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

src/components/courseItem/index.vue

@@ -24,7 +24,7 @@
         </div>
       </div>
       <ul v-if="data.getWay=='ticket'">
-        <li v-for="(item,index) in data.tag" :key="index">{{item}}</li>
+        <li v-for="(item,index) in data.tag" :key="index">{{item.TagName}}</li>
       </ul>
       <div v-if="data.getWay=='free'" class="flex-h">
         <div class="flex-item">

src/components/discounts/discounts.vue

@@ -11,7 +11,7 @@
       </div>
       <div class="card-right">
         <img :src="logo" alt="" width="100%" height="100%">
-        <div class="btn" @click.stop="toUse" v-if="data.useType == '未使用'">去使用</div>
+        <div class="btn" @click.stop="toUse" v-if="data.useType == '未使用' && !data.hideBtn">去使用</div>
       </div>
       <div class="tag" :class="{'gray-location' : data.useType == '已使用'}">
         <span>{{data.tag}}</span>

src/components/myCard/myCard.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="card-content flex-l" :class="{invalid: data.invalid}">
+  <div class="card-content flex-l" :class="{invalid: data.invalid || isgrey}">
     <div class="card-top flex-h">
       <div>
         <img :src="logo" class="logo">
@@ -54,12 +54,20 @@ export default {
     data: {
       type: Object,
       default: () => { }
+    },
+    isgrey: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {
     share () {
       if (!this.data.invalid) {
-        this.$emit('share', this.data)
+        if (this.isgrey) {
+          this.$toast('您的卡券分享功能已被关闭，请联系主管')
+        } else {
+          this.$emit('share', this.data)
+        }
       }
     }
   }
@@ -86,8 +94,8 @@ export default {
       display: -webkit-box;
       -webkit-line-clamp: 2;
       -webkit-box-orient: vertical;
-      height: .32rem;
-      line-height: .16rem;
+      height: 0.32rem;
+      line-height: 0.16rem;
     }
     div:nth-of-type(1) {
       width: 1.15rem;
@@ -124,7 +132,7 @@ export default {
       }
       span {
         color: #323645;
-        font-size: 12px;      
+        font-size: 12px;
         padding-top: 0.05rem;
       }
     }

src/components/noMore/noMore.vue

@@ -16,12 +16,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.nomore{
-  img{
-    width: 100%;
+.nomore {
+  img {
+    width: 40%;
     position: absolute;
-    top: 40%;
-    transform: translateX(-50%);
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
   }
 }
 </style>

src/components/orderItem/index.vue

@@ -18,7 +18,7 @@
           </div>
         </div>
         <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">
+        <input v-if="!data.spec.length && data.status === 1" type="tel" @input="input" v-model="defaultNum" readonly style="color:#000;">
         <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>
         <span v-if="data.status !== 1">已售罄</span>

src/components/orderPopup/index.vue

@@ -22,7 +22,7 @@
           </div>
         </div>
         <i class="iconfont icon-jian" @click="subtract"></i>
-        <input type="tel" v-model="num">
+        <input type="tel" v-model="num" readonly style="color:#000;">
         <i class="iconfont icon-jia" @click="add"></i>
         <a @click="sure">确定</a>
       </div>

src/pages/sales/customerSearch/page.scss

@@ -89,13 +89,14 @@
         height: .3rem;
         background: #eee;
         border-radius: .08rem;
-        padding-left: .2rem;
+        padding-left: .3rem;
         line-height: .3rem;
+        padding-top: .03rem;
       }
       i{
         font-size: .16rem;
         position: absolute;
-        top: .16rem;
+        top: .18rem;
         left: .23rem;
         color: #aaa;
       }

src/pages/user/bindMobile/bindMobile.vue

@@ -110,6 +110,13 @@ export default {
           }
         }
       }
