diff --git a/App.vue b/App.vue index e048def..78968b5 100644 --- a/App.vue +++ b/App.vue @@ -62,6 +62,7 @@ } } } - } + + \ No newline at end of file diff --git a/common/css/app.scss b/common/css/app.scss index 7f2f938..9ebf5ea 100644 --- a/common/css/app.scss +++ b/common/css/app.scss @@ -48,7 +48,16 @@ view { min-height: 100vh; } - +.starBox { + width: 58rpx; + height: 32rpx; + line-height: 32rpx; + background: $tagC; + font-size: 24rpx; + text-align: center; + color: #fff; + border-radius: 16px 0px 16px 16rpx; + } .pad { padding: 0 28rpx; @@ -70,16 +79,7 @@ image { .placeholderClassFFF { color: #fff !important; } -.starBox { - width: 58rpx; - height: 32rpx; - line-height: 32rpx; - background: $tagC; - font-size: 24rpx; - text-align: center; - color: #fff; - border-radius: 16px 0px 16px 16rpx; - } + .pozPhone { opacity: 0.7; } diff --git a/common/js/mixins.js b/common/js/mixins.js index 588f5d4..060d18e 100644 --- a/common/js/mixins.js +++ b/common/js/mixins.js @@ -27,7 +27,9 @@ export default { if(token) { this.$store.dispatch('getUserInfo') } - this.$store.dispatch('getCity') + if(!this.vuex_cityInfo.lat) { + this.$store.dispatch('getCity') + } }, } \ No newline at end of file diff --git a/common/js/qqLatLng.js b/common/js/qqLatLng.js index 33f0d10..5bf0930 100644 --- a/common/js/qqLatLng.js +++ b/common/js/qqLatLng.js @@ -1,7 +1,7 @@ var KJTencentLocation = uni.requireNativePlugin("KJ-TencentLocation"); var kic = { - "apiKey": "BPMBZ-VSKE3-MC23F-O3KZO-AZGI7-PXFJI", //ios才有效，andorid的在App原生插件配置里设置 + "apiKey": "JTOBZ-KLLKQ-S325W-25JZC-JLHEV-WNF5J", //ios才有效，andorid的在App原生插件配置里设置BPMBZ-VSKE3-MC23F-O3KZO-AZGI7-PXFJI "deviceID": "oaid" //andorid必须设置，默认使用oaid，ios无需设置 } // 获取系统信息 diff --git a/config/site.config.js b/config/site.config.js index 4730b65..d585812 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -10,4 +10,6 @@ module.exports = { }; -// http://123.6.232.54:8099/测试地址 \ No newline at end of file +// http://123.6.232.54:8099/测试地址 + +//http://www.lyjppt.com/正式地址 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8f1110c..dd67b50 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "洛阳学车", "appid" : "__UNI__3347C6E", "description" : "", - "versionName" : "1.2.9", - "versionCode" : 129, + "versionName" : "1.3.0", + "versionCode" : 130, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -165,7 +165,7 @@ } }, "KJ-TencentLocation" : { - "andorid_key" : "BPMBZ-VSKE3-MC23F-O3KZO-AZGI7-PXFJI", + "andorid_key" : "JTOBZ-KLLKQ-S325W-25JZC-JLHEV-WNF5J", "__plugin_info__" : { "name" : "腾讯定位、定位反作弊、伪定位、后台定位、单次或持续定位、场景定位(双端)", "description" : "支持获取oaid、腾讯定位、定位反作弊、伪定位、后台定位、单次或持续定位、场景定位、请试用合适再购买、请试用合适再购买、请试用合适再购买", @@ -225,7 +225,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.43:8318/", + "target" : "http://192.168.1.40:8318/", // "target" : "http://123.6.232.1:8099/", "changeOrigin" : true, "secure" : true, diff --git a/pages/indexEntry/enroll/payment/payment.vue b/pages/indexEntry/enroll/payment/payment.vue index 00457ff..a0f5572 100644 --- a/pages/indexEntry/enroll/payment/payment.vue +++ b/pages/indexEntry/enroll/payment/payment.vue @@ -53,7 +53,7 @@ this.initWx() }, onPullDownRefresh() { - // this.getStudentByPayment() + this.course_infoFn() }, methods: { // 初始化微信分享方法 @@ -116,8 +116,8 @@ const platform = 'common'; //易收宝H5的前端页面地址，不同的环境详见第四章第4节 // 测试地址 - // const preUrl = 'https://ft1wbs.zyebank.cn/cem_ysb_ft2/index.html' - const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html' + const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u6/index.html' + // const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html' // 生产地址 // const preUrl = 'https://zmcht.zybank.com.cn/cem_ysb/index.html'; const distinctId = this.userId //惟一标识 diff --git a/pages/indexEntry/findCoach/comp/coachItem.vue b/pages/indexEntry/findCoach/comp/coachItem.vue index 790c000..f794527 100644 --- a/pages/indexEntry/findCoach/comp/coachItem.vue +++ b/pages/indexEntry/findCoach/comp/coachItem.vue @@ -77,7 +77,6 @@ .starBox { margin: 10rpx 0; - } .pingjia { font-size: 24rpx; diff --git a/pages/mineEntry/carLearnHours/carLearnHours.vue b/pages/mineEntry/carLearnHours/carLearnHours.vue index 3ec043b..50e9a4d 100644 --- a/pages/mineEntry/carLearnHours/carLearnHours.vue +++ b/pages/mineEntry/carLearnHours/carLearnHours.vue @@ -42,11 +42,10 @@ methods: { async getStudentProcessFn() { const {data: res} = await getStudentProcess({studentId: this.studentId}) - console.log('基础不劳') this.list = [ {total: res.subjectOneTotalTime, time: res.subjectOneValidTtime, text: '科目一'}, {total: res.subjectTwoTotalTime, time: res.subjectTwoValidTtime, text: '科目二'}, - {total: res.subjectThreeTotalTime, time: res.subjectOneValidTtime, text: '科目三'}, + {total: res.subjectThreeTotalTime, time: res.subjectThreeValidTtime, text: '科目三'}, ] } } diff --git a/pages/mineEntry/myForecastName/myForecastName.vue b/pages/mineEntry/myForecastName/myForecastName.vue index ba06f33..1ab402d 100644 --- a/pages/mineEntry/myForecastName/myForecastName.vue +++ b/pages/mineEntry/myForecastName/myForecastName.vue @@ -47,12 +47,17 @@ deleteFn(id) { uni.showModal({ content: '确定要删除吗？', - success: async () => { - const res = await trainingApplyDelete({id}) - if(res.code==0) { - this.$u.toast('删除成功') + success: async (res) => { + if (res.confirm) { + const reslove = await trainingApplyDelete({id}) + if(reslove.code==0) { + uni.$u.toast('删除成功') + } + this.trainingApplyListFn() + } else if (res.cancel) { + console.log('用户点击取消'); } - this.trainingApplyListFn() + } }) }, diff --git a/pages/mineEntry/myOrder/detail/detail.vue b/pages/mineEntry/myOrder/detail/detail.vue index 02c8bd7..3dae963 100644 --- a/pages/mineEntry/myOrder/detail/detail.vue +++ b/pages/mineEntry/myOrder/detail/detail.vue @@ -101,7 +101,7 @@ 申请退款 - 下载发票 + 下载凭证 培训缴费电子凭证 diff --git a/store/modules/user.js b/store/modules/user.js index 85b3574..2a5fcdb 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -92,12 +92,12 @@ const user = { const http = uni.$u.http let config = { custom: { auth: false }, header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'} } const res = await http.get('app/student-record/get') - if(res.tenantId) { - uni.$u.http.setConfig((config) => { - config.header['tenant-id'] = res.tenantId - return config - }) - } + // if(res.tenantId) { + // uni.$u.http.setConfig((config) => { + // config.header['tenant-id'] = res.tenantId + // return config + // }) + // } commit('update_vuex_userInfo',res.data) }, // 刷新token diff --git a/uni.scss b/uni.scss index b78d54b..57a3be2 100644 --- a/uni.scss +++ b/uni.scss @@ -79,4 +79,4 @@ $uni-font-size-paragraph:15px; // 自已定义的 $themC: #3776FF; -$tagC: #0a52f499; +$tagC: rgba(10, 82, 244, 0.6);