Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/components/calcMenu/index.vue

@@ -26,7 +26,7 @@
               <span>备注：</span>
               <div class="flex-item">
                 <div>
-                  <textarea cols="30" rows="3"></textarea>
+                  <textarea cols="30" rows="3" v-model="Remark"></textarea>
                 </div>
               </div>
             </div>
@@ -48,7 +48,7 @@ export default {
   props: ['show', 'data', 'totalNum'],
   data () {
     return {
-
+      Remark:''
     }
   },
   computed: {
@@ -65,7 +65,7 @@ export default {
       this.$emit('closeCalcMenu')
     },
     placeOrder () { // 点单
-      this.$emit('placeOrder')
+      this.$emit('placeOrder',this.Remark)
     },
   }
 }

src/components/discounts/discounts.vue

@@ -18,8 +18,8 @@
       </div>
     </div>
     <div class="useType">
-      <img :src="used" alt="已使用" v-if="data.useType == '已使用'" width="100%" height="100%">
-      <img :src="failure" alt="已失效" v-if="data.useType == '已失效'" width="100%" height="100%">
+      <img :src="used" v-if="data.useType == '已使用'" width="100%" height="100%">
+      <img :src="failure" v-if="data.useType == '已失效'" width="100%" height="100%">
     </div>
   </div>
 </template>

src/components/myCard/myCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="card-content flex-l" :class="{invalid: data.invalid || isgrey}">
-    <div class="card-top flex-h">
+    <div class="card-top flex-h" @click="detail">
       <div>
         <img :src="logo" class="logo">
         <span>￥ <span> {{data.price}} </span> 元</span>
@@ -12,7 +12,7 @@
         <span>{{data.startDate}}-{{data.endDate}}</span>
       </div>
     </div>
-    <div class="card-main flex-h">
+    <div class="card-main flex-h" @click="detail">
       <img :src="line">
       <div class="flex-h">
         <span>总数量</span>
@@ -24,11 +24,11 @@
       </div>
       <div>
         <span>用户领取</span>
-        <span>{{data.SentCount}}</span>
+        <span>{{ismanager?data.SentCount:data.CustomerList.length}}</span>
       </div>
       <div>
         <span>用户使用</span>
-        <span>{{data.usedCount}}</span>
+        <span>{{ismanager?data.usedCount:data.CustomerList.filter(x => x.Status===2).length}}</span>
       </div>
     </div>
     <div class="card-bottom" @click.stop="share">
@@ -58,6 +58,10 @@ export default {
     isgrey: {
       type: Boolean,
       default: false
+    },
+    ismanager: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {
@@ -69,6 +73,9 @@ export default {
           this.$emit('share', this.data)
         }
       }
+    },
+    detail () {
+      this.$emit('detail', this.data)
     }
   }
 }

src/pages/bodyCheck/index/index.vue

@@ -27,7 +27,7 @@
       </div>
     </div>
     <div v-else class="nodata">
-        暂无体检数据 .
+        暂无体检数据
     </div>
     <div class="bg-white" :hidden="ishidden">
     </div>

src/pages/sales/cardAndCouponNum/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mainPage flex-v" v-if="data">
+  <div class="mainPage flex-v" v-if="showPage">
     <div class="top flex-h">
       <span>￥<em>{{parseInt(data.Price)}}</em>元</span>
       <div class="flex-item">
@@ -44,19 +44,19 @@
               <span>销售名称</span>
               <div class="flex-item">
                 <div>
-                  <span>实际使用</span>
+                  <span>用户领取</span>
                 </div>
               </div>
-              <span>用户领取</span>
+              <span>实际使用</span>
             </li>
             <li class="flex-h" v-for="(item,index) in data.CustomerCard" :key="index">
-              <span>{{salesData(item).name}}</span>
+              <span>{{item.RealName}}</span>
               <div class="flex-item">
                 <div>
-                  <span>{{salesData(item).receive}}</span>
+                  <span>{{item.ReceiveNum}}</span>
                 </div>
               </div>
-              <span>{{salesData(item).used}}</span>
+              <span>{{item.UsedNum}}</span>
             </li>
           </ul>
         </div>
@@ -72,72 +72,75 @@ export default {
   name: '',
   data () {
     return {
-      data: {}
+      data: {},
+      showPage: false
     }
   },
   created () {
     if (this.$route.query.type === 'card') {
       this.getCardNum({ id: this.$route.query.id }).then(() => {
-        this.getSales({ type: 'sales' }).then(() => {
-          this.data = this.cardAndCoupon
-          this.data.CustomerCard = this.data.CustomerCard || []
-        })
+        // this.getSales({ type: 'sales' }).then(() => {
+        this.data = this.cardAndCoupon
+        this.data.CustomerCard = this.data.CustomerCard || []
+        this.showPage = true
+        // })
       })
     } else {
       this.getCouponNum({ id: this.$route.query.id }).then(() => {
-        this.getSales({ type: 'sales' }).then(() => {
+        // this.getSales({ type: 'sales' }).then(() => {
           this.data = this.cardAndCoupon
           this.data.CustomerCard = this.data.CustomerCoupon || []
-        })
+          this.showPage = true
+        // })
       })
     }
   },
   computed: {
     ...mapForbidState({
-      salesList: x => x.salesList,
+      // salesList: x => x.salesList,
       cardAndCoupon: x => x.cardAndCoupon
     })
   },
   methods: {
-    ...mapForbidActions(['getCardNum', 'getCouponNum', 'getSales']),
-    salesData (item) {
-      let receive = 0
-      let used = 0
-      let name
-      if (this.$route.query.type === 'card') {
-        for (let i = 0; i < this.salesList.length; i++) {
-          this.salesList[i].CustomerCard = this.salesList[i].CustomerCard || []
-          for (let j = 0; j < this.salesList[i].CustomerCard.length; j++) {
-            if (this.salesList[i].CustomerCard[j].SalesId === item.SalesId) {
-              name = this.salesList[i].RealName
-              receive++
-              if (!item.VerifyStatus) {
-                used++
-              }
-            }
-          }
-        }
-      } else {
-        for (let i = 0; i < this.salesList.length; i++) {
-          this.salesList[i].CustomerCoupon = this.salesList[i].CustomerCoupon || []
-          for (let j = 0; j < this.salesList[i].CustomerCoupon.length; j++) {
-            if (this.salesList[i].CustomerCoupon[j].SalesId === item.SalesId) {
-              name = this.salesList[i].RealName
-              receive++
-              if (!item.VerifyStatus) {
-                used++
-              }
-            }
-          }
-        }
-      }
+    ...mapForbidActions(['getCardNum', 'getCouponNum']),
+    // salesData (item) {
+    //   let receive = 0
+    //   let used = 0
+    //   let name
+    //   if (this.$route.query.type === 'card') {
+    //     for (let i = 0; i < this.salesList.length; i++) {
+    //       this.salesList[i].CustomerCard = this.salesList[i].CustomerCard || []
+    //       for (let j = 0; j < this.salesList[i].CustomerCard.length; j++) {
+    //         if (this.salesList[i].CustomerCard[j].SalesId === item.SalesId) {
+    //           name = this.salesList[i].RealName
+    //           receive++
+    //           if (!item.VerifyStatus) {
+    //             used++
+    //           }
+    //         }
+    //       }
+    //     }
+    //   } else {
+    //     for (let i = 0; i < this.salesList.length; i++) {
+    //       this.salesList[i].CustomerCoupon = this.salesList[i].CustomerCoupon || []
+    //       for (let j = 0; j < this.salesList[i].CustomerCoupon.length; j++) {
+    //         if (this.salesList[i].CustomerCoupon[j].SalesId === item.SalesId) {
+    //           name = this.salesList[i].RealName
+    //           receive++
+    //           if (!item.VerifyStatus) {
+    //             used++
+    //           }
+    //         }
+    //       }
+    //     }
+    //   }
 
-      return {
-        'name': name,
-        'receive': receive,
-        'used': used
-      }
-    },
+    //   return {
+    //     'name': name,
+    //     'receive': receive,
+    //     'used': used
+    //   }
+    // },
   }
 }
 </script>

src/pages/sales/customerSearch/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.CustomerName"></topCaseInfo>
     </div>
     <div class="content flex-item">
       <div>
@@ -9,7 +9,8 @@
           <li class="customer-card">
             <div class="list-box">
               <customerCard v-for="(item,index) in cardList" :key="index" :data='item' @record='record'></customerCard>
-              <span class="noData" v-if="ajaxOff && !cardList.length">暂无数据</span>
+              <!-- <span class="noData" v-if="ajaxOff && !cardList.length">暂无数据</span> -->
+              <noMore v-if="ajaxOff && hasPic"></noMore>
             </div>
           </li>
         </ul>
@@ -31,6 +32,7 @@ import customerCard from '../../../components/customerCard/customerCard'
 import active from '../../../common/icon/check-box-checked.png'
 import normal from '../../../common/icon/check-box-empty.png'
 import topCaseInfo from '../../../components/topCaseInfo/index'
+import noMore from '../../../components/noMore/noMore'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
@@ -51,6 +53,7 @@ export default {
         normal: normal
       },
       ajaxOff: false,
+      hasPic: false,
       key: '',
       mask: true,
       checked: true,
