xcx

package.json

@@ -9,7 +9,8 @@
   },
   "dependencies": {
     "element-ui": "^2.4.6",
-    "vue": "^2.5.17"
+    "vue": "^2.5.17",
+    "weixin-js-sdk": "^1.3.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.0.1",

src/components/caseTableItem/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="caseTableItem flex-h">
-    <i class="iconfont icon-yinchenglogo"></i>
+    <!-- <i class="iconfont icon-yinchenglogo"></i> -->
+    <img :src="icon" class="iconfont icon-yinchenglogo">
     <div class="itemNo">
       <a>
         <div class="centerLabel">
@@ -22,7 +23,7 @@
 
 export default {
   name: '',
-  props: ['item','index'],
+  props: ['item','index','icon'],
   data () {
     return {
       

src/components/caseTableItem/page.scss

@@ -3,12 +3,25 @@
   position: relative;
   overflow: hidden;
   align-items: center;
-  &>i{
+  &>img{
+    display: inline-block;
+    position: absolute;
+    right: .06rem;
+    top: 50%;
+    transform: translateY(-50%);
+    -webkit-transform: translateY(-50%);
+    width: .36rem;
+    z-index: 1;
+    opacity: .3;
+  }
+  &>img{
     display: inline-block;
     position: absolute;
     right: .1rem;
     top: .05rem;
-    font-size: .36rem;
+    // font-size: .36rem;
+    width: .4rem;
+    height: .4rem;
     z-index: 1;
     color: rgba(255, 0, 0, .1);
   }

src/components/courseItem/index.vue

@@ -19,8 +19,8 @@
               <span>优惠券体验</span>
             </div>
           </div>
-          <span>时间：{{data.time}}</span>
           <span>地点：{{data.address}}</span>
+          <span>备注：{{data.remark}}</span>
         </div>
       </div>
       <ul v-if="data.getWay=='ticket'">

src/components/myCard/myCard.vue

@@ -8,7 +8,7 @@
       </div>
       <div>
         <h2>{{data.title}}</h2>
-        <span>{{data.desc}}</span>
+        <span class="descs">{{data.desc}}</span>
         <span>{{data.startDate}}-{{data.endDate}}</span>
       </div>
     </div>
@@ -58,7 +58,7 @@ export default {
   },
   methods: {
     share () {
-      if(!this.data.invalid){
+      if (!this.data.invalid) {
         this.$emit('share', this.data)
       }
     }
@@ -79,6 +79,13 @@ export default {
     height: 0.88rem;
     padding: 0.1rem;
     box-sizing: border-box;
+    .descs {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+    }
     div:nth-of-type(1) {
       width: 1.2rem;
       position: relative;
@@ -151,7 +158,7 @@ export default {
     background-color: #fc6243;
     text-align: center;
     color: #fff;
-    border-radius: 0 0 .08rem .08rem;
+    border-radius: 0 0 0.08rem 0.08rem;
   }
 }
 </style>

src/components/orderItem/index.vue

@@ -17,7 +17,7 @@
             <span>￥{{data.price}}</span>
           </div>
         </div>
-        <i class="iconfont icon-jian" @click="subtract" v-if="!data.spec.length && data.status === 1"></i>
+        <i class="iconfont icon-jian" :class="{'active': defaultNum > 0}" @click="subtract" v-if="!data.spec.length && data.status === 1"></i>
         <input v-if="!data.spec.length && data.status === 1" type="tel" @input="input" v-model="defaultNum">
         <i class="iconfont icon-jia" :class="{'active': defaultNum > 0}" @click="add" v-if="!data.spec.length && data.status === 1"></i>
         <a v-if="data.spec.length && data.status === 1" @click="selectSpec">选规格</a>

src/components/orderListItem/index.vue

@@ -66,6 +66,9 @@ export default {
     returnStatus (val) {
       for (var n = 0; n < dict.orderStatus.length; n++) {
         if(val === dict.orderStatus[n].key){
+          if (dict.orderStatus[n].value === '已下单'){
+            dict.orderStatus[n].value = '制作中'
+          }
           return dict.orderStatus[n].value
         }
       }

src/pages/bodyCheck/index/index.vue

@@ -5,7 +5,7 @@
       <div class="userInfo flex-h">
         <div class="flex-item">
           <span>{{user.Name}}</span>
-          <span>{{user.Sex=='0' ? '先生' : '女士'}}</span>
+          <!-- <span>{{user.Sex=='0' ? '先生' : '女士'}}</span> -->
         </div>
         <div>
           <span>体检时间</span>
@@ -40,7 +40,7 @@ import title from '../../../common/icon/title.png'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapBodyCheckState, mapActions: mapBodyCheckActions } = createNamespacedHelpers('bodyCheck')
 export default {
-  data() {
+  data () {
     return {
       title,
       ishidden: true,
@@ -54,12 +54,12 @@ export default {
       user: x => x.user
     })
   },
-  methods:{
+  methods: {
     ...mapBodyCheckActions(['getBodyCheck']),
-    linkTo(url){
-      window.location.href=url
+    linkTo (url) {
+      window.location.href = url
     },
-    loaded() {
+    loaded () {
       var _that = this
       setTimeout(() => {
         // Indicator.close()
@@ -67,21 +67,23 @@ export default {
       }, 500)
     },
   },
-  beforeMount() {
+  beforeMount () {
     // Indicator.open()
   },
-  created() {
+  created () {
     this.getBodyCheck().then(() => {
       this.showPage = true
+    }).catch(() => {
+      this.showPage = true
     })
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 
-.bg-white{
+.bg-white {
   width: 100%;
   height: 100%;
   position: absolute;

src/pages/sales/login/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="mainPage">
+  <div class="mainPage" v-if="showPage">
     <div class="mask">
-      <img :src="logo" class="logo" alt="">
+      <!-- <img :src="logo" class="logo" alt=""> -->
       <div class="centerLabel" style="width:100%;">
         <div class="box" style="margin:0 auto;">
           <div class="title">登录</div>
@@ -14,7 +14,7 @@
           <div class="sms" style="margin-top:.2rem;">
             <i class="iconfont icon-mima"></i>
             <input type="number" maxlength="6" placeholder="验证码" v-model="postData.captcha">
-            <div class="sand" v-if="seconds === 60" @click="sandMsg">发送验证码</div>
+            <div class="sand" v-if="seconds === 61" @click="sandMsg">发送验证码</div>
             <div class="sand" v-else>{{seconds}}后可重发</div>
           </div>
         </div>
@@ -56,19 +56,26 @@ import logo from '../../../common/icon/logo.png'
 import { createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
 const { mapActions: mapLoginActions } = createNamespacedHelpers('login')
+const { mapState: mapUserState } = createNamespacedHelpers('userCenter')
 export default {
   data () {
     return {
       logo,
+      showPage: false,
       showCase: false,
       showSales: false,
-      seconds: 60,
+      seconds: 61,
       postData: {
         phone: '',
         captcha: ''
       }
     }
   },
+  computed: {
+    ...mapUserState({
+      userInfo: x => x.userInfo
+    }),
+  },
   methods: {
     ...actions(['getCaptcha']),
     ...mapLoginActions(['submitData']),
@@ -77,7 +84,13 @@ export default {
         this.$toast('请先填写手机号')
         return
       }
+      let reg = /^1[0-9]{10}$/
+      if (!reg.test(this.postData.phone)) {
+        this.$toast('请填写正确的手机号')
+        return
+      }
       this.getCaptcha(this.postData.phone)
+      this.seconds = 60
       this.runTime()
     },
     runTime () {
@@ -86,17 +99,22 @@ export default {
         if (this.seconds < 60 && this.seconds >= 1) {
           this.runTime()
         } else if (this.seconds < 1) {
-          this.seconds = 59
+          this.seconds = 61
         }
       }, 1000)
     },
     getUrl (val) {
       var url = window.location.pathname
-      return url.replace('sales.html', 'user.html') + '#/' + val
+      return url.replace('sales.html', 'user.html') + '#/' + val + '?hideTabbar=1'
     },
     submit () {
       if (!this.postData.captcha) {
-        this.$toast('请先获取验证码')
+        this.$toast('请填写验证码')
+        return
+      }
+      let reg = /^[0-9]{6}$/
+      if (!reg.test(this.postData.captcha)) {
+        this.$toast('验证码格式不正确')
         return
       }
       // console.log(this.postData)
@@ -105,10 +123,18 @@ export default {
         window.location.href = this.getUrl('mainPage/coffeeIndex')
       })
     }
+  },
+  created () {
+    if (this.userInfo.customer.MapUser) {
+      window.location.href = this.getUrl('mainPage/coffeeIndex')
+      return
+    } else {
+      this.showPage = true
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/sales/login/page.scss

@@ -2,6 +2,9 @@
   background: url("../../../common/icon/bg.jpg") no-repeat 0 -0.8rem;
   background-size: 100% calc(100% + 90px);
   position: relative;
+  input::-webkit-input-placeholder {
+    color: rgba(168,182,200,1);
+  }
   .mask{
     width: 100%;
     height: 100%;
@@ -50,8 +53,8 @@
           font-size: .18rem;
         }
         input{
-          flex: 1;
           height: 100%;
+          width: 1.4rem;
         }
         .sand{
           padding: 0 .1rem;

src/pages/user/App.vue

@@ -40,8 +40,6 @@ export default {
       link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
       thu_image: `${window.location.origin}${window.location.pathname}${logo}`
     })
-    // 计算距离方法
-    console.log(this.toolClass.getGreatCircleDistance(117.225495, 39.133713, 117.225962, 39.132573))
   },
   methods: {
     ...actions(['getUserInfo'])

src/pages/user/bindMobile/bindMobile.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage">
     <div class="mask">
-      <img :src="logo" class="logo" alt="">
+      <!-- <img :src="logo" class="logo" alt=""> -->
       <div class="box">
         <div class="title">绑定</div>
 
@@ -25,7 +25,7 @@
         <div class="sms">
           <i class="iconfont icon-mima"></i>
           <input type="number" maxlength="6" placeholder="验证码" v-model="postData.captcha">
-          <div class="sand" v-if="seconds === 60" @click="sandMsg">发送验证码</div>
+          <div class="sand" v-if="seconds === 61" @click="sandMsg">发送验证码</div>
           <div class="sand" v-else>{{seconds}}后可重发</div>
         </div>
 
@@ -75,7 +75,7 @@ export default {
       columnsS: [],
       caseName: '选择案场',
       salesName: '选择销售',
-      seconds: 60,
+      seconds: 61,
       postData: {
         phone: '',
         case: '',
@@ -142,6 +142,7 @@ export default {
         return
       }
       this.getCaptcha(this.postData.phone)
+      this.seconds = 60
       this.runTime()
     },
     runTime () {
@@ -150,34 +151,33 @@ export default {
         if (this.seconds < 60 && this.seconds >= 1) {
           this.runTime()
         } else if (this.seconds < 1) {
-          this.seconds = 60
+          this.seconds = 61
         }
       }, 1000)
     },
     submit () {
-      var _that = this
       if (!this.postData.captcha) {
-        this.$toast('请先获取验证码')
-        return
-      }
-      if (!this.postData.case) {
-        this.$toast('请选择案场')
-        return
-      }
-      if (!this.postData.sales) {
-        this.$toast('请选择销售')
+        this.$toast('请填写验证码')
         return
       }
+      // if (!this.postData.case) {
+      //   this.$toast('请选择案场')
+      //   return
+      // }
+      // if (!this.postData.sales) {
+      //   this.$toast('请选择销售')
+      //   return
+      // }
       this.submitData(this.postData).then((res) => {
         this.$toast(res)
         if (this.$route.query.isLottery) {
           setTimeout(() => {
             const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}` : ''
-            window.location.href = `/game/luckdraw/${from}`
+            window.location.href = `${window.location.origin}/game/luckdraw/${from}`
           }, 2000)
         } else {
-          setTimeout(function () {
-            // _that.$router.push({name: 'userCenter'})
+          setTimeout(() => {
+            // this.$router.push({name: 'userCenter'})
             window.history.go(-1)
           }, 300)
         }

src/pages/user/bindMobile/page.scss

@@ -2,6 +2,9 @@
   background: url("../../../common/icon/bg.jpg") no-repeat 0 -0.8rem;
   background-size: 100% calc(100% + 90px);
   position: relative;
+  input::-webkit-input-placeholder {
+    color: rgba(168,182,200,1);
+  }
   .mask{
     width: 100%;
     height: 100%;

src/pages/user/card/index.vue

@@ -140,7 +140,9 @@ export default {
       this.getList('change')
     },
     toUse (item) {
-      // console.log(item)
+      console.log(item)
+      this.$router.push({ name: 'lessonDetail', query: {id: item.CustomerCourseId} })
+      // this.$router.push({ name: 'lessonOrder' })
     },
     getList (param) {
       if (this.active === 0) {

src/pages/user/coupons/index.vue

@@ -1,13 +1,9 @@
 <template>
   <div class="mainPage">
-    <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'>
-      <div class="box">
-        <router-link tag="div" v-for="(item,index) in list" :key='index' :to="{name: 'couponsDetail', query: {id: item.customercouponid}}">
-          <discounts @toUse='toUse' :data='item'></discounts>
-        </router-link>
-        <noMore v-if="hasPic"></noMore>
-      </div>
-    </scroll>
+    <div class="box">
+      <discounts @toUse='toUse' :data='item' @toDetail="toDetail" v-for="(item,index) in list" :key="index"></discounts>
+      <noMore v-if="hasPic"></noMore>
+    </div>
   </div>
 </template>
 
@@ -46,19 +42,6 @@ export default {
     noMore,
     discounts
   },
-  computed: {
-    pullUpLoadObj: function () {
-      return this.pullUpLoad
-        ? {
-          threshold: parseInt(this.pullUpLoadThreshold),
-          txt: {
-            more: this.pullUpLoadMoreTxt,
-            noMore: this.pullUpLoadNoMoreTxt
-          }
-        }
-        : false
-    }
-  },
   created () {
     this.getCouponList().then((res) => {
       // console.log(JSON.stringify(res))
@@ -71,7 +54,8 @@ export default {
           useType: res[n].Status === 1 ? '未使用' : '已使用',
           tag: res[n].Coupon.CouponType === 'coupon' ? '课程' : '商品',
           customercouponid: res[n].CustomerCouponId,
-          couponid: res[n].Coupon.CouponId
+          couponid: res[n].Coupon.CouponId,
+          Coupon: res[n].Coupon
         })
       }
     })
@@ -84,10 +68,19 @@ export default {
       this.active = index
     },
     toUse (item) {
-      // console.log(item)
+      console.log(item)
+      if (item.Coupon.Targets.length > 1) {
+        this.$router.push({ name: 'indexPage' })
+      } else {
+        if (item.tag === '商品') {
+          this.$router.push({ name: 'coffeeIndex' })
+        } else {
+          this.$router.push({ name: 'majorProjectsDetail', query: { id: item.Coupon.Targets[0].TargetId } })
+        }
+      }
     },
-    getList () {
-      // console.log(111)
+    toDetail (item) {
+      this.$router.push({ name: 'couponsDetail', query: { id: item.customercouponid } })
     }
   }
 }

src/pages/user/fiveA/index.vue

@@ -24,7 +24,7 @@
             </ul>
             <span v-if="fiveANoData" style="width:100%;line-height:.3rem;display:block;text-align:center;color:#ccc;margin-bottom:.1rem;">暂无数据</span>
           </div>
-          <router-link :to="{name:'',query:{}}" class="more" v-if="!fiveANoData">查看更多</router-link>
+          <router-link :to="{name:'',query:{}}" class="more">查看更多</router-link>
           <div style="width:100%;height:.1rem;background:#f8f8f8;margin:0 auto;"></div>
           <h5>资讯</h5>
           <div class="newsList flex-h">
@@ -150,7 +150,7 @@ export default {
           id: arr[n].CourseId,
           title: arr[n].CourseName,
           img: arr[n].CourseImg,
-          time: this.toolClass.dateFormat(arr[n].BeginDate),
+          remark: arr[n].Remark,
           address: arr[n].CaseInfo.CaseAddress,
           tag: arr[n].CourseTags || [],
           courseType: '',
@@ -163,11 +163,11 @@ export default {
       // console.log(item)
       item.ForwardType = item.ForwardType || ''
       if (item.ForwardType === 'url') {
-        window.location.href = '//' + item.ForwardUrl
+        window.location.href = item.ForwardUrl
       } else if (item.ForwardType === 'course') {
         this.$router.push({ name: '', query: { id: item.ForwardResourceId } }) // 此处去课程详情
       } else {
-        window.location.href = '//' + item.InfoUrl
+        window.location.href = item.InfoUrl
       }
     }
   }

src/pages/user/mainPage/coffeeIndex/index.vue

@@ -29,12 +29,13 @@
                     <ul class="areaList">
                       <li v-for="(item,index) in CaseTableList" :key="index">
                         <div class="title">
-                          <i class="iconfont icon-yinchenglogo"></i>
+                          <!-- <i class="iconfont icon-yinchenglogo"></i> -->
+                          <img :src="item.AreaIcon" class="iconfont icon-yinchenglogo">
                           <span>{{item.AreaName}}</span>
                         </div>
                         <ul class="subAreaList flex-h">
                           <router-link tag="li" class="flex-item flex-h" v-for="(subItem,subIndex) in item.Tables" :key="subIndex" :to="{name: 'placeOrder', query: { tableid: encodeURI(subItem.TableId), tableno: encodeURI(subItem.TableNo), caseid: encodeURI(subItem.CaseId), casename: encodeURI(topCaseInfoData.caseName), areaid: encodeURI(subItem.AreaId), areaname: encodeURI(item.AreaName)}}">
-                            <caseTableItem :item="subItem" :index="subIndex"></caseTableItem>
+                            <caseTableItem :icon="item.AreaIcon" :item="subItem" :index="subIndex"></caseTableItem>
                           </router-link>
                           <li class="flex-item noData" v-if="(item.Tables || []).length % 2 != 0"></li>
                         </ul>
@@ -53,7 +54,7 @@
                       <span>￥{{cardTotalCount}}</span>
                     </div>
                   </div>
-                  <a @click="toSalesHistory">销售记录</a>
+                  <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
                 </div>
                 <myCard v-for="(item,index) in data[1].list" :key="index" :data='item' @share='shareCard'></myCard>
               </div>
@@ -132,6 +133,7 @@ const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForC
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
 const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('myCard')
 const { mapActions: mapUserCenterActions } = createNamespacedHelpers('userCenter')
+const wx = require('weixin-js-sdk')
 
 export default {
   name: '',
@@ -184,7 +186,7 @@ export default {
       topCaseInfoData: {
         caseName: '',
         caseId: '',
-        ShowSelect: true,
+        ShowSelect: false,
       },
       caseInfo: {
         value: '',
@@ -231,17 +233,6 @@ export default {
     }
   },
   computed: {
-    pullUpLoadObj: function () {
-      return this.pullUpLoad
-        ? {
-          threshold: parseInt(this.pullUpLoadThreshold),
-          txt: {
-            more: this.pullUpLoadMoreTxt,
-            noMore: this.pullUpLoadNoMoreTxt
-          }
-        }
-        : false
-    },
     ...mapState({
       userInfo: x => x.userCenter.userInfo,
       CaseList: x => x.app.CaseList,
@@ -327,6 +318,8 @@ export default {
           this.cardTotalCount = count.toFixed(2)
         })
       })
+    } else {
+
     }
     this.getCaseList().then((res) => {
       this.locationMapping()
@@ -427,45 +420,50 @@ export default {
       window.location.href = this.getUrl('customerSearch')
     },
     locationMapping () {
-      // wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-      //   title: '城的空间',
-      //   desc: '城的空间',
-      //   link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
-      //   thu_image: `${window.location.origin}${window.location.pathname}${logo}`
-      // }).then(() => {
-      //   wx.getLocation({
-      //     type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-      //     success: function (res) {
-      //       let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
-      //       let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
-      //       for (let i = 0; i < this.CaseList.length; i++) {
-      //         let result = this.CaseList[i].Coordinate.split(",")
-      //         let latitude2 = parseFloat(result[0])
-      //         let longitude2 = parseFloat(result[1])
-      //         if (this.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
-      //           this.topCaseInfoData.caseName = this.CaseList[i].CaseName
-      //           this.topCaseInfoData.caseId = this.CaseList[i].CaseId
-      //           this.getCaseTableList({
-      //             caseid: this.topCaseInfoData.caseId
-      //           })
-      //           this.getCaseTotal({
-      //             caseid: this.topCaseInfoData.caseId
-      //           })
-      //         }
-      //       }
-      //       if (!this.topCaseInfoData.caseId || !this.topCaseInfoData.caseName){
-      //         this.topCaseInfoData.caseName = '当前位置无案场'
-      //       }
-      //     }
-      //   })
-      // })
-      this.topCaseInfoData.caseName = this.CaseList[0].CaseName
-      this.topCaseInfoData.caseId = this.CaseList[0].CaseId
-      this.getCaseTableList({
-        caseid: this.topCaseInfoData.caseId
+      let that = this
+      that.topCaseInfoData.caseName = that.CaseList[0].CaseName
+      that.topCaseInfoData.caseId = that.CaseList[0].CaseId
+      that.getCaseTableList({
+        caseid: that.topCaseInfoData.caseId
       })
-      this.getCaseTotal({
-        caseid: this.topCaseInfoData.caseId
+      if (this.userInfo.customer.MapUser !== '') {
+        that.getCaseTotal({
+          caseid: that.topCaseInfoData.caseId
+        })
+      }
+      wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+        title: '城的空间',
+        desc: '城的空间',
+        link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
+        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+      }).then(() => {
+        wx.getLocation({
+          type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+          success: function (res) {
+            let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
+            let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
+            for (let i = 0; i < that.CaseList.length; i++) {
+              let result = that.CaseList[i].Coordinate.split(",")
+              let latitude2 = parseFloat(result[0])
+              let longitude2 = parseFloat(result[1])
+              if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
+                that.topCaseInfoData.caseName = that.CaseList[i].CaseName
+                that.topCaseInfoData.caseId = that.CaseList[i].CaseId
+                that.getCaseTableList({
+                  caseid: that.topCaseInfoData.caseId
+                })
+                if (this.userInfo.customer.MapUser !== '') {
+                  that.getCaseTotal({
+                    caseid: that.topCaseInfoData.caseId
+                  })
+                }
+              }
+            }
+            if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName) {
+              that.topCaseInfoData.caseName = '当前位置无案场'
+            }
+          }
+        })
       })
     },
     beforeClose (action, done) {

src/pages/user/mainPage/coffeeIndex/page.scss

@@ -105,12 +105,17 @@
                       margin-top: .22rem;
                       *{
                         line-height: .26rem;
+                        display: inline-block;
+                        vertical-align: middle;
                         font-size: .14rem;
                       }
-                      i{
-                        color: red;
-                        margin-right: .05rem;
+                      img{
+                        width: .2rem;
                       }
+                      // i{
+                      //   color: red;
+                      //   margin-right: .05rem;
+                      // }
                     }
                     .subAreaList{
                       position: relative;

src/pages/user/mainPage/index.vue

@@ -5,8 +5,8 @@
         <router-view></router-view>
       </div>
     </div>
-    <nav class="flex-h" v-if="!userInfo.customer.MapUser">
-      <router-link :to="{name:item.pathName,query:{}}" class="flex-item" active-class="active" v-for="(item, index) in tabBar" :key="index">
+    <nav class="flex-h">
+      <router-link :to="{name:item.pathName,query:{}}" v-if="showTabBar" class="flex-item" active-class="active" v-for="(item, index) in tabBar" :key="index">
         <div>
           <img v-if="index==0" class="centerLabel" src="../../../common/icon/tabBar-icon-1.png" alt="">
           <img v-if="index==1" class="centerLabel" src="../../../common/icon/tabBar-icon-2.png" alt="">
@@ -33,7 +33,8 @@ export default {
       }, {
         pathName: 'userCenter',
         name: '会员'
-      }]
+      }],
+      showTabBar: false
     }
   },
   computed: {
@@ -45,7 +46,11 @@ export default {
 
   },
   created () {
-
+    console.log(this.$route.query)
+    console.log(this.userInfo)
+    if (!this.userInfo.customer.MapUser || !this.$route.query.hideTabbar) {
+      this.showTabBar = true
+    }
   },
   methods: {
 

src/pages/user/mainPage/indexPage/index.vue

@@ -73,6 +73,7 @@ import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapIndexActions } = createNamespacedHelpers('index')
+const { mapState: mapUserState } = createNamespacedHelpers('userCenter')
 export default {
   name: '',
   data () {
@@ -99,6 +100,9 @@ export default {
     }
   },
   computed: {
+    ...mapUserState({
+      userInfo: x => x.userInfo
+    }),
     ...mapState({
       orgid: x => x.app.orgId,
       fiveA: x => x.index.fiveA,
@@ -145,11 +149,11 @@ export default {
     jump (item) {
       item.ForwardType = item.ForwardType || ''
       if (item.ForwardType === 'url') {
-        window.location.href = '//' + item.ForwardUrl
+        window.location.href = item.ForwardUrl
       } else if (item.ForwardType === 'course') {
         this.$router.push({ name: '', query: { id: item.ForwardResourceId } }) // 此处去课程详情
       } else {
-        window.location.href = '//' + item.InfoUrl
+        window.location.href = item.InfoUrl
       }
     }
   }

src/pages/user/mainPage/userCenter/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage">
     <div class="loading" v-if="isLoading">
-      <div @click="bindMobile">请绑定手机号</div>
+      <!-- <div @click="bindMobile">请绑定手机号</div> -->
     </div>
     <div v-else>
       <div class="userTop_view" >
@@ -14,7 +14,8 @@
         </div>
         <div class="uesr-info">
           <div class="user-name">{{user.Name}}</div>
-          <div class="mobile">{{user.Phone}}</div>
+          <div class="mobile" v-if="user.Phone">{{user.Phone}}</div>
+          <div class="mobile" v-else @click="bindMobile">绑定手机号</div>
         </div>
       </div>
       <div class="vip-privilege flex-h">
@@ -23,21 +24,21 @@
             <img src="../../../../common/icon/userCenter-icon-1.png" width="100%" height="100%" alt="">
           </div>
           <span>优惠券</span>
-          <span>2张未使用</span>
+          <span>{{Nums.couponnum || 0}}张未使用</span>
         </div>
         <div class="flex-item privilege-item" @click="toCard">
           <div class="img-box">
             <img src="../../../../common/icon/userCenter-icon-2.png" width="100%" height="100%" alt="">
           </div>
           <span>卡券</span>
-          <span>2张未使用</span>
+          <span>{{Nums.cardsnum || 0}}张未使用</span>
         </div>
         <div class="flex-item privilege-item" @click="toVip">
           <div class="img-box">
             <img src="../../../../common/icon/userCenter-icon-3.png" width="100%" height="100%" alt="">
           </div>
           <span>VIP卡</span>
-          <span>￥200 <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i></span>
+          <span>￥{{(Nums.account || {}).Amount || 0}} <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i></span>
         </div>
       </div>
 
@@ -77,7 +78,8 @@ export default {
   computed: {
     ...mapState({
       userInfo: x => x.userCenter.userInfo,
-      org: x => x.app.orgId
+      org: x => x.app.orgId,
+      Nums: x => x.userCenter.Nums
     })
   },
   components: {
@@ -85,16 +87,17 @@ export default {
   },
   mounted () {
     this.getUserInfo({ org: this.org }).then(() => {
-      if (this.userInfo != 406) {
+      if (this.userInfo) {
         this.user = this.userInfo.customer
         this.AccountInfo = JSON.parse(this.user.AccountInfo)
         this.headimgurl = this.AccountInfo.headimgurl
         this.isLoading = false
       }
     })
+    this.getNum()
   },
   methods: {
-    ...actions(['getUserInfo']),
+    ...actions(['getUserInfo', 'getNum']),
     toLessonOrder () {
       this.$router.push({ name: 'lessonOrder' })
     },
@@ -114,7 +117,7 @@ export default {
       this.$router.push({ name: 'orderList' })
     },
     toBodyCheck () {
-      window.location.href = `/bodyCheck.html#/`
+      window.location.href = `${window.location.origin}/c-v2/bodyCheck.html#/`
     },
     toLuckdraw () {
       // ^参数约定为97
@@ -122,7 +125,7 @@ export default {
       let num = Math.floor(Math.random() * 10 + 1) * 100 + Math.floor(Math.random() * 10 + 1) * 10 + Math.floor(Math.random() * 10 + 1)
       num = num >= 1000 ? 999 : num
       userid = parseInt(`${userid}${num}`) ^ 97
-      window.location.href = `/game/luckdraw/#/lotteryList?from=${userid}`
+      window.location.href = `${window.location.origin}/game/luckdraw/#/lotteryList?from=${userid}`
     }
   }
 }

src/pages/user/majorProjects/index.vue

@@ -14,7 +14,7 @@
       <div class="flex-item">
         <div v-for="(item,index) in courseList" :key="index">
           <span>{{item.month+1}}月</span>
-          <ul>
+          <ul class="items">
             <router-link tag="li" v-for="(subItem,subIndex) in item.list" :key="subIndex" :to="{name: 'majorProjectsDetail', query: {id: subItem.id}}" class="flex-h">
               <div class="flex-item">
                 <div>
@@ -27,7 +27,7 @@
         <div class="cutLine"></div>
         <div>
           <span>关注我们</span>
-          <ul>
+          <ul class="items">
             <li class="flex-h">
               <div class="bottom flex-item flex-h">
                 <div class="flex-item flex-h">

src/pages/user/majorProjects/page.scss

@@ -26,6 +26,9 @@
       }
     }
   }
+  .items{
+    width: 3.33rem;
+  }
   p{
     width: 100%;
     box-sizing: border-box;

src/pages/user/majorProjectsDetail/index.vue

@@ -64,21 +64,25 @@
           <span>优惠券体验</span>
         </div>
       </div>
-      <router-link :to="{name: 'placeOrderForCourse', query: {id: courseDetail.CourseId}}">去购买</router-link>
+      <a @click="toBuy">去购买</a>
     </div>
   </div>
 </template>
 
 <script>
+import wxsdk from '../../../util/share'
+import logo from '../../../common/icon/indexlogo.jpg'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapProjectActions, mapState: mapProjectState } = createNamespacedHelpers('majorProjects')
+const wx = require('weixin-js-sdk')
 
 export default {
   name: '',
   data () {
     return {
+      logo,
       swiperOption: {
         observer: true,
         autoplay: {
@@ -156,6 +160,15 @@ export default {
     triggerCourseTime () { // 显隐更多课程时间
       this.showMoreCourse = !this.showMoreCourse
     },
+    toBuy () {
+      let nowDate = Date.now()
+      let endData = new Date(this.courseDetail.EndDate).getTime()
+      if (nowDate > endData) {
+        this.$toast('该课程已过期')
+      } else {
+        this.$router.push({ name: 'placeOrderForCourse', query: { id: this.courseDetail.CourseId } })
+      }
+    }
   }
 }
 </script>

src/pages/user/placeOrder/index.vue

@@ -20,7 +20,6 @@
           </div>
         </div>
         <a @click="reback">返回选择桌号</a>
-        <!-- <router-link :to="{name: 'coffeeIndex', query: {}}">返回选择桌号</router-link> -->
       </div>
       <div class="content flex-item flex-h">
         <div class="slideMenus">
@@ -67,7 +66,6 @@
           <!-- <i class="iconfont" :class="{'icon-jiantou-up': !showCalcMenu,'icon-jiantou-down': showCalcMenu}" @click="showCalcMenu = true"></i> -->
         </div>
       </div>
-      <!-- <router-link :to="{name: 'placeOrderDetail', query: {info: JSON.stringify(settlementList), caseid: encodeURI(caseId), areaid: encodeURI(areaId), areaname: encodeURI(areaName), areaid: encodeURI(areaId), tableid: encodeURI(tableId), tableno: encodeURI(tableNo)}}">下单</router-link> -->
       <a @click="toPlaceOrder">下单</a>
     </div>
     <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
@@ -208,13 +206,13 @@ export default {
           this.$router.push({ name: 'placeOrderDetail', query: { info: JSON.stringify(this.selGoods), caseid: encodeURI(this.caseId), areaid: encodeURI(this.areaId), areaname: encodeURI(this.areaName), areaid: encodeURI(this.areaId), tableid: encodeURI(this.tableId), tableno: encodeURI(this.tableNo) } })
         } else {
           this.showCalcMenu = true
-        } 
+        }
       } else {
         this.$toast('您还没有选择商品哦~')
       }
     },
     mapArr () { // 匹配商品规格
-      var aArr = this.goodsTypeList, bArr = this.goodsList
+      var aArr = (this.goodsTypeList || []), bArr = (this.goodsList || [])
       for (var n = 0; n < aArr.length; n++) {
         aArr[n].list = []
         for (var a = 0; a < bArr.length; a++) {
@@ -261,11 +259,11 @@ export default {
         title: '提示',
         message: '返回页面将清空当前选择的商品，确定要返回吗?'
       }).then(() => {
-        this.$router.push({ name: 'coffeeIndex' })
+        // this.$router.push({ name: 'coffeeIndex' })
+        window.history.go(-1)
       })
     },
     placeOrder () { // 下单
-      // this.$router.push({ name: 'orderList', query: {} })
       this.postData.info.OrgId = this.orgId
       this.postData.info.UserId = this.userInfo.CustomerId
       this.postData.info.UserName = this.userInfo.customer.CustomerName
@@ -281,10 +279,10 @@ export default {
           SpecId: orderInfo[n].spec,
           SpecName: orderInfo[n].specname,
           Number: orderInfo[n].num - 0,
-          Price: String(orderInfo[n].price-0),
+          Price: String(orderInfo[n].price - 0),
         })
-        amount += (orderInfo[n].price-0) * orderInfo[n].num
-        num += orderInfo[n].num-0
+        amount += (orderInfo[n].price - 0) * orderInfo[n].num
+        num += orderInfo[n].num - 0
       }
       this.postData.info.Amount = String(amount)
       this.postData.info.OrdersNum = num
@@ -297,7 +295,7 @@ export default {
         this.$dialog.alert({
           message: '下单成功！'
         }).then(() => {
-          this.$router.push({name: 'orderList'})
+          this.$router.push({ name: 'orderList' })
         })
       })
     },
@@ -337,7 +335,9 @@ export default {
           specname: (val.specname || ''),
         })
       } else {
-        this.selGoods.splice(this.selGoods.findIndex(item => item.id === val.id && item.spec === (val.spec || '')), 1)
+        if (val.defaultNum === 0) {
+          this.selGoods.splice(this.selGoods.findIndex(item => item.id === val.id && item.spec === (val.spec || '')), 1)
+        }
       }
     },
     calcTotalNum () { // 计算总数量、价格

src/pages/user/placeOrderForCourse/index.vue

@@ -48,14 +48,14 @@
               </li>
             </ul>
             <div class="selectTicket">
-              <div class="flex-h" @click="showLayer = true">
+              <div class="flex-h" @click="couponList.length ? showLayer = true : showLayer = false">
                 <div class="flex-item">
                   <div>
                     <span>优惠信息</span>
                   </div>
                 </div>
                 <span>{{postData.customercouponid == '' ? '暂未选择优惠券' : '已选择优惠券'}}</span>
-                <i class="iconfont icon-jiantou-right"></i>
+                <i class="iconfont icon-jiantou-right" v-if="couponList.length"></i>
               </div>
               <div class="flex-h">
                 <div class="flex-item">
@@ -78,11 +78,10 @@
               </div>
             </div>
             <div class="protocol">
-              <div>1、协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容</div>
-              <div>2、协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容</div>
-              <div>3、协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容</div>
-              <div>4、协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容</div>
-              <div>5、协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容</div>
+              <div>1. 甲方具有为乙方更换教练的权利及责任。(当甲方为乙方安排的教练因故离职或乙方认 为甲方的教练无法胜任对其的指导工作时,甲方应为乙方另行安排教练)。</div>
+              <div>2. 甲方必须保证乙方享有与教练一对多的指导，甲方教练上课中出现违规时乙方有权投诉。</div>
+              <div>3. 乙方承诺其身体状况已被医疗机构确认良好，适宜接受本协议约定的训练课程,即身体 状况完全正常，不存在运动风险及潜在运动风险。如若隐瞒，出现后果由乙方自负。</div>
+              <div>4. 乙方承诺其身体状况完全符合使用甲方器械以及完成课程内容的条件和能力。若因乙方 未提供既往病史或谎报病史而引起的运动伤害,后果由乙方自负。</div>
             </div>
           </div>
         </div>
@@ -131,7 +130,7 @@ export default {
     return {
       couponList: [],
       getCouponOff: false,
-      agreementOff: false, // 是否同意协议
+      agreementOff: true, // 是否同意协议
       courseTimeList: [],
       postData: {
         CouponId: '',
@@ -163,39 +162,39 @@ export default {
       this.getCourseDetailInfo({ id: this.$route.query.id }).then((res) => {
         var arr = res.CourseDetail
         this.courseTimeList = arr.sort(function (a, b) { return new Date(a.BeginDate).getTime() > new Date(b.BeginDate).getTime() ? 1 : -1 })
-      })
-      var id = this.$route.query.id, arr = [], nowDate = Date.now()
-      for (var n = 0; n < res.length; n++) {
-        if (res[n].Coupon.CouponType === 'coupon' && res[n].Status === 1) {
-          if (res[n].Coupon.IsAll) {
-            this.couponList.push({
-              title: res[n].Coupon.CouponName,
-              desc: res[n].Coupon.Share.UseInstruction,
-              time: this.toolClass.dateFormat(res[n].EndDate),
-              useType: '未使用',
-              tag: '课程',
-              id: res[n].CustomerCouponId,
-              select: false,
-            })
-          } else {
-            for (var a = 0; a < res[n].Coupon.Targets.length; a++) {
-              if (res[n].Coupon.Targets[a].TargetId === id && nowDate >= new Date(res[n].StartDate).getTime() && nowDate < new Date(res[n].EndDate).getTime()) {
-                this.couponList.push({
-                  title: res[n].Coupon.CouponName,
-                  desc: res[n].Coupon.Share.UseInstruction,
-                  time: this.toolClass.dateFormat(res[n].EndDate),
-                  useType: '未使用',
-                  tag: '课程',
-                  id: res[n].CustomerCouponId,
-                  select: false,
-                })
+        var id = this.$route.query.id, arr = [], nowDate = Date.now()
+        for (var n = 0; n < res.length; n++) {
+          if (res[n].Coupon.CouponType === 'coupon' && res[n].Status === 1) {
+            if (res[n].Coupon.IsAll) {
+              this.couponList.push({
+                title: res[n].Coupon.CouponName,
+                desc: res[n].Coupon.Share.UseInstruction,
+                time: this.toolClass.dateFormat(res[n].EndDate),
+                useType: '未使用',
+                tag: '课程',
+                id: res[n].CustomerCouponId,
+                select: false,
+              })
+            } else {
+              for (var a = 0; a < res[n].Coupon.Targets.length; a++) {
+                if (res[n].Coupon.Targets[a].TargetId === id && nowDate >= new Date(res[n].StartDate).getTime() && nowDate < new Date(res[n].EndDate).getTime()) {
+                  this.couponList.push({
+                    title: res[n].Coupon.CouponName,
+                    desc: res[n].Coupon.Share.UseInstruction,
+                    time: this.toolClass.dateFormat(res[n].EndDate),
+                    useType: '未使用',
+                    tag: '课程',
+                    id: res[n].CustomerCouponId,
+                    select: false,
+                  })
+                }
               }
             }
           }
         }
-      }
-      this.getCouponOff = true
-      // console.log(JSON.stringify(this.couponList))
+        this.getCouponOff = true
+        // console.log(JSON.stringify(this.couponList))
+      })
     })
   },
   methods: {

src/pages/user/receive/index.vue

@@ -140,12 +140,19 @@ export default {
       return `${rnd}${timestamp}`
     },
     sdk (info) {
-      let logo = this.data.Images[0].CouponImageUrl ? this.data.Images[0].CouponImageUrl : this.data.Images[0].CardImageUrl
+      let logo, title
+      if ($route.query.type === 'card') {
+        logo = this.data.Images[0].CardImageUrl
+        title = this.data.CardName
+      } else {
+        logo = this.data.Images[0].CouponImageUrl
+        title = this.data.CouponName
+      }
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-        title: '领取卡券',
+        title: title,
         desc: info,
-        link: `${window.location.origin}${window.location.pathname}/user.html#/receiveShared/${this.$route.query.id}/${this.$route.query.salesid}/${this.$route.query.type}/receive`,
-        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+        link: `${window.location.origin}${window.location.pathname}#/receiveShared/${this.$route.query.id}/${this.$route.query.salesid}/${this.$route.query.type}/receive`,
+        thu_image: logo
       })
     }
   }

src/pages/user/receiveChannel/index.vue

@@ -131,12 +131,19 @@ export default {
       }
     },
     sdk (info) {
-      let logo = this.data.Images[0].CouponImageUrl ? this.data.Images[0].CouponImageUrl : this.data.Images[0].CardImageUrl
+      let logo, title
+      if ($route.query.type === 'card') {
+        logo = this.data.Images[0].CardImageUrl
+        title = this.data.CardName
+      } else {
+        logo = this.data.Images[0].CouponImageUrl
+        title = this.data.CouponName
+      }
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-        title: '领取卡券',
+        title: title,
         desc: info,
-        link: `${window.location.origin}${window.location.pathname}/user.html#/receiveChannelShared/${this.$route.query.id}/${this.$route.query.type}/receive`,
-        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+        link: `${window.location.origin}${window.location.pathname}#/receiveChannelShared/${this.$route.query.id}/${this.$route.query.type}/receive`,
+        thu_image: logo
       })
     }
   }

src/pages/user/receiveResults/index.vue

@@ -9,7 +9,7 @@
       <span v-else>{{msg}}</span>
       <div class="back" v-if="status === 'success'" @click="back">查看我的体验券</div>
       <div v-else></div>
-      <img :src="logo">
+      <img :src="logo" class="bottomLogo">
     </div>
   </div>
 </template>
@@ -35,7 +35,7 @@ export default {
   },
   methods: {
     back () {
-      this, $router.push({ name: 'userCenter' })
+      this.$router.push({ name: 'userCenter' })
     }
   }
 }

src/pages/user/receiveResults/page.scss

@@ -32,5 +32,6 @@
   img{
     width: 1rem;
     margin-top: 1rem;
+    opacity: .5;
   }
 }

src/store/bodyCheck/index.js

@@ -9,15 +9,15 @@ export default {
     mainInfo: {}
   },
   mutations: {
-    updateState(state, payload) {
+    updateState (state, payload) {
       state.result = payload.Message
       state.user = payload.UserInfo
       state.mainInfo = payload.Info[0]
     }
   },
   actions: {
-    getBodyCheck (context, data) {
-      return new Promise((resolve) => {
+    getBodyCheck (context) {
+      return new Promise((resolve, reject) => {
         Ajax({
           ...api.bodyCheck.bodyCheck
         }).then(res => {

src/store/fiveA/fiveA.js

@@ -116,9 +116,9 @@ export default {
     },
     getFiveAInfo (context, data) {
       // console.log(data)
-      http.getBanner(data).then((res) => {
-        context.commit('setBanner', res)
-      })
+      // http.getBanner(data).then((res) => {
+      //   context.commit('setBanner', res)
+      // })
       // http.getList(data).then((res) => {
       //   context.commit('setList', res)
       // })

src/store/index/index.js

@@ -100,7 +100,11 @@ export default {
       state.fiveA = data
     },
     setMessage (state, data) { // 获取首页消息
-      state.message = data
+      if (data.length > 3) {
+        state.message = data.slice(0,3)
+      } else {
+        state.message = data
+      }
     },
     setProject (state, data) { // 获取项目专题
       state.project = data

src/store/userCenter/userCenter.js

@@ -73,6 +73,7 @@ http.submitData = (data) => { // 绑定手机号
 export default {
   namespaced: true,
   state: {
+    Nums: {},
     userInfo: {},
     caseInfo: {},
     courseOrderList: {},
@@ -80,6 +81,9 @@ export default {
     courseOrderDetail: {},
   },
   mutations: {
+    setNums (state, data) {
+      state.Nums = data || {}
+    },
     setUserInfo (state, data) {
       state.userInfo = data
     },
@@ -96,11 +100,21 @@ export default {
       if (page <= 1) {
         state.courseOrderList = res
       } else {
-        state.courseOrderList = {...res, list: [...state.courseOrderList.list, ...res.list]}
+        state.courseOrderList = { ...res, list: [...state.courseOrderList.list, ...res.list] }
       }
     }
   },
   actions: {
+    getNum (context) { // 获取我的用户领取卡信息
+      return new Promise((resolve) => {
+        Ajax({
+          ...api.user.getNum
+        }).then(res => {
+          context.commit('setNums', res)
+          resolve(res)
+        })
+      })
+    },
     getCustomerCardList (context, { id, payload }) { // 获取我的用户领取卡信息
       return new Promise((resolve) => {
         Ajax(api.sales.getCustomerCardList.url, {

src/util/ajax.js

@@ -10,7 +10,9 @@ const token = function (headers) {
     localStorage.setItem('JWT', headers.authorization)
     JWT = headers.authorization
   }
-  return JWT ? JWT : localStorage.getItem('JWT')
+  const token = JWT ? JWT : localStorage.getItem('JWT')
+
+  return !token ? '' : token
 }
 
 const Axios = axios.create({

src/util/api.js

@@ -2,7 +2,6 @@
 const baseUrl = '/api'
 const wechat = '/wechat/:org'
 const guest = '/guest/:org'
-const common = '/common/:org'
 
 const $api = {
   index: { // 首页
@@ -126,6 +125,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${wechat}/gymcard/:customerGymId`
     },
+    getNum: { // 获取卡券数
+      method: 'get',
+      url: `${baseUrl}${wechat}/customer/info`
+    }
   },
   director: {
     getSales: { // 获取销售列表
@@ -204,7 +207,7 @@ const $api = {
   share: {
     share: {
       method: 'get',
-      url: `${baseUrl}${guest}/wechat/jssdk/signature/:url`
+      url: `${baseUrl}${guest}/wechat/jssdk/signature`
     },
     card: {
       method: 'get',

src/util/share.js

@@ -14,14 +14,16 @@ function wxsdk (params, config) {
   return new Promise(function (resolve, reject) {
     Ajax(api.share.share.url, {
       method: api.share.share.method,
-      urlData: {
+      queryData: {
         ...params
       }
     }).then(result => {
+      console.log(result)
+      let time = parseInt(result.timestamp)
       wx.config({
         debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
         appId: result.appId, // 必填，公众号的唯一标识
-        timestamp: result.timestamp, // 必填，生成签名的时间戳
+        timestamp: time, // 必填，生成签名的时间戳
         nonceStr: result.noncestr, // 必填，生成签名的随机串
         signature: result.signature, // 必填，签名，见附录1
         jsApiList: [

src/util/util.js

@@ -41,15 +41,11 @@ const toolClass = {
     let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${wechatConfig.redirect_uri}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
     window.location.href = url
   },
+
   /**
    * caculate the great circle distance
    * 经纬度计算距离
-   * @param {Object} lat1 纬度1
-   * @param {Object} lng1 精度1
-   * @param {Object} lat2 纬度2
-   * @param {Object} lng2 精度2
    */
-
   getGreatCircleDistance: (lat1, lng1, lat2, lng2) => {
     if (lat1 === lat2 && lng1 === lng2) {
       return 0
@@ -63,6 +59,7 @@ const toolClass = {
     var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)))
     s = s * EARTH_RADIUS
     s = Math.round(s * 10000) / 10000.0
+    console.log(s)
     return s
   }
 }

vue.config.js

@@ -20,14 +20,12 @@ module.exports = {
   productionSourceMap: true,
   chainWebpack: config => config.plugins.delete('named-chunks'),
   devServer: {
-    // publicPath: '/c-v2/',
     proxy: {
-      // '/api-v2': {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        // target: 'http://192.168.0.62:8080', // wf
+        target: 'http://192.168.0.62:8080', // wf
         // target: 'http://192.168.0.125:8080', // hyq
-        target: 'http://192.168.0.11', // ys
+        // target: 'http://192.168.0.11', // ys
         // target: 'http://dev.ycjcjy.com', // frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {