diff --git a/src/App.vue b/src/App.vue
index 2166821..85211f5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,18 +1,17 @@
 <template>
-  <div id="app" :class="isElder?'elder':''">
-
+  <div id="app" :class="isElder ? 'elder' : ''">
     <router-view @setElder="setElder" />
   </div>
 </template>
 <script>
 // import vConsole from 'vconsole'
 export default {
-  data () {
+  data() {
     return {
-      isElder: false
+      isElder: false,
     }
   },
-  mounted () {
+  mounted() {
     // new vConsole()
     ZWJSBridge.onReady(() => {
       console.log('初始化完成后，执行bridge方法')
@@ -23,21 +22,23 @@ export default {
     } else {
       ZWJSBridge.getUiStyle({})
         .then((result) => {
-          console.log(result);
+          console.log(result)
           if (result.uiStyle == 'elder') {
-            this.isElder = true;
+            this.isElder = true
             localStorage.setItem('isElder', 1)
           }
         })
         //浙里办APP 6.11.0 版本以下版本标准模式兼容
-        .catch((error) => { console.log(error); });
+        .catch((error) => {
+          console.log(error)
+        })
     }
   },
   methods: {
-    setElder (e) {
+    setElder(e) {
       this.isElder = e
-    }
-  }
+    },
+  },
 }
 </script>
 <style>
diff --git a/src/common/index.js b/src/common/index.js
index 41cf202..9d17501 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -2,8 +2,10 @@ var common = function() {
     return {
         //取地址参数方法
         getUrlParam: function(name) {
+            console.log(name)
             var url = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
             var newUrl = window.location.search.substr(1).match(url);
+            console.log(window.location)
             if (newUrl != null) {
                 return unescape(newUrl[2]);
             } else {
diff --git a/src/main.js b/src/main.js
index 7ef2f9a..1b3ae2c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,7 +7,8 @@ import store from './store'
 import Moment from 'moment'
 Vue.prototype.Moment = Moment;
 
-// Vue.prototype.yanxueUrl = 'https://yanxue.myjxt.com';
+Vue.prototype.proxyUrl = 'https://proxy.shunzhi.net/prod';
+Vue.prototype.yanxueUrl = 'https://yanxue.myjxt.com';
 // Vue.prototype.dataUrl = 'http://47.110.50.251:9010'
 Vue.prototype.dataUrl = 'https://proxy.shunzhi.net/consulte'
 // Vue.prototype.kqUrl = 'http://47.110.50.251:9092/'
diff --git a/src/router/index.js b/src/router/index.js
index c6997ec..1bb2648 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,9 +5,6 @@ import HomeUserInfo from '@/views/Home/HomeUserInfo.vue'
 
 import ServiceAbroadDetail from '@/views/Service/AbroadDetail.vue'
 import ServiceAbroadEvaluate from '@/views/Service/AbroadEvaluate.vue'
-import ServiceDatePackage from '@/views/Service/DatePackage.vue'
-import ServiceCheckOrder from '@/views/Service/CheckOrder.vue'
-import ServiceCardSelect from '@/views/Service/CardSelect.vue'
 import ServiceOrderXST from '@/views/Service/ServiceOrderXST.vue'
 import evaluateCourse from '@/views/Service/evaluateCourse.vue'
 import evaluateBase from '@/views/Service/evaluateBase.vue' //基地评价
@@ -15,8 +12,6 @@ import evaluateDetail from '@/views/Service/evaluateDetail.vue' //评价详情
 
 import ServiceKQ from '@/views/Service/ServiceKQ.vue' //柯桥研学
 
-import CardBoxXST from '@/views/Service/CardBoxXST.vue'
-import CardCourseList from '@/views/Service/CardCourseList.vue' //优惠券对应商品列表
 import YanxueCode from '@/views/Home/YanxueCode.vue' //研学码
 import YanxueInfo from '@/views/Home/YanxueInfo.vue' //研学码信息
 import chooseSchool from '@/views/Service/component/chooseSchool.vue' //选择学校
@@ -87,46 +82,6 @@ const routes = [{
         }
     },
 
-    {
-        path: '/date_package',
-        name: 'ServiceDatePackage',
-        component: ServiceDatePackage,
-        meta: {
-            title: '选择套餐/日期'
-        }
-    },
-    {
-        path: '/check_order',
-        name: 'ServiceCheckOrder',
-        component: ServiceCheckOrder,
-        meta: {
-            title: '支付'
-        }
-    },
-    {
-        path: '/card_select',
-        name: 'ServiceCardSelect',
-        component: ServiceCardSelect,
-        meta: {
-            title: '我的优惠券'
-        }
-    },
-    {
-        path: '/CardBoxXST',
-        name: 'CardBoxXST',
-        component: CardBoxXST,
-        meta: {
-            title: '我的优惠券'
-        }
-    },
-    {
-        path: '/CardCourseList',
-        name: 'CardCourseList',
-        component: CardCourseList,
-        meta: {
-            title: '限时限量特惠大集合'
-        }
-    },
 
     {
         path: '/service_orderXST',
diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue
index eddf6ae..d9f5ac8 100644
--- a/src/views/Home/Home.vue
+++ b/src/views/Home/Home.vue
@@ -130,10 +130,6 @@ export default {
     handleGroup() {
       this.$toast('暂未开放，敬请期待！')
     },
-    // 我的优惠券
-    handleMyCard() {
-      this.$router.push({ name: 'CardBoxXST' })
-    },
     // 个人信息
     handleMyInfo() {
       this.$router.push({ name: 'HomeUserInfo' })
@@ -201,42 +197,27 @@ export default {
     },
     // 获取用户信息
     getUserInfo() {
-      this.mgop({
-        api: 'mgop.sz.hswsy.getPortalUserByNum', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          userNum: this.centerNo,
-        },
-        onSuccess: (res) => {
-          console.log('getUserInfo', res)
-          if (res.data.code == 200) {
-            let userInfo = res.data.data.userInfo
-            this.userInfo = userInfo
-            localStorage.setItem('userInfo', JSON.stringify(userInfo))
-            if (userInfo.schoolNames || userInfo.schoolNames == [] || userInfo.schoolNames == 'null') {
-              userInfo.schoolNames = userInfo.schoolNames.filter((n) => n)
-              localStorage.setItem('schoolNames', JSON.stringify(userInfo.schoolNames))
-              this.$store.commit('changeSchool', userInfo.schoolNames)
-              if (!localStorage.getItem('schoolNamesChoose') || localStorage.getItem('schoolNamesChoose') == 'null') {
-                localStorage.setItem('schoolNamesChoose', JSON.stringify(userInfo.schoolNames[0]))
-                this.schoolNamesChoose = userInfo.schoolNames[0]
-              }
-            } else {
-              localStorage.setItem('schoolNames', [])
-              this.$store.commit('changeSchool', [])
+      // alert('getUserInfo:' + this.centerNo)
+      this.yxAxios.get(`${this.proxyUrl}/user/info/getPortalUserByNum?userNum=${this.centerNo}`).then((res) => {
+        console.log('getUserInfo', res)
+        if (res.data.code == 200) {
+          let userInfo = res.data.data.userInfo
+          this.userInfo = userInfo
+          localStorage.setItem('userInfo', JSON.stringify(userInfo))
+          if (userInfo.schoolNames || userInfo.schoolNames == [] || userInfo.schoolNames == 'null') {
+            userInfo.schoolNames = userInfo.schoolNames.filter((n) => n)
+            localStorage.setItem('schoolNames', JSON.stringify(userInfo.schoolNames))
+            this.$store.commit('changeSchool', userInfo.schoolNames)
+            if (!localStorage.getItem('schoolNamesChoose') || localStorage.getItem('schoolNamesChoose') == 'null') {
+              localStorage.setItem('schoolNamesChoose', JSON.stringify(userInfo.schoolNames[0]))
+              this.schoolNamesChoose = userInfo.schoolNames[0]
             }
+          } else {
+            localStorage.setItem('schoolNames', [])
+            this.$store.commit('changeSchool', [])
           }
-          this.showChildList = true
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
+        }
+        this.showChildList = true
       })
     },
     formatterTime(time) {
diff --git a/src/views/Home/HomeUserInfo.vue b/src/views/Home/HomeUserInfo.vue
index 40d4bb3..9fa41f3 100644
--- a/src/views/Home/HomeUserInfo.vue
+++ b/src/views/Home/HomeUserInfo.vue
@@ -9,29 +9,28 @@
       </van-cell>
       </template>
     </van-popover> -->
-      
+
       <van-cell title="身份证" :value="idCard" />
       <van-cell title="手机号" :value="phone" />
       <van-cell title="关注主学校" :value="schoolNamesChoose" />
     </van-cell-group>
-    
   </div>
 </template>
 <script>
 export default {
-  data () {
+  data() {
     return {
-      nickName: '',//姓名
-      gender: '',//性别
-      idCard: '',//身份证
-      phone: '',//手机号
-      schoolNamesChoose: '',//学校
-      showGenderPopover:false,
+      nickName: '', //姓名
+      gender: '', //性别
+      idCard: '', //身份证
+      phone: '', //手机号
+      schoolNamesChoose: '', //学校
+      showGenderPopover: false,
       actions: [{ text: '选项一' }, { text: '选项二' }, { text: '选项三' }],
     }
   },
-  mounted () {
-    this.centerNo = localStorage.getItem('centerNo');
+  mounted() {
+    this.centerNo = localStorage.getItem('centerNo')
     const userInfo = JSON.parse(localStorage.getItem('userInfo'))
     this.nickName = userInfo.nickName
     this.gender = userInfo.gender
@@ -43,41 +42,25 @@ export default {
     }
   },
   methods: {
-     onSelect(action) {
-      Toast(action.text);
+    onSelect(action) {
+      Toast(action.text)
     },
     // 获取用户信息
-    getUserInfo: function () {
+    getUserInfo: function() {
       this.$toast.loading({
         message: '加载中...',
         duration: 0,
-        forbidClick: true
+        forbidClick: true,
       })
-      this.mgop({
-        api: 'mgop.sz.hswsy.getPortalUserByNum', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "userNum": this.centerNo
-        },
-        onSuccess: res => {
+      this.yxAxios.get(`${this.proxyUrl}/user/info/getPortalUserByNum?userNum=${this.centerNo}`).then((res) => {
         this.$toast.clear()
-          if (res.data.code == 200) {
-             const userInfo = res.data.data.userInfo
+        if (res.data.code == 200) {
+          const userInfo = res.data.data.userInfo
           localStorage.setItem('userInfo', JSON.stringify(userInfo))
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
         }
-      });
+      })
     },
-  }
+  },
 }
 </script>
 <style lang="scss">
@@ -90,4 +73,4 @@ export default {
     padding: 30px 32px;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Home/MyClassList.vue b/src/views/Home/MyClassList.vue
index 43f96e5..c2103e8 100644
--- a/src/views/Home/MyClassList.vue
+++ b/src/views/Home/MyClassList.vue
@@ -3,31 +3,45 @@
     <div class="header">
       <van-swipe class="my-swipe" indicator-color="white" v-if="baseInfo.coverList && baseInfo.coverList.length > 0">
         <van-swipe-item v-for="n in baseInfo.coverList" :key="n.id">
-          <video v-if="n.cover_url.indexOf('.mp4') > -1" id="video" :src="n.cover_url" poster="" controls="controls" windowlessvideo="true" playsinline="true" webkit-playsinline="true" x5-playsinline="true" x-webkit-airplay="allow" width="100%" height="260px" type="video/mp4"></video>
+          <video
+            v-if="n.cover_url.indexOf('.mp4') > -1"
+            id="video"
+            :src="n.cover_url"
+            poster=""
+            controls="controls"
+            windowlessvideo="true"
+            playsinline="true"
+            webkit-playsinline="true"
+            x5-playsinline="true"
+            x-webkit-airplay="allow"
+            width="100%"
+            height="260px"
+            type="video/mp4"
+          ></video>
           <img v-if="n.cover_url.indexOf('.mp4') == -1" :src="n.cover_url" />
         </van-swipe-item>
       </van-swipe>
       <img v-else src="@/assets/service/defCoure.jpg" alt="" />
     </div>
     <div class="base_info">
-      <p class="base_title">{{baseInfo.baseName}}</p>
+      <p class="base_title">{{ baseInfo.baseName }}</p>
       <div class="rate">
         <van-rate v-model="baseInfo.baseScore" color="#FFCC00" :size="16" readonly />
         <span>{{ baseInfo.baseScore }}</span>
       </div>
       <p class="address">
         <van-icon name="location" class="icon" />
-        {{baseInfo.address}}
+        {{ baseInfo.address }}
       </p>
       <p class="phone">
         <van-icon name="phone" class="icon" />
-        {{baseInfo.phone}}
+        {{ baseInfo.phone }}
       </p>
     </div>
     <div class="select_student" @click="selectStudent">
       <p class="select_tip">请选择需要打卡的孩子</p>
       <div class="student" v-if="selectedContact.travelerName">
-        <span>{{selectedContact.travelerName}}</span>
+        <span>{{ selectedContact.travelerName }}</span>
         <van-icon name="close" class="icon" />
       </div>
       <div class="student" v-else>
@@ -35,9 +49,9 @@
       </div>
     </div>
     <div class="btns" @click="getPosition">立即打卡</div>
-    <van-popup v-model="failShow" round closeable :style="{ width:'80%'}">
+    <van-popup v-model="failShow" round closeable :style="{ width: '80%' }">
       <div class="success">
-        <img src="@/assets/tip1.png" alt="">
+        <img src="@/assets/tip1.png" alt="" />
         <h3>打卡失败！</h3>
         <p>您当前所在的地理位置不在课程的打卡范围内！</p>
       </div>
@@ -47,169 +61,135 @@
 
 <script>
 export default {
-  data () {
+  data() {
     return {
       baseInfo: '',
       list: [],
       baseId: '',
       userInfo: '',
       failShow: false,
-      selectedContact: '',//选择的出行人
-
+      selectedContact: '', //选择的出行人
     }
   },
-  mounted () {
-    var userInfo = localStorage.getItem('userInfo');
+  mounted() {
+    var userInfo = localStorage.getItem('userInfo')
     if (userInfo) {
-      this.userInfo = JSON.parse(userInfo);
+      this.userInfo = JSON.parse(userInfo)
     }
     // 选择的出行人
-    let selectedContactArr = localStorage.getItem('selectedContactArr');
+    let selectedContactArr = localStorage.getItem('selectedContactArr')
     if (selectedContactArr) {
-      selectedContactArr = JSON.parse(selectedContactArr);
+      selectedContactArr = JSON.parse(selectedContactArr)
       this.selectedContact = selectedContactArr[0]
     }
-    this.baseId = this.$route.query.qrresult;
-    this.GetStudyBaseDetail(this.baseId);
+    this.baseId = this.$route.query.qrresult
+    this.GetStudyBaseDetail(this.baseId)
   },
   methods: {
-    AddSign () {
-
+    AddSign() {
       this.$toast.loading({
         message: '请求中...',
-      });
-      this.mgop({
-        api: 'mgop.sz.hswsy.AddSign', // 必须
-        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('打卡签到成功');
+      })
+      this.yxAxios
+        .get(`${this.yanxueUrl}/api/BaseManage/AddSign?userId=${this.selectedContact.travelerNum}&baseId=${this.baseId}&type=3`)
+        .then((res) => {
+          this.$toast.success('打卡签到成功')
           setTimeout(() => {
             this.$router.push({ name: 'Home' })
           }, 1000)
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
+        })
     },
     // 获取基地信息
-    GetStudyBaseDetail (baseId) {
+    GetStudyBaseDetail(baseId) {
       this.$toast.loading({
         message: '请求中...',
-      });
-      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": 0,
-          "cs": '绍兴市',
-          "id": baseId
-        },
-        onSuccess: res => {
+      })
+      this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetStudyBaseDetail?userId=0&cs=绍兴市&id=${baseId}`).then((res) => {
+        this.$toast.clear()
+        console.log('基地信息：', res.data)
+        if (res.data.data) {
           this.$toast.clear()
-          console.log('基地信息：', res.data)
-          if (res.data.data) {
-            this.$toast.clear();
-            this.baseInfo = res.data.data;
-          } else {
-            this.$toast.fail(res.data.message)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
+          this.baseInfo = res.data.data
+        } else {
+          this.$toast.fail(res.data.message)
         }
-      });
+      })
     },
-    getPosition () {
+    getPosition() {
       if (!this.selectedContact.travelerNum) {
-        this.$toast('请选择需要打卡的孩子');
-        return false;
+        this.$toast('请选择需要打卡的孩子')
+        return false
       }
-      if (this.baseInfo.signLong == 0 && this.baseInfo.signLat == 0) {  //基地没数坐标
-        this.AddSign();
+      if (this.baseInfo.signLong == 0 && this.baseInfo.signLat == 0) {
+        //基地没数坐标
+        this.AddSign()
         return false
       }
-      var basePosition = [this.baseInfo.signLong, this.baseInfo.signLat];
-      AMap.convertFrom(basePosition, 'baidu', function (status, result) {
-        console.log('基地定位转换：',result)
+      var basePosition = [this.baseInfo.signLong, this.baseInfo.signLat]
+      AMap.convertFrom(basePosition, 'baidu', function(status, result) {
+        console.log('基地定位转换：', result)
         if (result.info === 'ok') {
-          basePosition = [result.locations[0].lng, result.locations[0].lat]; // Array.<LngLat>
+          basePosition = [result.locations[0].lng, result.locations[0].lat] // Array.<LngLat>
         }
-      });
+      })
       this.$toast.loading({
         message: '请求中...',
-      });
-      this.getNowPosition((posi) => { //获取当前位置坐标
-      console.log('获取当前位置坐标:',posi)
-        this.$toast.clear();
+      })
+      this.getNowPosition((posi) => {
+        //获取当前位置坐标
+        console.log('获取当前位置坐标:', posi)
+        this.$toast.clear()
         if (posi) {
-          var nowPosition = [posi.position.lng, posi.position.lat];
-          var distance = AMap.GeometryUtil.distance(nowPosition, basePosition);
-      console.log('两点距离:',distance)
+          var nowPosition = [posi.position.lng, posi.position.lat]
+          var distance = AMap.GeometryUtil.distance(nowPosition, basePosition)
+          console.log('两点距离:', distance)
           console.log(parseInt(distance), nowPosition, basePosition)
           if (parseInt(distance) > 500) {
-            this.failShow = true;
+            this.failShow = true
           } else {
             // alert('定位小于500m')
-            this.AddSign();
+            this.AddSign()
           }
         } else {
           // alert('getNowPosition没有返回')
         }
-      });
+      })
     },
-    getNowPosition: function (callback) {
-      let mapObj = new AMap.Map('iCenter');
-      mapObj.plugin('AMap.Geolocation', function () {
+    getNowPosition: function(callback) {
+      let mapObj = new AMap.Map('iCenter')
+      mapObj.plugin('AMap.Geolocation', function() {
         let geolocation = new AMap.Geolocation({
-          enableHighAccuracy: true,//是否使用高精度定位，默认:true
-          timeout: 10000,          //超过10秒后停止定位，默认：无穷大
-          maximumAge: 0,           //定位结果缓存0毫秒，默认：0
-          convert: true,           //自动偏移坐标，偏移后的坐标为高德坐标，默认：true
-          showButton: true,        //显示定位按钮，默认：true
-          buttonPosition: 'LB',    //定位按钮停靠位置，默认：'LB'，左下角
-          buttonOffset: new AMap.Pixel(0, 0),//定位按钮与设置的停靠位置的偏移量，默认：Pixel(10, 20)
-          showMarker: true,        //定位成功后在定位到的位置显示点标记，默认：true
-          showCircle: true,        //定位成功后用圆圈表示定位精度范围，默认：true
-          panToLocation: true,     //定位成功后将定位到的位置作为地图中心点，默认：true
-          zoomToAccuracy: true      //定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
-        });
-        mapObj.addControl(geolocation);
-        geolocation.getCurrentPosition();
-        AMap.event.addListener(geolocation, 'complete', function (res) {
+          enableHighAccuracy: true, //是否使用高精度定位，默认:true
+          timeout: 10000, //超过10秒后停止定位，默认：无穷大
+          maximumAge: 0, //定位结果缓存0毫秒，默认：0
+          convert: true, //自动偏移坐标，偏移后的坐标为高德坐标，默认：true
+          showButton: true, //显示定位按钮，默认：true
+          buttonPosition: 'LB', //定位按钮停靠位置，默认：'LB'，左下角
+          buttonOffset: new AMap.Pixel(0, 0), //定位按钮与设置的停靠位置的偏移量，默认：Pixel(10, 20)
+          showMarker: true, //定位成功后在定位到的位置显示点标记，默认：true
+          showCircle: true, //定位成功后用圆圈表示定位精度范围，默认：true
+          panToLocation: true, //定位成功后将定位到的位置作为地图中心点，默认：true
+          zoomToAccuracy: true, //定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
+        })
+        mapObj.addControl(geolocation)
+        geolocation.getCurrentPosition()
+        AMap.event.addListener(geolocation, 'complete', function(res) {
           // alert('返回定位信息:' + JSON.stringify(res))
           console.log('返回定位信息:', res)
-          callback(res);
-        });//返回定位信息
-        AMap.event.addListener(geolocation, 'error', function (res) {
+          callback(res)
+        }) //返回定位信息
+        AMap.event.addListener(geolocation, 'error', function(res) {
           // alert('返回定位出错信息:' + JSON.stringify(res))
           console.log('返回定位出错信息:', res)
-          callback();
-        });      //返回定位出错信息
+          callback()
+        }) //返回定位出错信息
       })
-
     },
     // 选择孩子
-    selectStudent () {
+    selectStudent() {
       this.$router.push({ name: 'SelectContact', query: { limit: 1, hideParent: 1 } })
-    }
-  }
+    },
+  },
 }
 </script>
 
diff --git a/src/views/Home/StudentDetail.vue b/src/views/Home/StudentDetail.vue
index 13ebeae..4a91ec0 100644
--- a/src/views/Home/StudentDetail.vue
+++ b/src/views/Home/StudentDetail.vue
@@ -3,28 +3,36 @@
     <div class="infomation">
       <div class="top">
         <div>
-          <img class="head" :src="defaultHead" alt="">
+          <img class="head" :src="defaultHead" alt="" />
           <div class="right">
-            <p class="name">{{studentInfo.travelerName}}<span v-if="studentInfo.enrollYear">{{studentInfo.enrollYear}}级</span></p>
-            <p class="school_name">{{studentInfo.schoolName}}</p>
+            <p class="name">
+              {{ studentInfo.travelerName }}<span v-if="studentInfo.enrollYear">{{ studentInfo.enrollYear }}级</span>
+            </p>
+            <p class="school_name">{{ studentInfo.schoolName }}</p>
           </div>
         </div>
         <HomeScan></HomeScan>
       </div>
       <div class="count_box">
         <div class="count_item">
-          <p class="count"><span>{{signCheckCountInfo.signCount}}</span>/次</p>
+          <p class="count">
+            <span>{{ signCheckCountInfo.signCount }}</span
+            >/次
+          </p>
           <p class="des">基地打卡次数</p>
         </div>
         <div class="line"></div>
         <div class="count_item">
-          <p class="count"><span>{{signCheckCountInfo.courseDays}}</span>/天</p>
+          <p class="count">
+            <span>{{ signCheckCountInfo.courseDays }}</span
+            >/天
+          </p>
           <p class="des">课程实践</p>
         </div>
       </div>
       <div class="icon_box">
         <div class="icon_item" @click="handleYanxue">
-          <img src="@/assets/home/stu_icon1.png" alt="">
+          <img src="@/assets/home/stu_icon1.png" alt="" />
           <p>研学码</p>
         </div>
         <!-- <div class="icon_item" @click="contactService">
@@ -40,36 +48,36 @@
     <div class="list_box">
       <van-tabs v-model="active" color="#21A3FF">
         <van-tab title="基地记录">
-          <div class="list_item" v-for="(item,index) in baseList" :key="index">
+          <div class="list_item" v-for="(item, index) in baseList" :key="index">
             <div class="left">
-              <p class="day">{{item.day}}</p>
-              <p class="minute">{{item.minute}}</p>
+              <p class="day">{{ item.day }}</p>
+              <p class="minute">{{ item.minute }}</p>
             </div>
             <div class="line"></div>
             <div class="right">
-              <img :src="item.baseUrl" alt="">
-              <p class="item_title">{{item.baseName}} </p>
-              <button class="active" v-if="item.evaluationId==0" @click="evaluateBase(item)">去评价</button>
+              <img :src="item.baseUrl" alt="" />
+              <p class="item_title">{{ item.baseName }}</p>
+              <button class="active" v-if="item.evaluationId == 0" @click="evaluateBase(item)">去评价</button>
               <button v-else @click="evaluateBaseDetail(item)">查看评价</button>
             </div>
           </div>
-          <van-empty v-if="baseList.length==0" description="暂无基地记录" />
+          <van-empty v-if="baseList.length == 0" description="暂无基地记录" />
         </van-tab>
         <van-tab title="课程记录">
-          <div class="list_item" v-for="(item,index) in courseList" :key="index">
+          <div class="list_item" v-for="(item, index) in courseList" :key="index">
             <div class="left">
-              <p class="day">{{item.day}}</p>
-              <p class="minute">{{item.minute}}</p>
+              <p class="day">{{ item.day }}</p>
+              <p class="minute">{{ item.minute }}</p>
             </div>
             <div class="line"></div>
             <div class="right">
-              <img :src="item.baseUrl" alt="">
-              <p class="item_title">{{item.baseName}} </p>
-              <button class="active" v-if="item.evaluationId==0" @click="evaluateCourse(item)">去评价</button>
+              <img :src="item.baseUrl" alt="" />
+              <p class="item_title">{{ item.baseName }}</p>
+              <button class="active" v-if="item.evaluationId == 0" @click="evaluateCourse(item)">去评价</button>
               <button v-else @click="evaluateCourseDetail(item)">查看评价</button>
             </div>
           </div>
-          <van-empty v-if="courseList.length==0" description="暂无课程记录" />
+          <van-empty v-if="courseList.length == 0" description="暂无课程记录" />
         </van-tab>
       </van-tabs>
     </div>
@@ -78,28 +86,28 @@
 <script>
 import HomeScan from '@/views/Home/component/HomeScan'
 export default {
-  data () {
+  data() {
     return {
       defaultHead: require('@/assets/head.png'),
       studentInfo: '',
-      courseList: [],//课程记录
-      baseList: [],//基地记录
-      signCheckCountInfo: '',//打卡和课程天数信息
-      active: 0
+      courseList: [], //课程记录
+      baseList: [], //基地记录
+      signCheckCountInfo: '', //打卡和课程天数信息
+      active: 0,
     }
   },
-  mounted () {
+  mounted() {
     let studentInfo = localStorage.getItem('StudentDetialInfo')
     this.studentInfo = JSON.parse(studentInfo)
     this.$nextTick(() => {
       if (!this.studentInfo?.travelerNum) {
         this.$toast.fail('学生信息缺失，请返回首页重试')
-        return;
+        return
       }
       this.$toast.loading({
         message: '加载中...',
         duration: 0,
-        forbidClick: true
+        forbidClick: true,
       })
       this.getCourseList()
       this.getBaseList()
@@ -108,22 +116,14 @@ export default {
   },
   methods: {
     // 获取课程记录
-    getCourseList () {
-      this.mgop({
-        api: 'mgop.sz.hswsy.CourseCheckDetail', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "userId": this.studentInfo?.travelerNum,
-          "pageIndex": 1,
-          "pageSize": 999
-        },
-        onSuccess: res => {
+    getCourseList() {
+      this.yxAxios
+        .post(`${this.yanxueUrl}/api/StudiesWap/CourseCheckDetail/List`, {
+          userId: this.studentInfo?.travelerNum,
+          pageIndex: 1,
+          pageSize: 999,
+        })
+        .then((res) => {
           this.$toast.clear()
           console.log('课程记录：', res.data)
           if (res.data.status == 1) {
@@ -137,29 +137,17 @@ export default {
           } else {
             this.$toast.fail(res.data.message)
           }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
+        })
     },
     // 获取基地记录
-    getBaseList () {
-      this.mgop({
-        api: 'mgop.sz.hswsy.SignDetail', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "userId": this.studentInfo?.travelerNum,
-          "pageIndex": 1,
-          "pageSize": 999
-        },
-        onSuccess: res => {
+    getBaseList() {
+      this.yxAxios
+        .post(`${this.yanxueUrl}/api/StudiesWap/SignDetail/List`, {
+          userId: this.studentInfo?.travelerNum,
+          pageIndex: 1,
+          pageSize: 999,
+        })
+        .then((res) => {
           this.$toast.clear()
           console.log('基地记录：', res.data)
           if (res.data.status == 1) {
@@ -173,27 +161,13 @@ export default {
           } else {
             this.$toast.fail(res.data.message)
           }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
+        })
     },
     // 根据用户编号获取打卡和课程天数信息
-    getSignCheckCountInfo () {
-      this.mgop({
-        api: 'mgop.sz.hswsy.SignCheckCountInfoByUserId', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "userId": this.studentInfo?.travelerNum,
-        },
-        onSuccess: res => {
+    getSignCheckCountInfo() {
+      this.yxAxios
+        .get(`${this.yanxueUrl}/api/StudiesWap/SignCheckCountInfo/ByUserId?userId=${this.studentInfo?.travelerNum}`)
+        .then((res) => {
           this.$toast.clear()
           console.log('天数：', res.data)
           if (res.data.status == 1) {
@@ -201,44 +175,40 @@ export default {
           } else {
             this.$toast.fail(res.data.message)
           }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
+        })
     },
     // 研学码
-    handleYanxue () {
+    handleYanxue() {
       this.$router.push({ name: 'YanxueCode' })
     },
     // 联系客服
-    contactService () {
+    contactService() {
       // if (this.detailData.mobiles) {
       //   location.href = "tel://" + this.detailData.mobiles.split(",")[0];
       // }
     },
     // 基地评价
-    evaluateBase (item) {
+    evaluateBase(item) {
       this.$router.push({ name: 'evaluateBase', query: { baseId: item.baseId, signId: item.signId } })
     },
     // 课程评价
-    evaluateCourse (item) {
-      let courseInfo = item;
+    evaluateCourse(item) {
+      let courseInfo = item
       courseInfo.id = courseInfo.orderId
       window.localStorage.setItem('courseInfo', JSON.stringify(courseInfo))
       this.$router.push({ name: 'evaluateCourse' })
     },
     // 基地评价详情
-    evaluateBaseDetail (item) {
+    evaluateBaseDetail(item) {
       this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId, baseId: item.baseId } })
     },
     // 课程评价详情
-    evaluateCourseDetail (item) {
+    evaluateCourseDetail(item) {
       this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId } })
-    }
+    },
   },
   components: {
-    HomeScan
+    HomeScan,
   },
 }
 </script>
@@ -249,7 +219,7 @@ export default {
   .infomation {
     width: 100%;
     height: 852px;
-    background: url("~@/assets/home/bg_stu.png");
+    background: url('~@/assets/home/bg_stu.png');
     background-size: 100%;
     background-position: center;
     .top {
@@ -451,22 +421,22 @@ export default {
       }
     }
     .list_box .list_item {
-      .left{
+      .left {
         font-size: 40px;
-        .minute{
+        .minute {
           font-size: 36px;
         }
       }
       .right {
-      button {
-        font-size: 32px;
-        padding: 0;
-      }
-      .item_title {
-        font-size: 40px;
+        button {
+          font-size: 32px;
+          padding: 0;
+        }
+        .item_title {
+          font-size: 40px;
+        }
       }
     }
-    }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Home/YanxueInfo.vue b/src/views/Home/YanxueInfo.vue
index 9ca9d3d..1744be5 100644
--- a/src/views/Home/YanxueInfo.vue
+++ b/src/views/Home/YanxueInfo.vue
@@ -12,7 +12,7 @@
 
 <script>
 export default {
-  data () {
+  data() {
     return {
       codeNum: '',
       userNum: '',
@@ -20,59 +20,41 @@ export default {
       name: '',
     }
   },
-  created () {
-
-    let studentInfo = JSON.parse(localStorage.getItem('StudentDetialInfo'));
+  created() {
+    let studentInfo = JSON.parse(localStorage.getItem('StudentDetialInfo'))
     this.userNum = studentInfo.travelerNum
     this.school = studentInfo.schoolName
     this.name = studentInfo.travelerName
-    this.codeNum = this.GetQueryString('qrresult') || studentInfo.studyCode;
+    this.codeNum = this.GetQueryString('qrresult') || studentInfo.studyCode
   },
   methods: {
-    getbind () {
+    getbind() {
       if (this.userNum == '' || this.codeNum == '') {
-        this.$toast('请先填写完整信息！');
-        return ;
+        this.$toast('请先填写完整信息！')
+        return
       }
-      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)
+      this.yxAxios.get(this.proxyUrl + '/user/info/bingStudyCode?userNum=' + this.userNum + '&code=' + this.codeNum).then((res) => {
+        console.log('接口返回', res.data)
+        if (res.data.code == '200') {
+          this.$toast('操作成功')
+          this.$router.push({ name: 'YanxueCode' })
+        } else {
+          this.$toast('操作失败:' + res.data.message)
         }
-      });
+      })
     },
     //扫一扫
-    saoYiSao () {
-      window.location.href = 'http://sao315.com/w/api/saoyisao?redirect_uri=https://payment.myjxt.com/center/%23/YanxueInfo';
+    saoYiSao() {
+      window.location.href = 'http://sao315.com/w/api/saoyisao?redirect_uri=https://payment.myjxt.com/center/%23/YanxueInfo'
     },
     // 获取链接参数
-    GetQueryString (name) {
-      var reg = new RegExp("\\b" + name + "=([^&]*)");
-      var r = location.href.match(reg);
-      if (r != null) return decodeURIComponent(r[1]);
-    }
-  }
+    GetQueryString(name) {
+      var reg = new RegExp('\\b' + name + '=([^&]*)')
+      var r = location.href.match(reg)
+      if (r != null) return decodeURIComponent(r[1])
+    },
+  },
 }
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/Home/component/AddChildPopupGroup.vue b/src/views/Home/component/AddChildPopupGroup.vue
index c45f6f0..50b4669 100644
--- a/src/views/Home/component/AddChildPopupGroup.vue
+++ b/src/views/Home/component/AddChildPopupGroup.vue
@@ -206,21 +206,13 @@ export default {
         duration: 0,
         forbidClick: true,
       })
-      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: {
+      this.http
+        .getMsg({
           phone: this.phone,
-        },
-        onSuccess: (res) => {
+        })
+        .then((res) => {
           this.$toast.clear()
-          if (res.data.code == 200 || res.data.success) {
+          if (res.success) {
             let i = 60
             codeInterval = setInterval(() => {
               if (i == 0) {
@@ -232,13 +224,9 @@ export default {
               i--
             }, 1000)
           } else {
-            this.$toast.fail(res.data?.message)
+            this.$toast.fail(res.message)
           }
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
-      })
+        })
     },
     // 获取手机号白名单信息,激活认证
     checkPhoneAndCode() {
@@ -259,21 +247,13 @@ export default {
         duration: 0,
         forbidClick: true,
       })
-      this.mgop({
-        api: 'mgop.sz.hswsy.checkPhone', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
+      this.yxAxios
+        .post(`${this.proxyUrl}/user/info/checkPhone`, {
           code: this.code,
           phone: this.phone,
           travelerNum: this.travelerNum,
-        },
-        onSuccess: (res) => {
+        })
+        .then((res) => {
           this.$toast.clear()
           if (res.data.code == 200) {
             this.$toast.success('认证成功')
@@ -281,11 +261,7 @@ export default {
           } else {
             this.$toast.fail(res.data?.message)
           }
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
-      })
+        })
     },
     // 获取身份证认证
     checkCard() {
@@ -302,20 +278,12 @@ export default {
         duration: 0,
         forbidClick: true,
       })
-      this.mgop({
-        api: 'mgop.sz.hswsy.checkIdCard', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
+      this.yxAxios
+        .post(`${this.proxyUrl}/user/info/checkIdCard`, {
           idCard: this.cardId,
           travelerNum: this.travelerNum,
-        },
-        onSuccess: (res) => {
+        })
+        .then((res) => {
           this.$toast.clear()
           if (res.data.code == 200) {
             this.$toast.success('认证成功')
@@ -323,41 +291,20 @@ export default {
           } else {
             this.$toast.fail(res.data?.message)
           }
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
-      })
+        })
     },
     // 初始化入学年份选项
     initYearArr() {
-      this.mgop({
-        api: 'mgop.sz.hswsy.SchoolManageGradeAll', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        onSuccess: (res) => {
-          if (res.data.status == 1) {
-            console.log('入学年份列表：', res)
-            let yearArr = res.data.data
-            let newYearArr = yearArr.map((x) => {
-              return {
-                value: x,
-                label: x,
-              }
-            })
-            this.yearArr = newYearArr
-          } else {
-            this.$toast.fail(res.data?.message)
+      this.yxAxios.get(`${this.yanxueUrl}/api/SchoolManage/Grade/All`).then((res) => {
+        console.log('入学年份列表：', res)
+        let yearArr = res.data.data
+        let newYearArr = yearArr.map((x) => {
+          return {
+            value: x,
+            label: x,
           }
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
+        })
+        this.yearArr = newYearArr
       })
     },
     selectYearOver(value) {
@@ -382,18 +329,8 @@ export default {
     },
     // 获取班级列表
     GetSchoolManageClass() {
-      this.mgop({
-        api: 'mgop.sz.hswsy.SchoolManageClassAll', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        onSuccess: (res) => {
-          if (res.data.status == 1) {
-            console.log('班级列表：', res)
+      this.yxAxios.get(`${this.yanxueUrl}/api/SchoolManage/Class/All`).then((res) => {
+        console.log('班级列表：', res)
         let classTypeArr = res.data.data
         let newClassTypeArr = classTypeArr.map((x) => {
           return {
@@ -402,13 +339,6 @@ export default {
           }
         })
         this.classTypeArr = newClassTypeArr
-          } else {
-            this.$toast.fail(res.data?.message)
-          }
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
       })
     },
     handleSelectArea() {
@@ -455,29 +385,18 @@ export default {
           duration: 0,
           forbidClick: true,
         })
-        this.mgop({
-          api: 'mgop.sz.hswsy.addStudent', // 必须
-          host: 'https://mapi.zjzwfw.gov.cn/',
-          dataType: 'JSON',
-          type: 'GET',
-          appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-          headers: {
-            //   'isTestUrl': '1'
-          },
-          data: postData,
-          onSuccess: (res) => {
-            console.log('添加学生：', res)
-            this.$toast.clear()
-            if (res.data.code == 200) {
-              this.$toast.success('添加学生成功')
+        this.yxAxios.post(`${this.proxyUrl}/user/info/addStudent`, postData).then((res) => {
+          console.log('添加学生：', res)
+          this.$toast.clear()
+          if (res.data.code == 200) {
+            this.$toast.success('添加学生成功')
+
+            setTimeout(() => {
               this.$emit('complete')
-            } else {
-              this.$toast.fail(res.data?.message)
-            }
-          },
-          onFail: (err) => {
-            console.log('err', err)
-          },
+            }, 500)
+          } else {
+            this.$toast.fail(res.data?.message)
+          }
         })
       }
     },
diff --git a/src/views/Home/component/HomeChildList.vue b/src/views/Home/component/HomeChildList.vue
index 3516a1f..b01c91b 100644
--- a/src/views/Home/component/HomeChildList.vue
+++ b/src/views/Home/component/HomeChildList.vue
@@ -65,20 +65,8 @@ export default {
         duration: 0,
         forbidClick: true
       })
-      this.mgop({
-        api: 'mgop.sz.hswsy.getPortalUserByNum', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "userNum": localStorage.getItem('centerNo')
-        },
-        onSuccess: res => {
-          console.log('getUserInfo', res)
+      this.yxAxios.get(`${this.proxyUrl}/user/info/getPortalUserByNum?userNum=${localStorage.getItem('centerNo')}`).then((res) => {
+        console.log('getUserInfo', res)
           this.$toast.clear()
           if (res.data.code == 200) {
             const userInfo = res.data.data.userInfo
@@ -94,11 +82,7 @@ export default {
               this.$store.commit('changeSchool', [])
             }
           }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
+      })
     },
     addStudent () {
       this.step = 1
diff --git a/src/views/Service/AbroadDetail.vue b/src/views/Service/AbroadDetail.vue
index 0dec0e3..3965118 100644
--- a/src/views/Service/AbroadDetail.vue
+++ b/src/views/Service/AbroadDetail.vue
@@ -36,23 +36,6 @@
         </template>
       </div>
     </div>
-    <!-- <div class="package top_border">
-      <p class="package_title">套餐类型/日期</p>
-      <div class="package_box" v-if="packageArr.length>0">
-        <div style="overflow:auto;">
-          <div class="package_item" :class="packageActive==index?'active':''" v-for="(item, index) in packageArr" :key="index" @click="handlePackageDay(index)">
-            <p class="date">{{ item.day }}</p>
-            <p class="week">{{ item.week }}</p>
-            <img class="select" src="@/assets/service/select.png" alt="" />
-          </div>
-        </div>
-        <div class="package_item package_item_more" @click="checkDatePackage()" v-if="packageArr.length>5">
-          <img class="more_icon" src="@/assets/service/more.png" alt="" />
-          <p class="more_text">查看更多</p>
-        </div>
-      </div>
-      <img class="notime" v-if="packageArr.length==0" src="@/assets/service/notime.png" alt="">
-    </div> -->
     <div class="package top_border" v-if="packageArr.length>0&&packageArr[packageActive].comboInfoList.length>1">
       <div class="package_box">
         <div style="overflow:auto;">
@@ -93,8 +76,6 @@
 import AbroadDes from './component/AbroadDetail/AbroadDes';
 import AbroadBase from './component/AbroadDetail/AbroadBase';
 import AbroadEvaluate from './component/AbroadDetail/AbroadEvaluate';
-import CountDown from './component/AbroadDetail/CountDown';
-import AbroadCoupon from './component/AbroadDetail/AbroadCoupon';
 import './AbroadDetail.scss';
 export default {
   name: "ServiceAbroadDetail",
@@ -122,12 +103,6 @@ export default {
     this.GetCourseDetail();
   },
   methods: {
-    // 点击套餐日期
-    handlePackageDay (index) {
-      this.packageActive = index;
-      this.packageTypeActive = 0;//重置套餐类型选择
-      //TODO 获取该日所包含的套餐
-    },
 
     // 点击预约
     checkDatePackage () {
@@ -161,22 +136,8 @@ export default {
       });
 
       this.addReadNum(this.courseId)
-      
-      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();
+      this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetCourseDetail?id=${this.courseId}&cs=绍兴市`).then((res) => {
+        this.$toast.clear();
           if (res.data.data && res.data.data.id !== 0) {
             let detailData = res.data.data;
             console.log('产品详情：', detailData)
@@ -191,7 +152,6 @@ export default {
                 price: detailData.price,
               })
             );
-            this.getPackageData(); //获取套餐列表
           } else {
             let message = res.data.message;
             if (!message) {
@@ -199,104 +159,9 @@ export default {
             }
             this.$toast.fail(message)
           }
-        },
-        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.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 => {
-          console.log('套餐列表:', res.data.data);
-          if (res.data.data) {
-            let allPackage = res.data.data;
-            let usefulPackage = [];
-            for (let i in allPackage) {
-              if (allPackage[i]?.comboList?.length > 0) {
-                usefulPackage.push(allPackage[i]);
-              }
-            }
-            this.packageData = usefulPackage;
-            localStorage.setItem(
-              "packageData",
-              JSON.stringify(usefulPackage)
-            );
-            this.setPackageArr();
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    // 设置套餐价格
-    setPackageArr () {
-      console.log('含套餐的日期：', this.packageData);
-      let packageArr = [];
-      for (let i in this.packageData) {
-        let packageDate = this.Moment(
-          new Date(this.packageData[i]?.dayName.replace(/\-/g, "/"))
-        );
-        let week = packageDate.format("d");
-        week =
-          week == 1
-            ? "周一"
-            : week == 2
-              ? "周二"
-              : week == 3
-                ? "周三"
-                : week == 4
-                  ? "周四"
-                  : week == 5
-                    ? "周五"
-                    : week == 6
-                      ? "周六"
-                      : week == 0
-                        ? "周日"
-                        : "";
-        let comboInfoList = [];
-        let comboList = JSON.parse(JSON.stringify(this.packageData[i]?.comboList))
-        // 为套餐添加下标
-        let marketPrice = 999;
-        for (let j in comboList) {
-          for (let k in comboList[j].comboInfoList) {
-            comboList[j].comboInfoList[k].tagIndex = [j, k]
-            comboList[j].comboInfoList[k].bindId = comboList[j].id
-            if (comboList[j].comboInfoList[k].actualPrice < marketPrice) {
-              marketPrice = comboList[j].comboInfoList[k].actualPrice
-            }
-          }
-          comboInfoList.push(...comboList[j].comboInfoList)
-        }
-        packageArr.push({
-          day: packageDate.format("M/D"),
-          date: packageDate.format("YYYY-MM-DD"),
-          week: week,
-          marketPrice: marketPrice,
-          comboInfoList: comboInfoList,
-        });
-      }
-      this.packageArr = packageArr;
-      this.initPackageArr = true
-    },
     // 联系客服
     contactService () {
       if (this.detailData.mobiles) {
@@ -327,8 +192,6 @@ export default {
     AbroadDes,
     AbroadBase,
     AbroadEvaluate,
-    CountDown,
-    AbroadCoupon
   }
 };
 </script>
diff --git a/src/views/Service/AbroadEvaluate.vue b/src/views/Service/AbroadEvaluate.vue
index 64b7ec8..a17d9b1 100644
--- a/src/views/Service/AbroadEvaluate.vue
+++ b/src/views/Service/AbroadEvaluate.vue
@@ -2,7 +2,7 @@
   <div id="abroadEvaluate">
     <div class="top">
       <div class="score">
-        <span>{{score}}.0</span>
+        <span>{{ score }}.0</span>
         <div>
           <p>商家评分</p>
           <van-rate v-model="score" void-icon="star" void-color="#eee" color="#FFCC00" :size="14" />
@@ -16,83 +16,73 @@
       </div> -->
     </div>
     <div class="evaluate_list">
-      <div class="evaluate_item" v-for="(item,index) in list" :key="index">
+      <div class="evaluate_item" v-for="(item, index) in list" :key="index">
         <div class="user">
-          <img src="@/assets/head.png" alt="">
+          <img src="@/assets/head.png" alt="" />
           <div>
-            <p>{{item.nickName||'匿名用户'}}</p>
-            <span>{{item.intime}}</span>
+            <p>{{ item.nickName || '匿名用户' }}</p>
+            <span>{{ item.intime }}</span>
           </div>
         </div>
         <div class="rate_box">
           <van-rate v-model="item.courseScore" void-icon="star" void-color="#eee" color="#FFCC00" :size="18" />
-          <span class="rate">{{item.courseScore}}.0</span>
+          <span class="rate">{{ item.courseScore }}.0</span>
         </div>
-        <p class="evaluation"><span>评价：</span>{{item.evaluation}}</p>
+        <p class="evaluation"><span>评价：</span>{{ item.evaluation }}</p>
         <div class="evaluation_img_box">
           <!-- <img class="evaluation_img" src="@/assets/head.png" alt=""> -->
-          <img class="evaluation_img" v-for="(imgItem,index) in item.imgList" :key="index" :src="imgItem.imgUrl" alt="" @click="previewImg(imgItem.imgUrl)">
+          <img
+            class="evaluation_img"
+            v-for="(imgItem, index) in item.imgList"
+            :key="index"
+            :src="imgItem.imgUrl"
+            alt=""
+            @click="previewImg(imgItem.imgUrl)"
+          />
         </div>
       </div>
     </div>
     <van-popup v-model="showPreview" round get-container="body">
-      <img class="preview_img" :src="previewUrl" alt="">
+      <img class="preview_img" :src="previewUrl" alt="" />
     </van-popup>
   </div>
 </template>
 <script>
 export default {
-  data () {
+  data() {
     return {
       score: '',
       list: [],
-      previewUrl: '',//图片预览
-      showPreview: false
+      previewUrl: '', //图片预览
+      showPreview: false,
     }
   },
-  mounted () {
-    const courseId = this.$route.query.courseId;
+  mounted() {
+    const courseId = this.$route.query.courseId
     this.$toast.loading({
       message: '加载中...',
-    });
+    })
     this.getEvaluationList(courseId)
-
   },
   methods: {
-    getEvaluationList (courseId) {
-      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
+    getEvaluationList(courseId) {
+      this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/Evaluation/List?courseId=${this.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')
           }
-        },
-        onFail: err => {
-          console.log('err', err)
+          this.list = list
+          this.score = res.data.data?.shopScore
         }
-      });
+      })
     },
     // 预览图片
-    previewImg (url) {
-      this.previewUrl = url;
+    previewImg(url) {
+      this.previewUrl = url
       this.showPreview = true
-    }
+    },
   },
 }
 </script>
@@ -218,10 +208,10 @@ export default {
           font-size: 40px;
         }
       }
-      .evaluation{
+      .evaluation {
         font-size: 40px;
       }
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Service/CardBoxXST.vue b/src/views/Service/CardBoxXST.vue
deleted file mode 100644
index 427a9a0..0000000
--- a/src/views/Service/CardBoxXST.vue
+++ /dev/null
@@ -1,445 +0,0 @@
-<template>
-  <div>
-    <van-tabs v-model="active" :before-change="beforeTabChange" sticky>
-      <div id="cardBox">
-        <van-tab title="未使用">
-          <!-- <div class="exchange_btn" @click="handleExchange">
-            <p>
-              <van-icon name="coupon-o" />
-              兑换优惠券
-            </p>
-            <van-icon name="arrow" />
-          </div> -->
-          <div class="card_item" :class="{'big':item.picsArr.length>1,'margin_bottom':item.desShow}" v-for="(item,index) in cardList" :key="index">
-            <div class="left">
-              <div class="top" @click="handleUseCard(index)">
-                <template v-if="item.picsArr.length==1">
-                  <img :src="item.picsArr[0]" alt="">
-                  <p class="title">仅该商品可用：<span>{{item.proNameArr[0]}}</span></p>
-                </template>
-                <template v-if="item.picsArr.length>1">
-                  <p class="bigtext">{{item.title}}</p>
-                  <template v-for="(img,index2) in item.picsArr">
-                    <img class="bigimg" v-if="index2<3" :src="img" :key="index2" alt="">
-                  </template>
-                </template>
-              </div>
-              <p class="end_time" @click="item.desShow=!item.desShow">
-                <span>有效期至：{{item.couponEndTimeVo}}</span>
-                <van-icon v-if="item.desShow" name="arrow-up" />
-                <van-icon v-else name="arrow-down" />
-              </p>
-            </div>
-            <div class="right" @click="handleUseCard(index)">
-              <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>
-            <p class="des" v-if="item.desShow">仅限领券中心品类券指定商品内使用</p>
-          </div>
-
-          <van-empty v-if="cardList.length==0" description="暂无优惠券" />
-        </van-tab>
-        <van-tab title="领券中心">
-          <div class="card_item" :class="{'big':item.picsArr.length>1,'margin_bottom':item.desShow}" v-for="(item,index) in reCardList" :key="index">
-            <div class="left">
-              <div class="top">
-                <template v-if="item.picsArr.length==1">
-                  <img :src="item.picsArr[0]" alt="">
-                  <p class="title">仅该商品可用：<span>{{item.proNameArr[0]}}</span></p>
-                </template>
-                <template v-if="item.picsArr.length>1">
-                  <p class="bigtext">{{item.title}}</p>
-                  <template v-for="(img,index2) in item.picsArr">
-                    <img class="bigimg" v-if="index2<3" :src="img" :key="index2" alt="">
-                  </template>
-                </template>
-              </div>
-              <p class="end_time" @click="item.desShow=!item.desShow">
-                <span v-if="item.lifeFlag==1">领取后当天生效，有效期为：{{item.lifeDay}}天</span>
-                <span v-else>有效期至：{{item.lifeTime}}</span>
-                <van-icon v-if="item.desShow" name="arrow-up" />
-                <van-icon v-else name="arrow-down" />
-              </p>
-            </div>
-            <div class="right" @click="reCard(item)">
-              <p class="discount" :class="item.geted?'disable':''"><span>¥</span>{{item.couponPrice}}</p>
-              <p class="usenow disable" v-if="item.geted">已领取</p>
-              <p class="usenow" v-else>立即领取</p>
-            </div>
-            <p class="des" v-if="item.desShow">仅限领券中心品类券指定商品内使用，每人仅可领取一次！</p>
-          </div>
-          <van-empty v-if="reCardList.length==0" description="暂无优惠券" />
-
-        </van-tab>
-      </div>
-    </van-tabs>
-  </div>
-</template>
-<script>
-export default {
-  name: 'CardBoxXST',
-  data () {
-    return {
-      cardList: [],
-      reCardList: [],
-      centerNo: '',
-      active: 0,
-      pickerArr: []
-    }
-  },
-  mounted () {
-    let active = this.$route.query.active;
-    if (active) {
-      this.active = Number(active)
-    }
-    this.centerNo = localStorage.getItem('centerNo')
-    this.getAllCard()
-    this.getReCard()
-  },
-  methods: {
-    beforeTabChange (item) {
-      if (item == 0) {
-        this.getAllCard()
-      } else {
-        this.getReCard()
-      }
-      return true;
-    },
-    // 获取所有优惠券
-    getAllCard () {
-      this.mgop({
-        api: 'mgop.sz.hswsy.CouponList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "userId": this.centerNo,
-          "state": '',//状态 1-正常 2-已使用 3-已过期 不传为全部,
-          "pageNum": '1',
-          "pageSize": '999'
-        },
-        onSuccess: res => {
-          console.log('所有优惠券：', 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")
-              cardList[i].picsArr = cardList[i].pics.split(',');
-              cardList[i].proNameArr = cardList[i].proName.split(',');
-              cardList[i].desShow = false;
-            }
-            this.cardList = cardList
-            if (this.reCardList.length > 0) {
-              this.$nextTick(() => {
-                this.resetReCardList()//设置领券中心券的状态
-              })
-            }
-          }
-          else {
-            this.$toast.fail(res.data.message);
-          }
-
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-
-    //待领取的优惠券
-    getReCard () {
-      this.mgop({
-        api: 'mgop.sz.hswsy.getNormalCoupons', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "unionId": this.centerNo,
-        },
-        onSuccess: res => {
-          console.log('待领取的优惠券：', res)
-          if (res.data.rows) {
-            let reCardList = res.data.rows
-            for (let i in reCardList) {
-              reCardList[i].lifeTime = this.Moment(new Date(reCardList[i].lifeTime)).format("YYYY-MM-DD HH:mm:ss")
-              reCardList[i].picsArr = reCardList[i].pics.split(',');
-              reCardList[i].proNameArr = reCardList[i].proName.split(',');
-              reCardList[i].desShow = false;
-            }
-            this.reCardList = reCardList
-            if (this.reCardList.length > 0) {
-              this.$nextTick(() => {
-                this.resetReCardList()//设置领券中心券的状态
-              })
-            }
-          } else {
-            this.$toast.fail(res.data.msg);
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-
-    },
-    //设置领券中心券的状态
-    resetReCardList () {
-      let cardList = this.cardList;
-      let reCardList = this.reCardList;
-      for (let i = 0; i < reCardList.length; i++) {
-        for (let j = 0; j < cardList.length; j++) {
-          if (reCardList[i].id == cardList[j].id) {
-            reCardList[i].geted = true
-          }
-        }
-      }
-      console.log(this.reCardList)
-      this.reCardList = reCardList
-      this.$forceUpdate()
-
-    },
-    //领取优惠券
-    reCard (item) {
-      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": this.centerNo,
-          "proId": item.proId,
-          "proName": item.proName,
-          "pic": item.pics,
-          "couponId": item.id,
-        },
-        onSuccess: res => {
-          console.log('领取优惠券：', res)
-          if (res.data.code == 200) {
-            this.$toast('领取成功！')
-            this.$nextTick(() => {
-              this.resetReCardList()//设置领券中心券的状态
-            })
-          } else {
-            this.$toast.fail(res.data.message);
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-
-    },
-    // 使用优惠券
-    handleUseCard (index) {
-      const item = this.cardList[index];
-      // 未使用才触发后续操作
-      if (item.couponState == 1) {
-        let proIdArr = item.proId.split(',')
-        if (proIdArr.length == 1) {
-          // 单个商品直接跳转商品
-          this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: proIdArr[0] } })
-        } else {
-          // 多个商品跳转优惠券详情页
-          localStorage.setItem('cardCousreCardId', item.id)
-          localStorage.setItem('cardCousreCardPrice', item.couponPrice)
-          localStorage.setItem('cardCousreCardTitle', item.title)
-          localStorage.setItem('cardCousreProId', item.proId)
-          localStorage.setItem('cardCousreProName', item.proName)
-          localStorage.setItem('cardCousrePics', item.pics)
-          localStorage.setItem('cardCousreGeted', true)//设置详情页优惠券状态为已领取
-          this.$router.push({ name: 'CardCourseList' })
-        }
-      }
-    },
-
-    handleCard (index) {
-      const item = this.reCardList[index];
-      let proIdArr = item.proId.split(',')
-      // 单个商品直接跳转商品
-      if (proIdArr.length == 1) {
-        this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: proIdArr[0] } })
-      } else {
-        // 多个商品跳转优惠券详情页
-        localStorage.setItem('cardCousreCardId', item.id)
-        localStorage.setItem('cardCousreCardPrice', item.couponPrice)
-        localStorage.setItem('cardCousreCardTitle', item.title)
-        localStorage.setItem('cardCousreProId', item.proId)
-        localStorage.setItem('cardCousreProName', item.proName)
-        localStorage.setItem('cardCousrePics', item.pics)
-        localStorage.setItem('cardCousreGeted', false)//设置详情页优惠券状态为待领取
-        this.$router.push({ name: 'CardCourseList' })
-      }
-
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-#cardBox {
-  width: 100%;
-  min-height: 100vh;
-  background: rgb(246, 246, 250);
-  overflow: hidden;
-  box-sizing: border-box;
-  padding-bottom: 100px;
-  .exchange_btn {
-    font-size: 28px;
-    width: 710px;
-    height: 76px;
-    background: #ffffff;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 16px auto;
-    box-sizing: border-box;
-    padding: 0 16px;
-  }
-  .card_item {
-    width: 726px;
-    height: 210px;
-    background: url("../../assets/service/card.png");
-    background-size: 100%;
-    background-repeat: no-repeat;
-    margin: 0 auto;
-    margin-top: 20px;
-    position: relative;
-    &.margin_bottom {
-      margin-bottom: 60px;
-    }
-    &.big {
-      height: 250px;
-    }
-    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;
-      padding-bottom: 10px;
-      .top {
-        display: flex;
-        flex-wrap: wrap;
-        img {
-          width: 66px;
-          height: 66px;
-          background: #d8d8d8;
-          border-radius: 6px;
-        }
-        .title {
-          font-size: 24px;
-          font-weight: bold;
-          margin-left: 10px;
-          word-break: break-all;
-          max-width: 370px;
-          span {
-            color: #7f5316;
-          }
-        }
-        .bigtext {
-          font-size: 24px;
-          width: 400px;
-          font-weight: bold;
-          margin-bottom: 10px;
-        }
-        .bigimg {
-          width: 120px;
-          height: 120px;
-          margin-right: 16px;
-        }
-      }
-    }
-    .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: 20px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      width: 450px;
-    }
-    .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;
-      }
-    }
-    .des {
-      font-size: 26px;
-      padding: 10px;
-      color: #999;
-    }
-  }
-}
-</style>
-<style lang="scss">
-.elder {
-  #cardBox .card_item {
-    height: 300px;
-    background-size: 100% 100%;
-    &.big {
-      height: 330px;
-    }
-    .left .top {
-      .title {
-        font-size: 40px;
-      }
-      .bigtext {
-        font-size: 40px;
-      }
-    }
-    .end_time {
-      font-size: 36px;
-    }
-    .des {
-      font-size: 36px;
-    }
-    .usenow{
-      font-size: 40px;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/Service/CardCourseList.vue b/src/views/Service/CardCourseList.vue
deleted file mode 100644
index 415b8b0..0000000
--- a/src/views/Service/CardCourseList.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
-  <div id="cardCourseList">
-    <div class="card_box">
-      <img src="../../assets/service/card_bg.png" alt="">
-      <p class="card_title">{{cardTitle}}</p>
-      <p class="card_tip">仅限相关活动产品使用</p>
-      <div class="right" @click="reCard">
-        <p class="card_price"><span>¥</span>{{couponPrice}}</p>
-        <span class="card_btn nobg" v-if="geted">已领取</span>
-        <span class="card_btn" v-else>立即抢券</span>
-      </div>
-    </div>
-    <p class="line">以/下/指/定/商/品/可/用</p>
-    <ServiceListSecond :list="proList" :notab="true"></ServiceListSecond>
-
-  </div>
-</template>
-<script>
-import ServiceListSecond from '@/views/Service/component/ServiceListSecond.vue'
-export default {
-  name: 'CardBoxXST',
-  data () {
-    return {
-      unionId: '',
-      cardTitle: '',
-      couponPrice: '',
-      cardId: '',
-      proId: '',
-      proName: '',
-      pics: '',
-      geted: false,
-      proList: []
-    }
-  },
-  mounted () {
-    this.cardTitle = localStorage.getItem('cardCousreCardTitle');
-    this.couponPrice = localStorage.getItem('cardCousreCardPrice');
-    this.cardId = localStorage.getItem('cardCousreCardId');
-    this.proId = localStorage.getItem('cardCousreProId');
-    this.proName = localStorage.getItem('cardCousreProName');
-    this.pics = localStorage.getItem('cardCousrePics');
-    this.geted = localStorage.getItem('cardCousreGeted') == 'true' ? true : false
-    this.getCourseList()
-  },
-  methods: {
-    // 获取优惠券对应的商品列表
-    getCourseList () {
-      this.$toast.loading({
-        message: "加载中...",
-        duration: 0,
-        forbidClick: true,
-      });
-      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: this.proId.split(',')
-        },
-        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)
-        }
-      });
-    },
-    formatWeek (week) {
-      return week == 1 ? '周一' : week == 2 ? '周二' : week == 3 ? '周三' : week == 4 ? '周四' : week == 5 ? '周五' : week == 6 ? '周六' : week == 0 ? '周日' : '';
-    },
-
-    //领取优惠券
-    reCard () {
-      if (this.geted) return;
-      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": localStorage.getItem('centerNo'),
-          "proId": this.proId,
-          "proName": this.proName,
-          "pic": this.pics,
-          "couponId": this.cardId,
-        },
-        onSuccess: res => {
-          if (res.data.code == 200) {
-            localStorage.setItem('cardCousreGeted', true)
-            this.geted = true;
-            this.$toast('领取成功！')
-          } else {
-            this.$toast.fail(res.data.message);
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-
-    },
-    onConfirm (item) {
-      this.showPicker = false;
-      this.enterAboradDetail(item.proId)
-    },
-  },
-  components: {
-    ServiceListSecond
-  }
-}
-</script>
-<style lang="scss" scoped>
-#cardCourseList {
-  width: 100%;
-  min-height: 100vh;
-  background: #fff;
-  background-image: url("../../assets/service/bg.png");
-  background-size: 100%;
-  background-repeat: no-repeat;
-  // padding-top: 36px;
-  overflow: hidden;
-  .card_box {
-    width: 704px;
-    height: 150px;
-    margin: 0 auto;
-    position: relative;
-    margin-top: 36px;
-    img {
-      width: 100%;
-    }
-    .card_title {
-      font-size: 40px;
-      font-weight: bold;
-      color: #7f5316;
-      position: absolute;
-      top: 22px;
-      left: 40px;
-    }
-    .card_tip {
-      font-size: 24px;
-      color: #7f5316;
-      position: absolute;
-      top: 94px;
-      left: 40px;
-    }
-    .right {
-      height: 100%;
-      position: absolute;
-      top: 0;
-      right: 2px;
-      padding-top: 20px;
-      box-sizing: border-box;
-    }
-    .card_price {
-      width: 160px;
-      font-size: 60px;
-      font-weight: bold;
-      text-align: center;
-      color: #000;
-      span {
-        font-size: 28px;
-      }
-    }
-    .card_btn {
-      display: block;
-      margin: 0 auto;
-      margin-top: 10px;
-      width: 134px;
-      line-height: 40px;
-      color: #7f5316;
-      font-size: 26px;
-      text-align: center;
-      font-weight: bold;
-      background: #fff;
-      border-radius: 4px;
-      &.nobg {
-        background: transparent;
-      }
-    }
-  }
-  .line {
-    font-size: 32px;
-    color: #fff;
-    letter-spacing: 4px;
-    text-align: center;
-    margin-top: 18px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/Service/CheckOrder.vue b/src/views/Service/CheckOrder.vue
deleted file mode 100644
index 00a4bcd..0000000
--- a/src/views/Service/CheckOrder.vue
+++ /dev/null
@@ -1,564 +0,0 @@
-<template>
-  <div id="checkOrder">
-    <div class="goods_data top_border">
-      <div class="top">
-        <img src="@/assets/service/school_bg.png" alt="">
-        <div>
-          <p class="goods_title">{{showCourseData.course_name}}</p>
-          <p class="package_name">套餐名称：{{selectCombo.comboName}}</p>
-          <p class="count">数量：x{{count}}{{selectComboUnitName}}</p>
-        </div>
-      </div>
-      <div class="bottom">
-        <p class="time">使用时间： {{date}}</p>
-        <p class="price"><span>¥</span>{{selectCombo.actualPrice*1000*count/1000}}</p>
-      </div>
-    </div>
-    <div class="card top_border" v-if="selectCombo.actualPrice>0" @click="openCardBox">
-      <p>可用优惠券</p>
-      <div>
-        <span class="use_card" v-if="useCard">已使用红包抵扣{{useCard.couponPrice}}</span>
-        <van-icon name="arrow" />
-      </div>
-    </div>
-    <div class="top_border">
-      <contact-box :limit="count" :people="selectCombo.adultCount" :child="selectCombo.chilCount"></contact-box>
-    </div>
-    <div class="card top_border">
-      <p>服务承诺和保障</p>
-      <van-icon name="arrow" />
-    </div>
-    <div class="protocol">
-      <van-checkbox v-model="checked" shape="square" icon-size="16px">我已阅读并同意 </van-checkbox>
-      <span style="text-decoration: underline;" @click="goPayneed">购买须知</span> <span style="text-decoration: underline;" @click="goProtocol">用户协议</span>
-    </div>
-    <div class="Collection">
-      <div class="box box1">
-        <p><span>¥</span>{{paymoney}} <del>{{selectCombo.productPrice*1000*count/1000}}</del></p>
-        <p class="coupon" v-if="useCard">优惠券已抵用：{{useCard.couponPrice}}</p>
-      </div>
-      <div class="box box2" v-if="userInfo">
-        <span @click="createOrder()">支付</span>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import ContactBox from './component/ContactBox.vue'
-export default {
-  name: 'ServiceCheckOrder',
-  data () {
-    return {
-      date: '',
-      period: '',
-      count: 1,
-      checked: false,
-      useCard: '',
-      orderDetail: '',
-      selectCombo: '',//当前套餐信息
-      selectComboUnitName:'',//套餐单位 人或份
-      showCourseData: '',//当前课程的信息
-      selectCombo: '',//已选择的套餐
-      userInfo: '',//支付用
-    }
-  },
-  mounted () {
-    let userInfo = localStorage.getItem('userInfo');
-    if (userInfo) {
-      this.userInfo = JSON.parse(userInfo);
-    }
-
-    this.date = this.$route.query.date;
-    this.count = this.$route.query.count;
-    this.period = this.$route.query.period;
-
-    // 套餐
-    let selectCombo = localStorage.getItem('selectCombo')
-    if (selectCombo) {
-      this.selectCombo = JSON.parse(selectCombo)
-    }
-    this.selectComboUnitName = localStorage.getItem('selectComboUnitName')
-
-    // 如果有优惠券，就展示
-    let useCard = localStorage.getItem('useCard')
-    let showCourseData = localStorage.getItem('showCourseData')
-    if (useCard) {
-      this.useCard = JSON.parse(useCard)
-    }
-    if (showCourseData) {
-      this.showCourseData = JSON.parse(showCourseData)
-    }
-    //判断是否为支付会跳，查询订单状态
-    let outTradeNo = localStorage.getItem('outTradeNo')
-    if (outTradeNo) {
-      this.getOrderStatus(outTradeNo)
-    }
-  },
-  computed: {
-    paymoney () {
-      let paymoney = (this.selectCombo.actualPrice * 1000 * this.count - (this.useCard.couponPrice * 1000 || 0)) / 1000;
-      if (paymoney < 0) paymoney = 0;
-      return paymoney
-    }
-  },
-  methods: {
-    // 进入选择优惠券
-    openCardBox () {
-      this.$router.push({ name: 'ServiceCardSelect' })
-    },
-    //购买须知
-    goPayneed () {
-      this.$router.push({ name: 'payneed' })
-    },
-    // 前往查看协议
-    goProtocol () {
-      this.$router.push({ name: 'protocol' })
-    },
-    // 创建订单
-    createOrder () {
-       // 出行人数量判断
-      let selectedContactArr = localStorage.getItem('selectedContactArr');
-      selectedContactArr = JSON.parse(selectedContactArr);
-      let selAdult = 0;
-      let selChild = 0;
-      for(let i in selectedContactArr){
-        if(selectedContactArr[i].userType==2){
-          selAdult++
-        }else{
-          selChild++
-        }
-      }
-      // 判断选择成人和学生数量是否匹配
-      if(selAdult!=this.count*this.selectCombo.adultCount||selChild!=this.count*this.selectCombo.chilCount){
-        this.$toast.fail('请选择正确数量的出行人');
-        return;
-      }
-      // 协议勾选
-      if (!this.checked) {
-        this.$toast.fail('请先阅读并同意用户协议');
-        return;
-      }
-
-      // 出行人字段格式
-      let selectedContact = []
-      for (let i in selectedContactArr) {
-        selectedContact.push(selectedContactArr[i].travelerNum)
-      }
-      selectedContact = selectedContact.join(',')
-      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": localStorage.getItem('selectComboBindId'),
-          "unionId": this.userInfo?.centerNo,
-          "price": this.selectCombo.actualPrice * 1000 * this.count / 1000,//商品减掉优惠券之前的价格
-          "travelNum": selectedContact,//出行人编号
-          "couponId": this.useCard?.id || 0,
-        },
-        onSuccess: res => {
-          if (res.data.data) {
-            if (this.paymoney == 0) {
-              // 使用后移除优惠券，防止返回继续使用
-              localStorage.removeItem('useCard')
-              this.$router.push({ name: 'ServiceOrderXST', query: { active: 1, showChatGroupUrl: 1 } })
-            } else {
-              // 使用后移除优惠券，防止返回继续使用
-              localStorage.removeItem('useCard')
-              this.openPay(res.data.data);
-              this.orderId = res.data.data.orderId;
-            }
-          } else {
-            this.$toast.fail(res.data?.result);
-          }
-
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    openPay (data) {
-      const sUserAgent = window.navigator.userAgent.toLowerCase()
-      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": 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')
-        console.log('h5')
-        this.mgop({
-          api: 'mgop.sz.hswsy.mobilePay', // 必须
-          host: 'https://mapi.zjzwfw.gov.cn/',
-          dataType: 'JSON',
-          type: 'POST',
-          appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-          headers: {
-            //   'isTestUrl': '1'
-          },
-          data: {
-            "appid": "2021002189681626",
-            "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": this.showCourseData.id, //商品id
-            "quit_url": location.href,
-            "subject": this.showCourseData.course_name + '_' + this.date,
-            "totalFee": this.selectCombo.actualPrice * 1000 * this.count / 1000
-          },
-          onSuccess: res => {
-            console.log(res)
-            localStorage.setItem('outTradeNo', data.trade_no)
-            // this.BridgePay(res.data.message)
-            let divForm = document.getElementsByTagName('divform')
-            if (divForm.length) {
-              document.body.removeChild(divForm[0])
-            }
-            const div = document.createElement('divform')
-            div.innerHTML = res.data.message // res.data就是sb支付宝返回给你的form
-            document.body.appendChild(div)
-            // document.forms[0].setAttribute('target', '_blank') // 加了_blank可能出问题所以我注释了
-            document.forms[0].submit()
-          },
-          onFail: err => {
-            console.log('err', err)
-          }
-        });
-      }
-    },
-    // 支付API
-    // BridgePay (credential) {
-    //   var payMsg = {
-    //     platform: 1,
-    //     arg: {
-    //       "credential": credential,
-    //       "inSandBox": false
-    //     }
-    //   };
-    //   ZWJSBridge.pay(payMsg).then((result) => {
-
-    //     alert('支付成功！');
-    //     console.log('#### ZWJSBridge.pay() result:' + result);
-
-    //   }).catch((error) => {
-    //     var errorMsg = JSON.stringify(error);
-    //     alert('支付失败:' + errorMsg);
-    //     console.log('#### ZWJSBridge.pay() error:' + error);
-    //   });
-    // },
-    //判断是否为支付会跳，查询订单状态
-    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) {
-            localStorage.removeItem('selectedContactArr')
-            this.$router.push({ name: 'ServiceOrderXST', query: { active: 1, showChatGroupUrl: 1 } })
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    }
-  },
-  components: {
-    ContactBox
-  }
-}
-</script>
-<style lang="scss" scoped>
-#checkOrder {
-  padding-bottom: 260px;
-  .top_border {
-    border-top: 16px solid #f6f7fa;
-  }
-  .goods_data {
-    padding: 0 22px;
-    .top {
-      padding: 20px 0;
-      img {
-        display: inline-block;
-        width: 124px;
-        height: 124px;
-        border-radius: 8px;
-      }
-      div {
-        vertical-align: top;
-        display: inline-block;
-        margin-left: 20px;
-        width: 560px;
-      }
-      p {
-        margin: 0;
-      }
-      .goods_title {
-        font-size: 28px;
-        font-weight: bold;
-      }
-      .package_name {
-        font-size: 24px;
-        margin-top: 18px;
-      }
-      .count {
-        font-size: 24px;
-      }
-    }
-    .bottom {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 28px 0;
-      border-top: 2px solid #f2f4f9;
-      .time {
-        font-size: 28px;
-      }
-      .price {
-        font-size: 32px;
-        font-weight: bold;
-        span {
-          font-size: 20px;
-        }
-      }
-    }
-  }
-  .card {
-    padding: 0 22px;
-    height: 98px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 28px;
-    font-weight: bold;
-    .use_card {
-      font-size: 26px;
-      color: #f64c37;
-      // padding: 2px 24px;
-      // background: #ffecc0;
-      // border-radius: 8px;
-      margin-right: 10px;
-      font-weight: normal;
-    }
-  }
-  .protocol {
-    display: flex;
-    align-items: center;
-    padding: 0 22px;
-    font-size: 24px;
-    span {
-      color: #3f92ff;
-      margin: 0 4px;
-    }
-  }
-  .Collection {
-    background-color: white;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    padding: 28px 22px;
-    box-sizing: border-box;
-    padding-bottom: 50px;
-    z-index: 500;
-    box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.34);
-
-    .box {
-      display: inline-block;
-      vertical-align: middle;
-      color: #666666;
-      .icon {
-        display: inline-block;
-        width: 45%;
-        text-align: center;
-        font-size: 24px;
-        p {
-          // margin: 0;
-          color: #999999;
-          margin-top: 8px;
-        }
-        i {
-          font-size: 48px;
-          color: rgb(45, 45, 45);
-          font-weight: bold;
-        }
-      }
-
-      > span {
-        display: inline-block;
-        width: 100%;
-        line-height: 92px;
-        box-sizing: border-box;
-        border-radius: 100px;
-        color: white;
-        font-size: 32px;
-        background: #4092ff;
-        text-align: center;
-        box-shadow: 0px 10px 40px 0px #a0c9ff;
-        b {
-          display: inline-block;
-          vertical-align: middle;
-          margin-left: 20px;
-          color: white;
-        }
-        i {
-          vertical-align: middle;
-          font-size: 44px;
-          font-weight: bold;
-        }
-      }
-    }
-    .box1 {
-      width: 40%;
-      p {
-        font-size: 49px;
-        font-weight: bold;
-        color: #f64c37;
-      }
-      span {
-        font-size: 32px;
-      }
-      del {
-        font-size: 20px;
-        color: #999;
-      }
-      .coupon {
-        font-size: 24px;
-        color: #999;
-      }
-    }
-    .box2 {
-      width: 60%;
-    }
-  }
-}
-::v-deep .van-calendar__bottom-info {
-  color: #f95555;
-}
-::v-deep .van-calendar__selected-day {
-  background: #ecf2fc !important;
-  border: 4px solid #79abff;
-  box-sizing: border-box;
-  color: #333;
-}
-.van-checkbox {
-  display: inline-flex;
-}
-</style>
-<style lang="scss">
-.elder {
-  #checkOrder {
-    .goods_data {
-      .top {
-        img {
-          width: 200px;
-          height: 200px;
-        }
-        div {
-          width: 470px;
-        }
-        .goods_title {
-          font-size: 40px;
-        }
-        .package_name {
-          font-size: 36px;
-        }
-        .count {
-          font-size: 36px;
-        }
-      }
-      .bottom {
-        .time {
-          font-size: 36px;
-        }
-        .price {
-          font-size: 36px;
-          span {
-            font-size: 32px;
-          }
-        }
-      }
-    }
-    .card {
-      font-size: 40px;
-    }
-    .protocol {
-      font-size: 36px;
-    }
-    .Collection {
-      .box1 p {
-        font-size: 56px;
-        span {
-          font-size: 40px;
-        }
-        del {
-          font-size: 40px;
-        }
-      }
-      .box > span {
-        font-size: 44px;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/Service/DatePackage.vue b/src/views/Service/DatePackage.vue
deleted file mode 100644
index 5d4edfc..0000000
--- a/src/views/Service/DatePackage.vue
+++ /dev/null
@@ -1,475 +0,0 @@
-<template>
-  <div id="datePackage" v-if="comboList">
-    <!-- <div class="tag_item">
-      <p class="tag_title">商品名称</p>
-      <p class="package_name">{{showCourseData.course_name}}</p>
-    </div> -->
-    <div class="tag_item">
-      <p class="tag_title">出行时间</p>
-      <p class="package_name" :class="date?'active':''" @click="showCalendar=true">{{date||'选择日期'}}<van-icon name="arrow" /></p>
-      <van-calendar v-model="showCalendar" :default-date="defaultDate" @confirm="chooseDate" :show-confirm="false" color="#3F92FF" :formatter="formatCalendar" />
-    </div>
-    <div class="tag_item" v-if="date">
-      <p class="tag_title">行程选择</p>
-      <div class="period">
-        <div class="period_item" :class="Index1==index?'active':''" v-for="(item,index) in comboList" :key="index" @click="choosePeriod(index)">行程{{index + 1}} ：{{item.dateComboName}}</div>
-      </div>
-    </div>
-    <div class="tag_item" v-if="comboList[Index1]">
-      <p class="tag_title">成团情况<span class="pintuan_status" v-if="comboList[Index1].clusterName">{{comboList[Index1].clusterName}}</span></p>
-      <p class="package_name">最低拼团数 {{comboList[Index1].peopleCount}}{{comboList[Index1].unitName}} 已报名{{comboList[Index1].unitName}}数{{numOne}}/{{comboList[Index1].stockCount}}{{comboList[Index1].unitName}}</p>
-    </div>
-    <div class="tag_item" v-if="date">
-      <p class="tag_title">套餐类型</p>
-      <div class="period">
-        <div class="period_item" :class="Index2==index?'active':''" v-for="(item,index) in comboList[Index1].comboInfoList" :key="index" @click="choosePeriod2(index)">套餐{{index + 1}} ：{{item.comboName}} ¥{{item.actualPrice}}</div>
-      </div>
-    </div>
-    <div class="tag_item">
-      <div class="tag_title tag_title_flex">
-        <span>请选择套餐数量</span>
-        <div class="tag_title_right">
-          <span class="btn" @click="countReduce">-</span>
-          <span class="count">{{count}}</span>
-          <span class="btn" @click="count++">+</span>
-        </div>
-      </div>
-      <div class="package_num">
-        <span>库存数量({{numSecond}} /</span>
-        <span class="tint">{{numOne+numSecond}}{{comboList[Index1].unitName}})</span>
-      </div>
-    </div>
-    <p class="package_des" v-if="comboList[Index1].comboInfoList[Index2].comboDescrption">套餐说明<br>{{comboList[Index1].comboInfoList[Index2].comboDescrption}}</p>
-    <div class="Collection">
-      <div class="box box1">
-        <p><span>¥</span>{{comboList[Index1].comboInfoList[Index2].actualPrice*1000*count/1000}} <del>{{comboList[Index1].comboInfoList[Index2].productPrice*1000*count/1000}}</del></p>
-      </div>
-      <div class="box box2">
-        <span @click="checkOrder()">去下单</span>
-      </div>
-    </div>
-
-    <van-popup style="background: transparent;" get-container="body" v-model="showSchool" @close='closeSchool'>
-      <school-add @closeAdd='closeAdd'></school-add>
-    </van-popup>
-  </div>
-</template>
-<script>
-import schoolAdd from '@/views/Travel/component/schoolAdd'
-export default {
-  name: 'ServiceDatePackage',
-  data () {
-    return {
-      date: null,
-      defaultDate: null,
-      packageData: '',
-      showCourseData: '',
-      comboList: '',
-      Index1: 0,//选中的档期
-      Index2: 0,//选中的套餐
-      showCalendar: false,
-      count: 1,
-      days: 1,
-      numOne: 0,
-      numSecond: 0,
-      showSchool: false
-    }
-  },
-  mounted () {
-    localStorage.removeItem('selectedContactArr')
-    // date 日期
-    const date = this.$route.query.date;
-    if (date) {
-      this.date = date
-      this.defaultDate = new Date(date)
-    }
-    // 缓存中读取排期
-    let packageData = localStorage.getItem('packageData')
-    if (packageData) {
-      this.packageData = JSON.parse(packageData)
-
-      console.log(this.packageData)
-      if (this.date) {
-        this.setComboList()
-      }
-    }
-    // 当前的商品信息
-    let showCourseData = localStorage.getItem('showCourseData')
-    if (showCourseData) {
-      this.showCourseData = JSON.parse(showCourseData)
-    }
-    console.log(showCourseData)
-  },
-  methods: {
-    // 获取库存
-    GetOrderPayCount (bindId) {
-      let showCourseData = JSON.parse(localStorage.getItem('showCourseData'))
-      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: {
-          "bindId":bindId,
-          "productId": showCourseData.id,
-          "startDate": this.date,
-        },
-        onSuccess: res => {
-          if (res.data.data) {
-            this.numOne = res.data.data
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    // 获取库存第二个参数
-    getSurplusComboCount (bindId) {
-      let showCourseData = JSON.parse(localStorage.getItem('showCourseData'))
-      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
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    // 选择排期
-    choosePeriod (index) {
-      this.Index1 = index;
-      this.Index2 = 0;
-      let bindId = this.comboList[index].id
-      console.log(this.comboList[index])
-      this.GetOrderPayCount(bindId)
-      this.getSurplusComboCount(bindId)
-    },
-    // 选择套餐
-    choosePeriod2 (index) {
-      this.Index2 = index;
-    },
-    // 选择日期
-    chooseDate (date) {
-      let canChoose = false
-      for (let i in this.packageData) {
-        if (this.Moment(date, 'YYYY-MM-DD').format('YYYY-MM-DD') == this.Moment(this.packageData[i].dayName, 'YYYY-MM-DD').format('YYYY-MM-DD')) {
-          canChoose = true;
-        }
-      }
-      if (!canChoose) {
-        this.$toast('当前日期无可选套餐')
-        return;
-      }
-      this.date = this.Moment(date, 'YYYY-MM-DD').format('YYYY-MM-DD')
-      this.Index1 = 0;
-      this.Index2 = 0;
-      this.showCalendar = false;
-      this.setComboList()
-    },
-    // 设置日历文字
-    formatCalendar (day) {
-      // console.log(day)
-      for (let i in this.packageData) {
-        if (this.Moment(day.date, 'YYYY-MM-DD').format('YYYY-MM-DD') == this.Moment(this.packageData[i].dayName, 'YYYY-MM-DD').format('YYYY-MM-DD')) {
-          day.bottomInfo = '¥' + this.packageData[i].comboList[0].comboInfoList[0].actualPrice;
-        }
-      }
-      return day;
-    },
-    // 根据日期设置套餐
-    setComboList () {
-      for (let i in this.packageData) {
-        if (this.Moment(this.packageData[i].dayName, 'YYYY-MM-DD').format(('YYYY-MM-DD')) == this.date) {
-          let comboList = this.packageData[i].comboList;
-          this.comboList = comboList
-          let bindId = comboList[this.Index1].id
-          this.days = this.packageData[i].days
-          this.GetOrderPayCount(bindId)
-          this.getSurplusComboCount(bindId)
-          break;
-        }
-      }
-    },
-    // 减少数量
-    countReduce () {
-      if (this.count > 1) {
-        this.count--
-      }
-    },
-
-    checkOrder () {
-      if (this.count > this.numSecond) {
-        this.$toast('库存不足');
-
-      } else {
-        const query = {
-          date: this.date,
-          count: this.count
-        }
-        localStorage.setItem('selectCombo', JSON.stringify(this.comboList[this.Index1].comboInfoList[this.Index2]))
-        localStorage.setItem('selectComboBindId', JSON.stringify(this.comboList[this.Index1].id))
-        localStorage.setItem('selectComboUnitName', this.comboList[this.Index1].unitName)
-        this.$router.push({ name: 'ServiceCheckOrder', query: query })
-      }
-    },
-    closeSchool () {
-      if (localStorage.getItem('schoolNames') == 'undefined' || !localStorage.getItem('schoolNames')) {
-        // this.showSchool = true
-      }
-    },
-    closeAdd () {
-      this.showSchool = false
-    }
-  },
-  components: {
-    schoolAdd
-  }
-}
-</script>
-<style lang="scss" scoped>
-#datePackage {
-  padding-top: 40px;
-  .tag_item {
-    padding: 22px;
-    .tag_title {
-      font-size: 34px;
-      font-weight: bold;
-      margin-top: 0;
-      margin-bottom: 32px;
-      display: flex;
-      align-items: center;
-      .pintuan_status {
-        font-size: 24px;
-        padding: 2px 10px;
-        background: #ffe9b1;
-        border-radius: 6px;
-        margin-left: 12px;
-      }
-    }
-    .package_name {
-      display: flex;
-      justify-content: space-between;
-      font-size: 28px;
-      width: 100%;
-      background: #f5f6fa;
-      border-radius: 12px;
-      padding: 20px 18px;
-      box-sizing: border-box;
-      margin: 0;
-      &.active {
-        background: #3f92ff;
-        color: #fff;
-      }
-    }
-    // 时间段
-    .period {
-      .period_item {
-        padding: 10px 20px;
-        font-size: 28px;
-        margin-bottom: 15px;
-        text-align: left;
-        background: #f5f6fa;
-        border-radius: 10px;
-        box-sizing: border-box;
-        &.active {
-          background: #3f92ff;
-          color: #fff;
-        }
-      }
-    }
-    .tag_title_flex {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 0;
-      padding: 50px 0;
-      .tag_title_right {
-        display: flex;
-        align-items: center;
-      }
-      .btn {
-        width: 48px;
-        height: 48px;
-        background: #f5f6fa;
-        border-radius: 10px;
-        font-size: 32px;
-        line-height: 48px;
-        text-align: center;
-      }
-      .count {
-        width: 100px;
-        text-align: center;
-        font-size: 32px;
-      }
-    }
-    .package_num {
-      font-size: 30px;
-      width: 50%;
-      float: right;
-      text-align: right;
-      border-radius: 12px;
-      padding: 0px 18px;
-      box-sizing: border-box;
-      .tint {
-        font-size: 30px;
-        font-weight: normal;
-        color: #909399;
-      }
-    }
-  }
-  .package_des {
-    margin: 0 24px;
-    margin-top: 28px;
-    padding: 20px 0;
-    font-size: 26px;
-    line-height: 40px;
-    color: #a9a9aa;
-    border-top: 1px solid #e2e7ee;
-  }
-  .Collection {
-    background-color: white;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    padding: 28px 22px;
-    box-sizing: border-box;
-    padding-bottom: 50px;
-    z-index: 500;
-    box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.34);
-
-    .box {
-      display: inline-block;
-      vertical-align: middle;
-      color: #666666;
-      .icon {
-        display: inline-block;
-        width: 45%;
-        text-align: center;
-        font-size: 24px;
-        p {
-          // margin: 0;
-          color: #999999;
-          margin-top: 8px;
-        }
-        i {
-          font-size: 48px;
-          color: rgb(45, 45, 45);
-          font-weight: bold;
-        }
-      }
-
-      > span {
-        display: inline-block;
-        width: 100%;
-        line-height: 92px;
-        box-sizing: border-box;
-        border-radius: 100px;
-        color: white;
-        font-size: 32px;
-        background: #4092ff;
-        text-align: center;
-        box-shadow: 0px 10px 40px 0px #a0c9ff;
-        b {
-          display: inline-block;
-          vertical-align: middle;
-          margin-left: 20px;
-          color: white;
-        }
-        i {
-          vertical-align: middle;
-          font-size: 44px;
-          font-weight: bold;
-        }
-      }
-    }
-    .box1 {
-      width: 40%;
-      p {
-        font-size: 49px;
-        font-weight: bold;
-        color: #f64c37;
-      }
-      span {
-        font-size: 32px;
-      }
-      del {
-        font-size: 20px;
-        color: #999;
-      }
-    }
-    .box2 {
-      width: 60%;
-    }
-  }
-}
-::v-deep .van-calendar__bottom-info {
-  color: #f95555;
-}
-::v-deep .van-calendar__selected-day {
-  background: #ecf2fc !important;
-  border: 4px solid #79abff;
-  box-sizing: border-box;
-  color: #333;
-}
-</style>
-<style lang="scss">
-.elder {
-  #datePackage {
-    .tag_item {
-      .tag_title {
-        font-size: 44px;
-      }
-      .package_name {
-        font-size: 40px;
-      }
-      .period .period_item {
-        font-size: 40px;
-      }
-      .tag_title_flex .count {
-        font-size: 40px;
-      }
-      .package_num {
-        font-size: 40px;
-        .tint {
-          font-size: 40px;
-        }
-      }
-    }
-    .Collection {
-      .box1 p {
-        font-size: 56px;
-        span {
-          font-size: 40px;
-        }
-        del {
-          font-size: 40px;
-        }
-      }
-      .box > span {
-        font-size: 44px;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/Service/EditContact.vue b/src/views/Service/EditContact.vue
index 3db46e4..6a5fb5d 100644
--- a/src/views/Service/EditContact.vue
+++ b/src/views/Service/EditContact.vue
@@ -22,7 +22,7 @@
 </template>
 <script>
 export default {
-  data () {
+  data() {
     return {
       id: '',
       userType: '',
@@ -32,16 +32,16 @@ export default {
       gender: '',
       travelerIdCard: '',
       travelerNum: '',
-      isAdd: false,//是否为新增家长（新增学生不在此页面）
+      isAdd: false, //是否为新增家长（新增学生不在此页面）
     }
   },
-  mounted () {
+  mounted() {
     let editContact = JSON.parse(localStorage.getItem('editContact'))
     if (this.$route.query.add) {
       console.log('新增家长')
-      this.userType = 2;
+      this.userType = 2
       this.userTypeName = '家长'
-      this.isAdd = true;
+      this.isAdd = true
     } else {
       this.userType = editContact?.userType
       this.userTypeName = editContact?.userType == 1 ? '学生' : '家长'
@@ -63,86 +63,72 @@ export default {
   },
   methods: {
     // 确认
-    addContact () {
+    addContact() {
       if (!this.gender) {
         this.$toast('请选择性别')
-        return;
+        return
       }
       if (!this.phone) {
         this.$toast('请输入手机号')
-        return;
+        return
       }
       if (!this.checkPhone(this.phone)) {
         this.$toast('请输入正确的手机号')
-        return;
+        return
       }
       if (!this.travelerIdCard) {
-        this.$toast('请输入身份证');
-        return;
+        this.$toast('请输入身份证')
+        return
       }
       if (!this.checkCard(this.travelerIdCard)) {
         this.$toast('请输入正确的身份证号')
-        return;
+        return
       }
       let userInfo = localStorage.getItem('userInfo')
-      userInfo = userInfo ? JSON.parse(userInfo) : userInfo;
+      userInfo = userInfo ? JSON.parse(userInfo) : userInfo
       let postData = {
         contactsName: this.travelerName,
         contactsMobile: this.phone,
         contactsIdCard: this.travelerIdCard,
         contactsType: this.userType,
         gender: Number(this.gender),
-        loginMobile: userInfo?.phone
-      };
-      if (!this.isAdd) {//新增学生或家长
-        postData.userNum = this.travelerNum;
+        loginMobile: userInfo?.phone,
+      }
+      if (!this.isAdd) {
+        //新增学生或家长
+        postData.userNum = this.travelerNum
       }
       this.$toast.loading({
         message: '加载中',
         duration: 0,
-        forbidClick: true
+        forbidClick: true,
       })
-      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)
+      this.yxAxios.post(`${this.proxyUrl}/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)
         }
-      });
+      })
     },
-    checkPhone (phone) {
-      if ((/^1[3456789]\d{9}$/.test(phone))) {
+    checkPhone(phone) {
+      if (/^1[3456789]\d{9}$/.test(phone)) {
         return true
       } else {
         return false
       }
     },
-    checkCard (card) {
+    checkCard(card) {
       // 18位身份证校验
-      if ((/^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(card))) {
+      if (/^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(card)) {
         return true
       } else {
         return false
       }
     },
-  }
-
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -180,4 +166,4 @@ export default {
     border-radius: 45px;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Service/SelectContact.vue b/src/views/Service/SelectContact.vue
index 432d836..a6be476 100644
--- a/src/views/Service/SelectContact.vue
+++ b/src/views/Service/SelectContact.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="selectContact">
     <div class="control">
-      <div class="add_btn" @click="showAddChildPopupGroup=true">
+      <div class="add_btn" @click="showAddChildPopupGroup = true">
         <van-icon name="add-o" />
         新增学生
       </div>
@@ -11,21 +11,20 @@
       </div>
     </div>
     <div class="box">
-      <template v-for="(item,index) in contactList">
-        <div class="contact_item" v-if="!hideParent&&item.userType!=1||item.userType==1" :key="index">
+      <template v-for="(item, index) in contactList">
+        <div class="contact_item" v-if="(!hideParent && item.userType != 1) || item.userType == 1" :key="index">
           <van-checkbox class="checkbox" v-model="item.checked" shape="square"></van-checkbox>
           <div class="info">
-            <p class="name">{{item.travelerName}}<span v-if="!item.travelerIdCard||!item.gender">需完善</span></p>
-            <p class="des">{{item.userType==1?'学生':'家长'}}·{{showPhone(item.travelerMobile)}}</p>
+            <p class="name">{{ item.travelerName }}<span v-if="!item.travelerIdCard || !item.gender">需完善</span></p>
+            <p class="des">{{ item.userType == 1 ? '学生' : '家长' }}·{{ showPhone(item.travelerMobile) }}</p>
           </div>
           <van-icon class="edit" name="edit" @click="editContact(index)" />
         </div>
       </template>
-
     </div>
     <van-button class="btn" type="primary" @click="selectContact">确定</van-button>
     <van-popup style="background: transparent;" get-container="body" v-model="showAddChildPopupGroup">
-      <AddChildPopupGroup @complete="complete" step='1'></AddChildPopupGroup>
+      <AddChildPopupGroup @complete="complete" step="1"></AddChildPopupGroup>
     </van-popup>
   </div>
 </template>
@@ -33,64 +32,48 @@
 import AddChildPopupGroup from '@/views/Home/component/AddChildPopupGroup'
 import IdentityCodeValid from '@/common/validateIdent'
 export default {
-  data () {
+  data() {
     return {
-      limit: '',//数量
+      limit: '', //数量
       hideParent: false,
       contactList: [],
-      showAddChildPopupGroup: false
+      showAddChildPopupGroup: false,
     }
   },
-  mounted () {
-    this.limit = this.$route.query.limit;
-    this.hideParent = this.$route.query.hideParent ? true : false;
+  mounted() {
+    this.limit = this.$route.query.limit
+    this.hideParent = this.$route.query.hideParent ? true : false
     this.getContactList()
   },
   methods: {
     // 获取联系人列表
-    getContactList () {
+    getContactList() {
       this.$toast.loading({
         message: '加载中...',
         duration: 0,
-        forbidClick: true
+        forbidClick: true,
       })
-      this.mgop({
-        api: 'mgop.sz.hswsy.getPortalUserByNum', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "userNum": localStorage.getItem('centerNo')
-        },
-        onSuccess: res => {
-          console.log('联系人列表：', res)
-          this.$toast.clear()
-          if (res.data.code == 200) {
-            let userInfo = res.data.data.userInfo;
-            let contactList = userInfo.subUsers
-            // 把家长添加到列表
-            contactList.unshift({
-              travelerMobile: userInfo?.phone,
-              travelerNum: userInfo?.centerNo,
-              travelerIdCard: userInfo?.idCard,
-              userType: 2,
-              travelerName: userInfo?.nickName,
-              gender: userInfo?.gender,
-            })
-            this.contactList = contactList
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
+      this.yxAxios.get(`${this.proxyUrl}/user/info/getPortalUserByNum?userNum=${localStorage.getItem('centerNo')}`).then((res) => {
+        console.log('联系人列表：', res)
+        this.$toast.clear()
+        if (res.data.code == 200) {
+          let userInfo = res.data.data.userInfo
+          let contactList = userInfo.subUsers
+          // 把家长添加到列表
+          contactList.unshift({
+            travelerMobile: userInfo?.phone,
+            travelerNum: userInfo?.centerNo,
+            travelerIdCard: userInfo?.idCard,
+            userType: 2,
+            travelerName: userInfo?.nickName,
+            gender: userInfo?.gender,
+          })
+          this.contactList = contactList
         }
-      });
+      })
     },
     // 修改联系人
-    editContact (index) {
+    editContact(index) {
       let contactItem = this.contactList[index]
       let editContact = {
         travelerMobile: contactItem.travelerMobile,
@@ -104,25 +87,25 @@ export default {
       this.$router.push({ name: 'EditContact' })
     },
     // 添加家长
-    addContact () {
+    addContact() {
       this.$router.push({ name: 'EditContact', query: { add: 1 } })
     },
-    complete () {
-      this.showAddChildPopupGroup = false;
+    complete() {
+      this.showAddChildPopupGroup = false
       this.getContactList()
     },
     // 选择联系人完成
-    selectContact () {
-      let contactList = this.contactList;
-      let selectedArr = [];
+    selectContact() {
+      let contactList = this.contactList
+      let selectedArr = []
       for (let i in contactList) {
         if (contactList[i]?.checked) {
           if ((!contactList[i].travelerIdCard || !contactList[i].gender) && !this.hideParent) {
             this.$toast('请先完善您选择的出行人信息')
-            return;
+            return
           } else if (!IdentityCodeValid(contactList[i].travelerIdCard)) {
             this.$toast(`${contactList[i].travelerName}的身份证有误，请重新完善修改`)
-            return;
+            return
           } else {
             selectedArr.push({
               travelerName: contactList[i].travelerName,
@@ -136,7 +119,7 @@ export default {
       }
       console.log(this.limit, selectedArr.length)
       // 判断是否选择学生
-      let hasStudent = false;
+      let hasStudent = false
       for (let i in selectedArr) {
         if (selectedArr[i].userType == 1) {
           hasStudent = true
@@ -146,22 +129,21 @@ export default {
         this.$dialog.alert({
           title: '温馨提示',
           message: '活动参与主体为学生本人，请选择出行学生！未绑定学生，请新增出行学生进行添加。',
-          confirmButtonColor: '#3385FF'
+          confirmButtonColor: '#3385FF',
         })
-        return;
+        return
       }
       // console.log(selectedArr)
       localStorage.setItem('selectedContactArr', JSON.stringify(selectedArr))
       this.$router.back()
     },
-    showPhone(phone){
-      return phone.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2")
-    }
+    showPhone(phone) {
+      return phone.replace(/^(\d{3})\d{4}(\d+)/, '$1****$2')
+    },
   },
   components: {
-    AddChildPopupGroup
-  }
-
+    AddChildPopupGroup,
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -266,4 +248,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Service/ServiceBaseKQ.vue b/src/views/Service/ServiceBaseKQ.vue
index e22ca7b..3a0c6b4 100644
--- a/src/views/Service/ServiceBaseKQ.vue
+++ b/src/views/Service/ServiceBaseKQ.vue
@@ -1,70 +1,53 @@
 <template>
   <div id="serviceKQ">
-    <div v-show="tabName == 'ZZY'">
-      <div class="container" style="top:0">
-        <van-swipe class="service_swipe" :loop="true" :show-indicators="false">
-          <!-- <van-swipe-item @click="handleBanner"> -->
-          <van-swipe-item>
-            <img style="width:100vw" src="@/assets/service/banner3.jpg" alt="" />
-          </van-swipe-item>
-        </van-swipe>
-        <img class="card_zzy" src="@/assets/service/card_zzy.png" alt="" @click="handleMyCard" />
-        <img class="order_btn" src="@/assets/service/order.png" alt="" @click="handleMyOrder" />
-        <van-pull-refresh v-model="loading" @refresh="onRefresh('campList')">
-          <ServiceListFour :list="campList" :notab="false"></ServiceListFour>
-        </van-pull-refresh>
-      </div>
+    <div class="swipeDiv">
+      <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
+        <van-swipe-item>
+          <img src="@/assets/keqiao/kq_main1.png" style="width:100%;height:100%" />
+        </van-swipe-item>
+        <van-swipe-item>
+          <img src="@/assets/keqiao/kq_main2.png" style="width:100%;height:100%" />
+        </van-swipe-item>
+      </van-swipe>
     </div>
-    <div v-show="tabName == 'KQ'">
-      <div class="swipeDiv">
-        <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
-          <van-swipe-item>
-            <img src="@/assets/keqiao/kq_main1.png" style="width:100%;height:100%" />
-          </van-swipe-item>
-          <van-swipe-item>
-            <img src="@/assets/keqiao/kq_main2.png" style="width:100%;height:100%" />
-          </van-swipe-item>
-        </van-swipe>
-      </div>
-      <div class="container" style="margin-bottom:10">
-        <!-- 顶部搜索、扫一扫、个人中心 -->
-        <van-sticky>
-          <!-- <div class="top_tool">
+    <div class="container" style="margin-bottom:10">
+      <!-- 顶部搜索、扫一扫、个人中心 -->
+      <van-sticky>
+        <!-- <div class="top_tool">
             <van-search class="search" v-model="search" shape="round" background="transparent" left-icon="" right-icon="search" placeholder="搜索活动、研学旅行、服务" @search="onSearch" />
           </div> -->
-          <div class="redLink" @click="handleRedLink">
-            <img src="@/assets/keqiao/redlink.png" alt="" />
-          </div>
-        </van-sticky>
-        <div class="tabsCard">
-          <van-tabs v-model="active" sticky offset-top="19.73vw" z-index="100" :ellipsis="false" :before-change="beforeChange" ref="tabs">
-            <van-tab title="革命遗址">
-              <van-pull-refresh v-model="loading" @refresh="onRefresh('uniList')">
-                <ServiceListThird :list="uniList" :notab="true"></ServiceListThird>
-              </van-pull-refresh>
-            </van-tab>
-            <van-tab title="文化传承">
-              <van-pull-refresh v-model="loading" @refresh="onRefresh('weekList')">
-                <ServiceListThird :list="weekList" :notab="true"></ServiceListThird>
-              </van-pull-refresh>
-            </van-tab>
-            <van-tab title="红色军旅">
-              <van-pull-refresh v-model="loading" @refresh="onRefresh('cityList')">
-                <ServiceListThird :list="cityList" :notab="true"></ServiceListThird>
-              </van-pull-refresh>
-            </van-tab>
-            <van-tab title="共同富裕">
-              <van-pull-refresh v-model="loading" @refresh="onRefresh('selectList')">
-                <ServiceListThird :list="selectList" :notab="true"></ServiceListThird>
-              </van-pull-refresh>
-            </van-tab>
-            <van-tab title="大好河山">
-              <van-pull-refresh v-model="loading" @refresh="onRefresh('riverList')">
-                <ServiceListThird :list="riverList" :notab="true"></ServiceListThird>
-              </van-pull-refresh>
-            </van-tab>
-          </van-tabs>
+        <div class="redLink" @click="handleRedLink">
+          <img src="@/assets/keqiao/redlink.png" alt="" />
         </div>
+      </van-sticky>
+      <div class="tabsCard">
+        <van-tabs v-model="active" sticky offset-top="19.73vw" z-index="100" :ellipsis="false" :before-change="beforeChange" ref="tabs">
+          <van-tab title="革命遗址">
+            <van-pull-refresh v-model="loading" @refresh="onRefresh('uniList')">
+              <ServiceListThird :list="uniList" :notab="true"></ServiceListThird>
+            </van-pull-refresh>
+          </van-tab>
+          <van-tab title="文化传承">
+            <van-pull-refresh v-model="loading" @refresh="onRefresh('weekList')">
+              <ServiceListThird :list="weekList" :notab="true"></ServiceListThird>
+            </van-pull-refresh>
+          </van-tab>
+          <van-tab title="红色军旅">
+            <van-pull-refresh v-model="loading" @refresh="onRefresh('cityList')">
+              <ServiceListThird :list="cityList" :notab="true"></ServiceListThird>
+            </van-pull-refresh>
+          </van-tab>
+          <van-tab title="共同富裕">
+            <van-pull-refresh v-model="loading" @refresh="onRefresh('selectList')">
+              <ServiceListThird :list="selectList" :notab="true"></ServiceListThird>
+            </van-pull-refresh>
+          </van-tab>
+          <van-tab title="大好河山">
+            <van-pull-refresh v-model="loading" @refresh="onRefresh('riverList')">
+              <ServiceListThird :list="riverList" :notab="true"></ServiceListThird>
+            </van-pull-refresh>
+          </van-tab>
+        </van-tabs>
       </div>
     </div>
 
@@ -135,16 +118,8 @@ export default {
     // 革命遗址
     getUniList() {
       this.$toast.loading()
-      this.mgop({
-        api: 'mgop.sz.hswsy.qxyList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
+      this.yxAxios
+        .post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
           area: '',
           province: '',
           city: '',
@@ -153,10 +128,9 @@ export default {
           productTypeId: 'BQ0001',
           businessTypeId: 'BQ0001',
           channelCode: '',
-        },
-        onSuccess: (data) => {
-          this.$toast.clear()
-          let uniList = data.data.data
+        })
+        .then((res) => {
+          let uniList = res.data.data
           for (let i in uniList) {
             uniList[i].course_labels = uniList[i].course_labels?.split(',')
             if (uniList[i].startDate) {
@@ -167,25 +141,14 @@ export default {
           }
           this.loading = false
           this.uniList = uniList
-          console.log('革命遗址:', data)
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
-      })
+          console.log('革命遗址:', uniList)
+        })
     },
     // 文化传承
     getWeekList() {
-      this.mgop({
-        api: 'mgop.sz.hswsy.qxyList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
+      this.$toast.loading()
+      this.yxAxios
+        .post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
           area: '',
           province: '',
           city: '',
@@ -194,9 +157,9 @@ export default {
           productTypeId: 'BQ0002',
           businessTypeId: 'BQ0001',
           channelCode: '',
-        },
-        onSuccess: (data) => {
-          let weekList = data.data.data
+        })
+        .then((res) => {
+          let weekList = res.data.data
           for (let i in weekList) {
             weekList[i].course_labels = weekList[i].course_labels?.split(',')
             if (weekList[i].startDate) {
@@ -208,24 +171,13 @@ export default {
           this.loading = false
           this.weekList = weekList
           console.log('文化传承:', weekList)
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
-      })
+        })
     },
     // 红色军旅
     getCityList() {
-      this.mgop({
-        api: 'mgop.sz.hswsy.qxyList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
+      this.$toast.loading()
+      this.yxAxios
+        .post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
           area: '',
           province: '',
           city: '',
@@ -234,9 +186,9 @@ export default {
           productTypeId: 'BQ0003',
           businessTypeId: 'BQ0001',
           channelCode: '',
-        },
-        onSuccess: (data) => {
-          let cityList = data.data.data
+        })
+        .then((res) => {
+          let cityList = res.data.data
           for (let i in cityList) {
             cityList[i].course_labels = cityList[i].course_labels?.split(',')
             if (cityList[i].startDate) {
@@ -248,24 +200,13 @@ export default {
           this.loading = false
           this.cityList = cityList
           console.log('红色军旅:', cityList)
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
-      })
+        })
     },
     // 乡村振新
     getSelectList() {
-      this.mgop({
-        api: 'mgop.sz.hswsy.qxyList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
+      this.$toast.loading()
+      this.yxAxios
+        .post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
           area: '',
           province: '',
           city: '',
@@ -274,9 +215,9 @@ export default {
           productTypeId: 'BQ0004',
           businessTypeId: 'BQ0001',
           channelCode: '',
-        },
-        onSuccess: (data) => {
-          let selectList = data.data.data
+        })
+        .then((res) => {
+          let selectList = res.data.data
           for (let i in selectList) {
             selectList[i].course_labels = selectList[i].course_labels?.split(',')
             if (selectList[i].startDate) {
@@ -288,24 +229,13 @@ export default {
           this.loading = false
           this.selectList = selectList
           console.log('乡村振新：', selectList)
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
-      })
+        })
     },
     // 大好河山
     getRiverList() {
-      this.mgop({
-        api: 'mgop.sz.hswsy.qxyList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
+      this.$toast.loading()
+      this.yxAxios
+        .post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
           area: '',
           province: '',
           city: '',
@@ -314,9 +244,9 @@ export default {
           productTypeId: 'BQ0005',
           businessTypeId: 'BQ0001',
           channelCode: '',
-        },
-        onSuccess: (data) => {
-          let riverList = data.data.data
+        })
+        .then((res) => {
+          let riverList = res.data.data
           for (let i in riverList) {
             riverList[i].course_labels = riverList[i].course_labels?.split(',')
             if (riverList[i].startDate) {
@@ -328,25 +258,14 @@ export default {
           this.loading = false
           this.riverList = riverList
           console.log('大好河山:', riverList)
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
-      })
+        })
     },
 
     // 每周一营 6
     getCampList() {
-      this.mgop({
-        api: 'mgop.sz.hswsy.qxyList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
+      this.$toast.loading()
+      this.yxAxios
+        .post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
           area: '',
           province: '',
           city: '',
@@ -355,9 +274,9 @@ export default {
           productTypeId: 'ZZY001',
           businessTypeId: 'JY0004',
           channelCode: 'GZH002',
-        },
-        onSuccess: (data) => {
-          let campList = data.data.data
+        })
+        .then((res) => {
+          let campList = res.data.data
           for (let i in campList) {
             campList[i].course_labels = campList[i].course_labels?.split(',')
             if (campList[i].startDate) {
@@ -368,12 +287,8 @@ export default {
           }
           this.loading = false
           this.campList = campList
-          console.log('每周一营:', data)
-        },
-        onFail: (err) => {
-          console.log('err', err)
-        },
-      })
+          console.log('每周一营:', campList)
+        })
     },
     beforeChange(index) {
       // if (index != 0 && index != 1  && index != 2) {
@@ -389,11 +304,6 @@ export default {
     handleMyOrder() {
       this.$router.push({ name: 'ServiceOrderXST' })
     },
-    // 我的优惠券
-    handleMyCard() {
-      // this.$toast('暂未开放，敬请期待！');
-      this.$router.push({ name: 'CardBoxXST', query: { active: 1 } })
-    },
     formatWeek(week) {
       return week == 1
         ? '周一'
@@ -417,7 +327,7 @@ export default {
     },
     handleRedLink() {
       let isWechat = localStorage.getItem('isWechat')
-      if (isWechat==1) {
+      if (isWechat == 1) {
         return
       } else {
         location.href = 'https://www.wasee.com/wt/b46pjfuln&ua=WaseeVRAndroid'
diff --git a/src/views/Service/ServiceKQ.vue b/src/views/Service/ServiceKQ.vue
index d7d8445..600e421 100644
--- a/src/views/Service/ServiceKQ.vue
+++ b/src/views/Service/ServiceKQ.vue
@@ -41,14 +41,14 @@ export default {
       let centerNo = localStorage.getItem('centerNo')
       let ticket = this.common.getUrlParam('ticket') //浙里办app访问
       let ticketId = this.common.getUrlParam('ticketId') //浙里办微信小程序访问
-      // alert(location.href)
-      // alert(ticketId)
-      if (centerNo) {
-        // alert('有中台编号：' + centerNo)
-        this.centerNo = centerNo
-        localStorage.setItem('centerNo', centerNo)
-        this.getUserInfo()
-      } else if (ticket) {
+      console.log(ticket,ticketId)
+      // if (centerNo) {
+      //   // alert('有中台编号：' + centerNo)
+      //   this.centerNo = centerNo
+      //   localStorage.setItem('centerNo', centerNo)
+      //   this.getUserInfo()
+      // } else 
+      if (ticket) {
         this.getCenterByTicket(ticket)
       } else if (ticketId) {
         // alert('getCenterByTicketId')
@@ -77,65 +77,29 @@ export default {
     },
     // 通过ticket获取centerNo
     getCenterByTicket(ticket) {
-      this.mgop({
-        api: 'mgop.sz.hswsy.getCenterNo', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          ticket: ticket,
-        },
-        onSuccess: (res) => {
-          console.log('通过ticket获取centerNo成功:', res)
-          // alert('通过ticket获取centerNo成功:' + res.data.message)
-          if (res.data.code == 200) {
-            this.centerNo = res.data.message
-            localStorage.setItem('centerNo', res.data.message)
-            this.getUserInfo()
-          } else {
-            this.reLoad()
-          }
-        },
-        onFail: (err) => {
-          // alert('通过ticket获取centerNo失败:' + JSON.stringify(err))
-          console.log('通过ticket获取centerNo失败:', JSON.stringify(err))
+      this.yxAxios.get(`${this.proxyUrl}/api/third/getCenterNo?ticket=${ticket}`).then((res) => {
+        console.log('通过ticket获取centerNo成功:', res)
+        if (res.data.code == 200) {
+          this.centerNo = res.data.message
+          localStorage.setItem('centerNo', res.data.message)
+          this.getUserInfo()
+        } else {
           this.reLoad()
-        },
+        }
       })
     },
     // 通过ticketId获取centerNo
     getCenterByTicketId(ticketId) {
       // alert(ticketId)
-      this.mgop({
-        api: 'mgop.sz.hswsy.getCenterNoWx', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          ticket: ticketId,
-        },
-        onSuccess: (res) => {
-          // alert('通过ticketId获取centerNo Success:' + res.data.message)
-          if (res.data.code == 200) {
-            // this.centerNo = res.data.message
-            localStorage.setItem('centerNo', res.data.message)
-            this.getUserInfo()
-          } else {
-            this.getUserInfo()
-          }
-        },
-        onFail: (err) => {
-          // alert('通过ticket获取centerNo Fail:' + JSON.stringify(err))
-          // this.reLoad()
-        },
+      this.yxAxios.get(`${this.proxyUrl}/api/third/getCenterNoWx?ticket=${ticketId}`).then((res) => {
+        console.log('通过ticket获取centerNo成功:', res)
+        if (res.data.code == 200) {
+          this.centerNo = res.data.message
+          localStorage.setItem('centerNo', res.data.message)
+          this.getUserInfo()
+        } else {
+          this.reLoad()
+        }
       })
     },
     reLoad() {
@@ -170,30 +134,16 @@ export default {
       }
     },
     // 获取用户信息
-    getUserInfo: function() {
+    getUserInfo() {
       this.centerNo = localStorage.getItem('centerNo')
       // alert('getUserInfo:' + this.centerNo)
-      this.mgop({
-        api: 'mgop.sz.hswsy.getPortalUserByNum', // 必须
-        // host: 'https://mapi.zjzwfw.gov.cn/',
-        // dataType: 'JSON',
-        // type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          userNum: localStorage.getItem('centerNo'),
-        },
-        onSuccess: (res) => {
-          // alert('getUserInfo success:' + JSON.stringify(res))
-          if (res.data.code == 200) {
-            localStorage.setItem('userInfo', JSON.stringify(res.data.data.userInfo))
-          }
-        },
-        onFail: (err) => {
-          // alert('getUserInfo fail:' + JSON.stringify(err))
-        },
+      this.yxAxios.get(`${this.proxyUrl}/user/info/getPortalUserByNum?userNum=${localStorage.getItem('centerNo')}`).then((res) => {
+        console.log('获取用户信息getPortalUserByNum:', res)
+        if (res.data.code == 200) {
+          localStorage.setItem('userInfo', JSON.stringify(res.data.data.userInfo))
+          this.userInfo = res.data.data.userInfo
+          
+        }
       })
     },
   },
diff --git a/src/views/Service/ServiceOrderXST.vue b/src/views/Service/ServiceOrderXST.vue
index bd170e7..2a7ad84 100644
--- a/src/views/Service/ServiceOrderXST.vue
+++ b/src/views/Service/ServiceOrderXST.vue
@@ -119,22 +119,9 @@ export default {
     },
     //获取待评价
     onLoadCareer () {
-      this.mgop({
-        api: 'mgop.sz.hswsy.GetOrderPayList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "userId": localStorage.getItem('centerNo'),
-          "type": 3,
-          "page": 1,
-          "pageSize": 999
-        },
-        onSuccess: res => {
+      this.yxAxios
+        .get(`${this.yanxueUrl}/api/StudiesWap/GetOrderPayList?userId=${localStorage.getItem('centerNo')}&type=${3}&page=1&pageSize=999`)
+        .then((res) => {
           console.log('待评价:', res)
           if (res.data.status == 1) {
             this.datalist = res.data.data.list;
@@ -143,30 +130,13 @@ export default {
           } else {
             this.$toast.fail(res.data.message);
           }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
+        })
     },
     //获取已评价
     onLoad () {
-      this.mgop({
-        api: 'mgop.sz.hswsy.GetOrderPayList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "userId": localStorage.getItem('centerNo'),
-          "type": 4,
-          "page": 1,
-          "pageSize": 999
-        },
-        onSuccess: res => {
+      this.yxAxios
+        .get(`${this.yanxueUrl}/api/StudiesWap/GetOrderPayList?userId=${localStorage.getItem('centerNo')}&type=${4}&page=1&pageSize=999`)
+        .then((res) => {
           console.log('已评价:', res)
           if (res.data.status == 1) {
             this.list = res.data.data.list;
@@ -175,11 +145,7 @@ export default {
           } else {
             this.$toast.fail(res.data.message);
           }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
+        })
     },
     //评价
     evaluate (item) {
diff --git a/src/views/Service/component/AbroadDetail/AbroadBase.vue b/src/views/Service/component/AbroadDetail/AbroadBase.vue
index 0b1b3a5..bc47430 100644
--- a/src/views/Service/component/AbroadDetail/AbroadBase.vue
+++ b/src/views/Service/component/AbroadDetail/AbroadBase.vue
@@ -4,10 +4,8 @@
       <img v-if="baseData.coverList.length > 0" :src="baseData.coverList[0].cover_url" alt="" />
       <div class="center">
         <p class="basename">{{ baseData.baseName }}</p>
-        <p class="address">
-          <van-icon name="location-o" />{{ baseData.city }}{{ baseData.area}}{{ baseData.address }}
-        </p>
-        <p class="tag">{{ baseData.baseLabel.join("/") }}</p>
+        <p class="address"><van-icon name="location-o" />{{ baseData.city }}{{ baseData.area }}{{ baseData.address }}</p>
+        <p class="tag">{{ baseData.baseLabel.join('/') }}</p>
       </div>
     </div>
   </div>
@@ -15,39 +13,24 @@
 <script>
 export default {
   props: ['baseId'],
-  data () {
+  data() {
     return {
-      baseData: "", //基地信息
+      baseData: '', //基地信息
     }
   },
-  mounted () {
+  mounted() {
     this.GetOneBase()
   },
   methods: {
     // 获取单个基地
-    GetOneBase () {
-      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": this.baseId,
-        },
-        onSuccess: res => {
-          if (res.data.data) {
-            this.baseData = res.data.data;
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
+    GetOneBase() {
+      this.yxAxios.get(`${this.yanxueUrl}/api/Manage/GetOneBase?id=${this.baseId}`).then((res) => {
+        // console.log(res.data.data)
+        if (res.data.data) {
+          this.baseData = res.data.data
         }
-      });
+      })
     },
-  }
+  },
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/Service/component/AbroadDetail/AbroadCoupon.vue b/src/views/Service/component/AbroadDetail/AbroadCoupon.vue
deleted file mode 100644
index 2dda32e..0000000
--- a/src/views/Service/component/AbroadDetail/AbroadCoupon.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <div class="course_coupons" v-if="proCoupon.length>0">
-    <div>
-      <van-tag v-for="(item,index) in proCoupon" :key="index" color="#ffffff" text-color="#FF2B2B">{{proCouponHas?'已领取：':''}}{{item.title}}</van-tag>
-    </div>
-    <div @click="toCoupons" class="fontBlue">领取 ></div>
-  </div>
-</template>
-<script>
-export default {
-  props: ['detailDataId', 'centerNo'],
-  data () {
-    return {
-      proCoupon: [],//优惠券
-      proCouponHas: false,//优惠券已领取
-    }
-  },
-  mounted () {
-    this.getOrderCoupon()
-  },
-  methods: {
-    //获取产品可使用优惠券
-    getOrderCoupon () {
-      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.detailDataId,
-          "userId": this.centerNo,
-        },
-        onSuccess: res => {
-          if (res.data.data) {
-            if (res.data.data.has.length > 0) {
-              this.proCoupon = res.data.data.has
-              localStorage.setItem("proCoupon", JSON.stringify(this.proCoupon))
-              this.chooseDefaultUseCard(res.data.data.has)//设置默认选中的优惠券
-              this.proCouponHas = true;
-            } else if (res.data.data.get.length > 0) {
-              this.proCoupon = {
-                title: '您有可领优惠券'
-              }
-            }
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    // 设置默认选中的优惠券
-    chooseDefaultUseCard (has) {
-      if (has.length > 1) {
-        let useCard = has[0];
-        for (let i in has) {
-          console.log(Number(has[i].couponPrice) > Number(useCard.couponPrice))
-          if (Number(has[i].couponPrice) > Number(useCard.couponPrice)) {
-            useCard = has[i]
-          }
-        }
-        // console.log('useCard', useCard)
-        this.proCoupon = [useCard]
-        localStorage.setItem('useCard', JSON.stringify(useCard))
-
-      } else {
-        localStorage.setItem('useCard', JSON.stringify(this.proCoupon[0]))
-      }
-    },
-    //领券
-    toCoupons () {
-      this.$router.push({
-        name: "CardBoxXST",
-      });
-    },
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/Service/component/AbroadDetail/AbroadEvaluate.vue b/src/views/Service/component/AbroadDetail/AbroadEvaluate.vue
index f92cfcf..50e12bd 100644
--- a/src/views/Service/component/AbroadDetail/AbroadEvaluate.vue
+++ b/src/views/Service/component/AbroadDetail/AbroadEvaluate.vue
@@ -1,56 +1,41 @@
 <template>
   <div class="abroad_evaluate">
     <div class="rate" @click="handleEvaluate">
-        <div>
-          <van-rate v-model="evaluationData.evaluationScore" color="#FFCC00" :size="16" readonly />
-          <span>{{ evaluationData.evaluationScore }}</span>
-        </div>
-        <span>共{{evaluationData.evaluationCount}}个客户评价
-          <van-icon name="arrow" />
-        </span>
+      <div>
+        <van-rate v-model="evaluationData.evaluationScore" color="#FFCC00" :size="16" readonly />
+        <span>{{ evaluationData.evaluationScore }}</span>
       </div>
+      <span
+        >共{{ evaluationData.evaluationCount }}个客户评价
+        <van-icon name="arrow" />
+      </span>
+    </div>
   </div>
 </template>
 <script>
 export default {
-  props:['courseId'],
-  data(){
-    return{
-      evaluationData: '',//评价
+  props: ['courseId'],
+  data() {
+    return {
+      evaluationData: '', //评价
     }
   },
-  mounted(){
+  mounted() {
     this.getEvaluationSummary()
   },
-  methods:{
+  methods: {
     // 获取评价
-    getEvaluationSummary () {
-      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)
+    getEvaluationSummary() {
+      this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/Evaluation/Summary?courseId=${this.courseId}`).then((res) => {
+        if (res.data.data) {
+          this.evaluationData = res.data.data
         }
-      });
+      })
     },
     // 点击评价进入评价详情页
-    handleEvaluate () {
-      this.$router.push({ name: "ServiceAbroadEvaluate", query: { courseId: this.courseId } });
+    handleEvaluate() {
+      this.$router.push({ name: 'ServiceAbroadEvaluate', query: { courseId: this.courseId } })
     },
-  }
+  },
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/Service/component/AbroadDetail/CountDown.vue b/src/views/Service/component/AbroadDetail/CountDown.vue
deleted file mode 100644
index 0b57972..0000000
--- a/src/views/Service/component/AbroadDetail/CountDown.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-  <div class="count_down">
-    <div class="countDown" v-show="detailData.clusterTime ">
-      <div class="countDownTop">
-        <div>{{day}} {{detailData.applyCount>=detailData.minPeopleCount?'报名截止时间：':'团期截止倒计时'}}</div>
-        <div v-if="detailData.applyCount>=detailData.minPeopleCount||timeTamp * 1 < 0">{{detailData.periodOfValidity}}</div>
-        <div class="countDownTime" v-else>
-          <div class="countDownFont">{{ showTime.day }}</div>
-          天
-          <div class="countDownFont">{{ showTime.hour }}</div>
-          时
-          <div class="countDownFont">{{ showTime.minute }}</div>
-          分
-          <div class="countDownFont">{{ showTime.second }}</div>
-          秒
-        </div>
-      </div>
-      <!-- <div class="countDownTop" v-else>
-        <div>{{day}}</div>
-      </div> -->
-      <div class="countDownBottom">
-        <div>
-          <div class="countDownBottomyellow" v-show="detailData.minPeopleCount">
-            {{ detailData.clusterName }}
-          </div>
-          <span v-if="detailData.applyCount>=detailData.minPeopleCount">已报名 {{detailData.applyCount}}/{{detailData.stockCount}}{{detailData.unitName}}</span>
-          <span v-else>最低成团数{{detailData.minPeopleCount}}{{detailData.unitName}}/已报名{{detailData.applyCount}}{{detailData.unitName}}</span>
-          <!-- 已报名:<span>{{ detailData.applyCount }}</span><span>/{{ detailData.stockCount }}</span> -->
-        </div>
-        <div class="countDownAbout" @click="showPintuanAbout=true">关于拼团？</div>
-      </div>
-    </div>
-    <van-popup v-model="showPintuanAbout" round>
-      <div class="pintuan_about">
-        <img class="about_img" src="@/assets/service/tip.png" alt="">
-        <p class="about_title">拼团规则说明</p>
-        <p class="about_content">1、拼团展示默认为最近活动档期，选择其它档期请时刻注意成团动态。</p>
-        <p class="about_content">2、在限时截止后，报名人数未达最低成团数，则结束本团活动，系统将在72小时内，全额退还！</p>
-        <p class="about_content">3、报名人数达到最低成团要求后，则拼团成功，凡在报名截止时间内未达最大限团人数，则可放心参与。</p>
-        <p class="about_content">4、已成团的活动，除特殊情况等不可抗拒因素外，活动如期举行。</p>
-        <p class="about_know" @click="showPintuanAbout=false">我知道了</p>
-      </div>
-    </van-popup>
-  </div>
-</template>
-<script>
-export default {
-  props: ['day','productId', 'packageArr', 'bindId', 'comboId'],
-  data () {
-    return {
-      timeTamp: "",
-      showTime: {
-        day: "",
-        hour: "",
-        minute: "",
-        second: "",
-      },
-      showPintuanAbout: false,
-      detailData: ''
-    }
-  },
-  watch: {
-    bindId (oldVal, newVal) {
-      this.getDateInfoById()
-    },
-    comboId (oldVal, newVal) {
-      this.getDateInfoById()
-    },
-  },
-  mounted () {
-    // console.log(this.detailData)
-    // console.log(this.packageArr)
-    this.getDateInfoById()
-
-  },
-  methods: {
-    // 根据选择的档期显示成团状态
-    getDateInfoById () {
-      const productId = this.productId
-      const bindId = this.bindId
-      const comboId = this.comboId
-      // console.log(productId, bindId, comboId)
-      this.mgop({
-        api: 'mgop.sz.hswsy.DateInfoById', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "productId": productId,
-          "bindId": bindId,
-          "comboId": comboId,
-        },
-        onSuccess: res => {
-          console.log('套餐列表:', res.data.data);
-          if (res.data.data) {
-            this.detailData = res.data.data
-            let timer = setInterval(() => {
-              this.timeDown(); //倒计时
-            }, 1000);
-            this.$once("hook:beforeDestroy", () => {
-              clearInterval(timer); //清理定时器
-              console.log('清理定时器')
-            });
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    //倒计时计算
-    timeDown () {
-      var clusterTime = Date.parse(new Date(this.detailData.clusterTime.replace(/\-/g, "/"))) + 60 * 60 * 24 * 1000;
-      var nowTime = Date.parse(new Date());
-      let timeTamp = clusterTime / 1000 - nowTime / 1000;
-      // console.log(timeTamp)
-      this.timeTamp = timeTamp;
-      // console.log(timeTamp)
-      let k = this.calculateDiffTime(timeTamp);
-      // console.log(k)
-    },
-    calculateDiffTime (timeDiff) {
-      var day = parseInt(timeDiff / 86400);
-      var hour = parseInt((timeDiff % 86400) / 3600);
-      var minute = parseInt(((timeDiff % 86400) % 3600) / 60);
-      var second = parseInt((((timeDiff % 86400) % 3600) % 60) % 60);
-
-      this.showTime = {
-        day,
-        hour,
-        minute,
-        second,
-      };
-      day = day ? day + "天" : "";
-      hour = hour ? hour + "时" : "";
-      minute = minute ? minute + "分" : "";
-      second = second ? second + "秒" : "";
-      return day + hour + minute + second;
-    },
-  }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/Service/component/chooseSchool.vue b/src/views/Service/component/chooseSchool.vue
index b32af3e..2b3f9ff 100644
--- a/src/views/Service/component/chooseSchool.vue
+++ b/src/views/Service/component/chooseSchool.vue
@@ -7,8 +7,8 @@
       </form>
     </div>
     <div class="listCardBox">
-      <div v-for="(val,i) in schoolList" :key="i" class="listCard">
-        <div @click="schoolClick(val)">{{val.text}}</div>
+      <div v-for="(val, i) in schoolList" :key="i" class="listCard">
+        <div @click="schoolClick(val)">{{ val.text }}</div>
       </div>
     </div>
   </div>
@@ -16,71 +16,55 @@
 
 <script>
 export default {
-  data () {
+  data() {
     return {
       searchSchool: '',
-      schoolList: []
+      schoolList: [],
     }
   },
   methods: {
-    onSearch (val) {
+    onSearch(val) {
       console.log(val)
       this.GetHighSchoolList()
     },
-    onCancel () {
+    onCancel() {
       // this.$toast('取消');
       this.searchSchool = ''
       this.schoolList = []
       this.$emit('input', false)
     },
     // 通过学校姓名获取学校
-    GetHighSchoolList () {
-      this.mgop({
-        api: 'mgop.sz.hswsy.GetAllSchoolList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "schoolName": this.searchSchool
-        },
-        onSuccess: res => {
-          console.log('学校：', res)
-          if (res.data.data) {
-            let data = res.data.data;
-            let arr = [];
-            if (data) {
-              data.forEach((n, i) => {
-                let obj = {};
-                obj.text = n.schoolName;
-                obj.id = n.id;
-                arr.push(obj);
-              });
-              this.schoolList = arr;
-              console.log(this.schoolList)
-            }
-          } else {
-            this.$toast.fail(res.data.message)
+    GetHighSchoolList() {
+      this.yxAxios.get(`${this.yanxueUrl}/api/SchoolManage/GetAllSchoolList?schoolName=${this.searchSchool}`).then((res) => {
+        console.log('学校：', res)
+        if (res.data.data) {
+          let data = res.data.data
+          let arr = []
+          if (data) {
+            data.forEach((n, i) => {
+              let obj = {}
+              obj.text = n.schoolName
+              obj.id = n.id
+              arr.push(obj)
+            })
+            this.schoolList = arr
+            console.log(this.schoolList)
           }
-        },
-        onFail: err => {
-          console.log('err', err)
+        } else {
+          this.$toast.fail(res.data.message)
         }
-      });
+      })
     },
     //点击学校
-    schoolClick (val) {
+    schoolClick(val) {
       console.log(val)
       this.$emit('schoolData', val)
       this.onCancel()
-    }
+    },
   },
-  mounted () {
+  mounted() {
     // this.GetHighSchoolList()
-  }
+  },
 }
 </script>
 
@@ -109,4 +93,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Service/evaluateBase.vue b/src/views/Service/evaluateBase.vue
index ab9d3e5..e5479a2 100644
--- a/src/views/Service/evaluateBase.vue
+++ b/src/views/Service/evaluateBase.vue
@@ -86,70 +86,40 @@ export default {
       this.$toast.loading({
         message: '请求中...',
       });
-      this.mgop({
-        api: 'mgop.sz.hswsy.AddEvaluation', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "baseId": this.baseId,
-          "signId": this.signId,
-          "evaluation": this.content,
-          "userId": this.studentInfo.travelerNum,
-          "imgList": this.imgsrc,
-          "baseScore": this.starsBaseNum
-        },
-        onSuccess: res => {
-          this.$toast.clear();
-          if (res.data.status == 1) {
-            this.$toast.success('发布成功');
-            setTimeout(() => {
-              this.$router.back()
-            }, 1000)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
+      this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/AddEvaluation`,
+        {
+          baseId: this.baseId,
+          signId:this.signId,
+          evaluation: this.content,
+          userId: this.studentInfo.travelerNum,
+          imgList: this.imgsrc,
+          baseScore: this.starsBaseNum
         }
-      });
+      ).then((res) => {
+        this.$toast.clear();
+        if (res.data.status == 1) {
+          this.$toast.success('发布成功');
+          setTimeout(() => {
+            this.$router.back()
+          }, 1000)
+        }
+      })
+      
     },
     // 获取基地信息
     GetStudyBaseDetail () {
       this.$toast.loading({
         message: '请求中...',
       });
-      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": 0,
-          "cs": '绍兴市',
-          "id": this.baseId
-        },
-        onSuccess: res => {
-          this.$toast.clear()
-          console.log('基地信息：', res.data)
-          if (res.data.data) {
-            this.$toast.clear();
-            this.baseInfo = res.data.data;
-          } else {
-            this.$toast.fail(res.data.message)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
+      this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetStudyBaseDetail?userId=0&cs=绍兴市&id=${this.baseId}`).then((res) => {
+        console.log(res.data)
+        if (res.data.data) {
+          this.$toast.clear();
+          this.baseInfo = res.data.data;
+        } else {
+          this.$toast.fail(res.data.message)
         }
-      });
+      })
     },
     callback (img) {
       this.imgsrc.push({
diff --git a/src/views/Service/evaluateCourse.vue b/src/views/Service/evaluateCourse.vue
index 5b0be7e..c259743 100644
--- a/src/views/Service/evaluateCourse.vue
+++ b/src/views/Service/evaluateCourse.vue
@@ -93,40 +93,29 @@ export default {
       this.$toast.loading({
         message: '请求中...',
       });
-      this.mgop({
-        api: 'mgop.sz.hswsy.AddEvaluation', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "baseId": this.courseInfo.baseId,
-          "title": this.courseInfo.courseName,
-          "evaluation": this.content,
-          "courseId": this.courseInfo.courseId,
-          "orderId": this.courseInfo.id,
-          "userId": this.userInfo.centerNo,
-          "imgList": this.imgsrc,
-          "courseScore": this.starsCourseNum,
-          "baseScore": this.starsBaseNum
-        },
-        onSuccess: res => {
-          this.$toast.clear();
-          if (res.data.status == 1) {
-            this.$toast.success('发布成功');
-            setTimeout(() => {
-              // this.$router.push({ name: 'ServiceOrderXST' })
-              this.$router.back()
-            }, 1000)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
+      this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/AddEvaluation`,
+        {
+          baseId: this.courseInfo.baseId,
+          title: this.courseInfo.courseName,
+          evaluation: this.content,
+          courseId: this.courseInfo.courseId,
+          orderId: this.courseInfo.id,
+          userId: this.userInfo.centerNo,
+          imgList: this.imgsrc,
+          courseScore: this.starsCourseNum,
+          baseScore: this.starsBaseNum
         }
-      });
+      ).then((res) => {
+        this.$toast.clear();
+        if (res.data.status == 1) {
+          this.$toast.success('发布成功');
+          setTimeout(() => {
+            // this.$router.push({ name: 'ServiceOrderQYX' })
+            this.$router.back()
+          }, 1000)
+        }
+      })
+      
     },
     callback (img) {
       this.imgsrc.push({
diff --git a/src/views/Service/evaluateDetail.vue b/src/views/Service/evaluateDetail.vue
index c688371..ae562ac 100644
--- a/src/views/Service/evaluateDetail.vue
+++ b/src/views/Service/evaluateDetail.vue
@@ -2,22 +2,30 @@
   <div class="releaseEvaluate">
     <div class="box top" v-if="baseId">
       <div class="pic">
-        <img :src="baseInfo.coverList[0].cover_url ? baseInfo.coverList[0].cover_url : require('../../assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
+        <img
+          :src="baseInfo.coverList[0].cover_url ? baseInfo.coverList[0].cover_url : require('../../assets/service/defCoure.jpg')"
+          alt=""
+          style="width:100%;height:100%"
+        />
       </div>
       <div class="basefont">
-        <div class="titlefont">{{baseInfo.baseName}}</div>
-        <div class="tcfont">{{baseInfo.address}}</div>
-        <div class="tcfont">{{baseInfo.phone}}</div>
+        <div class="titlefont">{{ baseInfo.baseName }}</div>
+        <div class="tcfont">{{ baseInfo.address }}</div>
+        <div class="tcfont">{{ baseInfo.phone }}</div>
       </div>
     </div>
     <div class="box top" v-else>
       <div class="pic">
-        <img :src="courseInfo.coverUrl ? courseInfo.coverUrl : require('../../assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
+        <img
+          :src="courseInfo.coverUrl ? courseInfo.coverUrl : require('../../assets/service/defCoure.jpg')"
+          alt=""
+          style="width:100%;height:100%"
+        />
       </div>
       <div class="basefont">
-        <div class="titlefont">{{courseInfo.baseName}}</div>
-        <div class="tcfont">套餐名称：{{courseInfo.courseName}}</div>
-        <div class="tcfont" v-if="courseInfo.orderCount">数量*{{courseInfo.orderCount}}</div>
+        <div class="titlefont">{{ courseInfo.baseName }}</div>
+        <div class="tcfont">套餐名称：{{ courseInfo.courseName }}</div>
+        <div class="tcfont" v-if="courseInfo.orderCount">数量*{{ courseInfo.orderCount }}</div>
       </div>
     </div>
     <div class="box">
@@ -25,21 +33,28 @@
         <div class="title">课程评分</div>
         <div class="fr">
           <van-rate v-model="evaluationData.courseScore" void-icon="star" void-color="#eee" color="#FFCC00" :size="16" readonly />
-          <span class="rate">{{evaluationData.courseScore}}.0</span>
+          <span class="rate">{{ evaluationData.courseScore }}.0</span>
         </div>
       </div>
       <div class="boxdf">
         <div class="title">基地评分</div>
         <div class="fr">
           <van-rate v-model="evaluationData.baseScore" void-icon="star" void-color="#eee" color="#FFCC00" :size="16" readonly />
-          <span class="rate">{{evaluationData.baseScore}}.0</span>
+          <span class="rate">{{ evaluationData.baseScore }}.0</span>
         </div>
       </div>
-      <p class="evaluation"><span>评价：</span>{{evaluationData.evaluation}}</p>
+      <p class="evaluation"><span>评价：</span>{{ evaluationData.evaluation }}</p>
       <div class="evaluation_img_box">
-        <img class="evaluation_img" v-for="(imgItem,index) in evaluationData.imgList" :key="index" :src="imgItem.imgUrl" alt="" @click="previewImg(imgItem.imgUrl)">
+        <img
+          class="evaluation_img"
+          v-for="(imgItem, index) in evaluationData.imgList"
+          :key="index"
+          :src="imgItem.imgUrl"
+          alt=""
+          @click="previewImg(imgItem.imgUrl)"
+        />
       </div>
-      <p class="evaluation_time">评价于 {{evaluationData.intime}}</p>
+      <p class="evaluation_time">评价于 {{ evaluationData.intime }}</p>
     </div>
   </div>
 </template>
@@ -47,9 +62,9 @@
 <script>
 import { imgCut } from 'vue-imgcut'
 export default {
-  data () {
+  data() {
     return {
-      baseId: '',//有基地id时为基地评价
+      baseId: '', //有基地id时为基地评价
       baseInfo: '',
       evaluationId: '',
       evaluationData: '',
@@ -68,9 +83,9 @@ export default {
     }
   },
   components: {
-    imgCut
+    imgCut,
   },
-  mounted () {
+  mounted() {
     this.evaluationId = this.$route.query.evaluationId
     let baseId = this.$route.query.baseId
     // 当前为基地评价
@@ -80,33 +95,21 @@ export default {
     }
     this.getEvaluationDetail()
 
-    var courseInfo = window.localStorage.getItem('courseInfo');
+    var courseInfo = window.localStorage.getItem('courseInfo')
     if (courseInfo) {
-      this.courseInfo = JSON.parse(courseInfo);
+      this.courseInfo = JSON.parse(courseInfo)
     }
   },
   methods: {
-    getEvaluationDetail () {
+    getEvaluationDetail() {
       this.$toast.loading({
         message: '加载中...',
         duration: 0,
-        forbidClick: true
+        forbidClick: true,
       })
-      this.mgop({
-        api: 'mgop.sz.hswsy.EvaluationDetailById', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "id": this.evaluationId
-        },
-        onSuccess: res => {
-          this.$toast.clear()
-          console.log('评价详情：', res.data)
+      this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/EvaluationDetail/ById?id=${this.evaluationId}`).then((res) => {
+        this.$toast.clear()
+        console.log('评价详情：', res.data)
         if (res.data.status == 1) {
           let evaluationData = res.data.data
           evaluationData.intime = this.Moment(new Date(evaluationData.intime)).format('YYYY-MM-DD')
@@ -114,47 +117,25 @@ export default {
         } else {
           this.$toast.fail(res.data.message)
         }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
+      })
     },
     // 获取基地信息
-    GetStudyBaseDetail () {
+    GetStudyBaseDetail() {
       this.$toast.loading({
         message: '请求中...',
-      });
-      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": 0,
-          "cs": '绍兴市',
-          "id": this.baseId
-        },
-        onSuccess: res => {
+      })
+      this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetStudyBaseDetail?userId=0&cs=绍兴市&id=${this.baseId}`).then((res) => {
+        this.$toast.clear()
+        console.log('基地信息：', res.data)
+        if (res.data.data) {
           this.$toast.clear()
-          console.log('基地信息：', res.data)
-          if (res.data.data) {
-            this.$toast.clear();
-            this.baseInfo = res.data.data;
-          } else {
-            this.$toast.fail(res.data.message)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
+          this.baseInfo = res.data.data
+        } else {
+          this.$toast.fail(res.data.message)
         }
-      });
+      })
     },
-  }
+  },
 }
 </script>
 
diff --git a/src/views/Service/evaluatePubilc.vue b/src/views/Service/evaluatePubilc.vue
index 67d8c82..2d42002 100644
--- a/src/views/Service/evaluatePubilc.vue
+++ b/src/views/Service/evaluatePubilc.vue
@@ -2,12 +2,16 @@
   <div class="releaseEvaluate">
     <div class="box top">
       <div class="pic">
-        <img :src="courseInfo.coverUrl ? courseInfo.coverUrl : require('../../assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
+        <img
+          :src="courseInfo.coverUrl ? courseInfo.coverUrl : require('../../assets/service/defCoure.jpg')"
+          alt=""
+          style="width:100%;height:100%"
+        />
       </div>
       <div class="basefont">
-        <div class="titlefont">{{courseInfo.baseName}}</div>
-        <div class="tcfont">套餐名称：{{courseInfo.courseName}}</div>
-        <div class="tcfont">数量*{{courseInfo.orderCount}}</div>
+        <div class="titlefont">{{ courseInfo.baseName }}</div>
+        <div class="tcfont">套餐名称：{{ courseInfo.courseName }}</div>
+        <div class="tcfont">数量*{{ courseInfo.orderCount }}</div>
       </div>
     </div>
     <div class="box">
@@ -15,14 +19,14 @@
         <div class="title">课程评分</div>
         <div class="fr">
           <van-rate v-model="starsCourseNum" void-icon="star" void-color="#eee" color="#FFCC00" :size="16" />
-          <span class="rate">{{starsCourseNum}}.0</span>
+          <span class="rate">{{ starsCourseNum }}.0</span>
         </div>
       </div>
       <div class="boxdf">
         <div class="title">基地评分</div>
         <div class="fr">
           <van-rate v-model="starsBaseNum" void-icon="star" void-color="#eee" color="#FFCC00" :size="16" />
-          <span class="rate">{{starsBaseNum}}.0</span>
+          <span class="rate">{{ starsBaseNum }}.0</span>
         </div>
       </div>
       <div class="cont">
@@ -31,7 +35,7 @@
         </div>
       </div>
       <div class="imgs">
-        <img :src="n.imgUrl" alt="" v-for="(n,i) in imgsrc" :key="i">
+        <img :src="n.imgUrl" alt="" v-for="(n, i) in imgsrc" :key="i" />
         <div class="selectImg">
           <imgCut @callback="callback" :width="142" :height="142">
             <van-icon name="cross" />
@@ -40,14 +44,14 @@
         <!-- <van-uploader v-model="fileList" multiple /> -->
       </div>
     </div>
-    <div class="btns" :class="content==''||starsCourseNum==0||starsBaseNum==0?'disabled':''" @click="AddEvaluation ">发布</div>
+    <div class="btns" :class="content == '' || starsCourseNum == 0 || starsBaseNum == 0 ? 'disabled' : ''" @click="AddEvaluation">发布</div>
   </div>
 </template>
 
 <script>
 import { imgCut } from 'vue-imgcut'
 export default {
-  data () {
+  data() {
     return {
       starsBaseNum: 0,
       starsCourseNum: 0,
@@ -64,75 +68,64 @@ export default {
     }
   },
   components: {
-    imgCut
+    imgCut,
   },
-  created () {
-    var userInfo = localStorage.getItem('userInfo');
+  created() {
+    var userInfo = localStorage.getItem('userInfo')
     if (userInfo) {
-      this.userInfo = JSON.parse(userInfo);
+      this.userInfo = JSON.parse(userInfo)
     }
-    var courseInfo = localStorage.getItem('courseInfo');
+    var courseInfo = localStorage.getItem('courseInfo')
     if (courseInfo) {
-      this.courseInfo = JSON.parse(courseInfo);
+      this.courseInfo = JSON.parse(courseInfo)
     }
   },
   methods: {
-    AddEvaluation () {
+    AddEvaluation() {
       if (this.content == '') {
         this.$toast('请输入评价内容')
-        return;
+        return
       }
       if (this.starsCourseNum == 0) {
         this.$toast('请完成课程评分')
-        return;
+        return
       }
       if (this.starsBaseNum == 0) {
         this.$toast('请完成基地评分')
-        return;
+        return
       }
       this.$toast.loading({
         message: '请求中...',
-      });
-      this.mgop({
-        api: 'mgop.sz.hswsy.AddEvaluation', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "baseId": this.courseInfo.baseId,
-          "title": this.courseInfo.courseName,
-          "evaluation": this.content,
-          "courseId": this.courseInfo.courseId,
-          "orderId": this.courseInfo.id,
-          "userId": this.userInfo.centerNo,
-          "imgList": this.imgsrc,
-          "courseScore": this.starsCourseNum,
-          "baseScore": this.starsBaseNum
-        },
-        onSuccess: res => {
-          this.$toast.clear();
+      })
+      this.yxAxios
+        .post(`${this.yanxueUrl}/api/StudiesWap/AddEvaluation`, {
+          baseId: this.courseInfo.baseId,
+          title: this.courseInfo.courseName,
+          evaluation: this.content,
+          courseId: this.courseInfo.courseId,
+          orderId: this.courseInfo.id,
+          userId: this.userInfo.centerNo,
+          imgList: this.imgsrc,
+          courseScore: this.starsCourseNum,
+          baseScore: this.starsBaseNum,
+        })
+        .then((res) => {
+          this.$toast.clear()
           if (res.data.status == 1) {
-            this.$toast.success('发布成功');
+            this.$toast.success('发布成功')
             setTimeout(() => {
-              this.$router.push({ name: 'ServiceOrderXST' })
+              // this.$router.push({ name: 'ServiceOrderQYX' })
+              this.$router.back()
             }, 1000)
           }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
+        })
     },
-    callback (img) {
+    callback(img) {
       this.imgsrc.push({
-        imgUrl: img
-      });
-    }
-  }
+        imgUrl: img,
+      })
+    },
+  },
 }
 </script>
 
--
libgit2 0.21.0