From f02585ece90430a9e6969d2ae607e6ee99ce5a3c Mon Sep 17 00:00:00 2001
From: xiayt <x1027869635@gmail.com>
Date: Fri, 22 Oct 2021 10:46:26 +0800
Subject: [PATCH] feat: 文件结构调整

---
 src/component/MiniProgramPopup.vue                    |  67 -------------------------------------------------------------------
 src/component/PrefectBox.vue                          | 298 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/component/PrefectBoxXST.vue                       | 394 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/component/Tabbar4.vue                             |   2 +-
 src/router/index.js                                   | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/Home/Home.vue                               | 262 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Home/MyClassList.vue                        | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Home/StudentDetail.vue                      | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Home/YanxueCode.vue                         | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Home/YanxueInfo.vue                         |  62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Home/component/AddChildPopupGroup.vue       | 662 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Home/component/HomeChildList.vue            | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Home/component/HomeOrder.vue                |  82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Home/component/HomeScan.vue                 |  50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/PublicHome/HomeKQ.vue                       | 264 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicHome/MyClassList.vue                  | 289 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicHome/StudentDetail.vue                | 419 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicHome/YanxueCode.vue                   | 154 ----------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicHome/YanxueInfo.vue                   |  62 --------------------------------------------------------------
 src/views/PublicHome/component/AddChildPopupGroup.vue | 662 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicHome/component/HomeChildList.vue      | 201 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicHome/component/HomeOrder.vue          |  87 ---------------------------------------------------------------------------------------
 src/views/PublicHome/component/HomeScan.vue           |  50 --------------------------------------------------
 src/views/PublicService/AuthorizeKQ.vue               |  65 -----------------------------------------------------------------
 src/views/PublicService/CardBoxPublic.vue             | 164 --------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/CardBoxXST.vue                | 417 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/CardCourseList.vue            | 199 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/LoginPublic.vue               | 234 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/ServiceBaseKQ.vue             | 571 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/ServiceKQ.vue                 |  81 ---------------------------------------------------------------------------------
 src/views/PublicService/ServiceOrderXST.vue           | 867 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/component/PrefectBox.vue      | 392 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/component/chooseSchool.vue    | 112 ----------------------------------------------------------------------------------------------------------------
 src/views/PublicService/evaluateBase.vue              | 297 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/evaluateCourse.vue            | 274 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/evaluateDetail.vue            | 303 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/evaluatePubilc.vue            | 274 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/PublicService/privateXST.vue                | 362 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/Service/CardBoxPublic.vue                   | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/CardBoxXST.vue                      | 417 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/CardCourseList.vue                  | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/LoginPublic.vue                     | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/SelectContact.vue                   |   2 +-
 src/views/Service/ServiceBaseKQ.vue                   | 571 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/ServiceKQ.vue                       |  81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/ServiceOrderXST.vue                 | 867 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/component/chooseSchool.vue          | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/evaluateBase.vue                    | 297 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/evaluateCourse.vue                  | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/evaluateDetail.vue                  | 303 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/Service/evaluatePubilc.vue                  | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 51 files changed, 6181 insertions(+), 7775 deletions(-)
 delete mode 100644 src/component/MiniProgramPopup.vue
 delete mode 100644 src/component/PrefectBox.vue
 delete mode 100644 src/component/PrefectBoxXST.vue
 create mode 100644 src/views/Home/Home.vue
 create mode 100644 src/views/Home/MyClassList.vue
 create mode 100644 src/views/Home/StudentDetail.vue
 create mode 100644 src/views/Home/YanxueCode.vue
 create mode 100644 src/views/Home/YanxueInfo.vue
 create mode 100644 src/views/Home/component/AddChildPopupGroup.vue
 create mode 100644 src/views/Home/component/HomeChildList.vue
 create mode 100644 src/views/Home/component/HomeOrder.vue
 create mode 100644 src/views/Home/component/HomeScan.vue
 delete mode 100644 src/views/PublicHome/HomeKQ.vue
 delete mode 100644 src/views/PublicHome/MyClassList.vue
 delete mode 100644 src/views/PublicHome/StudentDetail.vue
 delete mode 100644 src/views/PublicHome/YanxueCode.vue
 delete mode 100644 src/views/PublicHome/YanxueInfo.vue
 delete mode 100644 src/views/PublicHome/component/AddChildPopupGroup.vue
 delete mode 100644 src/views/PublicHome/component/HomeChildList.vue
 delete mode 100644 src/views/PublicHome/component/HomeOrder.vue
 delete mode 100644 src/views/PublicHome/component/HomeScan.vue
 delete mode 100644 src/views/PublicService/AuthorizeKQ.vue
 delete mode 100644 src/views/PublicService/CardBoxPublic.vue
 delete mode 100644 src/views/PublicService/CardBoxXST.vue
 delete mode 100644 src/views/PublicService/CardCourseList.vue
 delete mode 100644 src/views/PublicService/LoginPublic.vue
 delete mode 100644 src/views/PublicService/ServiceBaseKQ.vue
 delete mode 100644 src/views/PublicService/ServiceKQ.vue
 delete mode 100644 src/views/PublicService/ServiceOrderXST.vue
 delete mode 100644 src/views/PublicService/component/PrefectBox.vue
 delete mode 100644 src/views/PublicService/component/chooseSchool.vue
 delete mode 100644 src/views/PublicService/evaluateBase.vue
 delete mode 100644 src/views/PublicService/evaluateCourse.vue
 delete mode 100644 src/views/PublicService/evaluateDetail.vue
 delete mode 100644 src/views/PublicService/evaluatePubilc.vue
 delete mode 100644 src/views/PublicService/privateXST.vue
 create mode 100644 src/views/Service/CardBoxPublic.vue
 create mode 100644 src/views/Service/CardBoxXST.vue
 create mode 100644 src/views/Service/CardCourseList.vue
 create mode 100644 src/views/Service/LoginPublic.vue
 create mode 100644 src/views/Service/ServiceBaseKQ.vue
 create mode 100644 src/views/Service/ServiceKQ.vue
 create mode 100644 src/views/Service/ServiceOrderXST.vue
 create mode 100644 src/views/Service/component/chooseSchool.vue
 create mode 100644 src/views/Service/evaluateBase.vue
 create mode 100644 src/views/Service/evaluateCourse.vue
 create mode 100644 src/views/Service/evaluateDetail.vue
 create mode 100644 src/views/Service/evaluatePubilc.vue

diff --git a/src/component/MiniProgramPopup.vue b/src/component/MiniProgramPopup.vue
deleted file mode 100644
index e58a3bf..0000000
--- a/src/component/MiniProgramPopup.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <div id="mini_program">
-    <img src="../assets/success.png" alt="">
-    <p class="title">激活成功</p>
-    <p class="content">请点击下方按钮直接进入<br>（学事通升学汇志愿填报系统）登录</p>
-    <div class="btn_box">
-      <p class="text">点击进入</p>
-      <wx-open-launch-weapp id="launch-btn" username="gh_c0f904a5ee0c" path="pages/index/index?type=zkedt">
-        <script type="text/wxtag-template">
-          <style>.mini_btn { width:500px;height:500px;background:transparent;border:0; }</style>
-        <button class="mini_btn"></button>
-      </script>
-      </wx-open-launch-weapp>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-
-}
-</script>
-<style lang="scss" scoped>
-#mini_program {
-  background: #fff;
-  border-radius: 10px;
-  padding: 60px 40px;
-  img {
-    width: 342px;
-    display: block;
-    margin: 0 auto;
-  }
-  .title {
-    font-size: 40px;
-    font-weight: bold;
-    text-align: center;
-    padding: 20px 0;
-    color: rgb(8, 130, 250);
-  }
-  .content {
-    white-space: nowrap;
-    font-size: 32px;
-    text-align: center;
-    line-height: 50px;
-    padding: 40px 0;
-  }
-  .btn_box {
-    width: 300px;
-    height: 100px;
-    border-radius: 50px;
-    background: rgb(8, 130, 250);
-    display: block;
-    margin: 0 auto;
-    position: relative;
-    overflow: hidden;
-    z-index: 1;
-    .text {
-      font-size: 4.3vw;
-      color: #fff;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      z-index: -1;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/component/PrefectBox.vue b/src/component/PrefectBox.vue
deleted file mode 100644
index fcc6456..0000000
--- a/src/component/PrefectBox.vue
+++ /dev/null
@@ -1,298 +0,0 @@
-<template>
-  <div>
-    <div id="prefect_box">
-      <img class="bg" src="../assets/msg.png" alt="">
-      <div class="content">
-        <div class="item">
-          <input type="text" placeholder="请输入您的姓名" v-model="studentName">
-        </div>
-        <div class="item" @click="handleYear">
-          <p :class="!year||yearDisable?'nodata':''">{{year?year:'请选择当前所处高中年级'}}</p>
-          <img src="../assets/more.png" alt="">
-        </div>
-        <div class="item" @click="showAreaSelect = true">
-          <p :class="!area?'nodata':''">{{area?area:'请选择地区'}}</p>
-          <img src="../assets/more.png" alt="">
-        </div>
-        <div class="item" @click="handleSchool">
-          <p :class="!school?'nodata':''">{{school?school:'请选择学校'}}</p>
-          <img src="../assets/more.png" alt="">
-        </div>
-        <div class="tip">
-          <img src="../assets/tip2.png" alt="">
-          <p>所处高中年级与会员有效期相关，请认真填写</p>
-        </div>
-        <button class="submit" @click="submit">完成</button>
-      </div>
-    </div>
-    <van-popup v-model="showYearSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="当前所处高中年级" show-toolbar :columns="yearArr" value-key="label" @cancel="showYearSelect = false" @confirm="selectYearOver" />
-    </van-popup>
-    <van-popup v-model="showAreaSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-area title="地区" :area-list="areaList" @cancel="showAreaSelect = false" @confirm="selectAreaOver" />
-    </van-popup>
-    <van-popup v-model="showSchoolSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="学校" show-toolbar :columns="schoolList" @cancel="showSchoolSelect = false" @confirm="selectSchoolOver" />
-    </van-popup>
-  </div>
-</template>
-
-<script>
-
-export default {
-  data () {
-    return {
-      studentName: '',
-      year: '',
-      yearDisable: false,
-      showYearSelect: false,
-      yearArr: [],
-      area: '',
-      areaCode: '',
-      showAreaSelect: false,
-      areaList: [],
-      school: '',
-      schoolId: '',
-      showSchoolSelect: false,
-      schoolList: [],
-    }
-  },
-
-  mounted () {
-    let userInfo = sessionStorage.getItem('userInfo')
-    this.userInfo = userInfo ? JSON.parse(userInfo) : userInfo;
-    this.studentName = this.userInfo?.studentName;
-    this.initYearArr()
-    this.GetSysAreaList()
-  },
-  methods: {
-    // 初始化入学年份选项
-    initYearArr () {
-      // 页面创建时执行
-      let year = new Date().getFullYear(),
-        Month = new Date().getMonth() + 1,
-        yearArr = [];
-      // if (Month > 8) {
-      //   // 如果月份大于8,那么当年的学年的高考年份要+1,如果月份小于7,那么当前的年份就是今年高考的年份
-      //   year = year + 1
-      // }
-      for (let index = year - 2; index < year + 1; index++) {
-        yearArr.push({ value: index, label: '' })
-      }
-      yearArr[0].label = `高三(${yearArr[0].value})级`;
-      yearArr[1].label = `高二(${yearArr[1].value})级`;
-      yearArr[2].label = `高一(${yearArr[2].value})级`;
-      this.yearArr = yearArr
-      if (this.userInfo?.year) {
-        for (let i in yearArr) {
-          if (yearArr[i].value == this.userInfo.year) {
-            this.year = yearArr[i].label
-            this.yearDisable = true
-          }
-        }
-      }
-    },
-    selectYearOver (value) {
-      this.year = value.label;
-      this.showYearSelect = false;
-    },
-    handleYear () {
-      if (!this.yearDisable) {
-        this.showYearSelect = true;
-      }
-    },
-    // 获取地区列表
-    GetSysAreaList () {
-      this.http.GetSysAreaList({
-        areaCode: 33
-      }).then((res) => {
-        if (res.success) {
-          let data = res.data;
-          let obj = {
-            province_list: {
-              330000: '浙江省'
-            },
-            city_list: {},
-            county_list: {}
-          };
-          if (data) {
-            data.forEach((n, i) => {
-              obj.city_list[n.area_code + '00'] = n.area_name;
-              if (n.areaList.length > 0) {
-                n.areaList.forEach((k, j) => {
-                  obj.county_list[k.area_code] = k.area_name;
-                })
-              }
-            });
-            this.areaList = obj;
-          }
-        } else {
-          this.$toast.fail(res.message)
-        }
-      })
-    },
-    selectAreaOver (value) {
-      let data = value;
-      var city = data[1].code;
-      city = city.substring(0, city.length - 2);
-      // console.log(city)
-      this.area = data[0].name + ',' + data[1].name + ',' + data[2].name;
-      this.areaCode = [data[0].code, city, data[2].code];
-      this.quCode = data[2].code;
-      this.school = '',
-        this.schoolId = '',
-        this.showAreaSelect = false
-      this.GetHighSchoolList(data[2].code);// 通过地区获取学校
-    },
-    // 点击选择学校
-    handleSchool () {
-      if (!this.area) {
-        this.$toast('请先选择地区');
-        return;
-      }
-      this.showSchoolSelect = true
-    },
-    // 通过地区获取学校
-    GetHighSchoolList (areaCode) {
-      this.http.GetHighSchoolList({
-        areaCode: areaCode
-      }).then((res) => {
-        if (res.success) {
-          let data = res.data;
-          let arr = [];
-          if (data) {
-            data.forEach((n, i) => {
-              let obj = {};
-              obj.text = n.schoolName;
-              obj.value = n.id;
-              arr.push(obj);
-            });
-            this.schoolList = arr;
-          }
-        } else {
-          this.$toast.fail(res.message)
-        }
-      })
-    },
-    selectSchoolOver (value) {
-      this.school = value.text;
-      this.schoolId = value.value
-      this.showSchoolSelect = false
-    },
-
-    submit () {
-      if (!this.year) {
-        this.$toast('请选择入学年份');
-        return;
-      }
-      let postData = {
-        studentName: this.studentName,
-        province: this.area.split(',')[0],
-        city: this.area.split(',')[1],
-        areaCode: this.areaCode[2],
-        areaName: this.area.split(',')[2],
-        school: this.school,
-        schoolAddress: this.areaCode[2] ? JSON.stringify(this.areaCode) : '',
-        year: this.year=='高一'?this.yearArr[2].value:this.year=='高二'?this.yearArr[1].value:this.yearArr[0].value
-      }
-      this.$toast.loading({
-        message: '加载中',
-        duration: 0,
-        forbidClick: true
-      })
-      this.http.updateUserInfo(postData).then((res) => {
-        this.$toast.clear()
-        if (res.success) {
-          this.$toast.success(res.message)
-          this.$emit('complete')
-          this.$emit('hidePrefectBox')
-        } else {
-          this.$toast.fail(res.message)
-        }
-      })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-#prefect_box {
-  width: 638px;
-  height: 836px;
-  background: #ffffff;
-  border-radius: 24px;
-  position: relative;
-  .bg {
-    width: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-  .content {
-    width: 100%;
-    box-sizing: border-box;
-    padding: 0 40px;
-    position: absolute;
-    top: 236px;
-    left: 0;
-    .item {
-      width: 558px;
-      height: 72px;
-      border-radius: 36px;
-      background: #f7f7f7;
-      box-sizing: border-box;
-      font-size: 28px;
-      padding: 0 32px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 28px;
-      p {
-        color: #333333;
-        &.nodata {
-          color: #999999;
-        }
-      }
-      img {
-        width: 40px;
-      }
-      input {
-        width: 100%;
-        background: transparent;
-        border: 0;
-        color: #333333;
-        padding: 0;
-        &::-webkit-input-placeholder {
-          color: #999999;
-        }
-      }
-    }
-    .tip {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-bottom: 40px;
-      img {
-        width: 32px;
-      }
-      p {
-        font-size: 24px;
-        color: #f7b500;
-        margin-left: 8px;
-      }
-    }
-    .submit {
-      width: 294px;
-      height: 72px;
-      border: 0;
-      background: linear-gradient(135deg, #99c2ff 0%, #1f59ff 100%);
-      box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
-        0px 8px 12px 0px rgba(87, 137, 255, 0.5);
-      border-radius: 34px;
-      font-size: 34px;
-      color: #ffffff;
-      margin: 0 auto;
-      display: block;
-    }
-  }
-}
-</style>
diff --git a/src/component/PrefectBoxXST.vue b/src/component/PrefectBoxXST.vue
deleted file mode 100644
index 7ba26ea..0000000
--- a/src/component/PrefectBoxXST.vue
+++ /dev/null
@@ -1,394 +0,0 @@
-<template>
-  <div>
-    <div id="prefect_box">
-      <img class="bg" src="@/assets/msg.png" alt="">
-      <div class="content">
-        <div class="name">学生信息:</div>
-        <div class="item">
-          <input type="text" placeholder="请输入学生姓名" v-model="studentName">
-        </div>
-        <div class="item" @click="showUserTypeSelect=true" style="width:48%;display:inline-flex;margin-right:4%;">
-          <p :class="!userType?'nodata':''">{{userType?userType:'当前阶段'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item" @click="handleYear" style="width:48%;display:inline-flex;">
-          <p :class="!year||yearDisable?'nodata':''">{{year?year:'入学年份'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item" @click="showAreaSelect=true">
-          <p :class="!area?'nodata':''">{{area?area:'请选择地区'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <!-- <div class="item">
-          <form action="/" style="width:100%;">
-            <van-search v-model="searchSchool" placeholder="请输入学校关键字" @search="handleSchool" />
-          </form>
-        </div> -->
-        <div class="item">
-           <input type="text" placeholder="请选择学校" readonly v-model="school">
-           <button type="info" class="btn" @click="chooseSchool">选择学校</button>
-        </div>
-        <!-- <p class="school_select" v-if="school">已选择学校：{{school}}</p> -->
-        <button class="submit" @click="submit">完成</button>
-      </div>
-    </div>
-    <van-popup v-model="showUserTypeSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="当前阶段" show-toolbar :columns="userTypeArr" value-key="label" @cancel="showUserTypeSelect = false" @confirm="selectUserTypeOver" />
-    </van-popup>
-    <van-popup v-model="showYearSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="入学年份" show-toolbar :columns="yearArr" value-key="label" @cancel="showYearSelect = false" @confirm="selectYearOver" />
-    </van-popup>
-    <van-popup v-model="showAreaSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-area title="地区" :area-list="areaList" @cancel="showAreaSelect = false" @confirm="selectAreaOver" />
-    </van-popup>
-    <van-popup v-model="showSchoolSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="学校" show-toolbar :columns="schoolList" :loading="schoolListLoading" @cancel="showSchoolSelect = false" @confirm="selectSchoolOver" />
-    </van-popup>
-
-    <van-popup v-model="chooseSchoolisShow" round  get-container="body" :safe-area-inset-bottom="true">
-      <div v-if="chooseSchoolisShow"><chooseSchool v-model="chooseSchoolisShow" @schoolData='schoolData'></chooseSchool></div>
-    </van-popup>
-  </div>
-</template>
-
-<script>
-
-import chooseSchool from '@/views/PublicService/component/chooseSchool'
-export default {
-  props: [
-    "phone",
-    "id",
-    "publicName"
-  ],
-  components: {chooseSchool},
-  data () {
-    return {
-      studentName: '',
-
-      year: '',//入学年份
-      yearDisable: false,
-      showYearSelect: false,
-      yearArr: [],
-
-      userType: '',
-      userTypeVal: '',//所处阶段1-小学 2-初中 3-高中
-      showUserTypeSelect: false,
-      userTypeArr: [{
-        label: '小学',
-        value: 1
-      }, {
-        label: '初中',
-        value: 2
-      }, {
-        label: '高中',
-        value: 3
-      }],
-
-      area: '',
-      areaCode: '',
-      showAreaSelect: false,
-      areaList: [],
-
-      searchSchool: '',
-      school: '',
-      schoolId: '',
-      showSchoolSelect: false,
-      schoolListLoading: false,
-      schoolList: [],
-
-      appId: '',
-      chooseSchoolisShow: false
-    }
-  },
-
-  mounted () {
-    if (this.publicName == 'SXYX') {
-      this.appId = 'wx1305e88d2bc74073'
-    } else if (this.publicName == 'XST') {
-      this.appId = 'wx1c630c8773c482f1'
-    } else if (this.publicName == 'KQ') {
-      this.appId = 'wx1305e88d2bc74073'
-    }
-    let userInfo = sessionStorage.getItem('userInfo')
-    this.userInfo = userInfo ? JSON.parse(userInfo) : userInfo;
-    this.studentName = this.userInfo?.studentName;
-    this.initYearArr()
-    this.GetSysAreaList()
-  },
-  methods: {
-    // 初始化入学年份选项
-    initYearArr () {
-      // 页面创建时执行
-      let year = new Date().getFullYear(),
-        Month = new Date().getMonth() + 1,
-        yearArr = [];
-      if (Month > 8) {
-        // 如果月份大于8,那么当年的学年的高考年份要+1,如果月份小于7,那么当前的年份就是今年高考的年份
-        year = year
-      }
-      for (let index = year; index > year - 6; index--) {
-        yearArr.push({ value: index, label: index })
-      }
-      this.yearArr = yearArr
-    },
-    selectYearOver (value) {
-      this.year = value.label;
-      this.showYearSelect = false;
-    },
-    handleYear () {
-      if (!this.yearDisable) {
-        this.showYearSelect = true;
-      }
-    },
-    selectUserTypeOver (value) {
-      this.userType = value.label;
-      this.userTypeVal = value.value;
-      this.showUserTypeSelect = false;
-    },
-    // 获取地区列表
-    GetSysAreaList () {
-      this.http.GetSysAreaList({
-        areaCode: 33
-      }).then((res) => {
-        if (res.success) {
-          let data = res.data;
-          let obj = {
-            province_list: {
-              330000: '浙江省'
-            },
-            city_list: {},
-            county_list: {}
-          };
-          if (data) {
-            data.forEach((n, i) => {
-              obj.city_list[n.area_code + '00'] = n.area_name;
-              if (n.areaList.length > 0) {
-                n.areaList.forEach((k, j) => {
-                  obj.county_list[k.area_code] = k.area_name;
-                })
-              }
-            });
-            this.areaList = obj;
-          }
-        } else {
-          this.$toast.fail(res.message)
-        }
-      })
-    },
-    selectAreaOver (value) {
-      let data = value;
-      var city = data[1].code;
-      city = city.substring(0, city.length - 2);
-      // console.log(city)
-      this.area = data[0].name + ',' + data[1].name + ',' + data[2].name;
-      this.areaCode = [data[0].code, city, data[2].code];
-      this.quCode = data[2].code;
-      this.school = '',
-        this.schoolId = '',
-        this.showAreaSelect = false
-    },
-    // 点击选择学校
-    handleSchool () {
-      if (!this.searchSchool) {
-        this.$toast('请输入学校关键字');
-        return;
-      }
-      this.showSchoolSelect = true;
-      this.GetHighSchoolList();
-    },
-    // 通过地区获取学校
-    GetHighSchoolList () {
-      this.schoolListLoading = true;
-      this.yxAxios.get(`${this.yanxueUrl}/api/SchoolManage/GetAllSchoolList?schoolName=${this.searchSchool}`).then((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;
-            this.schoolListLoading = false
-          }
-        } else {
-          this.schoolListLoading = false
-          this.$toast.fail(res.data.message)
-        }
-      })
-    },
-    selectSchoolOver (value) {
-      console.log(value)
-      this.school = value.text;
-      this.schoolId = value.id;
-      this.showSchoolSelect = false;
-    },
-
-    submit () {
-      if (!this.studentName) {
-        this.$toast('请输入姓名');
-      }
-      else if (!this.userType) {
-        this.$toast('请选择阶段');
-      }
-      else if (!this.year) {
-        this.$toast('请选择入学年份');
-      }
-      else if (!this.area) {
-        this.$toast('请选择地区');
-      }
-      else if (!this.school) {
-        this.$toast('请选择学校');
-      } else {
-        let postData = {
-          id: this.userInfo.id,
-          userName: this.studentName,
-          mobile: this.userInfo.phone,
-          province: this.area.split(',')[0],//省份
-          city: this.area.split(',')[1],//城市
-          area: this.area.split(',')[2],//地区
-          schoolName: this.school,//学校名称
-          enrollYear: this.year,//入学年份
-          userType: this.userTypeVal,//1-小学 2-初中 3-高中
-        }
-        this.$toast.loading({
-          message: '加载中',
-          duration: 0,
-          forbidClick: true
-        })
-        this.yxAxios.post(`${this.proxyUrl}/prod/api/wx/${this.appId}/updateUserInfo`, postData).then((res) => {
-          this.$toast.clear()
-          if (res.data.code == 200) {
-            this.$toast.success(res.data?.message)
-            this.$emit('complete')
-            this.$emit('hidePrefectBox')
-          } else {
-            this.$toast.fail(res.message)
-          }
-            this.getUserInfoff()
-        })
-      }
-    },
-    //选择学校
-    chooseSchool() {
-      // this.$router.push({name: 'chooseSchool'})
-      this.chooseSchoolisShow = true
-    },
-    schoolData(val) {
-      this.school = val.text;
-      this.schoolId = val.id;
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-#prefect_box {
-  width: 638px;
-  height: 836px;
-  background: #ffffff;
-  border-radius: 24px;
-  position: relative;
-  .bg {
-    width: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-  .content {
-    width: 100%;
-    box-sizing: border-box;
-    padding: 0 40px;
-    position: absolute;
-    top: 236px;
-    left: 0;
-    .name {
-      width: 558px;
-      height: 50px;
-      font-size: 28px;
-      color: #000;
-      padding-left: 20px;
-      box-sizing: border-box;
-    }
-    .item {
-      width: 558px;
-      height: 72px;
-      border-radius: 36px;
-      background: #f7f7f7;
-      box-sizing: border-box;
-      font-size: 28px;
-      padding: 0 32px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 28px;
-      p {
-        color: #333333;
-        &.nodata {
-          color: #999999;
-        }
-      }
-      img {
-        width: 40px;
-      }
-      input {
-        width: 100%;
-        background: transparent;
-        border: 0;
-        color: #333333;
-        padding: 0;
-        &::-webkit-input-placeholder {
-          color: #999999;
-        }
-      }
-      .btn {
-        width: 240px;
-        height: 55px;
-        float: right;
-        font-size: 28px;
-        background: linear-gradient(135deg, #cdf8cf 0%, #8af36f 100%);
-        box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
-          0px 8px 12px 0px rgba(89, 199, 171, 0.5);
-        border-radius: 34px;
-        border: transparent;
-        color: #333333;
-      }
-    }
-    .school_select {
-      font-size: 28px;
-      padding: 0 32px;
-      margin-bottom: 28px;
-    }
-    .submit {
-      width: 294px;
-      height: 72px;
-      border: 0;
-      background: linear-gradient(135deg, #99c2ff 0%, #1f59ff 100%);
-      box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
-        0px 8px 12px 0px rgba(87, 137, 255, 0.5);
-      border-radius: 34px;
-      font-size: 34px;
-      color: #ffffff;
-      margin: 0 auto;
-      display: block;
-    }
-  }
-}
-::v-deep .van-search {
-  background: transparent;
-  padding: 0;
-  width: 100%;
-}
-::v-deep .van-search__content {
-  padding: 0;
-}
-.schoolBoxF {
-    width: 100vw;
-    height: 100vh;
-    position: absolute;
-    top: 0;
-    left: 0;
-    background-color: #fff;
-}
-</style>
diff --git a/src/component/Tabbar4.vue b/src/component/Tabbar4.vue
index ea7e16f..cd2f30f 100644
--- a/src/component/Tabbar4.vue
+++ b/src/component/Tabbar4.vue
@@ -31,7 +31,7 @@ export default {
       this.$router.push({ name: 'ServiceKQ', query: { showTab: 'KQ' } })
     },
     handleCenter () {
-      this.$router.push({ name: 'HomeKQ' })
+      this.$router.push({ name: 'Home' })
     }
   }
 }
diff --git a/src/router/index.js b/src/router/index.js
index 54a6141..e21729c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,241 +1,232 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import HomeKQ from '@/views/PublicHome/HomeKQ.vue'
+import Home from '@/views/Home/Home.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/PublicService/ServiceOrderXST.vue'
-import evaluateCourse from '@/views/PublicService/evaluateCourse.vue'
-import evaluateBase from '@/views/PublicService/evaluateBase.vue'//基地评价
-import evaluateDetail from '@/views/PublicService/evaluateDetail.vue'//评价详情
+import ServiceOrderXST from '@/views/Service/ServiceOrderXST.vue'
+import evaluateCourse from '@/views/Service/evaluateCourse.vue'
+import evaluateBase from '@/views/Service/evaluateBase.vue' //基地评价
+import evaluateDetail from '@/views/Service/evaluateDetail.vue' //评价详情
 
-import ServiceKQ from '@/views/PublicService/ServiceKQ.vue'   //柯桥研学
-import LoginPublic from '@/views/PublicService/LoginPublic.vue'
-import ServiceCardBoxPublic from '@/views/PublicService/CardBoxPublic.vue'
+import ServiceKQ from '@/views/Service/ServiceKQ.vue' //柯桥研学
+import LoginPublic from '@/views/Service/LoginPublic.vue'
+import ServiceCardBoxPublic from '@/views/Service/CardBoxPublic.vue'
 
-import privateXST from '@/views/PublicService/privateXST.vue'  //学事通 修改个人
-import CardBoxXST from '@/views/PublicService/CardBoxXST.vue'
-import CardCourseList from '@/views/PublicService/CardCourseList.vue'//优惠券对应商品列表
-import YanxueCode from '@/views/PublicHome/YanxueCode.vue'  //研学码
-import YanxueInfo from '@/views/PublicHome/YanxueInfo.vue'  //研学码信息
-import chooseSchool from '@/views/PublicService/component/chooseSchool.vue'  //选择学校
-import SelectContact from '@/views/Service/SelectContact.vue'  //选择联系人
-import EditContact from '@/views/Service/EditContact.vue'  //新增联系人
-import MyClassList from '@/views/PublicHome/MyClassList.vue'  //扫码基地签到
-import StudentDetail from '@/views/PublicHome/StudentDetail.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' //选择学校
+import SelectContact from '@/views/Service/SelectContact.vue' //选择联系人
+import EditContact from '@/views/Service/EditContact.vue' //新增联系人
+import MyClassList from '@/views/Home/MyClassList.vue' //扫码基地签到
+import StudentDetail from '@/views/Home/StudentDetail.vue' //学生信息
 
 
 
 
 Vue.use(VueRouter)
 const [routerPush, routerReplace] = [VueRouter.prototype.push, VueRouter.prototype.replace];
-VueRouter.prototype.push = function push (to) {
-	return routerPush.call(this, to).catch(err => err)
+VueRouter.prototype.push = function push(to) {
+    return routerPush.call(this, to).catch(err => err)
 }
-VueRouter.prototype.replace = function replace (location) {
-	return routerReplace.call(this, location).catch(error => error);
+VueRouter.prototype.replace = function replace(location) {
+    return routerReplace.call(this, location).catch(error => error);
 };
 const routes = [{
-	path: '/',
-	name: 'ServiceKQ',
-	component: ServiceKQ,
-	meta: {
-	}
-}, {
-	path: '/HomeKQ',
-	name: 'HomeKQ',
-	component: HomeKQ,
-	meta: {
-		title: '个人中心(柯桥研学)'
-	}
-},
-{
-	path: '/login_public',
-	name: 'LoginPublic',
-	component: LoginPublic,
-	meta: {
-		title: '绑定手机号'
-	}
-},
+        path: '/',
+        name: 'ServiceKQ',
+        component: ServiceKQ,
+        meta: {}
+    }, {
+        path: '/home',
+        name: 'Home',
+        component: Home,
+        meta: {
+            title: '个人中心(柯桥研学)'
+        }
+    },
+    {
+        path: '/login_public',
+        name: 'LoginPublic',
+        component: LoginPublic,
+        meta: {
+            title: '绑定手机号'
+        }
+    },
 
-{
-	path: '/abroad_detail',
-	name: 'ServiceAbroadDetail',
-	component: ServiceAbroadDetail,
-	meta: {
-		title: '详情'
-	}
-},
+    {
+        path: '/abroad_detail',
+        name: 'ServiceAbroadDetail',
+        component: ServiceAbroadDetail,
+        meta: {
+            title: '详情'
+        }
+    },
 
-{
-	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: '/card_box_public',
-	name: 'ServiceCardBoxPublic',
-	component: ServiceCardBoxPublic,
-	meta: {
-		title: '我的优惠券'
-	}
-},
-{
-	path: '/CardBoxXST',
-	name: 'CardBoxXST',
-	component: CardBoxXST,
-	meta: {
-		title: '我的优惠券'
-	}
-},
-{
-	path: '/CardCourseList',
-	name: 'CardCourseList',
-	component: CardCourseList,
-	meta: {
-		title: '限时限量特惠大集合'
-	}
-},
-{
-	path: '/privateXST',
-	name: 'privateXST',
-	component: privateXST,
-	meta: {
-		title: '修改个人'
-	}
-},
-{
-	path: '/service_orderXST',
-	name: 'ServiceOrderXST',
-	component: ServiceOrderXST,
-	meta: {
-		title: '我的订单'
-	}
-},
-{
-	path: '/evaluateCourse',
-	name: 'evaluateCourse',
-	component: evaluateCourse,
-	meta: {
-		title: '评价'
-	}
-},
-{
-	path: '/evaluateBase',
-	name: 'evaluateBase',
-	component: evaluateBase,
-	meta: {
-		title: '基地评价'
-	}
-},
-{
-	path: '/evaluateDetail',
-	name: 'evaluateDetail',
-	component: evaluateDetail,
-	meta: {
-		title: '评价详情'
-	}
-},
-{
-	path: '/service_abroad_evaluate',
-	name: 'ServiceAbroadEvaluate',
-	component: ServiceAbroadEvaluate,
-	meta: {
-		title: '评价'
-	}
-},
-{
-	path: '/YanxueCode',
-	name: 'YanxueCode',
-	component: YanxueCode,
-	meta: {
-		title: '研学码'
-	}
-},
-{
-	path: '/YanxueInfo',
-	name: 'YanxueInfo',
-	component: YanxueInfo,
-	meta: {
-		title: '研学码信息'
-	}
-},
-{
-	path: '/chooseSchool',
-	name: 'chooseSchool',
-	component: chooseSchool,
-	meta: {
-		title: '选择学校'
-	}
-},
-{
-	path: '/select_contact',
-	name: 'SelectContact',
-	component: SelectContact,
-	meta: {
-		title: '选择出行人'
-	}
-},
-{
-	path: '/edit_contact',
-	name: 'EditContact',
-	component: EditContact,
-	meta: {
-		title: '修改出行人'
-	}
-},
-{
-	path: '/MyClassList',
-	name: 'MyClassList',
-	component: MyClassList,
-	meta: {
-		title: '基地签到'
-	}
-},
-{
-	path: '/StudentDetail',
-	name: 'StudentDetail',
-	component: StudentDetail,
-	meta: {
-		title: '学生信息'
-	}
-},
+    {
+        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: '/card_box_public',
+        name: 'ServiceCardBoxPublic',
+        component: ServiceCardBoxPublic,
+        meta: {
+            title: '我的优惠券'
+        }
+    },
+    {
+        path: '/CardBoxXST',
+        name: 'CardBoxXST',
+        component: CardBoxXST,
+        meta: {
+            title: '我的优惠券'
+        }
+    },
+    {
+        path: '/CardCourseList',
+        name: 'CardCourseList',
+        component: CardCourseList,
+        meta: {
+            title: '限时限量特惠大集合'
+        }
+    },
+
+    {
+        path: '/service_orderXST',
+        name: 'ServiceOrderXST',
+        component: ServiceOrderXST,
+        meta: {
+            title: '我的订单'
+        }
+    },
+    {
+        path: '/evaluateCourse',
+        name: 'evaluateCourse',
+        component: evaluateCourse,
+        meta: {
+            title: '评价'
+        }
+    },
+    {
+        path: '/evaluateBase',
+        name: 'evaluateBase',
+        component: evaluateBase,
+        meta: {
+            title: '基地评价'
+        }
+    },
+    {
+        path: '/evaluateDetail',
+        name: 'evaluateDetail',
+        component: evaluateDetail,
+        meta: {
+            title: '评价详情'
+        }
+    },
+    {
+        path: '/service_abroad_evaluate',
+        name: 'ServiceAbroadEvaluate',
+        component: ServiceAbroadEvaluate,
+        meta: {
+            title: '评价'
+        }
+    },
+    {
+        path: '/YanxueCode',
+        name: 'YanxueCode',
+        component: YanxueCode,
+        meta: {
+            title: '研学码'
+        }
+    },
+    {
+        path: '/YanxueInfo',
+        name: 'YanxueInfo',
+        component: YanxueInfo,
+        meta: {
+            title: '研学码信息'
+        }
+    },
+    {
+        path: '/chooseSchool',
+        name: 'chooseSchool',
+        component: chooseSchool,
+        meta: {
+            title: '选择学校'
+        }
+    },
+    {
+        path: '/select_contact',
+        name: 'SelectContact',
+        component: SelectContact,
+        meta: {
+            title: '选择出行人'
+        }
+    },
+    {
+        path: '/edit_contact',
+        name: 'EditContact',
+        component: EditContact,
+        meta: {
+            title: '修改出行人'
+        }
+    },
+    {
+        path: '/MyClassList',
+        name: 'MyClassList',
+        component: MyClassList,
+        meta: {
+            title: '基地签到'
+        }
+    },
+    {
+        path: '/StudentDetail',
+        name: 'StudentDetail',
+        component: StudentDetail,
+        meta: {
+            title: '学生信息'
+        }
+    },
 ]
 const router = new VueRouter({
-	mode: 'hash',
-	// base: process.env.BASE_URL+'/center',
-	base: process.env.BASE_URL,
-	routes
+    mode: 'hash',
+    // base: process.env.BASE_URL+'/center',
+    base: process.env.BASE_URL,
+    routes
 })
 router.beforeEach((to, from, next) => {
-	/* 路由发生变化修改页面title */
-	if (to.meta.title) {
-		// console.log(to)
-		document.title = to.meta.title
-	}
-	next()
+    /* 路由发生变化修改页面title */
+    if (to.meta.title) {
+        // console.log(to)
+        document.title = to.meta.title
+    }
+    next()
 })
 
-export default router
+export default router
\ No newline at end of file
diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue
new file mode 100644
index 0000000..9ee7959
--- /dev/null
+++ b/src/views/Home/Home.vue
@@ -0,0 +1,262 @@
+<template>
+  <div class="home">
+    <div class="infomation">
+      <div class="top">
+        <div>
+          <img class="head" :src="headImgUrl?headImgUrl:defaultHead" alt="">
+          <div class="right">
+            <p class="name">{{userInfo.nickName}}</p>
+            <p class="phone">{{userInfo.phone}}</p>
+          </div>
+        </div>
+        <HomeScan></HomeScan>
+      </div>
+    </div>
+    <HomeOrder></HomeOrder>
+    <div class="function">
+      <div class="item" @click="handleGroup">
+        <div class="left">
+          <van-icon class="icon" name="orders-o" />
+          <span>集团权限</span>
+        </div>
+        <van-icon name="arrow" />
+      </div>
+      <div class="item" @click="handleMyCard">
+        <div class="left">
+          <van-icon class="icon" name="discount" />
+          <span>我的优惠券</span>
+        </div>
+        <van-icon name="arrow" />
+      </div>
+    </div>
+    <HomeChildList v-if="showChildList"></HomeChildList>
+
+    <!-- <div class="cardPic" v-show='isShow'>
+      <div class="boxPic"  @click="isShow = false">
+          <img style="width:100%;height:100%" src="../assets/coupon.png" />
+      </div>
+    </div> -->
+    <tabbar4 active="center"></tabbar4>
+  </div>
+</template>
+
+<script>
+import HomeChildList from '@/views/Home/component/HomeChildList'
+import HomeOrder from '@/views/Home/component/HomeOrder'
+import HomeScan from '@/views/Home/component/HomeScan'
+import Tabbar4 from '@/component/Tabbar4'
+export default {
+  data () {
+    return {
+      centerNo: '',
+      userInfo: {
+        openId: '',
+        headImg: '',
+        nickName: '',
+        phone: '',
+        roleType: '',
+        time: '',
+        year: '',
+        studentName: '',
+        school: '',
+      },
+      nicknameUser: '',
+      headImgUrl: '',
+      defaultHead: require('@/assets/head.png'),
+      isShow: false,
+      showChildList: false
+    }
+  },
+
+  mounted () {
+
+    this.checkAuth()
+  },
+  methods: {
+    checkAuth () {
+      let centerNo = this.common.getUrlParam('center_no') || sessionStorage.getItem('centerNo');
+      if (centerNo) {
+        this.centerNo = centerNo
+        sessionStorage.setItem('centerNo', centerNo);
+        this.getUserInfo()
+      } else {
+        const sUserAgent = window.navigator.userAgent.toLowerCase()
+        const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1
+        const miniprogram = sUserAgent.indexOf("miniprogram") > -1 && sUserAgent.indexOf("alipay") > -1
+        if (dtdreamweb) {
+          alert('浙里办')
+          window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`;
+        }
+        // else if (miniprogram) {
+        //   alert('支付宝')
+        //   window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`;
+        // }
+        else {
+          console.log('非浙里办渠道访问，显示测试用户数据')
+          this.centerNo = '20210930160466993660'
+          sessionStorage.setItem('centerNo', '20210930160466993660');
+          this.getUserInfo()
+        }
+      }
+    },
+    // 研学码
+    handleYanxue () {
+      this.$router.push({ name: 'YanxueCode' })
+    },
+    // 我的订单
+    handleOrder () {
+      this.$router.push({ name: 'ServiceOrderXST' })
+    },
+    // 集团认证
+    handleGroup () {
+      this.$toast('暂未开放，敬请期待！');
+    },
+    // 我的优惠券
+    handleMyCard () {
+      this.$router.push({ name: 'CardBoxXST' })
+    },
+    // 合伙人中心
+    handlePartner () {
+      this.$toast('暂未开放，敬请期待！');
+      //   this.$router.push({ name: 'Partner' })
+    },
+    // 获取用户信息
+    getUserInfo: function () {
+      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
+            sessionStorage.setItem('userInfo', JSON.stringify(userInfo))
+          }
+          this.showChildList = true
+
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    formatterTime (time) {
+      if (time) {
+        return time.split(' ')[0]
+      } else {
+        return ''
+      }
+    },
+    complete () {
+      this.getUserInfo()
+    }
+  },
+  components: {
+    Tabbar4,
+    HomeChildList,
+    HomeOrder,
+    HomeScan
+  },
+}
+</script>
+<style lang="scss" scoped>
+.home {
+  width: 100%;
+  min-height: 100%;
+  background: #f8f8f8;
+  padding-bottom: 196px;
+  .infomation {
+    width: 100%;
+    height: 320px;
+    background: url("~@/assets/home/bg_kq.png");
+    background-size: 100%;
+    background-position: center;
+    .top {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-between;
+      padding: 40px 28px;
+      > div {
+        display: flex;
+      }
+      .head {
+        width: 96px;
+        height: 96px;
+        border-radius: 50%;
+        overflow: hidden;
+      }
+      .right {
+        height: 96px;
+        margin-left: 24px;
+        display: flex;
+        align-content: space-around;
+        flex-wrap: wrap;
+        color: #fff;
+        .name {
+          font-size: 34px;
+          font-weight: bold;
+          width: 100%;
+        }
+        .phone {
+          font-size: 26px;
+        }
+      }
+    }
+  }
+
+  .function {
+    background: #ffffff;
+    border-radius: 12px;
+    margin: 24px;
+    .item {
+      margin: 0 32px;
+      height: 96px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      font-size: 34px;
+      &:not(:first-of-type) {
+        border-top: 1px solid #e2e2e2;
+      }
+      .left {
+        display: flex;
+        align-items: center;
+        .icon {
+          font-size: 40px;
+          margin-right: 20px;
+        }
+        span {
+          font-size: 30px;
+        }
+      }
+    }
+  }
+}
+
+.boxPic {
+  width: 85vw;
+  height: 115vw;
+  margin: 10vh 7.5vw;
+  position: absolute;
+  top: 0;
+  z-index: 99;
+}
+.cardPic {
+  position: absolute;
+  top: 0;
+  width: 100vw;
+  height: 100vh;
+  background: #0000008a;
+  z-index: 99;
+}
+</style>
diff --git a/src/views/Home/MyClassList.vue b/src/views/Home/MyClassList.vue
new file mode 100644
index 0000000..f070d69
--- /dev/null
+++ b/src/views/Home/MyClassList.vue
@@ -0,0 +1,289 @@
+<template>
+  <div class="sign_in">
+    <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>
+          <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>
+      <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}}
+      </p>
+      <p class="phone">
+        <van-icon name="phone" class="icon" />
+        {{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>
+        <van-icon name="close" class="icon" />
+      </div>
+      <div class="student" v-else>
+        <span>点击选择</span>
+      </div>
+    </div>
+    <div class="btns" @click="getPosition">立即打卡</div>
+    <van-popup v-model="failShow" round closeable :style="{ width:'80%'}">
+      <div class="success">
+        <img src="@/assets/tip1.png" alt="">
+        <h3>打卡失败！</h3>
+        <p>您当前所在的地理位置不在课程的打卡范围内！</p>
+      </div>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      baseInfo: '',
+      list: [],
+      baseId: '',
+      userInfo: '',
+      failShow: false,
+      selectedContact: '',//选择的出行人
+
+    }
+  },
+  mounted () {
+    var userInfo = sessionStorage.getItem('userInfo');
+    if (userInfo) {
+      this.userInfo = JSON.parse(userInfo);
+    }
+    // 选择的出行人
+    let selectedContactArr = sessionStorage.getItem('selectedContactArr');
+    if (selectedContactArr) {
+      selectedContactArr = JSON.parse(selectedContactArr);
+      this.selectedContact = selectedContactArr[0]
+    }
+    this.baseId = this.$route.query.qrresult;
+    this.GetStudyBaseDetail(this.baseId);
+  },
+  methods: {
+    AddSign () {
+
+      this.$toast.loading({
+        message: '请求中...',
+      });
+      this.yxAxios.get(`${this.yanxueUrl}/api/BaseManage/AddSign?userId=${this.selectedContact.travelerNum}&baseId=${this.baseId}`).then((res) => {
+        this.$toast.success('打卡签到成功');
+        console.log(res.data)
+        // alert('打卡签到成功:',JSON.stringify(res))
+        setTimeout(() => {
+          let publicName = sessionStorage.getItem('publicName');
+          this.$router.push({ name: 'Home' + publicName })
+        }, 1000)
+      })
+    },
+    // 获取基地信息
+    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.$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)
+        }
+      });
+    },
+    getPosition () {
+      if (!this.selectedContact.travelerNum) {
+        this.$toast('请选择需要打卡的孩子');
+        return false;
+      }
+      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)
+        if (result.info === 'ok') {
+          basePosition = [result.locations[0].lng, result.locations[0].lat]; // Array.<LngLat>
+        }
+      });
+      this.$toast.loading({
+        message: '请求中...',
+      });
+      this.getNowPosition((posi) => { //获取当前位置坐标
+        this.$toast.clear();
+        if (posi) {
+          var nowPosition = [posi.position.lng, posi.position.lat];
+          var distance = AMap.GeometryUtil.distance(nowPosition, basePosition);
+          console.log(parseInt(distance), nowPosition, basePosition)
+          if (parseInt(distance) > 500) {
+            this.failShow = true;
+          } else {
+            // alert('定位小于500m')
+            this.AddSign();
+          }
+        } else {
+          // alert('getNowPosition没有返回')
+        }
+      });
+    },
+    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) {
+          // alert('返回定位信息:' + JSON.stringify(res))
+          console.log('返回定位信息:', res)
+          callback(res);
+        });//返回定位信息
+        AMap.event.addListener(geolocation, 'error', function (res) {
+          // alert('返回定位出错信息:' + JSON.stringify(res))
+          console.log('返回定位出错信息:', res)
+          callback();
+        });      //返回定位出错信息
+      })
+
+    },
+    // 选择孩子
+    selectStudent () {
+      this.$router.push({ name: 'SelectContact', query: { limit: 1, hideParent: 1 } })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.sign_in {
+  padding-bottom: 100px;
+  .header {
+    img {
+      width: 100%;
+    }
+  }
+  .base_info {
+    width: 702px;
+    margin: 0 auto;
+    padding-top: 20px;
+    .base_title {
+      font-size: 34px;
+      font-weight: bold;
+    }
+    .rate {
+      margin-top: 20px;
+      span {
+        font-size: 30px;
+        color: #ffcc00;
+        margin-left: 30px;
+      }
+    }
+    .address,
+    .phone {
+      font-size: 24px;
+      color: #999;
+      margin-top: 16px;
+      .icon {
+        color: #000;
+      }
+    }
+  }
+  .select_student {
+    width: 702px;
+    margin: 0 auto;
+    margin-top: 30px;
+    padding-top: 30px;
+    border-top: 2px solid #d8d8d8;
+    .select_tip {
+      font-size: 30px;
+      color: #999;
+    }
+    .student {
+      position: relative;
+      width: 532px;
+      line-height: 78px;
+      margin: 0 auto;
+      margin-top: 24px;
+      background: #f5f6fa;
+      border-radius: 8px;
+      font-size: 28px;
+      text-align: center;
+      .icon {
+        position: absolute;
+        top: 50%;
+        right: 20px;
+        transform: translateY(-50%);
+      }
+    }
+  }
+
+  .btns {
+    width: 702px;
+    margin: 0 auto;
+    margin-top: 100px;
+    text-align: center;
+    line-height: 90px;
+    border-radius: 100px;
+    font-size: 30px;
+    background: #4092ff;
+    color: #fff;
+  }
+  .success {
+    padding: 40px 0;
+    text-align: center;
+    img {
+      width: 30%;
+    }
+    h3 {
+      font-size: 36px;
+    }
+    p {
+      font-size: 30px;
+      color: #999999;
+    }
+  }
+}
+</style>
diff --git a/src/views/Home/StudentDetail.vue b/src/views/Home/StudentDetail.vue
new file mode 100644
index 0000000..a085e73
--- /dev/null
+++ b/src/views/Home/StudentDetail.vue
@@ -0,0 +1,419 @@
+<template>
+  <div class="student_detail">
+    <div class="infomation">
+      <div class="top">
+        <div>
+          <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>
+          </div>
+        </div>
+        <HomeScan></HomeScan>
+      </div>
+      <div class="count_box">
+        <div class="count_item">
+          <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="des">课程实践</p>
+        </div>
+      </div>
+      <div class="icon_box">
+        <div class="icon_item" @click="handleYanxue">
+          <img src="@/assets/home/stu_icon1.png" alt="">
+          <p>研学码</p>
+        </div>
+        <div class="icon_item" @click="contactService">
+          <img src="@/assets/home/stu_icon2.png" alt="">
+          <p>专属客服</p>
+        </div>
+        <div class="icon_item">
+          <img src="@/assets/home/stu_icon3.png" alt="">
+          <p>敬请期待</p>
+        </div>
+      </div>
+    </div>
+    <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="left">
+              <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>
+              <button v-else @click="evaluateBaseDetail(item)">查看评价</button>
+            </div>
+          </div>
+          <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="left">
+              <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>
+              <button v-else @click="evaluateCourseDetail(item)">查看评价</button>
+            </div>
+          </div>
+          <van-empty v-if="courseList.length==0" description="暂无课程记录" />
+        </van-tab>
+      </van-tabs>
+    </div>
+  </div>
+</template>
+<script>
+import HomeScan from '@/views/Home/component/HomeScan'
+export default {
+  data () {
+    return {
+      defaultHead: require('@/assets/head.png'),
+      studentInfo: '',
+      courseList: [],//课程记录
+      baseList: [],//基地记录
+      signCheckCountInfo: '',//打卡和课程天数信息
+      active: 0
+    }
+  },
+  mounted () {
+    let studentInfo = sessionStorage.getItem('StudentDetialInfo')
+    this.studentInfo = JSON.parse(studentInfo)
+    this.$nextTick(() => {
+      if (!this.studentInfo?.travelerNum) {
+        this.$toast.fail('学生信息缺失，请返回首页重试')
+        return;
+      }
+      this.$toast.loading({
+        message: '加载中...',
+        duration: 0,
+        forbidClick: true
+      })
+      this.getCourseList()
+      this.getBaseList()
+      this.getSignCheckCountInfo()
+    })
+  },
+  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 => {
+          this.$toast.clear()
+          console.log('课程记录：', res.data)
+          if (res.data.status == 1) {
+            let courseList = res.data.data.data
+            for (let i in courseList) {
+              courseList[i].day = this.Moment(new Date(courseList[i].time)).format('MM-DD')
+              courseList[i].minute = this.Moment(new Date(courseList[i].time)).format('HH:mm')
+            }
+            this.courseList = courseList
+            console.log(this.courseList)
+          } 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 => {
+          this.$toast.clear()
+          console.log('基地记录：', res.data)
+          if (res.data.status == 1) {
+            let baseList = res.data.data.data
+            for (let i in baseList) {
+              baseList[i].day = this.Moment(new Date(baseList[i].time)).format('MM-DD')
+              baseList[i].minute = this.Moment(new Date(baseList[i].time)).format('HH:mm')
+            }
+            console.log(baseList)
+            this.baseList = baseList
+          } 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 => {
+          this.$toast.clear()
+          console.log('天数：', res.data)
+          if (res.data.status == 1) {
+            this.signCheckCountInfo = res.data.data
+          } else {
+            this.$toast.fail(res.data.message)
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    // 研学码
+    handleYanxue () {
+      this.$router.push({ name: 'YanxueCode' })
+    },
+    // 联系客服
+    contactService () {
+      // if (this.detailData.mobiles) {
+      //   location.href = "tel://" + this.detailData.mobiles.split(",")[0];
+      // }
+    },
+    // 基地评价
+    evaluateBase (item) {
+      this.$router.push({ name: 'evaluateBase', query: { baseId: item.baseId, signId: item.signId } })
+    },
+    // 课程评价
+    evaluateCourse (item) {
+      let courseInfo = item;
+      courseInfo.id = courseInfo.orderId
+      window.sessionStorage.setItem('courseInfo', JSON.stringify(courseInfo))
+      this.$router.push({ name: 'evaluateCourse' })
+    },
+    // 基地评价详情
+    evaluateBaseDetail (item) {
+      this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId, baseId: item.baseId } })
+    },
+    // 课程评价详情
+    evaluateCourseDetail (item) {
+      this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId } })
+    }
+  },
+  components: {
+    HomeScan
+  },
+}
+</script>
+<style lang="scss" scoped>
+.student_detail {
+  height: 100%;
+  background: rgb(247, 247, 251);
+  .infomation {
+    width: 100%;
+    height: 852px;
+    background: url("~@/assets/home/bg_stu.png");
+    background-size: 100%;
+    background-position: center;
+    .top {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-between;
+      padding: 40px 28px;
+      > div {
+        display: flex;
+      }
+      .head {
+        width: 96px;
+        height: 96px;
+        border-radius: 50%;
+        overflow: hidden;
+      }
+      .right {
+        width: 450px;
+        height: 96px;
+        margin-left: 24px;
+        display: flex;
+        align-content: space-around;
+        flex-wrap: wrap;
+        color: #fff;
+        .name {
+          font-size: 34px;
+          font-weight: bold;
+          width: 100%;
+          span {
+            display: inline-block;
+            padding: 0 14px;
+            margin-left: 14px;
+            line-height: 34px;
+            border-radius: 17px;
+            font-size: 22px;
+            background: #2d90d2;
+            vertical-align: middle;
+          }
+        }
+        .school_name {
+          font-size: 26px;
+        }
+      }
+    }
+    .count_box {
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      padding: 0 24px;
+      margin-top: 30px;
+      .count_item {
+        color: #fff;
+        text-align: center;
+        .count {
+          font-size: 24px;
+          span {
+            font-size: 38px;
+            font-weight: bold;
+            margin-right: 6px;
+          }
+        }
+        .des {
+          margin-top: 14px;
+          font-size: 28px;
+        }
+      }
+      .line {
+        width: 4px;
+        height: 48px;
+        background: #fff;
+      }
+    }
+    .icon_box {
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      width: 702px;
+      height: 158px;
+      background: #ffffff;
+      border-radius: 16px;
+      margin: 0 auto;
+      margin-top: 30px;
+      .icon_item {
+        text-align: center;
+        img {
+          width: 70px;
+        }
+        p {
+          font-size: 26px;
+        }
+      }
+      .line {
+        width: 4px;
+        height: 48px;
+        background: #fff;
+      }
+    }
+  }
+  .list_box {
+    width: 702px;
+    margin: 0 auto;
+    margin-top: -300px;
+    overflow: hidden;
+    border-radius: 16px;
+    background: #fff;
+    .list_item {
+      position: relative;
+      display: flex;
+      align-items: center;
+      &:first-of-type {
+        margin-top: 20px;
+      }
+      .left {
+        width: 110px;
+        padding-right: 30px;
+        text-align: right;
+        font-size: 34px;
+        .day {
+        }
+        .minute {
+          font-size: 30px;
+          color: #999;
+        }
+      }
+      .line {
+        width: 2px;
+        height: 188px;
+        background: #e5e5e5;
+        border-radius: 1px;
+      }
+      .right {
+        margin-left: 30px;
+        img {
+          display: inline-block;
+          width: 128px;
+          height: 128px;
+          border-radius: 16px;
+        }
+        .item_title {
+          display: inline-block;
+          width: 360px;
+          margin-left: 22px;
+          font-size: 30px;
+          vertical-align: top;
+        }
+        button {
+          position: absolute;
+          bottom: 30px;
+          right: 20px;
+          width: 144px;
+          line-height: 44px;
+          background: #fff;
+          color: #21a3ff;
+          border-radius: 8px;
+          border: 2px solid #21a3ff;
+          font-size: 26px;
+          &.active {
+            background: #21a3ff;
+            color: #fff;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Home/YanxueCode.vue b/src/views/Home/YanxueCode.vue
new file mode 100644
index 0000000..27a5699
--- /dev/null
+++ b/src/views/Home/YanxueCode.vue
@@ -0,0 +1,154 @@
+<template>
+  <div id="codeBox">
+    <div class="blueCard">
+      <div class="name">{{studentInfo.travelerName ? studentInfo.travelerName : ''}}</div>
+      <div class="school">
+        <div class="pic"><img src="@/assets/yxCode/school.png" style="width:100%;height:100%" /></div>
+        <div class="gray">学校：</div>
+        <div>{{studentInfo.schoolName ? studentInfo.schoolName : ''}}</div>
+      </div>
+      <div class="school">
+        <div class="pic"><img src="@/assets/yxCode/classroom.png" style="width:100%;height:100%" /></div>
+        <div class="gray">入学年份：</div>
+        <div>{{studentInfo.enrollYear ? studentInfo.enrollYear : ''}}</div>
+      </div>
+    </div>
+    <div id="qrcode" ref="imageWrapper" v-if="!imgUrl"></div>
+    <div class="codeDiv">
+      <img :src="imgUrl" v-if="imgUrl" style="width:100%;height:100%" />
+    </div>
+    <div class="fontDiv">
+      <div @click="sweep">绑定研学码</div>
+      <div class="blueLine"></div>
+      <div @click="downQrCode">下载一生一码</div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import QRCode from 'qrcodejs2';
+import html2canvas from "html2canvas"
+export default {
+  data () {
+    return {
+      studentInfo: {},
+      qrcodePIc: {},
+      imgUrl: ''
+    }
+  },
+  mounted () {
+    this.studentInfo = JSON.parse(sessionStorage.getItem('StudentDetialInfo'));
+    this.creatQrCode()
+  },
+  methods: {
+    //扫一扫页面
+    sweep () {
+      this.$router.push({ name: 'YanxueInfo' })
+    },
+    //创建qrcode
+    creatQrCode () {
+      let text = this.studentInfo.studyCode ? this.studentInfo.studyCode : ""
+      if (text == '') {
+        this.$toast('请先绑定研学码');
+      }
+      // let text = 'https://www.baidu.com/'
+      console.log(text)
+      document.getElementById('qrcode').innerHTML = '';
+      this.qrcodePIc = new QRCode('qrcode', {
+        text: text,
+        width: 240,
+        height: 240,
+        colorDark: '#333333', // 二维码颜色
+        colorLight: '#ffffff', // 二维码背景色
+        correctLevel: QRCode.CorrectLevel.L // 容错率，L/M/H
+      });
+      let canvas = document.getElementById('qrcode').innerHTML
+      console.log(canvas)
+      this.canvanqrCode()
+    },
+    canvanqrCode () {
+      html2canvas(this.$refs.imageWrapper, {
+        width: 240,
+        height: 240
+      }).then(canvas => {
+        let dataURL = canvas.toDataURL("image/png");
+        this.imgUrl = dataURL;
+      });
+    },
+    downQrCode () {
+      //下载二维码
+      this.$toast('请长按二维码进行保存!')
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+#codeBox {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  .blueCard {
+    width: 94vw;
+    height: 35vw;
+    margin: 5vw auto;
+    // background-color: royalblue;
+    background-image: url("~@/assets/yxCode/bck.png");
+    -moz-background-size: 100% 100%;
+    background-size: 100% 100%;
+    padding: 5vw 7vw;
+    box-sizing: border-box;
+    border-radius: 3vw;
+
+    .name {
+      color: #fff;
+      font-size: 4.5vw;
+      margin-bottom: 4vw;
+    }
+    .school {
+      color: #fff;
+      display: flex;
+      font-size: 3.7vw;
+      margin-bottom: 4vw;
+      display: flex;
+      align-items: center;
+      .pic {
+        width: 4.7vw;
+        height: 4.7vw;
+        margin-right: 2vw;
+      }
+      .gray {
+        color: #f3f3f3;
+      }
+    }
+  }
+  .codeDiv {
+    width: 67vw;
+    height: 67vw;
+    margin: 8vw auto;
+  }
+  .fontDiv {
+    width: 56vw;
+    margin: 0 auto;
+    font-size: 4vw;
+    color: #4092ff;
+    display: flex;
+    justify-content: space-between;
+
+    .blueLine {
+      height: 3.8vw;
+      width: 0.5px;
+      margin-top: 1vw;
+      background-color: #000000;
+      display: flex;
+      align-items: center;
+    }
+  }
+  #qrcode {
+    position: absolute;
+    top: -100vh;
+    left: -100vw;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Home/YanxueInfo.vue b/src/views/Home/YanxueInfo.vue
new file mode 100644
index 0000000..22a216d
--- /dev/null
+++ b/src/views/Home/YanxueInfo.vue
@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <van-field v-model="school" label="学校" readonly placeholder="学校" />
+    <van-field v-model="name" label="学生姓名" readonly placeholder="姓名" />
+    <van-field v-model="userNum" label="用户编号" readonly placeholder="用户编号" />
+    <van-field v-model="codeNum" label="研学码" readonly placeholder="研学码">
+      <van-button slot="button" size="small" native-type="button" @click="saoYiSao">扫一扫</van-button>
+    </van-field>
+    <van-button type="primary" block @click="getbind">提交</van-button>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      codeNum: '',
+      userNum: '',
+      school: '',
+      name: ''
+    }
+  },
+  created () {
+
+    let studentInfo = JSON.parse(sessionStorage.getItem('StudentDetialInfo'));
+    this.userNum = studentInfo.travelerNum
+    this.school = studentInfo.schoolName
+    this.name = studentInfo.travelerName
+    this.codeNum = this.GetQueryString('qrresult') || studentInfo.studyCode;
+  },
+  methods: {
+    getbind () {
+      if (this.userNum == '' || this.codeNum == '') {
+        return this.$toast('请先填写完整信息！');
+      }
+      this.yxAxios.get(this.proxyUrl + '/prod/user/info/bingStudyCode?userNum=' + this.userNum + '&code=' + this.codeNum)
+        .then((res) => {
+          console.log('接口返回', res.data)
+          if (res.data.code == '200') {
+            this.$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';
+    },
+    // 获取链接参数
+    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
diff --git a/src/views/Home/component/AddChildPopupGroup.vue b/src/views/Home/component/AddChildPopupGroup.vue
new file mode 100644
index 0000000..57a4b1e
--- /dev/null
+++ b/src/views/Home/component/AddChildPopupGroup.vue
@@ -0,0 +1,662 @@
+<template>
+  <div>
+    <div class="addchild_group" v-if="step==1">
+      <img class="bg" src="@/assets/home/bg2.png" alt="">
+      <p class="title">添加学生</p>
+      <p class="des">完善相关信息可帮助获得最佳使用体验 </p>
+      <div class="phone_content">
+        <div class="item">
+          <p class="phone_title">手机号</p>
+          <div class="flex">
+            <input class="code phone" type="tel" maxlength="11" v-model="phone" placeholder="请输入您的手机号">
+            <span class="getcode" @click="getCode">{{codeText}}</span>
+          </div>
+        </div>
+        <div class="item">
+          <p class="phone_title">验证码</p>
+          <input class="code" type="text" v-model="code" placeholder="请输入验证码">
+        </div>
+        <button class="submit" @click="checkPhoneAndCode">下一步（1/2）</button>
+      </div>
+    </div>
+    <div class="addchild_group" v-if="step==2">
+      <img class="bg" src="@/assets/home/bg2.png" alt="">
+      <p class="title">已查询到{{claimChildList.length}}位学生信息</p>
+      <p class="des">请仔细确认学生信息后再认领</p>
+      <div class="child_content">
+        <div class="child_box">
+          <div class="child_item" v-for="(item,index) in claimChildList" :key="index">
+            <p><span>姓名</span>{{item.travelerName}}</p>
+            <p><span>阶段</span>{{item.travelerType==1?'小学':item.travelerType==2?'初中':'高中'}}</p>
+            <p><span>所在地区</span>{{item.province+item.city+item.area}}</p>
+            <p><span>学校</span>{{item.schoolName}}</p>
+            <p><span>入学年份</span>{{item.enrollYear}}</p>
+            <van-checkbox class="checkbox" v-model="item.checked" shape="square"></van-checkbox>
+          </div>
+        </div>
+        <button class="submit" @click="claimChild">认领</button>
+      </div>
+    </div>
+    <div class="addchild_group" v-if="step==3">
+      <img class="bg" src="@/assets/home/bg2.png" alt="">
+      <p class="title">添加学生信息</p>
+      <p class="des">如验证号码非学校预留号码，请按步骤自行添加完善学生信息。</p>
+      <div class="content">
+        <div class="name">学生信息</div>
+        <div class="item">
+          <input type="text" placeholder="请输入学生姓名" v-model="studentName">
+        </div>
+        <div class="item" @click="showUserTypeSelect=true" style="width:48%;display:inline-flex;margin-right:4%;">
+          <p :class="!userType?'nodata':''">{{userType?userType:'当前阶段'}}</p>
+          <img src="@/assets/more.png" alt="">
+        </div>
+        <div class="item" @click="handleYear" style="width:48%;display:inline-flex;">
+          <p :class="!year||yearDisable?'nodata':''">{{year?year:'入学年份'}}</p>
+          <img src="@/assets/more.png" alt="">
+        </div>
+        <div class="item" @click="showAreaSelect=true">
+          <p :class="!area?'nodata':''">{{area?area:'请选择地区'}}</p>
+          <img src="@/assets/more.png" alt="">
+        </div>
+        <div class="item">
+          <input type="text" placeholder="请选择学校" readonly v-model="school">
+          <button type="info" class="btn" @click="chooseSchool">选择学校</button>
+        </div>
+        <button class="submit" @click="submit">完成</button>
+      </div>
+    </div>
+    <van-popup v-model="showUserTypeSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
+      <van-picker title="当前阶段" show-toolbar :columns="userTypeArr" value-key="label" @cancel="showUserTypeSelect = false" @confirm="selectUserTypeOver" />
+    </van-popup>
+    <van-popup v-model="showYearSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
+      <van-picker title="入学年份" show-toolbar :columns="yearArr" value-key="label" @cancel="showYearSelect = false" @confirm="selectYearOver" />
+    </van-popup>
+    <van-popup v-model="showAreaSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
+      <van-area title="地区" :area-list="areaList" @cancel="showAreaSelect = false" @confirm="selectAreaOver" />
+    </van-popup>
+
+    <van-popup v-model="chooseSchoolisShow" round get-container="body" :safe-area-inset-bottom="true">
+      <div v-if="chooseSchoolisShow">
+        <chooseSchool v-model="chooseSchoolisShow" @schoolData='schoolData'></chooseSchool>
+      </div>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+
+import chooseSchool from '@/views/Service/component/chooseSchool'
+var codeInterval;
+export default {
+  components: { chooseSchool },
+  data () {
+    return {
+      step: 1,
+      publicName: '',
+      phone: '',
+      codeText: '获取验证码',//获取验证码按钮文字
+      code: '',//验证码
+      studentName: '',
+      showDialog: true,
+
+      claimChildList: [],
+
+      year: '',//入学年份
+      yearDisable: false,
+      showYearSelect: false,
+      yearArr: [],
+
+      userType: '',
+      userTypeVal: '',//所处阶段1-小学 2-初中 3-高中
+      showUserTypeSelect: false,
+      userTypeArr: [{
+        label: '小学',
+        value: 1
+      }, {
+        label: '初中',
+        value: 2
+      }, {
+        label: '高中',
+        value: 3
+      }],
+
+      area: '',
+      areaCode: '',
+      showAreaSelect: false,
+      areaList: [],
+
+      searchSchool: '',
+      school: '',
+      schoolId: '',
+
+      appId: '',
+      chooseSchoolisShow: false
+    }
+  },
+
+  mounted () {
+    let publicName = sessionStorage.getItem('publicName')
+    this.publicName = publicName
+    let userInfo = sessionStorage.getItem('userInfo')
+    this.userInfo = JSON.parse(userInfo);
+    this.initYearArr()
+    this.GetSysAreaList()
+  },
+  methods: {
+    // 获取验证码
+    getCode () {
+      if (this.codeText != '获取验证码') return;
+      if (!this.phone) {
+        this.$toast('请输入手机号')
+        return;
+      }
+      if (!this.checkPhone(this.phone)) {
+        this.$toast('请输入正确的手机号')
+        return;
+      }
+      this.$toast.loading({
+        message: '加载中',
+        duration: 0,
+        forbidClick: true
+      })
+      this.http.getMsg({
+        phone: this.phone
+      }).then((res) => {
+        this.$toast.clear()
+        if (res.success) {
+          let i = 60;
+          codeInterval = setInterval(() => {
+            if (i == 0) {
+              this.codeText = `获取验证码`;
+              clearInterval(codeInterval);
+              return;
+            }
+            this.codeText = `重试（${i}）`;
+            i--
+          }, 1000)
+        } else {
+          this.$toast.fail(res.message)
+        }
+      })
+    },
+    // 获取手机号白名单信息
+    checkPhoneAndCode () {
+      if (!this.phone) {
+        this.$toast('请输入手机号')
+        return;
+      }
+      if (!this.checkPhone(this.phone)) {
+        this.$toast('请输入正确的手机号')
+        return;
+      }
+      if (!this.code) {
+        this.$toast('请输入验证码')
+        return;
+      }
+      this.$toast.loading({
+        message: '加载中',
+        duration: 0,
+        forbidClick: true
+      })
+
+      this.yxAxios.post(`${this.proxyUrl}/prod/user/info/checkPhoneAndCode`, {
+        "code": this.code,
+        "phone": this.phone,
+        "unionId": sessionStorage.getItem('centerNo')
+      }).then((res) => {
+        this.$toast.clear()
+        if (res.data.code == 200) {
+          if (res.data.data.length == 0) {
+            // 白名单无用户
+            this.step = 3;
+          } else {
+            // 白名单有用户
+            let claimChildList = res.data.data
+            for (let i in claimChildList) {
+              claimChildList[i].checked = false
+            }
+            this.claimChildList = claimChildList
+            this.step = 2;
+          }
+        } else {
+          this.$toast.fail(res.data?.message)
+        }
+      })
+    },
+
+
+    // 认领孩子
+    claimChild () {
+      const claimChildList = this.claimChildList;
+      let claimChildId = ''
+      for (let i in claimChildList) {
+        if (claimChildList[i].checked) {
+          if (claimChildId == '') {
+            claimChildId = claimChildList[i].travelerNum
+          } else {
+            claimChildId = claimChildId + ',' + claimChildList[i].travelerNum
+          }
+        }
+      }
+      this.$toast.loading({
+        message: '加载中...',
+        duration: 0,
+        forbidClick: true
+      })
+      this.mgop({
+        api: 'mgop.sz.hswsy.claimChildren', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'POST',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "loginMobile": this.phone,
+          "subUserNums": claimChildId
+        },
+        onSuccess: res => {
+          this.$toast.clear()
+          if (res.data.code == 200) {
+            this.$toast.success('认领成功')
+            this.$emit('complete')
+          } else {
+            this.$toast.fail(res.data?.message)
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+
+
+    // 初始化入学年份选项
+    initYearArr () {
+      // 页面创建时执行
+      let year = new Date().getFullYear(),
+        Month = new Date().getMonth() + 1,
+        yearArr = [];
+      if (Month > 8) {
+        // 如果月份大于8,那么当年的学年的高考年份要+1,如果月份小于7,那么当前的年份就是今年高考的年份
+        year = year
+      }
+      for (let index = year; index > year - 6; index--) {
+        yearArr.push({ value: index, label: index })
+      }
+      this.yearArr = yearArr
+    },
+    selectYearOver (value) {
+      this.year = value.label;
+      this.showYearSelect = false;
+    },
+    handleYear () {
+      if (!this.yearDisable) {
+        this.showYearSelect = true;
+      }
+    },
+    selectUserTypeOver (value) {
+      this.userType = value.label;
+      this.userTypeVal = value.value;
+      this.showUserTypeSelect = false;
+    },
+    // 获取地区列表
+    GetSysAreaList () {
+      this.mgop({
+        api: 'mgop.sz.hswsy.GetSysAreaList', // 必须
+        host: 'https://mapi.zjzwfw.gov.cn/',
+        dataType: 'JSON',
+        type: 'GET',
+        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+        headers: {
+          //   'isTestUrl': '1'
+        },
+        data: {
+          "areaCode": 33
+        },
+        onSuccess: res => {
+          console.log('获取地区列表', res)
+          if (res.data.success) {
+            let data = res.data.data;
+            let obj = {
+              province_list: {
+                330000: '浙江省'
+              },
+              city_list: {},
+              county_list: {}
+            };
+            if (data) {
+              data.forEach((n, i) => {
+                obj.city_list[n.area_code + '00'] = n.area_name;
+                if (n.areaList.length > 0) {
+                  n.areaList.forEach((k, j) => {
+                    obj.county_list[k.area_code] = k.area_name;
+                  })
+                }
+              });
+              this.areaList = obj;
+            }
+          } else {
+            this.$toast.fail(res.message)
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    selectAreaOver (value) {
+      let data = value;
+      var city = data[1].code;
+      city = city.substring(0, city.length - 2);
+      // console.log(city)
+      this.area = data[0].name + ',' + data[1].name + ',' + data[2].name;
+      this.areaCode = [data[0].code, city, data[2].code];
+      this.quCode = data[2].code;
+      this.school = '',
+        this.schoolId = '',
+        this.showAreaSelect = false
+    },
+
+    submit () {
+      if (!this.studentName) {
+        this.$toast('请输入姓名');
+      }
+      else if (!this.userType) {
+        this.$toast('请选择阶段');
+      }
+      else if (!this.year) {
+        this.$toast('请选择入学年份');
+      }
+      else if (!this.area) {
+        this.$toast('请选择地区');
+      }
+      else if (!this.school) {
+        this.$toast('请选择学校');
+      } else {
+        let postData = {
+          contactsName: this.studentName,
+          contactsMobile: this.phone,
+          contactsType: 1,
+          province: this.area.split(',')[0],//省份
+          city: this.area.split(',')[1],//城市
+          area: this.area.split(',')[2],//地区
+          schoolName: this.school,//学校名称
+          enrollYear: this.year,//入学年份
+          travelerType: this.userTypeVal,//1-小学 2-初中 3-高中
+          loginMobile: this.userInfo?.phone
+        }
+        this.$toast.loading({
+          message: '加载中',
+          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.$emit('complete')
+            } else {
+              this.$toast.fail(res.data?.message)
+            }
+          },
+          onFail: err => {
+            console.log('err', err)
+          }
+        });
+      }
+    },
+    //选择学校
+    chooseSchool () {
+      // this.$router.push({name: 'chooseSchool'})
+      this.chooseSchoolisShow = true
+    },
+    schoolData (val) {
+      this.school = val.text;
+      this.schoolId = val.id;
+    },
+    checkPhone (phone) {
+      if ((/^1[3456789]\d{9}$/.test(phone))) {
+        return true
+      } else {
+        return false
+      }
+    },
+  },
+  destroyed () {
+    clearInterval(codeInterval);
+  },
+}
+</script>
+<style lang="scss" scoped>
+.addchild_group {
+  width: 638px;
+  height: 836px;
+  background: #ffffff;
+  border-radius: 24px;
+  position: relative;
+  .bg {
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
+  .title {
+    position: relative;
+    width: 100%;
+    padding-top: 70px;
+    padding-bottom: 8px;
+    text-align: center;
+    font-size: 34px;
+    font-weight: bold;
+    color: #0857ff;
+  }
+  .des {
+    position: relative;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 15%;
+    text-align: center;
+    font-size: 24px;
+    color: #6596ff;
+  }
+  .content {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 40px;
+    position: absolute;
+    top: 236px;
+    left: 0;
+    .name {
+      width: 558px;
+      height: 50px;
+      font-size: 28px;
+      color: #000;
+      padding-left: 20px;
+      box-sizing: border-box;
+    }
+    .item {
+      width: 558px;
+      height: 72px;
+      border-radius: 36px;
+      background: #f7f7f7;
+      box-sizing: border-box;
+      font-size: 28px;
+      padding: 0 32px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 28px;
+      p {
+        color: #333333;
+        &.nodata {
+          color: #999999;
+        }
+      }
+      img {
+        width: 40px;
+      }
+      input {
+        width: 100%;
+        background: transparent;
+        border: 0;
+        color: #333333;
+        padding: 0;
+        &::-webkit-input-placeholder {
+          color: #999999;
+        }
+      }
+      .btn {
+        width: 240px;
+        height: 55px;
+        float: right;
+        font-size: 28px;
+        background: linear-gradient(135deg, #cdf8cf 0%, #8af36f 100%);
+        box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
+          0px 8px 12px 0px rgba(89, 199, 171, 0.5);
+        border-radius: 34px;
+        border: transparent;
+        color: #333333;
+      }
+    }
+    .school_select {
+      font-size: 28px;
+      padding: 0 32px;
+      margin-bottom: 28px;
+    }
+    .submit {
+      width: 294px;
+      height: 72px;
+      border: 0;
+      background: linear-gradient(135deg, #99c2ff 0%, #1f59ff 100%);
+      box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
+        0px 8px 12px 0px rgba(87, 137, 255, 0.5);
+      border-radius: 34px;
+      font-size: 34px;
+      color: #ffffff;
+      margin: 0 auto;
+      display: block;
+    }
+  }
+  .child_content {
+    position: relative;
+    margin-top: 40px;
+    .child_box {
+      height: 500px;
+      overflow: auto;
+      padding-left: 100px;
+      .child_item {
+        position: relative;
+        margin-bottom: 50px;
+        p {
+          font-size: 28px;
+          padding: 8px 0;
+          span {
+            display: inline-block;
+            width: 140px;
+            margin-right: 28px;
+            color: #999;
+          }
+        }
+        .checkbox {
+          position: absolute;
+          top: 115px;
+          right: 20px;
+        }
+      }
+    }
+    .submit {
+      width: 438px;
+      height: 78px;
+      background: #3385ff;
+      border-radius: 37px;
+      border-radius: 39px;
+      border: 0;
+      font-size: 34px;
+      color: #ffffff;
+      margin: 0 auto;
+      display: block;
+    }
+  }
+  .phone_content {
+    width: 100%;
+    position: absolute;
+    top: 180px;
+    left: 0;
+    box-sizing: border-box;
+    padding: 40px;
+    .item {
+      border-bottom: 1px solid #e2e2e2;
+      margin-bottom: 30px;
+    }
+    .phone_title {
+      font-size: 34px;
+      font-weight: bold;
+      margin-bottom: 28px;
+    }
+    .flex {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-bottom: 22px;
+    }
+    .code {
+      border: 0;
+      background: transparent;
+      font-size: 28px;
+      margin-bottom: 32px;
+      width: 100%;
+    }
+    .phone {
+      width: 50%;
+      margin: 0;
+    }
+    .getcode {
+      color: #5789ff;
+      font-size: 28px;
+      padding: 10px;
+    }
+    .submit {
+      width: 438px;
+      height: 78px;
+      background: #3385ff;
+      border-radius: 37px;
+      border-radius: 39px;
+      border: 0;
+      font-size: 34px;
+      color: #ffffff;
+      margin: 0 auto;
+      margin-top: 120px;
+      display: block;
+    }
+  }
+}
+::v-deep .van-search {
+  background: transparent;
+  padding: 0;
+  width: 100%;
+}
+::v-deep .van-search__content {
+  padding: 0;
+}
+.schoolBoxF {
+  width: 100vw;
+  height: 100vh;
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-color: #fff;
+}
+</style>
diff --git a/src/views/Home/component/HomeChildList.vue b/src/views/Home/component/HomeChildList.vue
new file mode 100644
index 0000000..445e848
--- /dev/null
+++ b/src/views/Home/component/HomeChildList.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="home_child_list home_child_list_kq">
+    <div class="stu_info" v-for="(item,index) in childList" :key="index" @click="handleStudentDetail(index)">
+      <div class="title">
+        <p>学生信息</p>
+        <!-- <button @click="handleYanxue(index)">出示研学码</button> -->
+      </div>
+      <img v-if="item.whiteFlag" class="img_auth" src="@/assets/home/auth.png" alt="">
+      <div class="item">
+        <van-icon name="manager" /><span>{{item.travelerName}}</span>
+      </div>
+      <div class="item">
+        <van-icon name="medal" /><span>{{item.enrollYear}}</span>
+      </div>
+      <div class="item">
+        <van-icon name="wap-home" /><span>{{item.schoolName}}</span>
+      </div>
+    </div>
+    <div class="add_btn" @click="addStudent">
+      <van-icon name="add" />
+      添加学生信息
+    </div>
+    <van-popup style="background: transparent;" get-container="body" v-model="showAddChildPopupGroup">
+      <AddChildPopupGroup @complete="complete"></AddChildPopupGroup>
+    </van-popup>
+  </div>
+</template>
+<script>
+import AddChildPopupGroup from '@/views/Home/component/AddChildPopupGroup'
+
+export default {
+  props: {
+    parent: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      showAddChildPopupGroup: false,//新增孩子弹出框
+      childList: [],//孩子列表
+    }
+  },
+  mounted () {
+    this.getChildList()
+  },
+  methods: {
+    // 研学码
+    // handleYanxue (index) {
+    //   sessionStorage.setItem('bindYanxueCodeChildInfo',JSON.stringify(this.childList[index]))
+    //   this.$router.push({ name: 'YanxueCode' })
+    // },
+    // 进入学生详情页
+    handleStudentDetail (index) {
+      sessionStorage.setItem('StudentDetialInfo', JSON.stringify(this.childList[index]))
+      this.$router.push({ name: 'StudentDetail' })
+    },
+    // 获取孩子列表
+    getChildList () {
+      this.$toast.loading({
+        message: '加载中...',
+        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": sessionStorage.getItem('centerNo')
+        },
+        onSuccess: res => {
+          console.log('getUserInfo', res)
+          this.$toast.clear()
+          if (res.data.code == 200) {
+          this.childList = res.data.data.userInfo.subUsers
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    addStudent(){
+      this.showAddChildPopupGroup=true
+    },
+    complete () {
+      this.showAddChildPopupGroup = false;
+      this.getChildList()
+    },
+  },
+  components: {
+    AddChildPopupGroup
+  }
+
+}
+</script>
+<style lang="scss">
+.home_child_list {
+  width: 100%;
+  padding: 16px 24px;
+  box-sizing: border-box;
+  .stu_info {
+    position: relative;
+    width: 100%;
+    height: 252px;
+    box-sizing: border-box;
+    padding: 24px 28px;
+    margin-bottom: 16px;
+    border-radius: 12px;
+    &:nth-of-type(2n) {
+      background: linear-gradient(47deg, #ff7371 0%, #fdd17c 100%);
+      box-shadow: 0px 4px 8px 0px rgba(254, 151, 117, 0.11);
+    }
+    &:nth-of-type(2n-1) {
+      background: linear-gradient(41deg, #316ff0 0%, #2afffb 100%);
+      box-shadow: 0px 4px 8px 0px rgba(37, 171, 255, 0.34);
+    }
+    .title {
+      // margin-top: 30px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-bottom: 42px;
+      p {
+        font-size: 32px;
+        font-weight: bold;
+        color: #fff;
+      }
+      button {
+        color: #ffffff;
+        font-size: 20px;
+        height: 40px;
+        border-radius: 30px;
+        border: 0;
+        background: linear-gradient(137deg, #83b2ff 0%, #3c80ef 100%);
+        box-shadow: 0px 4px 8px 0px rgba(106, 154, 232, 0.5);
+      }
+    }
+    .img_auth {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+      width: 196px;
+    }
+    .item {
+      display: inline-block;
+      margin-bottom: 24px;
+      color: #fff;
+      font-size: 28px;
+      span {
+        margin-left: 16px;
+      }
+      &:nth-of-type(2) {
+        margin-right: 60px;
+      }
+      &:last-of-type {
+        display: block;
+      }
+    }
+  }
+  .add_btn {
+    width: 100%;
+    box-sizing: border-box;
+    line-height: 96px;
+    border-radius: 16px;
+    border: 4px dashed #3074ff;
+    text-align: center;
+    font-size: 30px;
+    color: #3074ff;
+  }
+}
+// 柯桥个人中心红色主题
+.home_child_list_kq {
+  .stu_info {
+    &:nth-of-type(2n) {
+      background: linear-gradient(47deg, #ff7371 0%, #fdd17c 100%);
+      box-shadow: 0px 4px 8px 0px rgba(254, 151, 117, 0.11);
+    }
+    &:nth-of-type(2n-1) {
+      background: linear-gradient(41deg, #f03131 0%, #ff90a8 100%);
+      box-shadow: 0px 4px 8px 0px rgba(37, 171, 255, 0.34);
+    }
+    .title {
+      button {
+        background: linear-gradient(137deg, #ff83a2 0%, #ef3c63 100%);
+        box-shadow: 0px 4px 8px 0px rgba(232, 106, 165, 0.5);
+      }
+    }
+  }
+  .add_btn {
+    border-color: #f63837;
+    color: #f63837;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Home/component/HomeOrder.vue b/src/views/Home/component/HomeOrder.vue
new file mode 100644
index 0000000..172937d
--- /dev/null
+++ b/src/views/Home/component/HomeOrder.vue
@@ -0,0 +1,82 @@
+<template>
+  <div class="home_order">
+    <div class="top">
+      <p>我的订单</p>
+    </div>
+    <div class="icon_box">
+      <div @click="handleCustom">
+        <img src="@/assets/home/icon_kq1.png" alt="">
+        <p>定制研学</p>
+      </div>
+      <div @click="handleServiceOrder(0)">
+        <img src="@/assets/home/icon_kq2.png" alt="">
+        <p>待付款</p>
+      </div>
+      <div @click="handleServiceOrder(1)">
+        <img src="@/assets/home/icon_kq3.png" alt="">
+        <p>待使用</p>
+      </div>
+      <div @click="handleServiceOrder(2)">
+        <img src="@/assets/home/icon_kq4.png" alt="">
+        <p>待评价</p>
+      </div>
+      <div @click="handleServiceOrder(3)">
+        <img src="@/assets/home/icon_kq5.png" alt="">
+        <p>已评价</p>
+      </div>
+
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props:{
+    parent:{
+      type:String,
+      default:''
+    }
+  },
+  methods: {
+    // 定制研学
+    handleCustom () {
+      this.$toast('暂未开放，敬请期待！');
+    },
+    handleServiceOrder (active) {
+      this.$router.push({ name: 'ServiceOrderXST', query: { active: active } })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.home_order {
+  width: 702px;
+  margin: 0 auto;
+  margin-top: -130px;
+  box-sizing: border-box;
+  padding: 24px;
+  background: #fff;
+  border-radius: 16px;
+  .top {
+    p {
+      font-size: 28px;
+      font-weight: bold;
+    }
+  }
+  .icon_box {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 140px;
+    margin-top: 20px;
+    img {
+      display: block;
+      width: 62px;
+      margin: 0 auto;
+    }
+    p {
+      margin-top: 14px;
+      font-size: 26px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Home/component/HomeScan.vue b/src/views/Home/component/HomeScan.vue
new file mode 100644
index 0000000..351cf96
--- /dev/null
+++ b/src/views/Home/component/HomeScan.vue
@@ -0,0 +1,50 @@
+<template>
+  <div class="scan" @click="saoYiSao">
+    <van-icon name="scan" />
+    <img class="tishi" src="@/assets/home/tishi.png" alt="扫码打卡">
+  </div>
+</template>
+<script>
+export default {
+  methods: {
+    saoYiSao () {
+      let isLogin = this.checkLogin()
+      if (!isLogin) return;
+      if (process.env.NODE_ENV === "production" && this.common.isWeiXin()) {
+        location.href = `http://sao315.com/w/api/saoyisao?redirect_uri=https://payment.myjxt.com/center/%23/MyClassList`;
+      } else {
+        this.$router.push({ name: 'MyClassList', query: { qrresult: '188' } })
+      }
+    },
+    // 判断是否已登录
+    checkLogin () {
+      if (process.env.NODE_ENV != "production") return true;
+      const userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+      if (!userInfo?.phone) {
+        sessionStorage.setItem('prePage', 'Home' + sessionStorage.getItem('publicName'));
+        sessionStorage.setItem('prePageQuery', JSON.stringify({ showTab: this.$route.query.showTab }));
+        this.$router.push({ name: 'LoginPublic', query: { publicName: sessionStorage.getItem('publicName') } })
+        return false;
+      }
+      return true;
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.scan {
+  position: relative;
+  // position:absolute;
+  // right:20px;
+  // top :20px;
+  // z-index :100;
+  color: white;
+  font-size: 50px;
+  .tishi {
+    position: absolute;
+    left: -90px;
+    bottom: -30px;
+    width: 112px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/PublicHome/HomeKQ.vue b/src/views/PublicHome/HomeKQ.vue
deleted file mode 100644
index 19d7581..0000000
--- a/src/views/PublicHome/HomeKQ.vue
+++ /dev/null
@@ -1,264 +0,0 @@
-<template>
-  <div class="home">
-    <div class="infomation">
-      <div class="top">
-        <div>
-          <img class="head" :src="headImgUrl?headImgUrl:defaultHead" alt="">
-          <div class="right">
-            <p class="name">{{userInfo.nickName}}</p>
-            <p class="phone">{{userInfo.phone}}</p>
-          </div>
-        </div>
-        <HomeScan></HomeScan>
-      </div>
-    </div>
-    <HomeOrder parent="HomeKQ"></HomeOrder>
-    <div class="function">
-      <div class="item" @click="handleGroup">
-        <div class="left">
-          <van-icon class="icon" name="orders-o" />
-          <span>集团权限</span>
-        </div>
-        <van-icon name="arrow" />
-      </div>
-      <div class="item" @click="handleMyCard">
-        <div class="left">
-          <van-icon class="icon" name="discount" />
-          <span>我的优惠券</span>
-        </div>
-        <van-icon name="arrow" />
-      </div>
-    </div>
-    <HomeChildList v-if="showChildList" parent="HomeKQ"></HomeChildList>
-
-    <!-- <div class="cardPic" v-show='isShow'>
-      <div class="boxPic"  @click="isShow = false">
-          <img style="width:100%;height:100%" src="../assets/coupon.png" />
-      </div>
-    </div> -->
-    <tabbar4 active="center"></tabbar4>
-  </div>
-</template>
-
-<script>
-import PrefectBoxXST from '@/component/PrefectBoxXST'
-import HomeChildList from '@/views/PublicHome/component/HomeChildList'
-import HomeOrder from '@/views/PublicHome/component/HomeOrder'
-import HomeScan from '@/views/PublicHome/component/HomeScan'
-import Tabbar4 from '@/component/Tabbar4'
-export default {
-  data () {
-    return {
-      centerNo: '',
-      userInfo: {
-        openId: '',
-        headImg: '',
-        nickName: '',
-        phone: '',
-        roleType: '',
-        time: '',
-        year: '',
-        studentName: '',
-        school: '',
-      },
-      nicknameUser: '',
-      headImgUrl: '',
-      defaultHead: require('@/assets/head.png'),
-      isShow: false,
-      showChildList: false
-    }
-  },
-
-  mounted () {
-
-    this.checkAuth()
-  },
-  methods: {
-    checkAuth () {
-      let centerNo = this.common.getUrlParam('center_no') || sessionStorage.getItem('centerNo');
-      if (centerNo) {
-        this.centerNo = centerNo
-        sessionStorage.setItem('centerNo', centerNo);
-        this.getUserInfo()
-      } else {
-        const sUserAgent = window.navigator.userAgent.toLowerCase()
-        const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1
-        const miniprogram = sUserAgent.indexOf("miniprogram") > -1 && sUserAgent.indexOf("alipay") > -1
-        if (dtdreamweb) {
-          alert('浙里办')
-          window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`;
-        }
-        // else if (miniprogram) {
-        //   alert('支付宝')
-        //   window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`;
-        // }
-        else {
-          console.log('非浙里办渠道访问，显示测试用户数据')
-          this.centerNo = '20210930160466993660'
-          sessionStorage.setItem('centerNo', '20210930160466993660');
-          this.getUserInfo()
-        }
-      }
-    },
-    // 研学码
-    handleYanxue () {
-      this.$router.push({ name: 'YanxueCode' })
-    },
-    // 我的订单
-    handleOrder () {
-      this.$router.push({ name: 'ServiceOrderXST' })
-    },
-    // 集团认证
-    handleGroup () {
-      this.$toast('暂未开放，敬请期待！');
-    },
-    // 我的优惠券
-    handleMyCard () {
-      this.$router.push({ name: 'CardBoxXST' })
-    },
-    // 合伙人中心
-    handlePartner () {
-      this.$toast('暂未开放，敬请期待！');
-      //   this.$router.push({ name: 'Partner' })
-    },
-    // 获取用户信息
-    getUserInfo: function () {
-      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
-            sessionStorage.setItem('userInfo', JSON.stringify(userInfo))
-          }
-          this.showChildList = true
-
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    formatterTime (time) {
-      if (time) {
-        return time.split(' ')[0]
-      } else {
-        return ''
-      }
-    },
-    complete () {
-      this.getUserInfo()
-    }
-  },
-  components: {
-    Tabbar4,
-    PrefectBoxXST,
-    HomeChildList,
-    HomeOrder,
-    HomeScan
-  },
-}
-</script>
-<style lang="scss" scoped>
-.home {
-  width: 100%;
-  min-height: 100%;
-  background: #f8f8f8;
-  padding-bottom: 196px;
-  .infomation {
-    width: 100%;
-    height: 320px;
-    background: url("~@/assets/home/bg_kq.png");
-    background-size: 100%;
-    background-position: center;
-    .top {
-      display: flex;
-      flex-wrap: wrap;
-      align-items: center;
-      justify-content: space-between;
-      padding: 40px 28px;
-      > div {
-        display: flex;
-      }
-      .head {
-        width: 96px;
-        height: 96px;
-        border-radius: 50%;
-        overflow: hidden;
-      }
-      .right {
-        height: 96px;
-        margin-left: 24px;
-        display: flex;
-        align-content: space-around;
-        flex-wrap: wrap;
-        color: #fff;
-        .name {
-          font-size: 34px;
-          font-weight: bold;
-          width: 100%;
-        }
-        .phone {
-          font-size: 26px;
-        }
-      }
-    }
-  }
-
-  .function {
-    background: #ffffff;
-    border-radius: 12px;
-    margin: 24px;
-    .item {
-      margin: 0 32px;
-      height: 96px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      font-size: 34px;
-      &:not(:first-of-type) {
-        border-top: 1px solid #e2e2e2;
-      }
-      .left {
-        display: flex;
-        align-items: center;
-        .icon {
-          font-size: 40px;
-          margin-right: 20px;
-        }
-        span {
-          font-size: 30px;
-        }
-      }
-    }
-  }
-}
-
-.boxPic {
-  width: 85vw;
-  height: 115vw;
-  margin: 10vh 7.5vw;
-  position: absolute;
-  top: 0;
-  z-index: 99;
-}
-.cardPic {
-  position: absolute;
-  top: 0;
-  width: 100vw;
-  height: 100vh;
-  background: #0000008a;
-  z-index: 99;
-}
-</style>
diff --git a/src/views/PublicHome/MyClassList.vue b/src/views/PublicHome/MyClassList.vue
deleted file mode 100644
index f070d69..0000000
--- a/src/views/PublicHome/MyClassList.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<template>
-  <div class="sign_in">
-    <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>
-          <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>
-      <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}}
-      </p>
-      <p class="phone">
-        <van-icon name="phone" class="icon" />
-        {{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>
-        <van-icon name="close" class="icon" />
-      </div>
-      <div class="student" v-else>
-        <span>点击选择</span>
-      </div>
-    </div>
-    <div class="btns" @click="getPosition">立即打卡</div>
-    <van-popup v-model="failShow" round closeable :style="{ width:'80%'}">
-      <div class="success">
-        <img src="@/assets/tip1.png" alt="">
-        <h3>打卡失败！</h3>
-        <p>您当前所在的地理位置不在课程的打卡范围内！</p>
-      </div>
-    </van-popup>
-  </div>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      baseInfo: '',
-      list: [],
-      baseId: '',
-      userInfo: '',
-      failShow: false,
-      selectedContact: '',//选择的出行人
-
-    }
-  },
-  mounted () {
-    var userInfo = sessionStorage.getItem('userInfo');
-    if (userInfo) {
-      this.userInfo = JSON.parse(userInfo);
-    }
-    // 选择的出行人
-    let selectedContactArr = sessionStorage.getItem('selectedContactArr');
-    if (selectedContactArr) {
-      selectedContactArr = JSON.parse(selectedContactArr);
-      this.selectedContact = selectedContactArr[0]
-    }
-    this.baseId = this.$route.query.qrresult;
-    this.GetStudyBaseDetail(this.baseId);
-  },
-  methods: {
-    AddSign () {
-
-      this.$toast.loading({
-        message: '请求中...',
-      });
-      this.yxAxios.get(`${this.yanxueUrl}/api/BaseManage/AddSign?userId=${this.selectedContact.travelerNum}&baseId=${this.baseId}`).then((res) => {
-        this.$toast.success('打卡签到成功');
-        console.log(res.data)
-        // alert('打卡签到成功:',JSON.stringify(res))
-        setTimeout(() => {
-          let publicName = sessionStorage.getItem('publicName');
-          this.$router.push({ name: 'Home' + publicName })
-        }, 1000)
-      })
-    },
-    // 获取基地信息
-    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.$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)
-        }
-      });
-    },
-    getPosition () {
-      if (!this.selectedContact.travelerNum) {
-        this.$toast('请选择需要打卡的孩子');
-        return false;
-      }
-      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)
-        if (result.info === 'ok') {
-          basePosition = [result.locations[0].lng, result.locations[0].lat]; // Array.<LngLat>
-        }
-      });
-      this.$toast.loading({
-        message: '请求中...',
-      });
-      this.getNowPosition((posi) => { //获取当前位置坐标
-        this.$toast.clear();
-        if (posi) {
-          var nowPosition = [posi.position.lng, posi.position.lat];
-          var distance = AMap.GeometryUtil.distance(nowPosition, basePosition);
-          console.log(parseInt(distance), nowPosition, basePosition)
-          if (parseInt(distance) > 500) {
-            this.failShow = true;
-          } else {
-            // alert('定位小于500m')
-            this.AddSign();
-          }
-        } else {
-          // alert('getNowPosition没有返回')
-        }
-      });
-    },
-    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) {
-          // alert('返回定位信息:' + JSON.stringify(res))
-          console.log('返回定位信息:', res)
-          callback(res);
-        });//返回定位信息
-        AMap.event.addListener(geolocation, 'error', function (res) {
-          // alert('返回定位出错信息:' + JSON.stringify(res))
-          console.log('返回定位出错信息:', res)
-          callback();
-        });      //返回定位出错信息
-      })
-
-    },
-    // 选择孩子
-    selectStudent () {
-      this.$router.push({ name: 'SelectContact', query: { limit: 1, hideParent: 1 } })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.sign_in {
-  padding-bottom: 100px;
-  .header {
-    img {
-      width: 100%;
-    }
-  }
-  .base_info {
-    width: 702px;
-    margin: 0 auto;
-    padding-top: 20px;
-    .base_title {
-      font-size: 34px;
-      font-weight: bold;
-    }
-    .rate {
-      margin-top: 20px;
-      span {
-        font-size: 30px;
-        color: #ffcc00;
-        margin-left: 30px;
-      }
-    }
-    .address,
-    .phone {
-      font-size: 24px;
-      color: #999;
-      margin-top: 16px;
-      .icon {
-        color: #000;
-      }
-    }
-  }
-  .select_student {
-    width: 702px;
-    margin: 0 auto;
-    margin-top: 30px;
-    padding-top: 30px;
-    border-top: 2px solid #d8d8d8;
-    .select_tip {
-      font-size: 30px;
-      color: #999;
-    }
-    .student {
-      position: relative;
-      width: 532px;
-      line-height: 78px;
-      margin: 0 auto;
-      margin-top: 24px;
-      background: #f5f6fa;
-      border-radius: 8px;
-      font-size: 28px;
-      text-align: center;
-      .icon {
-        position: absolute;
-        top: 50%;
-        right: 20px;
-        transform: translateY(-50%);
-      }
-    }
-  }
-
-  .btns {
-    width: 702px;
-    margin: 0 auto;
-    margin-top: 100px;
-    text-align: center;
-    line-height: 90px;
-    border-radius: 100px;
-    font-size: 30px;
-    background: #4092ff;
-    color: #fff;
-  }
-  .success {
-    padding: 40px 0;
-    text-align: center;
-    img {
-      width: 30%;
-    }
-    h3 {
-      font-size: 36px;
-    }
-    p {
-      font-size: 30px;
-      color: #999999;
-    }
-  }
-}
-</style>
diff --git a/src/views/PublicHome/StudentDetail.vue b/src/views/PublicHome/StudentDetail.vue
deleted file mode 100644
index 2f2aba8..0000000
--- a/src/views/PublicHome/StudentDetail.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<template>
-  <div class="student_detail">
-    <div class="infomation">
-      <div class="top">
-        <div>
-          <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>
-          </div>
-        </div>
-        <HomeScan></HomeScan>
-      </div>
-      <div class="count_box">
-        <div class="count_item">
-          <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="des">课程实践</p>
-        </div>
-      </div>
-      <div class="icon_box">
-        <div class="icon_item" @click="handleYanxue">
-          <img src="@/assets/home/stu_icon1.png" alt="">
-          <p>研学码</p>
-        </div>
-        <div class="icon_item" @click="contactService">
-          <img src="@/assets/home/stu_icon2.png" alt="">
-          <p>专属客服</p>
-        </div>
-        <div class="icon_item">
-          <img src="@/assets/home/stu_icon3.png" alt="">
-          <p>敬请期待</p>
-        </div>
-      </div>
-    </div>
-    <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="left">
-              <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>
-              <button v-else @click="evaluateBaseDetail(item)">查看评价</button>
-            </div>
-          </div>
-          <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="left">
-              <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>
-              <button v-else @click="evaluateCourseDetail(item)">查看评价</button>
-            </div>
-          </div>
-          <van-empty v-if="courseList.length==0" description="暂无课程记录" />
-        </van-tab>
-      </van-tabs>
-    </div>
-  </div>
-</template>
-<script>
-import HomeScan from '@/views/PublicHome/component/HomeScan'
-export default {
-  data () {
-    return {
-      defaultHead: require('@/assets/head.png'),
-      studentInfo: '',
-      courseList: [],//课程记录
-      baseList: [],//基地记录
-      signCheckCountInfo: '',//打卡和课程天数信息
-      active: 0
-    }
-  },
-  mounted () {
-    let studentInfo = sessionStorage.getItem('StudentDetialInfo')
-    this.studentInfo = JSON.parse(studentInfo)
-    this.$nextTick(() => {
-      if (!this.studentInfo?.travelerNum) {
-        this.$toast.fail('学生信息缺失，请返回首页重试')
-        return;
-      }
-      this.$toast.loading({
-        message: '加载中...',
-        duration: 0,
-        forbidClick: true
-      })
-      this.getCourseList()
-      this.getBaseList()
-      this.getSignCheckCountInfo()
-    })
-  },
-  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 => {
-          this.$toast.clear()
-          console.log('课程记录：', res.data)
-          if (res.data.status == 1) {
-            let courseList = res.data.data.data
-            for (let i in courseList) {
-              courseList[i].day = this.Moment(new Date(courseList[i].time)).format('MM-DD')
-              courseList[i].minute = this.Moment(new Date(courseList[i].time)).format('HH:mm')
-            }
-            this.courseList = courseList
-            console.log(this.courseList)
-          } 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 => {
-          this.$toast.clear()
-          console.log('基地记录：', res.data)
-          if (res.data.status == 1) {
-            let baseList = res.data.data.data
-            for (let i in baseList) {
-              baseList[i].day = this.Moment(new Date(baseList[i].time)).format('MM-DD')
-              baseList[i].minute = this.Moment(new Date(baseList[i].time)).format('HH:mm')
-            }
-            console.log(baseList)
-            this.baseList = baseList
-          } 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 => {
-          this.$toast.clear()
-          console.log('天数：', res.data)
-          if (res.data.status == 1) {
-            this.signCheckCountInfo = res.data.data
-          } else {
-            this.$toast.fail(res.data.message)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    // 研学码
-    handleYanxue () {
-      this.$router.push({ name: 'YanxueCode' })
-    },
-    // 联系客服
-    contactService () {
-      // if (this.detailData.mobiles) {
-      //   location.href = "tel://" + this.detailData.mobiles.split(",")[0];
-      // }
-    },
-    // 基地评价
-    evaluateBase (item) {
-      this.$router.push({ name: 'evaluateBase', query: { baseId: item.baseId, signId: item.signId } })
-    },
-    // 课程评价
-    evaluateCourse (item) {
-      let courseInfo = item;
-      courseInfo.id = courseInfo.orderId
-      window.sessionStorage.setItem('courseInfo', JSON.stringify(courseInfo))
-      this.$router.push({ name: 'evaluateCourse' })
-    },
-    // 基地评价详情
-    evaluateBaseDetail (item) {
-      this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId, baseId: item.baseId } })
-    },
-    // 课程评价详情
-    evaluateCourseDetail (item) {
-      this.$router.push({ name: 'evaluateDetail', query: { evaluationId: item.evaluationId } })
-    }
-  },
-  components: {
-    HomeScan
-  },
-}
-</script>
-<style lang="scss" scoped>
-.student_detail {
-  height: 100%;
-  background: rgb(247, 247, 251);
-  .infomation {
-    width: 100%;
-    height: 852px;
-    background: url("~@/assets/home/bg_stu.png");
-    background-size: 100%;
-    background-position: center;
-    .top {
-      display: flex;
-      flex-wrap: wrap;
-      align-items: center;
-      justify-content: space-between;
-      padding: 40px 28px;
-      > div {
-        display: flex;
-      }
-      .head {
-        width: 96px;
-        height: 96px;
-        border-radius: 50%;
-        overflow: hidden;
-      }
-      .right {
-        width: 450px;
-        height: 96px;
-        margin-left: 24px;
-        display: flex;
-        align-content: space-around;
-        flex-wrap: wrap;
-        color: #fff;
-        .name {
-          font-size: 34px;
-          font-weight: bold;
-          width: 100%;
-          span {
-            display: inline-block;
-            padding: 0 14px;
-            margin-left: 14px;
-            line-height: 34px;
-            border-radius: 17px;
-            font-size: 22px;
-            background: #2d90d2;
-            vertical-align: middle;
-          }
-        }
-        .school_name {
-          font-size: 26px;
-        }
-      }
-    }
-    .count_box {
-      display: flex;
-      align-items: center;
-      justify-content: space-around;
-      padding: 0 24px;
-      margin-top: 30px;
-      .count_item {
-        color: #fff;
-        text-align: center;
-        .count {
-          font-size: 24px;
-          span {
-            font-size: 38px;
-            font-weight: bold;
-            margin-right: 6px;
-          }
-        }
-        .des {
-          margin-top: 14px;
-          font-size: 28px;
-        }
-      }
-      .line {
-        width: 4px;
-        height: 48px;
-        background: #fff;
-      }
-    }
-    .icon_box {
-      display: flex;
-      align-items: center;
-      justify-content: space-around;
-      width: 702px;
-      height: 158px;
-      background: #ffffff;
-      border-radius: 16px;
-      margin: 0 auto;
-      margin-top: 30px;
-      .icon_item {
-        text-align: center;
-        img {
-          width: 70px;
-        }
-        p {
-          font-size: 26px;
-        }
-      }
-      .line {
-        width: 4px;
-        height: 48px;
-        background: #fff;
-      }
-    }
-  }
-  .list_box {
-    width: 702px;
-    margin: 0 auto;
-    margin-top: -300px;
-    overflow: hidden;
-    border-radius: 16px;
-    background: #fff;
-    .list_item {
-      position: relative;
-      display: flex;
-      align-items: center;
-      &:first-of-type {
-        margin-top: 20px;
-      }
-      .left {
-        width: 110px;
-        padding-right: 30px;
-        text-align: right;
-        font-size: 34px;
-        .day {
-        }
-        .minute {
-          font-size: 30px;
-          color: #999;
-        }
-      }
-      .line {
-        width: 2px;
-        height: 188px;
-        background: #e5e5e5;
-        border-radius: 1px;
-      }
-      .right {
-        margin-left: 30px;
-        img {
-          display: inline-block;
-          width: 128px;
-          height: 128px;
-          border-radius: 16px;
-        }
-        .item_title {
-          display: inline-block;
-          width: 360px;
-          margin-left: 22px;
-          font-size: 30px;
-          vertical-align: top;
-        }
-        button {
-          position: absolute;
-          bottom: 30px;
-          right: 20px;
-          width: 144px;
-          line-height: 44px;
-          background: #fff;
-          color: #21a3ff;
-          border-radius: 8px;
-          border: 2px solid #21a3ff;
-          font-size: 26px;
-          &.active {
-            background: #21a3ff;
-            color: #fff;
-          }
-        }
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/PublicHome/YanxueCode.vue b/src/views/PublicHome/YanxueCode.vue
deleted file mode 100644
index 27a5699..0000000
--- a/src/views/PublicHome/YanxueCode.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-<template>
-  <div id="codeBox">
-    <div class="blueCard">
-      <div class="name">{{studentInfo.travelerName ? studentInfo.travelerName : ''}}</div>
-      <div class="school">
-        <div class="pic"><img src="@/assets/yxCode/school.png" style="width:100%;height:100%" /></div>
-        <div class="gray">学校：</div>
-        <div>{{studentInfo.schoolName ? studentInfo.schoolName : ''}}</div>
-      </div>
-      <div class="school">
-        <div class="pic"><img src="@/assets/yxCode/classroom.png" style="width:100%;height:100%" /></div>
-        <div class="gray">入学年份：</div>
-        <div>{{studentInfo.enrollYear ? studentInfo.enrollYear : ''}}</div>
-      </div>
-    </div>
-    <div id="qrcode" ref="imageWrapper" v-if="!imgUrl"></div>
-    <div class="codeDiv">
-      <img :src="imgUrl" v-if="imgUrl" style="width:100%;height:100%" />
-    </div>
-    <div class="fontDiv">
-      <div @click="sweep">绑定研学码</div>
-      <div class="blueLine"></div>
-      <div @click="downQrCode">下载一生一码</div>
-    </div>
-
-  </div>
-</template>
-
-<script>
-import QRCode from 'qrcodejs2';
-import html2canvas from "html2canvas"
-export default {
-  data () {
-    return {
-      studentInfo: {},
-      qrcodePIc: {},
-      imgUrl: ''
-    }
-  },
-  mounted () {
-    this.studentInfo = JSON.parse(sessionStorage.getItem('StudentDetialInfo'));
-    this.creatQrCode()
-  },
-  methods: {
-    //扫一扫页面
-    sweep () {
-      this.$router.push({ name: 'YanxueInfo' })
-    },
-    //创建qrcode
-    creatQrCode () {
-      let text = this.studentInfo.studyCode ? this.studentInfo.studyCode : ""
-      if (text == '') {
-        this.$toast('请先绑定研学码');
-      }
-      // let text = 'https://www.baidu.com/'
-      console.log(text)
-      document.getElementById('qrcode').innerHTML = '';
-      this.qrcodePIc = new QRCode('qrcode', {
-        text: text,
-        width: 240,
-        height: 240,
-        colorDark: '#333333', // 二维码颜色
-        colorLight: '#ffffff', // 二维码背景色
-        correctLevel: QRCode.CorrectLevel.L // 容错率，L/M/H
-      });
-      let canvas = document.getElementById('qrcode').innerHTML
-      console.log(canvas)
-      this.canvanqrCode()
-    },
-    canvanqrCode () {
-      html2canvas(this.$refs.imageWrapper, {
-        width: 240,
-        height: 240
-      }).then(canvas => {
-        let dataURL = canvas.toDataURL("image/png");
-        this.imgUrl = dataURL;
-      });
-    },
-    downQrCode () {
-      //下载二维码
-      this.$toast('请长按二维码进行保存!')
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-#codeBox {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  .blueCard {
-    width: 94vw;
-    height: 35vw;
-    margin: 5vw auto;
-    // background-color: royalblue;
-    background-image: url("~@/assets/yxCode/bck.png");
-    -moz-background-size: 100% 100%;
-    background-size: 100% 100%;
-    padding: 5vw 7vw;
-    box-sizing: border-box;
-    border-radius: 3vw;
-
-    .name {
-      color: #fff;
-      font-size: 4.5vw;
-      margin-bottom: 4vw;
-    }
-    .school {
-      color: #fff;
-      display: flex;
-      font-size: 3.7vw;
-      margin-bottom: 4vw;
-      display: flex;
-      align-items: center;
-      .pic {
-        width: 4.7vw;
-        height: 4.7vw;
-        margin-right: 2vw;
-      }
-      .gray {
-        color: #f3f3f3;
-      }
-    }
-  }
-  .codeDiv {
-    width: 67vw;
-    height: 67vw;
-    margin: 8vw auto;
-  }
-  .fontDiv {
-    width: 56vw;
-    margin: 0 auto;
-    font-size: 4vw;
-    color: #4092ff;
-    display: flex;
-    justify-content: space-between;
-
-    .blueLine {
-      height: 3.8vw;
-      width: 0.5px;
-      margin-top: 1vw;
-      background-color: #000000;
-      display: flex;
-      align-items: center;
-    }
-  }
-  #qrcode {
-    position: absolute;
-    top: -100vh;
-    left: -100vw;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/PublicHome/YanxueInfo.vue b/src/views/PublicHome/YanxueInfo.vue
deleted file mode 100644
index 22a216d..0000000
--- a/src/views/PublicHome/YanxueInfo.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <div>
-    <van-field v-model="school" label="学校" readonly placeholder="学校" />
-    <van-field v-model="name" label="学生姓名" readonly placeholder="姓名" />
-    <van-field v-model="userNum" label="用户编号" readonly placeholder="用户编号" />
-    <van-field v-model="codeNum" label="研学码" readonly placeholder="研学码">
-      <van-button slot="button" size="small" native-type="button" @click="saoYiSao">扫一扫</van-button>
-    </van-field>
-    <van-button type="primary" block @click="getbind">提交</van-button>
-  </div>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      codeNum: '',
-      userNum: '',
-      school: '',
-      name: ''
-    }
-  },
-  created () {
-
-    let studentInfo = JSON.parse(sessionStorage.getItem('StudentDetialInfo'));
-    this.userNum = studentInfo.travelerNum
-    this.school = studentInfo.schoolName
-    this.name = studentInfo.travelerName
-    this.codeNum = this.GetQueryString('qrresult') || studentInfo.studyCode;
-  },
-  methods: {
-    getbind () {
-      if (this.userNum == '' || this.codeNum == '') {
-        return this.$toast('请先填写完整信息！');
-      }
-      this.yxAxios.get(this.proxyUrl + '/prod/user/info/bingStudyCode?userNum=' + this.userNum + '&code=' + this.codeNum)
-        .then((res) => {
-          console.log('接口返回', res.data)
-          if (res.data.code == '200') {
-            this.$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';
-    },
-    // 获取链接参数
-    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
diff --git a/src/views/PublicHome/component/AddChildPopupGroup.vue b/src/views/PublicHome/component/AddChildPopupGroup.vue
deleted file mode 100644
index 516b07e..0000000
--- a/src/views/PublicHome/component/AddChildPopupGroup.vue
+++ /dev/null
@@ -1,662 +0,0 @@
-<template>
-  <div>
-    <div class="addchild_group" v-if="step==1">
-      <img class="bg" src="@/assets/home/bg2.png" alt="">
-      <p class="title">添加学生</p>
-      <p class="des">完善相关信息可帮助获得最佳使用体验 </p>
-      <div class="phone_content">
-        <div class="item">
-          <p class="phone_title">手机号</p>
-          <div class="flex">
-            <input class="code phone" type="tel" maxlength="11" v-model="phone" placeholder="请输入您的手机号">
-            <span class="getcode" @click="getCode">{{codeText}}</span>
-          </div>
-        </div>
-        <div class="item">
-          <p class="phone_title">验证码</p>
-          <input class="code" type="text" v-model="code" placeholder="请输入验证码">
-        </div>
-        <button class="submit" @click="checkPhoneAndCode">下一步（1/2）</button>
-      </div>
-    </div>
-    <div class="addchild_group" v-if="step==2">
-      <img class="bg" src="@/assets/home/bg2.png" alt="">
-      <p class="title">已查询到{{claimChildList.length}}位学生信息</p>
-      <p class="des">请仔细确认学生信息后再认领</p>
-      <div class="child_content">
-        <div class="child_box">
-          <div class="child_item" v-for="(item,index) in claimChildList" :key="index">
-            <p><span>姓名</span>{{item.travelerName}}</p>
-            <p><span>阶段</span>{{item.travelerType==1?'小学':item.travelerType==2?'初中':'高中'}}</p>
-            <p><span>所在地区</span>{{item.province+item.city+item.area}}</p>
-            <p><span>学校</span>{{item.schoolName}}</p>
-            <p><span>入学年份</span>{{item.enrollYear}}</p>
-            <van-checkbox class="checkbox" v-model="item.checked" shape="square"></van-checkbox>
-          </div>
-        </div>
-        <button class="submit" @click="claimChild">认领</button>
-      </div>
-    </div>
-    <div class="addchild_group" v-if="step==3">
-      <img class="bg" src="@/assets/home/bg2.png" alt="">
-      <p class="title">添加学生信息</p>
-      <p class="des">如验证号码非学校预留号码，请按步骤自行添加完善学生信息。</p>
-      <div class="content">
-        <div class="name">学生信息</div>
-        <div class="item">
-          <input type="text" placeholder="请输入学生姓名" v-model="studentName">
-        </div>
-        <div class="item" @click="showUserTypeSelect=true" style="width:48%;display:inline-flex;margin-right:4%;">
-          <p :class="!userType?'nodata':''">{{userType?userType:'当前阶段'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item" @click="handleYear" style="width:48%;display:inline-flex;">
-          <p :class="!year||yearDisable?'nodata':''">{{year?year:'入学年份'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item" @click="showAreaSelect=true">
-          <p :class="!area?'nodata':''">{{area?area:'请选择地区'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item">
-          <input type="text" placeholder="请选择学校" readonly v-model="school">
-          <button type="info" class="btn" @click="chooseSchool">选择学校</button>
-        </div>
-        <button class="submit" @click="submit">完成</button>
-      </div>
-    </div>
-    <van-popup v-model="showUserTypeSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="当前阶段" show-toolbar :columns="userTypeArr" value-key="label" @cancel="showUserTypeSelect = false" @confirm="selectUserTypeOver" />
-    </van-popup>
-    <van-popup v-model="showYearSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="入学年份" show-toolbar :columns="yearArr" value-key="label" @cancel="showYearSelect = false" @confirm="selectYearOver" />
-    </van-popup>
-    <van-popup v-model="showAreaSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-area title="地区" :area-list="areaList" @cancel="showAreaSelect = false" @confirm="selectAreaOver" />
-    </van-popup>
-
-    <van-popup v-model="chooseSchoolisShow" round get-container="body" :safe-area-inset-bottom="true">
-      <div v-if="chooseSchoolisShow">
-        <chooseSchool v-model="chooseSchoolisShow" @schoolData='schoolData'></chooseSchool>
-      </div>
-    </van-popup>
-  </div>
-</template>
-
-<script>
-
-import chooseSchool from '@/views/PublicService/component/chooseSchool'
-var codeInterval;
-export default {
-  components: { chooseSchool },
-  data () {
-    return {
-      step: 1,
-      publicName: '',
-      phone: '',
-      codeText: '获取验证码',//获取验证码按钮文字
-      code: '',//验证码
-      studentName: '',
-      showDialog: true,
-
-      claimChildList: [],
-
-      year: '',//入学年份
-      yearDisable: false,
-      showYearSelect: false,
-      yearArr: [],
-
-      userType: '',
-      userTypeVal: '',//所处阶段1-小学 2-初中 3-高中
-      showUserTypeSelect: false,
-      userTypeArr: [{
-        label: '小学',
-        value: 1
-      }, {
-        label: '初中',
-        value: 2
-      }, {
-        label: '高中',
-        value: 3
-      }],
-
-      area: '',
-      areaCode: '',
-      showAreaSelect: false,
-      areaList: [],
-
-      searchSchool: '',
-      school: '',
-      schoolId: '',
-
-      appId: '',
-      chooseSchoolisShow: false
-    }
-  },
-
-  mounted () {
-    let publicName = sessionStorage.getItem('publicName')
-    this.publicName = publicName
-    let userInfo = sessionStorage.getItem('userInfo')
-    this.userInfo = JSON.parse(userInfo);
-    this.initYearArr()
-    this.GetSysAreaList()
-  },
-  methods: {
-    // 获取验证码
-    getCode () {
-      if (this.codeText != '获取验证码') return;
-      if (!this.phone) {
-        this.$toast('请输入手机号')
-        return;
-      }
-      if (!this.checkPhone(this.phone)) {
-        this.$toast('请输入正确的手机号')
-        return;
-      }
-      this.$toast.loading({
-        message: '加载中',
-        duration: 0,
-        forbidClick: true
-      })
-      this.http.getMsg({
-        phone: this.phone
-      }).then((res) => {
-        this.$toast.clear()
-        if (res.success) {
-          let i = 60;
-          codeInterval = setInterval(() => {
-            if (i == 0) {
-              this.codeText = `获取验证码`;
-              clearInterval(codeInterval);
-              return;
-            }
-            this.codeText = `重试（${i}）`;
-            i--
-          }, 1000)
-        } else {
-          this.$toast.fail(res.message)
-        }
-      })
-    },
-    // 获取手机号白名单信息
-    checkPhoneAndCode () {
-      if (!this.phone) {
-        this.$toast('请输入手机号')
-        return;
-      }
-      if (!this.checkPhone(this.phone)) {
-        this.$toast('请输入正确的手机号')
-        return;
-      }
-      if (!this.code) {
-        this.$toast('请输入验证码')
-        return;
-      }
-      this.$toast.loading({
-        message: '加载中',
-        duration: 0,
-        forbidClick: true
-      })
-
-      this.yxAxios.post(`${this.proxyUrl}/prod/user/info/checkPhoneAndCode`, {
-        "code": this.code,
-        "phone": this.phone,
-        "unionId": sessionStorage.getItem('centerNo')
-      }).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          if (res.data.data.length == 0) {
-            // 白名单无用户
-            this.step = 3;
-          } else {
-            // 白名单有用户
-            let claimChildList = res.data.data
-            for (let i in claimChildList) {
-              claimChildList[i].checked = false
-            }
-            this.claimChildList = claimChildList
-            this.step = 2;
-          }
-        } else {
-          this.$toast.fail(res.data?.message)
-        }
-      })
-    },
-
-
-    // 认领孩子
-    claimChild () {
-      const claimChildList = this.claimChildList;
-      let claimChildId = ''
-      for (let i in claimChildList) {
-        if (claimChildList[i].checked) {
-          if (claimChildId == '') {
-            claimChildId = claimChildList[i].travelerNum
-          } else {
-            claimChildId = claimChildId + ',' + claimChildList[i].travelerNum
-          }
-        }
-      }
-      this.$toast.loading({
-        message: '加载中...',
-        duration: 0,
-        forbidClick: true
-      })
-      this.mgop({
-        api: 'mgop.sz.hswsy.claimChildren', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "loginMobile": this.phone,
-          "subUserNums": claimChildId
-        },
-        onSuccess: res => {
-          this.$toast.clear()
-          if (res.data.code == 200) {
-            this.$toast.success('认领成功')
-            this.$emit('complete')
-          } else {
-            this.$toast.fail(res.data?.message)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-
-
-    // 初始化入学年份选项
-    initYearArr () {
-      // 页面创建时执行
-      let year = new Date().getFullYear(),
-        Month = new Date().getMonth() + 1,
-        yearArr = [];
-      if (Month > 8) {
-        // 如果月份大于8,那么当年的学年的高考年份要+1,如果月份小于7,那么当前的年份就是今年高考的年份
-        year = year
-      }
-      for (let index = year; index > year - 6; index--) {
-        yearArr.push({ value: index, label: index })
-      }
-      this.yearArr = yearArr
-    },
-    selectYearOver (value) {
-      this.year = value.label;
-      this.showYearSelect = false;
-    },
-    handleYear () {
-      if (!this.yearDisable) {
-        this.showYearSelect = true;
-      }
-    },
-    selectUserTypeOver (value) {
-      this.userType = value.label;
-      this.userTypeVal = value.value;
-      this.showUserTypeSelect = false;
-    },
-    // 获取地区列表
-    GetSysAreaList () {
-      this.mgop({
-        api: 'mgop.sz.hswsy.GetSysAreaList', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'GET',
-        appKey: 'fuxgnukl+2001895516+edccpx', // 必须
-        headers: {
-          //   'isTestUrl': '1'
-        },
-        data: {
-          "areaCode": 33
-        },
-        onSuccess: res => {
-          console.log('获取地区列表', res)
-          if (res.data.success) {
-            let data = res.data.data;
-            let obj = {
-              province_list: {
-                330000: '浙江省'
-              },
-              city_list: {},
-              county_list: {}
-            };
-            if (data) {
-              data.forEach((n, i) => {
-                obj.city_list[n.area_code + '00'] = n.area_name;
-                if (n.areaList.length > 0) {
-                  n.areaList.forEach((k, j) => {
-                    obj.county_list[k.area_code] = k.area_name;
-                  })
-                }
-              });
-              this.areaList = obj;
-            }
-          } else {
-            this.$toast.fail(res.message)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    selectAreaOver (value) {
-      let data = value;
-      var city = data[1].code;
-      city = city.substring(0, city.length - 2);
-      // console.log(city)
-      this.area = data[0].name + ',' + data[1].name + ',' + data[2].name;
-      this.areaCode = [data[0].code, city, data[2].code];
-      this.quCode = data[2].code;
-      this.school = '',
-        this.schoolId = '',
-        this.showAreaSelect = false
-    },
-
-    submit () {
-      if (!this.studentName) {
-        this.$toast('请输入姓名');
-      }
-      else if (!this.userType) {
-        this.$toast('请选择阶段');
-      }
-      else if (!this.year) {
-        this.$toast('请选择入学年份');
-      }
-      else if (!this.area) {
-        this.$toast('请选择地区');
-      }
-      else if (!this.school) {
-        this.$toast('请选择学校');
-      } else {
-        let postData = {
-          contactsName: this.studentName,
-          contactsMobile: this.phone,
-          contactsType: 1,
-          province: this.area.split(',')[0],//省份
-          city: this.area.split(',')[1],//城市
-          area: this.area.split(',')[2],//地区
-          schoolName: this.school,//学校名称
-          enrollYear: this.year,//入学年份
-          travelerType: this.userTypeVal,//1-小学 2-初中 3-高中
-          loginMobile: this.userInfo?.phone
-        }
-        this.$toast.loading({
-          message: '加载中',
-          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.$emit('complete')
-            } else {
-              this.$toast.fail(res.data?.message)
-            }
-          },
-          onFail: err => {
-            console.log('err', err)
-          }
-        });
-      }
-    },
-    //选择学校
-    chooseSchool () {
-      // this.$router.push({name: 'chooseSchool'})
-      this.chooseSchoolisShow = true
-    },
-    schoolData (val) {
-      this.school = val.text;
-      this.schoolId = val.id;
-    },
-    checkPhone (phone) {
-      if ((/^1[3456789]\d{9}$/.test(phone))) {
-        return true
-      } else {
-        return false
-      }
-    },
-  },
-  destroyed () {
-    clearInterval(codeInterval);
-  },
-}
-</script>
-<style lang="scss" scoped>
-.addchild_group {
-  width: 638px;
-  height: 836px;
-  background: #ffffff;
-  border-radius: 24px;
-  position: relative;
-  .bg {
-    width: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-  .title {
-    position: relative;
-    width: 100%;
-    padding-top: 70px;
-    padding-bottom: 8px;
-    text-align: center;
-    font-size: 34px;
-    font-weight: bold;
-    color: #0857ff;
-  }
-  .des {
-    position: relative;
-    width: 100%;
-    box-sizing: border-box;
-    padding: 0 15%;
-    text-align: center;
-    font-size: 24px;
-    color: #6596ff;
-  }
-  .content {
-    width: 100%;
-    box-sizing: border-box;
-    padding: 0 40px;
-    position: absolute;
-    top: 236px;
-    left: 0;
-    .name {
-      width: 558px;
-      height: 50px;
-      font-size: 28px;
-      color: #000;
-      padding-left: 20px;
-      box-sizing: border-box;
-    }
-    .item {
-      width: 558px;
-      height: 72px;
-      border-radius: 36px;
-      background: #f7f7f7;
-      box-sizing: border-box;
-      font-size: 28px;
-      padding: 0 32px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 28px;
-      p {
-        color: #333333;
-        &.nodata {
-          color: #999999;
-        }
-      }
-      img {
-        width: 40px;
-      }
-      input {
-        width: 100%;
-        background: transparent;
-        border: 0;
-        color: #333333;
-        padding: 0;
-        &::-webkit-input-placeholder {
-          color: #999999;
-        }
-      }
-      .btn {
-        width: 240px;
-        height: 55px;
-        float: right;
-        font-size: 28px;
-        background: linear-gradient(135deg, #cdf8cf 0%, #8af36f 100%);
-        box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
-          0px 8px 12px 0px rgba(89, 199, 171, 0.5);
-        border-radius: 34px;
-        border: transparent;
-        color: #333333;
-      }
-    }
-    .school_select {
-      font-size: 28px;
-      padding: 0 32px;
-      margin-bottom: 28px;
-    }
-    .submit {
-      width: 294px;
-      height: 72px;
-      border: 0;
-      background: linear-gradient(135deg, #99c2ff 0%, #1f59ff 100%);
-      box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
-        0px 8px 12px 0px rgba(87, 137, 255, 0.5);
-      border-radius: 34px;
-      font-size: 34px;
-      color: #ffffff;
-      margin: 0 auto;
-      display: block;
-    }
-  }
-  .child_content {
-    position: relative;
-    margin-top: 40px;
-    .child_box {
-      height: 500px;
-      overflow: auto;
-      padding-left: 100px;
-      .child_item {
-        position: relative;
-        margin-bottom: 50px;
-        p {
-          font-size: 28px;
-          padding: 8px 0;
-          span {
-            display: inline-block;
-            width: 140px;
-            margin-right: 28px;
-            color: #999;
-          }
-        }
-        .checkbox {
-          position: absolute;
-          top: 115px;
-          right: 20px;
-        }
-      }
-    }
-    .submit {
-      width: 438px;
-      height: 78px;
-      background: #3385ff;
-      border-radius: 37px;
-      border-radius: 39px;
-      border: 0;
-      font-size: 34px;
-      color: #ffffff;
-      margin: 0 auto;
-      display: block;
-    }
-  }
-  .phone_content {
-    width: 100%;
-    position: absolute;
-    top: 180px;
-    left: 0;
-    box-sizing: border-box;
-    padding: 40px;
-    .item {
-      border-bottom: 1px solid #e2e2e2;
-      margin-bottom: 30px;
-    }
-    .phone_title {
-      font-size: 34px;
-      font-weight: bold;
-      margin-bottom: 28px;
-    }
-    .flex {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-bottom: 22px;
-    }
-    .code {
-      border: 0;
-      background: transparent;
-      font-size: 28px;
-      margin-bottom: 32px;
-      width: 100%;
-    }
-    .phone {
-      width: 50%;
-      margin: 0;
-    }
-    .getcode {
-      color: #5789ff;
-      font-size: 28px;
-      padding: 10px;
-    }
-    .submit {
-      width: 438px;
-      height: 78px;
-      background: #3385ff;
-      border-radius: 37px;
-      border-radius: 39px;
-      border: 0;
-      font-size: 34px;
-      color: #ffffff;
-      margin: 0 auto;
-      margin-top: 120px;
-      display: block;
-    }
-  }
-}
-::v-deep .van-search {
-  background: transparent;
-  padding: 0;
-  width: 100%;
-}
-::v-deep .van-search__content {
-  padding: 0;
-}
-.schoolBoxF {
-  width: 100vw;
-  height: 100vh;
-  position: absolute;
-  top: 0;
-  left: 0;
-  background-color: #fff;
-}
-</style>
diff --git a/src/views/PublicHome/component/HomeChildList.vue b/src/views/PublicHome/component/HomeChildList.vue
deleted file mode 100644
index 794511e..0000000
--- a/src/views/PublicHome/component/HomeChildList.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-  <div class="home_child_list" :class="parent=='HomeKQ'?'home_child_list_kq':''">
-    <div class="stu_info" v-for="(item,index) in childList" :key="index" @click="handleStudentDetail(index)">
-      <div class="title">
-        <p>学生信息</p>
-        <!-- <button @click="handleYanxue(index)">出示研学码</button> -->
-      </div>
-      <img v-if="item.whiteFlag" class="img_auth" src="@/assets/home/auth.png" alt="">
-      <div class="item">
-        <van-icon name="manager" /><span>{{item.travelerName}}</span>
-      </div>
-      <div class="item">
-        <van-icon name="medal" /><span>{{item.enrollYear}}</span>
-      </div>
-      <div class="item">
-        <van-icon name="wap-home" /><span>{{item.schoolName}}</span>
-      </div>
-    </div>
-    <div class="add_btn" @click="addStudent">
-      <van-icon name="add" />
-      添加学生信息
-    </div>
-    <van-popup style="background: transparent;" get-container="body" v-model="showAddChildPopupGroup">
-      <AddChildPopupGroup @complete="complete"></AddChildPopupGroup>
-    </van-popup>
-  </div>
-</template>
-<script>
-import AddChildPopupGroup from '@/views/PublicHome/component/AddChildPopupGroup'
-
-export default {
-  props: {
-    parent: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      showAddChildPopupGroup: false,//新增孩子弹出框
-      childList: [],//孩子列表
-    }
-  },
-  mounted () {
-    this.getChildList()
-  },
-  methods: {
-    // 研学码
-    // handleYanxue (index) {
-    //   sessionStorage.setItem('bindYanxueCodeChildInfo',JSON.stringify(this.childList[index]))
-    //   this.$router.push({ name: 'YanxueCode' })
-    // },
-    // 进入学生详情页
-    handleStudentDetail (index) {
-      sessionStorage.setItem('StudentDetialInfo', JSON.stringify(this.childList[index]))
-      this.$router.push({ name: 'StudentDetail' })
-    },
-    // 获取孩子列表
-    getChildList () {
-      this.$toast.loading({
-        message: '加载中...',
-        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": sessionStorage.getItem('centerNo')
-        },
-        onSuccess: res => {
-          console.log('getUserInfo', res)
-          this.$toast.clear()
-          if (res.data.code == 200) {
-          this.childList = res.data.data.userInfo.subUsers
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    addStudent(){
-      this.showAddChildPopupGroup=true
-    },
-    complete () {
-      this.showAddChildPopupGroup = false;
-      this.getChildList()
-    },
-  },
-  components: {
-    AddChildPopupGroup
-  }
-
-}
-</script>
-<style lang="scss">
-.home_child_list {
-  width: 100%;
-  padding: 16px 24px;
-  box-sizing: border-box;
-  .stu_info {
-    position: relative;
-    width: 100%;
-    height: 252px;
-    box-sizing: border-box;
-    padding: 24px 28px;
-    margin-bottom: 16px;
-    border-radius: 12px;
-    &:nth-of-type(2n) {
-      background: linear-gradient(47deg, #ff7371 0%, #fdd17c 100%);
-      box-shadow: 0px 4px 8px 0px rgba(254, 151, 117, 0.11);
-    }
-    &:nth-of-type(2n-1) {
-      background: linear-gradient(41deg, #316ff0 0%, #2afffb 100%);
-      box-shadow: 0px 4px 8px 0px rgba(37, 171, 255, 0.34);
-    }
-    .title {
-      // margin-top: 30px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-bottom: 42px;
-      p {
-        font-size: 32px;
-        font-weight: bold;
-        color: #fff;
-      }
-      button {
-        color: #ffffff;
-        font-size: 20px;
-        height: 40px;
-        border-radius: 30px;
-        border: 0;
-        background: linear-gradient(137deg, #83b2ff 0%, #3c80ef 100%);
-        box-shadow: 0px 4px 8px 0px rgba(106, 154, 232, 0.5);
-      }
-    }
-    .img_auth {
-      position: absolute;
-      bottom: 0;
-      right: 0;
-      width: 196px;
-    }
-    .item {
-      display: inline-block;
-      margin-bottom: 24px;
-      color: #fff;
-      font-size: 28px;
-      span {
-        margin-left: 16px;
-      }
-      &:nth-of-type(2) {
-        margin-right: 60px;
-      }
-      &:last-of-type {
-        display: block;
-      }
-    }
-  }
-  .add_btn {
-    width: 100%;
-    box-sizing: border-box;
-    line-height: 96px;
-    border-radius: 16px;
-    border: 4px dashed #3074ff;
-    text-align: center;
-    font-size: 30px;
-    color: #3074ff;
-  }
-}
-// 柯桥个人中心红色主题
-.home_child_list_kq {
-  .stu_info {
-    &:nth-of-type(2n) {
-      background: linear-gradient(47deg, #ff7371 0%, #fdd17c 100%);
-      box-shadow: 0px 4px 8px 0px rgba(254, 151, 117, 0.11);
-    }
-    &:nth-of-type(2n-1) {
-      background: linear-gradient(41deg, #f03131 0%, #ff90a8 100%);
-      box-shadow: 0px 4px 8px 0px rgba(37, 171, 255, 0.34);
-    }
-    .title {
-      button {
-        background: linear-gradient(137deg, #ff83a2 0%, #ef3c63 100%);
-        box-shadow: 0px 4px 8px 0px rgba(232, 106, 165, 0.5);
-      }
-    }
-  }
-  .add_btn {
-    border-color: #f63837;
-    color: #f63837;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/PublicHome/component/HomeOrder.vue b/src/views/PublicHome/component/HomeOrder.vue
deleted file mode 100644
index f2f4638..0000000
--- a/src/views/PublicHome/component/HomeOrder.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div class="home_order">
-    <div class="top">
-      <p>我的订单</p>
-    </div>
-    <div class="icon_box">
-      <div @click="handleCustom">
-        <img v-if="parent=='HomeKQ'" src="@/assets/home/icon_kq1.png" alt="">
-        <img v-else src="@/assets/home/icon1.png" alt="">
-        <p>定制研学</p>
-      </div>
-      <div @click="handleServiceOrder(0)">
-        <img v-if="parent=='HomeKQ'" src="@/assets/home/icon_kq2.png" alt="">
-        <img v-else src="@/assets/home/icon2.png" alt="">
-        <p>待付款</p>
-      </div>
-      <div @click="handleServiceOrder(1)">
-        <img v-if="parent=='HomeKQ'" src="@/assets/home/icon_kq3.png" alt="">
-        <img v-else src="@/assets/home/icon3.png" alt="">
-        <p>待使用</p>
-      </div>
-      <div @click="handleServiceOrder(2)">
-        <img v-if="parent=='HomeKQ'" src="@/assets/home/icon_kq4.png" alt="">
-        <img v-else src="@/assets/home/icon4.png" alt="">
-        <p>待评价</p>
-      </div>
-      <div @click="handleServiceOrder(3)">
-        <img v-if="parent=='HomeKQ'" src="@/assets/home/icon_kq5.png" alt="">
-        <img v-else src="@/assets/home/icon5.png" alt="">
-        <p>已评价</p>
-      </div>
-
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props:{
-    parent:{
-      type:String,
-      default:''
-    }
-  },
-  methods: {
-    // 定制研学
-    handleCustom () {
-      this.$toast('暂未开放，敬请期待！');
-    },
-    handleServiceOrder (active) {
-      this.$router.push({ name: 'ServiceOrderXST', query: { active: active } })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.home_order {
-  width: 702px;
-  margin: 0 auto;
-  margin-top: -130px;
-  box-sizing: border-box;
-  padding: 24px;
-  background: #fff;
-  border-radius: 16px;
-  .top {
-    p {
-      font-size: 28px;
-      font-weight: bold;
-    }
-  }
-  .icon_box {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 140px;
-    margin-top: 20px;
-    img {
-      display: block;
-      width: 62px;
-      margin: 0 auto;
-    }
-    p {
-      margin-top: 14px;
-      font-size: 26px;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/PublicHome/component/HomeScan.vue b/src/views/PublicHome/component/HomeScan.vue
deleted file mode 100644
index 351cf96..0000000
--- a/src/views/PublicHome/component/HomeScan.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <div class="scan" @click="saoYiSao">
-    <van-icon name="scan" />
-    <img class="tishi" src="@/assets/home/tishi.png" alt="扫码打卡">
-  </div>
-</template>
-<script>
-export default {
-  methods: {
-    saoYiSao () {
-      let isLogin = this.checkLogin()
-      if (!isLogin) return;
-      if (process.env.NODE_ENV === "production" && this.common.isWeiXin()) {
-        location.href = `http://sao315.com/w/api/saoyisao?redirect_uri=https://payment.myjxt.com/center/%23/MyClassList`;
-      } else {
-        this.$router.push({ name: 'MyClassList', query: { qrresult: '188' } })
-      }
-    },
-    // 判断是否已登录
-    checkLogin () {
-      if (process.env.NODE_ENV != "production") return true;
-      const userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
-      if (!userInfo?.phone) {
-        sessionStorage.setItem('prePage', 'Home' + sessionStorage.getItem('publicName'));
-        sessionStorage.setItem('prePageQuery', JSON.stringify({ showTab: this.$route.query.showTab }));
-        this.$router.push({ name: 'LoginPublic', query: { publicName: sessionStorage.getItem('publicName') } })
-        return false;
-      }
-      return true;
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-.scan {
-  position: relative;
-  // position:absolute;
-  // right:20px;
-  // top :20px;
-  // z-index :100;
-  color: white;
-  font-size: 50px;
-  .tishi {
-    position: absolute;
-    left: -90px;
-    bottom: -30px;
-    width: 112px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/PublicService/AuthorizeKQ.vue b/src/views/PublicService/AuthorizeKQ.vue
deleted file mode 100644
index 1e53c8e..0000000
--- a/src/views/PublicService/AuthorizeKQ.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-  <!-- 柯桥研学研学授权 -->
-  <div>
-    <p class="authorize">授权中...</p>
-  </div>
-</template>
-<script>
-export default {
-  data () {
-    return {
-      appId: 'wx1305e88d2bc74073'
-    }
-  },
-  mounted () {
-    let code = this.$route.query.code;
-    let openId = sessionStorage.getItem('openIdKQ');
-    if (!openId) {
-      if (!code) {
-        location.href = `${this.proxyUrl}/prod/api/wx/${this.appId}/getCode/kq`;
-      } else {
-        // 通过code获取openId和token
-        this.$toast.loading({
-          message: '加载中...',
-          duration: 0,
-          forbidClick: true
-        })
-        this.yxAxios.get(`${this.proxyUrl}/prod/api/wx/${this.appId}/getMsgByCode?appId=${this.appId}&code=${code}`).then((res) => {
-          this.$toast.clear()
-          if (res.data.code == 200) {
-            sessionStorage.setItem('openIdKQ', res.data.data.openid)
-            sessionStorage.setItem('unionId', res.data.data.unionId)
-            sessionStorage.setItem('nicknameUser', res.data.data.nickname)
-            sessionStorage.setItem('headImgUrl', res.data.data.headImgUrl)
-            this.backPage()
-          } else {
-            sessionStorage.removeItem('openIdKQ')
-            location.href = `${this.proxyUrl}/prod/api/wx/${this.appId}/getCode/kq`;
-          }
-        })
-      }
-    } else {
-      this.backPage()
-    }
-  },
-  methods: {
-    backPage () {
-      let prePage = sessionStorage.getItem('prePage');
-      let prePageQuery = sessionStorage.getItem('prePageQuery');
-      if (prePage) {
-        this.$router.push({ name: prePage, query: JSON.parse(prePageQuery) })
-      }
-
-    },
-  }
-}
-</script>
-<style lang="scss">
-.authorize {
-  font-size: 32px;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
-</style>
\ No newline at end of file
diff --git a/src/views/PublicService/CardBoxPublic.vue b/src/views/PublicService/CardBoxPublic.vue
deleted file mode 100644
index ce9c696..0000000
--- a/src/views/PublicService/CardBoxPublic.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <div id="cardBox">
-    <div class="card_item" v-for="(item,index) in cardList" :key="index" @click="handleCard(index)">
-      <div class="left">
-        <div class="top">
-          <img v-if="item.img" :src="item.img" alt="">
-          <p class="title">仅该商品可用：<span>{{item.title}}</span></p>
-        </div>
-        <p class="end_time">有效期至：{{item.useEndTime}}</p>
-      </div>
-      <div class="right">
-        <p class="discount" :class="item.couponState==1?'':'disable'"><span>¥</span>{{item.couponPrice}}</p>
-        <p class="usenow" v-if="item.couponState==1">立即使用</p>
-        <p class="usenow disable" v-else>{{item.couponState==2?'已使用':'已过期'}}</p>
-      </div>
-    </div>
-    <van-empty v-if="cardList.length==0" description="暂无优惠券" />
-
-  </div>
-</template>
-<script>
-export default {
-  name: 'ServiceCardBoxPublic',
-  data () {
-    return {
-      cardList: [],
-      publicName: '',
-      unionId: ''
-    }
-  },
-  mounted () {
-    let publicName = this.$route.query.publicName || sessionStorage.getItem('publicName');
-    if (publicName) {
-      sessionStorage.setItem('publicName', publicName)
-      this.publicName = publicName
-    }
-    if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
-      let openId = sessionStorage.getItem('openId' + this.publicName);
-      if (!openId) {
-        sessionStorage.setItem('prePage', 'ServiceCardBoxPublic');
-        this.$router.push({ name: 'Authorize' + this.publicName })
-        return;
-      }
-      this.unionId = sessionStorage.getItem('unionId');
-    } else {
-      this.unionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU';
-    }
-
-    this.$nextTick(() => {
-      this.getAllCard()
-    })
-  },
-  methods: {
-    // 获取所有优惠券
-    getAllCard () {
-      this.yxAxios.post(`${this.proxyUrl}/prod/api/coupon/list`, {
-        userId: this.unionId,
-        state: '',//状态 1-正常 2-已使用 3-已过期 不传为全部,
-        pageNum: '1',
-        pageSize: '999'
-      }).then((res) => {
-        if (res.data.rows) {
-          let cardList = res.data.rows
-          for (let i in cardList) {
-            cardList[i].useEndTime = this.Moment(cardList[i].useEndTime.replace(/\-/g, "/")).format("YYYY-MM-DD")
-          }
-          this.cardList = cardList
-        }
-        else {
-          this.$toast.fail(res.data.message);
-        }
-      })
-    },
-    handleCard (index) {
-      if (this.cardList[index].couponState == 1) {
-        this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: 499 } })
-      }
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-#cardBox {
-  width: 100%;
-  min-height: 100%;
-  background: rgb(246, 246, 250);
-  overflow: hidden;
-  .card_item {
-    width: 726px;
-    height: 216px;
-    background: url("../../assets/service/card.png");
-    background-size: 100%;
-    margin: 0 auto;
-    margin-top: 20px;
-    position: relative;
-    p {
-      width: 100%;
-      margin: 0;
-    }
-    .left {
-      display: inline-block;
-      width: 68%;
-      height: 100%;
-      vertical-align: top;
-      box-sizing: border-box;
-      padding: 24px 40px;
-      padding-right: 0;
-      .top {
-      display: flex;
-      img {
-        width: 66px;
-        height: 66px;
-        background: #d8d8d8;
-        border-radius: 6px;
-      }
-      .title {
-        font-size: 24px;
-        font-weight: bold;
-        margin-left: 10px;
-        word-break: break-all;
-        span {
-          color: #7f5316;
-        }
-      }
-    }
-    }
-    .right {
-      width: 32%;
-      height: 100%;
-      display: inline-flex;
-      align-content: center;
-      flex-wrap: wrap;
-      position: relative;
-    }
-    .end_time {
-      font-size: 24px;
-      color: #999;
-      left: 40px;
-      position: absolute;
-      bottom: 30px;
-    }
-    .discount {
-      text-align: center;
-      font-size: 60px;
-      font-weight: bold;
-      span {
-        font-size: 24px;
-      }
-      &.disable {
-        color: #999;
-      }
-    }
-    .usenow {
-      font-size: 32px;
-      text-align: center;
-      font-weight: bold;
-      margin-top: 10px;
-      &.disable {
-        color: #999;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/PublicService/CardBoxXST.vue b/src/views/PublicService/CardBoxXST.vue
deleted file mode 100644
index c58ddba..0000000
--- a/src/views/PublicService/CardBoxXST.vue
+++ /dev/null
@@ -1,417 +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 = sessionStorage.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 {
-          // 多个商品跳转优惠券详情页
-          sessionStorage.setItem('cardCousreCardId', item.id)
-          sessionStorage.setItem('cardCousreCardPrice', item.couponPrice)
-          sessionStorage.setItem('cardCousreCardTitle', item.title)
-          sessionStorage.setItem('cardCousreProId', item.proId)
-          sessionStorage.setItem('cardCousreProName', item.proName)
-          sessionStorage.setItem('cardCousrePics', item.pics)
-          sessionStorage.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 {
-        // 多个商品跳转优惠券详情页
-        sessionStorage.setItem('cardCousreCardId', item.id)
-        sessionStorage.setItem('cardCousreCardPrice', item.couponPrice)
-        sessionStorage.setItem('cardCousreCardTitle', item.title)
-        sessionStorage.setItem('cardCousreProId', item.proId)
-        sessionStorage.setItem('cardCousreProName', item.proName)
-        sessionStorage.setItem('cardCousrePics', item.pics)
-        sessionStorage.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>
\ No newline at end of file
diff --git a/src/views/PublicService/CardCourseList.vue b/src/views/PublicService/CardCourseList.vue
deleted file mode 100644
index 9176319..0000000
--- a/src/views/PublicService/CardCourseList.vue
+++ /dev/null
@@ -1,199 +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 {
-      publicName: '',
-      unionId: '',
-      cardTitle: '',
-      couponPrice: '',
-      cardId: '',
-      proId: '',
-      proName: '',
-      pics: '',
-      geted: false,
-      proList: []
-    }
-  },
-  mounted () {
-    let publicName = this.$route.query.publicName || sessionStorage.getItem('publicName');
-    if (publicName) {
-      sessionStorage.setItem('publicName', publicName)
-      this.publicName = publicName
-    }
-    this.cardTitle = sessionStorage.getItem('cardCousreCardTitle');
-    this.couponPrice = sessionStorage.getItem('cardCousreCardPrice');
-    this.cardId = sessionStorage.getItem('cardCousreCardId');
-    this.proId = sessionStorage.getItem('cardCousreProId');
-    this.proName = sessionStorage.getItem('cardCousreProName');
-    this.pics = sessionStorage.getItem('cardCousrePics');
-    this.geted = sessionStorage.getItem('cardCousreGeted') == 'true' ? true : false
-    if (process.env.NODE_ENV === "production") {
-      let openId = sessionStorage.getItem('openId' + this.publicName);
-      if (!openId) {
-        sessionStorage.setItem('prePage', 'CardBoxXST');
-        this.$router.push({ name: 'Authorize' + this.publicName })
-        return;
-      }
-      this.unionId = sessionStorage.getItem('unionId');
-    } else {
-      this.unionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU';
-    }
-    this.getCourseList()
-  },
-  methods: {
-    // 获取优惠券对应的商品列表
-    getCourseList () {
-      this.$toast.loading({
-        message: "加载中...",
-        duration: 0,
-        forbidClick: true,
-      });
-      this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/CourseList/ByIdList`, this.proId.split(',')).then((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
-      })
-    },
-    formatWeek (week) {
-      return week == 1 ? '周一' : week == 2 ? '周二' : week == 3 ? '周三' : week == 4 ? '周四' : week == 5 ? '周五' : week == 6 ? '周六' : week == 0 ? '周日' : '';
-    },
-
-    //领取优惠券
-    reCard () {
-      if (this.geted) return;
-      this.yxAxios.post(`${this.proxyUrl}/prod/api/coupon/get`, {
-        unionId: this.unionId,
-        "proId": this.proId,
-        "proName": this.proName,
-        "pic": this.pics,
-        couponId: this.cardId,
-      })
-        .then((res) => {
-          // console.log(res.data)
-          if (res.data.code == 200) {
-            sessionStorage.setItem('cardCousreGeted', true)
-            this.geted = true;
-            this.$toast('领取成功！')
-          } else {
-            this.$toast.fail(res.data.message);
-          }
-        })
-
-    },
-    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/PublicService/LoginPublic.vue b/src/views/PublicService/LoginPublic.vue
deleted file mode 100644
index eec1456..0000000
--- a/src/views/PublicService/LoginPublic.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <div id="login">
-    <img class="bg" src="@/assets/login_bg.png" alt="">
-    <div class="box">
-      <p class="login_title">绑定手机号</p>
-      <div class="item">
-        <p class="title">手机号</p>
-        <div class="flex">
-          <input class="code phone" type="tel" maxlength="11" v-model="phone" placeholder="请输入您的手机号">
-          <span class="getcode" @click="getCode">{{codeText}}</span>
-        </div>
-      </div>
-      <div class="item">
-        <p class="title">验证码</p>
-        <input class="code" type="text" v-model="code" placeholder="请输入验证码">
-      </div>
-      <button class="submit" @click="submitOperator">立即绑定</button>
-    </div>
-  </div>
-</template>
-<script>
-var codeInterval;
-export default {
-  name: 'LoginPublic',
-  data () {
-    return {
-      code: '',
-      phone: '',
-
-      codeText: '获取验证码',//获取验证码按钮文字
-      appId: '',
-      unionId: '',
-      openId: '',
-      prefectId: '',
-      publicName: '',//SXYX绍兴研学 XST学事通
-    }
-  },
-  mounted () {
-    let publicName = this.$route.query.publicName || sessionStorage.getItem('publicName');
-    if (publicName == 'SXYX') {
-      this.appId = 'wx1305e88d2bc74073'
-    } else if (publicName == 'XST') {
-      this.appId = 'wx1c630c8773c482f1'
-    } else if (publicName == 'KQ') {
-      this.appId = 'wx1305e88d2bc74073'
-    }
-    this.openId = sessionStorage.getItem('openId' + publicName);
-    this.unionId = sessionStorage.getItem('unionId');
-    if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
-      if (!this.openId) {
-        this.$router.push({ name: 'Authorize' + publicName })
-      }
-    }
-
-  },
-  methods: {
-    getCode () {
-      if (this.codeText != '获取验证码') return;
-      if (!this.phone) {
-        this.$toast('请输入手机号')
-        return;
-      }
-      if (!this.checkPhone(this.phone)) {
-        this.$toast('请输入正确的手机号')
-        return;
-      }
-      this.$toast.loading({
-        message: '加载中',
-        duration: 0,
-        forbidClick: true
-      })
-      this.yxAxios.post(`${this.proxyUrl}/prod/api/wx/${this.appId}/getMsg?phone=${this.phone}`).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          let i = 60;
-          codeInterval = setInterval(() => {
-            if (i == 0) {
-              this.codeText = `获取验证码`;
-              clearInterval(codeInterval);
-              return;
-            }
-            this.codeText = `重试（${i}）`;
-            i--
-          }, 1000)
-        } else {
-          this.$toast.fail(res.data.message)
-        }
-      })
-    },
-    submitOperator () {
-      if (!this.phone) {
-        this.$toast('请输入手机号')
-        return;
-      }
-      if (!this.checkPhone(this.phone)) {
-        this.$toast('请输入正确的手机号')
-        return;
-      }
-      if (!this.code) {
-        this.$toast('请输入验证码')
-        return;
-      }
-      this.$toast.loading({
-        message: '加载中',
-        duration: 0,
-        forbidClick: true
-      })
-      this.yxAxios.post(`${this.proxyUrl}/prod/api/wx/${this.appId}/checkPhoneAndCode`, {
-        phone: this.phone,
-        code: this.code,
-        unionId: this.unionId,
-        openId: this.openId
-      }).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          this.getUserInfo()
-        } else {
-          this.$toast.fail(res.data.message)
-        }
-      })
-    },
-    checkPhone (phone) {
-      if ((/^1[3456789]\d{9}$/.test(phone))) {
-        return true
-      } else {
-        return false
-      }
-    },
-    complete () {
-      this.getUserInfo()
-    },
-    // 获取用户信息
-    getUserInfo () {
-      this.$toast.loading({
-        message: '加载中...',
-        duration: 0,
-        forbidClick: true
-      })
-      this.yxAxios.get(`${this.proxyUrl}/prod/api/wx/${this.appId}/getUserInfo?unionId=${this.unionId}`).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          sessionStorage.setItem('userInfo', JSON.stringify(res.data.data))
-          let prePage = sessionStorage.getItem('prePage');
-          let prePageQuery = sessionStorage.getItem('prePageQuery');
-          if (prePage) {
-            this.$router.push({ name: prePage, query: JSON.parse(prePageQuery) })
-          }
-        } else {
-          this.$toast.fail(res.data.message)
-        }
-      })
-    },
-  },
-  destroyed () {
-    clearInterval(codeInterval);
-  }
-}
-</script>
-<style lang="scss" scoped>
-#login {
-  .bg {
-    width: 100%;
-  }
-  .login_title {
-    font-size: 36px;
-    font-weight: bold;
-    text-align: center;
-    color: #000;
-    padding-bottom: 40px;
-  }
-  .box {
-    width: 702px;
-    height: 540px;
-    background: linear-gradient(
-      180deg,
-      rgba(251, 251, 251, 0.99) 0%,
-      #ffffff 100%
-    );
-    box-shadow: 0px 4px 12px 0px rgba(87, 214, 255, 0.2);
-    border-radius: 20px;
-    position: absolute;
-    top: 240px;
-    left: 24px;
-    box-sizing: border-box;
-    padding: 40px;
-    .item {
-      border-bottom: 1px solid #e2e2e2;
-      margin-bottom: 30px;
-    }
-    .title {
-      font-size: 34px;
-      font-weight: bold;
-      margin-bottom: 28px;
-    }
-    .flex {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-bottom: 22px;
-    }
-    .code {
-      border: 0;
-      background: transparent;
-      font-size: 28px;
-      margin-bottom: 32px;
-      width: 100%;
-    }
-    .phone {
-      width: 50%;
-      margin: 0;
-    }
-    .getcode {
-      color: #5789ff;
-      font-size: 28px;
-      padding: 10px;
-    }
-    .submit {
-      width: 622px;
-      height: 88px;
-      background: linear-gradient(137deg, #83b2ff 0%, #3c80ef 100%);
-      box-shadow: 0px 4px 8px 0px rgba(87, 169, 255, 0.5);
-      border-radius: 44px;
-      border: 0;
-      font-size: 34px;
-      color: #ffffff;
-      margin: 0 auto;
-      display: block;
-    }
-  }
-}
-.prefect_pop {
-  background: transparent;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/PublicService/ServiceBaseKQ.vue b/src/views/PublicService/ServiceBaseKQ.vue
deleted file mode 100644
index eb6efb4..0000000
--- a/src/views/PublicService/ServiceBaseKQ.vue
+++ /dev/null
@@ -1,571 +0,0 @@
-<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">
-        <ServiceListFour :list="campList" :notab="false"></ServiceListFour>
-      </div>
-    </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_main1.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">
-            <van-search class="search" v-model="search" shape="round" background="transparent" placeholder="搜索活动、研学旅行、服务" @search="onSearch" />
-          </div>
-          <div class="redLink">轻纺城小学红色网上游主题教育馆</div>
-        </van-sticky>
-        <div class="tabsCard">
-          <van-tabs v-model="active" sticky offset-top="24vw" z-index='100' :ellipsis="false" :before-change="beforeChange">
-            <van-tab title="革命遗址">
-              <ServiceListThird :list="uniList" :notab="true"></ServiceListThird>
-            </van-tab>
-            <van-tab title="文化传承">
-              <ServiceListThird :list="weekList" :notab="true"></ServiceListThird>
-            </van-tab>
-            <van-tab title="红色军旅">
-              <ServiceListThird :list="cityList" :notab="true"></ServiceListThird>
-            </van-tab>
-            <van-tab title="乡村振新">
-              <ServiceListThird :list="selectList" :notab="true"></ServiceListThird>
-            </van-tab>
-            <van-tab title="大好河山">
-              <ServiceListThird :list="riverList" :notab="true"></ServiceListThird>
-            </van-tab>
-          </van-tabs>
-        </div>
-
-      </div>
-    </div>
-
-    <Tabbar4 :active="tabName"></Tabbar4>
-    <!-- <screen :reload="false"></screen> -->
-  </div>
-</template>
-
-<script>
-import Tabbar4 from '@/component/Tabbar4'
-import ServiceList from '@/views/Service/component/ServiceList.vue'
-import ServiceListSecond from '@/views/Service/component/ServiceListSecond.vue'
-import ServiceListThird from '@/views/Service/component/ServiceListThird.vue'
-import ServiceListFour from '@/views/Service/component/ServiceListFour.vue'
-import Screen from '@/views/Service/component/Screen.vue'
-export default {
-  props: [
-    'centerNo'
-  ],
-  data () {
-    return {
-      search: '',
-      defaultHead: require('@/assets/head.png'),
-      top_tab_active: 0,
-      active: 1,
-      uniList: [],
-      weekList: [],
-      cityList: [],
-      selectList: [],
-      riverList: [],
-      tabName: 'KQ',
-      campList: [],
-    }
-  },
-  watch: {
-    $route: {
-      immediate: true,
-      handler () {
-        // 设置tabbar状态
-        this.tabName = this.$route.query.showTab || 'KQ'
-        document.title = this.$route.query.showTab == 'ZZY' ? '周周营' : '柯桥研学'
-      }
-    }
-  },
-  mounted () {
-    console.log('base mounted')
-    this.initService()
-
-  },
-  activated () {
-    console.log('base activated')
-    this.initService()
-  },
-  methods: {
-    initService () {
-      this.getUniList()
-      this.getWeekList()
-      this.getCityList()
-      this.getSelectList()
-      this.getRiverList()
-      this.getCampList()
-    },
-
-    // 革命遗址
-    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: {
-          "area": "",
-          "province": "",
-          "city": "",
-          "searchType": "5",
-          "userId": this.centerNo,
-          "productTypeId": "BQ0001",
-          "businessTypeId": "BQ0001",
-          "channelCode": ""
-        },
-        onSuccess: data => {
-          console.log('data', data)
-          this.$toast.clear()
-          let uniList = data.data.data;
-          for (let i in uniList) {
-            uniList[i].course_labels = uniList[i].course_labels?.split(',');
-            if (uniList[i].startDate) {
-              uniList[i].week = this.formatWeek(this.Moment(uniList[i].startDate).format('d'));
-              uniList[i].startDate = this.Moment(uniList[i].startDate).format('YYYY.M.D');
-              uniList[i].endDate = this.Moment(uniList[i].endDate).format('YYYY.M.D');
-            }
-          }
-          this.uniList = uniList
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    // 文化传承
-    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: {
-          "area": "",
-          "province": "",
-          "city": "",
-          "searchType": "5",
-          "userId": this.centerNo,
-          "productTypeId": "BQ0002",
-          "businessTypeId": "BQ0001",
-          "channelCode": ""
-        },
-        onSuccess: data => {
-          console.log('data', data)
-          let weekList = data.data.data;
-          for (let i in weekList) {
-            weekList[i].course_labels = weekList[i].course_labels?.split(',');
-            if (weekList[i].startDate) {
-              weekList[i].week = this.formatWeek(this.Moment(weekList[i].startDate).format('d'));
-              weekList[i].startDate = this.Moment(weekList[i].startDate).format('YYYY.M.D');
-              weekList[i].endDate = this.Moment(weekList[i].endDate).format('YYYY.M.D');
-            }
-          }
-          this.weekList = 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: {
-          "area": "",
-          "province": "",
-          "city": "",
-          "searchType": "5",
-          "userId": this.centerNo,
-          "productTypeId": "BQ0003",
-          "businessTypeId": "BQ0001",
-          "channelCode": ""
-        },
-        onSuccess: data => {
-          console.log('data', data)
-          let cityList = data.data.data;
-          for (let i in cityList) {
-            cityList[i].course_labels = cityList[i].course_labels?.split(',');
-            if (cityList[i].startDate) {
-              cityList[i].week = this.formatWeek(this.Moment(cityList[i].startDate).format('d'));
-              cityList[i].startDate = this.Moment(cityList[i].startDate).format('YYYY.M.D');
-              cityList[i].endDate = this.Moment(cityList[i].endDate).format('YYYY.M.D');
-            }
-          }
-          this.cityList = 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: {
-          "area": "",
-          "province": "",
-          "city": "",
-          "searchType": "5",
-          "userId": this.centerNo,
-          "productTypeId": "BQ0004",
-          "businessTypeId": "BQ0001",
-          "channelCode": ""
-        },
-        onSuccess: data => {
-          console.log('data', data)
-          let selectList = data.data.data;
-          for (let i in selectList) {
-            selectList[i].course_labels = selectList[i].course_labels?.split(',');
-            if (selectList[i].startDate) {
-              selectList[i].week = this.formatWeek(this.Moment(selectList[i].startDate).format('d'));
-              selectList[i].startDate = this.Moment(selectList[i].startDate).format('YYYY.M.D');
-              selectList[i].endDate = this.Moment(selectList[i].endDate).format('YYYY.M.D');
-            }
-          }
-          this.selectList = 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: {
-          "area": "",
-          "province": "",
-          "city": "",
-          "searchType": "5",
-          "userId": this.centerNo,
-          "productTypeId": "BQ0005",
-          "businessTypeId": "BQ0001",
-          "channelCode": ""
-        },
-        onSuccess: data => {
-          console.log('data', data)
-          let riverList = data.data.data;
-          for (let i in riverList) {
-            riverList[i].course_labels = riverList[i].course_labels?.split(',');
-            if (riverList[i].startDate) {
-              riverList[i].week = this.formatWeek(this.Moment(riverList[i].startDate).format('d'));
-              riverList[i].startDate = this.Moment(riverList[i].startDate).format('YYYY.M.D');
-              riverList[i].endDate = this.Moment(riverList[i].endDate).format('YYYY.M.D');
-            }
-          }
-          this.riverList = 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: {
-          "area": "",
-          "province": "",
-          "city": "",
-          "searchType": "6",
-          "userId": this.centerNo,
-          "productTypeId": "ZZY001",
-          "businessTypeId": "JY0004",
-          "channelCode": "GZH002"
-        },
-        onSuccess: data => {
-          console.log('data', data)
-          let campList = data.data.data;
-          for (let i in campList) {
-            campList[i].course_labels = campList[i].course_labels?.split(',');
-            if (campList[i].startDate) {
-              campList[i].week = this.formatWeek(this.Moment(campList[i].startDate).format('d'));
-              campList[i].startDate = this.Moment(campList[i].startDate).format('YYYY.M.D');
-              campList[i].endDate = this.Moment(campList[i].endDate).format('YYYY.M.D');
-            }
-          }
-          this.campList = campList
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    beforeChange (index) {
-      // if (index != 0 && index != 1  && index != 2) {
-      //   this.$toast('暂未开放，敬请期待！')
-      //   return false
-      // }
-      return true
-    },
-    onSearch () {
-      this.$toast('暂未开放，敬请期待！')
-    },
-    // 我的订单
-    handleMyOrder () {
-      this.$router.push({ name: 'ServiceOrderXST' })
-    },
-    // 我的优惠券
-    handleMyCard () {
-      this.$router.push({ name: 'ServiceCardBoxPublic' })
-    },
-    formatWeek (week) {
-      return week == 1 ? '周一' : week == 2 ? '周二' : week == 3 ? '周三' : week == 4 ? '周四' : week == 5 ? '周五' : week == 6 ? '周六' : week == 0 ? '周日' : '';
-    },
-    // 点击轮播
-    handleBanner () {
-      location.href = 'https://mp.weixin.qq.com/s/a4N3xr2nXZ-aG3OEakv-Dg'
-    },
-  },
-  components: {
-    Tabbar4,
-    ServiceList,
-    Screen,
-    ServiceListSecond,
-    ServiceListThird,
-    ServiceListFour
-  }
-}
-</script>
-<style lang="scss" scoped>
-#serviceKQ {
-  width: 100%;
-  height: 100%;
-  background: #f8f8f8;
-  overflow: hidden;
-  .swipeDiv {
-    // height: 400px;
-    height: 60vw;
-    width: 100%;
-  }
-  .container {
-    height: 100%;
-    position: absolute;
-    // top: 410px;
-    top: 60vw;
-    background: #f6f7fa;
-    background-image: url("../../assets/keqiao/kq_white.png");
-    // background-image: url("../../assets/service/bg.png");
-    background-size: 100%;
-    background-repeat: no-repeat;
-    // border-radius: 50px;
-    .redLink {
-      height: 10vw;
-      font-size: 4vw;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #fff;
-      // background-color: aquamarine;
-      background-image: linear-gradient(
-        to right,
-        rgba(255, 0, 0, 0),
-        #ff696a,
-        rgba(255, 0, 0, 0)
-      );
-      background-color: #fff;
-    }
-    .tabsCard {
-      width: 100vw;
-    }
-    .top_tool {
-      display: flex;
-      align-items: center;
-      // justify-content: center;
-      justify-content: space-between;
-      padding: 20px 24px;
-      box-sizing: border-box;
-      height: 108px;
-      background-color: #fff;
-      .logo {
-        width: 82px;
-      }
-      .search {
-        padding: 0;
-        width: 100%;
-        // width: 400px;
-      }
-      .scan {
-        width: 44px;
-      }
-      .head {
-        width: 60px;
-      }
-      .top_tab {
-        width: 366px;
-        border-radius: 33px;
-        overflow: hidden;
-        span {
-          display: inline-block;
-          width: 50%;
-          line-height: 66px;
-          text-align: center;
-          font-size: 28px;
-          color: #f3f3f3;
-          background: rgba(255, 255, 255, 0.24);
-          &.active {
-            // color: #fff;
-            color: black;
-            background: rgba(255, 255, 255, 0.21);
-          }
-        }
-      }
-    }
-    .service_swipe {
-      img {
-        width: 100%;
-      }
-    }
-    .card_zzy {
-      display: block;
-      width: 704px;
-      margin: 0 auto;
-      margin-top: 20px;
-    }
-    .order_btn {
-      width: 160px;
-      position: fixed;
-      bottom: 200px;
-      right: 20px;
-      z-index: 99;
-    }
-  }
-
-  ::v-deep .van-search__content {
-    background: rgba(255, 255, 255, 0.36);
-    .van-cell {
-      //   color: #fff;
-      color: black;
-    }
-    .van-field__control {
-      //   color: #fff;
-      color: black;
-      &::-webkit-input-placeholder {
-        // color: #fff;
-        color: #909399;
-      }
-    }
-  }
-  ::v-deep .van-tabs__wrap {
-    box-shadow: 0 10px 10px rgba(238, 238, 238, 0.295);
-    height: 88px;
-  }
-  ::v-deep .van-tabs__nav {
-    background: transparent;
-  }
-  ::v-deep .van-tab {
-    // color: #fff;
-    color: black;
-    font-size: 28px;
-    background-color: #fff;
-  }
-  ::v-deep .van-tab--active {
-    // color: #fff;
-    color: black;
-    font-size: 32px;
-    font-weight: bold;
-  }
-  ::v-deep .van-tabs__line {
-    width: 48px;
-    height: 6px;
-    // background: #ffffff;
-    background: black;
-    border-radius: 10px 10px 0px 0px;
-  }
-  .tab_img {
-    width: 146px;
-    transition: 0.3s linear;
-  }
-  .van-tab--active {
-    .tab_img {
-      transform: scale(1.2);
-    }
-  }
-  .fixed_btn {
-    position: fixed;
-    bottom: 20vw;
-    right: 0;
-    span {
-      display: block;
-      width: 200px;
-      text-align: center;
-      line-height: 60px;
-      font-size: 30px;
-      background: rgb(100, 200, 250);
-      border-top-left-radius: 30px;
-      border-bottom-left-radius: 30px;
-      margin-bottom: 30px;
-    }
-  }
-}
-.my-swipe .van-swipe-item {
-  color: #fff;
-  height: 60vw;
-  font-size: 20px;
-  // line-height: 400px;
-  // line-height: 60vw;
-  text-align: center;
-  background-color: #39a9ed;
-}
-</style>
diff --git a/src/views/PublicService/ServiceKQ.vue b/src/views/PublicService/ServiceKQ.vue
deleted file mode 100644
index a55b170..0000000
--- a/src/views/PublicService/ServiceKQ.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <service-basekq :centerNo="centerNo" v-if="centerNo"></service-basekq>
-</template>
-
-<script>
-import ServiceBasekq from './ServiceBaseKQ.vue'
-export default {
-  name: 'ServiceKQ',
-  data () {
-    return {
-      centerNo: '',
-    }
-  },
-
-  mounted () {
-    console.log('xst mounted')
-    this.checkAuth()
-
-  },
-  activated () {
-    console.log('KQ activated')
-    this.checkAuth()
-  },
-  methods: {
-    checkAuth () {
-      let centerNo = this.common.getUrlParam('center_no') || sessionStorage.getItem('centerNo');
-      if (centerNo) {
-        this.centerNo = centerNo
-        sessionStorage.setItem('centerNo', centerNo);
-        this.getUserInfo()
-      } else {
-        const sUserAgent = window.navigator.userAgent.toLowerCase()
-        const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1
-        const miniprogram = sUserAgent.indexOf("miniprogram") > -1 && sUserAgent.indexOf("alipay") > -1
-        if (dtdreamweb) {
-          alert('浙里办')
-          window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`;
-        }
-        // else if (miniprogram) {
-        //   alert('支付宝')
-        //   window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`;
-        // }
-        else {
-          console.log('非浙里办渠道访问，显示测试用户数据')
-          this.centerNo = '20210930160466993660'
-          sessionStorage.setItem('centerNo', '20210930160466993660');
-          this.getUserInfo()
-        }
-      }
-    },
-    // 获取用户信息
-    getUserInfo: function () {
-      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) {
-            sessionStorage.setItem('userInfo', JSON.stringify(res.data.data.userInfo))
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-  },
-  components: {
-    ServiceBasekq
-  }
-}
-</script>
diff --git a/src/views/PublicService/ServiceOrderXST.vue b/src/views/PublicService/ServiceOrderXST.vue
deleted file mode 100644
index b60e2fb..0000000
--- a/src/views/PublicService/ServiceOrderXST.vue
+++ /dev/null
@@ -1,867 +0,0 @@
-<template>
-  <div class="myOrders">
-    <van-tabs v-model="active" :before-change="beforeTabChange">
-      <van-tab title="待付款">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoadpay()">
-          <div class="showBoxDPJ" v-for="(item,index) in paylist" :key="index">
-            <div class="topLine">
-              <div class="topLineL">订单编号：{{item.orderpaynum}}</div>
-              <div class="topLineR" style="color:#F64C37">待付款</div>
-            </div>
-            <div class="top" @click="toEdit(item)">
-              <div class="pic">
-                <img :src="item.coverUrl ? item.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
-              </div>
-              <div class="basefont">
-                <div class="titlefont">{{item.baseName}}</div>
-                <div class="tcfont">套餐名称：{{item.courseName}}</div>
-                <div class="tcfont">数量*{{item.orderCount}}</div>
-              </div>
-              <div class="priceRight">¥{{item.paymoney}}</div>
-            </div>
-            <div class="detailsBox">
-              <div class="detailsBoxOne">
-                <div>订单创建时间</div>
-                <div>{{item.intime.replace(/T/,' ')}}</div>
-              </div>
-            </div>
-          </div>
-        </van-list>
-      </van-tab>
-      <van-tab title="待使用">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoadmove()">
-          <div class="showBox" v-for="(item,index) in movelist" :key="index">
-            <div class="top" @click="toEdit(item)">
-              <div class="pic">
-                <img :src="item.coverUrl ? item.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
-              </div>
-              <div class="basefont">
-                <div class="titlefont">{{item.baseName}}</div>
-                <div class="tcfont">套餐名称：{{item.courseName}}</div>
-                <div class="tcfont">数量*{{item.orderCount}}</div>
-              </div>
-              <div class="priceRight">¥{{item.paymoney}}</div>
-            </div>
-            <div class="groupTime">
-              <van-icon name="clock-o" /><span class="grey"> 活动日期</span><span> {{item.startDate}} - {{ item.endDate}}</span>
-            </div>
-            <div class="btnBox">
-              <div class="wechat_code" @click="openGroupCodePopup(index)" style="margin-right:15px">
-                <img src="@/assets/home/wechat.png" alt="">
-                <span>加入拼团群</span>
-              </div>
-              <div>
-                <van-button type="warning" plain size="small" @click="showPintuanAbout = true" style="margin-right:15px">退款说明</van-button>
-                <!-- <van-button type="info" size="small" @click="makeCode(item.id)">核销码</van-button> -->
-                <van-button type="info" size="small" @click="toCode(item)">核销码</van-button>
-              </div>
-            </div>
-            <div class="detailsBox">
-              <div class="detailsBoxOne">
-                <div>订单创建时间</div>
-                <div>{{item.intime.replace(/T/,' ')}}</div>
-              </div>
-              <div class="detailsBoxOne">
-                <div>订单编号</div>
-                <div>{{item.orderpaynum}}</div>
-              </div>
-            </div>
-          </div>
-        </van-list>
-      </van-tab>
-      <van-tab title="待评价">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoadCareer()">
-          <div class="showBoxDPJ" v-for="(item,index) in datalist" :key="index">
-            <div class="topLine">
-              <div class="topLineL">订单编号：{{item.orderpaynum}}</div>
-              <div class="topLineR" @click="evaluate(item)">去评价 ></div>
-            </div>
-            <div class="top" @click="toEdit(item)">
-              <div class="pic">
-                <img :src="item.coverUrl ? item.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
-              </div>
-              <div class="basefont">
-                <div class="titlefont">{{item.baseName}}</div>
-                <div class="tcfont">套餐名称：{{item.courseName}}</div>
-                <div class="tcfont">数量*{{item.orderCount}}</div>
-              </div>
-              <div class="priceRight">¥{{item.paymoney}}</div>
-            </div>
-            <div class="detailsBox">
-              <div class="detailsBoxOne">
-                <div>订单创建时间</div>
-                <div>{{item.intime.replace(/T/,' ')}}</div>
-              </div>
-            </div>
-          </div>
-        </van-list>
-      </van-tab>
-      <van-tab title="已评价">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad()">
-          <div class="showBoxDPJ showBoxYPJ" v-for="(item,index) in list" :key="index">
-            <div class="top">
-              <div class="pic">
-                <img :src="item.coverUrl ? item.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
-              </div>
-              <div class="basefont">
-                <div class="titlefont">{{item.baseName}}</div>
-                <div class="tcfont">套餐名称：{{item.courseName}}</div>
-                <div class="tcfont">数量*{{item.orderCount}}</div>
-              </div>
-              <div class="priceRight">¥{{item.paymoney}}</div>
-            </div>
-            <div class="boxdf">
-              <div class="title">课程评分</div>
-              <div class="fr">
-                <van-rate v-model="item.courseScore" void-icon="star" void-color="#eee" color="#FFCC00" :size="16" readonly />
-                <span class="rate">{{item.courseScore}}.0</span>
-              </div>
-            </div>
-            <div class="boxdf">
-              <div class="title">基地评分</div>
-              <div class="fr">
-                <van-rate v-model="item.baseScore" void-icon="star" void-color="#eee" color="#FFCC00" :size="16" readonly />
-                <span class="rate">{{item.baseScore}}.0</span>
-              </div>
-            </div>
-            <p class="evaluation"><span>评价：</span>{{item.evaluation}}</p>
-            <div class="evaluation_img_box">
-              <img class="evaluation_img" v-for="(imgItem,index) in item.imageList" :key="index" :src="imgItem.imgUrl" alt="" @click="previewImg(imgItem.imgUrl)">
-            </div>
-            <!-- <p class="evaluation_time">评价于2020-12-21</p> -->
-          </div>
-        </van-list>
-      </van-tab>
-    </van-tabs>
-
-    <!--二维码-->
-    <!-- <div class="qrcodeBox" @click.self="qrcodeShow = false" v-show="qrcodeShow">
-      <div id="qrcode"></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、凡拼团活动报名人数未达最低成团数，本团活动则不开营，系统将在72小时内，全额退还，且不产生违约风险赔偿。</p>
-        <p class="about_content">2、如果您因行程发生变动需要取消预订，建议您尽可能提前与平台商户取得联系，并按商品订购须知或该商户旅游合同条款进行退款。</p>
-        <p class="about_content" style="font-weight:bold">如若未声明与明确的，按《浙江省境内旅游合同》条款退款。</p>
-        <!-- <p class="about_content">（1）出发前7日至4日，支付旅游费用总额的10%。</p>
-        <p class="about_content">（2）出发前3日至1日，支付旅游费用总额的15%。</p>
-        <p class="about_content">（3）出发当日，支付旅游费用总额的20%。</p> -->
-        <p class="about_know" @click="showPintuanAbout=false">我知道了</p>
-      </div>
-    </van-popup>
-
-    <van-popup v-model="showCode" round get-container="body">
-      <div class="codeCss">
-        <div class="showBox">
-          <div class="top">
-            <div class="pic">
-              <img :src="codeData.coverUrl ? codeData.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
-            </div>
-            <div class="basefont">
-              <div class="titlefont">{{codeData.baseName}}</div>
-              <div class="tcfont">套餐名称：{{codeData.courseName}}</div>
-              <div class="tcfont">数量*{{codeData.orderCount}}</div>
-            </div>
-            <!-- <div class="priceRight">¥{{codeData.paymoney}}</div> -->
-          </div>
-          <div class="groupTime">
-            <van-icon name="clock-o" /><span class="grey"> 活动日期</span><span> {{codeData.startDate}} - {{ codeData.endDate}}</span>
-          </div>
-          <div class="qrcodeBox">
-            <div id="qrcode" ref="imageWrapper" v-if="!imgUrl"></div>
-            <div class="imgBox">
-              <img :src="imgUrl" v-if="imgUrl" style="width:100%;height:100%" />
-            </div>
-          </div>
-          <div class="numShow">
-            {{codeData.id}}
-          </div>
-          <div class="fontBottom">请向工作人员出示</div>
-        </div>
-      </div>
-    </van-popup>
-    <van-popup v-model="showPreview" round get-container="body">
-      <img class="preview_img" :src="previewUrl" alt="">
-    </van-popup>
-    <GroupCodePopup v-if="showGroupCode" :chatGroupUrl="chatGroupUrl" @closeGroupCode="showGroupCode=false"></GroupCodePopup>
-  </div>
-</template>
-
-<script>
-import GroupCodePopup from '@/component/GroupCodePopup'
-import QRCode from 'qrcodejs2'  // 引入qrcode
-import html2canvas from "html2canvas"
-// let Base64 = require('js-base64').Base64;
-export default {
-  name: 'ServiceOrder',
-  data () {
-    return {
-      userInfo: '',
-      active: 1,
-      paylist: [], //待付款
-      movelist: [],  //待核销
-      list: [],  //所有
-      datalist: [],  //未评价
-      loading: false,
-      finished: false,
-      pageCareerIndex: 0,
-      qrcodeShow: false,
-      showPintuanAbout: false,
-      showCode: false,
-      codeData: {},
-      imgUrl: '',
-      previewUrl: '',//图片预览
-      showPreview: false,
-      showGroupCode: false,//群码
-      chatGroupUrl: '',//群码图片
-      showChatGroupUrlTag: false
-    }
-  },
-  computed: {
-    nicknameUser () {
-      return sessionStorage.getItem('nicknameUser')
-    }
-  },
-  mounted () {
-    let userInfo = sessionStorage.getItem('userInfo');
-    if (userInfo) {
-      this.userInfo = JSON.parse(userInfo);
-    }
-    // 进入页面进到第几个tab
-    if (this.$route.query.active || this.$route.query.active == 0) {
-      this.active = this.$route.query.active
-    }
-    // 进入页面直接显示第一个订单的群码
-    if (this.$route.query.showChatGroupUrl == 1) {
-      this.showChatGroupUrlTag = true
-    }
-  },
-  methods: {
-    beforeTabChange (item) {
-      console.log(item)
-      this.paylist = [];
-      this.movelist = [];
-      this.list = [];
-      this.datalist = [];
-      if (item == 0) {
-        this.onLoadpay()
-      } else if (item == 1) {
-        // this.onLoadCareer()
-        this.onLoadmove()
-      } else if (item == 2) {
-        this.onLoadCareer()
-      } else {
-        this.onLoad()
-      }
-      return true;
-    },
-    //获取待支付
-    onLoadpay () {
-      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": sessionStorage.getItem('centerNo'),
-          "type": 1,
-          "page": 1,
-          "pageSize": 999
-        },
-        onSuccess: res => {
-          console.log('待支付:', res)
-          if (res.data.status == 1) {
-            this.paylist = res.data.data.list;
-            this.loading = false;
-            this.finished = true;
-          } else {
-            this.$toast.fail(res.data.message);
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    //获取已支付
-    onLoadmove () {
-      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": sessionStorage.getItem('centerNo'),
-          "type": 2,
-          "page": 1,
-          "pageSize": 999
-        },
-        onSuccess: res => {
-          console.log('已支付:', res)
-          if (res.data.status == 1) {
-            this.movelist = res.data.data.list;
-            this.loading = false;
-            this.finished = true;
-            if (this.showChatGroupUrlTag) {
-              this.showChatGroupUrlTag = false;
-              this.openGroupCodePopup(0)
-            }
-          } else {
-            this.$toast.fail(res.data.message);
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    //获取待评价
-    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": sessionStorage.getItem('centerNo'),
-          "type": 3,
-          "page": 1,
-          "pageSize": 999
-        },
-        onSuccess: res => {
-          console.log('待评价:', res)
-          if (res.data.status == 1) {
-            this.datalist = res.data.data.list;
-            this.loading = false;
-            this.finished = true;
-            if (this.showChatGroupUrlTag) {
-              this.showChatGroupUrlTag = false;
-              this.openGroupCodePopup(0)
-            }
-          } else {
-            this.$toast.fail(res.data.message);
-          }
-        },
-        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": sessionStorage.getItem('centerNo'),
-          "type": 4,
-          "page": 1,
-          "pageSize": 999
-        },
-        onSuccess: res => {
-          console.log('已评价:', res)
-          if (res.data.status == 1) {
-            this.list = res.data.data.list;
-            this.loading = false;
-            this.finished = true;
-            if (this.showChatGroupUrlTag) {
-              this.showChatGroupUrlTag = false;
-              this.openGroupCodePopup(0)
-            }
-          } else {
-            this.$toast.fail(res.data.message);
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    //生成核销码
-    makeCode (id) {
-      console.log(id.toString())
-      document.getElementById('qrcode').innerHTML = '';
-      this.qrcodeShow = true;
-
-      let qrcode = new QRCode('qrcode', {
-        width: 200,
-        height: 200,
-        text: id.toString(), // 二维码地址
-      })
-      this.canvanqrCode()
-    },
-    //评价
-    evaluate (item) {
-      window.sessionStorage.setItem('courseInfo', JSON.stringify(item))
-      this.$router.push({ name: 'evaluateCourse' })
-    },
-    //核销码
-    toCode (item) {
-      this.codeData = {}
-      this.showCode = true
-      this.codeData = item
-      this.imgUrl = ''
-      setTimeout(() => {
-        this.makeCode(item.id)
-      }, 1000);
-    },
-    // 打开群码弹窗
-    openGroupCodePopup (index) {
-      this.chatGroupUrl = this.movelist[index]?.chatGroupUrl
-      this.showGroupCode = true;
-    },
-    //跳转
-    toEdit (item) {
-      this.$router.push({ path: 'abroad_detail', query: { courseId: item.courseId, publicName: sessionStorage.getItem('publicName') } })
-    },
-    //二维码转图片
-    canvanqrCode () {
-      html2canvas(this.$refs.imageWrapper, {
-        width: 200,
-        height: 200
-      }).then(canvas => {
-        let dataURL = canvas.toDataURL("image/png");
-        this.imgUrl = dataURL;
-      });
-    },
-    // 预览图片
-    previewImg (url) {
-      this.previewUrl = url;
-      this.showPreview = true
-    }
-  },
-  components: {
-    GroupCodePopup
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.myOrders {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  overflow: auto;
-  background: #f6f7fa;
-
-  // .qrcodeBox {
-  //   position: fixed;
-  //   top: 0;
-  //   left: 0;
-  //   bottom: 0;
-  //   right: 0;
-  //   background-color: rgba(0, 0, 0, 0.4);
-
-  //   #qrcode {
-  //     position: absolute;
-  //     top: 50%;
-  //     left: 50%;
-  //     transform: translate(-50%, -50%);
-  //     padding: 20px;
-  //     background: #fff;
-  //   }
-  // }
-
-  .list {
-    padding: 20px;
-    box-sizing: border-box;
-
-    li:not(:last-child) {
-      border-bottom: 1px dashed #eee;
-    }
-
-    li {
-      margin-bottom: 10px;
-      padding-bottom: 10px;
-
-      .baseName {
-        padding-left: 50px;
-        font-size: 30px;
-        background: url("../../assets/service/hoom.png") no-repeat left top;
-        background-size: contain;
-        margin: 10px 0;
-      }
-      .career_type {
-        font-size: 30px;
-        margin: 0;
-        margin-top: 10px;
-      }
-      .career_create {
-        color: #ccc;
-        font-size: 30px;
-        margin: 0;
-        margin-top: 10px;
-      }
-      .course {
-        min-height: 60px;
-
-        img {
-          object-fit: cover;
-          width: 200px;
-          float: left;
-          margin-right: 10px;
-        }
-
-        .courseCont {
-          h5 {
-            word-break: break-all;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 2;
-            overflow: hidden;
-            font-size: 30px;
-            margin: 0;
-          }
-
-          p {
-            color: #ccc;
-            font-size: 30px;
-            margin: 0;
-            margin-top: 10px;
-          }
-        }
-      }
-
-      .orderCont {
-        padding: 40px 0;
-        font-size: 28px;
-
-        span {
-          color: red;
-        }
-
-        .pj {
-          float: right;
-        }
-      }
-
-      .codeBtn {
-        text-align: right;
-        margin-top: 15px;
-      }
-    }
-  }
-  //待审核
-  .showBox {
-    width: 702px;
-    background: #fff;
-    border-radius: 16px;
-    margin: 30px auto;
-    padding: 34px 24px;
-    box-sizing: border-box;
-
-    .top {
-      display: flex;
-
-      .pic {
-        width: 124px;
-        height: 124px;
-        flex-shrink: 0;
-      }
-      .basefont {
-        padding: 0 20px;
-        box-sizing: border-box;
-        .titlefont {
-          color: #333333;
-          font-size: 28px;
-          margin-bottom: 18px;
-        }
-        .tcfont {
-          color: #535353;
-          font-size: 24px;
-        }
-      }
-      .priceRight {
-        width: 110px;
-        font-size: 28px;
-        color: #f64c37;
-        line-height: 200px;
-      }
-    }
-    .groupTime {
-      font-size: 28px;
-      line-height: 60px;
-      height: 60px;
-      margin-bottom: 20px;
-      // background-color: #f5f6fa;
-      padding-left: 10px;
-      box-sizing: border-box;
-
-      .grey {
-        color: #999999;
-      }
-    }
-    .btnBox {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .wechat_code {
-        display: flex;
-        align-items: center;
-        height: 54px;
-        padding: 0 16px;
-        background: #00c800;
-        border-radius: 8px;
-        font-size: 28px;
-        color: #fff;
-        img {
-          width: 40px;
-          margin-right: 14px;
-        }
-      }
-    }
-    .detailsBox {
-      color: #999999;
-      font-size: 28px;
-      margin-top: 60px;
-
-      .detailsBoxOne {
-        margin-top: 20px;
-        display: flex;
-        justify-content: space-between;
-      }
-    }
-  }
-  //待评价
-  .showBoxDPJ {
-    width: 702px;
-    // height: 330px;
-    margin: 30px auto;
-    padding: 34px 24px;
-    box-sizing: border-box;
-    background: #fff;
-    border-radius: 16px;
-    .topLine {
-      height: 60px;
-      display: flex;
-      justify-content: space-between;
-      .topLineL {
-        font-size: 23px;
-        color: #999999;
-      }
-      .topLineR {
-        font-size: 23px;
-      }
-    }
-    .top {
-      display: flex;
-
-      .pic {
-        width: 124px;
-        height: 124px;
-        flex-shrink: 0;
-      }
-      .basefont {
-        padding: 0 20px;
-        box-sizing: border-box;
-        .titlefont {
-          margin-bottom: 18px;
-          color: #333333;
-          font-weight: bold;
-          font-size: 28px;
-        }
-        .tcfont {
-          color: #535353;
-          font-size: 24px;
-        }
-      }
-      .priceRight {
-        width: 110px;
-        font-size: 28px;
-        color: #f64c37;
-        line-height: 200px;
-      }
-    }
-    .detailsBox {
-      color: #999999;
-      font-size: 28px;
-
-      .detailsBoxOne {
-        margin-top: 20px;
-        display: flex;
-        justify-content: space-between;
-      }
-    }
-  }
-  // 已评价
-  .showBoxYPJ {
-    .boxdf {
-      padding: 10px 0;
-      font-size: 5vw;
-      display: flex;
-      .title {
-        font-size: 28px;
-        margin-right: 10px;
-      }
-      .rate {
-        color: #ffcc00;
-        font-size: 30px;
-        margin-left: 10px;
-      }
-    }
-    .evaluation {
-      font-size: 30px;
-      span {
-        font-weight: bold;
-      }
-    }
-    .evaluation_img_box {
-      margin-top: 22px;
-      .evaluation_img {
-        width: 212px;
-        height: 212px;
-        margin-right: 9px;
-        margin-bottom: 9px;
-        &:nth-of-type(3n) {
-          margin-right: 0;
-        }
-      }
-    }
-    .evaluation_time {
-      margin-top: 18px;
-      text-align: right;
-      color: #999999;
-      font-size: 28px;
-    }
-  }
-
-  .pintuan_about {
-    width: 592px;
-    box-sizing: border-box;
-    padding: 0 50px;
-    .about_img {
-      width: 112px;
-      margin: 0 auto;
-      margin-top: 30px;
-      display: block;
-    }
-    .about_title {
-      font-size: 34px;
-      font-weight: bold;
-      text-align: center;
-    }
-    .about_content {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    .about_know {
-      font-size: 32px;
-      text-align: center;
-      color: #3385ff;
-      margin-top: 60px;
-      margin-bottom: 44px;
-    }
-  }
-}
-.codeCss {
-  width: 700px;
-  height: 850px;
-  position: relative;
-
-  .showBox {
-    width: 702px;
-    // height: 500px;
-    // background-color: aquamarine;
-    margin: 30px auto;
-    padding: 34px 24px;
-    box-sizing: border-box;
-
-    .top {
-      display: flex;
-
-      .pic {
-        width: 124px;
-        height: 124px;
-        flex-shrink: 0;
-      }
-      .basefont {
-        padding: 0 20px;
-        box-sizing: border-box;
-        .titlefont {
-          color: #333333;
-          font-size: 28px;
-          margin-bottom: 18px;
-        }
-        .tcfont {
-          color: #535353;
-          font-size: 24px;
-        }
-      }
-      .priceRight {
-        width: 110px;
-        font-size: 28px;
-        color: #f64c37;
-        line-height: 200px;
-      }
-    }
-    .groupTime {
-      font-size: 28px;
-      line-height: 60px;
-      height: 60px;
-      margin-bottom: 20px;
-      background-color: #f5f6fa;
-      padding-left: 10px;
-      box-sizing: border-box;
-
-      .grey {
-        color: #999999;
-      }
-    }
-    .qrcodeBox {
-      width: 100%;
-      height: 430px;
-
-      #qrcode {
-        transform: translate(25%, 10%);
-        // margin: auto;
-      }
-      .imgBox {
-        width: 370px;
-        height: 370px;
-        margin: 30px auto 0;
-        // transform: translate(25%, 10%);
-      }
-    }
-    .numShow {
-      width: 100%;
-      font-size: 28px;
-      text-align: center;
-      color: #999999;
-    }
-    .fontBottom {
-      width: 100%;
-      font-weight: bold;
-      font-size: 28px;
-      text-align: center;
-    }
-  }
-}
-.preview_img {
-  width: 100vw;
-}
-</style>
diff --git a/src/views/PublicService/component/PrefectBox.vue b/src/views/PublicService/component/PrefectBox.vue
deleted file mode 100644
index a1b3c0d..0000000
--- a/src/views/PublicService/component/PrefectBox.vue
+++ /dev/null
@@ -1,392 +0,0 @@
-<template>
-  <div>
-    <div id="prefect_box">
-      <img class="bg" src="@/assets/msg.png" alt="">
-      <div class="content">
-        <div class="name">学生信息:</div>
-        <div class="item">
-           <input type="text" placeholder="请输入学生姓名" v-model="studentName">
-        </div>
-        <div class="item" @click="showUserTypeSelect=true" style="width:48%;display:inline-flex;margin-right:4%;">
-          <p :class="!userType?'nodata':''">{{userType?userType:'当前阶段'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item" @click="handleYear" style="width:48%;display:inline-flex;">
-          <p :class="!year||yearDisable?'nodata':''">{{year?year:'入学年份'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item" @click="showAreaSelect=true">
-          <p :class="!area?'nodata':''">{{area?area:'请选择地区'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <!-- <div class="item">
-          <form action="/" style="width:100%;">
-            <van-search v-model="searchSchool" placeholder="请输入学校关键字" @search="handleSchool" />
-          </form>
-        </div> -->
-        <div class="item">
-           <input type="text" placeholder="请选择学校" readonly v-model="school">
-           <button type="info" class="btn" @click="chooseSchool">选择学校</button>
-        </div>
-
-        <!-- <p class="school_select" v-if="school">已选择学校：{{school}}</p> -->
-        <button class="submit" @click="submit">完成</button>
-      </div>
-    </div>
-    <van-popup v-model="showUserTypeSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="当前阶段" show-toolbar :columns="userTypeArr" value-key="label" @cancel="showUserTypeSelect = false" @confirm="selectUserTypeOver" />
-    </van-popup>
-    <van-popup v-model="showYearSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="入学年份" show-toolbar :columns="yearArr" value-key="label" @cancel="showYearSelect = false" @confirm="selectYearOver" />
-    </van-popup>
-    <van-popup v-model="showAreaSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-area title="地区" :area-list="areaList" @cancel="showAreaSelect = false" @confirm="selectAreaOver" />
-    </van-popup>
-    <van-popup v-model="showSchoolSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="学校" show-toolbar :columns="schoolList" :loading="schoolListLoading" @cancel="showSchoolSelect = false" @confirm="selectSchoolOver" />
-    </van-popup>
-    
-    <van-popup v-model="chooseSchoolisShow" round  get-container="body" :safe-area-inset-bottom="true">
-      <div v-if="chooseSchoolisShow"><chooseSchool v-model="chooseSchoolisShow" @schoolData='schoolData'></chooseSchool></div>
-    </van-popup>
-  </div>
-</template>
-
-<script>
-import chooseSchool from './chooseSchool'
-export default {
-  props: [
-    "phone",
-    "id",
-    "publicName"
-  ],
-  components: {chooseSchool},
-  data () {
-    return {
-      studentName: '',
-
-      year: '',//入学年份
-      yearDisable: false,
-      showYearSelect: false,
-      yearArr: [],
-
-      userType: '',
-      userTypeVal: '',//所处阶段1-小学 2-初中 3-高中
-      showUserTypeSelect: false,
-      userTypeArr: [{
-        label: '小学',
-        value: 1
-      }, {
-        label: '初中',
-        value: 2
-      }, {
-        label: '高中',
-        value: 3
-      }],
-
-      area: '',
-      areaCode: '',
-      showAreaSelect: false,
-      areaList: [],
-
-      searchSchool: '',
-      school: '',
-      schoolId: '',
-      showSchoolSelect: false,
-      schoolListLoading: false,
-      schoolList: [],
-
-      appId: '',
-      chooseSchoolisShow: false
-    }
-  },
-
-  mounted () {
-    if (this.publicName == 'SXYX') {
-      this.appId = 'wx1305e88d2bc74073'
-    } else if (this.publicName == 'XST') {
-      this.appId = 'wx1c630c8773c482f1'
-    }
-    let userInfo = sessionStorage.getItem('userInfo')
-    this.userInfo = userInfo ? JSON.parse(userInfo) : userInfo;
-    this.studentName = this.userInfo?.studentName;
-    this.initYearArr()
-    this.GetSysAreaList()
-  },
-  methods: {
-    // 初始化入学年份选项
-    initYearArr () {
-      // 页面创建时执行
-      let year = new Date().getFullYear(),
-        Month = new Date().getMonth() + 1,
-        yearArr = [];
-      if (Month > 8) {
-        // 如果月份大于8,那么当年的学年的高考年份要+1,如果月份小于7,那么当前的年份就是今年高考的年份
-        year = year
-      }
-      for (let index = year; index > year - 6; index--) {
-        yearArr.push({ value: index, label: index })
-      }
-      this.yearArr = yearArr
-    },
-    selectYearOver (value) {
-      this.year = value.label;
-      this.showYearSelect = false;
-    },
-    handleYear () {
-      if (!this.yearDisable) {
-        this.showYearSelect = true;
-      }
-    },
-    selectUserTypeOver (value) {
-      this.userType = value.label;
-      this.userTypeVal = value.value;
-      this.showUserTypeSelect = false;
-    },
-    // 获取地区列表
-    GetSysAreaList () {
-      this.http.GetSysAreaList({
-        areaCode: 33
-      }).then((res) => {
-        if (res.success) {
-          let data = res.data;
-          let obj = {
-            province_list: {
-              330000: '浙江省'
-            },
-            city_list: {},
-            county_list: {}
-          };
-          if (data) {
-            data.forEach((n, i) => {
-              obj.city_list[n.area_code + '00'] = n.area_name;
-              if (n.areaList.length > 0) {
-                n.areaList.forEach((k, j) => {
-                  obj.county_list[k.area_code] = k.area_name;
-                })
-              }
-            });
-            this.areaList = obj;
-          }
-        } else {
-          this.$toast.fail(res.message)
-        }
-      })
-    },
-    selectAreaOver (value) {
-      let data = value;
-      var city = data[1].code;
-      city = city.substring(0, city.length - 2);
-      // console.log(city)
-      this.area = data[0].name + ',' + data[1].name + ',' + data[2].name;
-      this.areaCode = [data[0].code, city, data[2].code];
-      this.quCode = data[2].code;
-      this.school = '',
-        this.schoolId = '',
-        this.showAreaSelect = false
-    },
-    // 点击选择学校
-    handleSchool () {
-      if (!this.searchSchool) {
-        this.$toast('请输入学校关键字');
-        return;
-      }
-      this.showSchoolSelect = true;
-      this.GetHighSchoolList();
-    },
-    // 通过地区获取学校
-    GetHighSchoolList () {
-      this.schoolListLoading = true;
-      this.yxAxios.get(`${this.yanxueUrl}/api/SchoolManage/GetAllSchoolList?schoolName=${this.searchSchool}`).then((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;
-            this.schoolListLoading = false
-          }
-        } else {
-          this.schoolListLoading = false
-          this.$toast.fail(res.data.message)
-        }
-      })
-    },
-    selectSchoolOver (value) {
-      console.log(value)
-      this.school = value.text;
-      this.schoolId = value.id;
-      this.showSchoolSelect = false;
-    },
-
-    submit () {
-      if (!this.studentName) {
-        this.$toast('请输入姓名');
-      }
-      else if (!this.userType) {
-        this.$toast('请选择阶段');
-      }
-      else if (!this.year) {
-        this.$toast('请选择入学年份');
-      }
-      else if (!this.area) {
-        this.$toast('请选择地区');
-      }
-      else if (!this.school) {
-        this.$toast('请选择学校');
-      } else {
-        let postData = {
-          id: this.id,
-          userName: this.studentName,
-          mobile: this.phone,
-          province: this.area.split(',')[0],//省份
-          city: this.area.split(',')[1],//城市
-          area: this.area.split(',')[2],//地区
-          schoolName: this.school,//学校名称
-          enrollYear: this.year,//入学年份
-          userType: this.userTypeVal,//1-小学 2-初中 3-高中
-        }
-        this.$toast.loading({
-          message: '加载中',
-          duration: 0,
-          forbidClick: true
-        })
-        this.yxAxios.post(`${this.proxyUrl}/prod/api/wx/${this.appId}/updateUserInfo`, postData).then((res) => {
-          this.$toast.clear()
-          if (res.data.code == 200) {
-            this.$toast.success(res.data?.message)
-            this.$emit('complete')
-            this.$emit('hidePrefectBox')
-          } else {
-            this.$toast.fail(res.message)
-          }
-        })
-      }
-    },
-    //选择学校
-    chooseSchool() {
-      // this.$router.push({name: 'chooseSchool'})
-      this.chooseSchoolisShow = true
-    },
-    schoolData(val) {
-      this.school = val.text;
-      this.schoolId = val.id;
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-#prefect_box {
-  width: 638px;
-  height: 836px;
-  background: #ffffff;
-  border-radius: 24px;
-  position: relative;
-  
-  .bg {
-    width: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-  .content {
-    width: 100%;
-    box-sizing: border-box;
-    padding: 0 40px;
-    position: absolute;
-    top: 236px;
-    left: 0;
-    .name {
-      width: 558px;
-      height: 50px;
-      font-size: 28px;
-      color: #000;
-      padding-left: 20px;
-      box-sizing: border-box;
-    }
-    .item {
-      width: 558px;
-      height: 72px;
-      border-radius: 36px;
-      background: #f7f7f7;
-      box-sizing: border-box;
-      font-size: 28px;
-      padding: 0 32px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 28px;
-      p {
-        color: #333333;
-        &.nodata {
-          color: #999999;
-        }
-      }
-      img {
-        width: 40px;
-      }
-      input {
-        width: 100%;
-        background: transparent;
-        border: 0;
-        color: #333333;
-        padding: 0;
-        &::-webkit-input-placeholder {
-          color: #999999;
-        }
-      }
-      .btn {
-        width: 240px;
-        height: 55px;
-        float: right;
-        font-size: 28px;
-        background: linear-gradient(135deg, #cdf8cf 0%, #8af36f 100%);
-        box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
-          0px 8px 12px 0px rgba(89, 199, 171, 0.5);
-        border-radius: 34px;
-        border: transparent;
-        color: #333333;
-      }
-    }
-    .school_select {
-      font-size: 28px;
-      padding: 0 32px;
-      margin-bottom: 28px;
-    }
-    .submit {
-      width: 294px;
-      height: 72px;
-      border: 0;
-      background: linear-gradient(135deg, #99c2ff 0%, #1f59ff 100%);
-      box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
-        0px 8px 12px 0px rgba(87, 137, 255, 0.5);
-      border-radius: 34px;
-      font-size: 34px;
-      color: #ffffff;
-      margin: 0 auto;
-      display: block;
-    }
-  }
-}
-::v-deep .van-search {
-  background: transparent;
-  padding: 0;
-  width: 100%;
-}
-::v-deep .van-search__content {
-  padding: 0;
-}
-.schoolBoxF {
-    width: 100vw;
-    height: 100vh;
-    position: absolute;
-    top: 0;
-    left: 0;
-    background-color: #fff;
-}
-</style>
diff --git a/src/views/PublicService/component/chooseSchool.vue b/src/views/PublicService/component/chooseSchool.vue
deleted file mode 100644
index b32af3e..0000000
--- a/src/views/PublicService/component/chooseSchool.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-/*选择学校*/
-<template>
-  <div id="schoolBox">
-    <div class="search">
-      <form action="/">
-        <van-search v-model="searchSchool" show-action placeholder="请输入搜索关键词" @input="onSearch" @cancel="onCancel" />
-      </form>
-    </div>
-    <div class="listCardBox">
-      <div v-for="(val,i) in schoolList" :key="i" class="listCard">
-        <div @click="schoolClick(val)">{{val.text}}</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      searchSchool: '',
-      schoolList: []
-    }
-  },
-  methods: {
-    onSearch (val) {
-      console.log(val)
-      this.GetHighSchoolList()
-    },
-    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)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    //点击学校
-    schoolClick (val) {
-      console.log(val)
-      this.$emit('schoolData', val)
-      this.onCancel()
-    }
-  },
-  mounted () {
-    // this.GetHighSchoolList()
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-#schoolBox {
-  width: 100vw;
-  height: 100vh;
-  // top: 0;
-  // left: 0;
-  background-color: #fff;
-
-  .search {
-    padding: 40px 30px;
-    box-sizing: border-box;
-  }
-  .listCardBox {
-    height: 1050px;
-    overflow: auto;
-
-    .listCard {
-      width: 700px;
-      height: 70px;
-      color: black;
-      font-size: 29px;
-      margin-left: 30px;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/PublicService/evaluateBase.vue b/src/views/PublicService/evaluateBase.vue
deleted file mode 100644
index ed5ebbe..0000000
--- a/src/views/PublicService/evaluateBase.vue
+++ /dev/null
@@ -1,297 +0,0 @@
-<template>
-  <div class="releaseEvaluate">
-    <div class="box top">
-      <div class="pic">
-        <img :src="baseInfo.baseUrl ? baseInfo.baseUrl : 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>
-    </div>
-    <div class="box">
-      <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>
-        </div>
-      </div>
-      <div class="cont">
-        <div class="item">
-          <van-field v-model="content" type="textarea" label="" placeholder="对基地的评价及建议" />
-        </div>
-      </div>
-      <div class="imgs">
-        <img :src="n.imgUrl" alt="" v-for="(n,i) in imgsrc" :key="i">
-        <div class="selectImg">
-          <imgCut @callback="callback" :width="750" :height="750">
-            <van-icon name="cross" />
-          </imgCut>
-        </div>
-        <!-- <van-uploader v-model="fileList" multiple /> -->
-      </div>
-    </div>
-    <div class="btns" :class="content==''||starsBaseNum==0?'disabled':''" @click="AddEvaluation ">发布</div>
-  </div>
-</template>
-
-<script>
-import { imgCut } from 'vue-imgcut'
-export default {
-  data () {
-    return {
-      baseId: '',
-      signId: '',
-      baseInfo: '',
-      starsBaseNum: 0,
-      userInfo: '',
-      studentInfo: '',
-      courseInfo: '',
-      content: '',
-      imgsrc: [],
-      fileList: [
-        { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
-        // Uploader 根据文件后缀来判断是否为图片文件
-        // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
-        { url: 'https://cloud-image', isImage: true },
-      ],
-    }
-  },
-  components: {
-    imgCut
-  },
-  mounted () {
-    var userInfo = window.sessionStorage.getItem('userInfo');
-    if (userInfo) {
-      this.userInfo = JSON.parse(userInfo);
-    }
-    let studentInfo = sessionStorage.getItem('StudentDetialInfo')
-    this.studentInfo = JSON.parse(studentInfo)
-    this.baseId = this.$route.query.baseId
-    this.signId = this.$route.query.signId
-    this.GetStudyBaseDetail()
-  },
-  methods: {
-    AddEvaluation () {
-      if (this.content == '') {
-        this.$toast('请输入评价内容')
-        return;
-      }
-      if (this.starsBaseNum == 0) {
-        this.$toast('请完成基地评分')
-        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.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)
-        }
-      });
-    },
-    // 获取基地信息
-    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)
-        }
-      });
-    },
-    callback (img) {
-      this.imgsrc.push({
-        imgUrl: img
-      });
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.releaseEvaluate {
-  padding: 20px;
-  box-sizing: border-box;
-  background: #f6f7fa;
-  box-sizing: border-box;
-  min-height: 100vh;
-  .box {
-    width: 702px;
-    background: #fff;
-    border-radius: 16px;
-    margin: 0 auto;
-    padding: 16px;
-    box-sizing: border-box;
-    margin-bottom: 16px;
-  }
-  .top {
-    display: flex;
-
-    .pic {
-      width: 124px;
-      height: 124px;
-      flex-shrink: 0;
-    }
-    .basefont {
-      padding: 0 20px;
-      box-sizing: border-box;
-      .titlefont {
-        color: #333333;
-        font-size: 28px;
-        margin-bottom: 18px;
-      }
-      .tcfont {
-        color: #535353;
-        font-size: 24px;
-      }
-    }
-    .priceRight {
-      width: 110px;
-      font-size: 28px;
-      color: #f64c37;
-      line-height: 200px;
-    }
-  }
-  .btns {
-    width: 702px;
-    height: 92px;
-    line-height: 92px;
-    border-radius: 16px;
-    margin: 0 auto;
-    margin-top: 20px;
-    background: #4092ff;
-    color: #fff;
-    font-size: 30px;
-    text-align: center;
-    box-shadow: 0 0 30px #7ab1f8;
-    &.disabled {
-      opacity: 0.4;
-    }
-  }
-  .cont {
-    .van-cell {
-      background: #f5f6fa;
-    }
-    input {
-      border: none;
-      width: 100%;
-      height: 38px;
-      line-height: 38px;
-      font-size: 1.4rem;
-    }
-    p {
-      font-size: 1.2rem;
-      text-align: right;
-      color: #909090;
-      span {
-        color: #09ce6c;
-      }
-    }
-  }
-  .imgs {
-    background: #f5f6fa;
-    padding: 20px;
-    // img:first-child::after{
-    // 	content: '封面图片';
-    // 	position:absolute;
-    // 	bottom: 0;
-    // 	left: 0;
-    // 	right: 0;
-    // 	background-color: rgba(0,0,0,.5);
-    // 	color: white;
-    // 	font-size: 1.2rem;
-    // 	padding: 3px;
-    // 	z-index: 1000;
-    // }
-    img {
-      position: relative;
-      display: inline-block;
-      vertical-align: top;
-      width: 142px;
-      height: 142px;
-      border-radius: 5px;
-      margin-right: 10px;
-      margin-top: 10px;
-    }
-    .selectImg {
-      display: inline-block;
-      vertical-align: top;
-      width: 142px;
-      height: 142px;
-      text-align: center;
-      line-height: 50px;
-      border-radius: 5px;
-      border: 1px solid rgb(8, 23, 88);
-      font-size: 2rem;
-      color: #eee;
-      margin-top: 10px;
-    }
-  }
-  .boxdf {
-    padding: 10px 0;
-    font-size: 5vw;
-    display: flex;
-    .title {
-      font-size: 28px;
-      margin-right: 10px;
-    }
-    .rate {
-      color: #ffcc00;
-      font-size: 30px;
-      margin-left: 10px;
-    }
-  }
-}
-</style>
diff --git a/src/views/PublicService/evaluateCourse.vue b/src/views/PublicService/evaluateCourse.vue
deleted file mode 100644
index 0fd9efb..0000000
--- a/src/views/PublicService/evaluateCourse.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<template>
-  <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%">
-      </div>
-      <div class="basefont">
-        <div class="titlefont">{{courseInfo.baseName}}</div>
-        <div class="tcfont">套餐名称：{{courseInfo.courseName}}</div>
-        <div class="tcfont">数量*{{courseInfo.orderCount}}</div>
-      </div>
-    </div>
-    <div class="box">
-      <div class="boxdf">
-        <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>
-        </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>
-        </div>
-      </div>
-      <div class="cont">
-        <div class="item">
-          <van-field v-model="content" type="textarea" label="" placeholder="关于活动、课程、研学的感想或评论" />
-        </div>
-      </div>
-      <div class="imgs">
-        <img :src="n.imgUrl" alt="" v-for="(n,i) in imgsrc" :key="i">
-        <div class="selectImg">
-          <imgCut @callback="callback" :width="750" :height="750">
-            <van-icon name="cross" />
-          </imgCut>
-        </div>
-        <!-- <van-uploader v-model="fileList" multiple /> -->
-      </div>
-    </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 () {
-    return {
-      starsBaseNum: 0,
-      starsCourseNum: 0,
-      userInfo: '',
-      courseInfo: '',
-      content: '',
-      imgsrc: [],
-      fileList: [
-        { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
-        // Uploader 根据文件后缀来判断是否为图片文件
-        // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
-        { url: 'https://cloud-image', isImage: true },
-      ],
-    }
-  },
-  components: {
-    imgCut
-  },
-  mounted () {
-    var userInfo = window.sessionStorage.getItem('userInfo');
-    if (userInfo) {
-      this.userInfo = JSON.parse(userInfo);
-    }
-    var courseInfo = window.sessionStorage.getItem('courseInfo');
-    if (courseInfo) {
-      this.courseInfo = JSON.parse(courseInfo);
-    }
-  },
-  methods: {
-    AddEvaluation () {
-      if (this.content == '') {
-        this.$toast('请输入评价内容')
-        return;
-      }
-      if (this.starsCourseNum == 0) {
-        this.$toast('请完成课程评分')
-        return;
-      }
-      if (this.starsBaseNum == 0) {
-        this.$toast('请完成基地评分')
-        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();
-          if (res.data.status == 1) {
-            this.$toast.success('发布成功');
-            setTimeout(() => {
-              // this.$router.push({ name: 'ServiceOrderXST' })
-              this.$router.back()
-            }, 1000)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    callback (img) {
-      this.imgsrc.push({
-        imgUrl: img
-      });
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.releaseEvaluate {
-  padding: 20px;
-  box-sizing: border-box;
-  background: #f6f7fa;
-  box-sizing: border-box;
-  min-height: 100vh;
-  .box {
-    width: 702px;
-    background: #fff;
-    border-radius: 16px;
-    margin: 0 auto;
-    padding: 16px;
-    box-sizing: border-box;
-    margin-bottom: 16px;
-  }
-  .top {
-    display: flex;
-
-    .pic {
-      width: 124px;
-      height: 124px;
-      flex-shrink: 0;
-    }
-    .basefont {
-      padding: 0 20px;
-      box-sizing: border-box;
-      .titlefont {
-        color: #333333;
-        font-size: 28px;
-        margin-bottom: 18px;
-      }
-      .tcfont {
-        color: #535353;
-        font-size: 24px;
-      }
-    }
-    .priceRight {
-      width: 110px;
-      font-size: 28px;
-      color: #f64c37;
-      line-height: 200px;
-    }
-  }
-  .btns {
-    width: 702px;
-    height: 92px;
-    line-height: 92px;
-    border-radius: 16px;
-    margin: 0 auto;
-    margin-top: 20px;
-    background: #4092ff;
-    color: #fff;
-    font-size: 30px;
-    text-align: center;
-    box-shadow: 0 0 30px #7ab1f8;
-    &.disabled {
-      opacity: 0.4;
-    }
-  }
-  .cont {
-    .van-cell {
-      background: #f5f6fa;
-    }
-    input {
-      border: none;
-      width: 100%;
-      height: 38px;
-      line-height: 38px;
-      font-size: 1.4rem;
-    }
-    p {
-      font-size: 1.2rem;
-      text-align: right;
-      color: #909090;
-      span {
-        color: #09ce6c;
-      }
-    }
-  }
-  .imgs {
-    background: #f5f6fa;
-    padding: 20px;
-    // img:first-child::after{
-    // 	content: '封面图片';
-    // 	position:absolute;
-    // 	bottom: 0;
-    // 	left: 0;
-    // 	right: 0;
-    // 	background-color: rgba(0,0,0,.5);
-    // 	color: white;
-    // 	font-size: 1.2rem;
-    // 	padding: 3px;
-    // 	z-index: 1000;
-    // }
-    img {
-      position: relative;
-      display: inline-block;
-      vertical-align: top;
-      width: 142px;
-      height: 142px;
-      border-radius: 5px;
-      margin-right: 10px;
-      margin-top: 10px;
-    }
-    .selectImg {
-      display: inline-block;
-      vertical-align: top;
-      width: 142px;
-      height: 142px;
-      text-align: center;
-      line-height: 50px;
-      border-radius: 5px;
-      border: 1px solid rgb(8, 23, 88);
-      font-size: 2rem;
-      color: #eee;
-      margin-top: 10px;
-    }
-  }
-  .boxdf {
-    padding: 10px 0;
-    font-size: 5vw;
-    display: flex;
-    .title {
-      font-size: 28px;
-      margin-right: 10px;
-    }
-    .rate {
-      color: #ffcc00;
-      font-size: 30px;
-      margin-left: 10px;
-    }
-  }
-}
-</style>
diff --git a/src/views/PublicService/evaluateDetail.vue b/src/views/PublicService/evaluateDetail.vue
deleted file mode 100644
index 0fd50fe..0000000
--- a/src/views/PublicService/evaluateDetail.vue
+++ /dev/null
@@ -1,303 +0,0 @@
-<template>
-  <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%">
-      </div>
-      <div class="basefont">
-        <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%">
-      </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>
-    </div>
-    <div class="box">
-      <div class="boxdf" v-if="!baseId">
-        <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>
-        </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>
-        </div>
-      </div>
-      <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)">
-      </div>
-      <p class="evaluation_time">评价于 {{evaluationData.intime}}</p>
-    </div>
-  </div>
-</template>
-
-<script>
-import { imgCut } from 'vue-imgcut'
-export default {
-  data () {
-    return {
-      baseId: '',//有基地id时为基地评价
-      baseInfo: '',
-      evaluationId: '',
-      evaluationData: '',
-      starsBaseNum: 0,
-      starsCourseNum: 0,
-      userInfo: '',
-      courseInfo: '',
-      content: '',
-      imgsrc: [],
-      fileList: [
-        { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
-        // Uploader 根据文件后缀来判断是否为图片文件
-        // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
-        { url: 'https://cloud-image', isImage: true },
-      ],
-    }
-  },
-  components: {
-    imgCut
-  },
-  mounted () {
-    this.evaluationId = this.$route.query.evaluationId
-    let baseId = this.$route.query.baseId
-    // 当前为基地评价
-    if (baseId) {
-      this.baseId = baseId
-      this.GetStudyBaseDetail()
-    }
-    this.getEvaluationDetail()
-
-    var courseInfo = window.sessionStorage.getItem('courseInfo');
-    if (courseInfo) {
-      this.courseInfo = JSON.parse(courseInfo);
-    }
-  },
-  methods: {
-    getEvaluationDetail () {
-      this.$toast.loading({
-        message: '加载中...',
-        duration: 0,
-        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)
-        if (res.data.status == 1) {
-          let evaluationData = res.data.data
-          evaluationData.intime = this.Moment(new Date(evaluationData.intime)).format('YYYY-MM-DD')
-          this.evaluationData = evaluationData
-        } else {
-          this.$toast.fail(res.data.message)
-        }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    // 获取基地信息
-    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)
-        }
-      });
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.releaseEvaluate {
-  padding: 20px;
-  box-sizing: border-box;
-  background: #f6f7fa;
-  box-sizing: border-box;
-  min-height: 100vh;
-  .box {
-    width: 702px;
-    background: #fff;
-    border-radius: 16px;
-    margin: 0 auto;
-    padding: 16px;
-    box-sizing: border-box;
-    margin-bottom: 16px;
-  }
-  .top {
-    display: flex;
-
-    .pic {
-      width: 124px;
-      height: 124px;
-      flex-shrink: 0;
-    }
-    .basefont {
-      padding: 0 20px;
-      box-sizing: border-box;
-      .titlefont {
-        color: #333333;
-        font-size: 28px;
-        margin-bottom: 18px;
-      }
-      .tcfont {
-        color: #535353;
-        font-size: 24px;
-      }
-    }
-    .priceRight {
-      width: 110px;
-      font-size: 28px;
-      color: #f64c37;
-      line-height: 200px;
-    }
-  }
-  .cont {
-    .van-cell {
-      background: #f5f6fa;
-    }
-    input {
-      border: none;
-      width: 100%;
-      height: 38px;
-      line-height: 38px;
-      font-size: 1.4rem;
-    }
-    p {
-      font-size: 1.2rem;
-      text-align: right;
-      color: #909090;
-      span {
-        color: #09ce6c;
-      }
-    }
-  }
-  .imgs {
-    background: #f5f6fa;
-    padding: 20px;
-    // img:first-child::after{
-    // 	content: '封面图片';
-    // 	position:absolute;
-    // 	bottom: 0;
-    // 	left: 0;
-    // 	right: 0;
-    // 	background-color: rgba(0,0,0,.5);
-    // 	color: white;
-    // 	font-size: 1.2rem;
-    // 	padding: 3px;
-    // 	z-index: 1000;
-    // }
-    img {
-      position: relative;
-      display: inline-block;
-      vertical-align: top;
-      width: 142px;
-      height: 142px;
-      border-radius: 5px;
-      margin-right: 10px;
-      margin-top: 10px;
-    }
-    .selectImg {
-      display: inline-block;
-      vertical-align: top;
-      width: 142px;
-      height: 142px;
-      text-align: center;
-      line-height: 50px;
-      border-radius: 5px;
-      border: 1px solid rgb(8, 23, 88);
-      font-size: 2rem;
-      color: #eee;
-      margin-top: 10px;
-    }
-  }
-  .boxdf {
-    padding: 10px 0;
-    font-size: 5vw;
-    display: flex;
-    .title {
-      font-size: 28px;
-      margin-right: 10px;
-    }
-    .rate {
-      color: #ffcc00;
-      font-size: 30px;
-      margin-left: 10px;
-    }
-  }
-  .evaluation {
-    font-size: 30px;
-    span {
-      font-weight: bold;
-    }
-  }
-  .evaluation_img_box {
-    margin-top: 22px;
-    .evaluation_img {
-      width: 212px;
-      height: 212px;
-      margin-right: 9px;
-      margin-bottom: 9px;
-      &:nth-of-type(3n) {
-        margin-right: 0;
-      }
-    }
-  }
-  .evaluation_time {
-    margin-top: 18px;
-    text-align: right;
-    color: #999999;
-    font-size: 28px;
-  }
-}
-</style>
diff --git a/src/views/PublicService/evaluatePubilc.vue b/src/views/PublicService/evaluatePubilc.vue
deleted file mode 100644
index 724b998..0000000
--- a/src/views/PublicService/evaluatePubilc.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<template>
-  <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%">
-      </div>
-      <div class="basefont">
-        <div class="titlefont">{{courseInfo.baseName}}</div>
-        <div class="tcfont">套餐名称：{{courseInfo.courseName}}</div>
-        <div class="tcfont">数量*{{courseInfo.orderCount}}</div>
-      </div>
-    </div>
-    <div class="box">
-      <div class="boxdf">
-        <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>
-        </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>
-        </div>
-      </div>
-      <div class="cont">
-        <div class="item">
-          <van-field v-model="content" type="textarea" label="" placeholder="关于活动、课程、研学的感想或评论" />
-        </div>
-      </div>
-      <div class="imgs">
-        <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" />
-          </imgCut>
-        </div>
-        <!-- <van-uploader v-model="fileList" multiple /> -->
-      </div>
-    </div>
-    <div class="btns" :class="content==''||starsCourseNum==0||starsBaseNum==0?'disabled':''" @click="AddEvaluation ">发布</div>
-  </div>
-</template>
-
-<script>
-import yxAxios from '@/https/yxAxios'
-import { imgCut } from 'vue-imgcut'
-export default {
-  data () {
-    return {
-      starsBaseNum: 0,
-      starsCourseNum: 0,
-      userInfo: '',
-      courseInfo: '',
-      content: '',
-      imgsrc: [],
-      fileList: [
-        { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
-        // Uploader 根据文件后缀来判断是否为图片文件
-        // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
-        { url: 'https://cloud-image', isImage: true },
-      ],
-    }
-  },
-  components: {
-    imgCut
-  },
-  created () {
-    var userInfo = window.sessionStorage.getItem('userInfo');
-    if (userInfo) {
-      this.userInfo = JSON.parse(userInfo);
-    }
-    var courseInfo = window.sessionStorage.getItem('courseInfo');
-    if (courseInfo) {
-      this.courseInfo = JSON.parse(courseInfo);
-    }
-  },
-  methods: {
-    AddEvaluation () {
-      if (this.content == '') {
-        this.$toast('请输入评价内容')
-        return;
-      }
-      if (this.starsCourseNum == 0) {
-        this.$toast('请完成课程评分')
-        return;
-      }
-      if (this.starsBaseNum == 0) {
-        this.$toast('请完成基地评分')
-        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();
-          if (res.data.status == 1) {
-            this.$toast.success('发布成功');
-            setTimeout(() => {
-              this.$router.push({ name: 'ServiceOrderXST' })
-            }, 1000)
-          }
-        },
-        onFail: err => {
-          console.log('err', err)
-        }
-      });
-    },
-    callback (img) {
-      this.imgsrc.push({
-        imgUrl: img
-      });
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.releaseEvaluate {
-  padding: 20px;
-  box-sizing: border-box;
-  background: #f6f7fa;
-  box-sizing: border-box;
-  min-height: 100vh;
-  .box {
-    width: 702px;
-    background: #fff;
-    border-radius: 16px;
-    margin: 0 auto;
-    padding: 16px;
-    box-sizing: border-box;
-    margin-bottom: 16px;
-  }
-  .top {
-    display: flex;
-
-    .pic {
-      width: 124px;
-      height: 124px;
-      flex-shrink: 0;
-    }
-    .basefont {
-      padding: 0 20px;
-      box-sizing: border-box;
-      .titlefont {
-        color: #333333;
-        font-size: 28px;
-        margin-bottom: 18px;
-      }
-      .tcfont {
-        color: #535353;
-        font-size: 24px;
-      }
-    }
-    .priceRight {
-      width: 110px;
-      font-size: 28px;
-      color: #f64c37;
-      line-height: 200px;
-    }
-  }
-  .btns {
-    width: 702px;
-    height: 92px;
-    line-height: 92px;
-    border-radius: 16px;
-    margin: 0 auto;
-    margin-top: 20px;
-    background: #4092ff;
-    color: #fff;
-    font-size: 30px;
-    text-align: center;
-    box-shadow: 0 0 30px #7ab1f8;
-    &.disabled {
-      opacity: 0.4;
-    }
-  }
-  .cont {
-    .van-cell {
-      background: #f5f6fa;
-    }
-    input {
-      border: none;
-      width: 100%;
-      height: 38px;
-      line-height: 38px;
-      font-size: 1.4rem;
-    }
-    p {
-      font-size: 1.2rem;
-      text-align: right;
-      color: #909090;
-      span {
-        color: #09ce6c;
-      }
-    }
-  }
-  .imgs {
-    background: #f5f6fa;
-    padding: 20px;
-    // img:first-child::after{
-    // 	content: '封面图片';
-    // 	position:absolute;
-    // 	bottom: 0;
-    // 	left: 0;
-    // 	right: 0;
-    // 	background-color: rgba(0,0,0,.5);
-    // 	color: white;
-    // 	font-size: 1.2rem;
-    // 	padding: 3px;
-    // 	z-index: 1000;
-    // }
-    img {
-      position: relative;
-      display: inline-block;
-      vertical-align: top;
-      width: 142px;
-      height: 142px;
-      border-radius: 5px;
-      margin-right: 10px;
-      margin-top: 10px;
-    }
-    .selectImg {
-      display: inline-block;
-      vertical-align: top;
-      width: 142px;
-      height: 142px;
-      text-align: center;
-      line-height: 50px;
-      border-radius: 5px;
-      border: 1px solid rgb(8, 23, 88);
-      font-size: 2rem;
-      color: #eee;
-      margin-top: 10px;
-    }
-  }
-  .boxdf {
-    padding: 10px 0;
-    font-size: 5vw;
-    display: flex;
-    .title {
-      font-size: 28px;
-      margin-right: 10px;
-    }
-    .rate {
-      color: #ffcc00;
-      font-size: 30px;
-      margin-left: 10px;
-    }
-  }
-}
-</style>
diff --git a/src/views/PublicService/privateXST.vue b/src/views/PublicService/privateXST.vue
deleted file mode 100644
index d8949d2..0000000
--- a/src/views/PublicService/privateXST.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
-  <div>
-    <div id="prefect_box">
-      <img class="bg" src="@/assets/msg.png" alt="">
-      <div class="content">
-        <div class="item">
-          <input type="text" placeholder="请输入您的姓名" v-model="studentName">
-        </div>
-        <div class="item" @click="showUserTypeSelect=true" style="width:48%;display:inline-flex;margin-right:4%;">
-          <p :class="!userType?'nodata':''">{{userType?userType:'当前阶段'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item" @click="handleYear" style="width:48%;display:inline-flex;">
-          <p :class="!year||yearDisable?'nodata':''">{{year?year:'入学年份'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item" @click="showAreaSelect=true">
-          <p :class="!area?'nodata':''">{{area?area:'请选择地区'}}</p>
-          <img src="@/assets/more.png" alt="">
-        </div>
-        <div class="item">
-          <form action="/" style="width:100%;">
-            <van-search v-model="searchSchool" placeholder="请输入学校关键字" @search="handleSchool" />
-          </form>
-        </div>
-        <p class="school_select" v-if="school">已选择学校：{{school}}</p>
-        <button class="submit" @click="submit">完成</button>
-      </div>
-    </div>
-    <van-popup v-model="showUserTypeSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="当前阶段" show-toolbar :columns="userTypeArr" value-key="label" @cancel="showUserTypeSelect = false" @confirm="selectUserTypeOver" />
-    </van-popup>
-    <van-popup v-model="showYearSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="入学年份" show-toolbar :columns="yearArr" value-key="label" @cancel="showYearSelect = false" @confirm="selectYearOver" />
-    </van-popup>
-    <van-popup v-model="showAreaSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-area title="地区" :area-list="areaList" @cancel="showAreaSelect = false" @confirm="selectAreaOver" />
-    </van-popup>
-    <van-popup v-model="showSchoolSelect" round position="bottom" get-container="body" :safe-area-inset-bottom="true">
-      <van-picker title="学校" show-toolbar :columns="schoolList" :loading="schoolListLoading" @cancel="showSchoolSelect = false" @confirm="selectSchoolOver" />
-    </van-popup>
-  </div>
-</template>
-
-<script>
-export default {
-//   props: [
-//     "phone",
-//     "id",
-//     "publicName"
-//   ],
-  data () {
-    return {
-      studentName: '',
-
-      year: '',//入学年份
-      yearDisable: false,
-      showYearSelect: false,
-      yearArr: [],
-
-      userType: '',
-      userTypeVal: '',//所处阶段1-小学 2-初中 3-高中
-      showUserTypeSelect: false,
-      userTypeArr: [{
-        label: '小学',
-        value: 1
-      }, {
-        label: '初中',
-        value: 2
-      }, {
-        label: '高中',
-        value: 3
-      }],
-
-      area: '',
-      areaCode: '',
-      showAreaSelect: false,
-      areaList: [],
-
-      searchSchool: '',
-      school: '',
-      schoolId: '',
-      showSchoolSelect: false,
-      schoolListLoading: false,
-      schoolList: [],
-
-      appId: '',
-      userInfo: {}
-    }
-  },
-
-  mounted () {
-    let userInfo = sessionStorage.getItem('userInfo')
-    this.userInfo = userInfo ? JSON.parse(userInfo) : userInfo;
-    this.studentName = this.userInfo?.studentName;
-    if (sessionStorage.getItem('publicName') == 'SXYX') {
-      this.appId = 'wx1305e88d2bc74073'
-    } else if (sessionStorage.getItem('publicName')== 'XST') {
-      this.appId = 'wx1c630c8773c482f1'
-    }
-    this.initYearArr()
-    this.GetSysAreaList()
-  },
-  methods: {
-    // 初始化入学年份选项
-    initYearArr () {
-      // 页面创建时执行
-      let year = new Date().getFullYear(),
-        Month = new Date().getMonth() + 1,
-        yearArr = [];
-      if (Month > 8) {
-        // 如果月份大于8,那么当年的学年的高考年份要+1,如果月份小于7,那么当前的年份就是今年高考的年份
-        year = year
-      }
-      for (let index = year; index > year - 6; index--) {
-        yearArr.push({ value: index, label: index })
-      }
-      this.yearArr = yearArr
-    },
-    selectYearOver (value) {
-      this.year = value.label;
-      this.showYearSelect = false;
-    },
-    handleYear () {
-      if (!this.yearDisable) {
-        this.showYearSelect = true;
-      }
-    },
-    selectUserTypeOver (value) {
-      this.userType = value.label;
-      this.userTypeVal = value.value;
-      this.showUserTypeSelect = false;
-    },
-    // 获取地区列表
-    GetSysAreaList () {
-      this.http.GetSysAreaList({
-        areaCode: 33
-      }).then((res) => {
-        if (res.success) {
-          let data = res.data;
-          let obj = {
-            province_list: {
-              330000: '浙江省'
-            },
-            city_list: {},
-            county_list: {}
-          };
-          if (data) {
-            data.forEach((n, i) => {
-              obj.city_list[n.area_code + '00'] = n.area_name;
-              if (n.areaList.length > 0) {
-                n.areaList.forEach((k, j) => {
-                  obj.county_list[k.area_code] = k.area_name;
-                })
-              }
-            });
-            this.areaList = obj;
-          }
-        } else {
-          this.$toast.fail(res.message)
-        }
-      })
-    },
-    selectAreaOver (value) {
-      let data = value;
-      var city = data[1].code;
-      city = city.substring(0, city.length - 2);
-      // console.log(city)
-      this.area = data[0].name + ',' + data[1].name + ',' + data[2].name;
-      this.areaCode = [data[0].code, city, data[2].code];
-      this.quCode = data[2].code;
-      this.school = '',
-        this.schoolId = '',
-        this.showAreaSelect = false
-    },
-    // 点击选择学校
-    handleSchool () {
-      if (!this.searchSchool) {
-        this.$toast('请输入学校关键字');
-        return;
-      }
-      this.showSchoolSelect = true;
-      this.GetHighSchoolList();
-    },
-    // 通过地区获取学校
-    GetHighSchoolList () {
-      this.schoolListLoading = true;
-      this.yxAxios.get(`${this.yanxueUrl}/api/SchoolManage/GetAllSchoolList?schoolName=${this.searchSchool}`).then((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;
-            this.schoolListLoading = false
-          }
-        } else {
-          this.schoolListLoading = false
-          this.$toast.fail(res.data.message)
-        }
-      })
-    },
-    selectSchoolOver (value) {
-      console.log(value)
-      this.school = value.text;
-      this.schoolId = value.id;
-      this.showSchoolSelect = false;
-    },
-
-    submit () {
-      if (!this.studentName) {
-        this.$toast('请输入姓名');
-      }
-      else if (!this.userType) {
-        this.$toast('请选择阶段');
-      }
-      else if (!this.year) {
-        this.$toast('请选择入学年份');
-      }
-      else if (!this.area) {
-        this.$toast('请选择地区');
-      }
-      else if (!this.school) {
-        this.$toast('请选择学校');
-      } else {
-        let postData = {
-          id: this.userInfo.id,
-          userName: this.studentName,
-          mobile: this.userInfo.phone,
-          province: this.area.split(',')[0],//省份
-          city: this.area.split(',')[1],//城市
-          area: this.area.split(',')[2],//地区
-          schoolName: this.school,//学校名称
-          enrollYear: this.year,//入学年份
-          userType: this.userTypeVal,//1-小学 2-初中 3-高中
-        }
-        this.$toast.loading({
-          message: '加载中',
-          duration: 0,
-          forbidClick: true
-        })
-        this.yxAxios.post(`${this.proxyUrl}/prod/api/wx/${this.appId}/updateUserInfo`, postData).then((res) => {
-          this.$toast.clear()
-          if (res.data.code == 200) {
-            this.$toast.success(res.data?.message)
-            this.$emit('complete')
-            this.$emit('hidePrefectBox')
-          } else {
-            this.$toast.fail(res.message)
-          }
-            this.getUserInfoff()
-        })
-      }
-    },
-
-    // 获取用户信息
-    getUserInfoff () {
-      this.$toast.loading({
-        message: '加载中...',
-        duration: 0,
-        forbidClick: true
-      })
-      this.yxAxios.get(`${this.proxyUrl}/prod/api/wx/${this.appId}/getUserInfo?unionId=${sessionStorage.getItem('unionId')}`).then((res) => {
-        this.$toast.clear()
-        if (res.data.code == 200) {
-          sessionStorage.setItem('userInfo', JSON.stringify(res.data.data))
-        } else {
-          this.$toast.fail(res.data.message)
-        }
-        this.$router.push({ name: 'ServiceXST' })
-      })
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-#prefect_box {
-  width: 638px;
-  height: 836px;
-  background: #ffffff;
-  border-radius: 24px;
-  position: relative;
-  margin:auto;
-  .bg {
-    width: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-  .content {
-    width: 100%;
-    box-sizing: border-box;
-    padding: 0 40px;
-    position: absolute;
-    top: 236px;
-    left: 0;
-    .item {
-      width: 558px;
-      height: 72px;
-      border-radius: 36px;
-      background: #f7f7f7;
-      box-sizing: border-box;
-      font-size: 28px;
-      padding: 0 32px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 28px;
-      p {
-        color: #333333;
-        &.nodata {
-          color: #999999;
-        }
-      }
-      img {
-        width: 40px;
-      }
-      input {
-        width: 100%;
-        background: transparent;
-        border: 0;
-        color: #333333;
-        padding: 0;
-        &::-webkit-input-placeholder {
-          color: #999999;
-        }
-      }
-    }
-    .school_select {
-      font-size: 28px;
-      padding: 0 32px;
-      margin-bottom: 28px;
-    }
-    .submit {
-      width: 294px;
-      height: 72px;
-      border: 0;
-      background: linear-gradient(135deg, #99c2ff 0%, #1f59ff 100%);
-      box-shadow: 0px 4px 8px 0px rgba(189, 189, 189, 0.5),
-        0px 8px 12px 0px rgba(87, 137, 255, 0.5);
-      border-radius: 34px;
-      font-size: 34px;
-      color: #ffffff;
-      margin: 0 auto;
-      display: block;
-    }
-  }
-}
-::v-deep .van-search {
-  background: transparent;
-  padding: 0;
-  width: 100%;
-}
-::v-deep .van-search__content {
-  padding: 0;
-}
-</style>
diff --git a/src/views/Service/CardBoxPublic.vue b/src/views/Service/CardBoxPublic.vue
new file mode 100644
index 0000000..ce9c696
--- /dev/null
+++ b/src/views/Service/CardBoxPublic.vue
@@ -0,0 +1,164 @@
+<template>
+  <div id="cardBox">
+    <div class="card_item" v-for="(item,index) in cardList" :key="index" @click="handleCard(index)">
+      <div class="left">
+        <div class="top">
+          <img v-if="item.img" :src="item.img" alt="">
+          <p class="title">仅该商品可用：<span>{{item.title}}</span></p>
+        </div>
+        <p class="end_time">有效期至：{{item.useEndTime}}</p>
+      </div>
+      <div class="right">
+        <p class="discount" :class="item.couponState==1?'':'disable'"><span>¥</span>{{item.couponPrice}}</p>
+        <p class="usenow" v-if="item.couponState==1">立即使用</p>
+        <p class="usenow disable" v-else>{{item.couponState==2?'已使用':'已过期'}}</p>
+      </div>
+    </div>
+    <van-empty v-if="cardList.length==0" description="暂无优惠券" />
+
+  </div>
+</template>
+<script>
+export default {
+  name: 'ServiceCardBoxPublic',
+  data () {
+    return {
+      cardList: [],
+      publicName: '',
+      unionId: ''
+    }
+  },
+  mounted () {
+    let publicName = this.$route.query.publicName || sessionStorage.getItem('publicName');
+    if (publicName) {
+      sessionStorage.setItem('publicName', publicName)
+      this.publicName = publicName
+    }
+    if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
+      let openId = sessionStorage.getItem('openId' + this.publicName);
+      if (!openId) {
+        sessionStorage.setItem('prePage', 'ServiceCardBoxPublic');
+        this.$router.push({ name: 'Authorize' + this.publicName })
+        return;
+      }
+      this.unionId = sessionStorage.getItem('unionId');
+    } else {
+      this.unionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU';
+    }
+
+    this.$nextTick(() => {
+      this.getAllCard()
+    })
+  },
+  methods: {
+    // 获取所有优惠券
+    getAllCard () {
+      this.yxAxios.post(`${this.proxyUrl}/prod/api/coupon/list`, {
+        userId: this.unionId,
+        state: '',//状态 1-正常 2-已使用 3-已过期 不传为全部,
+        pageNum: '1',
+        pageSize: '999'
+      }).then((res) => {
+        if (res.data.rows) {
+          let cardList = res.data.rows
+          for (let i in cardList) {
+            cardList[i].useEndTime = this.Moment(cardList[i].useEndTime.replace(/\-/g, "/")).format("YYYY-MM-DD")
+          }
+          this.cardList = cardList
+        }
+        else {
+          this.$toast.fail(res.data.message);
+        }
+      })
+    },
+    handleCard (index) {
+      if (this.cardList[index].couponState == 1) {
+        this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: 499 } })
+      }
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+#cardBox {
+  width: 100%;
+  min-height: 100%;
+  background: rgb(246, 246, 250);
+  overflow: hidden;
+  .card_item {
+    width: 726px;
+    height: 216px;
+    background: url("../../assets/service/card.png");
+    background-size: 100%;
+    margin: 0 auto;
+    margin-top: 20px;
+    position: relative;
+    p {
+      width: 100%;
+      margin: 0;
+    }
+    .left {
+      display: inline-block;
+      width: 68%;
+      height: 100%;
+      vertical-align: top;
+      box-sizing: border-box;
+      padding: 24px 40px;
+      padding-right: 0;
+      .top {
+      display: flex;
+      img {
+        width: 66px;
+        height: 66px;
+        background: #d8d8d8;
+        border-radius: 6px;
+      }
+      .title {
+        font-size: 24px;
+        font-weight: bold;
+        margin-left: 10px;
+        word-break: break-all;
+        span {
+          color: #7f5316;
+        }
+      }
+    }
+    }
+    .right {
+      width: 32%;
+      height: 100%;
+      display: inline-flex;
+      align-content: center;
+      flex-wrap: wrap;
+      position: relative;
+    }
+    .end_time {
+      font-size: 24px;
+      color: #999;
+      left: 40px;
+      position: absolute;
+      bottom: 30px;
+    }
+    .discount {
+      text-align: center;
+      font-size: 60px;
+      font-weight: bold;
+      span {
+        font-size: 24px;
+      }
+      &.disable {
+        color: #999;
+      }
+    }
+    .usenow {
+      font-size: 32px;
+      text-align: center;
+      font-weight: bold;
+      margin-top: 10px;
+      &.disable {
+        color: #999;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Service/CardBoxXST.vue b/src/views/Service/CardBoxXST.vue
new file mode 100644
index 0000000..c58ddba
--- /dev/null
+++ b/src/views/Service/CardBoxXST.vue
@@ -0,0 +1,417 @@
+<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 = sessionStorage.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 {
+          // 多个商品跳转优惠券详情页
+          sessionStorage.setItem('cardCousreCardId', item.id)
+          sessionStorage.setItem('cardCousreCardPrice', item.couponPrice)
+          sessionStorage.setItem('cardCousreCardTitle', item.title)
+          sessionStorage.setItem('cardCousreProId', item.proId)
+          sessionStorage.setItem('cardCousreProName', item.proName)
+          sessionStorage.setItem('cardCousrePics', item.pics)
+          sessionStorage.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 {
+        // 多个商品跳转优惠券详情页
+        sessionStorage.setItem('cardCousreCardId', item.id)
+        sessionStorage.setItem('cardCousreCardPrice', item.couponPrice)
+        sessionStorage.setItem('cardCousreCardTitle', item.title)
+        sessionStorage.setItem('cardCousreProId', item.proId)
+        sessionStorage.setItem('cardCousreProName', item.proName)
+        sessionStorage.setItem('cardCousrePics', item.pics)
+        sessionStorage.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>
\ No newline at end of file
diff --git a/src/views/Service/CardCourseList.vue b/src/views/Service/CardCourseList.vue
new file mode 100644
index 0000000..9176319
--- /dev/null
+++ b/src/views/Service/CardCourseList.vue
@@ -0,0 +1,199 @@
+<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 {
+      publicName: '',
+      unionId: '',
+      cardTitle: '',
+      couponPrice: '',
+      cardId: '',
+      proId: '',
+      proName: '',
+      pics: '',
+      geted: false,
+      proList: []
+    }
+  },
+  mounted () {
+    let publicName = this.$route.query.publicName || sessionStorage.getItem('publicName');
+    if (publicName) {
+      sessionStorage.setItem('publicName', publicName)
+      this.publicName = publicName
+    }
+    this.cardTitle = sessionStorage.getItem('cardCousreCardTitle');
+    this.couponPrice = sessionStorage.getItem('cardCousreCardPrice');
+    this.cardId = sessionStorage.getItem('cardCousreCardId');
+    this.proId = sessionStorage.getItem('cardCousreProId');
+    this.proName = sessionStorage.getItem('cardCousreProName');
+    this.pics = sessionStorage.getItem('cardCousrePics');
+    this.geted = sessionStorage.getItem('cardCousreGeted') == 'true' ? true : false
+    if (process.env.NODE_ENV === "production") {
+      let openId = sessionStorage.getItem('openId' + this.publicName);
+      if (!openId) {
+        sessionStorage.setItem('prePage', 'CardBoxXST');
+        this.$router.push({ name: 'Authorize' + this.publicName })
+        return;
+      }
+      this.unionId = sessionStorage.getItem('unionId');
+    } else {
+      this.unionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU';
+    }
+    this.getCourseList()
+  },
+  methods: {
+    // 获取优惠券对应的商品列表
+    getCourseList () {
+      this.$toast.loading({
+        message: "加载中...",
+        duration: 0,
+        forbidClick: true,
+      });
+      this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/CourseList/ByIdList`, this.proId.split(',')).then((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
+      })
+    },
+    formatWeek (week) {
+      return week == 1 ? '周一' : week == 2 ? '周二' : week == 3 ? '周三' : week == 4 ? '周四' : week == 5 ? '周五' : week == 6 ? '周六' : week == 0 ? '周日' : '';
+    },
+
+    //领取优惠券
+    reCard () {
+      if (this.geted) return;
+      this.yxAxios.post(`${this.proxyUrl}/prod/api/coupon/get`, {
+        unionId: this.unionId,
+        "proId": this.proId,
+        "proName": this.proName,
+        "pic": this.pics,
+        couponId: this.cardId,
+      })
+        .then((res) => {
+          // console.log(res.data)
+          if (res.data.code == 200) {
+            sessionStorage.setItem('cardCousreGeted', true)
+            this.geted = true;
+            this.$toast('领取成功！')
+          } else {
+            this.$toast.fail(res.data.message);
+          }
+        })
+
+    },
+    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/LoginPublic.vue b/src/views/Service/LoginPublic.vue
new file mode 100644
index 0000000..eec1456
--- /dev/null
+++ b/src/views/Service/LoginPublic.vue
@@ -0,0 +1,234 @@
+<template>
+  <div id="login">
+    <img class="bg" src="@/assets/login_bg.png" alt="">
+    <div class="box">
+      <p class="login_title">绑定手机号</p>
+      <div class="item">
+        <p class="title">手机号</p>
+        <div class="flex">
+          <input class="code phone" type="tel" maxlength="11" v-model="phone" placeholder="请输入您的手机号">
+          <span class="getcode" @click="getCode">{{codeText}}</span>
+        </div>
+      </div>
+      <div class="item">
+        <p class="title">验证码</p>
+        <input class="code" type="text" v-model="code" placeholder="请输入验证码">
+      </div>
+      <button class="submit" @click="submitOperator">立即绑定</button>
+    </div>
+  </div>
+</template>
+<script>
+var codeInterval;
+export default {
+  name: 'LoginPublic',
+  data () {
+    return {
+      code: '',
+      phone: '',
+
+      codeText: '获取验证码',//获取验证码按钮文字
+      appId: '',
+      unionId: '',
+      openId: '',
+      prefectId: '',
+      publicName: '',//SXYX绍兴研学 XST学事通
+    }
+  },
+  mounted () {
+    let publicName = this.$route.query.publicName || sessionStorage.getItem('publicName');
+    if (publicName == 'SXYX') {
+      this.appId = 'wx1305e88d2bc74073'
+    } else if (publicName == 'XST') {
+      this.appId = 'wx1c630c8773c482f1'
+    } else if (publicName == 'KQ') {
+      this.appId = 'wx1305e88d2bc74073'
+    }
+    this.openId = sessionStorage.getItem('openId' + publicName);
+    this.unionId = sessionStorage.getItem('unionId');
+    if (process.env.NODE_ENV === "production"&&this.common.isWeiXin()) {
+      if (!this.openId) {
+        this.$router.push({ name: 'Authorize' + publicName })
+      }
+    }
+
+  },
+  methods: {
+    getCode () {
+      if (this.codeText != '获取验证码') return;
+      if (!this.phone) {
+        this.$toast('请输入手机号')
+        return;
+      }
+      if (!this.checkPhone(this.phone)) {
+        this.$toast('请输入正确的手机号')
+        return;
+      }
+      this.$toast.loading({
+        message: '加载中',
+        duration: 0,
+        forbidClick: true
+      })
+      this.yxAxios.post(`${this.proxyUrl}/prod/api/wx/${this.appId}/getMsg?phone=${this.phone}`).then((res) => {
+        this.$toast.clear()
+        if (res.data.code == 200) {
+          let i = 60;
+          codeInterval = setInterval(() => {
+            if (i == 0) {
+              this.codeText = `获取验证码`;
+              clearInterval(codeInterval);
+              return;
+            }
+            this.codeText = `重试（${i}）`;
+            i--
+          }, 1000)
+        } else {
+          this.$toast.fail(res.data.message)
+        }
+      })
+    },
+    submitOperator () {
+      if (!this.phone) {
+        this.$toast('请输入手机号')
+        return;
+      }
+      if (!this.checkPhone(this.phone)) {
+        this.$toast('请输入正确的手机号')
+        return;
+      }
+      if (!this.code) {
+        this.$toast('请输入验证码')
+        return;
+      }
+      this.$toast.loading({
+        message: '加载中',
+        duration: 0,
+        forbidClick: true
+      })
+      this.yxAxios.post(`${this.proxyUrl}/prod/api/wx/${this.appId}/checkPhoneAndCode`, {
+        phone: this.phone,
+        code: this.code,
+        unionId: this.unionId,
+        openId: this.openId
+      }).then((res) => {
+        this.$toast.clear()
+        if (res.data.code == 200) {
+          this.getUserInfo()
+        } else {
+          this.$toast.fail(res.data.message)
+        }
+      })
+    },
+    checkPhone (phone) {
+      if ((/^1[3456789]\d{9}$/.test(phone))) {
+        return true
+      } else {
+        return false
+      }
+    },
+    complete () {
+      this.getUserInfo()
+    },
+    // 获取用户信息
+    getUserInfo () {
+      this.$toast.loading({
+        message: '加载中...',
+        duration: 0,
+        forbidClick: true
+      })
+      this.yxAxios.get(`${this.proxyUrl}/prod/api/wx/${this.appId}/getUserInfo?unionId=${this.unionId}`).then((res) => {
+        this.$toast.clear()
+        if (res.data.code == 200) {
+          sessionStorage.setItem('userInfo', JSON.stringify(res.data.data))
+          let prePage = sessionStorage.getItem('prePage');
+          let prePageQuery = sessionStorage.getItem('prePageQuery');
+          if (prePage) {
+            this.$router.push({ name: prePage, query: JSON.parse(prePageQuery) })
+          }
+        } else {
+          this.$toast.fail(res.data.message)
+        }
+      })
+    },
+  },
+  destroyed () {
+    clearInterval(codeInterval);
+  }
+}
+</script>
+<style lang="scss" scoped>
+#login {
+  .bg {
+    width: 100%;
+  }
+  .login_title {
+    font-size: 36px;
+    font-weight: bold;
+    text-align: center;
+    color: #000;
+    padding-bottom: 40px;
+  }
+  .box {
+    width: 702px;
+    height: 540px;
+    background: linear-gradient(
+      180deg,
+      rgba(251, 251, 251, 0.99) 0%,
+      #ffffff 100%
+    );
+    box-shadow: 0px 4px 12px 0px rgba(87, 214, 255, 0.2);
+    border-radius: 20px;
+    position: absolute;
+    top: 240px;
+    left: 24px;
+    box-sizing: border-box;
+    padding: 40px;
+    .item {
+      border-bottom: 1px solid #e2e2e2;
+      margin-bottom: 30px;
+    }
+    .title {
+      font-size: 34px;
+      font-weight: bold;
+      margin-bottom: 28px;
+    }
+    .flex {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-bottom: 22px;
+    }
+    .code {
+      border: 0;
+      background: transparent;
+      font-size: 28px;
+      margin-bottom: 32px;
+      width: 100%;
+    }
+    .phone {
+      width: 50%;
+      margin: 0;
+    }
+    .getcode {
+      color: #5789ff;
+      font-size: 28px;
+      padding: 10px;
+    }
+    .submit {
+      width: 622px;
+      height: 88px;
+      background: linear-gradient(137deg, #83b2ff 0%, #3c80ef 100%);
+      box-shadow: 0px 4px 8px 0px rgba(87, 169, 255, 0.5);
+      border-radius: 44px;
+      border: 0;
+      font-size: 34px;
+      color: #ffffff;
+      margin: 0 auto;
+      display: block;
+    }
+  }
+}
+.prefect_pop {
+  background: transparent;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Service/SelectContact.vue b/src/views/Service/SelectContact.vue
index f75037c..f975b2c 100644
--- a/src/views/Service/SelectContact.vue
+++ b/src/views/Service/SelectContact.vue
@@ -24,7 +24,7 @@
   </div>
 </template>
 <script>
-import AddChildPopupGroup from '@/views/PublicHome/component/AddChildPopupGroup'
+import AddChildPopupGroup from '@/views/Home/component/AddChildPopupGroup'
 import { Dialog } from 'vant';
 export default {
   data () {
diff --git a/src/views/Service/ServiceBaseKQ.vue b/src/views/Service/ServiceBaseKQ.vue
new file mode 100644
index 0000000..eb6efb4
--- /dev/null
+++ b/src/views/Service/ServiceBaseKQ.vue
@@ -0,0 +1,571 @@
+<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">
+        <ServiceListFour :list="campList" :notab="false"></ServiceListFour>
+      </div>
+    </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_main1.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">
+            <van-search class="search" v-model="search" shape="round" background="transparent" placeholder="搜索活动、研学旅行、服务" @search="onSearch" />
+          </div>
+          <div class="redLink">轻纺城小学红色网上游主题教育馆</div>
+        </van-sticky>
+        <div class="tabsCard">
+          <van-tabs v-model="active" sticky offset-top="24vw" z-index='100' :ellipsis="false" :before-change="beforeChange">
+            <van-tab title="革命遗址">
+              <ServiceListThird :list="uniList" :notab="true"></ServiceListThird>
+            </van-tab>
+            <van-tab title="文化传承">
+              <ServiceListThird :list="weekList" :notab="true"></ServiceListThird>
+            </van-tab>
+            <van-tab title="红色军旅">
+              <ServiceListThird :list="cityList" :notab="true"></ServiceListThird>
+            </van-tab>
+            <van-tab title="乡村振新">
+              <ServiceListThird :list="selectList" :notab="true"></ServiceListThird>
+            </van-tab>
+            <van-tab title="大好河山">
+              <ServiceListThird :list="riverList" :notab="true"></ServiceListThird>
+            </van-tab>
+          </van-tabs>
+        </div>
+
+      </div>
+    </div>
+
+    <Tabbar4 :active="tabName"></Tabbar4>
+    <!-- <screen :reload="false"></screen> -->
+  </div>
+</template>
+
+<script>
+import Tabbar4 from '@/component/Tabbar4'
+import ServiceList from '@/views/Service/component/ServiceList.vue'
+import ServiceListSecond from '@/views/Service/component/ServiceListSecond.vue'
+import ServiceListThird from '@/views/Service/component/ServiceListThird.vue'
+import ServiceListFour from '@/views/Service/component/ServiceListFour.vue'
+import Screen from '@/views/Service/component/Screen.vue'
+export default {
+  props: [
+    'centerNo'
+  ],
+  data () {
+    return {
+      search: '',
+      defaultHead: require('@/assets/head.png'),
+      top_tab_active: 0,
+      active: 1,
+      uniList: [],
+      weekList: [],
+      cityList: [],
+      selectList: [],
+      riverList: [],
+      tabName: 'KQ',
+      campList: [],
+    }
+  },
+  watch: {
+    $route: {
+      immediate: true,
+      handler () {
+        // 设置tabbar状态
+        this.tabName = this.$route.query.showTab || 'KQ'
+        document.title = this.$route.query.showTab == 'ZZY' ? '周周营' : '柯桥研学'
+      }
+    }
+  },
+  mounted () {
+    console.log('base mounted')
+    this.initService()
+
+  },
+  activated () {
+    console.log('base activated')
+    this.initService()
+  },
+  methods: {
+    initService () {
+      this.getUniList()
+      this.getWeekList()
+      this.getCityList()
+      this.getSelectList()
+      this.getRiverList()
+      this.getCampList()
+    },
+
+    // 革命遗址
+    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: {
+          "area": "",
+          "province": "",
+          "city": "",
+          "searchType": "5",
+          "userId": this.centerNo,
+          "productTypeId": "BQ0001",
+          "businessTypeId": "BQ0001",
+          "channelCode": ""
+        },
+        onSuccess: data => {
+          console.log('data', data)
+          this.$toast.clear()
+          let uniList = data.data.data;
+          for (let i in uniList) {
+            uniList[i].course_labels = uniList[i].course_labels?.split(',');
+            if (uniList[i].startDate) {
+              uniList[i].week = this.formatWeek(this.Moment(uniList[i].startDate).format('d'));
+              uniList[i].startDate = this.Moment(uniList[i].startDate).format('YYYY.M.D');
+              uniList[i].endDate = this.Moment(uniList[i].endDate).format('YYYY.M.D');
+            }
+          }
+          this.uniList = uniList
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    // 文化传承
+    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: {
+          "area": "",
+          "province": "",
+          "city": "",
+          "searchType": "5",
+          "userId": this.centerNo,
+          "productTypeId": "BQ0002",
+          "businessTypeId": "BQ0001",
+          "channelCode": ""
+        },
+        onSuccess: data => {
+          console.log('data', data)
+          let weekList = data.data.data;
+          for (let i in weekList) {
+            weekList[i].course_labels = weekList[i].course_labels?.split(',');
+            if (weekList[i].startDate) {
+              weekList[i].week = this.formatWeek(this.Moment(weekList[i].startDate).format('d'));
+              weekList[i].startDate = this.Moment(weekList[i].startDate).format('YYYY.M.D');
+              weekList[i].endDate = this.Moment(weekList[i].endDate).format('YYYY.M.D');
+            }
+          }
+          this.weekList = 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: {
+          "area": "",
+          "province": "",
+          "city": "",
+          "searchType": "5",
+          "userId": this.centerNo,
+          "productTypeId": "BQ0003",
+          "businessTypeId": "BQ0001",
+          "channelCode": ""
+        },
+        onSuccess: data => {
+          console.log('data', data)
+          let cityList = data.data.data;
+          for (let i in cityList) {
+            cityList[i].course_labels = cityList[i].course_labels?.split(',');
+            if (cityList[i].startDate) {
+              cityList[i].week = this.formatWeek(this.Moment(cityList[i].startDate).format('d'));
+              cityList[i].startDate = this.Moment(cityList[i].startDate).format('YYYY.M.D');
+              cityList[i].endDate = this.Moment(cityList[i].endDate).format('YYYY.M.D');
+            }
+          }
+          this.cityList = 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: {
+          "area": "",
+          "province": "",
+          "city": "",
+          "searchType": "5",
+          "userId": this.centerNo,
+          "productTypeId": "BQ0004",
+          "businessTypeId": "BQ0001",
+          "channelCode": ""
+        },
+        onSuccess: data => {
+          console.log('data', data)
+          let selectList = data.data.data;
+          for (let i in selectList) {
+            selectList[i].course_labels = selectList[i].course_labels?.split(',');
+            if (selectList[i].startDate) {
+              selectList[i].week = this.formatWeek(this.Moment(selectList[i].startDate).format('d'));
+              selectList[i].startDate = this.Moment(selectList[i].startDate).format('YYYY.M.D');
+              selectList[i].endDate = this.Moment(selectList[i].endDate).format('YYYY.M.D');
+            }
+          }
+          this.selectList = 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: {
+          "area": "",
+          "province": "",
+          "city": "",
+          "searchType": "5",
+          "userId": this.centerNo,
+          "productTypeId": "BQ0005",
+          "businessTypeId": "BQ0001",
+          "channelCode": ""
+        },
+        onSuccess: data => {
+          console.log('data', data)
+          let riverList = data.data.data;
+          for (let i in riverList) {
+            riverList[i].course_labels = riverList[i].course_labels?.split(',');
+            if (riverList[i].startDate) {
+              riverList[i].week = this.formatWeek(this.Moment(riverList[i].startDate).format('d'));
+              riverList[i].startDate = this.Moment(riverList[i].startDate).format('YYYY.M.D');
+              riverList[i].endDate = this.Moment(riverList[i].endDate).format('YYYY.M.D');
+            }
+          }
+          this.riverList = 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: {
+          "area": "",
+          "province": "",
+          "city": "",
+          "searchType": "6",
+          "userId": this.centerNo,
+          "productTypeId": "ZZY001",
+          "businessTypeId": "JY0004",
+          "channelCode": "GZH002"
+        },
+        onSuccess: data => {
+          console.log('data', data)
+          let campList = data.data.data;
+          for (let i in campList) {
+            campList[i].course_labels = campList[i].course_labels?.split(',');
+            if (campList[i].startDate) {
+              campList[i].week = this.formatWeek(this.Moment(campList[i].startDate).format('d'));
+              campList[i].startDate = this.Moment(campList[i].startDate).format('YYYY.M.D');
+              campList[i].endDate = this.Moment(campList[i].endDate).format('YYYY.M.D');
+            }
+          }
+          this.campList = campList
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    beforeChange (index) {
+      // if (index != 0 && index != 1  && index != 2) {
+      //   this.$toast('暂未开放，敬请期待！')
+      //   return false
+      // }
+      return true
+    },
+    onSearch () {
+      this.$toast('暂未开放，敬请期待！')
+    },
+    // 我的订单
+    handleMyOrder () {
+      this.$router.push({ name: 'ServiceOrderXST' })
+    },
+    // 我的优惠券
+    handleMyCard () {
+      this.$router.push({ name: 'ServiceCardBoxPublic' })
+    },
+    formatWeek (week) {
+      return week == 1 ? '周一' : week == 2 ? '周二' : week == 3 ? '周三' : week == 4 ? '周四' : week == 5 ? '周五' : week == 6 ? '周六' : week == 0 ? '周日' : '';
+    },
+    // 点击轮播
+    handleBanner () {
+      location.href = 'https://mp.weixin.qq.com/s/a4N3xr2nXZ-aG3OEakv-Dg'
+    },
+  },
+  components: {
+    Tabbar4,
+    ServiceList,
+    Screen,
+    ServiceListSecond,
+    ServiceListThird,
+    ServiceListFour
+  }
+}
+</script>
+<style lang="scss" scoped>
+#serviceKQ {
+  width: 100%;
+  height: 100%;
+  background: #f8f8f8;
+  overflow: hidden;
+  .swipeDiv {
+    // height: 400px;
+    height: 60vw;
+    width: 100%;
+  }
+  .container {
+    height: 100%;
+    position: absolute;
+    // top: 410px;
+    top: 60vw;
+    background: #f6f7fa;
+    background-image: url("../../assets/keqiao/kq_white.png");
+    // background-image: url("../../assets/service/bg.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+    // border-radius: 50px;
+    .redLink {
+      height: 10vw;
+      font-size: 4vw;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: #fff;
+      // background-color: aquamarine;
+      background-image: linear-gradient(
+        to right,
+        rgba(255, 0, 0, 0),
+        #ff696a,
+        rgba(255, 0, 0, 0)
+      );
+      background-color: #fff;
+    }
+    .tabsCard {
+      width: 100vw;
+    }
+    .top_tool {
+      display: flex;
+      align-items: center;
+      // justify-content: center;
+      justify-content: space-between;
+      padding: 20px 24px;
+      box-sizing: border-box;
+      height: 108px;
+      background-color: #fff;
+      .logo {
+        width: 82px;
+      }
+      .search {
+        padding: 0;
+        width: 100%;
+        // width: 400px;
+      }
+      .scan {
+        width: 44px;
+      }
+      .head {
+        width: 60px;
+      }
+      .top_tab {
+        width: 366px;
+        border-radius: 33px;
+        overflow: hidden;
+        span {
+          display: inline-block;
+          width: 50%;
+          line-height: 66px;
+          text-align: center;
+          font-size: 28px;
+          color: #f3f3f3;
+          background: rgba(255, 255, 255, 0.24);
+          &.active {
+            // color: #fff;
+            color: black;
+            background: rgba(255, 255, 255, 0.21);
+          }
+        }
+      }
+    }
+    .service_swipe {
+      img {
+        width: 100%;
+      }
+    }
+    .card_zzy {
+      display: block;
+      width: 704px;
+      margin: 0 auto;
+      margin-top: 20px;
+    }
+    .order_btn {
+      width: 160px;
+      position: fixed;
+      bottom: 200px;
+      right: 20px;
+      z-index: 99;
+    }
+  }
+
+  ::v-deep .van-search__content {
+    background: rgba(255, 255, 255, 0.36);
+    .van-cell {
+      //   color: #fff;
+      color: black;
+    }
+    .van-field__control {
+      //   color: #fff;
+      color: black;
+      &::-webkit-input-placeholder {
+        // color: #fff;
+        color: #909399;
+      }
+    }
+  }
+  ::v-deep .van-tabs__wrap {
+    box-shadow: 0 10px 10px rgba(238, 238, 238, 0.295);
+    height: 88px;
+  }
+  ::v-deep .van-tabs__nav {
+    background: transparent;
+  }
+  ::v-deep .van-tab {
+    // color: #fff;
+    color: black;
+    font-size: 28px;
+    background-color: #fff;
+  }
+  ::v-deep .van-tab--active {
+    // color: #fff;
+    color: black;
+    font-size: 32px;
+    font-weight: bold;
+  }
+  ::v-deep .van-tabs__line {
+    width: 48px;
+    height: 6px;
+    // background: #ffffff;
+    background: black;
+    border-radius: 10px 10px 0px 0px;
+  }
+  .tab_img {
+    width: 146px;
+    transition: 0.3s linear;
+  }
+  .van-tab--active {
+    .tab_img {
+      transform: scale(1.2);
+    }
+  }
+  .fixed_btn {
+    position: fixed;
+    bottom: 20vw;
+    right: 0;
+    span {
+      display: block;
+      width: 200px;
+      text-align: center;
+      line-height: 60px;
+      font-size: 30px;
+      background: rgb(100, 200, 250);
+      border-top-left-radius: 30px;
+      border-bottom-left-radius: 30px;
+      margin-bottom: 30px;
+    }
+  }
+}
+.my-swipe .van-swipe-item {
+  color: #fff;
+  height: 60vw;
+  font-size: 20px;
+  // line-height: 400px;
+  // line-height: 60vw;
+  text-align: center;
+  background-color: #39a9ed;
+}
+</style>
diff --git a/src/views/Service/ServiceKQ.vue b/src/views/Service/ServiceKQ.vue
new file mode 100644
index 0000000..a55b170
--- /dev/null
+++ b/src/views/Service/ServiceKQ.vue
@@ -0,0 +1,81 @@
+<template>
+  <service-basekq :centerNo="centerNo" v-if="centerNo"></service-basekq>
+</template>
+
+<script>
+import ServiceBasekq from './ServiceBaseKQ.vue'
+export default {
+  name: 'ServiceKQ',
+  data () {
+    return {
+      centerNo: '',
+    }
+  },
+
+  mounted () {
+    console.log('xst mounted')
+    this.checkAuth()
+
+  },
+  activated () {
+    console.log('KQ activated')
+    this.checkAuth()
+  },
+  methods: {
+    checkAuth () {
+      let centerNo = this.common.getUrlParam('center_no') || sessionStorage.getItem('centerNo');
+      if (centerNo) {
+        this.centerNo = centerNo
+        sessionStorage.setItem('centerNo', centerNo);
+        this.getUserInfo()
+      } else {
+        const sUserAgent = window.navigator.userAgent.toLowerCase()
+        const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1
+        const miniprogram = sUserAgent.indexOf("miniprogram") > -1 && sUserAgent.indexOf("alipay") > -1
+        if (dtdreamweb) {
+          alert('浙里办')
+          window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`;
+        }
+        // else if (miniprogram) {
+        //   alert('支付宝')
+        //   window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`;
+        // }
+        else {
+          console.log('非浙里办渠道访问，显示测试用户数据')
+          this.centerNo = '20210930160466993660'
+          sessionStorage.setItem('centerNo', '20210930160466993660');
+          this.getUserInfo()
+        }
+      }
+    },
+    // 获取用户信息
+    getUserInfo: function () {
+      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) {
+            sessionStorage.setItem('userInfo', JSON.stringify(res.data.data.userInfo))
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+  },
+  components: {
+    ServiceBasekq
+  }
+}
+</script>
diff --git a/src/views/Service/ServiceOrderXST.vue b/src/views/Service/ServiceOrderXST.vue
new file mode 100644
index 0000000..b60e2fb
--- /dev/null
+++ b/src/views/Service/ServiceOrderXST.vue
@@ -0,0 +1,867 @@
+<template>
+  <div class="myOrders">
+    <van-tabs v-model="active" :before-change="beforeTabChange">
+      <van-tab title="待付款">
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoadpay()">
+          <div class="showBoxDPJ" v-for="(item,index) in paylist" :key="index">
+            <div class="topLine">
+              <div class="topLineL">订单编号：{{item.orderpaynum}}</div>
+              <div class="topLineR" style="color:#F64C37">待付款</div>
+            </div>
+            <div class="top" @click="toEdit(item)">
+              <div class="pic">
+                <img :src="item.coverUrl ? item.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
+              </div>
+              <div class="basefont">
+                <div class="titlefont">{{item.baseName}}</div>
+                <div class="tcfont">套餐名称：{{item.courseName}}</div>
+                <div class="tcfont">数量*{{item.orderCount}}</div>
+              </div>
+              <div class="priceRight">¥{{item.paymoney}}</div>
+            </div>
+            <div class="detailsBox">
+              <div class="detailsBoxOne">
+                <div>订单创建时间</div>
+                <div>{{item.intime.replace(/T/,' ')}}</div>
+              </div>
+            </div>
+          </div>
+        </van-list>
+      </van-tab>
+      <van-tab title="待使用">
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoadmove()">
+          <div class="showBox" v-for="(item,index) in movelist" :key="index">
+            <div class="top" @click="toEdit(item)">
+              <div class="pic">
+                <img :src="item.coverUrl ? item.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
+              </div>
+              <div class="basefont">
+                <div class="titlefont">{{item.baseName}}</div>
+                <div class="tcfont">套餐名称：{{item.courseName}}</div>
+                <div class="tcfont">数量*{{item.orderCount}}</div>
+              </div>
+              <div class="priceRight">¥{{item.paymoney}}</div>
+            </div>
+            <div class="groupTime">
+              <van-icon name="clock-o" /><span class="grey"> 活动日期</span><span> {{item.startDate}} - {{ item.endDate}}</span>
+            </div>
+            <div class="btnBox">
+              <div class="wechat_code" @click="openGroupCodePopup(index)" style="margin-right:15px">
+                <img src="@/assets/home/wechat.png" alt="">
+                <span>加入拼团群</span>
+              </div>
+              <div>
+                <van-button type="warning" plain size="small" @click="showPintuanAbout = true" style="margin-right:15px">退款说明</van-button>
+                <!-- <van-button type="info" size="small" @click="makeCode(item.id)">核销码</van-button> -->
+                <van-button type="info" size="small" @click="toCode(item)">核销码</van-button>
+              </div>
+            </div>
+            <div class="detailsBox">
+              <div class="detailsBoxOne">
+                <div>订单创建时间</div>
+                <div>{{item.intime.replace(/T/,' ')}}</div>
+              </div>
+              <div class="detailsBoxOne">
+                <div>订单编号</div>
+                <div>{{item.orderpaynum}}</div>
+              </div>
+            </div>
+          </div>
+        </van-list>
+      </van-tab>
+      <van-tab title="待评价">
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoadCareer()">
+          <div class="showBoxDPJ" v-for="(item,index) in datalist" :key="index">
+            <div class="topLine">
+              <div class="topLineL">订单编号：{{item.orderpaynum}}</div>
+              <div class="topLineR" @click="evaluate(item)">去评价 ></div>
+            </div>
+            <div class="top" @click="toEdit(item)">
+              <div class="pic">
+                <img :src="item.coverUrl ? item.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
+              </div>
+              <div class="basefont">
+                <div class="titlefont">{{item.baseName}}</div>
+                <div class="tcfont">套餐名称：{{item.courseName}}</div>
+                <div class="tcfont">数量*{{item.orderCount}}</div>
+              </div>
+              <div class="priceRight">¥{{item.paymoney}}</div>
+            </div>
+            <div class="detailsBox">
+              <div class="detailsBoxOne">
+                <div>订单创建时间</div>
+                <div>{{item.intime.replace(/T/,' ')}}</div>
+              </div>
+            </div>
+          </div>
+        </van-list>
+      </van-tab>
+      <van-tab title="已评价">
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad()">
+          <div class="showBoxDPJ showBoxYPJ" v-for="(item,index) in list" :key="index">
+            <div class="top">
+              <div class="pic">
+                <img :src="item.coverUrl ? item.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
+              </div>
+              <div class="basefont">
+                <div class="titlefont">{{item.baseName}}</div>
+                <div class="tcfont">套餐名称：{{item.courseName}}</div>
+                <div class="tcfont">数量*{{item.orderCount}}</div>
+              </div>
+              <div class="priceRight">¥{{item.paymoney}}</div>
+            </div>
+            <div class="boxdf">
+              <div class="title">课程评分</div>
+              <div class="fr">
+                <van-rate v-model="item.courseScore" void-icon="star" void-color="#eee" color="#FFCC00" :size="16" readonly />
+                <span class="rate">{{item.courseScore}}.0</span>
+              </div>
+            </div>
+            <div class="boxdf">
+              <div class="title">基地评分</div>
+              <div class="fr">
+                <van-rate v-model="item.baseScore" void-icon="star" void-color="#eee" color="#FFCC00" :size="16" readonly />
+                <span class="rate">{{item.baseScore}}.0</span>
+              </div>
+            </div>
+            <p class="evaluation"><span>评价：</span>{{item.evaluation}}</p>
+            <div class="evaluation_img_box">
+              <img class="evaluation_img" v-for="(imgItem,index) in item.imageList" :key="index" :src="imgItem.imgUrl" alt="" @click="previewImg(imgItem.imgUrl)">
+            </div>
+            <!-- <p class="evaluation_time">评价于2020-12-21</p> -->
+          </div>
+        </van-list>
+      </van-tab>
+    </van-tabs>
+
+    <!--二维码-->
+    <!-- <div class="qrcodeBox" @click.self="qrcodeShow = false" v-show="qrcodeShow">
+      <div id="qrcode"></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、凡拼团活动报名人数未达最低成团数，本团活动则不开营，系统将在72小时内，全额退还，且不产生违约风险赔偿。</p>
+        <p class="about_content">2、如果您因行程发生变动需要取消预订，建议您尽可能提前与平台商户取得联系，并按商品订购须知或该商户旅游合同条款进行退款。</p>
+        <p class="about_content" style="font-weight:bold">如若未声明与明确的，按《浙江省境内旅游合同》条款退款。</p>
+        <!-- <p class="about_content">（1）出发前7日至4日，支付旅游费用总额的10%。</p>
+        <p class="about_content">（2）出发前3日至1日，支付旅游费用总额的15%。</p>
+        <p class="about_content">（3）出发当日，支付旅游费用总额的20%。</p> -->
+        <p class="about_know" @click="showPintuanAbout=false">我知道了</p>
+      </div>
+    </van-popup>
+
+    <van-popup v-model="showCode" round get-container="body">
+      <div class="codeCss">
+        <div class="showBox">
+          <div class="top">
+            <div class="pic">
+              <img :src="codeData.coverUrl ? codeData.coverUrl : require('@/assets/service/defCoure.jpg')" alt="" style="width:100%;height:100%">
+            </div>
+            <div class="basefont">
+              <div class="titlefont">{{codeData.baseName}}</div>
+              <div class="tcfont">套餐名称：{{codeData.courseName}}</div>
+              <div class="tcfont">数量*{{codeData.orderCount}}</div>
+            </div>
+            <!-- <div class="priceRight">¥{{codeData.paymoney}}</div> -->
+          </div>
+          <div class="groupTime">
+            <van-icon name="clock-o" /><span class="grey"> 活动日期</span><span> {{codeData.startDate}} - {{ codeData.endDate}}</span>
+          </div>
+          <div class="qrcodeBox">
+            <div id="qrcode" ref="imageWrapper" v-if="!imgUrl"></div>
+            <div class="imgBox">
+              <img :src="imgUrl" v-if="imgUrl" style="width:100%;height:100%" />
+            </div>
+          </div>
+          <div class="numShow">
+            {{codeData.id}}
+          </div>
+          <div class="fontBottom">请向工作人员出示</div>
+        </div>
+      </div>
+    </van-popup>
+    <van-popup v-model="showPreview" round get-container="body">
+      <img class="preview_img" :src="previewUrl" alt="">
+    </van-popup>
+    <GroupCodePopup v-if="showGroupCode" :chatGroupUrl="chatGroupUrl" @closeGroupCode="showGroupCode=false"></GroupCodePopup>
+  </div>
+</template>
+
+<script>
+import GroupCodePopup from '@/component/GroupCodePopup'
+import QRCode from 'qrcodejs2'  // 引入qrcode
+import html2canvas from "html2canvas"
+// let Base64 = require('js-base64').Base64;
+export default {
+  name: 'ServiceOrder',
+  data () {
+    return {
+      userInfo: '',
+      active: 1,
+      paylist: [], //待付款
+      movelist: [],  //待核销
+      list: [],  //所有
+      datalist: [],  //未评价
+      loading: false,
+      finished: false,
+      pageCareerIndex: 0,
+      qrcodeShow: false,
+      showPintuanAbout: false,
+      showCode: false,
+      codeData: {},
+      imgUrl: '',
+      previewUrl: '',//图片预览
+      showPreview: false,
+      showGroupCode: false,//群码
+      chatGroupUrl: '',//群码图片
+      showChatGroupUrlTag: false
+    }
+  },
+  computed: {
+    nicknameUser () {
+      return sessionStorage.getItem('nicknameUser')
+    }
+  },
+  mounted () {
+    let userInfo = sessionStorage.getItem('userInfo');
+    if (userInfo) {
+      this.userInfo = JSON.parse(userInfo);
+    }
+    // 进入页面进到第几个tab
+    if (this.$route.query.active || this.$route.query.active == 0) {
+      this.active = this.$route.query.active
+    }
+    // 进入页面直接显示第一个订单的群码
+    if (this.$route.query.showChatGroupUrl == 1) {
+      this.showChatGroupUrlTag = true
+    }
+  },
+  methods: {
+    beforeTabChange (item) {
+      console.log(item)
+      this.paylist = [];
+      this.movelist = [];
+      this.list = [];
+      this.datalist = [];
+      if (item == 0) {
+        this.onLoadpay()
+      } else if (item == 1) {
+        // this.onLoadCareer()
+        this.onLoadmove()
+      } else if (item == 2) {
+        this.onLoadCareer()
+      } else {
+        this.onLoad()
+      }
+      return true;
+    },
+    //获取待支付
+    onLoadpay () {
+      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": sessionStorage.getItem('centerNo'),
+          "type": 1,
+          "page": 1,
+          "pageSize": 999
+        },
+        onSuccess: res => {
+          console.log('待支付:', res)
+          if (res.data.status == 1) {
+            this.paylist = res.data.data.list;
+            this.loading = false;
+            this.finished = true;
+          } else {
+            this.$toast.fail(res.data.message);
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    //获取已支付
+    onLoadmove () {
+      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": sessionStorage.getItem('centerNo'),
+          "type": 2,
+          "page": 1,
+          "pageSize": 999
+        },
+        onSuccess: res => {
+          console.log('已支付:', res)
+          if (res.data.status == 1) {
+            this.movelist = res.data.data.list;
+            this.loading = false;
+            this.finished = true;
+            if (this.showChatGroupUrlTag) {
+              this.showChatGroupUrlTag = false;
+              this.openGroupCodePopup(0)
+            }
+          } else {
+            this.$toast.fail(res.data.message);
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    //获取待评价
+    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": sessionStorage.getItem('centerNo'),
+          "type": 3,
+          "page": 1,
+          "pageSize": 999
+        },
+        onSuccess: res => {
+          console.log('待评价:', res)
+          if (res.data.status == 1) {
+            this.datalist = res.data.data.list;
+            this.loading = false;
+            this.finished = true;
+            if (this.showChatGroupUrlTag) {
+              this.showChatGroupUrlTag = false;
+              this.openGroupCodePopup(0)
+            }
+          } else {
+            this.$toast.fail(res.data.message);
+          }
+        },
+        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": sessionStorage.getItem('centerNo'),
+          "type": 4,
+          "page": 1,
+          "pageSize": 999
+        },
+        onSuccess: res => {
+          console.log('已评价:', res)
+          if (res.data.status == 1) {
+            this.list = res.data.data.list;
+            this.loading = false;
+            this.finished = true;
+            if (this.showChatGroupUrlTag) {
+              this.showChatGroupUrlTag = false;
+              this.openGroupCodePopup(0)
+            }
+          } else {
+            this.$toast.fail(res.data.message);
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    //生成核销码
+    makeCode (id) {
+      console.log(id.toString())
+      document.getElementById('qrcode').innerHTML = '';
+      this.qrcodeShow = true;
+
+      let qrcode = new QRCode('qrcode', {
+        width: 200,
+        height: 200,
+        text: id.toString(), // 二维码地址
+      })
+      this.canvanqrCode()
+    },
+    //评价
+    evaluate (item) {
+      window.sessionStorage.setItem('courseInfo', JSON.stringify(item))
+      this.$router.push({ name: 'evaluateCourse' })
+    },
+    //核销码
+    toCode (item) {
+      this.codeData = {}
+      this.showCode = true
+      this.codeData = item
+      this.imgUrl = ''
+      setTimeout(() => {
+        this.makeCode(item.id)
+      }, 1000);
+    },
+    // 打开群码弹窗
+    openGroupCodePopup (index) {
+      this.chatGroupUrl = this.movelist[index]?.chatGroupUrl
+      this.showGroupCode = true;
+    },
+    //跳转
+    toEdit (item) {
+      this.$router.push({ path: 'abroad_detail', query: { courseId: item.courseId, publicName: sessionStorage.getItem('publicName') } })
+    },
+    //二维码转图片
+    canvanqrCode () {
+      html2canvas(this.$refs.imageWrapper, {
+        width: 200,
+        height: 200
+      }).then(canvas => {
+        let dataURL = canvas.toDataURL("image/png");
+        this.imgUrl = dataURL;
+      });
+    },
+    // 预览图片
+    previewImg (url) {
+      this.previewUrl = url;
+      this.showPreview = true
+    }
+  },
+  components: {
+    GroupCodePopup
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.myOrders {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  overflow: auto;
+  background: #f6f7fa;
+
+  // .qrcodeBox {
+  //   position: fixed;
+  //   top: 0;
+  //   left: 0;
+  //   bottom: 0;
+  //   right: 0;
+  //   background-color: rgba(0, 0, 0, 0.4);
+
+  //   #qrcode {
+  //     position: absolute;
+  //     top: 50%;
+  //     left: 50%;
+  //     transform: translate(-50%, -50%);
+  //     padding: 20px;
+  //     background: #fff;
+  //   }
+  // }
+
+  .list {
+    padding: 20px;
+    box-sizing: border-box;
+
+    li:not(:last-child) {
+      border-bottom: 1px dashed #eee;
+    }
+
+    li {
+      margin-bottom: 10px;
+      padding-bottom: 10px;
+
+      .baseName {
+        padding-left: 50px;
+        font-size: 30px;
+        background: url("../../assets/service/hoom.png") no-repeat left top;
+        background-size: contain;
+        margin: 10px 0;
+      }
+      .career_type {
+        font-size: 30px;
+        margin: 0;
+        margin-top: 10px;
+      }
+      .career_create {
+        color: #ccc;
+        font-size: 30px;
+        margin: 0;
+        margin-top: 10px;
+      }
+      .course {
+        min-height: 60px;
+
+        img {
+          object-fit: cover;
+          width: 200px;
+          float: left;
+          margin-right: 10px;
+        }
+
+        .courseCont {
+          h5 {
+            word-break: break-all;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            overflow: hidden;
+            font-size: 30px;
+            margin: 0;
+          }
+
+          p {
+            color: #ccc;
+            font-size: 30px;
+            margin: 0;
+            margin-top: 10px;
+          }
+        }
+      }
+
+      .orderCont {
+        padding: 40px 0;
+        font-size: 28px;
+
+        span {
+          color: red;
+        }
+
+        .pj {
+          float: right;
+        }
+      }
+
+      .codeBtn {
+        text-align: right;
+        margin-top: 15px;
+      }
+    }
+  }
+  //待审核
+  .showBox {
+    width: 702px;
+    background: #fff;
+    border-radius: 16px;
+    margin: 30px auto;
+    padding: 34px 24px;
+    box-sizing: border-box;
+
+    .top {
+      display: flex;
+
+      .pic {
+        width: 124px;
+        height: 124px;
+        flex-shrink: 0;
+      }
+      .basefont {
+        padding: 0 20px;
+        box-sizing: border-box;
+        .titlefont {
+          color: #333333;
+          font-size: 28px;
+          margin-bottom: 18px;
+        }
+        .tcfont {
+          color: #535353;
+          font-size: 24px;
+        }
+      }
+      .priceRight {
+        width: 110px;
+        font-size: 28px;
+        color: #f64c37;
+        line-height: 200px;
+      }
+    }
+    .groupTime {
+      font-size: 28px;
+      line-height: 60px;
+      height: 60px;
+      margin-bottom: 20px;
+      // background-color: #f5f6fa;
+      padding-left: 10px;
+      box-sizing: border-box;
+
+      .grey {
+        color: #999999;
+      }
+    }
+    .btnBox {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .wechat_code {
+        display: flex;
+        align-items: center;
+        height: 54px;
+        padding: 0 16px;
+        background: #00c800;
+        border-radius: 8px;
+        font-size: 28px;
+        color: #fff;
+        img {
+          width: 40px;
+          margin-right: 14px;
+        }
+      }
+    }
+    .detailsBox {
+      color: #999999;
+      font-size: 28px;
+      margin-top: 60px;
+
+      .detailsBoxOne {
+        margin-top: 20px;
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+  }
+  //待评价
+  .showBoxDPJ {
+    width: 702px;
+    // height: 330px;
+    margin: 30px auto;
+    padding: 34px 24px;
+    box-sizing: border-box;
+    background: #fff;
+    border-radius: 16px;
+    .topLine {
+      height: 60px;
+      display: flex;
+      justify-content: space-between;
+      .topLineL {
+        font-size: 23px;
+        color: #999999;
+      }
+      .topLineR {
+        font-size: 23px;
+      }
+    }
+    .top {
+      display: flex;
+
+      .pic {
+        width: 124px;
+        height: 124px;
+        flex-shrink: 0;
+      }
+      .basefont {
+        padding: 0 20px;
+        box-sizing: border-box;
+        .titlefont {
+          margin-bottom: 18px;
+          color: #333333;
+          font-weight: bold;
+          font-size: 28px;
+        }
+        .tcfont {
+          color: #535353;
+          font-size: 24px;
+        }
+      }
+      .priceRight {
+        width: 110px;
+        font-size: 28px;
+        color: #f64c37;
+        line-height: 200px;
+      }
+    }
+    .detailsBox {
+      color: #999999;
+      font-size: 28px;
+
+      .detailsBoxOne {
+        margin-top: 20px;
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+  }
+  // 已评价
+  .showBoxYPJ {
+    .boxdf {
+      padding: 10px 0;
+      font-size: 5vw;
+      display: flex;
+      .title {
+        font-size: 28px;
+        margin-right: 10px;
+      }
+      .rate {
+        color: #ffcc00;
+        font-size: 30px;
+        margin-left: 10px;
+      }
+    }
+    .evaluation {
+      font-size: 30px;
+      span {
+        font-weight: bold;
+      }
+    }
+    .evaluation_img_box {
+      margin-top: 22px;
+      .evaluation_img {
+        width: 212px;
+        height: 212px;
+        margin-right: 9px;
+        margin-bottom: 9px;
+        &:nth-of-type(3n) {
+          margin-right: 0;
+        }
+      }
+    }
+    .evaluation_time {
+      margin-top: 18px;
+      text-align: right;
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .pintuan_about {
+    width: 592px;
+    box-sizing: border-box;
+    padding: 0 50px;
+    .about_img {
+      width: 112px;
+      margin: 0 auto;
+      margin-top: 30px;
+      display: block;
+    }
+    .about_title {
+      font-size: 34px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .about_content {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    .about_know {
+      font-size: 32px;
+      text-align: center;
+      color: #3385ff;
+      margin-top: 60px;
+      margin-bottom: 44px;
+    }
+  }
+}
+.codeCss {
+  width: 700px;
+  height: 850px;
+  position: relative;
+
+  .showBox {
+    width: 702px;
+    // height: 500px;
+    // background-color: aquamarine;
+    margin: 30px auto;
+    padding: 34px 24px;
+    box-sizing: border-box;
+
+    .top {
+      display: flex;
+
+      .pic {
+        width: 124px;
+        height: 124px;
+        flex-shrink: 0;
+      }
+      .basefont {
+        padding: 0 20px;
+        box-sizing: border-box;
+        .titlefont {
+          color: #333333;
+          font-size: 28px;
+          margin-bottom: 18px;
+        }
+        .tcfont {
+          color: #535353;
+          font-size: 24px;
+        }
+      }
+      .priceRight {
+        width: 110px;
+        font-size: 28px;
+        color: #f64c37;
+        line-height: 200px;
+      }
+    }
+    .groupTime {
+      font-size: 28px;
+      line-height: 60px;
+      height: 60px;
+      margin-bottom: 20px;
+      background-color: #f5f6fa;
+      padding-left: 10px;
+      box-sizing: border-box;
+
+      .grey {
+        color: #999999;
+      }
+    }
+    .qrcodeBox {
+      width: 100%;
+      height: 430px;
+
+      #qrcode {
+        transform: translate(25%, 10%);
+        // margin: auto;
+      }
+      .imgBox {
+        width: 370px;
+        height: 370px;
+        margin: 30px auto 0;
+        // transform: translate(25%, 10%);
+      }
+    }
+    .numShow {
+      width: 100%;
+      font-size: 28px;
+      text-align: center;
+      color: #999999;
+    }
+    .fontBottom {
+      width: 100%;
+      font-weight: bold;
+      font-size: 28px;
+      text-align: center;
+    }
+  }
+}
+.preview_img {
+  width: 100vw;
+}
+</style>
diff --git a/src/views/Service/component/chooseSchool.vue b/src/views/Service/component/chooseSchool.vue
new file mode 100644
index 0000000..b32af3e
--- /dev/null
+++ b/src/views/Service/component/chooseSchool.vue
@@ -0,0 +1,112 @@
+/*选择学校*/
+<template>
+  <div id="schoolBox">
+    <div class="search">
+      <form action="/">
+        <van-search v-model="searchSchool" show-action placeholder="请输入搜索关键词" @input="onSearch" @cancel="onCancel" />
+      </form>
+    </div>
+    <div class="listCardBox">
+      <div v-for="(val,i) in schoolList" :key="i" class="listCard">
+        <div @click="schoolClick(val)">{{val.text}}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      searchSchool: '',
+      schoolList: []
+    }
+  },
+  methods: {
+    onSearch (val) {
+      console.log(val)
+      this.GetHighSchoolList()
+    },
+    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)
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    //点击学校
+    schoolClick (val) {
+      console.log(val)
+      this.$emit('schoolData', val)
+      this.onCancel()
+    }
+  },
+  mounted () {
+    // this.GetHighSchoolList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+#schoolBox {
+  width: 100vw;
+  height: 100vh;
+  // top: 0;
+  // left: 0;
+  background-color: #fff;
+
+  .search {
+    padding: 40px 30px;
+    box-sizing: border-box;
+  }
+  .listCardBox {
+    height: 1050px;
+    overflow: auto;
+
+    .listCard {
+      width: 700px;
+      height: 70px;
+      color: black;
+      font-size: 29px;
+      margin-left: 30px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Service/evaluateBase.vue b/src/views/Service/evaluateBase.vue
new file mode 100644
index 0000000..ed5ebbe
--- /dev/null
+++ b/src/views/Service/evaluateBase.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="releaseEvaluate">
+    <div class="box top">
+      <div class="pic">
+        <img :src="baseInfo.baseUrl ? baseInfo.baseUrl : 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>
+    </div>
+    <div class="box">
+      <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>
+        </div>
+      </div>
+      <div class="cont">
+        <div class="item">
+          <van-field v-model="content" type="textarea" label="" placeholder="对基地的评价及建议" />
+        </div>
+      </div>
+      <div class="imgs">
+        <img :src="n.imgUrl" alt="" v-for="(n,i) in imgsrc" :key="i">
+        <div class="selectImg">
+          <imgCut @callback="callback" :width="750" :height="750">
+            <van-icon name="cross" />
+          </imgCut>
+        </div>
+        <!-- <van-uploader v-model="fileList" multiple /> -->
+      </div>
+    </div>
+    <div class="btns" :class="content==''||starsBaseNum==0?'disabled':''" @click="AddEvaluation ">发布</div>
+  </div>
+</template>
+
+<script>
+import { imgCut } from 'vue-imgcut'
+export default {
+  data () {
+    return {
+      baseId: '',
+      signId: '',
+      baseInfo: '',
+      starsBaseNum: 0,
+      userInfo: '',
+      studentInfo: '',
+      courseInfo: '',
+      content: '',
+      imgsrc: [],
+      fileList: [
+        { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
+        // Uploader 根据文件后缀来判断是否为图片文件
+        // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
+        { url: 'https://cloud-image', isImage: true },
+      ],
+    }
+  },
+  components: {
+    imgCut
+  },
+  mounted () {
+    var userInfo = window.sessionStorage.getItem('userInfo');
+    if (userInfo) {
+      this.userInfo = JSON.parse(userInfo);
+    }
+    let studentInfo = sessionStorage.getItem('StudentDetialInfo')
+    this.studentInfo = JSON.parse(studentInfo)
+    this.baseId = this.$route.query.baseId
+    this.signId = this.$route.query.signId
+    this.GetStudyBaseDetail()
+  },
+  methods: {
+    AddEvaluation () {
+      if (this.content == '') {
+        this.$toast('请输入评价内容')
+        return;
+      }
+      if (this.starsBaseNum == 0) {
+        this.$toast('请完成基地评分')
+        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.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)
+        }
+      });
+    },
+    // 获取基地信息
+    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)
+        }
+      });
+    },
+    callback (img) {
+      this.imgsrc.push({
+        imgUrl: img
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.releaseEvaluate {
+  padding: 20px;
+  box-sizing: border-box;
+  background: #f6f7fa;
+  box-sizing: border-box;
+  min-height: 100vh;
+  .box {
+    width: 702px;
+    background: #fff;
+    border-radius: 16px;
+    margin: 0 auto;
+    padding: 16px;
+    box-sizing: border-box;
+    margin-bottom: 16px;
+  }
+  .top {
+    display: flex;
+
+    .pic {
+      width: 124px;
+      height: 124px;
+      flex-shrink: 0;
+    }
+    .basefont {
+      padding: 0 20px;
+      box-sizing: border-box;
+      .titlefont {
+        color: #333333;
+        font-size: 28px;
+        margin-bottom: 18px;
+      }
+      .tcfont {
+        color: #535353;
+        font-size: 24px;
+      }
+    }
+    .priceRight {
+      width: 110px;
+      font-size: 28px;
+      color: #f64c37;
+      line-height: 200px;
+    }
+  }
+  .btns {
+    width: 702px;
+    height: 92px;
+    line-height: 92px;
+    border-radius: 16px;
+    margin: 0 auto;
+    margin-top: 20px;
+    background: #4092ff;
+    color: #fff;
+    font-size: 30px;
+    text-align: center;
+    box-shadow: 0 0 30px #7ab1f8;
+    &.disabled {
+      opacity: 0.4;
+    }
+  }
+  .cont {
+    .van-cell {
+      background: #f5f6fa;
+    }
+    input {
+      border: none;
+      width: 100%;
+      height: 38px;
+      line-height: 38px;
+      font-size: 1.4rem;
+    }
+    p {
+      font-size: 1.2rem;
+      text-align: right;
+      color: #909090;
+      span {
+        color: #09ce6c;
+      }
+    }
+  }
+  .imgs {
+    background: #f5f6fa;
+    padding: 20px;
+    // img:first-child::after{
+    // 	content: '封面图片';
+    // 	position:absolute;
+    // 	bottom: 0;
+    // 	left: 0;
+    // 	right: 0;
+    // 	background-color: rgba(0,0,0,.5);
+    // 	color: white;
+    // 	font-size: 1.2rem;
+    // 	padding: 3px;
+    // 	z-index: 1000;
+    // }
+    img {
+      position: relative;
+      display: inline-block;
+      vertical-align: top;
+      width: 142px;
+      height: 142px;
+      border-radius: 5px;
+      margin-right: 10px;
+      margin-top: 10px;
+    }
+    .selectImg {
+      display: inline-block;
+      vertical-align: top;
+      width: 142px;
+      height: 142px;
+      text-align: center;
+      line-height: 50px;
+      border-radius: 5px;
+      border: 1px solid rgb(8, 23, 88);
+      font-size: 2rem;
+      color: #eee;
+      margin-top: 10px;
+    }
+  }
+  .boxdf {
+    padding: 10px 0;
+    font-size: 5vw;
+    display: flex;
+    .title {
+      font-size: 28px;
+      margin-right: 10px;
+    }
+    .rate {
+      color: #ffcc00;
+      font-size: 30px;
+      margin-left: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/Service/evaluateCourse.vue b/src/views/Service/evaluateCourse.vue
new file mode 100644
index 0000000..0fd9efb
--- /dev/null
+++ b/src/views/Service/evaluateCourse.vue
@@ -0,0 +1,274 @@
+<template>
+  <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%">
+      </div>
+      <div class="basefont">
+        <div class="titlefont">{{courseInfo.baseName}}</div>
+        <div class="tcfont">套餐名称：{{courseInfo.courseName}}</div>
+        <div class="tcfont">数量*{{courseInfo.orderCount}}</div>
+      </div>
+    </div>
+    <div class="box">
+      <div class="boxdf">
+        <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>
+        </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>
+        </div>
+      </div>
+      <div class="cont">
+        <div class="item">
+          <van-field v-model="content" type="textarea" label="" placeholder="关于活动、课程、研学的感想或评论" />
+        </div>
+      </div>
+      <div class="imgs">
+        <img :src="n.imgUrl" alt="" v-for="(n,i) in imgsrc" :key="i">
+        <div class="selectImg">
+          <imgCut @callback="callback" :width="750" :height="750">
+            <van-icon name="cross" />
+          </imgCut>
+        </div>
+        <!-- <van-uploader v-model="fileList" multiple /> -->
+      </div>
+    </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 () {
+    return {
+      starsBaseNum: 0,
+      starsCourseNum: 0,
+      userInfo: '',
+      courseInfo: '',
+      content: '',
+      imgsrc: [],
+      fileList: [
+        { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
+        // Uploader 根据文件后缀来判断是否为图片文件
+        // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
+        { url: 'https://cloud-image', isImage: true },
+      ],
+    }
+  },
+  components: {
+    imgCut
+  },
+  mounted () {
+    var userInfo = window.sessionStorage.getItem('userInfo');
+    if (userInfo) {
+      this.userInfo = JSON.parse(userInfo);
+    }
+    var courseInfo = window.sessionStorage.getItem('courseInfo');
+    if (courseInfo) {
+      this.courseInfo = JSON.parse(courseInfo);
+    }
+  },
+  methods: {
+    AddEvaluation () {
+      if (this.content == '') {
+        this.$toast('请输入评价内容')
+        return;
+      }
+      if (this.starsCourseNum == 0) {
+        this.$toast('请完成课程评分')
+        return;
+      }
+      if (this.starsBaseNum == 0) {
+        this.$toast('请完成基地评分')
+        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();
+          if (res.data.status == 1) {
+            this.$toast.success('发布成功');
+            setTimeout(() => {
+              // this.$router.push({ name: 'ServiceOrderXST' })
+              this.$router.back()
+            }, 1000)
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    callback (img) {
+      this.imgsrc.push({
+        imgUrl: img
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.releaseEvaluate {
+  padding: 20px;
+  box-sizing: border-box;
+  background: #f6f7fa;
+  box-sizing: border-box;
+  min-height: 100vh;
+  .box {
+    width: 702px;
+    background: #fff;
+    border-radius: 16px;
+    margin: 0 auto;
+    padding: 16px;
+    box-sizing: border-box;
+    margin-bottom: 16px;
+  }
+  .top {
+    display: flex;
+
+    .pic {
+      width: 124px;
+      height: 124px;
+      flex-shrink: 0;
+    }
+    .basefont {
+      padding: 0 20px;
+      box-sizing: border-box;
+      .titlefont {
+        color: #333333;
+        font-size: 28px;
+        margin-bottom: 18px;
+      }
+      .tcfont {
+        color: #535353;
+        font-size: 24px;
+      }
+    }
+    .priceRight {
+      width: 110px;
+      font-size: 28px;
+      color: #f64c37;
+      line-height: 200px;
+    }
+  }
+  .btns {
+    width: 702px;
+    height: 92px;
+    line-height: 92px;
+    border-radius: 16px;
+    margin: 0 auto;
+    margin-top: 20px;
+    background: #4092ff;
+    color: #fff;
+    font-size: 30px;
+    text-align: center;
+    box-shadow: 0 0 30px #7ab1f8;
+    &.disabled {
+      opacity: 0.4;
+    }
+  }
+  .cont {
+    .van-cell {
+      background: #f5f6fa;
+    }
+    input {
+      border: none;
+      width: 100%;
+      height: 38px;
+      line-height: 38px;
+      font-size: 1.4rem;
+    }
+    p {
+      font-size: 1.2rem;
+      text-align: right;
+      color: #909090;
+      span {
+        color: #09ce6c;
+      }
+    }
+  }
+  .imgs {
+    background: #f5f6fa;
+    padding: 20px;
+    // img:first-child::after{
+    // 	content: '封面图片';
+    // 	position:absolute;
+    // 	bottom: 0;
+    // 	left: 0;
+    // 	right: 0;
+    // 	background-color: rgba(0,0,0,.5);
+    // 	color: white;
+    // 	font-size: 1.2rem;
+    // 	padding: 3px;
+    // 	z-index: 1000;
+    // }
+    img {
+      position: relative;
+      display: inline-block;
+      vertical-align: top;
+      width: 142px;
+      height: 142px;
+      border-radius: 5px;
+      margin-right: 10px;
+      margin-top: 10px;
+    }
+    .selectImg {
+      display: inline-block;
+      vertical-align: top;
+      width: 142px;
+      height: 142px;
+      text-align: center;
+      line-height: 50px;
+      border-radius: 5px;
+      border: 1px solid rgb(8, 23, 88);
+      font-size: 2rem;
+      color: #eee;
+      margin-top: 10px;
+    }
+  }
+  .boxdf {
+    padding: 10px 0;
+    font-size: 5vw;
+    display: flex;
+    .title {
+      font-size: 28px;
+      margin-right: 10px;
+    }
+    .rate {
+      color: #ffcc00;
+      font-size: 30px;
+      margin-left: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/Service/evaluateDetail.vue b/src/views/Service/evaluateDetail.vue
new file mode 100644
index 0000000..0fd50fe
--- /dev/null
+++ b/src/views/Service/evaluateDetail.vue
@@ -0,0 +1,303 @@
+<template>
+  <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%">
+      </div>
+      <div class="basefont">
+        <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%">
+      </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>
+    </div>
+    <div class="box">
+      <div class="boxdf" v-if="!baseId">
+        <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>
+        </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>
+        </div>
+      </div>
+      <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)">
+      </div>
+      <p class="evaluation_time">评价于 {{evaluationData.intime}}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+import { imgCut } from 'vue-imgcut'
+export default {
+  data () {
+    return {
+      baseId: '',//有基地id时为基地评价
+      baseInfo: '',
+      evaluationId: '',
+      evaluationData: '',
+      starsBaseNum: 0,
+      starsCourseNum: 0,
+      userInfo: '',
+      courseInfo: '',
+      content: '',
+      imgsrc: [],
+      fileList: [
+        { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
+        // Uploader 根据文件后缀来判断是否为图片文件
+        // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
+        { url: 'https://cloud-image', isImage: true },
+      ],
+    }
+  },
+  components: {
+    imgCut
+  },
+  mounted () {
+    this.evaluationId = this.$route.query.evaluationId
+    let baseId = this.$route.query.baseId
+    // 当前为基地评价
+    if (baseId) {
+      this.baseId = baseId
+      this.GetStudyBaseDetail()
+    }
+    this.getEvaluationDetail()
+
+    var courseInfo = window.sessionStorage.getItem('courseInfo');
+    if (courseInfo) {
+      this.courseInfo = JSON.parse(courseInfo);
+    }
+  },
+  methods: {
+    getEvaluationDetail () {
+      this.$toast.loading({
+        message: '加载中...',
+        duration: 0,
+        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)
+        if (res.data.status == 1) {
+          let evaluationData = res.data.data
+          evaluationData.intime = this.Moment(new Date(evaluationData.intime)).format('YYYY-MM-DD')
+          this.evaluationData = evaluationData
+        } else {
+          this.$toast.fail(res.data.message)
+        }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    // 获取基地信息
+    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)
+        }
+      });
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.releaseEvaluate {
+  padding: 20px;
+  box-sizing: border-box;
+  background: #f6f7fa;
+  box-sizing: border-box;
+  min-height: 100vh;
+  .box {
+    width: 702px;
+    background: #fff;
+    border-radius: 16px;
+    margin: 0 auto;
+    padding: 16px;
+    box-sizing: border-box;
+    margin-bottom: 16px;
+  }
+  .top {
+    display: flex;
+
+    .pic {
+      width: 124px;
+      height: 124px;
+      flex-shrink: 0;
+    }
+    .basefont {
+      padding: 0 20px;
+      box-sizing: border-box;
+      .titlefont {
+        color: #333333;
+        font-size: 28px;
+        margin-bottom: 18px;
+      }
+      .tcfont {
+        color: #535353;
+        font-size: 24px;
+      }
+    }
+    .priceRight {
+      width: 110px;
+      font-size: 28px;
+      color: #f64c37;
+      line-height: 200px;
+    }
+  }
+  .cont {
+    .van-cell {
+      background: #f5f6fa;
+    }
+    input {
+      border: none;
+      width: 100%;
+      height: 38px;
+      line-height: 38px;
+      font-size: 1.4rem;
+    }
+    p {
+      font-size: 1.2rem;
+      text-align: right;
+      color: #909090;
+      span {
+        color: #09ce6c;
+      }
+    }
+  }
+  .imgs {
+    background: #f5f6fa;
+    padding: 20px;
+    // img:first-child::after{
+    // 	content: '封面图片';
+    // 	position:absolute;
+    // 	bottom: 0;
+    // 	left: 0;
+    // 	right: 0;
+    // 	background-color: rgba(0,0,0,.5);
+    // 	color: white;
+    // 	font-size: 1.2rem;
+    // 	padding: 3px;
+    // 	z-index: 1000;
+    // }
+    img {
+      position: relative;
+      display: inline-block;
+      vertical-align: top;
+      width: 142px;
+      height: 142px;
+      border-radius: 5px;
+      margin-right: 10px;
+      margin-top: 10px;
+    }
+    .selectImg {
+      display: inline-block;
+      vertical-align: top;
+      width: 142px;
+      height: 142px;
+      text-align: center;
+      line-height: 50px;
+      border-radius: 5px;
+      border: 1px solid rgb(8, 23, 88);
+      font-size: 2rem;
+      color: #eee;
+      margin-top: 10px;
+    }
+  }
+  .boxdf {
+    padding: 10px 0;
+    font-size: 5vw;
+    display: flex;
+    .title {
+      font-size: 28px;
+      margin-right: 10px;
+    }
+    .rate {
+      color: #ffcc00;
+      font-size: 30px;
+      margin-left: 10px;
+    }
+  }
+  .evaluation {
+    font-size: 30px;
+    span {
+      font-weight: bold;
+    }
+  }
+  .evaluation_img_box {
+    margin-top: 22px;
+    .evaluation_img {
+      width: 212px;
+      height: 212px;
+      margin-right: 9px;
+      margin-bottom: 9px;
+      &:nth-of-type(3n) {
+        margin-right: 0;
+      }
+    }
+  }
+  .evaluation_time {
+    margin-top: 18px;
+    text-align: right;
+    color: #999999;
+    font-size: 28px;
+  }
+}
+</style>
diff --git a/src/views/Service/evaluatePubilc.vue b/src/views/Service/evaluatePubilc.vue
new file mode 100644
index 0000000..724b998
--- /dev/null
+++ b/src/views/Service/evaluatePubilc.vue
@@ -0,0 +1,274 @@
+<template>
+  <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%">
+      </div>
+      <div class="basefont">
+        <div class="titlefont">{{courseInfo.baseName}}</div>
+        <div class="tcfont">套餐名称：{{courseInfo.courseName}}</div>
+        <div class="tcfont">数量*{{courseInfo.orderCount}}</div>
+      </div>
+    </div>
+    <div class="box">
+      <div class="boxdf">
+        <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>
+        </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>
+        </div>
+      </div>
+      <div class="cont">
+        <div class="item">
+          <van-field v-model="content" type="textarea" label="" placeholder="关于活动、课程、研学的感想或评论" />
+        </div>
+      </div>
+      <div class="imgs">
+        <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" />
+          </imgCut>
+        </div>
+        <!-- <van-uploader v-model="fileList" multiple /> -->
+      </div>
+    </div>
+    <div class="btns" :class="content==''||starsCourseNum==0||starsBaseNum==0?'disabled':''" @click="AddEvaluation ">发布</div>
+  </div>
+</template>
+
+<script>
+import yxAxios from '@/https/yxAxios'
+import { imgCut } from 'vue-imgcut'
+export default {
+  data () {
+    return {
+      starsBaseNum: 0,
+      starsCourseNum: 0,
+      userInfo: '',
+      courseInfo: '',
+      content: '',
+      imgsrc: [],
+      fileList: [
+        { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
+        // Uploader 根据文件后缀来判断是否为图片文件
+        // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
+        { url: 'https://cloud-image', isImage: true },
+      ],
+    }
+  },
+  components: {
+    imgCut
+  },
+  created () {
+    var userInfo = window.sessionStorage.getItem('userInfo');
+    if (userInfo) {
+      this.userInfo = JSON.parse(userInfo);
+    }
+    var courseInfo = window.sessionStorage.getItem('courseInfo');
+    if (courseInfo) {
+      this.courseInfo = JSON.parse(courseInfo);
+    }
+  },
+  methods: {
+    AddEvaluation () {
+      if (this.content == '') {
+        this.$toast('请输入评价内容')
+        return;
+      }
+      if (this.starsCourseNum == 0) {
+        this.$toast('请完成课程评分')
+        return;
+      }
+      if (this.starsBaseNum == 0) {
+        this.$toast('请完成基地评分')
+        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();
+          if (res.data.status == 1) {
+            this.$toast.success('发布成功');
+            setTimeout(() => {
+              this.$router.push({ name: 'ServiceOrderXST' })
+            }, 1000)
+          }
+        },
+        onFail: err => {
+          console.log('err', err)
+        }
+      });
+    },
+    callback (img) {
+      this.imgsrc.push({
+        imgUrl: img
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.releaseEvaluate {
+  padding: 20px;
+  box-sizing: border-box;
+  background: #f6f7fa;
+  box-sizing: border-box;
+  min-height: 100vh;
+  .box {
+    width: 702px;
+    background: #fff;
+    border-radius: 16px;
+    margin: 0 auto;
+    padding: 16px;
+    box-sizing: border-box;
+    margin-bottom: 16px;
+  }
+  .top {
+    display: flex;
+
+    .pic {
+      width: 124px;
+      height: 124px;
+      flex-shrink: 0;
+    }
+    .basefont {
+      padding: 0 20px;
+      box-sizing: border-box;
+      .titlefont {
+        color: #333333;
+        font-size: 28px;
+        margin-bottom: 18px;
+      }
+      .tcfont {
+        color: #535353;
+        font-size: 24px;
+      }
+    }
+    .priceRight {
+      width: 110px;
+      font-size: 28px;
+      color: #f64c37;
+      line-height: 200px;
+    }
+  }
+  .btns {
+    width: 702px;
+    height: 92px;
+    line-height: 92px;
+    border-radius: 16px;
+    margin: 0 auto;
+    margin-top: 20px;
+    background: #4092ff;
+    color: #fff;
+    font-size: 30px;
+    text-align: center;
+    box-shadow: 0 0 30px #7ab1f8;
+    &.disabled {
+      opacity: 0.4;
+    }
+  }
+  .cont {
+    .van-cell {
+      background: #f5f6fa;
+    }
+    input {
+      border: none;
+      width: 100%;
+      height: 38px;
+      line-height: 38px;
+      font-size: 1.4rem;
+    }
+    p {
+      font-size: 1.2rem;
+      text-align: right;
+      color: #909090;
+      span {
+        color: #09ce6c;
+      }
+    }
+  }
+  .imgs {
+    background: #f5f6fa;
+    padding: 20px;
+    // img:first-child::after{
+    // 	content: '封面图片';
+    // 	position:absolute;
+    // 	bottom: 0;
+    // 	left: 0;
+    // 	right: 0;
+    // 	background-color: rgba(0,0,0,.5);
+    // 	color: white;
+    // 	font-size: 1.2rem;
+    // 	padding: 3px;
+    // 	z-index: 1000;
+    // }
+    img {
+      position: relative;
+      display: inline-block;
+      vertical-align: top;
+      width: 142px;
+      height: 142px;
+      border-radius: 5px;
+      margin-right: 10px;
+      margin-top: 10px;
+    }
+    .selectImg {
+      display: inline-block;
+      vertical-align: top;
+      width: 142px;
+      height: 142px;
+      text-align: center;
+      line-height: 50px;
+      border-radius: 5px;
+      border: 1px solid rgb(8, 23, 88);
+      font-size: 2rem;
+      color: #eee;
+      margin-top: 10px;
+    }
+  }
+  .boxdf {
+    padding: 10px 0;
+    font-size: 5vw;
+    display: flex;
+    .title {
+      font-size: 28px;
+      margin-right: 10px;
+    }
+    .rate {
+      color: #ffcc00;
+      font-size: 30px;
+      margin-left: 10px;
+    }
+  }
+}
+</style>
--
libgit2 0.21.0