ytj

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,6 +54,10 @@ export default {
     data: {
       type: Object,
       default: () => { }
+    },
+    isgrey: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {

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">

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

@@ -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" :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>
               </div>
             </li>
             <li :hidden="navActive !== 2" class="my-card">
@@ -73,7 +73,7 @@
                   </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>
               </div>
             </li>
             <li :hidden="navActive !== 3" class="customer-card">
@@ -349,6 +349,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) {

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='courseDetail.CourseImgs? courseDetail.CourseImgs[0].ImgUrl : ""' 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,8 @@ export default {
       },
       showMoreCourse: false, // 显隐更多课程时间
       courseTimeList: [], // 课程时间
+      detailImage: [],
+      showPage: false
     }
   },
   computed: {
@@ -120,6 +129,11 @@ export default {
       if (arr === null) {
         arr = []
       }
+      this.courseDetail.CourseImgs = this.courseDetail.CourseImgs || []
+      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.CourseDetail[0].EndDate).getTime()
@@ -127,6 +141,7 @@ export default {
         this.gray = true
       }
       // console.log(JSON.stringify(res))
+      this.showPage = true
     })
   },
   methods: {

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">
@@ -98,7 +98,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 +159,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 +176,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 +189,7 @@ export default {
                     tag: '课程',
                     id: res[n].CustomerCouponId,
                     select: false,
+                    hideBtn: true
                   })
                 }
               }
@@ -213,6 +216,9 @@ export default {
       if (!bool) {
         this.postData.customercouponid = ''
       }
+      this.closeChoose()
+    },
+    closeChoose () {
       this.showLayer = false
     },
     selectCouponItem (item) { // 选择优惠券

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'