ytj

src/components/customerCard/customerCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="card-content">
-    <div class="tag">
+    <div class="tag" v-if='data.showTag'>
       <span>我推荐</span>
     </div>
     <div class="card-top flex-h">

src/pages/sales/login/index.vue

@@ -120,7 +120,9 @@ export default {
       // console.log(this.postData)
       this.submitData(this.postData).then((res) => {
         // this.$toast(res)
-        window.location.href = this.getUrl('mainPage/coffeeIndex')
+        setTimeout(() => {
+          window.location.href = this.getUrl('mainPage/coffeeIndex')
+        }, 2000)
       })
     }
   },

src/pages/user/App.vue

@@ -37,7 +37,7 @@ export default {
     wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
       title: '城的空间',
       desc: '城的空间',
-      link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
+      link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
       thu_image: `${window.location.origin}${window.location.pathname}${logo}`
     })
   },

src/pages/user/bindMobile/bindMobile.vue

@@ -179,7 +179,7 @@ export default {
           setTimeout(() => {
             // this.$router.push({name: 'userCenter'})
             window.history.go(-1)
-          }, 300)
+          }, 2000)
         }
       })
     }

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

@@ -77,7 +77,7 @@
               <div class="list-box">
                 <div class="search-bar flex-h">
                   <span>共{{this.data[3].list.length}}位客户</span>
-                  <!-- <van-checkbox v-model="postCustomerData.isrecommend">
+                  <van-checkbox v-model="postCustomerData.isrecommend">
                     我推荐的客户({{myRecommendUserList.length}}人)
                     <img
                       slot="icon"
@@ -85,7 +85,7 @@
                       :src="postCustomerData.isrecommend ? icon.active : icon.normal"
                       style="width:.2rem;height:.2rem;bottom: .02rem;position: relative;"
                     >
-                  </van-checkbox> -->
+                  </van-checkbox>
                   <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>
@@ -265,6 +265,9 @@ export default {
           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])
           }
