From dccef1c99fabf6c38bcf96ec5d6430be0fe41d68 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Fri, 29 Mar 2024 19:06:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E8=BD=A6=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/app.scss | 2 +- common/js/utils.js | 3 +- config/api.js | 5 ++ config/request.js | 3 +- config/site.config.js | 4 +- config/utils.js | 1 + manifest.json | 4 +- pages.json | 7 ++- pages/indexEntry/consult/record/record.vue | 21 +++++---- pages/indexEntry/enroll/enroll.vue | 1 - pages/indexEntry/enroll/registInfo/registInfo.vue | 32 +++++++++---- pages/indexEntry/iIndustryInfo/detail/detail.vue | 12 +++-- pages/indexEntry/signIn/signIn.vue | 2 +- pages/indexEntry/theory/theory.vue | 1 + .../mineEntry/carLearProgress/carLearProgress.vue | 55 +++++++++++++++------- pages/mineEntry/myContract/myContract.vue | 7 +++ pages/mineEntry/refund/comp/myform.vue | 4 +- pages/mineEntry/schoolTransfer/schoolTransfer.vue | 6 +-- pages/tabbar/index/index.vue | 2 + pages/tabbar/learnCar/comp/topInfo.vue | 8 ++-- pages/tabbar/learnCar/index.vue | 4 +- pages/tabbar/mine/index.vue | 6 +-- .../login/privacyAgreement/privacyAgreement.vue | 18 +++---- 23 files changed, 135 insertions(+), 73 deletions(-) diff --git a/common/css/app.scss b/common/css/app.scss index c70bf67..a168a68 100644 --- a/common/css/app.scss +++ b/common/css/app.scss @@ -50,7 +50,7 @@ view { .topBg{ background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat; - background-size: 100% ; + background-size: 100% 100%; } .pad { diff --git a/common/js/utils.js b/common/js/utils.js index 8650d1a..3cc36ce 100644 --- a/common/js/utils.js +++ b/common/js/utils.js @@ -124,6 +124,7 @@ const install = (Vue, vm) => { store.commit('goLogin') return } + // return vm.$goPage('/pages/indexEntry/enroll/registInfo/registInfo') // store.commit('updateNonPlatformStudent', false) if( vm.vuex_userInfo.applyStep<2) { vm.$goPage('/pages/indexEntry/enroll/enroll') @@ -135,7 +136,7 @@ const install = (Vue, vm) => { if(vm.vuex_userInfo.applyStep>5) { uni.$u.toast('您已是报名学员') } - + // 报名进度（0：待报名，1：已选驾校，2：已实名制，3：已填写报名信息，4：已签署合同，5：待支付，6：已支付） } let isImagePath = (path)=> { diff --git a/config/api.js b/config/api.js index 3674d94..6be5a6b 100644 --- a/config/api.js +++ b/config/api.js @@ -214,6 +214,11 @@ export const monthSignRecord = (data) => http.post('business/student/sign/monthS export const signDetail = (data) => http.post('business/student/sign/signDetail', data) // 学时确认 export const periodConfirm = (data) => http.post('app/student-process/periodConfirm', data) + // 获得学员动态 + export const getStudentDynamics = (data) => http.post('app/student-dynamic/getStudentDynamics', data) + + + diff --git a/config/request.js b/config/request.js index 4ea2c45..62abddf 100644 --- a/config/request.js +++ b/config/request.js @@ -57,7 +57,8 @@ module.exports = (vm) => { } } if(data.code==401) { - + console.log('报401的接口') + console.log(response.config.url) vm.$store.commit('goLogin', true) } diff --git a/config/site.config.js b/config/site.config.js index 7d45f6e..2613f4f 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,7 +2,9 @@ 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.43:8318/',//非代理地址 + // WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.37:8318/',//非代理地址 + WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',//非代理地址 + website: 'http://192.168.1.37', httpPrefix: 'app-api/', imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' diff --git a/config/utils.js b/config/utils.js index c1c024b..a57f2b7 100644 --- a/config/utils.js +++ b/config/utils.js @@ -194,6 +194,7 @@ export function uploadImgApi(filePath, imgName, imgLink='image') { _this.$store.commit('updateSchool', {}) _this.$store.commit('upDateSchoolCoach', item) }else { + obj.schoolName = decodeURIComponent(obj.schoolName) _this.$store.commit('upDateSchoolCoach', {}) _this.$store.commit('updateSchool', item) } diff --git a/manifest.json b/manifest.json index e8166ea..c21fbaa 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "洛阳学车", "appid" : "__UNI__3347C6E", "description" : "", - "versionName" : "1.1.2", - "versionCode" : 112, + "versionName" : "1.1.4", + "versionCode" : 114, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index e7ca110..2c1fb37 100644 --- a/pages.json +++ b/pages.json @@ -493,8 +493,6 @@ "backgroundTextStyle": "dark" } } - - ] }, @@ -513,8 +511,9 @@ { "path": "login/privacyAgreement/privacyAgreement", "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom", + "navigationBarTitleText": "", + // "navigationStyle": "custom", + "navigationBarBackgroundColor": "#fff", "enablePullDownRefresh": false, "backgroundTextStyle": "dark" } diff --git a/pages/indexEntry/consult/record/record.vue b/pages/indexEntry/consult/record/record.vue index d682d79..337ad01 100644 --- a/pages/indexEntry/consult/record/record.vue +++ b/pages/indexEntry/consult/record/record.vue @@ -1,22 +1,23 @@