ytj

src/components/courseItem/index.vue

@@ -19,8 +19,8 @@
               <span>优惠券体验</span>
             </div>
           </div>
-          <span>时间：{{data.time}}</span>
           <span>地点：{{data.address}}</span>
+          <span>备注：{{data.remark}}</span>
         </div>
       </div>
       <ul v-if="data.getWay=='ticket'">

src/components/myCard/myCard.vue

@@ -8,7 +8,7 @@
       </div>
       <div>
         <h2>{{data.title}}</h2>
-        <span>{{data.desc}}</span>
+        <span class="descs">{{data.desc}}</span>
         <span>{{data.startDate}}-{{data.endDate}}</span>
       </div>
     </div>
@@ -58,7 +58,7 @@ export default {
   },
   methods: {
     share () {
-      if(!this.data.invalid){
+      if (!this.data.invalid) {
         this.$emit('share', this.data)
       }
     }
@@ -79,6 +79,13 @@ export default {
     height: 0.88rem;
     padding: 0.1rem;
     box-sizing: border-box;
+    .descs {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+    }
     div:nth-of-type(1) {
       width: 1.2rem;
       position: relative;
@@ -151,7 +158,7 @@ export default {
     background-color: #fc6243;
     text-align: center;
     color: #fff;
-    border-radius: 0 0 .08rem .08rem;
+    border-radius: 0 0 0.08rem 0.08rem;
   }
 }
 </style>

src/components/orderListItem/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="orderListItem">
     <div class="title flex-h">
-      <div class="orange" v-if="returnStatus(data.MakeStatus) === '制作中'">
+      <div class="orange" v-if="returnStatus(data.MakeStatus) === '已下单'">
         <i class="iconfont icon-dengdai"></i><br>
         <span>{{returnStatus(data.MakeStatus)}}</span>
       </div>
@@ -66,6 +66,9 @@ export default {
     returnStatus (val) {
       for (var n = 0; n < dict.orderStatus.length; n++) {
         if(val === dict.orderStatus[n].key){
+          if (dict.orderStatus[n].value === '已下单'){
+            dict.orderStatus[n].value = '制作中'
+          }
           return dict.orderStatus[n].value
         }
       }

src/pages/sales/login/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage" v-if="showPage">
     <div class="mask">
-      <img :src="logo" class="logo" alt="">
+      <!-- <img :src="logo" class="logo" alt=""> -->
       <div class="centerLabel" style="width:100%;">
         <div class="box" style="margin:0 auto;">
           <div class="title">登录</div>
@@ -109,7 +109,7 @@ export default {
     },
     submit () {
       if (!this.postData.captcha) {
-        this.$toast('请先获取验证码')
+        this.$toast('请填写验证码')
         return
       }
       let reg = /^[0-9]{6}$/

src/pages/sales/login/page.scss

@@ -2,6 +2,9 @@
   background: url("../../../common/icon/bg.jpg") no-repeat 0 -0.8rem;
   background-size: 100% calc(100% + 90px);
   position: relative;
+  input::-webkit-input-placeholder {
+    color: rgba(168,182,200,1);
+  }
   .mask{
     width: 100%;
     height: 100%;

src/pages/user/bindMobile/bindMobile.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage">
     <div class="mask">
-      <img :src="logo" class="logo" alt="">
+      <!-- <img :src="logo" class="logo" alt=""> -->
       <div class="box">
         <div class="title">绑定</div>
 
@@ -157,17 +157,17 @@ export default {
     },
     submit () {
       if (!this.postData.captcha) {
-        this.$toast('请先获取验证码')
-        return
-      }
-      if (!this.postData.case) {
-        this.$toast('请选择案场')
-        return
-      }
-      if (!this.postData.sales) {
-        this.$toast('请选择销售')
+        this.$toast('请填写验证码')
         return
       }
+      // if (!this.postData.case) {
+      //   this.$toast('请选择案场')
+      //   return
+      // }
+      // if (!this.postData.sales) {
+      //   this.$toast('请选择销售')
+      //   return
+      // }
       this.submitData(this.postData).then((res) => {
         this.$toast(res)
         if (this.$route.query.isLottery) {

src/pages/user/bindMobile/page.scss

@@ -2,6 +2,9 @@
   background: url("../../../common/icon/bg.jpg") no-repeat 0 -0.8rem;
   background-size: 100% calc(100% + 90px);
   position: relative;
+  input::-webkit-input-placeholder {
+    color: rgba(168,182,200,1);
+  }
   .mask{
     width: 100%;
     height: 100%;

src/pages/user/coupons/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage">
     <div class="box">
-      <discounts @toUse='toUse' :data='item' @toDetail="toDetail"></discounts>
+      <discounts @toUse='toUse' :data='item' @toDetail="toDetail" v-for="(item,index) in list" :key="index"></discounts>
       <noMore v-if="hasPic"></noMore>
     </div>
   </div>
@@ -54,7 +54,8 @@ export default {
           useType: res[n].Status === 1 ? '未使用' : '已使用',
           tag: res[n].Coupon.CouponType === 'coupon' ? '课程' : '商品',
           customercouponid: res[n].CustomerCouponId,
-          couponid: res[n].Coupon.CouponId
+          couponid: res[n].Coupon.CouponId,
+          Coupon: res[n].Coupon
         })
       }
     })
@@ -71,7 +72,11 @@ export default {
       if (item.Coupon.Targets.length > 1) {
         this.$router.push({ name: 'indexPage' })
       } else {
-        this.$router.push({ name: 'majorProjectsDetail', query: { id: item.TargetId } })
+        if (item.tag === '商品') {
+          this.$router.push({ name: 'coffeeIndex' })
+        } else {
+          this.$router.push({ name: 'majorProjectsDetail', query: { id: item.Coupon.Targets[0].TargetId } })
+        }
       }
     },
     toDetail (item) {

src/pages/user/fiveA/index.vue

@@ -150,7 +150,7 @@ export default {
           id: arr[n].CourseId,
           title: arr[n].CourseName,
           img: arr[n].CourseImg,
-          time: this.toolClass.dateFormat(arr[n].BeginDate),
+          remark: arr[n].Remark,
           address: arr[n].CaseInfo.CaseAddress,
           tag: arr[n].CourseTags || [],
           courseType: '',

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

@@ -53,7 +53,7 @@
                       <span>￥{{cardTotalCount}}</span>
                     </div>
                   </div>
-                  <a @click="toSalesHistory">销售记录</a>
+                  <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>
               </div>

src/pages/user/majorProjectsDetail/index.vue

@@ -64,12 +64,14 @@
           <span>优惠券体验</span>
         </div>
       </div>
-      <router-link :to="{name: 'placeOrderForCourse', query: {id: courseDetail.CourseId}}">去购买</router-link>
+      <a @click="toBuy">去购买</a>
     </div>
   </div>
 </template>
 
 <script>
+import wxsdk from '../../../util/share'
+import logo from '../../../common/icon/indexlogo.jpg'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
@@ -80,6 +82,7 @@ export default {
   name: '',
   data () {
     return {
+      logo,
       swiperOption: {
         observer: true,
         autoplay: {
@@ -157,6 +160,15 @@ export default {
     triggerCourseTime () { // 显隐更多课程时间
       this.showMoreCourse = !this.showMoreCourse
     },
+    toBuy () {
+      let nowDate = Date.now()
+      let endData = new Date(this.courseDetail.EndDate).getTime()
+      if (nowDate > endData) {
+        this.$toast('该课程已过期')
+      } else {
+        this.$router.push({ name: 'placeOrderForCourse', query: { id: this.courseDetail.CourseId } })
+      }
+    }
   }
 }
 </script>

src/pages/user/placeOrderForCourse/index.vue

@@ -162,43 +162,39 @@ export default {
       this.getCourseDetailInfo({ id: this.$route.query.id }).then((res) => {
         var arr = res.CourseDetail
         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++) {
-        if (res[n].Coupon.CouponType === 'coupon' && res[n].Status === 1) {
-          if (res[n].Coupon.IsAll) {
-            this.couponList.push({
-              title: res[n].Coupon.CouponName,
-              desc: res[n].Coupon.Share.UseInstruction,
-              time: this.toolClass.dateFormat(res[n].EndDate),
-              useType: '未使用',
-              tag: '课程',
-              id: res[n].CustomerCouponId,
-              select: false,
-            })
-          } else {
-            console.log(res[n].Coupon.Targets[a].TargetId)
-            console.log(new Date(res[n].StartDate).getTime())
-            console.log(nowDate)
-            console.log(new Date(res[n].EndDate).getTime())
-            for (var a = 0; a < res[n].Coupon.Targets.length; a++) {
-              if (res[n].Coupon.Targets[a].TargetId === id && nowDate >= new Date(res[n].StartDate).getTime() && nowDate < new Date(res[n].EndDate).getTime()) {
-                this.couponList.push({
-                  title: res[n].Coupon.CouponName,
-                  desc: res[n].Coupon.Share.UseInstruction,
-                  time: this.toolClass.dateFormat(res[n].EndDate),
-                  useType: '未使用',
-                  tag: '课程',
-                  id: res[n].CustomerCouponId,
-                  select: false,
-                })
+        var id = this.$route.query.id, arr = [], nowDate = Date.now()
+        for (var n = 0; n < res.length; n++) {
+          if (res[n].Coupon.CouponType === 'coupon' && res[n].Status === 1) {
+            if (res[n].Coupon.IsAll) {
+              this.couponList.push({
+                title: res[n].Coupon.CouponName,
+                desc: res[n].Coupon.Share.UseInstruction,
+                time: this.toolClass.dateFormat(res[n].EndDate),
+                useType: '未使用',
+                tag: '课程',
+                id: res[n].CustomerCouponId,
+                select: false,
+              })
+            } 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()) {
+                  this.couponList.push({
+                    title: res[n].Coupon.CouponName,
+                    desc: res[n].Coupon.Share.UseInstruction,
+                    time: this.toolClass.dateFormat(res[n].EndDate),
+                    useType: '未使用',
+                    tag: '课程',
+                    id: res[n].CustomerCouponId,
+                    select: false,
+                  })
+                }
               }
             }
           }
         }
-      }
-      this.getCouponOff = true
-      // console.log(JSON.stringify(this.couponList))
+        this.getCouponOff = true
+        // console.log(JSON.stringify(this.couponList))
+      })
     })
   },
   methods: {

src/pages/user/receive/index.vue

@@ -140,12 +140,19 @@ export default {
       return `${rnd}${timestamp}`
     },
     sdk (info) {
-      let logo = this.data.Images[0].CouponImageUrl ? this.data.Images[0].CouponImageUrl : this.data.Images[0].CardImageUrl
+      let logo, title
+      if ($route.query.type === 'card') {
+        logo = this.data.Images[0].CardImageUrl
+        title = this.data.CardName
+      } else {
+        logo = this.data.Images[0].CouponImageUrl
+        title = this.data.CouponName
+      }
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-        title: '领取卡券',
+        title: title,
         desc: info,
         link: `${window.location.origin}${window.location.pathname}#/receiveShared/${this.$route.query.id}/${this.$route.query.salesid}/${this.$route.query.type}/receive`,
-        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+        thu_image: logo
       })
     }
   }

src/pages/user/receiveChannel/index.vue

@@ -131,12 +131,19 @@ export default {
       }
     },
     sdk (info) {
-      let logo = this.data.Images[0].CouponImageUrl ? this.data.Images[0].CouponImageUrl : this.data.Images[0].CardImageUrl
+      let logo, title
+      if ($route.query.type === 'card') {
+        logo = this.data.Images[0].CardImageUrl
+        title = this.data.CardName
+      } else {
+        logo = this.data.Images[0].CouponImageUrl
+        title = this.data.CouponName
+      }
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-        title: '领取卡券',
+        title: title,
         desc: info,
         link: `${window.location.origin}${window.location.pathname}#/receiveChannelShared/${this.$route.query.id}/${this.$route.query.type}/receive`,
-        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+        thu_image: logo
       })
     }
   }

src/pages/user/receiveResults/index.vue

@@ -9,7 +9,7 @@
       <span v-else>{{msg}}</span>
       <div class="back" v-if="status === 'success'" @click="back">查看我的体验券</div>
       <div v-else></div>
-      <img :src="logo">
+      <img :src="logo" class="bottomLogo">
     </div>
   </div>
 </template>
@@ -35,7 +35,7 @@ export default {
   },
   methods: {
     back () {
-      this, $router.push({ name: 'userCenter' })
+      this.$router.push({ name: 'userCenter' })
     }
   }
 }

src/pages/user/receiveResults/page.scss

@@ -32,5 +32,6 @@
   img{
     width: 1rem;
     margin-top: 1rem;
+    opacity: .5;
   }
 }