diff --git a/packageCa/search/search.vue b/packageCa/search/search.vue index 6eb39ba..ecf50cc 100644 --- a/packageCa/search/search.vue +++ b/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); diff --git a/packageCa/testReport/generalCareerTestReport.vue b/packageCa/testReport/generalCareerTestReport.vue index 58aac62..5725eec 100644 --- a/packageCa/testReport/generalCareerTestReport.vue +++ b/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 { diff --git a/packageCa/userCenter/professionPath.vue b/packageCa/userCenter/professionPath.vue index d8845c2..521e68c 100644 --- a/packageCa/userCenter/professionPath.vue +++ b/packageCa/userCenter/professionPath.vue @@ -18,9 +18,6 @@ 我的意向 - - 专业匹配 - @@ -35,9 +32,9 @@ - + @@ -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; diff --git a/packageCa/utilCa/config.js b/packageCa/utilCa/config.js index adb1f80..a97c819 100644 --- a/packageCa/utilCa/config.js +++ b/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 diff --git a/packageCa/utilCa/imageUrl.js b/packageCa/utilCa/imageUrl.js deleted file mode 100644 index b27ba15..0000000 --- a/packageCa/utilCa/imageUrl.js +++ /dev/null @@ -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}`; -} - diff --git a/packageCa/utilCa/request.js b/packageCa/utilCa/request.js index dbadf50..db0294a 100644 --- a/packageCa/utilCa/request.js +++ b/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,