ytj

src/pages/sales/customerSearch/index.vue

@@ -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/user/couponsDetail/index.vue

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

src/pages/user/placeOrderForCourse/index.vue

@@ -182,7 +182,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].EndDate).getTime()) {
                   this.couponList.push({
                     title: res[n].Coupon.CouponName,
                     desc: res[n].Coupon.Share.UseInstruction,

src/pages/user/receiveChannel/index.vue

@@ -15,7 +15,16 @@
       <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 :src="data.VideoUrl" width="100%" height="100%"
+          style="object-fit:fill" 
+          webkit-playsinline="true" 
+          x-webkit-airplay="true" 
+          playsinline="true" 
+          x5-video-player-type="h5"
+          x5-video-orientation="h5" 
+          x5-video-player-fullscreen="true"
+          preload="auto" 
+        ></video>
       </div>
       <div class="text">
         <div>