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 @@ -<template> - <div class="group_code_popup_mask"> - <img class="share_des" v-if="showShareDes" src="@/assets/home/share.png" alt=""> - <div class="group_code_popup"> - <van-icon class="close" name="cross" @click="$emit('closeGroupCode')" /> - <img class="bg" src="@/assets/home/bg3.png" alt=""> - <img class="success" src="@/assets/home/success.png" alt=""> - <p class="success_text">支付成功</p> - <!-- <p class="des"> - <template v-if="count"> - 还差<span>{{count}}</span>人,分享链接邀请好友完成拼团吧 - </template> - <template v-else> - 分享链接邀请好友来拼团吧 - </template> - </p> --> - <img class="code_img" v-if="chatGroupUrl" :src="chatGroupUrl" alt=""> - <p class="code_des" v-if="chatGroupUrl">加入拼团群实时关注拼团情况</p> - <div class="group_btn_box"> - <div @click="showShareDes=true"> - <img class="wechat2" src="@/assets/home/wechat2.png" alt=""> - <p>分享给微信好友</p> - </div> - <div @click="showShareDes=true"> - <img class="wechat3" src="@/assets/home/wechat3.png" alt=""> - <p>分享至朋友圈</p> - </div> - </div> - </div> - </div> -</template> -<script> -export default { - props: ['chatGroupUrl'], - data () { - return { - count: '1', - showShareDes: false,//显示分享文案 - } - }, - mounted () { - }, - methods: { - - } -} -</script> -<style lang="scss" scoped> -.group_code_popup_mask { - width: 100%; - height: 100vh; - position: fixed; - top: 0; - left: 0; - background: rgba(0, 0, 0, 0.7); - z-index: 99; - .share_des { - position: absolute; - top: 50px; - right: 100px; - width: 516px; - } -} -.group_code_popup { - position: absolute; - top: 50%; - left: 50%; - width: 624px; - background: #fff; - box-sizing: border-box; - border-radius: 20px; - overflow: hidden; - transform: translate(-50%, -50%); - .close { - position: absolute; - top: 0; - right: 0; - font-size: 40px; - padding: 30px; - } - .bg { - width: 100%; - } - .success { - position: absolute; - top: 84px; - left: 50%; - width: 112px; - transform: translateX(-50%); - } - .success_text { - position: absolute; - top: 180px; - width: 100%; - text-align: center; - font-size: 32px; - font-weight: bold; - } - .des { - position: absolute; - top: 234px; - width: 100%; - text-align: center; - color: #999; - font-size: 30px; - font-weight: bold; - } - .code_img { - display: block; - width: 372px; - margin: 10px auto; - margin-top: -40px; - } - .code_des { - width: 100%; - font-size: 28px; - font-weight: bold; - text-align: center; - } - .group_btn_box { - margin-top: 26px; - border: 1px solid #eff1f4; - div { - width: 50%; - height: 186px; - display: inline-flex; - align-content: center; - justify-content: center; - flex-wrap: wrap; - img { - display: block; - width: 56px; - } - .wechat2 { - width: 64px; - height: 54px; - } - .wechat3 { - width: 56px; - height: 58px; - } - p { - width: 100%; - font-size: 28px; - color: #999; - text-align: center; - } - } - } -} -</style> \ 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 @@ </div> </template> <script> -import Axios from 'axios'; -import wx from 'weixin-js-sdk'; export default { name: 'ServiceCheckOrder', data () { @@ -70,11 +68,10 @@ export default { } }, mounted () { - let userInfo = sessionStorage.getItem('userInfo'); + let userInfo = localStorage.getItem('userInfo'); if (userInfo) { this.userInfo = JSON.parse(userInfo); } - // 选择的出行人 let selectedContactArr = sessionStorage.getItem('selectedContactArr'); if (selectedContactArr) { @@ -106,6 +103,11 @@ export default { if (showCourseData) { this.showCourseData = JSON.parse(showCourseData) } + //判断是否为支付会跳,查询订单状态 + let outTradeNo = localStorage.getItem('outTradeNo') + if (outTradeNo) { + this.getOrderStatus(outTradeNo) + } }, computed: { paymoney () { @@ -164,7 +166,6 @@ export default { "price": this.selectCombo.actualPrice * 1000 * this.count / 1000,//商品减掉优惠券之前的价格 "travelNum": this.selectedContact,//出行人编号 "couponId": this.useCard?.id || 0, - "appId": 'wx1305e88d2bc74073' }, onSuccess: res => { if (res.data.data) { @@ -194,39 +195,39 @@ export default { const Jupiter = sUserAgent.indexOf("Jupiter") > -1 if (Jupiter) { alert('App') - console.log('App') - this.mgop({ - api: 'mgop.sz.hswsy.appPay', // 必须 - host: 'https://mapi.zjzwfw.gov.cn/', - dataType: 'JSON', - type: 'POST', - appKey: 'fuxgnukl+2001895516+edccpx', // 必须 - headers: { - // 'isTestUrl': '1' - }, - data: { - "appid": "2021002189681626", - "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://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy&goto=", - "subject": "string", - "totalFee": "0.01", - }, - onSuccess: res => { - console.log(res) - this.BridgePay(res.data.message) - }, - onFail: err => { - console.log('err', err) - } - }); + // console.log('App') + // this.mgop({ + // api: 'mgop.sz.hswsy.appPay', // 必须 + // host: 'https://mapi.zjzwfw.gov.cn/', + // dataType: 'JSON', + // type: 'POST', + // appKey: 'fuxgnukl+2001895516+edccpx', // 必须 + // headers: { + // // 'isTestUrl': '1' + // }, + // data: { + // "appid": "2021002189681626", + // "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": location.href, + // "subject": "string", + // "totalFee": "0.01", + // }, + // onSuccess: res => { + // console.log(res) + // this.BridgePay(res.data.message) + // }, + // onFail: err => { + // console.log('err', err) + // } + // }); } else { - alert('H5') + // alert('H5') console.log('h5') this.mgop({ api: 'mgop.sz.hswsy.mobilePay', // 必须 @@ -239,19 +240,20 @@ export default { }, data: { "appid": "2021002189681626", - "attach": "string1", - "body": "string23", - "notify_url": "http://47.110.50.251:9091/api/alipay/pay", - "outTradeNo": new Date().getTime(), + "attach": this.showCourseData.course_name + '_' + this.date, + "body": this.showCourseData.course_name + '_' + this.date, + "notify_url": "https://yanxue.myjxt.com/api/Manage/AlipayBackInfo", + "outTradeNo": data.trade_no, "payType": 0, "payWay": 0, - "productId": "11", - "quit_url": "https://www.baidu.com", - "subject": "string", + "productId": this.showCourseData.id, //商品id + "quit_url": location.href, + "subject": "研学产品", "totalFee": "0.01", }, onSuccess: res => { console.log(res) + localStorage.setItem('outTradeNo', data.trade_no) // res.data.data默认是我们拿到的form代码 const div = document.createElement('div') div.innerHTML = res.data.message @@ -273,6 +275,37 @@ export default { "inSandBox": false } }; + }, + //判断是否为支付会跳,查询订单状态 + getOrderStatus (outTradeNo) { + console.log('getOrderStatus') + this.$toast.loading() + this.mgop({ + api: 'mgop.sz.hswsy.IsPayByTradNo', // 必须 + host: 'https://mapi.zjzwfw.gov.cn/', + dataType: 'JSON', + type: 'POST', + appKey: 'fuxgnukl+2001895516+edccpx', // 必须 + headers: { + // 'isTestUrl': '1' + }, + data: { + "tradNo": outTradeNo, + }, + onSuccess: res => { + console.log(res) + this.$toast.clear() + localStorage.removeItem('outTradeNo') + // 如果已支付就跳转 + if (res.data.data) { + sessionStorage.removeItem('selectedContactArr') + this.$router.push({ name: 'ServiceOrderXST', query: { active: 1, showChatGroupUrl: 1 } }) + } + }, + onFail: err => { + console.log('err', err) + } + }); } } } diff --git a/src/views/Service/EditContact.vue b/src/views/Service/EditContact.vue index 51d0baf..5f3e499 100644 --- a/src/views/Service/EditContact.vue +++ b/src/views/Service/EditContact.vue @@ -74,7 +74,7 @@ export default { this.$toast('请输入正确的身份证号') return; } - let userInfo = sessionStorage.getItem('userInfo') + let userInfo = localStorage.getItem('userInfo') userInfo = userInfo ? JSON.parse(userInfo) : userInfo; let postData = { userNum: this.travelerNum, diff --git a/src/views/Service/ServiceBaseKQ.vue b/src/views/Service/ServiceBaseKQ.vue index 99f9a3f..2743e83 100644 --- a/src/views/Service/ServiceBaseKQ.vue +++ b/src/views/Service/ServiceBaseKQ.vue @@ -491,6 +491,7 @@ export default { right: 20px; z-index: 99; } + } ::v-deep .van-search__content { diff --git a/src/views/Service/ServiceKQ.vue b/src/views/Service/ServiceKQ.vue index a2cd0d1..3aa90b5 100644 --- a/src/views/Service/ServiceKQ.vue +++ b/src/views/Service/ServiceKQ.vue @@ -23,27 +23,28 @@ export default { }, methods: { checkAuth () { - let centerNo = this.common.getUrlParam('center_no') || sessionStorage.getItem('centerNo'); + let centerNo = sessionStorage.getItem('centerNo'); + let ticket = this.common.getUrlParam('ticket'); if (centerNo) { this.centerNo = centerNo sessionStorage.setItem('centerNo', centerNo); this.getUserInfo() + } else if (ticket) { + this.getCenterByTicket(ticket) } 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('浙里办') + // 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'); - this.getUserInfo() } else if (miniprogram) { - alert('支付宝') + // alert('支付宝') window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=hswsy`; } else { + alert('非浙里办渠道访问,显示测试用户数据') console.log('非浙里办渠道访问,显示测试用户数据') this.centerNo = '20210930160466993660' sessionStorage.setItem('centerNo', '20210930160466993660'); @@ -51,6 +52,57 @@ export default { } } }, + // 通过ticket获取centerNo + getCenterByTicket (ticket) { + this.mgop({ + api: 'mgop.sz.hswsy.getCenterNo', // 必须 + host: 'https://mapi.zjzwfw.gov.cn/', + dataType: 'JSON', + type: 'POST', + appKey: 'fuxgnukl+2001895516+edccpx', // 必须 + headers: { + // 'isTestUrl': '1' + }, + data: { + "ticket": ticket, + }, + onSuccess: res => { + console.log('通过ticket获取centerNo成功', res) + if (res.data.code == 200) { + this.centerNo = res.data.message + sessionStorage.setItem('centerNo', res.data.message); + } else { + this.reLoad() + } + }, + onFail: err => { + console.log('通过ticket获取centerNo成功失败', err) + this.reLoad() + } + }) + }, + reLoad () { + console.log('reload') + ZWJSBridge.confirm({ + "title": "警告", + "buttonLabels": [ + "重新载入" + ], + "message": "用户身份验证失败,请重新加载" + }).then(res => { + 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=hswsy`; + } + }) + }, // 获取用户信息 getUserInfo: function () { this.mgop({ @@ -68,7 +120,7 @@ export default { onSuccess: res => { console.log('getUserInfo', res) if (res.data.code == 200) { - sessionStorage.setItem('userInfo', JSON.stringify(res.data.data.userInfo)) + localStorage.setItem('userInfo', JSON.stringify(res.data.data.userInfo)) } }, onFail: err => { diff --git a/src/views/Service/ServiceOrderXST.vue b/src/views/Service/ServiceOrderXST.vue index fb6a7fe..afc411c 100644 --- a/src/views/Service/ServiceOrderXST.vue +++ b/src/views/Service/ServiceOrderXST.vue @@ -1,5 +1,11 @@ <template> <div class="myOrders"> + <van-nav-bar + title="" + left-text="返回首页" + left-arrow + @click-left="back" +/> <van-tabs v-model="active" :before-change="beforeTabChange"> <van-tab title="待付款"> <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoadpay()"> @@ -46,10 +52,7 @@ <van-icon name="clock-o" /><span class="grey"> 活动日期</span><span> {{item.startDate}} - {{ item.endDate}}</span> </div> <div class="btnBox"> - <div class="wechat_code" @click="openGroupCodePopup(index)" style="margin-right:15px"> - <img src="@/assets/home/wechat.png" alt=""> - <span>加入拼团群</span> - </div> + <div></div> <div> <van-button class="btn" type="warning" plain size="small" @click="showPintuanAbout = true" style="margin-right:15px">退款说明</van-button> <!-- <van-button type="info" size="small" @click="makeCode(item.id)">核销码</van-button> --> @@ -189,12 +192,10 @@ <van-popup v-model="showPreview" round get-container="body"> <img class="preview_img" :src="previewUrl" alt=""> </van-popup> - <GroupCodePopup v-if="showGroupCode" :chatGroupUrl="chatGroupUrl" @closeGroupCode="showGroupCode=false"></GroupCodePopup> </div> </template> <script> -import GroupCodePopup from '@/component/GroupCodePopup' import QRCode from 'qrcodejs2' // 引入qrcode import html2canvas from "html2canvas" // let Base64 = require('js-base64').Base64; @@ -218,9 +219,6 @@ export default { imgUrl: '', previewUrl: '',//图片预览 showPreview: false, - showGroupCode: false,//群码 - chatGroupUrl: '',//群码图片 - showChatGroupUrlTag: false } }, computed: { @@ -229,7 +227,7 @@ export default { } }, mounted () { - let userInfo = sessionStorage.getItem('userInfo'); + let userInfo = localStorage.getItem('userInfo'); if (userInfo) { this.userInfo = JSON.parse(userInfo); } @@ -237,12 +235,11 @@ export default { if (this.$route.query.active || this.$route.query.active == 0) { this.active = this.$route.query.active } - // 进入页面直接显示第一个订单的群码 - if (this.$route.query.showChatGroupUrl == 1) { - this.showChatGroupUrlTag = true - } }, methods: { + back(){ + this.$router.push({ name: 'ServiceKQ'}) + }, beforeTabChange (item) { console.log(item) this.paylist = []; @@ -316,10 +313,6 @@ export default { this.movelist = res.data.data.list; this.loading = false; this.finished = true; - if (this.showChatGroupUrlTag) { - this.showChatGroupUrlTag = false; - this.openGroupCodePopup(0) - } } else { this.$toast.fail(res.data.message); } @@ -352,10 +345,6 @@ export default { this.datalist = res.data.data.list; this.loading = false; this.finished = true; - if (this.showChatGroupUrlTag) { - this.showChatGroupUrlTag = false; - this.openGroupCodePopup(0) - } } else { this.$toast.fail(res.data.message); } @@ -388,10 +377,6 @@ export default { this.list = res.data.data.list; this.loading = false; this.finished = true; - if (this.showChatGroupUrlTag) { - this.showChatGroupUrlTag = false; - this.openGroupCodePopup(0) - } } else { this.$toast.fail(res.data.message); } @@ -429,11 +414,6 @@ export default { this.makeCode(item.id) }, 1000); }, - // 打开群码弹窗 - openGroupCodePopup (index) { - this.chatGroupUrl = this.movelist[index]?.chatGroupUrl - this.showGroupCode = true; - }, //跳转 toEdit (item) { this.$router.push({ path: 'abroad_detail', query: { courseId: item.courseId } }) @@ -455,7 +435,6 @@ export default { } }, components: { - GroupCodePopup } } </script> @@ -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 @@ </div> </div> </template> + <about-des></about-des> + </div> </template> <script> +import AboutDes from './aboutDes.vue' export default { props: { list: { @@ -64,8 +67,11 @@ export default { }, methods: { handleUniDetail (item) { - this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id} }) + this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.id } }) }, + }, + components:{ + AboutDes } } </script> 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 @@ </div> </div> </template> + <about-des></about-des> </div> </div> </template> <script> +import AboutDes from './aboutDes.vue' export default { props: { list: { @@ -75,6 +77,9 @@ export default { orderScroll () { // console.log(this.$refs.viewBox.scrollTop) } + }, + components:{ + AboutDes } } </script> 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 @@ +<template> + <p class="bottom_about_des">本服务由浙江政务服务网、柯桥区教育体育局、浙江行之教育信息咨询有限公司提供<br>服务咨询热线:<span @click="call">400-826-2468</span></p> +</template> +<script> +export default { + methods: { + call () { + ZWJSBridge.phoneCall({ + "corpId": "400-826-2468" + }).then(res => { + console.log(res) + }).catch(err => { + console.log(err) + }) + } + } +} +</script> +<style lang="scss"> +.bottom_about_des { + font-size: 26px; + text-align: center; + padding: 40px; + + span{ + color: rgb(41, 122, 189); + } +} +</style> +<style lang="scss"> +.elder { + .bottom_about_des { + font-size: 32px; + } +} +</style> \ 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