+      if (this.caseInfo.manager) {
+        for (let i = 0; i < this.caseInfo.manager.length; i++) {
+          if (this.caseInfo.manager[i].CaseId === this.postData.case) {
+            this.columnsS.push(this.caseInfo.manager[i])
+          }
+        }
+      }
       this.showCase = false
     },
     onCancelC () {
@@ -169,7 +176,6 @@ export default {
       //   return
       // }
       this.submitData(this.postData).then((res) => {
-        this.$toast(res)
         if (this.$route.query.isLottery) {
           setTimeout(() => {
             const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}` : ''

src/pages/user/card/index.vue

@@ -3,7 +3,8 @@
     <nav class="flex-h" v-if='false'>
       <a class="flex-item" v-for="(item,index) in nav" :key="index" :class="{'active':index==active}" @click="change(item,index)">{{item}}</a>
     </nav>
-    <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='data[active].list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'>
+    <div style="background:#fff;">
+    <!-- <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='data[active].list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'> -->
       <div class="box">
         <div v-if="active == 0">
           <discounts v-for="(item,index) in data[0].list" :key='index' @toUse='toUse' :data='item' @toDetail="toCardDetail(item)"></discounts>
@@ -29,7 +30,7 @@
               </div>
               <div class="card-bottom">
                 <img :src="line" alt="">
-                <div class="time">有效期：{{toolClass.dateFormat(item.EndDate)}}</div>
+                <div class="time">有效期：{{toolClass.dateFormat(item.EndDate,'yyyy-MM-dd')}}</div>
                 <div class="status" :class="{'gray-location' : item.CardStatus == 'used'}">
                   <span v-if="item.GymType == 'year'">年卡</span>
                   <span v-if="item.GymType == 'quarter'">季卡</span>
@@ -46,7 +47,8 @@
           <noMore v-if="data[active].hasPic"></noMore>
         </div>
       </div>
-    </scroll>
+    </div>
+    <!-- </scroll> -->
   </div>
 </template>
 
@@ -80,14 +82,14 @@ export default {
           hasPic: false,
           hasMore: true,
           page: 1,
-          pageSize: 1,
+          pagesize: 1,
           list: []
         },
         {
           hasPic: false,
           hasMore: true,
           page: 0,
-          pageSize: 10,
+          pagesize: 10000,
           list: []
         }
       ],
@@ -118,15 +120,20 @@ export default {
   created () {
     this.change('', 0)
     this.getCardList().then((res) => {
-      for (var n = 0; n < res.length; n++) {
-        this.data[0].list.push({
-          title: res[n].CardName,
-          desc: res[n].Share.CardUseRule,
-          time: this.toolClass.dateFormat(res[n].EndDate),
-          useType: res[n].Status === 1 ? '未使用' : '已使用',
-          tag: '共享',
-          cardid: res[n].CardId
-        })
+      if (res) {
+        for (var n = 0; n < res.length; n++) {
+          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 ? '未使用' : '已使用',
+            tag: '共享',
+            CustomerCourseId: res[n].CustomerCourseId,
+            CustomerCardId: res[n].CustomerCardId
+          })
+        }
+      } else {
+        this.data[this.active].hasPic
       }
     })
   },
@@ -141,8 +148,7 @@ export default {
     },
     toUse (item) {
       console.log(item)
-      this.$router.push({ name: 'lessonDetail', query: {id: item.CustomerCourseId} })
-      // this.$router.push({ name: 'lessonOrder' })
+      this.$router.push({ name: 'lessonDetail', query: { id: item.CustomerCourseId } })
     },
     getList (param) {
       if (this.active === 0) {
@@ -152,10 +158,10 @@ export default {
           this.data[this.active].page = 0
         }
         if (this.data[this.active].hasMore) {
-          this.getgymCardList({ page: this.data[this.active].page, pageSize: this.data[this.active].pageSize }).then((res) => {
+          this.getgymCardList({ page: this.data[this.active].page, pagesize: this.data[this.active].pagesize }).then((res) => {
             this.data[this.active].list = this.data[this.active].list.concat(this.gymCardList)
             this.data[this.active].page++
-            if (this.gymCardList.length < this.data[this.active].pageSize) {
+            if (this.gymCardList.length < this.data[this.active].pagesize) {
               this.data[this.active].hasMore = false
             }
             if (this.data[this.active].list.length <= 0) {
@@ -171,7 +177,7 @@ export default {
       this.$router.push({ name: 'gymCardDetail', query: { CustomerGymId: item.CustomerGymId } })
     },
     toCardDetail (item) {
-      this.$router.push({ name: 'cardDetail', query: { id: item.cardid } })
+      this.$router.push({ name: 'cardDetail', query: { id: item.CustomerCardId } })
     }
   }
 }

src/pages/user/card/page.scss

@@ -28,7 +28,7 @@
     }
   }
   .box{
-    padding: .25rem;
+    padding: .25rem .25rem 0;
     box-sizing: border-box;
     .fitness-card{
       overflow: hidden;

src/pages/user/cardDetail/index.vue

@@ -4,12 +4,12 @@
     <div class="content" v-if="info !== null">
       <div class="message">
         <div>
-          <span>{{info.CardName}}</span>
-          <span class="sub">(可在银城会所健身房和游泳池使用)</span>
+          <span>{{info.CustomerCardName}}</span>
+          <!-- <span class="sub">(可在银城会所健身房和游泳池使用)</span> -->
         </div>
         <div>
           <span>有效时间</span>
-          <span>{{toolClass.dateFormat(info.EndDate)}}</span>
+          <span>{{toolClass.dateFormat(info.StartDate,'yyyy-MM-dd') + '~' + toolClass.dateFormat(info.EndDate,'yyyy-MM-dd')}}</span>
         </div>
       </div>
       <div class="rule">

src/pages/user/coupons/index.vue

@@ -46,18 +46,23 @@ export default {
     this.getCouponList().then((res) => {
       // console.log(JSON.stringify(res))
       // console.log(JSON.stringify(this.couponList))
-      for (var n = 0; n < res.length; n++) {
-        this.list.push({
-          title: res[n].Coupon.CouponName,
-          desc: res[n].Coupon.Share.UseInstruction,
-          time: this.toolClass.dateFormat(res[n].EndDate),
-          useType: res[n].Status === 1 ? '未使用' : '已使用',
-          tag: res[n].Coupon.CouponType === 'course' ? '课程' : '商品',
-          customercouponid: res[n].CustomerCouponId,
-          couponid: res[n].Coupon.CouponId,
-          Coupon: res[n].Coupon
-        })
+      if (res) {
+        for (var n = 0; n < res.length; n++) {
+          this.list.push({
+            title: res[n].Coupon.CouponName,
+            desc: res[n].Coupon.Share.UseInstruction,
+            time: this.toolClass.dateFormat(res[n].EndDate),
+            useType: res[n].Status === 1 ? '未使用' : '已使用',
+            tag: res[n].Coupon.CouponType === 'course' ? '课程' : '商品',
+            customercouponid: res[n].CustomerCouponId,
+            couponid: res[n].Coupon.CouponId,
+            Coupon: res[n].Coupon
+          })
+        }
+      } else {
+        this.hasPic = true
       }
+
     })
   },
   methods: {
@@ -69,13 +74,18 @@ export default {
     },
     toUse (item) {
       console.log(item)
+      item.Coupon.Targets = item.Coupon.Targets || []
       if (item.Coupon.Targets.length > 1) {
         this.$router.push({ name: 'indexPage' })
       } else {
         if (item.tag === '商品') {
           this.$router.push({ name: 'coffeeIndex' })
         } else {
-          this.$router.push({ name: 'majorProjectsDetail', query: { id: item.Coupon.Targets[0].TargetId } })
+          if (item.Coupon.Targets && item.Coupon.Targets.length === 1) {
+            this.$router.push({ name: 'majorProjectsDetail', query: { id: item.Coupon.Targets[0].TargetId } })
+          } else {
+            this.$router.push({ name: 'indexPage' })
+          }
         }
       }
     },

src/pages/user/fiveA/index.vue

@@ -22,9 +22,8 @@
                 <courseItem :data="courseInfo(course)"></courseItem>
               </router-link>
             </ul>
-            <span v-if="fiveANoData" style="width:100%;line-height:.3rem;display:block;text-align:center;color:#ccc;margin-bottom:.1rem;">暂无数据</span>
+            <!-- <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">查看更多</router-link>
           <div style="width:100%;height:.1rem;background:#f8f8f8;margin:0 auto;"></div>
           <h5>{{item.Consult}}</h5>
           <div class="newsList flex-h">

src/pages/user/lessonDetail/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mainPage">
+  <div class="mainPage" v-if="showPage">
     <div class="title">课程详情</div>
     <div class="content" :class="{'opacity' : courseOrderDetail.IsDone === 1, 'gray': courseOrderDetail.IsDone === 1}">
       <div class="list-item flex-h">
@@ -26,14 +26,19 @@
         <span>下单时间</span>
         <span class="flex-item">{{toolClass.dateFormat(courseOrderDetail.CreateDate)}}</span>
       </div>
-      <!-- <div class="list-item">
+      <div class="list-item flex-h">
+        <span>课程时间</span>
+        <span class="flex-item">{{toolClass.dateFormat(courseOrderDetail.BeginDate) + ' ~ ' + toolClass.dateFormat(courseOrderDetail.EndDate)}}<span class="remark">计划备注({{courseOrderDetail.Remark}})</span> </span>
+      </div>
+      <div class="list-item">
         <span>地点</span>
         <span>{{returnCaseName(courseOrderDetail.CaseId)}}</span>
-      </div> -->
+      </div>
       <div class="list-item">
         <span>付款方式</span>
-        <span>{{courseOrderDetail.CourseObtaimType === 'cheng-coin' ? '城币支付' : '优惠券抵用'}}</span>
-        <!-- <span>优惠券抵用 <div class="coupon-name">小拉伸柔韧度体验券</div></span> -->
+        <span v-if="courseOrderDetail.CourseObtaimType === 'cheng-coin'">城币支付</span>
+        <span v-if="courseOrderDetail.CourseObtaimType === 'card'">卡券抵用</span>
+        <span v-if="courseOrderDetail.CourseObtaimType === 'coupon'">优惠券抵用</span>
       </div>
       <div class="half-cic">
         <span></span>
@@ -41,7 +46,6 @@
       </div>
       <div class="qr-code" v-if="courseOrderDetail.IsDone === 0">
         <qrCode v-if="showQrCode" :msg="courseOrderDetail.QrCodeString"></qrCode>
-        <!-- <div class="number">32237489123</div> -->
       </div>
     </div>
     <div class="useType">
@@ -69,6 +73,7 @@ export default {
       used,
       failure,
       showQrCode: false,
+      showPage: false
     }
   },
   created () {
@@ -78,6 +83,7 @@ export default {
           id: this.$route.query.id
         }).then((res) => {
           this.showQrCode = true
+          this.showPage = true
           // console.log(JSON.stringify(res))
         })
       })

src/pages/user/lessonDetail/page.scss

@@ -66,9 +66,13 @@
   }
   .useType{
     position: absolute;
-    bottom: 1.6rem;
-    right: .8rem;
+    bottom: 3.2rem;
+    right: .5rem;
     width: .76rem;
     height: .76rem;
   }
+  .remark{
+    font-size: .12rem;
+    color: #FC6243 !important;
+  }
 }

src/pages/user/lessonOrder/index.vue

@@ -9,7 +9,9 @@
           </div>
           <div class="card-msg">
             <div class="title">{{item.CourseName}}</div>
-            <div class="text">付款方式：{{item.CourseObtaimType === 'cheng-coin' ? '城币支付' : '优惠券抵用'}}</div>
+            <div class="text" v-if="item.CourseObtaimType === 'cheng-coin'">付款方式：城币支付</div>
+            <div class="text" v-if="item.CourseObtaimType === 'card'">付款方式：卡券抵用</div>
+            <div class="text" v-if="item.CourseObtaimType === 'coupon'">付款方式：优惠券抵用</div>
             <div class="text">下单时间：{{toolClass.dateFormat(item.CreateDate)}}</div>
           </div>
           <div class="card-price">
@@ -17,8 +19,8 @@
             <div class="type" :class="{'un-use' : item.IsDone === 0}">{{item.IsDone === 0 ? '未使用' : '已使用'}}</div>
           </div>
         </div>
-        <span v-if="noData" style="width:100%;display:block;text-align:center;font-size:.11rem;color:#ccc;">暂无数据</span>
-        <!-- <noMore v-if="hasPic"></noMore> -->
+        <noMore v-if="noData"></noMore>
+        <!-- <span v-if="noData" style="width:100%;display:block;text-align:center;font-size:.11rem;color:#ccc;">暂无数据</span> -->
       </div>
     </scroll>
   </div>

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

@@ -59,7 +59,8 @@
                   </div>
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
                 </div>
-                <myCard v-for="(item,index) in data[1].list" :key="index" :data='item' @share='shareCard'></myCard>
+                <myCard v-for="(item,index) in data[1].list" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCard'></myCard>
+                <noMore v-if="data[1].hasPic"></noMore>
               </div>
             </li>
             <li :hidden="navActive !== 2" class="my-card">
@@ -73,7 +74,8 @@
                   </div>
                   <a @click="toSalesHistory" v-if="userInfo.customer.UserTypeId == 'manager'">销售记录</a>
                 </div>
-                <myCard v-for="(item,index) in data[2].list" :key="index" :data='item' @share='shareCoupon'></myCard>
+                <myCard v-for="(item,index) in data[2].list" :isgrey="checkCanDo()" :key="index" :data='item' @share='shareCoupon'></myCard>
+                <noMore v-if="data[2].hasPic"></noMore>
               </div>
             </li>
             <li :hidden="navActive !== 3" class="customer-card">
@@ -92,6 +94,7 @@
                   <i class="iconfont icon-sousuo search-icon" @click="searchMask"></i>
                 </div>
                 <customerCard v-for="(item,index) in postCustomerData.isrecommend ? myRecommendUserList : data[3].list" :key="index" :data='item' @record='record'></customerCard>
+                <noMore v-if="data[3].hasPic"></noMore>
               </div>
             </li>
           </ul>
@@ -130,6 +133,7 @@ import active from '../../../../common/icon/check-box-checked.png'
 import normal from '../../../../common/icon/check-box-empty.png'
 import logo from '../../../../common/icon/indexlogo.jpg'
 import wxsdk from '../../../../util/share'
+import noMore from '../../../../components/noMore/noMore'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
@@ -153,11 +157,11 @@ export default {
       cardTotalCount: 0,
       postCouponData: {
         page: 1,
-        pageSize: 10000
+        pagesize: 10000
       },
       postCardData: {
         page: 1,
-        pageSize: 10000
+        pagesize: 10000
       },
       pullUpLoad: true,
       pullUpLoadThreshold: 40,
@@ -208,28 +212,28 @@ export default {
           hasPic: false,
           hasMore: true,
           page: 1,
-          pageSize: 1,
+          pagesize: 1,
           list: []
         },
         {
           hasPic: false,
           hasMore: true,
           page: 1,
-          pageSize: 1,
+          pagesize: 1,
           list: []
         },
         {
           hasPic: false,
           hasMore: true,
           page: 1,
-          pageSize: 1,
+          pagesize: 1,
           list: []
         },
         {
           hasPic: false,
           hasMore: true,
           page: 1,
-          pageSize: 1,
+          pagesize: 1,
           list: []
         }
       ]
@@ -252,7 +256,8 @@ export default {
     topCaseInfo,
     caseTableItem,
     myCard,
-    customerCard
+    customerCard,
+    noMore
   },
   created () {
     if (!this.userInfo.customer.MapUser) {
@@ -264,64 +269,75 @@ export default {
         this.getCustomerList({
           ...this.postCustomerData
         }).then((res) => {
-          // console.log(JSON.stringify(res))
-          for (var n = 0; n < res.length; n++) {
-            if (res[n].RecommendId === this.userInfo.customer.MapUser) {
-              this.myRecommendUserList.push(res[n])
-              res[n].showTag = true
-            } else {
-              res[n].showTag = false
+          if (res) {
+            for (var n = 0; n < res.length; n++) {
+              if (res[n].RecommendId === this.userInfo.customer.MapUser) {
+                this.myRecommendUserList.push(res[n])
+                res[n].showTag = true
+              } else {
+                res[n].showTag = false
+              }
+              this.data[3].list.push(res[n])
             }
-            this.data[3].list.push(res[n])
+          } else {
+            this.data[3].hasPic = true
           }
         })
         this.getMyCouponList({
           ...this.postCouponData
         }).then((res) => {
           res.list = res.list || []
-          for (var n = 0; n < res.list.length; n++) {
-            this.data[2].list.push({
-              invalid: this.returnInvalid(res.list[n], 'coupon'),
-              price: parseInt(res.list[n].Price),
-              title: res.list[n].CouponName,
-              desc: res.list[n].Share.UseRule,
-              startDate: this.toolClass.dateFormat(res.list[n].StartDate, 'yyyy年MM月dd日'),
-              endDate: this.toolClass.dateFormat(res.list[n].EndDate, 'yyyy年MM月dd日'),
-              totalCount: res.list[n].TotalCount,
-              SentCount: res.list[n].SentCount,
-              usedCount: res.list[n].UsedCount,
-              CardId: res.list[n].CouponId,
-            })
-          }
-          var count = 0
-          for (var n = 0; n < this.data[2].list.length; n++) {
-            count += this.data[2].list[n].price * this.data[2].list[n].totalCount - 0
+          if (res.list.length > 0) {
+            for (var n = 0; n < res.list.length; n++) {
+              this.data[2].list.push({
+                invalid: this.returnInvalid(res.list[n], 'coupon'),
+                price: parseInt(res.list[n].Price),
+                title: res.list[n].CouponName,
+                desc: res.list[n].Share.UseRule,
+                startDate: this.toolClass.dateFormat(res.list[n].StartDate, 'yyyy年MM月dd日'),
+                endDate: this.toolClass.dateFormat(res.list[n].EndDate, 'yyyy年MM月dd日'),
+                totalCount: res.list[n].TotalCount,
+                SentCount: res.list[n].SentCount,
+                usedCount: res.list[n].UsedCount,
+                CardId: res.list[n].CouponId,
+              })
+            }
+            var count = 0
+            for (var n = 0; n < this.data[2].list.length; n++) {
+              count += this.data[2].list[n].price * this.data[2].list[n].totalCount - 0
+            }
+            this.couponTotalCount = count.toFixed(2)
+          } else {
+            this.data[2].hasPic = true
           }
-          this.couponTotalCount = count.toFixed(2)
         })
         this.getMyCardList({
           ...this.postCardData
         }).then((res) => {
           res.list = res.list || []
-          for (var n = 0; n < res.list.length; n++) {
-            this.data[1].list.push({
-              invalid: this.returnInvalid(res.list[n], 'card'),
-              price: parseInt(res.list[n].Price),
-              title: res.list[n].CardName,
-              desc: res.list[n].Share.CardUseRule,
-              startDate: this.toolClass.dateFormat(res.list[n].StartDate, 'yyyy年MM月dd日'),
-              endDate: this.toolClass.dateFormat(res.list[n].EndDate, 'yyyy年MM月dd日'),
-              totalCount: res.list[n].TotalCount,
-              SentCount: res.list[n].SentCount,
-              usedCount: res.list[n].UsedCount,
-              CardId: res.list[n].CardId
-            })
-          }
-          var count = 0
-          for (var n = 0; n < this.data[1].list.length; n++) {
-            count += this.data[1].list[n].price * this.data[1].list[n].totalCount - 0
+          if (res.list.length > 0) {
+            for (var n = 0; n < res.list.length; n++) {
+              this.data[1].list.push({
+                invalid: this.returnInvalid(res.list[n], 'card'),
+                price: parseInt(res.list[n].Price),
+                title: res.list[n].CardName,
+                desc: res.list[n].Share.CardUseRule,
+                startDate: this.toolClass.dateFormat(res.list[n].StartDate, 'yyyy年MM月dd日'),
+                endDate: this.toolClass.dateFormat(res.list[n].EndDate, 'yyyy年MM月dd日'),
+                totalCount: res.list[n].TotalCount,
+                SentCount: res.list[n].SentCount,
+                usedCount: res.list[n].UsedCount,
+                CardId: res.list[n].CardId
+              })
+            }
+            var count = 0
+            for (var n = 0; n < this.data[1].list.length; n++) {
+              count += this.data[1].list[n].price * this.data[1].list[n].totalCount - 0
+            }
+            this.cardTotalCount = count.toFixed(2)
+          } else {
+            this.data[1].hasPic = true
           }
-          this.cardTotalCount = count.toFixed(2)
         })
       })
     } else {
@@ -349,6 +365,10 @@ export default {
       'getCaseConf',
     ]),
     ...mapCardActions(['getCardList']),
+    checkCanDo () {
+      const _that = this
+      return this.forbidList.filter(x => x.UserId === _that.userInfo.customer.MapUser && x.ForbidType === 'coupon').length > 0
+    },
     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) {
@@ -501,9 +521,9 @@ export default {
     },
     toOrders (subItem, item) {
       const _that = this
-      this.getCaseConf({caseid: subItem.CaseId}).then(res => {
+      this.getCaseConf({ caseid: subItem.CaseId }).then(res => {
         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)}})
+          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 {
           _that.$toast('当前案场已歇业！')
           return

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

@@ -41,7 +41,7 @@
 
       <div class="userCenter-menu">
         <div class="menu-item flex-h" @click="toLessonOrder">
-          <span>课程订单</span>
+          <span>我的课程</span>
           <i class="iconfont icon-jiantou-right"></i>
         </div>
         <div class="menu-item flex-h" @click="toGoodsOrder">

src/pages/user/majorProjectsDetail/index.vue

@@ -1,14 +1,15 @@
 <template>
-  <div class="mainPage flex-v">
+  <div class="mainPage flex-v" v-if="showPage">
     <div class="flex-item">
       <div class="content">
         <div class="banner">
           <div class="scrollImg">
-            <swiper :options="swiperOption" ref="mySwiper">
+            <img :src='topImage' 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="">
               </swiper-slide>
-            </swiper>
+            </swiper> -->
           </div>
           <div>
             <span>{{courseDetail.CourseName}}</span>
@@ -26,7 +27,7 @@
               <ul :class="{'show':showMoreCourse}">
                 <li v-for="(item,index) in courseTimeList" :key="index">{{returnCourseTime(item.BeginDate,item.EndDate)}}</li>
               </ul>
-              <a class="moreCourse" @click="triggerCourseTime">
+              <a class="moreCourse" @click="triggerCourseTime" v-if="courseTimeList.length>4">
                 {{showMoreCourse ? '收起' : '更多'}}
                 <i v-if="!showMoreCourse" class="iconfont icon-jiantou-down"></i>
                 <i v-if="showMoreCourse" class="iconfont icon-jiantou-up"></i>
@@ -55,6 +56,12 @@
             </div>
           </div>
         </div>
+        <div class="subContent address">
+          <h5 style="padding-bottom:.1rem">课程详情</h5>
+          <div class="flex-l" style="margin: 0 .26rem">
+            <img :src="item.ImgUrl" alt="" width="100%" v-for="(item,index) in detailImage" :key="index">
+          </div>
+        </div>
       </div>
     </div>
     <div class="flex-h">
@@ -64,7 +71,7 @@
           <span>优惠券体验</span>
         </div>
       </div>
-      <a @click="toBuy" :class="{gray:gray}">去购买</a>
+      <a @click="toBuy" :class="{gray: gray}">去购买</a>
     </div>
   </div>
 </template>
@@ -92,6 +99,9 @@ export default {
       },
       showMoreCourse: false, // 显隐更多课程时间
       courseTimeList: [], // 课程时间
+      detailImage: [],
+      showPage: false,
+      topImage: ''
     }
   },
   computed: {
@@ -120,13 +130,23 @@ export default {
       if (arr === null) {
         arr = []
       }
+      this.courseDetail.CourseImgs = this.courseDetail.CourseImgs || []
+      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)
+      }
+      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.EndDate).getTime()
       if (nowDate > endData) {
         this.gray = true
       }
+      if (this.courseDetail.SignupNum >= this.courseDetail.MaxNum) {
+        this.gray = true
+      }
       // console.log(JSON.stringify(res))
+      this.showPage = true
     })
   },
   methods: {
@@ -149,6 +169,10 @@ export default {
       this.showMoreCourse = !this.showMoreCourse
     },
     toBuy () {
+      if (this.gray) {
+        this.$toast('该课程已过期或参与人数已满')
+        return
+      }
       let nowDate = Date.now()
       let endData = new Date(this.courseDetail.EndDate).getTime()
       if (nowDate > endData) {

src/pages/user/orderList/index.vue

@@ -17,7 +17,8 @@
                 <orderListItem :data="item"></orderListItem>
               </li>
             </ul>
-            <span v-if="noData" style="width:100%;display:block;text-align:center;font-size:.11rem;color:#ccc;">暂无数据</span>
+            <noMore v-if="noData"></noMore>
+            <!-- <span v-if="noData" style="width:100%;display:block;text-align:center;font-size:.11rem;color:#ccc;">暂无数据</span> -->
           </scroll>
         </div>
       </div>

src/pages/user/placeOrder/index.vue

@@ -69,7 +69,7 @@
       <a @click="toPlaceOrder">下单</a>
     </div>
     <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
-    <calcMenu :show="showCalcMenu" :totalNum="sumNum" :data="selGoods" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
+    <calcMenu :show="showCalcMenu" :totalNum="sumNum + caseTotal.total" :data="selGoods" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
   </div>
 </template>
 
@@ -165,7 +165,7 @@ export default {
       this.selGoods.map(x => {
         price += x.price * x.num - 0
       })
-      return price
+      return Math.ceil((price) * 100) / 100
     }
   },
   components: {

src/pages/user/placeOrderForCourse/index.vue

@@ -54,8 +54,8 @@
                     <span>优惠信息</span>
                   </div>
                 </div>
-                <span>{{postData.customercouponid == '' ? '暂未选择优惠券' : '已选择优惠券'}}</span>
-                <i class="iconfont icon-jiantou-right" v-if="couponList.length"></i>
+                <span></span>
+                <i class="iconfont icon-jiantou-right"></i>
               </div>
               <div class="flex-h">
                 <div class="flex-item">
@@ -63,7 +63,9 @@
                     <span>优惠券</span>
                   </div>
                 </div>
-                <span>{{couponList.length ? couponList.length + '张可用优惠券' : '暂无优惠券'}}</span>
+                <span v-if='couponList.length <= 0 && !showCoupon'>暂无优惠券</span>
+                <span v-if='couponList.length > 0 && !showCoupon' style="color:#fc6243">{{couponList.length + '张可用优惠券'}}</span>
+                <span v-if='showCoupon' style="color:#fc6243">{{showCoupon}}</span>
               </div>
             </div>
             <div class="agreement">
@@ -98,7 +100,7 @@
     <div class="layer" :class="{'show': showLayer}"> 
       <div>
         <div class="top">
-          <i class="iconfont icon-guanbi"></i>
+          <i class="iconfont icon-guanbi" @click="closeChoose"></i>
         </div>
         <div class="body flex-h">
           <div class="flex-item">
@@ -159,8 +161,9 @@ export default {
   },
   created () {
     this.getCouponList().then((res) => {
-      this.getCourseDetailInfo({ id: this.$route.query.id }).then((res) => {
-        var arr = res.CourseDetail
+      this.getCourseDetailInfo({ id: this.$route.query.id }).then((result) => {
+        var arr = result.CourseDetail
+        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++) {
@@ -175,6 +178,7 @@ export default {
                 tag: '课程',
                 id: res[n].CustomerCouponId,
                 select: false,
+                hideBtn: true
               })
             } else {
               for (var a = 0; a < res[n].Coupon.Targets.length; a++) {
@@ -187,6 +191,7 @@ export default {
                     tag: '课程',
                     id: res[n].CustomerCouponId,
                     select: false,
+                    hideBtn: true
                   })
                 }
               }
@@ -208,11 +213,15 @@ export default {
         if (this.couponList[n].select) {
           bool = true
           this.postData.customercouponid = this.couponList[n].id
+          this.showCoupon = this.couponList[n].title
         }
       }
       if (!bool) {
         this.postData.customercouponid = ''
       }
+      this.closeChoose()
+    },
+    closeChoose () {
       this.showLayer = false
     },
     selectCouponItem (item) { // 选择优惠券

src/pages/user/receive/index.vue

@@ -30,7 +30,7 @@
           <i class="icon-kaquan iconfont"></i>
           <span>卡券有效期</span>
         </div>
-        <pre>有效期至{{toolClass.dateFormat(data.EndDate)}}，请在有效期结束前使用， 过期作废；</pre>
+        <pre>有效期至{{toolClass.dateFormat(data.EndDate,'yyyy-MM-dd')}}，请在有效期结束前使用， 过期作废；</pre>
       </div>
       <div class="text">
         <div>
@@ -119,14 +119,14 @@ export default {
     receive () {
       if (this.$route.query.type === 'card') {
         this.setCardShare({ id: this.$route.query.id, salesid: this.$route.query.salesid, serialcode: this.$route.query.random }).then(() => {
-          this.$router.push({ name: 'receiveResults', query: { type: 'success' } })
+          this.$router.push({ name: 'receiveResults', query: { type: 'success', text: '卡券' } })
         }).catch((err) => {
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
           console.log(err)
         })
       } else {
         this.setCouponShare({ id: this.$route.query.id, salesid: this.$route.query.salesid, serialcode: this.$route.query.random }).then(() => {
-          this.$router.push({ name: 'receiveResults', query: { type: 'success' } })
+          this.$router.push({ name: 'receiveResults', query: { type: 'success', text: '优惠券' } })
         }).catch((err) => {
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
           console.log(err)

src/pages/user/receiveChannel/index.vue

@@ -30,7 +30,7 @@
           <i class="icon-kaquan iconfont"></i>
           <span>卡券有效期</span>
         </div>
-        <pre>有效期至{{toolClass.dateFormat(data.EndDate)}}，请在有效期结束前使用， 过期作废；</pre>
+        <pre>有效期至{{toolClass.dateFormat(data.EndDate,'yyyy-MM-dd')}}，请在有效期结束前使用， 过期作废；</pre>
       </div>
       <div class="text">
         <div>
@@ -59,7 +59,7 @@ export default {
       video: true,
       button: true,
       show: false,
-      type:'',
+      type: '',
       data: {}
     }
   },
@@ -85,7 +85,7 @@ export default {
     }
 
     this.type = this.$route.query.type
-    
+
     this.getCaseList().then(() => {
       this.init()
     })
@@ -119,14 +119,14 @@ export default {
     receive () {
       if (this.$route.query.type === 'card') {
         this.setChannelCardShare({ id: this.$route.query.id }).then(() => {
-          this.$router.push({ name: 'receiveResults', query: { type: 'success' } })
+          this.$router.push({ name: 'receiveResults', query: { type: 'success', text: '卡券' } })
         }).catch((err) => {
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
           console.log(err)
         })
       } else {
         this.setChannelCouponShare({ id: this.$route.query.id }).then(() => {
-          this.$router.push({ name: 'receiveResults', query: { type: 'success' } })
+          this.$router.push({ name: 'receiveResults', query: { type: 'success', text: '优惠券' } })
         }).catch((err) => {
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
           console.log(err)

src/pages/user/receiveResults/index.vue

@@ -5,9 +5,9 @@
       <i class="iconfont icon-shibai fail" v-else></i>
       <span v-if="status === 'success'">领取成功</span>
       <span v-else>领取失败</span>
-      <span v-if="status === 'success'">快去个人中心查看我的体验券</span>
-      <span v-else>{{msg}}</span>
-      <div class="back" v-if="status === 'success'" @click="back">查看我的体验券</div>
+      <span v-if="status === 'success'">快去个人中心查看我的{{$route.query.text}}</span>
+      <span v-else>{{fli(msg)}}</span>
+      <div class="back" v-if="status === 'success'" @click="back">查看我的{{$route.query.text}}</div>
       <div v-else></div>
       <img :src="logo" class="bottomLogo">
     </div>
@@ -36,6 +36,9 @@ export default {
   methods: {
     back () {
       this.$router.push({ name: 'userCenter' })
+    },
+    fli (msg) {
+      return msg.substring(10, msg.length)
     }
   }
 }

src/util/ajax.js

@@ -76,6 +76,11 @@ const ajax = (...args) => {
         if (router.history.current.name !== 'bindMobile') {
           router.push({ name: 'bindMobile' })
         }
+      } else if (code === 405) {
+        // console.log(router.history.current.name)
+        // if (router.history.current.name !== 'bindMobile') {
+          router.push({ name: 'login' })
+        // }
       } else {
         if (message.indexOf("log-error") != -1) {
           console.log(message)

src/util/api.js

@@ -1,5 +1,5 @@
-// const baseUrl = '/api-v2'
-const baseUrl = '/api'
+const baseUrl = '/api-v2'
+// const baseUrl = '/api'
 const wechat = '/wechat/:org'
 const guest = '/guest/:org'