@@ -70,6 +73,7 @@ export default {
   components: {
     customerCard,
     topCaseInfo,
+    noMore
   },
   created () {
     this.getCaseList().then((res) => {
@@ -96,7 +100,7 @@ export default {
     ]),
     record (item) {
       // console.log(item)
-      this.$router.push({ name: 'getRecord', query: {name: item.Name, phone: item.Phone, id: item.CustomerId} })
+      this.$router.push({ name: 'getRecord', query: { name: item.Name, phone: item.Phone, id: item.CustomerId } })
     },
     searchMask () {
       this.getCustomerList({
@@ -105,11 +109,22 @@ export default {
         isrecommend: false,
         key: this.key,
       }).then((res) => {
-        // console.log(JSON.stringify(res))
-        res = res || []
-        for (var n = 0; n < res.length; n++) {
-          this.cardList.push({...res[n], invalid: false})
+        if (res) {
+          for (var n = 0; n < res.length; n++) {
+            if (res[n].RecommendId === this.userInfo.customer.MapUser) {
+              res[n].showTag = true
+            } else {
+              res[n].showTag = false
+            }
+            this.cardList.push(res[n])
+          }
+        } else {
+          this.hasPic = true
         }
+        // res = res || []
+        // for (var n = 0; n < res.length; n++) {
+        //   this.cardList.push({...res[n], invalid: false})
+        // }
         this.mask = false
         this.ajaxOff = true
       })

src/pages/sales/customerSearch/page.scss

@@ -90,8 +90,8 @@
         background: #eee;
         border-radius: .08rem;
         padding-left: .3rem;
-        line-height: .3rem;
-        padding-top: .03rem;
+        line-height: .13rem;
+        // padding-top: .03rem;
       }
       i{
         font-size: .16rem;

src/pages/sales/getRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showSelect = true"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.CustomerName" @selectCase="showSelect = true"></topCaseInfo>
     </div>
     <div class="info">
       <span><em>姓名：</em>{{user.name}}</span>
@@ -24,7 +24,7 @@
               <div class="list-detail" v-for="(item,index) in cardList" :key="index">
                 <span>{{item.CustomerCardName}}</span>
                 <span>{{toolClass.dateFormat(item.ReceiveDate)}}</span>
-                <span>已使用</span>
+                <span>{{item.VerifyStatus === "useable"?"未使用":"已使用"}}</span>
               </div>
               <span class="noData" v-if="cardAjaxOff && !cardList.length">暂无数据</span>
             </div>
@@ -32,7 +32,7 @@
               <div class="list-detail" v-for="(item,index) in couponList" :key="index">
                 <span>{{item.CustomerCouponName}}</span>
                 <span>{{toolClass.dateFormat(item.ReceiveDate)}}</span>
-                <span>已使用</span>
+                <span>{{item.Status === 2?"已使用":"未使用"}}</span>
               </div>
               <span class="noData" v-if="couponAjaxOff && !couponList.length">暂无数据</span>
             </div>

src/pages/sales/login/index.vue

@@ -1,19 +1,18 @@
 <template>
   <div class="mainPage" v-if="showPage">
     <div class="mask">
-      <!-- <img :src="logo" class="logo" alt=""> -->
       <div class="centerLabel" style="width:100%;">
         <div class="box" style="margin:0 auto;">
           <div class="title">登录</div>
 
           <div class="mobile">
             <i class="iconfont icon-dianhua"></i>
-            <input type="number" maxlength="11" placeholder="手机号" v-model="postData.phone">
+            <input type="tel" maxlength="11" placeholder="手机号" v-model="postData.phone">
           </div>
 
           <div class="sms" style="margin-top:.2rem;">
             <i class="iconfont icon-mima"></i>
-            <input type="number" maxlength="6" placeholder="验证码" v-model="postData.captcha">
+            <input type="tel" maxlength="6" placeholder="验证码" v-model="postData.captcha">
             <div class="sand color" v-if="seconds === 61" @click="sandMsg">发送验证码</div>
             <div class="sand" v-else>{{seconds}}后可重发</div>
           </div>
@@ -52,15 +51,14 @@
 </template>
 
 <script>
-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')
+let canSubmit
 export default {
   data () {
     return {
-      logo,
       showPage: false,
       showCase: false,
       showSales: false,
@@ -108,28 +106,36 @@ export default {
       return url.replace('sales.html', 'user.html') + '#/' + val + '?hideTabbar=1'
     },
     submit () {
+      if (!canSubmit) {
+        return
+      }
+      canSubmit = false
       if (!this.postData.captcha) {
         this.$toast('请填写验证码')
+        canSubmit = true
         return
       }
       let reg = /^[0-9]{6}$/
       if (!reg.test(this.postData.captcha)) {
         this.$toast('验证码格式不正确')
+        canSubmit = true
         return
       }
-      // console.log(this.postData)
       this.submitData(this.postData).then((res) => {
-        // this.$toast(res)
         setTimeout(() => {
-          window.location.href = this.getUrl('mainPage/coffeeIndex')
+          window.location.replace(this.getUrl('mainPage/coffeeIndex'))
         }, 2000)
+      }).catch(() => {
+        console.log(111)
+        canSubmit = true
       })
     }
   },
   created () {
+    canSubmit = true
     if (this.userInfo.customer.MapUser) {
-      window.location.href = this.getUrl('mainPage/coffeeIndex')
-      return
+      // this.showPage = true
+      window.location.replace(this.getUrl('mainPage/coffeeIndex'))
     } else {
       this.showPage = true
     }

src/pages/sales/salesGiveOutDetail/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.CustomerName" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <div class="flex-item flex-v body" v-if="data.allCard">
       <span>销售姓名：<em>{{data.RealName}}</em></span>
       <ul class="flex-h">
         <li class="flex-item" :class="{'active': activeIndex === 0}" @click="cutNav(0)">
           <span>饮品</span>
-          <span>（已赠送{{data.OrdersDetail.length}}杯）</span>  
+          <span>（已赠送{{drinkNumber}}杯）</span>  
         </li> 
         <li class="flex-item" :class="{'active': activeIndex === 1}" @click="cutNav(1)">
           <span>卡券</span>
@@ -37,7 +37,7 @@
             </li>
             <li :hidden="activeIndex === 0">
               <ul class="list">
-                <router-link tag="li" class="flex-h" v-for="(item,index) in data.allCard" :key="index" :to="{name: 'cardAndCouponNum', query: { id: item.CardId || item.CouponId, type:item.CardId ? 'card' : 'coupon' }}">
+                <li class="flex-h" v-for="(item,index) in data.allCard" :key="index" >
                   <div class="flex-item">
                     <div>
                       <span>{{item.CustomerCardName || item.CustomerCouponName}}</span>
@@ -49,7 +49,7 @@
                     </div>
                   </div>
                   <span>{{toolClass.dateFormat(item.ReceiveDate, 'yyyy/MM/dd hh:mm')}}</span>
-                </router-link>
+                </li>
               </ul>
             </li>
           </ul>
@@ -75,7 +75,8 @@ export default {
         caseId: '',
         showSelect: false
       },
-      data: {}
+      data: {},
+      drinkNumber: 0
     }
   },
   computed: {
@@ -105,6 +106,11 @@ export default {
       this.data.CustomerCoupon = this.data.CustomerCoupon ? this.data.CustomerCoupon : []
       this.data.OrdersDetail = this.data.OrdersDetail ? this.data.OrdersDetail : []
       this.data.allCard = this.data.CustomerCard.concat(this.data.CustomerCoupon)
+      let num = 0
+      for (let i = 0; i < this.data.OrdersDetail.length; i++) {
+        num += this.data.OrdersDetail[i].Number
+      }
+      this.drinkNumber = num
     })
   },
   methods: {

src/pages/sales/salesRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.CustomerName" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <div class="flex-item body">
       <div>

src/pages/user/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app" v-if="showPage">
-    <router-view ></router-view>
+    <router-view></router-view>
   </div>
 </template>
 
@@ -34,12 +34,12 @@ export default {
     this.getUserInfo({ org: this.org, code: this.code }).then(() => {
       this.showPage = true
     })
-    wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-      title: '城的空间',
-      desc: '城的空间',
-      link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-      thu_image: `${window.location.origin}${window.location.pathname}${logo}`
-    })
+    // wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+    //   title: '城的空间',
+    //   desc: '城的空间',
+    //   link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
+    //   thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg`
+    // })
   },
   methods: {
     ...actions(['getUserInfo'])

src/pages/user/app.js

@@ -8,11 +8,13 @@ import Vuex from 'vuex'
 import Ajax from '../../util/ajax'
 import api from '../../util/api'
 import toolClass from '../../util/util'
+const Base64 = require('js-base64').Base64
 
 Vue.use(Vant)
 Vue.use(Vuex)
 Vue.prototype.$api = api
 Vue.prototype.$ajax = Ajax
+Vue.prototype.Base64 = Base64
 Vue.prototype.toolClass = toolClass
 /* eslint-disable no-new */
 new Vue({

src/pages/user/bindMobile/bindMobile.vue

@@ -7,7 +7,7 @@
 
         <div class="mobile">
           <i class="iconfont icon-dianhua"></i>
-          <input type="number" maxlength="11" placeholder="手机号" v-model="postData.phone">
+          <input type="tel" maxlength="11" placeholder="手机号" v-model="postData.phone">
         </div>
 
         <div class="recommend">
@@ -24,7 +24,7 @@
 
         <div class="sms">
           <i class="iconfont icon-mima"></i>
-          <input type="number" maxlength="6" placeholder="验证码" v-model="postData.captcha">
+          <input type="tel" maxlength="6" placeholder="验证码" v-model="postData.captcha">
           <div class="sand color" v-if="seconds === 61" @click="sandMsg">发送验证码</div>
           <div class="sand" v-else>{{seconds}}后可重发</div>
         </div>
@@ -65,6 +65,7 @@
 import logo from '../../../common/icon/logo.png'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
+let canSubmit
 export default {
   data () {
     return {
@@ -90,6 +91,7 @@ export default {
     })
   },
   created () {
+    canSubmit = true
     this.getCaseInfo(1).then(() => {
       this.columns = this.caseInfo.cases
     })
@@ -163,8 +165,13 @@ export default {
       }, 1000)
     },
     submit () {
+      if (!canSubmit){
+        return
+      }
+      canSubmit = false
       if (!this.postData.captcha) {
         this.$toast('请填写验证码')
+        canSubmit = true
         return
       }
       // if (!this.postData.case) {
@@ -187,6 +194,9 @@ export default {
             window.history.go(-1)
           }, 2000)
         }
+      }).catch(() => {
+        console.log(111)
+        canSubmit = true
       })
     }
   }

src/pages/user/bindMobile/page.scss

@@ -82,10 +82,10 @@
         justify-content: space-between;
         span{
           color: rgba(168,182,200,1);
+          white-space: nowrap;
         }
         i{
           color: rgba(168,182,200,1);
-          padding-left: .14rem;
           font-size: .12rem;
         }
         div{
@@ -99,7 +99,7 @@
           padding: .1rem;
           box-sizing: border-box;
           span{
-            width: 70%;
+            width: 85%;
             overflow:hidden;
             text-overflow:ellipsis;
             white-space:nowrap;

src/pages/user/card/index.vue

@@ -122,18 +122,28 @@ export default {
     this.getCardList().then((res) => {
       if (res) {
         for (var n = 0; n < res.length; n++) {
+          let useType = '已使用'
+          let nowDate = new Date().valueOf()
+          let endDate = new Date(res[n].EndDate).valueOf()
+          // if (res[n].Status === 2) {
+          //   useType = '已使用'
+          // } else if (res[n].Status === 1 && nowDate > endDate) {
+          //   useType = '已失效'
+          // } else {
+          //   useType = '未使用'
+          // }
           this.data[0].list.push({
             title: res[n].CustomerCardName,
             desc: res[n].Share.CardUseRule,
             time: this.toolClass.dateFormat(res[n].EndDate, 'yyyy-MM-dd'),
-            useType: res[n].Status === 1 ? '未使用' : '已使用',
+            useType: useType,
             tag: '共享',
             CustomerCourseId: res[n].CustomerCourseId,
             CustomerCardId: res[n].CustomerCardId
           })
         }
       } else {
-        this.data[this.active].hasPic
+        this.data[this.active].hasPic = true
       }
     })
   },

src/pages/user/cardDetail/index.vue

@@ -5,7 +5,6 @@
       <div class="message">
         <div>
           <span>{{info.CustomerCardName}}</span>
-          <!-- <span class="sub">(可在银城会所健身房和游泳池使用)</span> -->
         </div>
         <div>
           <span>有效时间</span>
@@ -14,7 +13,7 @@
       </div>
       <div class="rule">
         <div>使用规则</div>
-        <div>{{info.Share.CardUseInstruction}}</div>
+        <pre style="white-space: pre-wrap;word-wrap: break-word;">{{info.Share.CardUseInstruction}}</pre>
       </div>
       <div class="line">
         <img :src="Artboard" alt="" width="100%">

src/pages/user/coupons/index.vue

@@ -34,7 +34,7 @@ export default {
       hasPic: false,
       hasMore: true,
       list: [],
-      line
+      line 
     }
   },
   components: {
@@ -48,11 +48,21 @@ export default {
       // console.log(JSON.stringify(this.couponList))
       if (res) {
         for (var n = 0; n < res.length; n++) {
+          let useType
+          let nowDate = new Date().valueOf()
+          let endDate = new Date(res[n].EndDate).valueOf()
+          if (res[n].Status === 2) {
+            useType = '已使用'
+          } else if (res[n].Status === 1 && nowDate > endDate) {
+            useType = '已失效'
+          } else {
+            useType = '未使用'
+          }
           this.list.push({
             title: res[n].Coupon.CouponName,
-            desc: res[n].Coupon.Share.UseInstruction,
+            desc: res[n].Coupon.Share.UseRule,
             time: this.toolClass.dateFormat(res[n].EndDate),
-            useType: res[n].Status === 1 ? '未使用' : '已使用',
+            useType: useType,
             tag: res[n].Coupon.CouponType === 'course' ? '课程' : '商品',
             customercouponid: res[n].CustomerCouponId,
             couponid: res[n].Coupon.CouponId,

src/pages/user/couponsDetail/index.vue

@@ -8,15 +8,16 @@
         </div>
         <div>
           <span>有效时间：</span>
-          <div class="time">{{toolClass.dateFormat(info.EndDate)}}</div>
+          <div class="time">{{toolClass.dateFormat(info.StartDate) + ' ~ ' + toolClass.dateFormat(info.EndDate)}}</div>
         </div>
       </div>
       <div class="rule">
         <div>使用规则</div>
-        <div>1. 此卡不可兑换现金，不可与其他优惠活动同时使用。 </div>
+        <pre style="white-space: pre-wrap;word-wrap: break-word;">{{info.Share.UseInstruction}}</pre>
+        <!-- <div>1. 此卡不可兑换现金，不可与其他优惠活动同时使用。 </div>
         <div>2. 此卡不可多人使用，一人记一次。 </div>
         <div>3. 非会员可凭此卡享受对应课程。 </div>
-        <div>4. 截止日期至{{toolClass.dateFormat(info.EndDate)}}。 </div>
+        <div>4. 截止日期至{{toolClass.dateFormat(info.EndDate)}}。 </div> -->
       </div>
       <div class="line">
         <img :src="Artboard" alt="" width="100%">

src/pages/user/fiveA/index.vue

@@ -25,12 +25,12 @@
             <!-- <span v-if="fiveANoData" style="width:100%;line-height:.3rem;display:block;text-align:center;color:#ccc;margin-bottom:.1rem;">暂无数据</span> -->
           </div>
           <div style="width:100%;height:.1rem;background:#f8f8f8;margin:0 auto;"></div>
-          <h5>{{item.Consult}}</h5>
+          <h5>{{item.Consult || '资讯'}}</h5>
           <div class="newsList flex-h">
             <ul class="flex-item">
-              <router-link tag="li" :to="{name:'',query:{}}" v-for="(newinfo,nindex) in item.News" :key="nindex">
-                <newsItem :data="newinfo" @jump='jump'></newsItem>
-              </router-link>
+              <li tag="li" @click="jump(newinfo)" v-for="(newinfo,nindex) in item.News" :key="nindex">
+                <newsItem :data="newinfo"></newsItem>
+              </li>
             </ul>
           </div>
         </div>
@@ -58,6 +58,7 @@ export default {
       swiperOption: {
         observer: true,
         loop: true,
+        speed: 1000,
         autoplay: {
           disableOnInteraction: false,
         }
@@ -83,6 +84,15 @@ export default {
     const _that = this
     this.getLocationDetails().then(res => {
       _that.locations = res
+      let id = _that.$route.query.id
+      let index = 0
+      for (let i = 0; i < _that.locations.length; i++) {
+        if (_that.locations[i].LocationId === id) {
+          index = i
+        }
+      }
+      console.log(index)
+      _that.changeLocation(id, index)
     })
   },
   methods: {
@@ -94,16 +104,16 @@ export default {
     },
     courseInfo (course) {
       return {
-          id: course.CourseId,
-          title: course.CourseName,
-          img: course.CourseImg,
-          remark: course.Remark,
-          address: course.CaseAddress,
-          tag: course.CourseTags || [],
-          courseType: '',
-          defaultPrice: course.Price + '/节',
-          getWay: 'ticket'
-        }
+        id: course.CourseId,
+        title: course.CourseName,
+        img: course.CourseImg,
+        remark: course.Remark,
+        address: course.CaseAddress,
+        tag: course.CourseTags || [],
+        courseType: '',
+        defaultPrice: course.Price + '/节',
+        getWay: 'ticket'
+      }
     },
     // returnCourseList (arr) { // 转换课程列表格式
     //   for (var n = 0; n < arr.length; n++) {
@@ -116,7 +126,11 @@ export default {
       if (item.ForwardType === 'url') {
         window.location.href = item.ForwardUrl
       } else if (item.ForwardType === 'course') {
-        this.$router.push({ name: '', query: { id: item.ForwardResourceId } }) // 此处去课程详情
+        if (item.ForwardResourceId){
+          this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardResourceId } }) // 此处去课程详情
+        } else {
+          this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardCourseId } }) // 此处去课程详情
+        }
       } else {
         window.location.href = item.InfoUrl
       }

src/pages/user/gymCardDetail/index.vue

@@ -5,7 +5,7 @@
       <div class="message">
         <div>
           <span>会所健身体验卡</span>
-          <span class="sub">(可在银城会所健身房和游泳池使用)</span>
+          <span class="sub">(可在城的空间健身房和游泳池使用)</span>
         </div>
         <div>
           <span>有效时间</span>

src/pages/user/lessonDetail/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage" v-if="showPage">
     <div class="title">课程详情</div>
-    <div class="content" :class="{'opacity' : courseOrderDetail.IsDone === 1, 'gray': courseOrderDetail.IsDone === 1}">
+    <div class="content" :class="{'opacity' : courseOrderDetail.IsDone === 1 || (courseOrderDetail.IsDone === 0 && now > time(courseOrderDetail.EndDate)), 'gray': courseOrderDetail.IsDone === 1 || (courseOrderDetail.IsDone === 0 && now > time(courseOrderDetail.EndDate))}">
       <div class="list-item flex-h">
         <span>订单编号</span>
         <span class="flex-item" style="font-size:.11rem;">{{courseOrderDetail.OrdersNo !== undefined ? courseOrderDetail.OrdersNo : ''}}</span>
@@ -46,11 +46,12 @@
       </div>
       <div class="qr-code" v-if="courseOrderDetail.IsDone === 0">
         <qrCode v-if="showQrCode" :msg="courseOrderDetail.QrCodeString"></qrCode>
+        <div>{{courseOrderDetail.QrCodeString}}</div>
       </div>
     </div>
     <div class="useType">
       <img :src="used" alt="已使用" v-if="courseOrderDetail.IsDone === 1" width="100%" height="100%">
-      <!-- <img :src="failure" alt="已失效" v-if="useType == '已失效'" width="100%" height="100%"> -->
+      <img :src="failure" alt="已失效" v-if="courseOrderDetail.IsDone === 0 && now > time(courseOrderDetail.EndDate)" width="100%" height="100%">
     </div>
   </div>
 </template>
@@ -65,18 +66,16 @@ const { mapActions: mapUserActions, mapState: mapUserState } = createNamespacedH
 export default {
   data () {
     return {
-      msg: {
-        course_type: 800,
-        orderNo: '342897789334'
-      },
       useType: '未使用',
       used,
       failure,
       showQrCode: false,
-      showPage: false
+      showPage: false,
+      now: ''
     }
   },
   created () {
+    this.now = Date.now()
     this.getCourseLocationList().then(() => {
       this.getCaseList().then(() => {
         this.getCourseOrderDetail({
@@ -120,6 +119,9 @@ export default {
         }
       }
     },
+    time (time) {
+      return new Date(time).getTime()
+    }
   },
   components: {
     qrCode,

src/pages/user/lessonDetail/page.scss

@@ -66,7 +66,7 @@
   }
   .useType{
     position: absolute;
-    bottom: 3.2rem;
+    top: 3.3rem;
     right: .5rem;
     width: .76rem;
     height: .76rem;
@@ -75,4 +75,9 @@
     font-size: .12rem;
     color: #FC6243 !important;
   }
+  .qr-code{
+    div{
+      text-align: center;
+    }
+  }
 }

src/pages/user/lessonOrder/index.vue

@@ -2,9 +2,9 @@
   <div class="mainPage">
     <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='courseOrderList.list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'>
       <div class="box">
-        <div class="order-card flex-h" v-for="(item,index) in courseOrderList.list" :key='index' :class="{'opacity' : item.status === 1}" @click="toDetail(item)">
+        <div class="order-card flex-h" v-for="(item,index) in courseOrderList.list" :key='index' :class="{'opacity' : item.IsDone === 1 || (item.IsDone === 0 && now > time(item.EndDate)) }" @click="toDetail(item)">
           <div class="card-pic">
-            <div :class="{'gray-location' : item.status === 1}"><span>{{returnLocationName(item.LocationId)}}</span></div>
+            <div :class="{'gray-location' : item.IsDone === 1 || (item.IsDone === 0 && now > time(item.EndDate)) }"><span>{{returnLocationName(item.LocationId)}}</span></div>
             <img :src="item.CourseImg" class="cover" width="100%" height="100%" alt="">
           </div>
           <div class="card-msg">
@@ -16,7 +16,9 @@
           </div>
           <div class="card-price">
             <div class="price" style="white-space: nowrap;">￥ {{item.Price}}</div>
-            <div class="type" :class="{'un-use' : item.IsDone === 0}">{{item.IsDone === 0 ? '未使用' : '已使用'}}</div>
+            <div class="type un-use" v-if="item.IsDone === 0 && now < time(item.EndDate)">未使用</div>
+            <div class="type" v-if="item.IsDone === 1">已使用</div>
+            <div class="type" v-if="item.IsDone === 0 && now > time(item.EndDate)">已失效</div>
           </div>
         </div>
         <noMore v-if="noData"></noMore>
@@ -43,7 +45,8 @@ export default {
       page: 1,
       isloading: true,
       hasMore: true,
-      list: []
+      list: [],
+      now: ''
     }
   },
   components: {
@@ -51,12 +54,13 @@ export default {
     noMore
   },
   created () {
+    this.now = Date.now()
     var _that = this
     this.getCourseLocationList().then((res) => {
       // console.log(JSON.stringify(res))
       this.getCourseOrderList({ page: this.page }).then((res) => {
         // console.log(JSON.stringify(res))
-        if(res.list === null){
+        if (res.list === null) {
           this.noData = true
         }
       })
@@ -111,7 +115,10 @@ export default {
       }
     },
     toDetail (item) {
-      this.$router.push({ name: 'lessonDetail', query: {id: item.CustomerCourseId} })
+      this.$router.push({ name: 'lessonDetail', query: { id: item.CustomerCourseId } })
+    },
+    time (time) {
+      return new Date(time).getTime()
     }
   }
 }

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

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.Name" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
       <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" v-if="userInfo.customer.UserTypeId !== 'manager' || item.id !== '4'" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
@@ -59,7 +59,7 @@
                   </div>
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
                 </div>
-                <myCard v-for="(item,index) in data[1].list" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCard'></myCard>
+                <myCard v-for="(item,index) in data[1].list" :ismanager="userInfo.customer.UserTypeId == 'manager'" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCard' @detail='toCardNumDetail'></myCard>
                 <noMore v-if="data[1].hasPic"></noMore>
               </div>
             </li>
@@ -74,7 +74,7 @@
                   </div>
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
                 </div>
-                <myCard v-for="(item,index) in data[2].list" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCoupon'></myCard>
+                <myCard v-for="(item,index) in data[2].list" :ismanager="userInfo.customer.UserTypeId == 'manager'" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCoupon' @detail='toCouponNumDetail'></myCard>
                 <noMore v-if="data[2].hasPic"></noMore>
               </div>
             </li>
@@ -250,7 +250,7 @@ export default {
     }),
     ...mapCardState({
       cardList: x => x.cardList
-    })
+    }),
   },
   components: {
     topCaseInfo,
@@ -300,6 +300,7 @@ export default {
                 SentCount: res.list[n].SentCount,
                 usedCount: res.list[n].UsedCount,
                 CardId: res.list[n].CouponId,
+                CustomerList: res.list[n].CustomerCoupon || []
               })
             }
             var count = 0
@@ -327,7 +328,8 @@ export default {
                 totalCount: res.list[n].TotalCount,
                 SentCount: res.list[n].SentCount,
                 usedCount: res.list[n].UsedCount,
-                CardId: res.list[n].CardId
+                CardId: res.list[n].CardId,
+                CustomerList: res.list[n].CustomerCard || []
               })
             }
             var count = 0
@@ -369,6 +371,20 @@ export default {
       const _that = this
       return this.forbidList.filter(x => x.UserId === _that.userInfo.customer.MapUser && x.ForbidType === 'coupon').length > 0
     },
+    checkCanOrder () {
+      const _that = this
+      return this.forbidList.filter(x => x.UserId === _that.userInfo.customer.MapUser && x.ForbidType === 'goods').length > 0
+    },
+    toCardNumDetail (item) {
+      if (this.userInfo.customer.UserTypeId === 'manager') {
+        window.location.href = `${this.getUrl('cardAndCouponNum')}?id=${item.CardId}&type=card`
+      }
+    },
+    toCouponNumDetail (item) {
+      if (this.userInfo.customer.UserTypeId === 'manager') {
+        window.location.href = `${this.getUrl('cardAndCouponNum')}?id=${item.CardId}&type=coupon`
+      }
+    },
     returnInvalid (item, type) {
       for (var n = 0; n < this.forbidList.length; n++) {
         if (this.forbidList[n].UserId === this.userInfo.customer.CustomerId && this.forbidList[n].ForbidType === type) {
@@ -461,6 +477,12 @@ export default {
       // that.topCaseInfoData.caseName = that.CaseList[0].CaseName
       // that.topCaseInfoData.caseId = that.CaseList[0].CaseId
       if (this.userInfo.customer.MapUser !== '') {
+        wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+          title: '城的空间',
+          desc: '城的空间',
+          link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
+          thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
+        })
         this.topCaseInfoData.caseId = this.userInfo.customer.BelongCaseId
         for (let i = 0; i < this.CaseList.length; i++) {
           if (this.CaseList[i].CaseId === this.topCaseInfoData.caseId) {
@@ -480,7 +502,7 @@ export default {
           title: '城的空间',
           desc: '城的空间',
           link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-          thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+          thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
         }).then(() => {
           wx.getLocation({
             type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
@@ -505,6 +527,7 @@ export default {
                 }
               }
               if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName) {
+                that.$toast('当前位置无案场')
                 that.topCaseInfoData.caseName = '当前位置无案场'
               }
             }
@@ -522,6 +545,10 @@ export default {
     toOrders (subItem, item) {
       const _that = this
       this.getCaseConf({ caseid: subItem.CaseId }).then(res => {
+        if (this.checkCanOrder()) {
+          _that.$toast('您的点单功能已被关闭！')
+          return
+        }
         if (res.Status === 1) {
           this.$router.push({ name: 'placeOrder', query: { tableid: encodeURI(subItem.TableId), tableno: encodeURI(subItem.TableNo), caseid: encodeURI(subItem.CaseId), casename: encodeURI(_that.topCaseInfoData.caseName), areaid: encodeURI(subItem.AreaId), areaname: encodeURI(item.AreaName) } })
         } else {

src/pages/user/mainPage/index.vue

@@ -26,7 +26,7 @@ export default {
     return {
       tabBar: [{
         pathName: 'indexPage',
-        name: '会所'
+        name: '城的空间'
       }, {
         pathName: 'coffeeIndex',
         name: '城咖啡'

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

@@ -59,9 +59,9 @@
     </div>
     <div class="flex-h">
       <ul class="newsList flex-item">
-        <router-link tag="li" :to="{name:'',query:{}}" v-for="(item,index) in newsList" :key="index">
-          <newsItem :data="item" @jump='jump'></newsItem>
-        </router-link>
+        <li @click="jump(item)" v-for="(item,index) in newsList" :key="index">
+          <newsItem :data="item"></newsItem>
+        </li>
       </ul>
     </div>
   </div>
@@ -84,6 +84,7 @@ export default {
       locationId: '',
       swiperOption: {
         observer: true,
+        loop: true,
         speed: 1000,
         autoplay: {
           disableOnInteraction: false,
@@ -91,8 +92,11 @@ export default {
       },
       swiperOptionMsg: {
         observer: true,
+        observeParents:true,
+        // slidesPerView: 3,
         direction: 'vertical',
         speed: 1000,
+        // loop: true,
         autoplay: {
           disableOnInteraction: false,
         }
@@ -151,10 +155,18 @@ export default {
       item.ForwardType = item.ForwardType || ''
       if (item.ForwardType === 'url') {
         window.location.href = item.ForwardUrl
+        return
       } else if (item.ForwardType === 'course') {
-        this.$router.push({ name: '', query: { id: item.ForwardResourceId } }) // 此处去课程详情
+        if (item.ForwardResourceId){
+          this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardResourceId } }) // 此处去课程详情
+          return
+        } else {
+          this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardCourseId } }) // 此处去课程详情
+          return
+        }
       } else {
         window.location.href = item.InfoUrl
+        return
       }
     }
   }

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

@@ -28,7 +28,7 @@
             <img src="../../../../common/icon/userCenter-icon-2.png" width="100%" height="100%" alt="">
           </div>
           <span>卡券</span>
-          <span>{{Nums.cardsnum || 0}}张未使用</span>
+          <span>0张未使用</span>
         </div>
         <div class="flex-item privilege-item" @click="toVip">
           <div class="img-box">
@@ -84,7 +84,9 @@ export default {
   mounted () {
     this.getUserInfo({ org: this.org }).then(() => {
       this.user = this.userInfo.customer
-      this.AccountInfo = JSON.parse(this.user.AccountInfo)
+      if (this.user.AccountInfo) {
+        this.AccountInfo = JSON.parse(this.user.AccountInfo)
+      }
       this.headimgurl = this.user.Headimgurl
     })
     this.getNum()
@@ -110,14 +112,15 @@ export default {
       this.$router.push({ name: 'orderList' })
     },
     toBodyCheck () {
-      window.location.href = `${window.location.origin}/c-v2/bodyCheck.html#/`
+      var url = window.location.pathname
+      window.location.href = url.replace('user.html', 'bodyCheck.html') + '#/'
     },
     toLuckdraw () {
       // ^参数约定为97
       let userid = this.userInfo.customer.CustomerId
       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
+      userid = `${userid}${num}`
       window.location.href = `${window.location.origin}/game/luckdraw/#/lotteryList?from=${userid}`
     }
   }

src/pages/user/majorProjects/index.vue

@@ -68,57 +68,7 @@ export default {
         }
       },
       courseList: [], // 课程列表
-      initList: [
-        // { // 初始化课程列表
-        //   id: '',
-        //   title: '课程名称',
-        //   img: '',
-        //   time: '2018.04.04 18:30-20:00',
-        //   address: '南京南',
-        //   tag: ['儿童教育', '小小外交官'],
-        //   courseType: '团体课',
-        //   defaultPrice: '168/节',
-        //   getWay: 'ticket',
-        //   startDate: 1514779200000,
-        //   endDate: 1514781600000,
-        // }, {
-        //   id: '',
-        //   title: '课程名称',
-        //   img: '',
-        //   time: '2018.04.04 18:30-20:00',
-        //   address: '南京南',
-        //   tag: ['儿童教育', '小小外交官'],
-        //   courseType: '团体课',
-        //   defaultPrice: '168/节',
-        //   getWay: 'ticket',
-        //   startDate: 1514779200000,
-        //   endDate: 1514781600000,
-        // }, {
-        //   id: '',
-        //   title: '课程名称',
-        //   img: '',
-        //   time: '2018.04.04 18:30-20:00',
-        //   address: '南京南',
-        //   tag: ['儿童教育', '小小外交官'],
-        //   courseType: '团体课',
-        //   defaultPrice: '168/节',
-        //   getWay: 'ticket',
-        //   startDate: 1517460000000,
-        //   endDate: 1517467200000,
-        // }, {
-        //   id: '',
-        //   title: '课程名称',
-        //   img: '',
-        //   time: '2018.04.04 18:30-20:00',
-        //   address: '南京南',
-        //   tag: ['儿童教育', '小小外交官'],
-        //   courseType: '团体课',
-        //   defaultPrice: '168/节',
-        //   getWay: 'ticket',
-        //   startDate: 1517460000000,
-        //   endDate: 1517467200000,
-        // }
-      ],
+      initList: [],
     }
   },
   computed: {
@@ -151,6 +101,9 @@ export default {
     ]),
     returnTag (arr) {
       var aArr = []
+      if (!arr) {
+        arr = []
+      }
       for (var n = 0; n < arr.length; n++) {
         aArr.push(arr[n].TagName)
       }
@@ -167,18 +120,20 @@ export default {
       this.getProjectInfo({ id: this.$route.query.id }).then((res) => {
         // console.log(JSON.stringify(res))
         // this.initList
-        if (res.Courses === null) {
+        if (!res.Courses) {
           res.Courses = []
         }
         var aArr = []
         for (var n = 0; n < res.Courses.length; n++) {
+          console.log(this.returnTag(res.Courses[n].CourseTags))
+          let tag = res.Courses[n].CourseTags
           aArr.push({
             id: res.Courses[n].CourseId,
             title: res.Courses[n].CourseName,
             img: res.Courses[n].CourseImg,
-            time: this.returnDate(res.Courses[n].BeginDate) + '至' + this.returnDate(res.Courses[n].EndDate),
-            address: res.CaseAddress == undefined ? '暂无数据' : res.CaseAddress,
-            tag: this.returnTag(res.Courses[n].CourseTags),
+            remark: this.toolClass.dateFormat(res.Courses[n].BeginDate, 'yyyy-MM-dd') + '至' + this.toolClass.dateFormat(res.Courses[n].EndDate, 'yyyy-MM-dd'),
+            address: res.Courses[n].CaseInfo.CaseAddress,
+            tag: tag,
             courseType: '团体课',
             defaultPrice: res.Courses[n].Price + '/节',
             getWay: 'ticket',
@@ -186,12 +141,16 @@ export default {
             endDate: new Date(res.Courses[n].EndDate).getTime(),
           })
         }
+        console.log(aArr)
         this.initList = aArr
         this.calcArr()
       })
     },
     calcArr () {
       let arr = []
+      if (!this.initList){
+        this.initList = []
+      }
       for (var n = 0; n < this.initList.length; n++) {
         arr.push(new Date(this.initList[n].startDate).getMonth())
       }

src/pages/user/majorProjectsDetail/index.vue

@@ -4,7 +4,7 @@
       <div class="content">
         <div class="banner">
           <div class="scrollImg">
-            <img :src='topImage' class="cover" alt="">
+            <img :src='courseDetail.CourseImg' class="cover" alt="">
             <!-- <swiper :options="swiperOption" ref="mySwiper">
               <swiper-slide class="swiper-slide" v-for="(item,index) in courseDetail.CourseImgs" :key="index">
                 <img :src='item.ImgUrl' class="cover" alt="">
@@ -131,14 +131,15 @@ export default {
         arr = []
       }
       this.courseDetail.CourseImgs = this.courseDetail.CourseImgs || []
-      this.topImage = this.courseDetail.CourseImgs.length > 0 ? this.courseDetail.CourseImgs[0].ImgUrl : ""
+      // this.topImage = this.courseDetail.CourseImgs.length > 0 ? this.courseDetail.CourseImgs[0].ImgUrl : ""
       if (this.courseDetail.CourseImgs.length > 0) {
-        this.detailImage = this.courseDetail.CourseImgs.slice(1)
+        this.courseDetail.CourseImgs.sort(this.getSortFun('asc', 'Sort'))
+        this.detailImage = this.courseDetail.CourseImgs
       }
       console.log(this.detailImage)
       this.courseTimeList = arr.sort(function (a, b) { return new Date(a.BeginDate).getTime() > new Date(b.BeginDate).getTime() ? 1 : -1 })
       let nowDate = Date.now()
-      let endData = new Date(this.courseDetail.CourseDetail[0].EndDate).getTime()
+      let endData = new Date(this.courseDetail.EndDate).getTime()
       if (nowDate > endData) {
         this.gray = true
       }
@@ -153,6 +154,11 @@ export default {
     ...mapProjectActions([
       'getCourseDetailInfo',
     ]),
+    getSortFun (order, sortBy) {
+      var ordAlpah = (order == 'asc') ? '>' : '<'
+      var sortFun = new Function('a', 'b', 'return a.' + sortBy + ordAlpah + 'b.' + sortBy + '?1:-1')
+      return sortFun
+    },
     returnCourseTime (val, endVal) { // 返回课时时间
       val = new Date(val)
       endVal = new Date(endVal)
@@ -186,7 +192,7 @@ export default {
         title: '城的空间',
         desc: '城的空间',
         link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+        thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
       }).then(() => {
         let result = this.courseDetail.CaseInfo.Coordinate.split(",")
         let latitude = parseFloat(result[0])

src/pages/user/placeOrder/index.vue

@@ -9,7 +9,7 @@
               <span>项目名称：{{caseName}}</span>
             </div>
           </div>
-          <span>{{userInfo.customer != undefined ? userInfo.customer.CustomerName : ''}}您好！</span>
+          <span>{{userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.Name}}您好！</span>
         </div>
       </div>
       <div class="tableInfo flex-h">
@@ -70,6 +70,13 @@
     </div>
     <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
     <calcMenu :show="showCalcMenu" :totalNum="sumNum + caseTotal.total" :data="selGoods" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
+    <div class="successPopup" v-if="showSuccessPopup">
+      <div>
+        <i class="iconfont icon-gou"></i>
+        <div class="text">出单成功</div>
+        <div class="back" @click="popBack">返回等待</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -136,6 +143,7 @@ export default {
         freeModeMomentumVelocityRatio: 2,
       },
       selGoods: [],
+      showSuccessPopup: false
     }
   },
   computed: {
@@ -258,18 +266,19 @@ export default {
     },
     reback () { // 返回桌位选择
       this.$dialog.confirm({
-        title: '提示',
         message: '返回页面将清空当前选择的商品，确定要返回吗?'
       }).then(() => {
         // this.$router.push({ name: 'coffeeIndex' })
-        window.history.go(-1)
+        // window.history.go(-1)
+        this.$router.go(-1)
       })
     },
-    placeOrder () { // 下单
+    placeOrder (Remark) { // 下单
       this.postData.info.OrgId = this.orgId
       this.postData.info.UserId = this.userInfo.CustomerId
       this.postData.info.UserName = this.userInfo.customer.CustomerName
       this.postData.info.PayType = 'sys user'
+      this.postData.info.Remark = Remark
       var orderInfo = this.selGoods
       this.postData.detail = []
       var amount = 0
@@ -294,14 +303,20 @@ export default {
         detail: JSON.stringify(this.postData.detail),
         coupon: JSON.stringify(this.postData.coupon)
       }).then((res) => {
-        this.$dialog.alert({
-          message: '下单成功！',
-          confirmButtonText: '返回等待'
-        }).then(() => {
-          this.$router.push({ name: 'orderList' })
-        })
+        this.showCalcMenu = false
+        this.showSuccessPopup = true
+        // this.$dialog.alert({
+        //   message: '下单成功！',
+        //   confirmButtonText: '返回等待'
+        // }).then(() => {
+
+        // })
       })
     },
+    popBack () {
+      this.showSuccessPopup = false
+      this.$router.push({ name: 'orderList' })
+    },
     closeCalcMenu () { // 关闭已选菜单
       this.showCalcMenu = false
     },
@@ -370,3 +385,9 @@ export default {
 <style lang="scss" scoped>
 @import 'page.scss';
 </style>
+
+<style>
+.van-dialog__message {
+  text-align: center;
+}
+</style>

src/pages/user/placeOrder/page.scss

@@ -238,4 +238,43 @@
       }
     }
   }
+  .successPopup{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 2;
+    background: rgba(0, 0, 0, .35);
+    >div{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+      width: 2.6rem;
+      height: 1.7rem;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 2px 4px 0px rgba(194,194,194,0.5);
+      border-radius:4px;
+      display: flex;
+      flex-flow: column nowrap;
+      justify-content: center;
+      align-items: center;
+      padding: .2rem;
+      i{
+        color: #000;
+        font-size: .36rem;
+        margin-bottom: .2rem;
+      }
+      .text{
+        font-size: .16rem;
+        margin-bottom: .2rem;
+      }
+      .back{
+        padding: .07rem .3rem;
+        border: 1px solid black;
+        border-radius: 4px;
+      }
+    }
+  }
 }

src/pages/user/placeOrderDetail/index.vue

@@ -35,7 +35,7 @@
       <div class="remark flex-h">
         <div class="flex-item flex-h">
           <div class="flex-h">
-            <textarea class="flex-item" cols="30" rows="10" v-model="postData.info.Remark"></textarea>
+            <textarea class="flex-item" cols="30" rows="6" v-model="postData.info.Remark"></textarea>
           </div>
         </div>
       </div>
@@ -43,6 +43,7 @@
       <div class="bottom">
         <a @click="cancel">取消</a>
         <a @click="toPayer">确定</a>
+        <div style="width: 100%;position: absolute;left: 0;bottom: 0;top: 0;" v-if="!ajaxoff"></div>
       </div>
     </div>
     <div class="selectCouponLayer" :class="{'show': showSelectCouponLayer}">
@@ -65,6 +66,13 @@
         <a @click="sureSelectCoupon">确定</a>
       </div>
     </div>
+    <div class="successPopup" v-if="showSuccessPopup">
+      <div>
+        <i class="iconfont icon-gou"></i>
+        <div class="text">出单成功</div>
+        <div class="back" @click="popBack">返回等待</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -72,15 +80,16 @@
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 import discounts from '../../../components/discounts/discounts'
-
 export default {
   name: '',
   data () {
     var _self = this
     return {
+      ajaxoff: true,
       showSelectCouponLayer: false,
       getCouponOff: false,
       couponList: [], // 优惠券列表
+      showSuccessPopup: false,
       postData: {
         info: {
           CaseId: decodeURI(_self.$route.query.caseid),
@@ -122,11 +131,12 @@ export default {
       // console.log(JSON.stringify(res))
       var id = JSON.parse(this.$route.query.info)[0].id, arr = [], nowDate = Date.now()
       for (var n = 0; n < res.length; n++) {
+        res[n].Coupon.Targets = res[n].Coupon.Targets || []
         if (res[n].Coupon.CouponType === 'goods' && res[n].Status === 1) {
-          if (res[n].Coupon.IsAll) {
+          if (res[n].Coupon.IsAll && nowDate >= new Date(res[n].StartDate).getTime() && nowDate < new Date(res[n].EndDate).getTime() && res[n].CaseId === this.$route.query.caseid) {
             this.couponList.push({
               title: res[n].Coupon.CouponName,
-              desc: res[n].Coupon.Share.UseInstruction,
+              desc: res[n].Coupon.Share.UseRule,
               time: this.toolClass.dateFormat(res[n].EndDate),
               useType: '未使用',
               tag: '商品',
@@ -197,43 +207,56 @@ export default {
       return [amount, num]
     },
     toPayer () { // 下单
-      this.postData.info.OrgId = this.orgId
-      this.postData.info.UserId = this.userInfo.CustomerId
-      this.postData.info.UserName = this.userInfo.customer.CustomerName
-      this.postData.info.PayType = this.postData.customercouponid === '' ? 'coupon' : 'vip'
-      var orderInfo = JSON.parse(this.$route.query.info)
-      this.postData.detail = []
-      var amount = 0
-      var num = 0
-      for (var n = 0; n < orderInfo.length; n++) {
-        this.postData.detail.push({
-          GoodsId: orderInfo[n].id,
-          GoodsName: orderInfo[n].name,
-          SpecId: orderInfo[n].spec,
-          SpecName: orderInfo[n].specname,
-          Number: orderInfo[n].num - 0,
-          Price: String(orderInfo[n].price - 0),
+      if (this.ajaxoff) {
+        this.ajaxoff = false
+        this.postData.info.OrgId = this.orgId
+        this.postData.info.UserId = this.userInfo.CustomerId
+        this.postData.info.UserName = this.userInfo.customer.CustomerName
+        this.postData.info.PayType = this.postData.customercouponid === '' ? 'coupon' : 'vip'
+        var orderInfo = JSON.parse(this.$route.query.info)
+        this.postData.detail = []
+        var amount = 0
+        var num = 0
+        for (var n = 0; n < orderInfo.length; n++) {
+          this.postData.detail.push({
+            GoodsId: orderInfo[n].id,
+            GoodsName: orderInfo[n].name,
+            SpecId: orderInfo[n].spec,
+            SpecName: orderInfo[n].specname,
+            Number: orderInfo[n].num - 0,
+            Price: String(orderInfo[n].price - 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
+        console.log(JSON.stringify(this.postData))
+        this.toPay({
+          info: JSON.stringify(this.postData.info),
+          detail: JSON.stringify(this.postData.detail),
+          customercouponid: this.postData.customercouponid
+        }).then((res) => {
+          this.showSuccessPopup = true
+          // this.$dialog.alert({
+          //   message: '下单成功！'
+          // }).then(() => {
+          //   window.history.go(-2)
+          // })
+        }).catch(() => {
+          this.ajaxoff = true
         })
-        amount += (orderInfo[n].price - 0) * orderInfo[n].num
-        num += orderInfo[n].num - 0
       }
-      this.postData.info.Amount = String(amount)
-      this.postData.info.OrdersNum = num
-      console.log(JSON.stringify(this.postData))
-      this.toPay({
-        info: JSON.stringify(this.postData.info),
-        detail: JSON.stringify(this.postData.detail),
-        customercouponid: this.postData.customercouponid
-      }).then((res) => {
-        this.$dialog.alert({
-          message: '下单成功！'
-        }).then(() => {
-          window.history.go(-2)
-        })
-      })
+    },
+
+    popBack () {
+      this.showSuccessPopup = false
+      // window.history.go(-2)
+      this.$router.push({name: 'coffeeIndex'})
     },
     cancel () {
-      window.history.go(-1)
+      // window.history.go(-1)
+      this.$router.push({name: 'coffeeIndex'})
     },
   }
 }

src/pages/user/placeOrderDetail/page.scss

@@ -299,4 +299,43 @@
     //   }
     // }
   }
+  .successPopup{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 2;
+    background: rgba(0, 0, 0, .35);
+    >div{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+      width: 2.6rem;
+      height: 1.7rem;
+      background:rgba(255,255,255,1);
+      box-shadow:0px 2px 4px 0px rgba(194,194,194,0.5);
+      border-radius:4px;
+      display: flex;
+      flex-flow: column nowrap;
+      justify-content: center;
+      align-items: center;
+      padding: .2rem;
+      i{
+        color: #000;
+        font-size: .36rem;
+        margin-bottom: .2rem;
+      }
+      .text{
+        font-size: .16rem;
+        margin-bottom: .2rem;
+      }
+      .back{
+        padding: .07rem .3rem;
+        border: 1px solid black;
+        border-radius: 4px;
+      }
+    }
+  }
 }

src/pages/user/placeOrderForCourse/index.vue

@@ -28,7 +28,8 @@
                     <span>时间描述</span>
                   </div>
                 </div>
-                <span v-if="courseTimeList.length">{{returnCourseTime(courseTimeList[0].BeginDate,courseTimeList[0].EndDate)}}</span>
+                <!-- <span v-if="courseTimeList.length">{{returnCourseTime(courseTimeList[0].BeginDate,courseTimeList[0].EndDate)}}</span> -->
+                <span v-if="courseTimeList.length">{{toolClass.dateFormat(courseDetail.BeginDate,'yyyy-MM-dd') + ' ~ ' + toolClass.dateFormat(courseDetail.EndDate, 'yyyy-MM-dd')}}</span>
               </li>
               <li class="flex-h">
                 <div class="flex-item">
@@ -73,17 +74,19 @@
               <div class="flex-h">
                 <div class="flex-item">
                   <div>
-                    <span>同意《银城精品团课服务协议》</span>
+                    <span>同意《城的空间课程服务协议》</span>
                   </div>
                 </div>
                 <i class="iconfont icon-gouxuan" :class="{'active': agreementOff}" @click="agreement"></i>
               </div>
             </div>
             <div class="protocol">
-              <div>1. 甲方具有为乙方更换教练的权利及责任。(当甲方为乙方安排的教练因故离职或乙方认 为甲方的教练无法胜任对其的指导工作时,甲方应为乙方另行安排教练)。</div>
-              <div>2. 甲方必须保证乙方享有与教练一对多的指导，甲方教练上课中出现违规时乙方有权投诉。</div>
-              <div>3. 乙方承诺其身体状况已被医疗机构确认良好，适宜接受本协议约定的训练课程,即身体 状况完全正常，不存在运动风险及潜在运动风险。如若隐瞒，出现后果由乙方自负。</div>
-              <div>4. 乙方承诺其身体状况完全符合使用甲方器械以及完成课程内容的条件和能力。若因乙方 未提供既往病史或谎报病史而引起的运动伤害,后果由乙方自负。</div>
+              <div>1. 参与城的空间课程的用户，具有完全的法律行为能力，同意遵守相关管理规章制度，应接受城的空间课程的相关服务协议，并已知晓有关的活动、健身规则与警示，承诺遵守城的空间课程的相关规定。</div>
+              <div>2. 在确认本协议前，用户应了解自身身体情况，以确保用户具备参与城的空间课程的身体条件，并且没有任何不宜运动的疾病、损伤和其他缺陷。因用户自身的任何疾病、损伤和其他缺陷导致用户在接收服务时发生任何损害的，城的空间不承担任何法律责任。。</div>
+              <div>3. 以下人群不能参加城的空间健身课程：手术后3月内的人群、有心血管疾病者、不能剧烈运动伤者、孕妇及哺乳期女性、产后不足6月内的人群，上课时如有隐瞒，所发生的一切后果及对他人产生的后果城的空间课程及教练均不负任何责任。如因此造成第三人损害的，由其承担赔偿责任。在课程中感到任何不适的，请及时告知课程教练，否则，如果发生身体损害，城的空间不承担法律责任。</div>
+              <div>4. 为了用户的健身安全，用户训练时需穿着专业的运动服、运动鞋及运动装备。运动期间，不得参与违反国家法律法规的活动、不得穿着违反道德规范的服饰进行运动。</div>
+              <div>5. 用户在参加健身锻炼时请勿携带珠宝饰品等贵重物品，以免丢失或造成意外。物品遗失概不负责。</div>
+              <div>6. 请您认真阅读以上内容，报名成功即认为您同意此服务协议。</div>
             </div>
           </div>
         </div>
@@ -162,14 +165,15 @@ export default {
   created () {
     this.getCouponList().then((res) => {
       this.getCourseDetailInfo({ id: this.$route.query.id }).then((result) => {
-        var arr = result.CourseDetail
-        console.log(arr)
+        var arr = result.CourseDetail, caseid = result.CaseId
+        // console.log(arr)
         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++) {
-          console.log(res[n])
+          // console.log(res[n])
+          res[n].Coupon.Targets = res[n].Coupon.Targets || []
           if (res[n].Coupon.CouponType === 'course' && res[n].Status === 1) {
-            if (res[n].Coupon.IsAll) {
+            if (res[n].Coupon.IsAll && res[n].CaseId === caseid && 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,
@@ -182,7 +186,7 @@ export default {
               })
             } 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()) {
+                if (res[n].Coupon.Targets[a].TargetId === id && nowDate > new Date(res[n].StartDate).getTime() && nowDate < new Date(res[n].EndDate).getTime() && res[n].CaseId === caseid) {
                   this.couponList.push({
                     title: res[n].Coupon.CouponName,
                     desc: res[n].Coupon.Share.UseInstruction,
@@ -250,7 +254,7 @@ export default {
       }).then((res) => {
         // console.log(JSON.stringify(res))
         this.$dialog.alert({
-          message: '下单成功！'
+          title: '下单成功！'
         }).then(() => {
           // this.$router.push({name: 'majorProjects'})
           window.history.go(-2)
@@ -292,3 +296,9 @@ export default {
 <style lang="scss" scoped>
 @import 'page.scss';
 </style>
+
+<style lang="scss">
+.van-dialog{
+  width: 60% !important;
+}
+</style>

src/pages/user/receive/index.vue

@@ -1,21 +1,20 @@
 <template>
   <div class="mainPage" v-if="show">
-    <!-- <div class="residue">
-      <i class="iconfont icon-gantanhao"></i>
-      <span>仅剩{{data.TotalCount - data.UsedCount}}张券可以领取！</span>
-    </div>
-    <div class="logo">
-      <img :src="logo" alt="">
-    </div> -->
     <div class="banner"  v-if="!video">
-      <img :src="data.Images[0].CardImageUrl" alt="" width="100%" height="100%" v-if="type === 'card'">
-      <img :src="data.Images[0].CouponImageUrl" alt="" width="100%" height="100%" v-if="type === 'coupon'">
+      <img :src="data.Images[0].CardImageUrl" alt="" v-if="type === 'card'">
+      <img :src="data.Images[0].CouponImageUrl" alt="" v-if="type === 'coupon'">
     </div>
     <div class="content">
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
       <div class="title" v-else>{{data.CouponName}}</div>
       <div class="video" v-if='video'>
-        <video :src="data.VideoUrl" width="100%" height="100%"></video>
+        <video width="100%" height="100%" preload="auto" controls="controls" x5-playsinline="true" :poster="type === 'card' ? data.Images[0].CardImageUrl : data.Images[0].CouponImageUrl">
+          <source :src="data.VideoUrl" type="video/mp4">
+          <source :src="data.VideoUrl" type="video/avi">
+          <source :src="data.VideoUrl" type="video/wma">
+          <source :src="data.VideoUrl" type="video/rmvb">
+          <source :src="data.VideoUrl" type="video/rm">
+        </video>
       </div>
       <div class="text">
         <div>
@@ -136,10 +135,10 @@ export default {
     sdk (info) {
       let logo, title
       if (this.$route.query.type === 'card') {
-        logo = this.data.Images[0].CardImageUrl
+        logo = this.data.Images[0].CardImageUrl + '?x-oss-process=style/wxicon'
         title = this.data.CardName
       } else {
-        logo = this.data.Images[0].CouponImageUrl
+        logo = this.data.Images[0].CouponImageUrl + '?x-oss-process=style/wxicon'
         title = this.data.CouponName
       }
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {

src/pages/user/receive/page.scss

@@ -18,6 +18,10 @@
   .banner{
     width: 100%;
     height: 1.8rem;
+    text-align: center;
+    img{
+      height: 100%;
+    }
   }
   .content{
     padding: .2rem;

src/pages/user/receiveChannel/index.vue

@@ -1,21 +1,29 @@
 <template>
   <div class="mainPage" v-if="show">
+    <!-- <video :src="data.VideoUrl" height="100%" width="100%" preload="auto" ></video> -->
     <div class="residue">
       <i class="iconfont icon-gantanhao"></i>
-      <span>仅剩{{data.TotalCount - data.UsedCount}}张券可以领取！</span>
+      <span>仅剩{{data.TotalCount - data.SentCount}}张券可以领取！</span>
     </div>
     <div class="logo">
       <img :src="logo" alt="">
     </div>
     <div class="banner"  v-if="!video">
-      <img :src="data.Images[0].CardImageUrl" alt="" width="100%" height="100%" v-if="type === 'card'">
-      <img :src="data.Images[0].CouponImageUrl" alt="" width="100%" height="100%" v-if="type === 'coupon'">
+      <img :src="data.Images[0].CardImageUrl" alt="" v-if="type === 'card'">
+      <img :src="data.Images[0].CouponImageUrl" alt="" v-if="type === 'coupon'">
     </div>
     <div class="content">
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
       <div class="title" v-else>{{data.CouponName}}</div>
       <div class="video" v-if='video'>
-        <video :src="data.VideoUrl" width="100%" height="100%"></video>
+
+        <video width="100%" height="100%" preload="auto" x5-playsinline="true" controls="controls" :poster="type === 'card' ? data.Images[0].CardImageUrl : data.Images[0].CouponImageUrl">
+          <source :src="data.VideoUrl" type="video/mp4">
+          <source :src="data.VideoUrl" type="video/avi">
+          <source :src="data.VideoUrl" type="video/wma">
+          <source :src="data.VideoUrl" type="video/rmvb">
+          <source :src="data.VideoUrl" type="video/rm">
+        </video>
       </div>
       <div class="text">
         <div>
@@ -30,7 +38,8 @@
           <i class="icon-kaquan iconfont"></i>
           <span>卡券有效期</span>
         </div>
-        <pre>有效期至{{toolClass.dateFormat(data.EndDate,'yyyy-MM-dd')}}，请在有效期结束前使用， 过期作废；</pre>
+        <pre v-if="data.ValidDays>0">领取后{{data.ValidDays}}天有效，请在有效期结束前使用， 过期作废；</pre>
+        <pre v-else>有效期至{{toolClass.dateFormat(data.EndDate,'yyyy-MM-dd')}}，请在有效期结束前使用， 过期作废；</pre>
       </div>
       <div class="text">
         <div>
@@ -39,8 +48,9 @@
         </div>
         <pre>{{data.address}}</pre>
       </div>
-      <div class="submit" v-if="button" @click="receive">确认领取</div>
-      <div class="submit" v-else>点击右上角分享给客户</div>
+      <div class="submit" v-if="button && data.TotalCount - data.SentCount > 0" @click="receive">确认领取</div>
+      <div class="submit grays" v-if="button && data.TotalCount - data.SentCount <= 0">优惠券已领完</div>
+      <div class="submit" v-if="!button">点击右上角分享给客户</div>
     </div>
   </div>
 </template>
@@ -97,7 +107,11 @@ export default {
       if (this.$route.query.type === 'card') {
         this.getCardShare({ id: this.$route.query.id }).then(() => {
           this.data = this.cardShare.Card
-          this.data.address = this.caseList.filter(x => x.CaseId === this.data.CaseId)[0].CaseAddress
+          let arr = this.caseList.filter(x => x.CaseId === this.data.CaseId)
+          if (arr.length <= 0) {
+            arr.push({ CaseAddress: '' })
+          }
+          this.data.address = arr[0].CaseAddress
           if (!this.data.VideoUrl) {
             this.video = false
           }
@@ -107,7 +121,11 @@ export default {
       } else {
         this.getCouponShare({ id: this.$route.query.id }).then(() => {
           this.data = this.couponShare.coupon
-          this.data.address = this.caseList.filter(x => x.CaseId === this.data.CaseId)[0].CaseAddress
+          let arr = this.caseList.filter(x => x.CaseId === this.data.CaseId)
+          if (arr.length <= 0) {
+            arr.push({ CaseAddress: '' })
+          }
+          this.data.address = arr[0].CaseAddress
           if (!this.data.VideoUrl) {
             this.video = false
           }
@@ -136,10 +154,10 @@ export default {
     sdk (info) {
       let logo, title
       if (this.$route.query.type === 'card') {
-        logo = this.data.Images[0].CardImageUrl
+        logo = this.data.Images[0].CardImageUrl + '?x-oss-process=style/wxicon'
         title = this.data.CardName
       } else {
-        logo = this.data.Images[0].CouponImageUrl
+        logo = this.data.Images[0].CouponImageUrl + '?x-oss-process=style/wxicon'
         title = this.data.CouponName
       }
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {

src/pages/user/receiveChannel/page.scss

@@ -18,6 +18,10 @@
   .banner{
     width: 100%;
     height: 1.8rem;
+    text-align: center;
+    img{
+      height: 100%;
+    }
   }
   .content{
     padding: .2rem;
@@ -59,5 +63,8 @@
       font-size: .16rem;
       color: #fff;
     }
+    .grays{
+      background: #585858;
+    }
   }
 }

src/store/index/index.js

@@ -94,12 +94,15 @@ export default {
   },
   mutations: {
     setBanner (state, data) { // 获取首页轮播图
+      data = data || []
       state.banner = data
     },
     setFiveA (state, data) { // 获取5A
+      data = data || []
       state.fiveA = data
     },
     setMessage (state, data) { // 获取首页消息
+      data = data || []
       if (data.length > 3) {
         state.message = data.slice(0,3)
       } else {
@@ -107,9 +110,11 @@ export default {
       }
     },
     setProject (state, data) { // 获取项目专题
+      data = data || []
       state.project = data
     },
     setCms (state, data) { // 获取cms
+      data = data || []
       state.cms = data
     }
   },

src/store/login/login.js

@@ -38,16 +38,20 @@ export default {
   mutations: {},
   actions: {
     getCaptcha ({ commit }, data) {
-      return new Promise((resolve) => {
+      return new Promise((resolve, reject) => {
         http.getCaptcha(data).then((res) => {
           resolve(res)
+        }).catch((err) => {
+          reject(err)
         })
       })
     },
-    submitData({ commit }, data) {
-      return new Promise((resolve) => {
+    submitData ({ commit }, data) {
+      return new Promise((resolve, reject) => {
         http.submitData(data).then((res) => {
           resolve(res)
+        }).catch((err) => {
+          reject(err)
         })
       })
     }

src/store/placeOrderForCoffee/index.js

@@ -64,7 +64,7 @@ export default {
       })
     },
     toPay (context, { info, detail, customercouponid }) { // 下单
-      return new Promise((resolve) => {
+      return new Promise((resolve, reject) => {
         Ajax(api.caseForCoffee.placeGoodsOrder.url, {
           method: api.caseForCoffee.placeGoodsOrder.method,
           data: {
@@ -74,6 +74,8 @@ export default {
           },
         }).then(res => {
           resolve(res)
+        }).catch(() => {
+          reject()
         })
       })
     },

src/store/userCenter/userCenter.js

@@ -240,9 +240,11 @@ export default {
       })
     },
     submitData (context, data) {
-      return new Promise((resolve) => {
+      return new Promise((resolve,reject) => {
         http.submitData(data).then((res) => {
           resolve(res)
+        }).catch(() => {
+          reject()
         })
       })
     }

src/util/ajax.js

@@ -5,12 +5,12 @@ import router from '../pages/user/router'
 import { Toast } from '../../node_modules/vant';
 
 const token = function (headers) {
-  let JWT
+  let JWT = ''
   if (headers) {
     localStorage.setItem('JWT', headers.authorization)
     JWT = headers.authorization
   }
-  const token = JWT ? JWT : localStorage.getItem('JWT')
+  const token = JWT ? JWT : localStorage.getItem('JWT') // eslint-disable-line
 
   return !token ? '' : token
 }
@@ -29,16 +29,16 @@ const Axios = axios.create({
 
 Axios.interceptors.request.use((config) => {
   config.headers.authorization = token()
+  // config.urlData = { ...config.urlData,  }
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
-  config.urlData = { ...config.urlData, org: 'MQ' }
+  let urlData = qs.stringify(config.urlData)
   let queryData = qs.stringify(config.queryData)
-  // 判断是通过斜杠传参还是通过query传参
+  // 判断是通过斜杠传参
   if (config.url.indexOf(':') > -1) {
     if (typeof config.urlData === 'object') {
-      config.url = Object.keys(config.urlData).reduce((url, k) => { // 此方法对每个元素进行处理
-        const re = new RegExp(`:${k}(?!w)`, 'i')
-        return url.replace(re, config.urlData[k])
-      }, config.url)
+      config.url = replaceURLParams(config.url, config.urlData)
+    } else {
+      config.url = config.url.slice(0, config.url.indexOf(':')) + urlData
     }
   }
   if (queryData) {
@@ -47,7 +47,9 @@ Axios.interceptors.request.use((config) => {
   let fm = new FormData()
   for (let k in config.data) {
     if (Array.isArray(config.data[k])) {
-      fm.append(k, ...config.data[k].map(v => `${k}=${encodeURIComponent(v)}`))
+      config.data[k].forEach((v) => {
+        fm.append(k, v)
+      })
     } else {
       fm.append(k, config.data[k])
     }
@@ -98,3 +100,12 @@ const ajax = (...args) => {
 }
 
 export default ajax
+
+export function replaceURLParams (url, params) {
+  const args = { ...(params || {}), org: 'MQ' }
+
+  return Object.keys(args).reduce((acc, k) => { // 此方法对每个元素进行处理
+    const re = new RegExp(`:${k}(?!w)`, 'i')
+    return acc.replace(re, args[k])
+  }, url)
+}

src/util/share.js

@@ -3,7 +3,7 @@ import api from './api'
 
 function wxsdk (params, config) {
   const wx = require('weixin-js-sdk')
-
+  console.log(config)
   const shareData = {
     title: config.title, // 分享标题
     desc: config.desc, // 分享标题