From 4ff4845bc7f8dd9b74cc0264ffdcedcb9f70b22d Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Fri, 17 May 2024 18:07:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=93=E7=AE=97=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/app.scss | 36 +-- config/api.js | 9 + config/request.js | 3 +- config/site.config.js | 2 +- manifest.json | 8 +- pages/indexEntry/settlement/detail/detail.vue | 3 + pages/indexEntry/settlement/settlement.vue | 244 ++++++++++--------- pages/login/login - 副本.vue | 263 --------------------- pages/login/login.vue | 27 ++- .../comp/pickDateTimer/pickDateTimer.vue | 1 + .../recordEntry/operate/mySchedule/mySchedule.vue | 1 + .../operate/todayStudent/todayStudent.vue | 3 + .../recordEntry/student/addStudent/addStudent.vue | 4 +- .../student/addStudent/searchStudent.vue | 4 +- .../student/studentDetail/studentDetail.vue | 3 + pages/tabbar/mine/index.vue | 20 +- pages/tabbar/operateTrain/index.vue | 113 +++++---- pages/tabbar/statistics/comp/operateCoach.vue | 64 +++-- pages/tabbar/statistics/comp/stage.vue | 20 +- pages/tabbar/statistics/index.vue | 104 +++++++- pages/tabbar/student/index.vue | 4 +- pages/userCenter/forgetPwd/forgetPwd.vue | 3 + pages/userCenter/myCar/myCar.vue | 3 + pages/userCenter/myCar/notBound/notBound.vue | 3 + pages/userCenter/personaInfo/personaInfo.vue | 32 ++- pages/userCenter/refund/refund.vue | 3 + pages/userCenter/scanCode/scanCode.vue | 16 +- pages/userCenter/scanCode/scanCodeSchool.vue | 23 +- .../schoolCoach/coachComment/coachComment.vue | 4 +- pages/userCenter/schoolCoach/schoolCoach.vue | 3 + pages/userCenter/schoolSite/schoolSite.vue | 3 + pages/userCenter/settled/settled.vue | 3 + pages/userCenter/studentComment/studentComment.vue | 29 ++- store/modules/user.js | 2 +- 34 files changed, 541 insertions(+), 522 deletions(-) delete mode 100644 pages/login/login - 副本.vue diff --git a/common/css/app.scss b/common/css/app.scss index 38208b3..6927ad2 100644 --- a/common/css/app.scss +++ b/common/css/app.scss @@ -42,9 +42,10 @@ view { .pageBgImg { font-size: 28rpx;; color: #333; - background: url('http://jxtemp.oss-cn-hangzhou.aliyuncs.com/defaultImages/admin/bigImg/topPageBg.png') #F6F6F6 no-repeat; - background-size: 100% 324rpx; - min-height: 100vh; + background: #F6F6F6; + background-color: #1989fa; + width: 100%; + height: 324rpx; } .pad { padding: 0 28rpx; @@ -119,21 +120,20 @@ image { } /* 通用 */ - ::-webkit-input-placeholder { color:#ADADAD; } - ::-moz-placeholder { color:#ADADAD; } /* firefox 19+ */ - :-ms-input-placeholder { color:#ADADAD; } /* ie */ - input:-moz-placeholder { color:#ADADAD; } + ::-webkit-input-placeholder { color:#BBBBBB; } + ::-moz-placeholder { color:#BBBBBB; } /* firefox 19+ */ + :-ms-input-placeholder { color:#BBBBBB; } /* ie */ + input:-moz-placeholder { color:#BBBBBB; } + + input::-webkit-input-placeholder { + color: #BBBBBB !important; + } + input::-moz-input-placeholder { + color: #BBBBBB !important; + } + input::-ms-input-placeholder { + color: #BBBBBB !important; + } - input::-webkit-input-placeholder { color: #CDCDCD !important; } - input::-moz-input-placeholder { color: #CDCDCD !important; } - input::-ms-input-placeholder { color: #CDCDCD !important; } - // /* webkit专用 */ - .input1::-webkit-input-placeholder { color:#00f; } - // #input2::-webkit-input-placeholder { color:#090; background:lightgreen; text-transform:uppercase; } - // #input3::-webkit-input-placeholder { font-style:italic; text-decoration:overline; color:#999; } - // /* mozilla专用 */ - // #input1::-moz-placeholder { color:#00f; } - // #input2::-moz-placeholder { color:#090; background:lightgreen; text-transform:uppercase; } - // #input3::-moz-placeholder { font-style:italic; text-decoration:overline; color:#999; } diff --git a/config/api.js b/config/api.js index 280bd90..e9958d3 100644 --- a/config/api.js +++ b/config/api.js @@ -5,6 +5,15 @@ export const getStudentDynamics = (data) => http.post('business/coach/getStudentDynamics', data) // 登录后查看是不是要签名 export const needSign = (data) => http.post('business/coach/needSign', data) + // 获得当日结算统计 + export const getSettlementStatistics = (data) => http.post('business/coach/getSettlementStatistics', data) + // 获得教练的学员结算列表 + export const settle_list = (data) => http.post('business/coach/settle_list', data) + + + + + diff --git a/config/request.js b/config/request.js index 2f189ae..5085d02 100644 --- a/config/request.js +++ b/config/request.js @@ -25,8 +25,9 @@ module.exports = (vm) => { if(contentTypeIndex) { // alert(contentTypeIndex) config.header['content-type'] = ContentType[contentTypeIndex] + }else { + config.header['content-type'] = 'application/json;charset=utf-8' } - config.header['content-type'] = 'application/json;charset=utf-8' // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{} config.data = config.data || {} // 根据custom参数中配置的是否需要token，添加对应的请求头 diff --git a/config/site.config.js b/config/site.config.js index ae290bb..8e1383d 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -3,7 +3,7 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 // WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.37:8318/',//非代理地址 - WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',//非代理地址 + WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://123.6.232.1:8099/',//非代理地址 // TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.39:48082/', httpPrefix: 'app-api/', imgUrl: 'http://jxtemp.oss-cn-hangzhou.aliyuncs.com/defaultImages/admin/bigImg/' diff --git a/manifest.json b/manifest.json index a272e88..3e98f23 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "洛阳驾校端", "appid" : "__UNI__BD23957", "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", + "versionName" : "1.0.1", + "versionCode" : 101, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -86,8 +86,8 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.38:8318/", - // "target" : "http://work.lyjppt.com:8099/", + "target" : "http://192.168.1.43:8318/", + // "target" : "http://123.6.232.1:8099", "changeOrigin" : true, "secure" : true, "pathRewrite" : { diff --git a/pages/indexEntry/settlement/detail/detail.vue b/pages/indexEntry/settlement/detail/detail.vue index 4b3303f..1f29b50 100644 --- a/pages/indexEntry/settlement/detail/detail.vue +++ b/pages/indexEntry/settlement/detail/detail.vue @@ -1,4 +1,6 @@ \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 7cb1914..90eff8c 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -17,12 +17,14 @@ - + + - + + {{codeText}} @@ -63,10 +65,11 @@ return uni.$u.test.mobile(this.FormData.phone) }, btnHighlight() { - return this.isPhone&&uni.$u.test.code(this.FormData.code, 4) + return this.isPhone&&this.FormData.code*1>999 } }, methods: { + // 是否选择协议 changeRadio(val) { this.isCheck = val @@ -112,13 +115,14 @@ this.$store.commit('update_vuex_loginInfo',res.data) await this.$store.dispatch('getUserInfo') if(res.userType==5) { + this.showRole = true + }else { + if(res.userType==3) this.$store.commit('upDateIdentity', '实操教练') + if(res.userType==4) this.$store.commit('upDateIdentity', '校长') uni.switchTab({ url: '/pages/tabbar/statistics/index' }) - }else { - this.showRole = true } - }, selectClick(item) { this.showRole = false @@ -140,6 +144,9 @@ min-height: 100vh; // background: url('../../../static/images/userCenter/loginTopBg.png') no-repeat; // background-size: 100% 360rpx; + .uni-input-placeholder { + color: #BBBBBB !important; + } .u-back-top { padding: 32rpx 0 0 0; .backBox { @@ -176,6 +183,14 @@ .inputBox { flex: 1; + input { + display: block; + width: 100%; + height: 100%; + display: block; + line-height: 112rpx; + font-size: 30rpx; + } } .code { color: #BBBBBB; diff --git a/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue index f9ecd3a..06c919e 100644 --- a/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue +++ b/pages/recordEntry/operate/mySchedule/comp/pickDateTimer/pickDateTimer.vue @@ -221,6 +221,7 @@ // 选择日期 chooseDate(item) { this.chooseDay = item.date + this.radioVal = '' this.scheduleClassGetFn() // console.log('*****') // console.log(this.chooseDay) diff --git a/pages/recordEntry/operate/mySchedule/mySchedule.vue b/pages/recordEntry/operate/mySchedule/mySchedule.vue index 17bfa47..eb1edd9 100644 --- a/pages/recordEntry/operate/mySchedule/mySchedule.vue +++ b/pages/recordEntry/operate/mySchedule/mySchedule.vue @@ -64,6 +64,7 @@ }else { let pickDateRef = this.$refs.pickDateRef if(!pickDateRef.timerArr.length||!pickDateRef.timerArr2.length) return this.$u.toast('没有排课计划，请添加排课计划') + pickDateRef.radioVal = '' this.step = val } // this.$emit('changeStep', val) diff --git a/pages/recordEntry/operate/todayStudent/todayStudent.vue b/pages/recordEntry/operate/todayStudent/todayStudent.vue index 1898e18..97e2ba1 100644 --- a/pages/recordEntry/operate/todayStudent/todayStudent.vue +++ b/pages/recordEntry/operate/todayStudent/todayStudent.vue @@ -1,4 +1,6 @@ + \ No newline at end of file diff --git a/pages/tabbar/statistics/comp/stage.vue b/pages/tabbar/statistics/comp/stage.vue index e778894..3f20b9e 100644 --- a/pages/tabbar/statistics/comp/stage.vue +++ b/pages/tabbar/statistics/comp/stage.vue @@ -1,17 +1,25 @@ \ No newline at end of file diff --git a/pages/userCenter/refund/refund.vue b/pages/userCenter/refund/refund.vue index dce2b84..b37d87b 100644 --- a/pages/userCenter/refund/refund.vue +++ b/pages/userCenter/refund/refund.vue @@ -1,4 +1,6 @@ @@ -91,4 +107,5 @@ margin-left: 6rpx; } } + \ No newline at end of file diff --git a/pages/userCenter/schoolCoach/coachComment/coachComment.vue b/pages/userCenter/schoolCoach/coachComment/coachComment.vue index f7d410d..0ccd446 100644 --- a/pages/userCenter/schoolCoach/coachComment/coachComment.vue +++ b/pages/userCenter/schoolCoach/coachComment/coachComment.vue @@ -1,4 +1,6 @@ diff --git a/pages/userCenter/schoolCoach/schoolCoach.vue b/pages/userCenter/schoolCoach/schoolCoach.vue index fa90756..5ad1f3a 100644 --- a/pages/userCenter/schoolCoach/schoolCoach.vue +++ b/pages/userCenter/schoolCoach/schoolCoach.vue @@ -1,4 +1,6 @@ diff --git a/pages/userCenter/schoolSite/schoolSite.vue b/pages/userCenter/schoolSite/schoolSite.vue index d68c50a..2d7cc1a 100644 --- a/pages/userCenter/schoolSite/schoolSite.vue +++ b/pages/userCenter/schoolSite/schoolSite.vue @@ -1,4 +1,6 @@ diff --git a/pages/userCenter/settled/settled.vue b/pages/userCenter/settled/settled.vue index f27c443..a82b23b 100644 --- a/pages/userCenter/settled/settled.vue +++ b/pages/userCenter/settled/settled.vue @@ -1,4 +1,6 @@