feat: 接口对接

夏洋涛
1 parent f02585ec
Showing 18 changed files with 392 additions and 758 deletions Show diff stats
src/https/api.js
src/https/index.js
src/main.js
src/router/index.js
src/views/Home/MyClassList.vue
src/views/Home/YanxueInfo.vue
src/views/Home/component/AddChildPopupGroup.vue
src/views/Service/AbroadDetail.vue
src/views/Service/AbroadEvaluate.vue
src/views/Service/CardBoxPublic.vue
src/views/Service/CardCourseList.vue
src/views/Service/CardSelect.vue
src/views/Service/CheckOrder.vue
src/views/Service/DatePackage.vue
src/views/Service/EditContact.vue
src/views/Service/LoginPublic.vue
src/views/Service/ServiceBaseKQ.vue
src/views/Service/evaluatePubilc.vue
@@ -1,11 +0,0 @@
-import {
-	get,
-	post
-} from '../https/index';
-
-const obj = {
-	GetSysAreaList: p => get('/h5/MyVoluntary/GetSysAreaList', p),//获取地区列表
-	getMsg: p => post('/sxh/wx/getMsg', p),//绑定手机号用到的验证码
-}
-
-export default obj;
@@ -1,100 +0,0 @@
-import Axios from 'axios';
-import QS from 'qs';
-
-let httpUrl = ''; //正式
-if (process.env.NODE_ENV === "development") {
-	// httpUrl = 'http://192.168.1.95:9901';
-	httpUrl = 'https://proxy.shunzhi.net';
-} else {
-	httpUrl = 'https://proxy.shunzhi.net';
-}
-
-var instance = Axios.create({
-	timeout: 60000
-});
-// instance.defaults.baseURL = 'https://proxy.shunzhi.net:51314/'; //正式
-instance.defaults.baseURL = httpUrl; //测试
-instance.defaults.timeout = 60000;
-instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-// 请求拦截器
-// instance.interceptors.request.use(
-// 	config => {
-// 		// 每次发送请求之前判断vuex中是否存在token        
-// 		// 如果存在，则统一在http请求的header都加上token，这样后台根据token判断你的登录情况
-// 		// 即使本地存在token，也有可能token是过期的，所以在响应拦截器中要对返回状态进行判断 
-// 		console.log(config)
-// 		// const token = common.getCookie('SXH_token');
-// 		// token && (config.headers.Authorization = token);
-// 		return config;
-// 	},
-// 	error => {
-// 		return Promise.error(error);
-// 	})
-// // 响应拦截器
-
-instance.interceptors.response.use(
-	response => {
-		console.log(response.data.message)
-		if (response.data.message === '登录已过期') {
-			let prevPage = sessionStorage.getItem('prePage');
-			if (prevPage == 'center') {//个人中心授权过期
-				location.href = httpUrl + '/wx/index/toPersonalNoLogin';
-			} else if (prevPage == 'college') {//高考季授权过期（目前无token，暂时无用）
-				location.href = httpUrl + '/wx/index/subscribe';
-			} else if (prevPage == 'lecture') {//公益讲座授权过期
-				location.href = httpUrl + '/wx/index/live';
-			}else{
-				location.href = httpUrl + '/wx/index/auth';
-			}
-			sessionStorage.removeItem('openId')
-		}
-		// 如果返回的状态码为200，说明接口请求成功，可以正常拿到数据
-		// 否则的话抛出错误
-		if (response.status === 200) {
-			return Promise.resolve(response);
-		} else {
-			return Promise.reject(response);
-		}
-	},
-	// 服务器状态码不是2开头的的情况
-	// 这里可以跟你们的后台开发人员协商好统一的错误状态码    
-	// 然后根据返回的状态码进行一些操作，例如登录过期提示，错误提示等等
-	// 下面列举几个常见的操作，其他需求可自行扩展
-	error => {
-		return Promise.reject(error.response);
-	}
-);
-
-export function get (url, params) {
-	return new Promise((resolve, reject) => {
-		let tokenValue = sessionStorage.getItem('tokenValue')
-		instance.get(url, {
-			params: params,
-			headers: { 'sztoken': tokenValue }
-		}).then(res => {
-			resolve(res.data);
-		}).catch(err => {
-			reject(err.data)
-		})
-	});
-}
-
-export function post (url, params, type) {
-	var ndata = type == 'json' ? JSON.stringify(params) : QS.stringify(params);
-	if (type == 'json') {
-		instance.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8';
-	} else {
-		instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-	}
-	return new Promise((resolve, reject) => {
-		let tokenValue = sessionStorage.getItem('tokenValue')
-		instance.post(url, ndata, {
-			headers: { 'sztoken': tokenValue }
-		}).then(res => {
-			resolve(res.data);
-		})
-			.catch(err => {
-				reject(err.data)
-			})
-	});
-}
@@ -3,9 +3,6 @@ import { Popup, Toast, Picker, Tag, Tab, Tabs, Area, Search, Swipe, SwipeItem, C
 import App from './App.vue'
 import router from './router'
 import store from './store'
-import http from './https/api'
-Vue.prototype.proxyUrl = 'https://proxy.shunzhi.net';
-Vue.prototype.yanxueUrl = 'https://yanxue.myjxt.com';
 import Moment from 'moment'
 Vue.prototype.Moment = Moment;
@@ -19,7 +16,6 @@ Vue.prototype.mgop = mgop;
 import common from './common/index'
 Vue.prototype.common = common;
-Vue.prototype.http = http;
 Vue
     .use(Popup)
     .use(Picker)
@@ -13,8 +13,6 @@ import evaluateBase from &#39;@/views/Service/evaluateBase.vue&#39; //基地评价
 import evaluateDetail from '@/views/Service/evaluateDetail.vue' //评价详情
 import ServiceKQ from '@/views/Service/ServiceKQ.vue' //柯桥研学
-import LoginPublic from '@/views/Service/LoginPublic.vue'
-import ServiceCardBoxPublic from '@/views/Service/CardBoxPublic.vue'
 import CardBoxXST from '@/views/Service/CardBoxXST.vue'
 import CardCourseList from '@/views/Service/CardCourseList.vue' //优惠券对应商品列表
@@ -50,14 +48,6 @@ const routes = [{
             title: '个人中心(柯桥研学)'
         }
     },
-    {
-        path: '/login_public',
-        name: 'LoginPublic',
-        component: LoginPublic,
-        meta: {
-            title: '绑定手机号'
-        }
-    },
     {
         path: '/abroad_detail',
@@ -93,14 +83,6 @@ const routes = [{
         }
     },
     {
-        path: '/card_box_public',
-        name: 'ServiceCardBoxPublic',
-        component: ServiceCardBoxPublic,
-        meta: {
-            title: '我的优惠券'
-        }
-    },
-    {
         path: '/CardBoxXST',
         name: 'CardBoxXST',
         component: CardBoxXST,
@@ -78,15 +78,30 @@ export default {
       this.$toast.loading({
         message: '请求中...',
       });
-      this.yxAxios.get(`${this.yanxueUrl}/api/BaseManage/AddSign?userId=${this.selectedContact.travelerNum}&baseId=${this.baseId}`).then((res) => {
-        this.$toast.success('打卡签到成功');
-        console.log(res.data)
-        // alert('打卡签到成功:',JSON.stringify(res))
-        setTimeout(() => {
-          let publicName = sessionStorage.getItem('publicName');
-          this.$router.push({ name: 'Home' + publicName })
-        }, 1000)
-      })
+      this.mgop({
+        api: 'mgop.sz.hswsy.GetStudyBaseDetail', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "userId": this.selectedContact.travelerNum,
+          "baseId": this.baseId
+        },
+        onSuccess: res => {
+          this.$toast.success('打卡签到成功');
+          setTimeout(() => {
+            let publicName = sessionStorage.getItem('publicName');
+            this.$router.push({ name: 'Home' + publicName })
+          }, 1000)
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     // 获取基地信息
     GetStudyBaseDetail (baseId) {
@@ -31,18 +31,34 @@ export default {
   methods: {
     getbind () {
       if (this.userNum == '' || this.codeNum == '') {
-        return this.$toast('请先填写完整信息！');
+        this.$toast('请先填写完整信息！');
+        return ;
       }
-      this.yxAxios.get(this.proxyUrl + '/prod/user/info/bingStudyCode?userNum=' + this.userNum + '&code=' + this.codeNum)
-        .then((res) => {
-          console.log('接口返回', res.data)
-          if (res.data.code == '200') {
+      this.mgop({
+        api: 'mgop.sz.hswsy.bingStudyCode', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "userNum": this.userNum,
+          "code": this.codeNum,
+        },
+        onSuccess: res => {
+           if (res.data.code == '200') {
             this.$toast('操作成功');
             this.$router.push({ name: 'YanxueCode' })
           } else {
             this.$toast('操作失败:' + res.data.message);
           }
-        })
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     //扫一扫
     saoYiSao () {
@@ -159,10 +159,20 @@ export default {
         duration: 0,
         forbidClick: true
       })
-      this.http.getMsg({
-        phone: this.phone
-      }).then((res) => {
-        this.$toast.clear()
+      this.mgop({
+        api: 'mgop.sz.hswsy.getMsg', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'POST',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "phone": this.phone
+        },
+        onSuccess: res => {
+          this.$toast.clear()
         if (res.success) {
           let i = 60;
           codeInterval = setInterval(() => {
@@ -177,7 +187,11 @@ export default {
         } else {
           this.$toast.fail(res.message)
         }
-      })
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     // 获取手机号白名单信息
     checkPhoneAndCode () {
@@ -198,30 +212,43 @@ export default {
         duration: 0,
         forbidClick: true
       })
-
-      this.yxAxios.post(`${this.proxyUrl}/prod/user/info/checkPhoneAndCode`, {
-        "code": this.code,
-        "phone": this.phone,
-        "unionId": sessionStorage.getItem('centerNo')
-      }).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          if (res.data.data.length == 0) {
-            // 白名单无用户
-            this.step = 3;
-          } else {
-            // 白名单有用户
-            let claimChildList = res.data.data
-            for (let i in claimChildList) {
-              claimChildList[i].checked = false
+      this.mgop({
+        api: 'mgop.sz.hswsy.checkPhoneAndCode', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'POST',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "code": this.code,
+          "phone": this.phone,
+          "unionId": sessionStorage.getItem('centerNo')
+        },
+        onSuccess: res => {
+          this.$toast.clear()
+          if (res.data.code == 200) {
+            if (res.data.data.length == 0) {
+              // 白名单无用户
+              this.step = 3;
+            } else {
+              // 白名单有用户
+              let claimChildList = res.data.data
+              for (let i in claimChildList) {
+                claimChildList[i].checked = false
+              }
+              this.claimChildList = claimChildList
+              this.step = 2;
             }
-            this.claimChildList = claimChildList
-            this.step = 2;
+          } else {
+            this.$toast.fail(res.data?.message)
           }
-        } else {
-          this.$toast.fail(res.data?.message)
+        },
+        onFail: err => {
+          console.log('err', err)
         }
-      })
+      });
     },
@@ -236,62 +236,11 @@ export default {
   },
   mounted () {
     sessionStorage.removeItem('useCard')
-
     this.courseId = this.$route.query.courseId;
-    let publicName = this.$route.query.publicName || sessionStorage.getItem('publicName');
-    if (publicName) {
-      sessionStorage.setItem('publicName', publicName)
-      this.publicName = publicName
-      if (publicName == "XST") {
-        this.appId = 'wx1c630c8773c482f1'
-      } else if (publicName == "SXYX") {
-        this.appId = 'wx1305e88d2bc74073'
-      } else if (publicName == "KQ") {
-        this.appId = 'wx1305e88d2bc74073'
-      }
-    }else{
-      this.$toast.fail('请通过正确的途径访问')
-      return;
-    }
-    sessionStorage.setItem('prePage', 'ServiceAbroadDetail');
-    sessionStorage.setItem('prePageQuery', JSON.stringify({ courseId: this.courseId, publicName: this.publicName }));
-    if (process.env.NODE_ENV === "production" && this.common.isWeiXin()) {
-      let openId = sessionStorage.getItem('openId' + this.publicName);
-      if (!openId) {
-        this.$router.push({ name: 'Authorize' + this.publicName })
-        return;
-      }
-      this.unionId = sessionStorage.getItem('unionId');
-      this.getUserInfo()
-    } else {
-      this.unionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU';
-      this.getUserInfo()
-    }
+    this.centerNo = sessionStorage.getItem('centerNo')
     this.GetCourseDetail();
   },
   methods: {
-    // 获取用户信息
-    getUserInfo () {
-      let userInfo = sessionStorage.getItem('userInfo');
-      let unionId = sessionStorage.getItem('unionId');
-      if (userInfo) {
-        userInfo = JSON.parse(userInfo)
-        this.centerNo = userInfo.centerNo
-      } else {
-        this.$toast.loading({
-          message: '加载中...',
-          duration: 0,
-          forbidClick: true
-        })
-        this.yxAxios.get(`${this.proxyUrl}/prod/api/wx/${this.appId}/getUserInfo?unionId=${unionId}`).then((res) => {
-          this.$toast.clear()
-          if (res.data.code == 200) {
-            this.centerNo = res.data.data.centerNo
-            sessionStorage.setItem('userInfo', JSON.stringify(res.data.data))
-          }
-        })
-      }
-    },
     // 展开关闭院校简介
     extend_btn () {
       this.isOpen = !this.isOpen;
@@ -350,11 +299,20 @@ export default {
         duration: 0,
         forbidClick: true,
       });
-      this.yxAxios
-        .get(
-          `${this.yanxueUrl}/api/StudiesWap/GetCourseDetail?id=${this.courseId}&cs=绍兴市`
-        )
-        .then((res) => {
+      this.mgop({
+        api: 'mgop.sz.hswsy.GetCourseDetail', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'POST',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "id":this.courseId,
+          "cs": "绍兴市",
+        },
+        onSuccess: res => {
           this.$toast.clear();
           if (res.data.data && res.data.data.id !== 0) {
             let detailData = res.data.data;
@@ -393,17 +351,28 @@ export default {
             }
             this.$toast.fail(message)
           }
-        });
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     //获取商品可使用优惠券
     getOrderCoupon () {
-      this.yxAxios
-        .post(`${this.proxyUrl}/prod/api/coupon/orderCoupon`, {
-          proId: this.detailData.id,
-          userId: this.centerNo,
-        })
-        .then((res) => {
-          // console.log(res.data.data)
+      this.mgop({
+        api: 'mgop.sz.hswsy.orderCoupon', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'POST',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "proId": this.detailData.id,
+          "userId": this.centerNo,
+        },
+        onSuccess: res => {
           if (res.data.data) {
             if (res.data.data.has.length > 0) {
               this.proCoupon = res.data.data.has
@@ -416,7 +385,11 @@ export default {
               }
             }
           }
-        });
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     // 设置默认选中的优惠券
     chooseDefaultUseCard (has) {
@@ -438,31 +411,47 @@ export default {
     },
     // 获取评价
     getEvaluationSummary () {
-      this.yxAxios
-        .get(
-          `${this.yanxueUrl}/api/StudiesWap/Evaluation/Summary?courseId=${this.courseId}`)
-        .then((res) => {
-          console.log(res.data.data);
+      this.mgop({
+        api: 'mgop.sz.hswsy.EvaluationSummary', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "courseId": this.courseId,
+        },
+        onSuccess: res => {
           if (res.data.data) {
             this.evaluationData = res.data.data
           }
-        });
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     // 获取套餐列表
     getPackageData () {
       let startDate = this.Moment().format("YYYY-MM-DD");
       let endDate = this.Moment().add(60, "days").format("YYYY-MM-DD");
-      this.yxAxios
-        .post(
-          `${this.yanxueUrl}/api/Product/DateComboBindList/ByTime/List`,
-          {
-            productId: this.detailData.id,
-            startDate: startDate,
-            endDate: endDate,
-          }
-        )
-        .then((res) => {
-          console.log(res.data.data);
+      this.mgop({
+        api: 'mgop.sz.hswsy.DateComboBindList', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "productId": this.detailData.id,
+            "startDate": startDate,
+            "endDate": endDate,
+        },
+        onSuccess: res => {
           if (res.data.data) {
             let allPackage = res.data.data;
             let usefulPackage = [];
@@ -479,7 +468,11 @@ export default {
             );
             this.setPackageArr();
           }
-        });
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     // 设置套餐价格
     setPackageArr () {
@@ -522,14 +515,27 @@ export default {
     },
     // 获取单个基地
     GetOneBase (baseId) {
-      this.yxAxios
-        .get(`${this.yanxueUrl}/api/Manage/GetOneBase?id=${baseId}`)
-        .then((res) => {
-          // console.log(res.data.data)
+      this.mgop({
+        api: 'mgop.sz.hswsy.GetOneBase', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "id": baseId,
+        },
+        onSuccess: res => {
           if (res.data.data) {
             this.baseData = res.data.data;
           }
-        });
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     // 设置第几天的课程表
     getWeekCard (index) {
@@ -60,17 +60,33 @@ export default {
   },
   methods: {
     getEvaluationList (courseId) {
-      this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/Evaluation/List?courseId=${courseId}`).then((res) => {
-        this.$toast.clear();
-        if (res.data.status == 1) {
-          let list = res.data.data?.evaluationList;
-          for (let i in list) {
-            list[i].intime = this.Moment(list[i].intime).format("YYYY.MM.DD");
+      this.mgop({
+        api: 'mgop.sz.hswsy.EvaluationList', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "courseId": courseId,
+        },
+        onSuccess: res => {
+          this.$toast.clear();
+          if (res.data.status == 1) {
+            let list = res.data.data?.evaluationList;
+            for (let i in list) {
+              list[i].intime = this.Moment(list[i].intime).format("YYYY.MM.DD");
+            }
+            this.list = list;
+            this.score = res.data.data?.shopScore
           }
-          this.list = list;
-          this.score = res.data.data?.shopScore
+        },
+        onFail: err => {
+          console.log('err', err)
         }
-      })
+      });
     },
     // 预览图片
     previewImg (url) {
@@ -1,164 +0,0 @@
-<template>
-  <div id="cardBox">
-    <div class="card_item" v-for="(item,index) in cardList" :key="index" @click="handleCard(index)">
-      <div class="left">
-        <div class="top">
-          <img v-if="item.img" :src="item.img" alt="">
-          <p class="title">仅该商品可用：<span>{{item.title}}</span></p>
-        </div>
-        <p class="end_time">有效期至：{{item.useEndTime}}</p>
-      </div>
-      <div class="right">
-        <p class="discount" :class="item.couponState==1?'':'disable'"><span>¥</span>{{item.couponPrice}}</p>
-        <p class="usenow" v-if="item.couponState==1">立即使用</p>
-        <p class="usenow disable" v-else>{{item.couponState==2?'已使用':'已过期'}}</p>
-      </div>
-    </div>
-    <van-empty v-if="cardList.length==0" description="暂无优惠券" />
-
-  </div>
-</template>
-<script>
-export default {
-  name: 'ServiceCardBoxPublic',
-  data () {
-    return {
-      cardList: [],
-      publicName: '',
-      unionId: ''
-    }
-  },
-  mounted () {
-    let publicName = this.$route.query.publicName || sessionStorage.getItem('publicName');
-    if (publicName) {
-      sessionStorage.setItem('publicName', publicName)
-      this.publicName = publicName
-    }
-    if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
-      let openId = sessionStorage.getItem('openId' + this.publicName);
-      if (!openId) {
-        sessionStorage.setItem('prePage', 'ServiceCardBoxPublic');
-        this.$router.push({ name: 'Authorize' + this.publicName })
-        return;
-      }
-      this.unionId = sessionStorage.getItem('unionId');
-    } else {
-      this.unionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU';
-    }
-
-    this.$nextTick(() => {
-      this.getAllCard()
-    })
-  },
-  methods: {
-    // 获取所有优惠券
-    getAllCard () {
-      this.yxAxios.post(`${this.proxyUrl}/prod/api/coupon/list`, {
-        userId: this.unionId,
-        state: '',//状态 1-正常 2-已使用 3-已过期 不传为全部,
-        pageNum: '1',
-        pageSize: '999'
-      }).then((res) => {
-        if (res.data.rows) {
-          let cardList = res.data.rows
-          for (let i in cardList) {
-            cardList[i].useEndTime = this.Moment(cardList[i].useEndTime.replace(/\-/g, "/")).format("YYYY-MM-DD")
-          }
-          this.cardList = cardList
-        }
-        else {
-          this.$toast.fail(res.data.message);
-        }
-      })
-    },
-    handleCard (index) {
-      if (this.cardList[index].couponState == 1) {
-        this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: 499 } })
-      }
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-#cardBox {
-  width: 100%;
-  min-height: 100%;
-  background: rgb(246, 246, 250);
-  overflow: hidden;
-  .card_item {
-    width: 726px;
-    height: 216px;
-    background: url("../../assets/service/card.png");
-    background-size: 100%;
-    margin: 0 auto;
-    margin-top: 20px;
-    position: relative;
-    p {
-      width: 100%;
-      margin: 0;
-    }
-    .left {
-      display: inline-block;
-      width: 68%;
-      height: 100%;
-      vertical-align: top;
-      box-sizing: border-box;
-      padding: 24px 40px;
-      padding-right: 0;
-      .top {
-      display: flex;
-      img {
-        width: 66px;
-        height: 66px;
-        background: #d8d8d8;
-        border-radius: 6px;
-      }
-      .title {
-        font-size: 24px;
-        font-weight: bold;
-        margin-left: 10px;
-        word-break: break-all;
-        span {
-          color: #7f5316;
-        }
-      }
-    }
-    }
-    .right {
-      width: 32%;
-      height: 100%;
-      display: inline-flex;
-      align-content: center;
-      flex-wrap: wrap;
-      position: relative;
-    }
-    .end_time {
-      font-size: 24px;
-      color: #999;
-      left: 40px;
-      position: absolute;
-      bottom: 30px;
-    }
-    .discount {
-      text-align: center;
-      font-size: 60px;
-      font-weight: bold;
-      span {
-        font-size: 24px;
-      }
-      &.disable {
-        color: #999;
-      }
-    }
-    .usenow {
-      font-size: 32px;
-      text-align: center;
-      font-weight: bold;
-      margin-top: 10px;
-      &.disable {
-        color: #999;
-      }
-    }
-  }
-}
-</style>
 \ No newline at end of file
@@ -67,7 +67,38 @@ export default {
         duration: 0,
         forbidClick: true,
       });
-      this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/CourseList/ByIdList`, this.proId.split(',')).then((res) => {
+      // this.mgop({
+      //   api: 'mgop.sz.hswsy.CourseListByIdList', // 必须
+      //   host: 'https://mapi.zjzwfw.gov.cn/',
+      //   dataType: 'JSON',
+      //   type: 'POST',
+      //   appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+      //   headers: {
+      //     //   'isTestUrl': '1'
+      //   },
+      //   data: {idList:["1502","1524","1551","1570","1572"]},
+      //   onSuccess: res => {
+      //     this.$toast.clear();
+      //   let proList = res.data.data;
+      //   for (let i in proList) {
+      //     proList[i].course_labels = proList[i].course_labels?.split(',');
+      //     proList[i].coverUrl = proList[i]?.coverList[0]?.cover_url
+      //     if (proList[i].startDate) {
+      //       proList[i].week = this.formatWeek(this.Moment(proList[i].startDate).format('d'));
+      //       proList[i].startDate = this.Moment(proList[i].startDate).format('YYYY.M.D');
+      //       proList[i].endDate = this.Moment(proList[i].endDate).format('YYYY.M.D');
+      //     }
+      //   }
+      //   console.log(proList)
+      //   this.proList = proList
+      //   },
+      //   onFail: err => {
+      //     console.log('err', err)
+      //   }
+      // });
+      this.yxAxios.post(`https://yanxue.myjxt.com/api/StudiesWap/CourseList/ByIdList`, {
+        idList:this.proId
+      }).then((res) => {
         this.$toast.clear();
         let proList = res.data.data;
         for (let i in proList) {
@@ -90,15 +121,23 @@ export default {
     //领取优惠券
     reCard () {
       if (this.geted) return;
-      this.yxAxios.post(`${this.proxyUrl}/prod/api/coupon/get`, {
-        unionId: this.unionId,
-        "proId": this.proId,
-        "proName": this.proName,
-        "pic": this.pics,
-        couponId: this.cardId,
-      })
-        .then((res) => {
-          // console.log(res.data)
+      this.mgop({
+        api: 'mgop.sz.hswsy.CouponGet', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'POST',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "unionId": sessionStorage.getItem('centerNo'),
+          "proId": this.proId,
+          "proName": this.proName,
+          "pic": this.pics,
+          "couponId": this.cardId,
+        },
+        onSuccess: res => {
           if (res.data.code == 200) {
             sessionStorage.setItem('cardCousreGeted', true)
             this.geted = true;
@@ -106,7 +145,11 @@ export default {
           } else {
             this.$toast.fail(res.data.message);
           }
-        })
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     onConfirm (item) {
@@ -31,18 +31,9 @@ export default {
     return {
       cardList: [],
       selectIndex: -1,
-      unionId: ''
     }
   },
   mounted () {
-    if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
-      this.unionId = sessionStorage.getItem('unionId');
-    } else {
-      this.unionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU';
-    }
-    // this.$nextTick(() => {
-    //   this.getOrderCoupon()
-    // })
     let cardList = sessionStorage.getItem('proCoupon')
     if (cardList) {
       this.cardList = JSON.parse(cardList)
@@ -65,7 +65,6 @@ export default {
       showCourseData: '',//当前课程的信息
       selectCombo: '',//已选择的套餐
       publicName: '',
-      openId: '',//支付用
       userInfo: '',//支付用
       appId: '',
       selectedContactArr: [],//选择的出行人
@@ -84,18 +83,6 @@ export default {
         this.appId = 'wx1305e88d2bc74073'
       }
     }
-    let openId = sessionStorage.getItem('openId' + this.publicName);
-
-    if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
-      if (!openId) {
-        sessionStorage.setItem('prePage', 'ServiceCheckOrder');
-        this.$router.push({ name: 'Authorize' + this.publicName })
-        return;
-      } else {
-        this.openId = openId;
-      }
-    }
-
     let userInfo = sessionStorage.getItem('userInfo');
     if (userInfo) {
       this.userInfo = JSON.parse(userInfo);
@@ -168,32 +155,37 @@ export default {
         this.$toast.fail('请先阅读并同意用户协议');
         return;
       }
-      this.yxAxios.post(`${this.yanxueUrl}/api/Manage/AddOrderPay`, {
-        courseId: this.showCourseData.id,
-        payway: 2,
-        paymoney: this.paymoney,//时段个数*单价*人数-优惠券
-        userId: this.userInfo?.centerNo,//升学汇和其他端接口字段不同
-        orderCount: this.count,//人数
-        orderTime: this.date,//时段集合 2018-10-15 
-        comboId: this.selectCombo.id,
-        dateBindComboId: this.selectCombo.dateBindComboId,
-        unionId: this.userInfo?.centerNo,
-        // unionId: this.userInfo?.unionId,
-        price: this.selectCombo.actualPrice * 1000 * this.count / 1000,//商品减掉优惠券之前的价格
-        travelNum: this.selectedContact,//出行人编号
-        couponId: this.useCard?.id || 0,
-        appId:this.appId
-      }).then(res => {
-        console.log(res.data)
-        if (res.data.data) {
+      this.mgop({
+        api: 'mgop.sz.hswsy.AddOrderPay', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'POST',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "courseId": this.showCourseData.id,
+          "payway": 2,
+          "paymoney": this.paymoney,//时段个数*单价*人数-优惠券
+          "userId": this.userInfo?.centerNo,//升学汇和其他端接口字段不同
+          "orderCount": this.count,//人数
+          "orderTime": this.date,//时段集合 2018-10-15 
+          "comboId": this.selectCombo.id,
+          "dateBindComboId": this.selectCombo.dateBindComboId,
+          "unionId": this.userInfo?.centerNo,
+          "price": this.selectCombo.actualPrice * 1000 * this.count / 1000,//商品减掉优惠券之前的价格
+          "travelNum": this.selectedContact,//出行人编号
+          "couponId": this.useCard?.id || 0,
+          "appId": this.appId
+        },
+        onSuccess: res => {
+          if (res.data.data) {
           if (this.paymoney == 0) {
             // 使用后移除优惠券，防止返回继续使用
             sessionStorage.removeItem('useCard')
-            if (this.publicName == 'SXYX' || this.publicName == 'XST' || this.publicName == 'KQ') {
               this.$router.push({ name: 'ServiceOrderXST', query: { active: 1, showChatGroupUrl: 1 } })
-            } else {
-              this.$router.push({ name: 'ServiceOrderPublic' })
-            }
+
           } else {
             // 使用后移除优惠券，防止返回继续使用
             sessionStorage.removeItem('useCard')
@@ -204,29 +196,26 @@ export default {
           this.$toast.fail(res.data?.result);
         }
-      })
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
     },
     openPay (data) {
       let that = this;
-      if (!this.openId) {
-        this.$toast.fail('没有获取到当前用户信息，请通过正确的渠道访问');
-        return;
-      }
-      console.log('openId =', this.openId)
-      
+      alert('支付')
+      return;
+
       Axios({
-        // url: this.proxyUrl + '/sxh/order/orderCenter',
-        url: this.proxyUrl + '/prod/api/wx/pay/' + this.appId + '/1614900216',
+        url: 'https://proxy.shunzhi.net/prod/api/wx/pay/' + this.appId + '/1614900216',
         method: 'post',
-        // headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
         headers: { 'Content-Type': 'application/json;charset=UTF-8' },
-        // data: Qs.stringify({
         data: {
-          notify_url: `${this.yanxueUrl}/api/Manage/WxBackInfo`,
-          body: this.showCourseData.course_name+'_'+this.date,
+          notify_url: `https://yanxue.myjxt.com/api/Manage/WxBackInfo`,
+          body: this.showCourseData.course_name + '_' + this.date,
           openId: this.openId, //'oHHbojor4C_gR96lxxFUeYTrY0Uc'
-          // openId: 'oQTiTjhDkusbSi-rgJ5nMey3IsPw', //'oHHbojor4C_gR96lxxFUeYTrY0Uc'
           outTradeNo: data.trade_no, //订单号
           productId: this.showCourseData.id, //商品id
           totalFee: this.paymoney * 100, //钱
@@ -95,23 +95,55 @@ export default {
     // 获取库存
     GetOrderPayCount () {
       let showCourseData = JSON.parse(sessionStorage.getItem('showCourseData'))
-      this.yxAxios.get(`${this.yanxueUrl}/api/Product/OrderPayCount/ByBindId?productId=${showCourseData.id}&startDate=${this.date}`).then((res) => {
-        if (res.data) {
+      this.mgop({
+        api: 'mgop.sz.hswsy.OrderPayCount', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "productId": showCourseData.id,
+          "startDate": this.date,
+        },
+        onSuccess: res => {
+          if (res.data.data) {
           this.numOne = res.data.data
-          // console.log(this.numOne)
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
         }
-      })
+      });
     },
     // 获取库存第二个参数
     getSurplusComboCount (bindId) {
       let showCourseData = JSON.parse(sessionStorage.getItem('showCourseData'))
-      this.yxAxios.get(`${this.yanxueUrl}/api/Product/SurplusComboCount/ByBindId?bindId=${bindId}&productId=${showCourseData.id}&startDate=${this.date}`).then((res) => {
-        if (res.data) {
+      this.mgop({
+        api: 'mgop.sz.hswsy.SurplusComboCount', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "bindId": bindId,
+          "productId": showCourseData.id,
+          "startDate": this.date,
+        },
+        onSuccess: res => {
+          if (res.data.data) {
           this.numSecond = res.data.data
-          // console.log(this.numSecond)
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
         }
-      })
-
+      });
     },
     // 选择排期
     choosePeriod (index) {
@@ -90,15 +90,29 @@ export default {
         duration: 0,
         forbidClick: true
       })
-      this.yxAxios.post(`${this.proxyUrl}/prod/user/info/addContacts`, postData).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          this.$toast.success('完善成功')
-          this.$router.back()
-        } else {
-          this.$toast.fail(res.message)
+      this.mgop({
+        api: 'mgop.sz.hswsy.addContacts', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: postData,
+        onSuccess: res => {
+          this.$toast.clear()
+          if (res.data.code == 200) {
+            this.$toast.success('完善成功')
+            this.$router.back()
+          } else {
+            this.$toast.fail(res.message)
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
         }
-      })
+      });
     },
     checkPhone (phone) {
       if ((/^1[3456789]\d{9}$/.test(phone))) {
@@ -1,234 +0,0 @@
-<template>
-  <div id="login">
-    <img class="bg" src="@/assets/login_bg.png" alt="">
-    <div class="box">
-      <p class="login_title">绑定手机号</p>
-      <div class="item">
-        <p class="title">手机号</p>
-        <div class="flex">
-          <input class="code phone" type="tel" maxlength="11" v-model="phone" placeholder="请输入您的手机号">
-          <span class="getcode" @click="getCode">{{codeText}}</span>
-        </div>
-      </div>
-      <div class="item">
-        <p class="title">验证码</p>
-        <input class="code" type="text" v-model="code" placeholder="请输入验证码">
-      </div>
-      <button class="submit" @click="submitOperator">立即绑定</button>
-    </div>
-  </div>
-</template>
-<script>
-var codeInterval;
-export default {
-  name: 'LoginPublic',
-  data () {
-    return {
-      code: '',
-      phone: '',
-
-      codeText: '获取验证码',//获取验证码按钮文字
-      appId: '',
-      unionId: '',
-      openId: '',
-      prefectId: '',
-      publicName: '',//SXYX绍兴研学 XST学事通
-    }
-  },
-  mounted () {
-    let publicName = this.$route.query.publicName || sessionStorage.getItem('publicName');
-    if (publicName == 'SXYX') {
-      this.appId = 'wx1305e88d2bc74073'
-    } else if (publicName == 'XST') {
-      this.appId = 'wx1c630c8773c482f1'
-    } else if (publicName == 'KQ') {
-      this.appId = 'wx1305e88d2bc74073'
-    }
-    this.openId = sessionStorage.getItem('openId' + publicName);
-    this.unionId = sessionStorage.getItem('unionId');
-    if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
-      if (!this.openId) {
-        this.$router.push({ name: 'Authorize' + publicName })
-      }
-    }
-
-  },
-  methods: {
-    getCode () {
-      if (this.codeText != '获取验证码') return;
-      if (!this.phone) {
-        this.$toast('请输入手机号')
-        return;
-      }
-      if (!this.checkPhone(this.phone)) {
-        this.$toast('请输入正确的手机号')
-        return;
-      }
-      this.$toast.loading({
-        message: '加载中',
-        duration: 0,
-        forbidClick: true
-      })
-      this.yxAxios.post(`${this.proxyUrl}/prod/api/wx/${this.appId}/getMsg?phone=${this.phone}`).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          let i = 60;
-          codeInterval = setInterval(() => {
-            if (i == 0) {
-              this.codeText = `获取验证码`;
-              clearInterval(codeInterval);
-              return;
-            }
-            this.codeText = `重试（${i}）`;
-            i--
-          }, 1000)
-        } else {
-          this.$toast.fail(res.data.message)
-        }
-      })
-    },
-    submitOperator () {
-      if (!this.phone) {
-        this.$toast('请输入手机号')
-        return;
-      }
-      if (!this.checkPhone(this.phone)) {
-        this.$toast('请输入正确的手机号')
-        return;
-      }
-      if (!this.code) {
-        this.$toast('请输入验证码')
-        return;
-      }
-      this.$toast.loading({
-        message: '加载中',
-        duration: 0,
-        forbidClick: true
-      })
-      this.yxAxios.post(`${this.proxyUrl}/prod/api/wx/${this.appId}/checkPhoneAndCode`, {
-        phone: this.phone,
-        code: this.code,
-        unionId: this.unionId,
-        openId: this.openId
-      }).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          this.getUserInfo()
-        } else {
-          this.$toast.fail(res.data.message)
-        }
-      })
-    },
-    checkPhone (phone) {
-      if ((/^1[3456789]\d{9}$/.test(phone))) {
-        return true
-      } else {
-        return false
-      }
-    },
-    complete () {
-      this.getUserInfo()
-    },
-    // 获取用户信息
-    getUserInfo () {
-      this.$toast.loading({
-        message: '加载中...',
-        duration: 0,
-        forbidClick: true
-      })
-      this.yxAxios.get(`${this.proxyUrl}/prod/api/wx/${this.appId}/getUserInfo?unionId=${this.unionId}`).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          sessionStorage.setItem('userInfo', JSON.stringify(res.data.data))
-          let prePage = sessionStorage.getItem('prePage');
-          let prePageQuery = sessionStorage.getItem('prePageQuery');
-          if (prePage) {
-            this.$router.push({ name: prePage, query: JSON.parse(prePageQuery) })
-          }
-        } else {
-          this.$toast.fail(res.data.message)
-        }
-      })
-    },
-  },
-  destroyed () {
-    clearInterval(codeInterval);
-  }
-}
-</script>
-<style lang="scss" scoped>
-#login {
-  .bg {
-    width: 100%;
-  }
-  .login_title {
-    font-size: 36px;
-    font-weight: bold;
-    text-align: center;
-    color: #000;
-    padding-bottom: 40px;
-  }
-  .box {
-    width: 702px;
-    height: 540px;
-    background: linear-gradient(
-      180deg,
-      rgba(251, 251, 251, 0.99) 0%,
-      #ffffff 100%
-    );
-    box-shadow: 0px 4px 12px 0px rgba(87, 214, 255, 0.2);
-    border-radius: 20px;
-    position: absolute;
-    top: 240px;
-    left: 24px;
-    box-sizing: border-box;
-    padding: 40px;
-    .item {
-      border-bottom: 1px solid #e2e2e2;
-      margin-bottom: 30px;
-    }
-    .title {
-      font-size: 34px;
-      font-weight: bold;
-      margin-bottom: 28px;
-    }
-    .flex {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-bottom: 22px;
-    }
-    .code {
-      border: 0;
-      background: transparent;
-      font-size: 28px;
-      margin-bottom: 32px;
-      width: 100%;
-    }
-    .phone {
-      width: 50%;
-      margin: 0;
-    }
-    .getcode {
-      color: #5789ff;
-      font-size: 28px;
-      padding: 10px;
-    }
-    .submit {
-      width: 622px;
-      height: 88px;
-      background: linear-gradient(137deg, #83b2ff 0%, #3c80ef 100%);
-      box-shadow: 0px 4px 8px 0px rgba(87, 169, 255, 0.5);
-      border-radius: 44px;
-      border: 0;
-      font-size: 34px;
-      color: #ffffff;
-      margin: 0 auto;
-      display: block;
-    }
-  }
-}
-.prefect_pop {
-  background: transparent;
-}
-</style>
 \ No newline at end of file
@@ -368,7 +368,24 @@ export default {
     },
     // 我的优惠券
     handleMyCard () {
-      this.$router.push({ name: 'ServiceCardBoxPublic' })
+      let isLogin = this.checkLogin()
+      if (!isLogin) return;
+      const publicName = sessionStorage.getItem('publicName')
+      // this.$toast('暂未开放，敬请期待！');
+      this.$router.push({ name: 'CardBoxXST', query: { active: 1, publicName: publicName } })
+    },
+    // 判断是否已登录
+    checkLogin () {
+      if (process.env.NODE_ENV != "production") return true;
+      const userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+      if (!userInfo?.phone) {
+        const publicName = sessionStorage.getItem('publicName')
+        sessionStorage.setItem('prePage', 'Service' + publicName);
+        sessionStorage.setItem('prePageQuery', JSON.stringify({ showTab: this.$route.query.showTab }));
+        this.$router.push({ name: 'LoginPublic', query: { publicName: publicName } })
+        return false;
+      }
+      return true;
     },
     formatWeek (week) {
       return week == 1 ? '周一' : week == 2 ? '周二' : week == 3 ? '周三' : week == 4 ? '周四' : week == 5 ? '周五' : week == 6 ? '周六' : week == 0 ? '周日' : '';
@@ -45,7 +45,6 @@
 </template>
 <script>
-import yxAxios from '@/https/yxAxios'
 import { imgCut } from 'vue-imgcut'
 export default {
   data () {
	@@ -1,11 +0,0 @@	@@ -1,11 +0,0 @@
1	-import {
2	- get,
3	- post
4	-} from '../https/index';
5	-
6	-const obj = {
7	- GetSysAreaList: p => get('/h5/MyVoluntary/GetSysAreaList', p),//获取地区列表
8	- getMsg: p => post('/sxh/wx/getMsg', p),//绑定手机号用到的验证码
9	-}
10	-
11	-export default obj;
	@@ -1,100 +0,0 @@	@@ -1,100 +0,0 @@
1	-import Axios from 'axios';
2	-import QS from 'qs';
3	-
4	-let httpUrl = ''; //正式
5	-if (process.env.NODE_ENV === "development") {
6	- // httpUrl = 'http://192.168.1.95:9901';
7	- httpUrl = 'https://proxy.shunzhi.net';
8	-} else {
9	- httpUrl = 'https://proxy.shunzhi.net';
10	-}
11	-
12	-var instance = Axios.create({
13	- timeout: 60000
14	-});
15	-// instance.defaults.baseURL = 'https://proxy.shunzhi.net:51314/'; //正式
16	-instance.defaults.baseURL = httpUrl; //测试
17	-instance.defaults.timeout = 60000;
18	-instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
19	-// 请求拦截器
20	-// instance.interceptors.request.use(
21	-// config => {
22	-// // 每次发送请求之前判断vuex中是否存在token
23	-// // 如果存在，则统一在http请求的header都加上token，这样后台根据token判断你的登录情况
24	-// // 即使本地存在token，也有可能token是过期的，所以在响应拦截器中要对返回状态进行判断
25	-// console.log(config)
26	-// // const token = common.getCookie('SXH_token');
27	-// // token && (config.headers.Authorization = token);
28	-// return config;
29	-// },
30	-// error => {
31	-// return Promise.error(error);
32	-// })
33	-// // 响应拦截器
34	-
35	-instance.interceptors.response.use(
36	- response => {
37	- console.log(response.data.message)
38	- if (response.data.message === '登录已过期') {
39	- let prevPage = sessionStorage.getItem('prePage');
40	- if (prevPage == 'center') {//个人中心授权过期
41	- location.href = httpUrl + '/wx/index/toPersonalNoLogin';
42	- } else if (prevPage == 'college') {//高考季授权过期（目前无token，暂时无用）
43	- location.href = httpUrl + '/wx/index/subscribe';
44	- } else if (prevPage == 'lecture') {//公益讲座授权过期
45	- location.href = httpUrl + '/wx/index/live';
46	- }else{
47	- location.href = httpUrl + '/wx/index/auth';
48	- }
49	- sessionStorage.removeItem('openId')
50	- }
51	- // 如果返回的状态码为200，说明接口请求成功，可以正常拿到数据
52	- // 否则的话抛出错误
53	- if (response.status === 200) {
54	- return Promise.resolve(response);
55	- } else {
56	- return Promise.reject(response);
57	- }
58	- },
59	- // 服务器状态码不是2开头的的情况
60	- // 这里可以跟你们的后台开发人员协商好统一的错误状态码
61	- // 然后根据返回的状态码进行一些操作，例如登录过期提示，错误提示等等
62	- // 下面列举几个常见的操作，其他需求可自行扩展
63	- error => {
64	- return Promise.reject(error.response);
65	- }
66	-);
67	-
68	-export function get (url, params) {
69	- return new Promise((resolve, reject) => {
70	- let tokenValue = sessionStorage.getItem('tokenValue')
71	- instance.get(url, {
72	- params: params,
73	- headers: { 'sztoken': tokenValue }
74	- }).then(res => {
75	- resolve(res.data);
76	- }).catch(err => {
77	- reject(err.data)
78	- })
79	- });
80	-}
81	-
82	-export function post (url, params, type) {
83	- var ndata = type == 'json' ? JSON.stringify(params) : QS.stringify(params);
84	- if (type == 'json') {
85	- instance.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8';
86	- } else {
87	- instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
88	- }
89	- return new Promise((resolve, reject) => {
90	- let tokenValue = sessionStorage.getItem('tokenValue')
91	- instance.post(url, ndata, {
92	- headers: { 'sztoken': tokenValue }
93	- }).then(res => {
94	- resolve(res.data);
95	- })
96	- .catch(err => {
97	- reject(err.data)
98	- })
99	- });
100	-}
	@@ -13,8 +13,6 @@ import evaluateBase from '@/views/Service/evaluateBase.vue' //基地评价		@@ -13,8 +13,6 @@ import evaluateBase from '@/views/Service/evaluateBase.vue' //基地评价
13	import evaluateDetail from '@/views/Service/evaluateDetail.vue' //评价详情	13	import evaluateDetail from '@/views/Service/evaluateDetail.vue' //评价详情
14		14
15	import ServiceKQ from '@/views/Service/ServiceKQ.vue' //柯桥研学	15	import ServiceKQ from '@/views/Service/ServiceKQ.vue' //柯桥研学
16	-import LoginPublic from '@/views/Service/LoginPublic.vue'
17	-import ServiceCardBoxPublic from '@/views/Service/CardBoxPublic.vue'
18		16
19	import CardBoxXST from '@/views/Service/CardBoxXST.vue'	17	import CardBoxXST from '@/views/Service/CardBoxXST.vue'
20	import CardCourseList from '@/views/Service/CardCourseList.vue' //优惠券对应商品列表	18	import CardCourseList from '@/views/Service/CardCourseList.vue' //优惠券对应商品列表
	@@ -50,14 +48,6 @@ const routes = [{		@@ -50,14 +48,6 @@ const routes = [{
50	title: '个人中心(柯桥研学)'	48	title: '个人中心(柯桥研学)'
51	}	49	}
52	},	50	},
53	- {
54	- path: '/login_public',
55	- name: 'LoginPublic',
56	- component: LoginPublic,
57	- meta: {
58	- title: '绑定手机号'
59	- }
60	- },
61		51
62	{	52	{
63	path: '/abroad_detail',	53	path: '/abroad_detail',
	@@ -93,14 +83,6 @@ const routes = [{		@@ -93,14 +83,6 @@ const routes = [{
93	}	83	}
94	},	84	},
95	{	85	{
96	- path: '/card_box_public',
97	- name: 'ServiceCardBoxPublic',
98	- component: ServiceCardBoxPublic,
99	- meta: {
100	- title: '我的优惠券'
101	- }
102	- },
103	- {
104	path: '/CardBoxXST',	86	path: '/CardBoxXST',
105	name: 'CardBoxXST',	87	name: 'CardBoxXST',
106	component: CardBoxXST,	88	component: CardBoxXST,
	@@ -78,15 +78,30 @@ export default {		@@ -78,15 +78,30 @@ export default {
78	this.$toast.loading({	78	this.$toast.loading({
79	message: '请求中...',	79	message: '请求中...',
80	});	80	});
81	- this.yxAxios.get(`${this.yanxueUrl}/api/BaseManage/AddSign?userId=${this.selectedContact.travelerNum}&baseId=${this.baseId}`).then((res) => {
82	- this.$toast.success('打卡签到成功');
83	- console.log(res.data)
84	- // alert('打卡签到成功:',JSON.stringify(res))
85	- setTimeout(() => {
86	- let publicName = sessionStorage.getItem('publicName');
87	- this.$router.push({ name: 'Home' + publicName })
88	- }, 1000)
89	- })	81	+ this.mgop({
		82	+ api: 'mgop.sz.hswsy.GetStudyBaseDetail', // 必须
		83	+ host: 'https://mapi.zjzwfw.gov.cn/',
		84	+ dataType: 'JSON',
		85	+ type: 'GET',
		86	+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
		87	+ headers: {
		88	+ // 'isTestUrl': '1'
		89	+ },
		90	+ data: {
		91	+ "userId": this.selectedContact.travelerNum,
		92	+ "baseId": this.baseId
		93	+ },
		94	+ onSuccess: res => {
		95	+ this.$toast.success('打卡签到成功');
		96	+ setTimeout(() => {
		97	+ let publicName = sessionStorage.getItem('publicName');
		98	+ this.$router.push({ name: 'Home' + publicName })
		99	+ }, 1000)
		100	+ },
		101	+ onFail: err => {
		102	+ console.log('err', err)
		103	+ }
		104	+ });
90	},	105	},
91	// 获取基地信息	106	// 获取基地信息
92	GetStudyBaseDetail (baseId) {	107	GetStudyBaseDetail (baseId) {
	@@ -31,18 +31,34 @@ export default {		@@ -31,18 +31,34 @@ export default {
31	methods: {	31	methods: {
32	getbind () {	32	getbind () {
33	if (this.userNum == '' \|\| this.codeNum == '') {	33	if (this.userNum == '' \|\| this.codeNum == '') {
34	- return this.$toast('请先填写完整信息！');	34	+ this.$toast('请先填写完整信息！');
		35	+ return ;
35	}	36	}
36	- this.yxAxios.get(this.proxyUrl + '/prod/user/info/bingStudyCode?userNum=' + this.userNum + '&code=' + this.codeNum)
37	- .then((res) => {
38	- console.log('接口返回', res.data)
39	- if (res.data.code == '200') {	37	+ this.mgop({
		38	+ api: 'mgop.sz.hswsy.bingStudyCode', // 必须
		39	+ host: 'https://mapi.zjzwfw.gov.cn/',
		40	+ dataType: 'JSON',
		41	+ type: 'GET',
		42	+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
		43	+ headers: {
		44	+ // 'isTestUrl': '1'
		45	+ },
		46	+ data: {
		47	+ "userNum": this.userNum,
		48	+ "code": this.codeNum,
		49	+ },
		50	+ onSuccess: res => {
		51	+ if (res.data.code == '200') {
40	this.$toast('操作成功');	52	this.$toast('操作成功');
41	this.$router.push({ name: 'YanxueCode' })	53	this.$router.push({ name: 'YanxueCode' })
42	} else {	54	} else {
43	this.$toast('操作失败:' + res.data.message);	55	this.$toast('操作失败:' + res.data.message);
44	}	56	}
45	- })	57	+ },
		58	+ onFail: err => {
		59	+ console.log('err', err)
		60	+ }
		61	+ });
46	},	62	},
47	//扫一扫	63	//扫一扫
48	saoYiSao () {	64	saoYiSao () {
	@@ -159,10 +159,20 @@ export default {		@@ -159,10 +159,20 @@ export default {
159	duration: 0,	159	duration: 0,
160	forbidClick: true	160	forbidClick: true
161	})	161	})
162	- this.http.getMsg({
163	- phone: this.phone
164	- }).then((res) => {
165	- this.$toast.clear()	162	+ this.mgop({
		163	+ api: 'mgop.sz.hswsy.getMsg', // 必须
		164	+ host: 'https://mapi.zjzwfw.gov.cn/',
		165	+ dataType: 'JSON',
		166	+ type: 'POST',
		167	+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
		168	+ headers: {
		169	+ // 'isTestUrl': '1'
		170	+ },
		171	+ data: {
		172	+ "phone": this.phone
		173	+ },
		174	+ onSuccess: res => {
		175	+ this.$toast.clear()
166	if (res.success) {	176	if (res.success) {
167	let i = 60;	177	let i = 60;
168	codeInterval = setInterval(() => {	178	codeInterval = setInterval(() => {
	@@ -177,7 +187,11 @@ export default {		@@ -177,7 +187,11 @@ export default {
177	} else {	187	} else {
178	this.$toast.fail(res.message)	188	this.$toast.fail(res.message)
179	}	189	}
180	- })	190	+ },
		191	+ onFail: err => {
		192	+ console.log('err', err)
		193	+ }
		194	+ });
181	},	195	},
182	// 获取手机号白名单信息	196	// 获取手机号白名单信息
183	checkPhoneAndCode () {	197	checkPhoneAndCode () {
	@@ -198,30 +212,43 @@ export default {		@@ -198,30 +212,43 @@ export default {
198	duration: 0,	212	duration: 0,
199	forbidClick: true	213	forbidClick: true
200	})	214	})
201	-
202	- this.yxAxios.post(`${this.proxyUrl}/prod/user/info/checkPhoneAndCode`, {
203	- "code": this.code,
204	- "phone": this.phone,
205	- "unionId": sessionStorage.getItem('centerNo')
206	- }).then((res) => {
207	- this.$toast.clear()
208	- if (res.data.code == 200) {
209	- if (res.data.data.length == 0) {
210	- // 白名单无用户
211	- this.step = 3;
212	- } else {
213	- // 白名单有用户
214	- let claimChildList = res.data.data
215	- for (let i in claimChildList) {
216	- claimChildList[i].checked = false	215	+ this.mgop({
		216	+ api: 'mgop.sz.hswsy.checkPhoneAndCode', // 必须
		217	+ host: 'https://mapi.zjzwfw.gov.cn/',
		218	+ dataType: 'JSON',
		219	+ type: 'POST',
		220	+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
		221	+ headers: {
		222	+ // 'isTestUrl': '1'
		223	+ },
		224	+ data: {
		225	+ "code": this.code,
		226	+ "phone": this.phone,
		227	+ "unionId": sessionStorage.getItem('centerNo')
		228	+ },
		229	+ onSuccess: res => {
		230	+ this.$toast.clear()
		231	+ if (res.data.code == 200) {
		232	+ if (res.data.data.length == 0) {
		233	+ // 白名单无用户
		234	+ this.step = 3;
		235	+ } else {
		236	+ // 白名单有用户
		237	+ let claimChildList = res.data.data
		238	+ for (let i in claimChildList) {
		239	+ claimChildList[i].checked = false
		240	+ }
		241	+ this.claimChildList = claimChildList
		242	+ this.step = 2;
217	}	243	}
218	- this.claimChildList = claimChildList
219	- this.step = 2;	244	+ } else {
		245	+ this.$toast.fail(res.data?.message)
220	}	246	}
221	- } else {
222	- this.$toast.fail(res.data?.message)	247	+ },
		248	+ onFail: err => {
		249	+ console.log('err', err)
223	}	250	}
224	- })	251	+ });
225	},	252	},
226		253
227		254
	@@ -60,17 +60,33 @@ export default {		@@ -60,17 +60,33 @@ export default {
60	},	60	},
61	methods: {	61	methods: {
62	getEvaluationList (courseId) {	62	getEvaluationList (courseId) {
63	- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/Evaluation/List?courseId=${courseId}`).then((res) => {
64	- this.$toast.clear();
65	- if (res.data.status == 1) {
66	- let list = res.data.data?.evaluationList;
67	- for (let i in list) {
68	- list[i].intime = this.Moment(list[i].intime).format("YYYY.MM.DD");	63	+ this.mgop({
		64	+ api: 'mgop.sz.hswsy.EvaluationList', // 必须
		65	+ host: 'https://mapi.zjzwfw.gov.cn/',
		66	+ dataType: 'JSON',
		67	+ type: 'GET',
		68	+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
		69	+ headers: {
		70	+ // 'isTestUrl': '1'
		71	+ },
		72	+ data: {
		73	+ "courseId": courseId,
		74	+ },
		75	+ onSuccess: res => {
		76	+ this.$toast.clear();
		77	+ if (res.data.status == 1) {
		78	+ let list = res.data.data?.evaluationList;
		79	+ for (let i in list) {
		80	+ list[i].intime = this.Moment(list[i].intime).format("YYYY.MM.DD");
		81	+ }
		82	+ this.list = list;
		83	+ this.score = res.data.data?.shopScore
69	}	84	}
70	- this.list = list;
71	- this.score = res.data.data?.shopScore	85	+ },
		86	+ onFail: err => {
		87	+ console.log('err', err)
72	}	88	}
73	- })	89	+ });
74	},	90	},
75	// 预览图片	91	// 预览图片
76	previewImg (url) {	92	previewImg (url) {
	@@ -1,164 +0,0 @@		@@ -1,164 +0,0 @@
1	-<template>
2	- <div id="cardBox">
3	- <div class="card_item" v-for="(item,index) in cardList" :key="index" @click="handleCard(index)">
4	- <div class="left">
5	- <div class="top">
6	- <img v-if="item.img" :src="item.img" alt="">
7	- <p class="title">仅该商品可用：<span>{{item.title}}</span></p>
8	- </div>
9	- <p class="end_time">有效期至：{{item.useEndTime}}</p>
10	- </div>
11	- <div class="right">
12	- <p class="discount" :class="item.couponState==1?'':'disable'"><span>¥</span>{{item.couponPrice}}</p>
13	- <p class="usenow" v-if="item.couponState==1">立即使用</p>
14	- <p class="usenow disable" v-else>{{item.couponState==2?'已使用':'已过期'}}</p>
15	- </div>
16	- </div>
17	- <van-empty v-if="cardList.length==0" description="暂无优惠券" />
18	-
19	- </div>
20	-</template>
21	-<script>
22	-export default {
23	- name: 'ServiceCardBoxPublic',
24	- data () {
25	- return {
26	- cardList: [],
27	- publicName: '',
28	- unionId: ''
29	- }
30	- },
31	- mounted () {
32	- let publicName = this.$route.query.publicName \|\| sessionStorage.getItem('publicName');
33	- if (publicName) {
34	- sessionStorage.setItem('publicName', publicName)
35	- this.publicName = publicName
36	- }
37	- if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
38	- let openId = sessionStorage.getItem('openId' + this.publicName);
39	- if (!openId) {
40	- sessionStorage.setItem('prePage', 'ServiceCardBoxPublic');
41	- this.$router.push({ name: 'Authorize' + this.publicName })
42	- return;
43	- }
44	- this.unionId = sessionStorage.getItem('unionId');
45	- } else {
46	- this.unionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU';
47	- }
48	-
49	- this.$nextTick(() => {
50	- this.getAllCard()
51	- })
52	- },
53	- methods: {
54	- // 获取所有优惠券
55	- getAllCard () {
56	- this.yxAxios.post(`${this.proxyUrl}/prod/api/coupon/list`, {
57	- userId: this.unionId,
58	- state: '',//状态 1-正常 2-已使用 3-已过期不传为全部,
59	- pageNum: '1',
60	- pageSize: '999'
61	- }).then((res) => {
62	- if (res.data.rows) {
63	- let cardList = res.data.rows
64	- for (let i in cardList) {
65	- cardList[i].useEndTime = this.Moment(cardList[i].useEndTime.replace(/\-/g, "/")).format("YYYY-MM-DD")
66	- }
67	- this.cardList = cardList
68	- }
69	- else {
70	- this.$toast.fail(res.data.message);
71	- }
72	- })
73	- },
74	- handleCard (index) {
75	- if (this.cardList[index].couponState == 1) {
76	- this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: 499 } })
77	- }
78	- },
79	- }
80	-}
81	-</script>
82	-<style lang="scss" scoped>
83	-#cardBox {
84	- width: 100%;
85	- min-height: 100%;
86	- background: rgb(246, 246, 250);
87	- overflow: hidden;
88	- .card_item {
89	- width: 726px;
90	- height: 216px;
91	- background: url("../../assets/service/card.png");
92	- background-size: 100%;
93	- margin: 0 auto;
94	- margin-top: 20px;
95	- position: relative;
96	- p {
97	- width: 100%;
98	- margin: 0;
99	- }
100	- .left {
101	- display: inline-block;
102	- width: 68%;
103	- height: 100%;
104	- vertical-align: top;
105	- box-sizing: border-box;
106	- padding: 24px 40px;
107	- padding-right: 0;
108	- .top {
109	- display: flex;
110	- img {
111	- width: 66px;
112	- height: 66px;
113	- background: #d8d8d8;
114	- border-radius: 6px;
115	- }
116	- .title {
117	- font-size: 24px;
118	- font-weight: bold;
119	- margin-left: 10px;
120	- word-break: break-all;
121	- span {
122	- color: #7f5316;
123	- }
124	- }
125	- }
126	- }
127	- .right {
128	- width: 32%;
129	- height: 100%;
130	- display: inline-flex;
131	- align-content: center;
132	- flex-wrap: wrap;
133	- position: relative;
134	- }
135	- .end_time {
136	- font-size: 24px;
137	- color: #999;
138	- left: 40px;
139	- position: absolute;
140	- bottom: 30px;
141	- }
142	- .discount {
143	- text-align: center;
144	- font-size: 60px;
145	- font-weight: bold;
146	- span {
147	- font-size: 24px;
148	- }
149	- &.disable {
150	- color: #999;
151	- }
152	- }
153	- .usenow {
154	- font-size: 32px;
155	- text-align: center;
156	- font-weight: bold;
157	- margin-top: 10px;
158	- &.disable {
159	- color: #999;
160	- }
161	- }
162	- }
163	-}
164	-</style>
165	\ No newline at end of file	0	\ No newline at end of file
	@@ -67,7 +67,38 @@ export default {		@@ -67,7 +67,38 @@ export default {
67	duration: 0,	67	duration: 0,
68	forbidClick: true,	68	forbidClick: true,
69	});	69	});
70	- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/CourseList/ByIdList`, this.proId.split(',')).then((res) => {	70	+ // this.mgop({
		71	+ // api: 'mgop.sz.hswsy.CourseListByIdList', // 必须
		72	+ // host: 'https://mapi.zjzwfw.gov.cn/',
		73	+ // dataType: 'JSON',
		74	+ // type: 'POST',
		75	+ // appKey: 'fuxgnukl+2001895516+edccpx', // 必须
		76	+ // headers: {
		77	+ // // 'isTestUrl': '1'
		78	+ // },
		79	+ // data: {idList:["1502","1524","1551","1570","1572"]},
		80	+ // onSuccess: res => {
		81	+ // this.$toast.clear();
		82	+ // let proList = res.data.data;
		83	+ // for (let i in proList) {
		84	+ // proList[i].course_labels = proList[i].course_labels?.split(',');
		85	+ // proList[i].coverUrl = proList[i]?.coverList[0]?.cover_url
		86	+ // if (proList[i].startDate) {
		87	+ // proList[i].week = this.formatWeek(this.Moment(proList[i].startDate).format('d'));
		88	+ // proList[i].startDate = this.Moment(proList[i].startDate).format('YYYY.M.D');
		89	+ // proList[i].endDate = this.Moment(proList[i].endDate).format('YYYY.M.D');
		90	+ // }
		91	+ // }
		92	+ // console.log(proList)
		93	+ // this.proList = proList
		94	+ // },
		95	+ // onFail: err => {
		96	+ // console.log('err', err)
		97	+ // }
		98	+ // });
		99	+ this.yxAxios.post(`https://yanxue.myjxt.com/api/StudiesWap/CourseList/ByIdList`, {
		100	+ idList:this.proId
		101	+ }).then((res) => {
71	this.$toast.clear();	102	this.$toast.clear();
72	let proList = res.data.data;	103	let proList = res.data.data;
73	for (let i in proList) {	104	for (let i in proList) {
	@@ -90,15 +121,23 @@ export default {		@@ -90,15 +121,23 @@ export default {
90	//领取优惠券	121	//领取优惠券
91	reCard () {	122	reCard () {
92	if (this.geted) return;	123	if (this.geted) return;
93	- this.yxAxios.post(`${this.proxyUrl}/prod/api/coupon/get`, {
94	- unionId: this.unionId,
95	- "proId": this.proId,
96	- "proName": this.proName,
97	- "pic": this.pics,
98	- couponId: this.cardId,
99	- })
100	- .then((res) => {
101	- // console.log(res.data)	124	+ this.mgop({
		125	+ api: 'mgop.sz.hswsy.CouponGet', // 必须
		126	+ host: 'https://mapi.zjzwfw.gov.cn/',
		127	+ dataType: 'JSON',
		128	+ type: 'POST',
		129	+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
		130	+ headers: {
		131	+ // 'isTestUrl': '1'
		132	+ },
		133	+ data: {
		134	+ "unionId": sessionStorage.getItem('centerNo'),
		135	+ "proId": this.proId,
		136	+ "proName": this.proName,
		137	+ "pic": this.pics,
		138	+ "couponId": this.cardId,
		139	+ },
		140	+ onSuccess: res => {
102	if (res.data.code == 200) {	141	if (res.data.code == 200) {
103	sessionStorage.setItem('cardCousreGeted', true)	142	sessionStorage.setItem('cardCousreGeted', true)
104	this.geted = true;	143	this.geted = true;
	@@ -106,7 +145,11 @@ export default {		@@ -106,7 +145,11 @@ export default {
106	} else {	145	} else {
107	this.$toast.fail(res.data.message);	146	this.$toast.fail(res.data.message);
108	}	147	}
109	- })	148	+ },
		149	+ onFail: err => {
		150	+ console.log('err', err)
		151	+ }
		152	+ });
110		153
111	},	154	},
112	onConfirm (item) {	155	onConfirm (item) {
	@@ -31,18 +31,9 @@ export default {		@@ -31,18 +31,9 @@ export default {
31	return {	31	return {
32	cardList: [],	32	cardList: [],
33	selectIndex: -1,	33	selectIndex: -1,
34	- unionId: ''
35	}	34	}
36	},	35	},
37	mounted () {	36	mounted () {
38	- if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
39	- this.unionId = sessionStorage.getItem('unionId');
40	- } else {
41	- this.unionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU';
42	- }
43	- // this.$nextTick(() => {
44	- // this.getOrderCoupon()
45	- // })
46	let cardList = sessionStorage.getItem('proCoupon')	37	let cardList = sessionStorage.getItem('proCoupon')
47	if (cardList) {	38	if (cardList) {
48	this.cardList = JSON.parse(cardList)	39	this.cardList = JSON.parse(cardList)