diff --git a/public/index.html b/public/index.html index 5d38461..988e6ac 100644 --- a/public/index.html +++ b/public/index.html @@ -9,7 +9,7 @@ - + + We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. + Please enable it to continue. +
diff --git a/src/App.vue b/src/App.vue index f406aa8..cd160da 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,20 +1,46 @@ diff --git a/src/component/Tabbar4.vue b/src/component/Tabbar4.vue index cd2f30f..f74b15b 100644 --- a/src/component/Tabbar4.vue +++ b/src/component/Tabbar4.vue @@ -90,4 +90,20 @@ export default { } } } + + \ No newline at end of file diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue index f01b35a..c8dba0a 100644 --- a/src/views/Home/Home.vue +++ b/src/views/Home/Home.vue @@ -28,6 +28,16 @@ +
+
+ + 长辈版 +
+

+ {{isElder?'已开启':'未开启'}} + +

+
@@ -45,6 +55,7 @@ import HomeChildList from '@/views/Home/component/HomeChildList' import HomeOrder from '@/views/Home/component/HomeOrder' import HomeScan from '@/views/Home/component/HomeScan' import Tabbar4 from '@/component/Tabbar4' +import { Dialog } from 'vant' export default { data () { return { @@ -64,46 +75,48 @@ export default { headImgUrl: '', defaultHead: require('@/assets/head.png'), isShow: false, - showChildList: false + showChildList: false, + isElder: false } }, mounted () { - aplus_queue.push({ - 'action': 'aplus.sendPV', - 'arguments': [{ - is_auto: false - }] - }) - this.checkAuth() + const isElder = sessionStorage.getItem('isElder') + if (isElder) { + this.isElder = true + } + this.centerNo = sessionStorage.getItem('centerNo'); + this.getUserInfo() + + // this.checkAuth() }, methods: { - checkAuth () { - let centerNo = this.common.getUrlParam('center_no') || sessionStorage.getItem('centerNo'); - if (centerNo) { - this.centerNo = centerNo - sessionStorage.setItem('centerNo', centerNo); - this.getUserInfo() - } else { - const sUserAgent = window.navigator.userAgent.toLowerCase() - const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1 - const miniprogram = sUserAgent.indexOf("miniprogram") > -1 && sUserAgent.indexOf("alipay") > -1 - if (dtdreamweb) { - alert('浙里办') - window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`; - } - // else if (miniprogram) { - // alert('支付宝') - // window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`; - // } - else { - console.log('非浙里办渠道访问，显示测试用户数据') - this.centerNo = '20210930160466993660' - sessionStorage.setItem('centerNo', '20210930160466993660'); - this.getUserInfo() - } - } - }, + // checkAuth () { + // let centerNo = this.common.getUrlParam('center_no') || sessionStorage.getItem('centerNo'); + // if (centerNo) { + // this.centerNo = centerNo + // sessionStorage.setItem('centerNo', centerNo); + // this.getUserInfo() + // } else { + // const sUserAgent = window.navigator.userAgent.toLowerCase() + // const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1 + // const miniprogram = sUserAgent.indexOf("miniprogram") > -1 && sUserAgent.indexOf("alipay") > -1 + // if (dtdreamweb) { + // alert('浙里办') + // window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`; + // } + // // else if (miniprogram) { + // // alert('支付宝') + // // window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`; + // // } + // else { + // console.log('非浙里办渠道访问，显示测试用户数据') + // this.centerNo = '20210930160466993660' + // sessionStorage.setItem('centerNo', '20210930160466993660'); + // this.getUserInfo() + // } + // } + // }, // 研学码 handleYanxue () { this.$router.push({ name: 'YanxueCode' }) @@ -125,6 +138,42 @@ export default { this.$toast('暂未开放，敬请期待！'); // this.$router.push({ name: 'Partner' }) }, + // 点击长辈版 + handelElder () { + if (this.isElder) { + Dialog.confirm({ + title: '长辈版', + message: '超大字号，看的更清楚，长辈版，专为长辈设计', + confirmButtonColor: '#ee0a24', + confirmButtonText: '关闭长辈版模式' + }) + .then(() => { + // on confirm + this.isElder = false + sessionStorage.removeItem('isElder') + this.$emit('setElder', false) + }) + .catch(() => { + // on cancel + }); + } else { + Dialog.confirm({ + title: '长辈版', + message: '超大字号，看的更清楚，长辈版，专为长辈设计', + confirmButtonColor: '#3385FF', + confirmButtonText: '开启长辈版模式' + }) + .then(() => { + // on confirm + this.isElder = true + sessionStorage.setItem('isElder', 1) + this.$emit('setElder', true) + }) + .catch(() => { + // on cancel + }); + } + }, // 获取用户信息 getUserInfo: function () { this.mgop({ @@ -265,3 +314,20 @@ export default { z-index: 99; } + diff --git a/src/views/Home/component/HomeChildList.vue b/src/views/Home/component/HomeChildList.vue index 445e848..e4f0484 100644 --- a/src/views/Home/component/HomeChildList.vue +++ b/src/views/Home/component/HomeChildList.vue @@ -198,4 +198,17 @@ export default { color: #f63837; } } + + \ No newline at end of file diff --git a/src/views/Home/component/HomeOrder.vue b/src/views/Home/component/HomeOrder.vue index 172937d..0339e88 100644 --- a/src/views/Home/component/HomeOrder.vue +++ b/src/views/Home/component/HomeOrder.vue @@ -79,4 +79,18 @@ export default { } } } + + \ No newline at end of file diff --git a/src/views/Service/AbroadDetail.vue b/src/views/Service/AbroadDetail.vue index 03722a7..dc17b0b 100644 --- a/src/views/Service/AbroadDetail.vue +++ b/src/views/Service/AbroadDetail.vue @@ -309,7 +309,7 @@ export default { // 'isTestUrl': '1' }, data: { - "id":this.courseId, + "id": this.courseId, "cs": "绍兴市", }, onSuccess: res => { @@ -448,8 +448,8 @@ export default { }, data: { "productId": this.detailData.id, - "startDate": startDate, - "endDate": endDate, + "startDate": startDate, + "endDate": endDate, }, onSuccess: res => { if (res.data.data) { @@ -1176,4 +1176,104 @@ export default { } } } + + \ No newline at end of file diff --git a/src/views/Service/CheckOrder.vue b/src/views/Service/CheckOrder.vue index 99e95e3..36cff20 100644 --- a/src/views/Service/CheckOrder.vue +++ b/src/views/Service/CheckOrder.vue @@ -181,20 +181,20 @@ export default { }, onSuccess: res => { if (res.data.data) { - if (this.paymoney == 0) { - // 使用后移除优惠券，防止返回继续使用 - sessionStorage.removeItem('useCard') + if (this.paymoney == 0) { + // 使用后移除优惠券，防止返回继续使用 + sessionStorage.removeItem('useCard') this.$router.push({ name: 'ServiceOrderXST', query: { active: 1, showChatGroupUrl: 1 } }) + } else { + // 使用后移除优惠券，防止返回继续使用 + sessionStorage.removeItem('useCard') + this.openPay(res.data.data); + this.orderId = res.data.data.orderId; + } } else { - // 使用后移除优惠券，防止返回继续使用 - sessionStorage.removeItem('useCard') - this.openPay(res.data.data); - this.orderId = res.data.data.orderId; + this.$toast.fail(res.data?.result); } - } else { - this.$toast.fail(res.data?.result); - } }, onFail: err => { @@ -203,8 +203,45 @@ export default { }); }, openPay (data) { + const sUserAgent = window.navigator.userAgent.toLowerCase() + const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1 + const miniprogram = sUserAgent.indexOf("miniprogram") > -1 && sUserAgent.indexOf("alipay") > -1 + if (dtdreamweb) { + alert('浙里办') + } + else if (miniprogram) { + alert('支付宝') + } let that = this; - alert('支付') + var payMsg = { + platform: 1, + arg: { + "credential": JSON.stringify({ + "appid": "2021000118637887", + "attach": "string1", + "body": "string23", + "notify_url": "http://47.110.50.251:9091/api/alipay/pay", + "outTradeNo": new Date().getTime(), + "payType": 0, + "payWay": 0, + "productId": "11", + "quit_url": "https://www.baidu.com", + "subject": "string", + "totalFee": "1000000" + }), + "inSandBox": false + } + }; + ZWJSBridge.pay(payMsg).then((result) => { + + alert('支付成功！'); + console.log('#### ZWJSBridge.pay() result:' + result); + + }).catch((error) => { + var errorMsg = JSON.stringify(error); + alert('支付失败:' + errorMsg); + console.log('#### ZWJSBridge.pay() error:' + error); + }); return; Axios({ diff --git a/src/views/Service/DatePackage.vue b/src/views/Service/DatePackage.vue index d145ede..6a01c40 100644 --- a/src/views/Service/DatePackage.vue +++ b/src/views/Service/DatePackage.vue @@ -110,7 +110,7 @@ export default { }, onSuccess: res => { if (res.data.data) { - this.numOne = res.data.data + this.numOne = res.data.data } }, onFail: err => { @@ -137,7 +137,7 @@ export default { }, onSuccess: res => { if (res.data.data) { - this.numSecond = res.data.data + this.numSecond = res.data.data } }, onFail: err => { @@ -225,12 +225,12 @@ export default { // 判断是否已登录 checkLogin () { if (process.env.NODE_ENV != "production") return true; - + const userInfo = JSON.parse(sessionStorage.getItem('userInfo')) const publicName = sessionStorage.getItem('publicName') if (!userInfo?.phone) { sessionStorage.setItem('prePage', 'ServiceDatePackage'); - sessionStorage.setItem('prePageQuery', JSON.stringify({ date:this.date })); + sessionStorage.setItem('prePageQuery', JSON.stringify({ date: this.date })); this.$router.push({ name: 'LoginPublic', query: { publicName: publicName } }) return false; } @@ -277,7 +277,7 @@ export default { .period_item { padding: 10px 20px; font-size: 28px; - margin-bottom:15px; + margin-bottom: 15px; text-align: left; background: #f5f6fa; border-radius: 10px; @@ -414,4 +414,43 @@ export default { box-sizing: border-box; color: #333; } + + \ No newline at end of file diff --git a/src/views/Service/ServiceBaseKQ.vue b/src/views/Service/ServiceBaseKQ.vue index 83a03a3..18f2c89 100644 --- a/src/views/Service/ServiceBaseKQ.vue +++ b/src/views/Service/ServiceBaseKQ.vue @@ -125,7 +125,7 @@ export default { type: 'POST', appKey: 'fuxgnukl+2001895516+edccpx', // 必须 headers: { - // 'isTestUrl': '1' + // 'isTestUrl': '1' }, data: { "area": "", @@ -165,7 +165,7 @@ export default { type: 'POST', appKey: 'fuxgnukl+2001895516+edccpx', // 必须 headers: { - // 'isTestUrl': '1' + // 'isTestUrl': '1' }, data: { "area": "", @@ -204,7 +204,7 @@ export default { type: 'POST', appKey: 'fuxgnukl+2001895516+edccpx', // 必须 headers: { - // 'isTestUrl': '1' + // 'isTestUrl': '1' }, data: { "area": "", @@ -243,7 +243,7 @@ export default { type: 'POST', appKey: 'fuxgnukl+2001895516+edccpx', // 必须 headers: { - // 'isTestUrl': '1' + // 'isTestUrl': '1' }, data: { "area": "", @@ -282,7 +282,7 @@ export default { type: 'POST', appKey: 'fuxgnukl+2001895516+edccpx', // 必须 headers: { - // 'isTestUrl': '1' + // 'isTestUrl': '1' }, data: { "area": "", @@ -322,7 +322,7 @@ export default { type: 'POST', appKey: 'fuxgnukl+2001895516+edccpx', // 必须 headers: { - // 'isTestUrl': '1' + // 'isTestUrl': '1' }, data: { "area": "", @@ -528,9 +528,6 @@ export default { box-shadow: 0 10px 10px rgba(238, 238, 238, 0.295); height: 88px; } - ::v-deep .van-tabs__nav { - background: transparent; - } ::v-deep .van-tab { // color: #fff; color: black; @@ -586,3 +583,27 @@ export default { background-color: #39a9ed; } + \ No newline at end of file diff --git a/src/views/Service/ServiceKQ.vue b/src/views/Service/ServiceKQ.vue index 29f5fff..a2cd0d1 100644 --- a/src/views/Service/ServiceKQ.vue +++ b/src/views/Service/ServiceKQ.vue @@ -14,12 +14,6 @@ export default { mounted () { console.log('xst mounted') - aplus_queue.push({ - 'action': 'aplus.sendPV', - 'arguments': [{ - is_auto: false - }] - }) this.checkAuth() }, @@ -33,25 +27,22 @@ export default { if (centerNo) { this.centerNo = centerNo sessionStorage.setItem('centerNo', centerNo); - console.log(111) this.getUserInfo() } else { - console.log(222) const sUserAgent = window.navigator.userAgent.toLowerCase() const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1 const miniprogram = sUserAgent.indexOf("miniprogram") > -1 && sUserAgent.indexOf("alipay") > -1 if (dtdreamweb) { - console.log(333) alert('浙里办') - // window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`; - this.centerNo = '20210930160466993660' - sessionStorage.setItem('centerNo', '20210930160466993660'); + window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`; + // this.centerNo = '20210930160466993660' + // sessionStorage.setItem('centerNo', '20210930160466993660'); this.getUserInfo() } - // else if (miniprogram) { - // alert('支付宝') - // window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`; - // } + else if (miniprogram) { + alert('支付宝') + window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=hswsy`; + } else { console.log('非浙里办渠道访问，显示测试用户数据') this.centerNo = '20210930160466993660' diff --git a/src/views/Service/component/ServiceListFour.vue b/src/views/Service/component/ServiceListFour.vue index e7aee6d..3e1f1b9 100644 --- a/src/views/Service/component/ServiceListFour.vue +++ b/src/views/Service/component/ServiceListFour.vue @@ -97,6 +97,7 @@ export default { } .abroad { padding: 18px 0; + padding-bottom: 146px; .padding_box { padding: 0 28px; padding-bottom: 16px; @@ -264,4 +265,37 @@ export default { } } } + + \ No newline at end of file diff --git a/src/views/Service/component/ServiceListSecond.vue b/src/views/Service/component/ServiceListSecond.vue index a015658..9c47b88 100644 --- a/src/views/Service/component/ServiceListSecond.vue +++ b/src/views/Service/component/ServiceListSecond.vue @@ -6,13 +6,13 @@