From 0f61c1adf4762c1b6c5b5b617a9aff645236caa9 Mon Sep 17 00:00:00 2001 From: xiayt Date: Wed, 27 Oct 2021 15:48:20 +0800 Subject: [PATCH] feat: 支付接通 --- src/component/GroupCodePopup.vue | 151 ------------------------------------------------------------------------------------------------------------------------------------------------------- src/main.js | 3 ++- src/views/Home/Home.vue | 29 +---------------------------- src/views/Home/MyClassList.vue | 4 ++-- src/views/Home/component/AddChildPopupGroup.vue | 2 +- src/views/Service/CheckOrder.vue | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------- src/views/Service/EditContact.vue | 2 +- src/views/Service/ServiceBaseKQ.vue | 1 + src/views/Service/ServiceKQ.vue | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- src/views/Service/ServiceOrderXST.vue | 60 +++++++++++------------------------------------------------- src/views/Service/component/ServiceListFour.vue | 8 +++++++- src/views/Service/component/ServiceListThird.vue | 5 +++++ src/views/Service/component/aboutDes.vue | 36 ++++++++++++++++++++++++++++++++++++ src/views/Service/evaluateBase.vue | 2 +- src/views/Service/evaluateCourse.vue | 4 ++-- src/views/Service/evaluatePubilc.vue | 4 ++-- 16 files changed, 208 insertions(+), 290 deletions(-) delete mode 100644 src/component/GroupCodePopup.vue create mode 100644 src/views/Service/component/aboutDes.vue diff --git a/src/component/GroupCodePopup.vue b/src/component/GroupCodePopup.vue deleted file mode 100644 index 88c0d31..0000000 --- a/src/component/GroupCodePopup.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - \ No newline at end of file diff --git a/src/main.js b/src/main.js index 22acd62..6a10fd0 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,5 @@ import Vue from 'vue' -import { Popup, Toast, Picker, Tag, Tab, Tabs, Area, Search, Swipe, SwipeItem, Cell, List, Collapse, CollapseItem, Button, Field, Icon, Sticky, DropdownMenu, DropdownItem, Rate, Calendar, Checkbox, Empty, Lazyload, Radio, RadioGroup, CellGroup, Dialog, CheckboxGroup } from 'vant'; +import { Popup, Toast, Picker, Tag, Tab, Tabs, Area, Search, Swipe, SwipeItem, Cell, List, Collapse, CollapseItem, Button, Field, Icon, Sticky, DropdownMenu, DropdownItem, Rate, Calendar, Checkbox, Empty, Lazyload, Radio, RadioGroup, CellGroup, Dialog, CheckboxGroup, NavBar } from 'vant'; import App from './App.vue' import router from './router' import store from './store' @@ -43,6 +43,7 @@ Vue .use(Lazyload) .use(Toast) .use(Dialog) + .use(NavBar) .use(RadioGroup) .use(Radio); Vue.config.productionTip = false; diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue index d0ec908..27cbfc3 100644 --- a/src/views/Home/Home.vue +++ b/src/views/Home/Home.vue @@ -88,35 +88,8 @@ export default { 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() - // } - // } - // }, // 研学码 handleYanxue () { this.$router.push({ name: 'YanxueCode' }) @@ -193,7 +166,7 @@ export default { if (res.data.code == 200) { let userInfo = res.data.data.userInfo this.userInfo = userInfo - sessionStorage.setItem('userInfo', JSON.stringify(userInfo)) + localStorage.setItem('userInfo', JSON.stringify(userInfo)) } this.showChildList = true diff --git a/src/views/Home/MyClassList.vue b/src/views/Home/MyClassList.vue index 0561819..902dacb 100644 --- a/src/views/Home/MyClassList.vue +++ b/src/views/Home/MyClassList.vue @@ -59,7 +59,7 @@ export default { } }, mounted () { - var userInfo = sessionStorage.getItem('userInfo'); + var userInfo = localStorage.getItem('userInfo'); if (userInfo) { this.userInfo = JSON.parse(userInfo); } @@ -79,7 +79,7 @@ export default { message: '请求中...', }); this.mgop({ - api: 'mgop.sz.hswsy.GetStudyBaseDetail', // 必须 + api: 'mgop.sz.hswsy.AddSign', // 必须 host: 'https://mapi.zjzwfw.gov.cn/', dataType: 'JSON', type: 'GET', diff --git a/src/views/Home/component/AddChildPopupGroup.vue b/src/views/Home/component/AddChildPopupGroup.vue index e17a9d6..96eef50 100644 --- a/src/views/Home/component/AddChildPopupGroup.vue +++ b/src/views/Home/component/AddChildPopupGroup.vue @@ -133,7 +133,7 @@ export default { }, mounted () { - let userInfo = sessionStorage.getItem('userInfo') + let userInfo = localStorage.getItem('userInfo') this.userInfo = JSON.parse(userInfo); this.initYearArr() this.GetSysAreaList() diff --git a/src/views/Service/CheckOrder.vue b/src/views/Service/CheckOrder.vue index 5e4ceab..62b8cfb 100644 --- a/src/views/Service/CheckOrder.vue +++ b/src/views/Service/CheckOrder.vue @@ -49,8 +49,6 @@ @@ -622,20 +601,6 @@ export default { display: flex; justify-content: space-between; align-items: center; - .wechat_code { - display: flex; - align-items: center; - height: 54px; - padding: 0 16px; - background: #00c800; - border-radius: 8px; - font-size: 28px; - color: #fff; - img { - width: 40px; - margin-right: 14px; - } - } } .detailsBox { color: #999999; @@ -921,9 +886,6 @@ export default { font-size: 36px; } .btnBox { - .wechat_code { - font-size: 36px; - } .btn { font-size: 36px; } diff --git a/src/views/Service/component/ServiceListFour.vue b/src/views/Service/component/ServiceListFour.vue index ba820cf..99e37d1 100644 --- a/src/views/Service/component/ServiceListFour.vue +++ b/src/views/Service/component/ServiceListFour.vue @@ -42,9 +42,12 @@ + + diff --git a/src/views/Service/component/ServiceListThird.vue b/src/views/Service/component/ServiceListThird.vue index 2271ade..ce65228 100644 --- a/src/views/Service/component/ServiceListThird.vue +++ b/src/views/Service/component/ServiceListThird.vue @@ -33,10 +33,12 @@ + diff --git a/src/views/Service/component/aboutDes.vue b/src/views/Service/component/aboutDes.vue new file mode 100644 index 0000000..073a039 --- /dev/null +++ b/src/views/Service/component/aboutDes.vue @@ -0,0 +1,36 @@ + + + + \ No newline at end of file diff --git a/src/views/Service/evaluateBase.vue b/src/views/Service/evaluateBase.vue index ed5ebbe..e0b6a42 100644 --- a/src/views/Service/evaluateBase.vue +++ b/src/views/Service/evaluateBase.vue @@ -63,7 +63,7 @@ export default { imgCut }, mounted () { - var userInfo = window.sessionStorage.getItem('userInfo'); + var userInfo = localStorage.getItem('userInfo'); if (userInfo) { this.userInfo = JSON.parse(userInfo); } diff --git a/src/views/Service/evaluateCourse.vue b/src/views/Service/evaluateCourse.vue index 0fd9efb..ecb0325 100644 --- a/src/views/Service/evaluateCourse.vue +++ b/src/views/Service/evaluateCourse.vue @@ -67,11 +67,11 @@ export default { imgCut }, mounted () { - var userInfo = window.sessionStorage.getItem('userInfo'); + var userInfo = localStorage.getItem('userInfo'); if (userInfo) { this.userInfo = JSON.parse(userInfo); } - var courseInfo = window.sessionStorage.getItem('courseInfo'); + var courseInfo = sessionStorage.getItem('courseInfo'); if (courseInfo) { this.courseInfo = JSON.parse(courseInfo); } diff --git a/src/views/Service/evaluatePubilc.vue b/src/views/Service/evaluatePubilc.vue index c024e74..73eeb39 100644 --- a/src/views/Service/evaluatePubilc.vue +++ b/src/views/Service/evaluatePubilc.vue @@ -67,11 +67,11 @@ export default { imgCut }, created () { - var userInfo = window.sessionStorage.getItem('userInfo'); + var userInfo = localStorage.getItem('userInfo'); if (userInfo) { this.userInfo = JSON.parse(userInfo); } - var courseInfo = window.sessionStorage.getItem('courseInfo'); + var courseInfo = sessionStorage.getItem('courseInfo'); if (courseInfo) { this.courseInfo = JSON.parse(courseInfo); } -- libgit2 0.21.0