ytj

src/components/topCaseInfo/index.vue

@@ -13,7 +13,7 @@
 
 export default {
   name: '',
-  props: ['data','userName'],
+  props: ['data', 'userName'],
   data () {
     return {
 
@@ -38,5 +38,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

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

@@ -6,10 +6,9 @@
     <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>
     </nav>
-    <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='data[navActive].list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'>
       <div class="content">
-        <!-- <div>
-          <ul> -->
+        <div>
+          <ul>
             <li :hidden="navActive !== 0 && userInfo.customer.MapUser !== ''" class="placeOrder">
               <div class="topInfo flex-h" v-if="userInfo.customer.MapUser !== ''">
                 <div class="flex-item">
@@ -56,7 +55,7 @@
                   </div>
                   <a @click="toSalesHistory">销售记录</a>
                 </div>
-                <myCard v-for="(item,index) in data[1].list" :key="index" :data='item' @share='share'></myCard>
+                <myCard v-for="(item,index) in data[1].list" :key="index" :data='item' @share='shareCard'></myCard>
               </div>
             </li>
             <li :hidden="navActive !== 2" class="my-card">
@@ -70,7 +69,7 @@
                   </div>
                   <a @click="toSalesHistory">销售记录</a>
                 </div>
-                <myCard v-for="(item,index) in data[2].list" :key="index" :data='item' @share='share'></myCard>
+                <myCard v-for="(item,index) in data[2].list" :key="index" :data='item' @share='shareCoupon'></myCard>
               </div>
             </li>
             <li :hidden="navActive !== 3" class="customer-card">
@@ -91,10 +90,9 @@
                 <customerCard v-for="(item,index) in postCustomerData.isrecommend ? myRecommendUserList : data[3].list" :key="index" :data='item' @record='record'></customerCard>
               </div>
             </li>
-          <!-- </ul>
-        </div> -->
+          </ul>
+        </div>
       </div>
-    </scroll>
     <div class="selectCase" :hidden="!showSelect"></div>
     <van-picker :hidden="!showSelect"
       show-toolbar
@@ -120,7 +118,6 @@
 </template>
 
 <script>
-import scroll from '../../../../components/scroll/scroll'
 import caseTableItem from '../../../../components/caseTableItem/index'
 import topCaseInfo from '../../../../components/topCaseInfo/index'
 import myCard from '../../../../components/myCard/myCard'
@@ -184,7 +181,7 @@ export default {
       topCaseInfoData: {
         CaseName: '',
         CaseId: '',
-        ShowSelect: true,
+        ShowSelect: false,
       },
       caseInfo: {
         value: '',
@@ -258,10 +255,12 @@ export default {
     topCaseInfo,
     caseTableItem,
     myCard,
-    customerCard,
-    scroll
+    customerCard
   },
   created () {
+    if (!this.userInfo.customer.MapUser) {
+      this.topCaseInfoData.ShowSelect = true
+    }
     if (this.userInfo.customer.MapUser !== '') {
       this.getForbidInfo().then((res) => {
         this.forbidList = res || []
@@ -291,6 +290,7 @@ export default {
               totalCount: res.list[n].TotalCount,
               SentCount: res.list[n].SentCount,
               usedCount: res.list[n].UsedCount,
+              CardId: res.list[n].CouponId,
             })
           }
           var count = 0
@@ -314,6 +314,7 @@ export default {
               totalCount: res.list[n].TotalCount,
               SentCount: res.list[n].SentCount,
               usedCount: res.list[n].UsedCount,
+              CardId: res.list[n].CardId,
             })
           }
           var count = 0
@@ -396,8 +397,23 @@ export default {
         }
       }
     },
-    share (item) {
-      // console.log(item)
+    shareCard (item) {
+      let query = {
+        id: item.CardId,
+        type: 'card',
+        sharetype: 'share',
+        salesid: this.userInfo.customer.MapUser
+      }
+      this.$router.push({ name: 'receive', query: query })
+    },
+    shareCoupon (item) {
+      let query = {
+        id: item.CardId,
+        type: 'coupon',
+        sharetype: 'share',
+        salesid: this.userInfo.customer.MapUser
+      }
+      this.$router.push({ name: 'receive', query: query })
     },
     remark (item) {
       // console.log(item)

src/pages/user/mainPage/coffeeIndex/page.scss

@@ -32,23 +32,26 @@
     }
   }
   .content{
-    // &>div{
-    //   width: 100%;
-    //   position: absolute;
-    //   left: 0;
-    //   top: 0;
-    //   bottom: 0;
-    //   overflow: hidden;
-    //   &>ul{
-    //     width: 100%;
-    //     height: 100%;
-    //     position: relative;
-    //     overflow: hidden;
+    width: 100%;
+    height: 100%;
+    position: relative;
+    &>div{
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      overflow: hidden;
+      &>ul{
+        width: 100%;
+        height: 100%;
+        position: relative;
+        overflow: hidden;
         &>li{
           width: 100%;
           height: 100%;
           position: relative;
-          // overflow-y: scroll;
+          overflow-y: scroll;
           -webkit-overflow-scrolling: touch;
           transform: translateZ(0);
           -webkit-transform: translateZ(0);
@@ -179,8 +182,8 @@
             }
           }
         }
-    //   }
-    // }
+      }
+    }
   }
   .selectCase{
     width: 100%;

src/pages/user/mainPage/index.vue

@@ -5,7 +5,7 @@
         <router-view></router-view>
       </div>
     </div>
-    <nav class="flex-h" v-if="!userInfo.CustomerId">
+    <nav class="flex-h" v-if="!userInfo.customer.MapUser">
       <router-link :to="{name:item.pathName,query:{}}" class="flex-item" active-class="active" v-for="(item, index) in tabBar" :key="index">
         <div>
           <img v-if="index==0" class="centerLabel" src="../../../common/icon/tabBar-icon-1.png" alt="">

src/pages/user/placeOrder/index.vue

@@ -336,6 +336,8 @@ export default {
           spec: (val.spec || ''),
           specname: (val.specname || ''),
         })
+      } else {
+        this.selGoods.splice(this.selGoods.findIndex(item => item.id === val.id && item.spec === (val.spec || '')), 1)
       }
     },
     calcTotalNum () { // 计算总数量、价格

src/pages/user/receive/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mainPage">
+  <div class="mainPage" v-if="show">
     <!-- <div class="residue">
       <i class="iconfont icon-gantanhao"></i>
       <span>仅剩{{data.TotalCount - data.UsedCount}}张券可以领取！</span>
@@ -8,10 +8,12 @@
       <img :src="logo" alt="">
     </div> -->
     <div class="banner"  v-if="!video">
-      <img :src="data.CoverUrl" alt="" width="100%" height="100%">
+      <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>
     </div>
     <div class="content">
-      <div class="title">{{data.CardName}}</div>
+      <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
+      <div class="title" v-else>{{data.CouponName}}</div>
       <div class="video" v-if='video'>
         <video :src="data.VideoUrl" width="100%" height="100%"></video>
       </div>
@@ -20,7 +22,8 @@
           <i class="icon-shuoming iconfont"></i>
           <span>卡券使用说明</span>
         </div>
-        <pre>{{data.Share.CardUseInstruction}}</pre>
+        <pre v-if="$route.query.type === 'card'">{{data.Share.CardUseInstruction}}</pre>
+        <pre v-else>{{data.Share.UseInstruction}}</pre>
       </div>
       <div class="text">
         <div>
@@ -55,9 +58,8 @@ export default {
       logo,
       video: true,
       button: true,
-      data: {
-        Share: {}
-      }
+      show: false,
+      data: {}
     }
   },
   computed: {
@@ -70,6 +72,7 @@ export default {
     })
   },
   created () {
+    this.data = {}
     if (this.$route.params) {
       let that = this
       Object.keys(this.$route.params).forEach(function (key) {
@@ -78,7 +81,7 @@ export default {
     }
 
 
-    if (this.$route.query.shareType === 'share') {
+    if (this.$route.query.sharetype === 'share') {
       this.button = false
     }
     this.getCaseList().then(() => {
@@ -96,16 +99,18 @@ export default {
           if (!this.data.VideoUrl) {
             this.video = false
           }
-          this.sdk()
+          this.show = true
+          this.sdk(this.data.Share.CardShareInfo)
         })
       } else {
         this.getCouponShare({ id: this.$route.query.id }).then(() => {
-          this.data = this.cardShare.Card
+          this.data = this.couponShare.coupon
           this.data.address = this.caseList.filter(x => x.CaseId === this.data.CaseId)[0].CaseAddress
           if (!this.data.VideoUrl) {
             this.video = false
           }
-          this.sdk()
+          this.show = true
+          this.sdk(this.data.Share.CouponShareInfo)
         })
       }
     },
@@ -134,11 +139,11 @@ export default {
       let timestamp = new Date().valueOf()
       return `${rnd}${timestamp}`
     },
-    sdk () {
+    sdk (info) {
       let logo = this.logo.substring(2, this.logo.length)
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         title: '领取卡券',
-        desc: this.data.Share.CardShareInfo,
+        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}`
       })

src/pages/user/receiveChannel/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mainPage">
+  <div class="mainPage" v-if="show">
     <div class="residue">
       <i class="iconfont icon-gantanhao"></i>
       <span>仅剩{{data.TotalCount - data.UsedCount}}张券可以领取！</span>
@@ -8,10 +8,12 @@
       <img :src="logo" alt="">
     </div>
     <div class="banner"  v-if="!video">
-      <img :src="data.CoverUrl" alt="" width="100%" height="100%">
+      <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>
     </div>
     <div class="content">
-      <div class="title">{{data.CardName}}</div>
+      <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
+      <div class="title" v-else>{{data.CouponName}}</div>
       <div class="video" v-if='video'>
         <video :src="data.VideoUrl" width="100%" height="100%"></video>
       </div>
@@ -20,7 +22,8 @@
           <i class="icon-shuoming iconfont"></i>
           <span>卡券使用说明</span>
         </div>
-        <pre>{{data.Share.CardUseInstruction}}</pre>
+        <pre v-if="$route.query.type === 'card'">{{data.Share.CardUseInstruction}}</pre>
+        <pre v-else>{{data.Share.UseInstruction}}</pre>
       </div>
       <div class="text">
         <div>
@@ -55,9 +58,8 @@ export default {
       logo,
       video: true,
       button: true,
-      data: {
-        Share: {}
-      }
+      show: false,
+      data: {}
     }
   },
   computed: {
@@ -78,7 +80,7 @@ export default {
     }
 
 
-    if (this.$route.query.shareType === 'share') {
+    if (this.$route.query.sharetype === 'share') {
       this.button = false
     }
     this.getCaseList().then(() => {
@@ -96,16 +98,18 @@ export default {
           if (!this.data.VideoUrl) {
             this.video = false
           }
-          this.sdk()
+          this.show = true
+          this.sdk(this.data.Share.CardShareInfo)
         })
       } else {
         this.getCouponShare({ id: this.$route.query.id }).then(() => {
-          this.data = this.cardShare.Card
+          this.data = this.couponShare.coupon
           this.data.address = this.caseList.filter(x => x.CaseId === this.data.CaseId)[0].CaseAddress
           if (!this.data.VideoUrl) {
             this.video = false
           }
-          this.sdk()
+          this.show = true
+          this.sdk(this.data.Share.CouponShareInfo)
         })
       }
     },
@@ -126,20 +130,12 @@ 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 () {
+    sdk (info) {
       let logo = this.logo.substring(2, this.logo.length)
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         title: '领取卡券',
-        desc: this.data.Share.CardShareInfo,
-        link: `${window.location.origin}${window.location.pathname}#/receiveShared/${this.$route.query.id}/${this.$route.query.salesid}/${this.$route.query.type}/receive`,
+        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}`
       })
     }

src/util/share.js

@@ -11,7 +11,7 @@ function wxsdk (params, config) {
     imgUrl: config.thu_image // 分享图标
   }
   // 初始化
-  return new Promise(function (resolve) {
+  return new Promise(function (resolve, reject) {
     Ajax(api.share.share.url, {
       method: api.share.share.method,
       urlData: {