Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service

packageCa/search/search.vue

@@ -109,7 +109,7 @@
 				const res = await api.queryKaShiToken(this.idCard,this.name)
 				if(res.Result == 1){
 					let params = {
-						token:res.Data.token,
+						token:res.Data.token, 
 						user: res.Data.userInfo
 					};
 					uni.setStorageSync('CAuserInfo',params);

packageCa/testReport/generalCareerTestReport.vue

@@ -72,7 +72,7 @@
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
 	const echarts = require('../utilCa/echarts.min.js');
-    // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
+    import * as echarts1 from '../utilCa/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);
     export default {

packageCa/userCenter/professionPath.vue

@@ -18,9 +18,6 @@
 						<view class="th">
 							我的意向
 						</view>
-						<view class="th">
-							专业匹配
-						</view>
 					</view>
 					<view class="tr" v-for="(item,index) in jobList" @click="checkedJob(item)" :key="index">
 						<view class="td">
@@ -35,9 +32,9 @@
 						<view class="td">
 							<view class="is-has" v-if="item.IsIntention"></view>
 						</view>
-						<view class="td">
+					<!-- 	<view class="td">
 							<view class="is-has" v-if="item.IsSpecialtyMatch"></view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="empty" v-else>
@@ -308,7 +305,7 @@
 					.tr {
 						display: -webkit-box;
 						.th {
-							width: 145rpx;
+							width: 170rpx;
 							height: 72rpx;
 							line-height: 72rpx;
 							text-align: center;
@@ -327,7 +324,7 @@
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							width: 145rpx;
+							width: 170rpx;
 							min-height: 72rpx;
 							font-size: 24rpx;
 							color: #333333;

packageCa/utilCa/config.js

@@ -2,9 +2,9 @@ let baseUrl = ""
 // #ifdef MP-WEIXIN
 // 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译
 if (wx.getAccountInfoSync().miniProgram.envVersion === 'develop') {
-    baseUrl = 'https://localhost:7026' // 开发环境
+    baseUrl = 'https://localhost:7026/career' // 开发环境
 } else {
-    baseUrl = 'https://yanxueapi.51xuanxiao.com' // 生产环境
+    baseUrl = 'https://ksrs.51xuanxiao.com' // 生产环境
 }
 // #endif
 

packageCa/utilCa/imageUrl.js

@@ -1,20 +0,0 @@
-// 公共图片基地址
-const BASE_IMAGE_URL = 'https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh';
-
-/**
- * 图片地址拼接方法
- * @param {string} path - 图片路径（相对于基地址的路径）
- * @param {string} [process] - OSS图片处理参数，例如：'image/resize,m_fixed,w_348/quality,q_80'
- * @returns {string} 完整的图片URL
- */
-export function ossImageUrl(path, process) {
-  
-  // 如果有处理参数，拼接处理参数
-  if (process) {
-    return `${BASE_IMAGE_URL}/${path}?x-oss-process=${process}`;
-  }
-  
-  // 没有处理参数时，直接返回原始路径
-  return `${BASE_IMAGE_URL}/${path}`;
-}
-

packageCa/utilCa/request.js

@@ -8,7 +8,10 @@ request.globalRequest = (url, method, data, power, type) => {
     // 1 == 不通过access_token校验的接口
     // 2 == 文件下载接口列表
     const userInfo = uni.getStorageSync('CAuserInfo')
-	headers['Token'] = userInfo.token
+	console.log("ca用户",userInfo);
+	if(userInfo != ""){
+		headers['Token'] = userInfo.token
+	}
     return uni.request({
         timeout: 60000,
         url: baseUrl + url,

packageRc/pages/personalList/personalList.vue

@@ -78,7 +78,8 @@
       <view>
         <view  v-for="(job,index) in perlist" :key="index"
           class="swipe_action_item">
-          <view class="job-list__item" :style="{ paddingBottom: job.auditStatus == 1 ? '0' : '32rpx' }" @tap="toPage(`/packageRc/pages/community/personEdit?id=${job.id}&type=edit`)">
+          <view class="job-list__item" :style="{ paddingBottom: job.auditStatus == 1 ? '0' : '32rpx' }">
+           <!-- @tap="toPage(`/packageRc/pages/community/personEdit?id=${job.id}&type=edit`)" -->
             <view class="job-list__item-top">
               <img src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/malepng.png" v-if="job.gender == 0" class="gender-img" alt="" />
               <img src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/femalepng.png" v-else class="gender-img" alt="" />
@@ -126,7 +127,7 @@
               <view v-show="$store.getters.roles.includes('shequn')" class="btn" style="color: #f56c6c;"
                 @click.native.stop="handleReturn(job)">退回</view>
               <view class="btn" @click.native.stop="toPage(
-                `/packageRc/pages/community/serviceDetails?id=${job.id}&userId=${job.userId}`
+                `/packageRc/pages/daiban/daibandetail?id=${job.id}&userId=${job.userId}`
               )">服务</view>
               <view
                 v-if=" job.personType == 3"
@@ -434,9 +435,9 @@ export default {
       this.$refs.show.open()
     },
     toPage(url) {
-      uni.navigateTo(
+      uni.navigateTo({
         url
-      )
+      })
     },
     cancelSortPicker() {
       this.showSortPicker = false