From 83f806f973c88075696c4437471ebd539b0d5ed0 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Mon, 6 Nov 2023 19:14:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/request.js | 4 +- config/site.config.js | 4 +- pages.json | 11 ++ pages/carEntry/evaluate/evaluate.vue | 15 +- .../NonPlatformStudentInfo.vue | 168 +++++++++++++++++++++ pages/indexEntry/enroll/enroll.vue | 27 +++- pages/indexEntry/enroll/realName/realName.vue | 7 +- pages/indexEntry/enroll/registInfo/registInfo.vue | 2 +- .../enroll/uploadAvatar/uploadAvatar.vue | 2 +- pages/indexEntry/examines/detail/detail.vue | 27 +++- pages/tabbar/index/index.vue | 10 +- pages/tabbar/learnCar/comp/subject0.vue | 2 +- pages/tabbar/learnCar/comp/subject3.vue | 2 +- pages/userCenter/login/login.vue | 2 + pages/userCenter/login/loginByPhone.vue | 2 + site.config.js | 8 - store/modules/user.js | 7 +- 17 files changed, 271 insertions(+), 29 deletions(-) create mode 100644 pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue delete mode 100644 site.config.js diff --git a/config/request.js b/config/request.js index 95b5198..85785b6 100644 --- a/config/request.js +++ b/config/request.js @@ -1,5 +1,5 @@ -import { H5_API, WX_API,httpPrefix } from './site.config.js' +import { H5_API, WX_API,httpPrefix } from '@/config/site.config.js'; import { checkToken } from './utils' @@ -16,7 +16,7 @@ module.exports = (vm) => { config.baseURL = H5_API+ WX_API + prefix; /* 根域名 */ console.log(config.baseURL) // config.header['content-type'] = 'application/x-www-form-urlencoded; charset=UTF-8' - config.header['tenant-id'] = '1' + config.header['tenant-id'] = vm.$store.state.user.vuex_userInfo.tenantId || 1 return config }) diff --git a/config/site.config.js b/config/site.config.js index 9bdc128..cc5ace4 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,8 +2,8 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; // localIp = false module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 - WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.36:48080/',//非代理地址 - TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.26:48080/', + WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.39:48080/',//非代理地址 + website: 'http://192.168.1.44:8001/h5/#', httpPrefix: 'app-api/', imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' }; diff --git a/pages.json b/pages.json index d03df73..c3d212b 100644 --- a/pages.json +++ b/pages.json @@ -32,6 +32,17 @@ { "root": "pages/indexEntry", "pages": [ + + { + "path": "NonPlatformStudentInfo/NonPlatformStudentInfo", + "style": { + "navigationBarTitleText": "非平台学员", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "backgroundTextStyle": "dark" , + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { "path": "credit/credit", "style": { diff --git a/pages/carEntry/evaluate/evaluate.vue b/pages/carEntry/evaluate/evaluate.vue index b81ae71..7292f74 100644 --- a/pages/carEntry/evaluate/evaluate.vue +++ b/pages/carEntry/evaluate/evaluate.vue @@ -1,7 +1,7 @@