diff --git a/App.vue b/App.vue index b6c062a..e048def 100644 --- a/App.vue +++ b/App.vue @@ -42,5 +42,26 @@ \ No newline at end of file diff --git a/androidPrivacy.json b/androidPrivacy.json new file mode 100644 index 0000000..0a55e44 --- /dev/null +++ b/androidPrivacy.json @@ -0,0 +1,38 @@ +{ + "version" : "1", + "prompt" : "template", + "title" : "服务协议和隐私政策", + "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "buttonAccept" : "同意并接受", + "buttonRefuse" : "暂不同意", + "hrefLoader" : "system", + "backToExit" : "true", + "second" : { + "title" : "确认提示", + "message" : "　　进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", + "buttonAccept" : "同意并继续", + "buttonRefuse" : "退出应用" + }, + "disagreeMode" : { + "support" : false, + "loadNativePlugins" : false, + "visitorEntry" : false, + "showAlways" : false + }, + "styles" : { + "backgroundColor" : "#fff", + "borderRadius" : "5px", + "title" : { + "color" : "#333" + }, + "buttonAccept" : { + "color" : "#333" + }, + "buttonRefuse" : { + "color" : "#cccccc" + }, + "buttonVisitor" : { + "color" : "#333" + } + } +} diff --git a/common/css/app.scss b/common/css/app.scss index 10f8eb2..1301db2 100644 --- a/common/css/app.scss +++ b/common/css/app.scss @@ -42,16 +42,13 @@ view { .pageBgImg { font-size: 28rpx;; color: #333; - background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat; - background-size: 100% 278rpx; + // background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat; + // background-size: 100% 278rpx; min-height: 100vh; } -.topBg{ - background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat; - background-size: 100% 100%; -} + .pad { padding: 0 28rpx; diff --git a/common/js/mixins.js b/common/js/mixins.js index ce38231..588f5d4 100644 --- a/common/js/mixins.js +++ b/common/js/mixins.js @@ -25,8 +25,9 @@ export default { },1500) let token = this.$store.state.user.vuex_loginInfo.accessToken if(token) { - this.$store.dispatch('getCity') + this.$store.dispatch('getUserInfo') } + this.$store.dispatch('getCity') }, } \ No newline at end of file diff --git a/manifest.json b/manifest.json index b5b2702..d7e5d10 100644 --- a/manifest.json +++ b/manifest.json @@ -112,6 +112,9 @@ "UniversalLinks" : "https://static-mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d.next.bspapp.com/uni-universallinks/__UNI__3347C6E/" } } + }, + "splashscreen" : { + "useOriginalMsgbox" : true } }, "nativePlugins" : { diff --git a/pages.json b/pages.json index 3e53cde..d89e5d7 100644 --- a/pages.json +++ b/pages.json @@ -266,6 +266,15 @@ } }, { + "path": "theory/webView", + "style": { + "navigationBarTitleText": "理论学习webview", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { "path": "consult/consult", "style": { "navigationBarTitleText": "咨询投诉", diff --git a/pages/indexEntry/enroll/signContract/signContract.vue b/pages/indexEntry/enroll/signContract/signContract.vue index 19483f1..e18cad9 100644 --- a/pages/indexEntry/enroll/signContract/signContract.vue +++ b/pages/indexEntry/enroll/signContract/signContract.vue @@ -87,6 +87,8 @@ } = await getSignContract(obj) uni.hideLoading() this.webViewUrl = res.url + console.log('===============webview地址==================') + console.log(this.webViewUrl) }, // 查询签约状态 diff --git a/pages/indexEntry/theory/theory.vue b/pages/indexEntry/theory/theory.vue index e492f3b..c1b3299 100644 --- a/pages/indexEntry/theory/theory.vue +++ b/pages/indexEntry/theory/theory.vue @@ -24,10 +24,10 @@ return { radioArr: [ {text: '自学练习', id: 1}, - {text: '记录理论学时', id: 2}, - {text: '安全警示教育在线视频学习', id: 3}, + // {text: '记录理论学时', id: 2}, + // {text: '安全警示教育在线视频学习', id: 3}, ], - currentId: 2, + currentId: 1, } }, onLoad(options) { @@ -38,23 +38,12 @@ this.currentId = item.id }, goPage() { - return this.$u.toast('待确定！') + // return this.$u.toast('待确定！') if(this.currentId==1) { // let url = 'https://www.hzsjspx.com/theory/scienceStudy?token=amlhcGVpMTY5NTc3NzUzODg5ODA5NjU1&lat=30.343055&lng=120.183711&isUni=1' - let questionUrl = website+':93/question/' - let phone = this.vuex_userInfo.phone - let obj = { - phone, - cityCode: '3311', - } - // #ifdef MP-WEIXIN - obj.isWx = 1 - // #endif - let uniItem = encodeURIComponent(JSON.stringify(obj)) - let url = `${questionUrl}?uniItem=${uniItem}` - console.log(url) + let url =`http://121.41.97.244/question/question?phone=${this.vuex_userInfo.phone}&cityCode=3311&isUni=1` this.$store.commit('updateWebVeiwUrl', url) - this.$goPage('/pages/indexEntry/webView/webView') + this.$goPage('/pages/indexEntry/theory/webView') }else if(this.currentId==2) { let theory = website+':91/theory/' let token = this.$store.state.user.vuex_loginInfo.accessToken diff --git a/pages/indexEntry/theory/webView.vue b/pages/indexEntry/theory/webView.vue new file mode 100644 index 0000000..a8a650f --- /dev/null +++ b/pages/indexEntry/theory/webView.vue @@ -0,0 +1,44 @@ + + + + diff --git a/pages/indexEntry/webView/webView.vue b/pages/indexEntry/webView/webView.vue index a599c43..a8a650f 100644 --- a/pages/indexEntry/webView/webView.vue +++ b/pages/indexEntry/webView/webView.vue @@ -1,13 +1,11 @@ - diff --git a/pages/mineEntry/myOrder/detail/detail.vue b/pages/mineEntry/myOrder/detail/detail.vue index f9716a1..02c8bd7 100644 --- a/pages/mineEntry/myOrder/detail/detail.vue +++ b/pages/mineEntry/myOrder/detail/detail.vue @@ -222,6 +222,9 @@ margin-left: 14rpx; padding: 0 16rpx; font-size: 24rpx; + height: 72rpx; + line-height: 72rpx; + border-radius: 8rpx; } } } diff --git a/pages/mineEntry/personaInfo/personaInfo.vue b/pages/mineEntry/personaInfo/personaInfo.vue index 84b3339..0b6a63a 100644 --- a/pages/mineEntry/personaInfo/personaInfo.vue +++ b/pages/mineEntry/personaInfo/personaInfo.vue @@ -61,7 +61,7 @@ --> - + 删除测试账号（开发用的） diff --git a/pages/mineEntry/refund/comp/myform.vue b/pages/mineEntry/refund/comp/myform.vue index 6965633..e2bbac9 100644 --- a/pages/mineEntry/refund/comp/myform.vue +++ b/pages/mineEntry/refund/comp/myform.vue @@ -117,7 +117,7 @@ let _this = this uni.showModal({ title: '确定要提交申请退款吗？', - content: '提交申请后，待教练和驾校审核通过即可收到退款~', + content: '提交申请后，驾校审核通过即可收到退款~', success: async ()=> { _this.onsubmit() } @@ -188,7 +188,7 @@ // 去除空格 cardNumber = cardNumber.replace(/\s/g, ''); // 银行卡号一般为 12-19 位数字 - const regex = /^[0-9]{12,19}$/; + const regex = /^[0-9]{10,22}$/; return regex.test(cardNumber); }, // 发送短信验证码 diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue index 5487aab..6d804f7 100644 --- a/pages/tabbar/index/index.vue +++ b/pages/tabbar/index/index.vue @@ -195,9 +195,9 @@ }, onShow() { - // if(!this.vuex_cityInfo.lat) { - // this.$store.dispatch('getCity') - // } + if(!this.vuex_cityInfo.lat) { + this.$store.dispatch('getCity') + } let token = this.$store.state.user.vuex_loginInfo.accessToken if(token) { this.$store.dispatch('getUserInfo') diff --git a/pages/tabbar/learnCar/comp/subject2.vue b/pages/tabbar/learnCar/comp/subject2.vue index 4e33c33..a4e8b1d 100644 --- a/pages/tabbar/learnCar/comp/subject2.vue +++ b/pages/tabbar/learnCar/comp/subject2.vue @@ -90,18 +90,17 @@ --> - + - 科目二实操训练 - {{ item.reservationStatus==9?'已取消': reservationStatus[item.reservationStatus]}} - {{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }} + 科目二实操训练 + {{ item.reservationTime }} 预约场地：{{item.reservationAddress}} 预约教练：{{item.reservationCoach}} 预约车辆：{{item.reservationCar}} - 预约时间：{{ $u.timeFormat(item.reservationTime, 'yyyy-mm-dd hh:MM:ss') }} - 核销时间：{{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }} + 预约时间：{{ item.createTime }} + diff --git a/pages/tabbar/learnCar/comp/subject3.vue b/pages/tabbar/learnCar/comp/subject3.vue index f0c5508..17314f3 100644 --- a/pages/tabbar/learnCar/comp/subject3.vue +++ b/pages/tabbar/learnCar/comp/subject3.vue @@ -77,17 +77,18 @@ - + - 科目三实操训练 {{ item.reservationStatus==9?'已取消': reservationStatus[item.reservationStatus]}} - {{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }} + 科目三实操训练 + + {{ item.reservationTime }} 预约场地：{{item.reservationAddress}} 预约教练：{{item.reservationCoach}} 预约车辆：{{item.reservationCar}} - 预约时间：{{ $u.timeFormat(item.reservationTime, 'yyyy-mm-dd hh:MM:ss') }} - 核销时间：{{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }} + 预约时间：{{ item.createTime }} + diff --git a/pages/tabbar/learnCar/comp/topInfo.vue b/pages/tabbar/learnCar/comp/topInfo.vue index 2cb7235..e76efad 100644 --- a/pages/tabbar/learnCar/comp/topInfo.vue +++ b/pages/tabbar/learnCar/comp/topInfo.vue @@ -55,7 +55,7 @@ --> - + 确认学时 diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index 38ae801..f5ccfdb 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -72,8 +72,8 @@ {name: '我的评价', icon: require('@/static/images/mineIcon/minIcon (1).png'),url: '/pages/mineEntry/myEvaluate/myEvaluate'}, // {name: '退款申请', icon: require('@/static/images/mineIcon/minIcon (3).png'),url: '/pages/mineEntry/refund/refund'}, // {name: '变更车型', icon: require('@/static/images/mineIcon/minIcon (7).png'),url: '/pages/mineEntry/modelChange/modelChange'}, - {name: '同城转校', icon: require('@/static/images/mineIcon/minIcon (5).png'),url: '/pages/mineEntry/schoolTransfer/schoolTransfer'}, - // {name: '退款申请记录', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: ''}, + // {name: '同城转校', icon: require('@/static/images/mineIcon/minIcon (5).png'),url: '/pages/mineEntry/schoolTransfer/schoolTransfer'}, + {name: '隐私政策', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: ''}, {name: '关于我们', icon: require('@/static/images/mineIcon/minIcon (2).png'),url: '/pages/mineEntry/aboutUs/aboutUs'}, ] } @@ -82,6 +82,7 @@ if(this.show) this.show = false }, methods: { + topClick() { if(!this.vuex_userInfo.phone) { this.$goPage('/pages/userCenter/login/login') @@ -92,6 +93,8 @@ goPage(item) { if(item.name!='关于我们') { // return this.$goPage('/pages/mineEntry/myForecastName/myForecastName') + // console.log(this.vuex_userInfo.applyStep) + console.log(this.vuex_userInfo.applyStep) if(item.name=='我的订单'&&this.vuex_userInfo.applyStep>2&&this.vuex_userInfo.applyStep<6) { return this.$goPage('/pages/mineEntry/myForecastName/myForecastName') } diff --git a/static/images/bigImg/h1Active.png b/static/images/bigImg/h1Active.png new file mode 100644 index 0000000..f430b73 Binary files /dev/null and b/static/images/bigImg/h1Active.png differ diff --git a/static/images/bigImg/homeBg.png b/static/images/bigImg/homeBg.png new file mode 100644 index 0000000..6b4def3 Binary files /dev/null and b/static/images/bigImg/homeBg.png differ diff --git a/static/images/bigImg/indexTopBanner.png b/static/images/bigImg/indexTopBanner.png new file mode 100644 index 0000000..fa29ac7 Binary files /dev/null and b/static/images/bigImg/indexTopBanner.png differ diff --git a/static/images/bigImg/loginTopBg.png b/static/images/bigImg/loginTopBg.png new file mode 100644 index 0000000..1086c92 Binary files /dev/null and b/static/images/bigImg/loginTopBg.png differ diff --git a/static/images/bigImg/topBg.png b/static/images/bigImg/topBg.png new file mode 100644 index 0000000..c11a262 Binary files /dev/null and b/static/images/bigImg/topBg.png differ diff --git a/static/images/topBg.png b/static/images/topBg.png new file mode 100644 index 0000000..c11a262 Binary files /dev/null and b/static/images/topBg.png differ