ytj

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>
@@ -73,6 +73,9 @@ export default {
           this.$emit('share', this.data)
         }
       }
+    },
+    detail () {
+      this.$emit('detail', this.data)
     }
   }
 }

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">
@@ -72,7 +72,8 @@ export default {
   name: '',
   data () {
     return {
-      data: {}
+      data: {},
+      showPage: false
     }
   },
   created () {
@@ -81,6 +82,7 @@ export default {
         this.getSales({ type: 'sales' }).then(() => {
           this.data = this.cardAndCoupon
           this.data.CustomerCard = this.data.CustomerCard || []
+          this.showPage = true
         })
       })
     } else {
@@ -88,6 +90,7 @@ export default {
         this.getSales({ type: 'sales' }).then(() => {
           this.data = this.cardAndCoupon
           this.data.CustomerCard = this.data.CustomerCoupon || []
+          this.showPage = true
         })
       })
     }

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.RealName : ''"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.CustomerName"></topCaseInfo>
     </div>
     <div class="content flex-item">
       <div>

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.RealName : ''" @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>

src/pages/sales/login/index.vue

@@ -8,7 +8,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="sms" style="margin-top:.2rem;">

src/pages/sales/salesGiveOutDetail/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''" @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>
@@ -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>

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.RealName : ''" @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/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">

src/pages/user/card/index.vue

@@ -122,16 +122,16 @@ export default {
     this.getCardList().then((res) => {
       if (res) {
         for (var n = 0; n < res.length; n++) {
-          let useType
+          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 = '未使用'
-          }
+          // 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,

src/pages/user/cardDetail/index.vue

@@ -14,7 +14,7 @@
       </div>
       <div class="rule">
         <div>使用规则</div>
-        <pre style="white-space: pre;">{{info.Share.CardUseInstruction}}</pre>
+        <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

@@ -60,7 +60,7 @@ export default {
           }
           this.list.push({
             title: res[n].Coupon.CouponName,
-            desc: res[n].Coupon.Share.UseInstruction,
+            desc: res[n].Coupon.Share.CouponShareInfo,
             time: this.toolClass.dateFormat(res[n].EndDate),
             useType: useType,
             tag: res[n].Coupon.CouponType === 'course' ? '课程' : '商品',

src/pages/user/couponsDetail/index.vue

@@ -13,7 +13,7 @@
       </div>
       <div class="rule">
         <div>使用规则</div>
-        <pre style="white-space: pre;">{{info.Share.UseInstruction}}</pre>
+        <pre style="white-space: pre-wrap;word-wrap: break-word;">{{info.Share.UseInstruction}}</pre>
         <!-- <div>1. 此卡不可兑换现金，不可与其他优惠活动同时使用。 </div>
         <div>2. 此卡不可多人使用，一人记一次。 </div>
         <div>3. 非会员可凭此卡享受对应课程。 </div>

src/pages/user/fiveA/index.vue

@@ -125,7 +125,7 @@ export default {
       if (item.ForwardType === 'url') {
         window.location.href = item.ForwardUrl
       } else if (item.ForwardType === 'course') {
-        this.$router.push({ name: '', query: { id: item.ForwardResourceId } }) // 此处去课程详情
+        this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardResourceId } }) // 此处去课程详情
       } else {
         window.location.href = item.InfoUrl
       }

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.IsDone === 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.RealName : ''" @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" :ismanager="userInfo.customer.UserTypeId == 'manager'" :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" :ismanager="userInfo.customer.UserTypeId == 'manager'" :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>
@@ -371,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) {
@@ -524,6 +538,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/userCenter/index.vue

@@ -110,7 +110,7 @@ export default {
       this.$router.push({ name: 'orderList' })
     },
     toBodyCheck () {
-      window.location.href = `${window.location.origin}/c-v2/bodyCheck.html#/`
+      window.location.href = `${window.location.origin}/bodyCheck.html#/`
     },
     toLuckdraw () {
       // ^参数约定为97

src/pages/user/majorProjectsDetail/index.vue

@@ -133,7 +133,7 @@ export default {
       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)
+        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 })

src/pages/user/placeOrder/index.vue

@@ -266,7 +266,6 @@ export default {
     },
     reback () { // 返回桌位选择
       this.$dialog.confirm({
-        title: '提示',
         message: '返回页面将清空当前选择的商品，确定要返回吗?'
       }).then(() => {
         // this.$router.push({ name: 'coffeeIndex' })
@@ -385,3 +384,9 @@ export default {
 <style lang="scss" scoped>
 @import 'page.scss';
 </style>
+
+<style>
+.van-dialog__message {
+  text-align: center;
+}
+</style>

src/pages/user/placeOrderDetail/index.vue

@@ -130,8 +130,9 @@ 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()) {
             this.couponList.push({
               title: res[n].Coupon.CouponName,
               desc: res[n].Coupon.Share.UseInstruction,
@@ -241,7 +242,7 @@ export default {
         // })
       })
     },
-    
+
     popBack () {
       this.showSuccessPopup = false
       window.history.go(-2)

src/pages/user/placeOrderForCourse/index.vue

@@ -29,7 +29,7 @@
                   </div>
                 </div>
                 <!-- <span v-if="courseTimeList.length">{{returnCourseTime(courseTimeList[0].BeginDate,courseTimeList[0].EndDate)}}</span> -->
-                <span v-if="courseTimeList.length">{{toolClass.dateFormat(courseTimeList[0].BeginDate,'yyyy-MM-dd') + ' ~ ' + toolClass.dateFormat(courseTimeList[0].EndDate, 'yyyy-MM-dd')}}</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">
@@ -169,8 +169,9 @@ export default {
         var id = this.$route.query.id, arr = [], nowDate = Date.now()
         for (var n = 0; n < res.length; 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 && res[n].CaseId === caseid) {
+            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,

src/util/ajax.js

@@ -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)
+}