@@ -276,7 +279,7 @@ export default {
           for (var n = 0; n < res.list.length; n++) {
             this.data[2].list.push({
               invalid: this.returnInvalid(res.list[n], 'coupon'),
-              price: res.list[n].Price,
+              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日'),
@@ -300,7 +303,7 @@ export default {
           for (var n = 0; n < res.list.length; n++) {
             this.data[1].list.push({
               invalid: this.returnInvalid(res.list[n], 'card'),
-              price: res.list[n].Price,
+              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日'),
@@ -308,7 +311,7 @@ export default {
               totalCount: res.list[n].TotalCount,
               SentCount: res.list[n].SentCount,
               usedCount: res.list[n].UsedCount,
-              CardId: res.list[n].CardId,
+              CardId: res.list[n].CardId
             })
           }
           var count = 0
@@ -391,7 +394,8 @@ export default {
         id: item.CardId,
         type: 'card',
         sharetype: 'share',
-        salesid: this.userInfo.customer.MapUser
+        salesid: this.userInfo.customer.MapUser,
+        random: this.random()
       }
       this.$router.push({ name: 'receive', query: query })
     },
@@ -400,10 +404,19 @@ export default {
         id: item.CardId,
         type: 'coupon',
         sharetype: 'share',
-        salesid: this.userInfo.customer.MapUser
+        salesid: this.userInfo.customer.MapUser,
+        random: this.random()
       }
       this.$router.push({ name: 'receive', query: query })
     },
+    random () {
+      let rnd = ''
+      for (let i = 0; i < 5; i++) {
+        rnd += Math.floor(Math.random() * 10)
+      }
+      let timestamp = new Date().valueOf()
+      return `${rnd}${timestamp}`
+    },
     remark (item) {
       // console.log(item)
       this.showDialog = true
@@ -423,14 +436,6 @@ export default {
       let that = this
       that.topCaseInfoData.caseName = that.CaseList[0].CaseName
       that.topCaseInfoData.caseId = that.CaseList[0].CaseId
-      that.getCaseTableList({
-        caseid: that.topCaseInfoData.caseId
-      })
-      if (this.userInfo.customer.MapUser !== '') {
-        that.getCaseTotal({
-          caseid: that.topCaseInfoData.caseId
-        })
-      }
       if (this.userInfo.customer.MapUser !== '') {
         this.topCaseInfoData.caseId = this.userInfo.customer.BelongCaseId
         for (let i = 0; i < this.CaseList.length; i++) {
@@ -438,11 +443,19 @@ export default {
             this.topCaseInfoData.caseName = this.CaseList[i].CaseName
           }
         }
+        that.getCaseTableList({
+          caseid: that.topCaseInfoData.caseId
+        })
+        if (this.userInfo.customer.MapUser !== '') {
+          that.getCaseTotal({
+            caseid: that.topCaseInfoData.caseId
+          })
+        }
       } else {
         wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
           title: '城的空间',
           desc: '城的空间',
-          link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
+          link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
           thu_image: `${window.location.origin}${window.location.pathname}${logo}`
         }).then(() => {
           wx.getLocation({

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

@@ -84,6 +84,7 @@ export default {
       locationId: '',
       swiperOption: {
         observer: true,
+        speed: 1000,
         autoplay: {
           disableOnInteraction: false,
         }
@@ -91,7 +92,7 @@ export default {
       swiperOptionMsg: {
         observer: true,
         direction: 'vertical',
-        loop: true,
+        speed: 1000,
         autoplay: {
           disableOnInteraction: false,
         }
@@ -115,7 +116,9 @@ export default {
       return this.$refs.mySwiper.swiper
     },
     MySwiperMsg () {
-      return this.$refs.MySwiperMsg.swiper
+      this.$nextTick(() => {  // 下一个UI帧再初始化swiper
+        return this.$refs.MySwiperMsg.swiper
+      })
     }
   },
   components: {

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

@@ -1,15 +1,12 @@
 <template>
   <div class="mainPage">
-    <div class="loading" v-if="isLoading">
-      <!-- <div @click="bindMobile">请绑定手机号</div> -->
-    </div>
-    <div v-else>
+    <div>
       <div class="userTop_view" >
         <div class="gradient_bg"></div>
         <div class="zIndex_bg"></div>
         <div class="userAvatar_Border">
           <div class="userAvatar">
-            <img :src='AccountInfo.headimgurl' alt="" width="100%" height="100%">
+            <img :src='headimgurl' alt="" width="100%" height="100%">
           </div>
         </div>
         <div class="uesr-info">
@@ -71,8 +68,7 @@ export default {
   name: '',
   data () {
     return {
-      user: {},
-      isLoading: true
+      user: {}
     }
   },
   computed: {
@@ -87,12 +83,9 @@ export default {
   },
   mounted () {
     this.getUserInfo({ org: this.org }).then(() => {
-      if (this.userInfo) {
-        this.user = this.userInfo.customer
-        this.AccountInfo = JSON.parse(this.user.AccountInfo)
-        this.headimgurl = this.AccountInfo.headimgurl
-        this.isLoading = false
-      }
+      this.user = this.userInfo.customer
+      this.AccountInfo = JSON.parse(this.user.AccountInfo)
+      this.headimgurl = this.user.Headimgurl
     })
     this.getNum()
   },

src/pages/user/majorProjectsDetail/index.vue

@@ -122,7 +122,7 @@ export default {
       }
       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()
+      let endData = new Date(this.courseDetail.CourseDetail[0].EndDate).getTime()
       if (nowDate > endData) {
         this.gray = true
       }
@@ -130,7 +130,7 @@ export default {
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         title: '城的空间',
         desc: '城的空间',
-        link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
+        link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
         thu_image: `${window.location.origin}${window.location.pathname}${logo}`
       }).then(() => {
         let result = this.courseDetail.CaseInfo.Coordinate.split(",")

src/pages/user/placeOrder/index.vue

@@ -186,9 +186,11 @@ export default {
         // console.log(JSON.stringify(res))
         this.mapArr()
       })
-      this.getCaseTotal({
-        caseid: this.caseId
-      })
+      if (this.userInfo.customer.MapUser !== '') {
+        this.getCaseTotal({
+          caseid: this.caseId
+        })
+      }
     })
   },
   methods: {

src/pages/user/receive/index.vue

@@ -8,8 +8,8 @@
       <img :src="logo" alt="">
     </div> -->
     <div class="banner"  v-if="!video">
-      <img :src="data.Images[0].CardImageUrl" alt="" width="100%" height="100%" v-if="$route.query.type === 'card'">
-      <img :src="data.Images[0].CouponImageUrl" alt="" width="100%" height="100%" v-else>
+      <img :src="data.Images[0].CardImageUrl" alt="" width="100%" height="100%" v-if="type === 'card'">
+      <img :src="data.Images[0].CouponImageUrl" alt="" width="100%" height="100%" v-if="type === 'coupon'">
     </div>
     <div class="content">
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
@@ -59,6 +59,7 @@ export default {
       video: true,
       button: true,
       show: false,
+      type: '',
       data: {}
     }
   },
@@ -80,6 +81,7 @@ export default {
       })
     }
 
+    this.type = this.$route.query.type
 
     if (this.$route.query.sharetype === 'share') {
       this.button = false
@@ -116,14 +118,14 @@ export default {
     },
     receive () {
       if (this.$route.query.type === 'card') {
-        this.setCardShare({ id: this.$route.query.id, salesid: this.$route.query.salesid, serialcode: this.random() }).then(() => {
+        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' } })
         }).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.random() }).then(() => {
+        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' } })
         }).catch((err) => {
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
@@ -131,17 +133,9 @@ export default {
         })
       }
     },
-    random () {
-      let rnd = ''
-      for (let i = 0; i < 5; i++) {
-        rnd += Math.floor(Math.random() * 10)
-      }
-      let timestamp = new Date().valueOf()
-      return `${rnd}${timestamp}`
-    },
     sdk (info) {
       let logo, title
-      if ($route.query.type === 'card') {
+      if (this.$route.query.type === 'card') {
         logo = this.data.Images[0].CardImageUrl
         title = this.data.CardName
       } else {
@@ -151,7 +145,7 @@ export default {
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         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`,
+        link: `${window.location.origin}${window.location.pathname}#/receiveShared/${this.$route.query.id}/${this.$route.query.salesid}/${this.$route.query.type}/${this.$route.query.random}/receive`,
         thu_image: logo
       })
     }

src/pages/user/receiveChannel/index.vue

@@ -8,8 +8,8 @@
       <img :src="logo" alt="">
     </div>
     <div class="banner"  v-if="!video">
-      <img :src="data.Images[0].CardImageUrl" alt="" width="100%" height="100%" v-if="$route.query.type === 'card'">
-      <img :src="data.Images[0].CouponImageUrl" alt="" width="100%" height="100%" v-else>
+      <img :src="data.Images[0].CardImageUrl" alt="" width="100%" height="100%" v-if="type === 'card'">
+      <img :src="data.Images[0].CouponImageUrl" alt="" width="100%" height="100%" v-if="type === 'coupon'">
     </div>
     <div class="content">
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
@@ -59,6 +59,7 @@ export default {
       video: true,
       button: true,
       show: false,
+      type:'',
       data: {}
     }
   },
@@ -79,10 +80,12 @@ export default {
       })
     }
 
-
     if (this.$route.query.sharetype === 'share') {
       this.button = false
     }
+
+    this.type = this.$route.query.type
+    
     this.getCaseList().then(() => {
       this.init()
     })
@@ -132,7 +135,7 @@ export default {
     },
     sdk (info) {
       let logo, title
-      if ($route.query.type === 'card') {
+      if (this.$route.query.type === 'card') {
         logo = this.data.Images[0].CardImageUrl
         title = this.data.CardName
       } else {

src/pages/user/receiveResults/page.scss

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

src/pages/user/router.js

@@ -139,7 +139,7 @@ const router = new Router({
     component: receiveResults,
     children: []
   }, { // 卡券领取(带参数，分享后的路径)
-    path: '/receiveShared/:id/:salesid/:type/:sharetype',
+    path: '/receiveShared/:id/:salesid/:type/:random/:sharetype',
     name: 'receive',
     component: receive
   }, { // 渠道卡券领取

src/util/ajax.js

@@ -6,7 +6,7 @@ import { Toast } from '../../node_modules/vant';
 
 const token = function (headers) {
   let JWT
-  if (headers){
+  if (headers) {
     localStorage.setItem('JWT', headers.authorization)
     JWT = headers.authorization
   }
@@ -77,12 +77,15 @@ const ajax = (...args) => {
           router.push({ name: 'bindMobile' })
         }
       } else {
-        // console.log(message)
-        Toast.fail({
-          duration: 2000, // 持续展示 toast
-          forbidClick: true, // 禁用背景点击
-          message: message
-        })
+        if (message.indexOf("log-error") != -1) {
+          console.log(message)
+        } else {
+          Toast.fail({
+            duration: 2000, // 持续展示 toast
+            forbidClick: true, // 禁用背景点击
+            message: message
+          })
+        }
         reject(message)
       }
     }).catch(reject)