diff --git a/README.md b/README.md index c7f91dc..aeb8b28 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# 升学汇个人中心 h5 vue +# 柯桥周周营浙里办应用 +- 功能与sxhPersonalCenter中的柯桥相关功能相同，定位、支付，授权等功能逻辑会有所不同等 +- 删除了大部分无关代码，如（微信授权、微信分享、生涯服务功能文件、绍兴研学、学事通页面） \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 044d080..533944f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1805,6 +1805,44 @@ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "debug": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", @@ -1814,6 +1852,13 @@ "ms": "2.1.2" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "json5": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", @@ -1871,6 +1916,52 @@ "requires": { "minipass": "^3.1.1" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz", + "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dev": true, + "optional": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } } } }, @@ -11388,75 +11479,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz", - "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz", diff --git a/src/App.vue b/src/App.vue index 3e9ae63..dee4133 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,87 +2,17 @@
- + - +
diff --git a/src/component/CollegeSeasonPopup.vue b/src/component/CollegeSeasonPopup.vue deleted file mode 100644 index 6943ee3..0000000 --- a/src/component/CollegeSeasonPopup.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - - diff --git a/src/component/LecturePopup.vue b/src/component/LecturePopup.vue deleted file mode 100644 index 165f242..0000000 --- a/src/component/LecturePopup.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - \ No newline at end of file diff --git a/src/component/PrefectBox.vue b/src/component/PrefectBox.vue deleted file mode 100644 index fcc6456..0000000 --- a/src/component/PrefectBox.vue +++ /dev/null @@ -1,298 +0,0 @@ - - - - diff --git a/src/https/api.js b/src/https/api.js index 81cc435..3f09f50 100644 --- a/src/https/api.js +++ b/src/https/api.js @@ -4,69 +4,8 @@ import { } from '../https/index'; const obj = { - getWxConfig: p => get('/wx/config/getWxConfig', p),//获取微信配置 - - getMsgByCode: p => get('/personal/getMsgByCode', p),//通过code获取openid和token - getUserInfo: () => post('/personal/getUserInfo'),//获取用户信息 - - getMsg: p => post('/sxh/wx/getMsg', p),//绑定手机号用到的验证码 - checkPhone: p => post('/personal/checkPhone', p),//绑定手机号 GetSysAreaList: p => get('/h5/MyVoluntary/GetSysAreaList', p),//获取地区列表 - GetHighSchoolList: p => get('/h5/MyVoluntary/GetHighSchoolList', p),//获取学校列表 - updateUserInfo: p => post('/personal/updateUserInfo', p, 'json'),//完善信息 - activeInviteCode: p => get('/sxh/order/activeInviteCode', p),//邀请码激活 - exchangeCard: p => get('/sxh/order/exchangeCard', p),//卡密兑换 - activeVipPhone: p => post('/sxh/order/activeVipPhone', p),//青春卡激活 - getChannelMsg: p => post('/sxh/channel/getMsg', p),//青春卡激活用到的验证码 - initSubscribeUser: p => post('/sys/wxUser/checkCode', p, 'json'),//高考季h5填写信息 - // initSubscribeUser:p=>post('/sys/wxUser/initSubscribeUser',p,'json'),//高考季h5填写信息 getMsg: p => post('/sxh/wx/getMsg', p),//绑定手机号用到的验证码 - getSxhOrderList: p => get('/sxh/order/list', p),//生涯vip订单 - - - getIndexExpertList: p => get('/wx/live/getIndexExpertList', p),//首页获取专家直播 - getAllExpertList: p => post('/wx/live/getAllExpertList', p, 'json'),//分页获取更多专家直播 - getSchoolList: p => post('/wx/live/getSchoolList', p, 'json'),//分页获取院校直播 - GetBannerList: p => post('/admin/Voluntary/GetBannerList', p, 'json'),//轮播 - subscribe: p => post('/wx/live/subscribe', p, 'json'),//预约 - getAreaList: p => post('/admin/Voluntary/GetAreaList', p, 'json'),//地区列表 - getUniParam: p => get('/common/getUniversityParam', p),//院校特性办学性质等 - - incrByType: p => get('/count/incrByType', p),//计数器 - - - // 数据宝典 - getBannerList2: p => get('/mobile/index/getBanner/' + p),//顶部轮播 - getBannerDetail: p => get('/mobile/index/getBannerContent/' + p),//顶部轮播详情页 - getAllList: p => post('/h5/consult/getAllList', p, 'json'),//底部栏目资讯 - getConsultation: p => post('/h5/consult/getConsultation', p, 'json'),//栏目资讯列表 - getConsultationDetail: p => get('/h5/consult/getConsultationDetail', p),//栏目资讯详情页 - getUniList: p => post('/University/getUniversityList', p, 'json'),//院校大全 列表 - getUniDetail: p => get('/University/getUniversityDetail', p),//院校详情 - getUniMajor: p => get('/mobile/data/getUniversityMajor/' + p),//院校详情页专业列表 - getRecruitDetail: p => get('/University/GetRecruitRulesDetail', p),//章程详情 - getEnrollmentPlan: p => post('/mobile/data/getEnrollmentPlan', p, 'json'),//获取该院校招生计划 - getMajorPointLine: p => post('/mobile/data/getMajorPointLine', p, 'json'),//获取该院校专业分数线 - getPointLine: p => get('/mobile/data/getPointLine/' + p),//获取该院校历年分数线 - getMajorTree: p => get('/mobile/data/getMajorTree', p, 'json'),//获取专业列表 - getMajorDetail: p => get('/mobile/data/getMajorDetail/' + p),//获取专业详情 - getProfessionalEncyclopeList: p => get('/h5/match/getProfessionalEncyclopeList', p, 'json'),//获取职业列表 - getProfessionalEncyclope: p => get('/h5/match/getProfessionalEncyclope', p, 'json'),//获取职业详情 - getJobByName: p => get('/University/getJobByName', p, 'json'),//获取职业详情2 - getSchoolByMajor: p => post('/mobile/data/getSchoolByMajor', p, 'json'),//获取当前专业开设院校 - getHistoryData: p => post('/mobile/data/getHistoryData', p, 'json'),//获取历史数据 - getHistoryDataYear: p => get('/mobile/data/getHistoryDataYear/' + p),//获取强基 三位年份数据 1-强基 2 名校三位 3 省内三位 4 提前 5艺术 6 体育 7平行 8高职 - getAdvanceHistoryData: p => post('/mobile/data/getAdvanceHistoryData', p, 'json'),//获取提前批大数据 - getArtHistoryData: p => post('/mobile/data/getArtHistoryData', p, 'json'),//获取艺术大数据 - getPhysicalHistoryData: p => post('/mobile/data/getPhysicalHistoryData', p, 'json'),//获取体育大数据 - getComprehensiveHistoryData: p => post('/mobile/data/getComprehensiveHistoryData', p, 'json'),//获取平行大数据 - getHighVocationHistoryData: p => post('/mobile/data/getHighVocationHistoryData', p, 'json'),//获取高职大数据 - getCalendar: p => post('/mobile/data/getCalendar', p),//获取日历，传对应月份 - getResult: p => post('/mobile/data/getResult', p),//获取成绩 - getRecommendUniverse: p => post('/mobile/data/getRecommendUniverse', p),//获取推荐院校 - - getSendFlag: () => post('/personal/getSendFlag'),//获取优惠券弹框 - } export default obj; diff --git a/src/router/index.js b/src/router/index.js index 247696a..15ee02a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -38,8 +38,14 @@ VueRouter.prototype.push = function push (to) { VueRouter.prototype.replace = function replace (location) { return routerReplace.call(this, location).catch(error => error); }; -const routes = [ { +const routes = [{ path: '/', + name: 'ServiceKQ', + component: ServiceKQ, + meta: { + } +}, { + path: '/HomeKQ', name: 'HomeKQ', component: HomeKQ, meta: { @@ -55,15 +61,6 @@ const routes = [ { } }, -//柯桥研学单独服务活动板块 -{ - path: '/service_kq', - name: 'ServiceKQ', - component: ServiceKQ, - meta: { - // title: '服务活动' - } -}, { path: '/abroad_detail', name: 'ServiceAbroadDetail', @@ -130,14 +127,6 @@ const routes = [ { } }, { - path: '/protocol', - name: 'protocol', - component: protocol, - meta: { - title: '查看协议' - } -}, -{ path: '/service_orderXST', name: 'ServiceOrderXST', component: ServiceOrderXST, diff --git a/src/views/PublicHome/HomeKQ.vue b/src/views/PublicHome/HomeKQ.vue index c264bde..c00a349 100644 --- a/src/views/PublicHome/HomeKQ.vue +++ b/src/views/PublicHome/HomeKQ.vue @@ -76,20 +76,22 @@ export default { this.headImgUrl = sessionStorage.getItem('headImgUrl') this.nicknameUser = sessionStorage.getItem('nicknameUser') - if (process.env.NODE_ENV === "production" && this.common.isWeiXin()) { - let openid = sessionStorage.getItem('openIdKQ'); - if (!openid) { - this.$router.push({ name: 'Authorize' + this.publicName }) - } else { - this.nicknameUser = sessionStorage.getItem('nicknameUser') - this.headImgUrl = sessionStorage.getItem('headImgUrl') - this.getUserInfoXST() - } - } else { - sessionStorage.setItem('unionId', 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU') - this.getUserInfoXST() + const sUserAgent = window.navigator.userAgent.toLowerCase() + alert(sUserAgent) + console.log(sUserAgent) + 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`; + } + if (miniprogram) { + alert('支付宝') + // window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`; } + sessionStorage.setItem('unionId', 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU') + this.getUserInfoXST() }, methods: { // 研学码 @@ -132,31 +134,6 @@ export default { this.userInfo = res.data.data; this.centerNo = res.data.data.centerNo sessionStorage.setItem('userInfo', JSON.stringify(res.data.data)) - // 设置分享 - this.$emit('getWxConfig', { - title: '趣研学啦', // 分享标题 - desc: '现在世界是孩子的书本，一起学才更好玩！', // 分享描述 - link: `https://payment.myjxt.com/center/#/HomeKQ`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致 - imgUrl: 'https://payment.myjxt.com/share_qxy.png', // 分享图标 - }) - } - }) - }, - //获取优惠券 - getSendFlag () { - this.$toast.loading({ - message: '加载中...', - duration: 0, - forbidClick: true - }) - this.http.getSendFlag().then((res) => { - this.$toast.clear() - if (res.success) { - if (res.data == 1) { - this.isShow = true - } - } else { - this.$toast.fail(res.message) } }) }, diff --git a/src/views/PublicService/LoginPublic.vue b/src/views/PublicService/LoginPublic.vue index 59be6a2..eec1456 100644 --- a/src/views/PublicService/LoginPublic.vue +++ b/src/views/PublicService/LoginPublic.vue @@ -16,13 +16,9 @@ - - - diff --git a/src/views/PublicService/ServiceBaseKQ.vue b/src/views/PublicService/ServiceBaseKQ.vue index 5e94154..89c4eda 100644 --- a/src/views/PublicService/ServiceBaseKQ.vue +++ b/src/views/PublicService/ServiceBaseKQ.vue @@ -93,9 +93,6 @@ export default { // 设置tabbar状态 this.tabName = this.$route.query.showTab || 'KQ' document.title = this.$route.query.showTab == 'ZZY' ? '周周营': '柯桥研学' - this.$nextTick(() => { - this.$emit('setWxShare', this.tabName) - }) } } }, diff --git a/src/views/PublicService/ServiceKQ.vue b/src/views/PublicService/ServiceKQ.vue index 0242296..8f68bfb 100644 --- a/src/views/PublicService/ServiceKQ.vue +++ b/src/views/PublicService/ServiceKQ.vue @@ -1,5 +1,5 @@ - diff --git a/src/views/Service/AbroadDetail.vue b/src/views/Service/AbroadDetail.vue index 90136de..d664a6b 100644 --- a/src/views/Service/AbroadDetail.vue +++ b/src/views/Service/AbroadDetail.vue @@ -386,13 +386,6 @@ export default { this.getWeekCard(i); } }); - // 设置分享 - this.$emit('getWxConfig', { - title: detailData.course_name, // 分享标题 - desc: '读万卷书，行万里路，我们一起“趣研学啦”', // 分享描述 - link: `https://payment.myjxt.com/center/#/abroad_detail?courseId=${this.courseId}&publicName=${this.publicName}`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致 - imgUrl: 'https://payment.myjxt.com/share_qxy.png', // 分享图标 - }) } else { let message = res.data.message; if (!message) { -- libgit2 0.21.0