ytj

src/components/caseTableItem/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="caseTableItem flex-h">
-    <i class="iconfont icon-yinchenglogo"></i>
+    <img :src="item.caseIcon" alt="" v-if="item.caseIcon">
+    <i class="iconfont icon-yinchenglogo" v-else></i>
     <div class="itemNo">
       <a>
         <div class="centerLabel">

src/components/caseTableItem/page.scss

@@ -12,6 +12,17 @@
     z-index: 1;
     color: rgba(255, 0, 0, .1);
   }
+  &>img{
+    display: inline-block;
+    position: absolute;
+    right: .1rem;
+    top: .05rem;
+    // font-size: .36rem;
+    width: .4rem;
+    height: .4rem;
+    z-index: 1;
+    color: rgba(255, 0, 0, .1);
+  }
   .itemNo{
     width: .44rem;
     position: relative;

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

@@ -1,7 +1,7 @@
 <template>
   <div class="orderListItem">
     <div class="title flex-h">
-      <div class="orange" v-if="returnStatus(data.MakeStatus) === '已下单'">
+      <div class="orange" v-if="returnStatus(data.MakeStatus) === '制作中'">
         <i class="iconfont icon-dengdai"></i><br>
         <span>{{returnStatus(data.MakeStatus)}}</span>
       </div>

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,5 +1,5 @@
 <template>
-  <div class="mainPage">
+  <div class="mainPage" v-if="showPage">
     <div class="mask">
       <img :src="logo" class="logo" alt="">
       <div class="centerLabel" style="width:100%;">
@@ -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,29 +99,42 @@ 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('请先获取验证码')
         return
       }
+      let reg = /^[0-9]{6}$/
+      if (!reg.test(this.postData.captcha)) {
+        this.$toast('验证码格式不正确')
+        return
+      }
       // console.log(this.postData)
       this.submitData(this.postData).then((res) => {
         // this.$toast(res)
         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

@@ -50,8 +50,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

@@ -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,12 +151,11 @@ 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
@@ -173,11 +173,11 @@ export default {
         if (this.$route.query.isLottery) {
           setTimeout(() => {
             const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}` : ''
-            window.location.href = `${window.location.origin}/c-v2/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/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"></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))
@@ -84,10 +67,15 @@ 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 {
+        this.$router.push({ name: 'majorProjectsDetail', query: { id: item.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">
@@ -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

@@ -185,7 +185,7 @@ export default {
       topCaseInfoData: {
         caseName: '',
         caseId: '',
-        ShowSelect: true,
+        ShowSelect: false,
       },
       caseInfo: {
         value: '',
@@ -232,17 +232,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,
@@ -328,6 +317,8 @@ export default {
           this.cardTotalCount = count.toFixed(2)
         })
       })
+    } else {
+
     }
     this.getCaseList().then((res) => {
       this.locationMapping()
@@ -429,45 +420,49 @@ export default {
     },
     locationMapping () {
       let that = this
-      // 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
-      //           })
-      //           that.getCaseTotal({
-      //             caseid: that.topCaseInfoData.caseId
-      //           })
-      //         }
-      //       }
-      //       if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName){
-      //         that.topCaseInfoData.caseName = '当前位置无案场'
-      //       }
-      //     }
-      //   })
-      // })
       that.topCaseInfoData.caseName = that.CaseList[0].CaseName
       that.topCaseInfoData.caseId = that.CaseList[0].CaseId
       that.getCaseTableList({
         caseid: that.topCaseInfoData.caseId
       })
-      that.getCaseTotal({
-        caseid: that.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/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

@@ -124,10 +124,6 @@ export default {
     swiperSlide,
   },
   created () {
-    if (this.userInfo.customer.MapUser) {
-      this.$router.push({ name: 'coffeeIndex' })
-      return
-    }
     this.getIndexLocation({ orgid: this.orgid, issys: '0' }).then((res) => {
       this.data.fiveA = this.fiveA
       this.locationId = 'index'
@@ -153,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">
@@ -86,7 +87,7 @@ 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
@@ -124,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 = `${window.location.origin}/c-v2/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/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,7 +206,7 @@ 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('您还没有选择商品哦~')
       }
@@ -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' })
         })
       })
     },

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: '',
@@ -178,6 +177,10 @@ export default {
               select: false,
             })
           } else {
+            console.log(res[n].Coupon.Targets[a].TargetId)
+            console.log(new Date(res[n].StartDate).getTime())
+            console.log(nowDate)
+            console.log(new Date(res[n].EndDate).getTime())
             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({

src/pages/user/receive/index.vue

@@ -144,7 +144,7 @@ export default {
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         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`,
+        link: `${window.location.origin}${window.location.pathname}#/receiveShared/${this.$route.query.id}/${this.$route.query.salesid}/${this.$route.query.type}/receive`,
         thu_image: `${window.location.origin}${window.location.pathname}${logo}`
       })
     }

src/pages/user/receiveChannel/index.vue

@@ -135,7 +135,7 @@ export default {
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         title: '领取卡券',
         desc: info,
-        link: `${window.location.origin}${window.location.pathname}/user.html#/receiveChannelShared/${this.$route.query.id}/${this.$route.query.type}/receive`,
+        link: `${window.location.origin}${window.location.pathname}#/receiveChannelShared/${this.$route.query.id}/${this.$route.query.type}/receive`,
         thu_image: `${window.location.origin}${window.location.pathname}${logo}`
       })
     }

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/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: { // 首页

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,9 +20,7 @@ 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