xcx

package-lock.json

@@ -13386,6 +13386,12 @@
       "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
       "dev": true
     },
+    "weixin-js-sdk": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.3.3.tgz",
+      "integrity": "sha512-1ofMi7Q1ioXV8/V8tGv3DrU7pugmyvhN86Pxbj1WaGeIEs/+yz0Jdv/5L+ocuDh/JAbKmtvMvBXh0OyuP6kQ8A==",
+      "dev": true
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "http://registry.npm.taobao.org/which/download/which-1.3.1.tgz",

src/components/customerCard/customerCard.vue

@@ -2,21 +2,16 @@
   <div class="card-content">
     <div class="card-top flex-h">
       <div class="flex-h">
-        <img :src="inv" alt="">
+        <img :src="data.Headimgurl" alt="">
         <div>
-          <span>姓名：王丽丽</span>
-          <span>手机号:17372957078</span>
+          <span>姓名：{{data.Name}}</span>
+          <span>手机号:{{data.Phone}}</span>
         </div>
       </div>
       <div>
         <div @click="record">领取记录</div>
-        <div @click="history">历史备注</div>
       </div>
     </div>
-    <div class="card-bottom">
-      <span>备注：老客户，人非常好。</span>
-      <span @click="remark">+ 添加备注</span>
-    </div>
   </div>
 </template>
 
@@ -36,15 +31,9 @@ export default {
     }
   },
   methods: {
-    remark () {
-      this.$emit('remark', this.data)
-    },
     record () {
       this.$emit('record', this.data)
     },
-    history () {
-      this.$emit('history', this.data)
-    }
   }
 }
 </script>

src/pages/sales/customerSearch/index.vue

@@ -1,11 +1,14 @@
 <template>
   <div class="mainPage flex-v">
+    <div class="top">
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''"></topCaseInfo>
+    </div>
     <div class="content flex-item">
       <div>
         <ul>
           <li class="customer-card">
             <div class="list-box">
-              <customerCard v-for="(item,index) in cardList" :key="index" :data='item' @remark='remark' @record='record' @history='history'></customerCard>
+              <customerCard v-for="(item,index) in cardList" :key="index" :data='item' @record='record'></customerCard>
             </div>
           </li>
         </ul>
@@ -19,18 +22,6 @@
       </div>
       <div class="mask-bottom"></div>
     </div>
-    <van-dialog
-      v-model="showDialog"
-      show-cancel-button
-      title='添加备注'
-      :before-close="beforeClose">
-      <van-field
-        v-model="message"
-        type="textarea"
-        placeholder="请输入备注"
-        rows="3"
-        autosize/>
-    </van-dialog>
   </div>
 </template>
 
@@ -38,34 +29,29 @@
 import customerCard from '../../../components/customerCard/customerCard'
 import active from '../../../common/icon/check-box-checked.png'
 import normal from '../../../common/icon/check-box-empty.png'
+import topCaseInfo from '../../../components/topCaseInfo/index'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
+const { mapActions: mapUserCenterActions } = createNamespacedHelpers('userCenter')
 
 export default {
   name: '',
   data () {
     return {
+      topCaseInfoData: {
+        CaseName: '',
+        CaseId: '',
+        ShowSelect: false,
+      },
       icon: {
         active: active,
         normal: normal
       },
-      showDialog: false,
       mask: true,
       checked: true,
-      cardList: [
-        {
-          invalid: true
-        },
-        {
-          invalid: false
-        },
-        {
-          invalid: false
-        }
-      ],
-      message: ''
+      cardList: [],
     }
   },
   computed: {
@@ -79,10 +65,19 @@ export default {
     })
   },
   components: {
-    customerCard
+    customerCard,
+    topCaseInfo,
+  },
+  created () {
+    this.getCaseList().then((res) => {
+      this.topCaseInfoData.CaseName = res.cases[0].CaseName
+      this.topCaseInfoData.CaseId = res.cases[0].CaseId
+    })
   },
-  created () { },
   methods: {
+    ...mapUserCenterActions([
+      'getCustomerList',
+    ]),
     ...actions([
       'getCaseList',
     ]),
@@ -92,28 +87,23 @@ export default {
     ...mapCaseActions([
       'getCaseTotal',
     ]),
-    remark (item) {
-      console.log(item)
-      this.showDialog = true
-    },
-    history (item) {
-      console.log(item)
-      this.$router.push({ name: 'history' })
-    },
     record (item) {
-      console.log(item)
+      // console.log(item)
       this.$router.push({ name: 'getRecord' })
     },
     searchMask () {
-      this.mask = false
+      this.getCustomerList({
+        page: 1,
+        pagesize: 10000,
+        isrecommend: false
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        for (var n = 0; n < res.length; n++) {
+          this.cardList.push({...res[n], invalid: false})
+        }
+        this.mask = false
+      })
     },
-    beforeClose (action, done) {
-      if (action === 'confirm') {
-        setTimeout(done, 1000)
-      } else {
-        done()
-      }
-    }
   }
 }
 </script>

src/pages/user/App.vue

@@ -12,7 +12,7 @@ export default {
   name: 'app',
   data () {
     return {
-      showPage: true
+      showPage: false
     }
   },
   components: {},
@@ -23,7 +23,7 @@ export default {
     })
   },
   created () {
-    console.log('creatde')
+    // console.log('creatde')
     if (location.search && this.toolClass.UrlSearch(location.search).code) {
       this.code = this.toolClass.UrlSearch(location.search).code
     } else {

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

@@ -65,8 +65,7 @@
                   <div class="flex-item">
                     <div>
                       <span>卡券货值总额：</span>
-                      <span>￥1000</span>
-                      <span>万</span>
+                      <span>￥{{couponTotalCount}}</span>
                     </div>
                   </div>
                   <a @click="toSalesHistory">销售记录</a>
@@ -77,19 +76,19 @@
             <li :hidden="navActive !== 3" class="customer-card">
               <div class="list-box">
                 <div class="search-bar flex-h">
-                  <span>共15位客户</span>
-                  <van-checkbox v-model="checked">
-                    我推荐的客户(8人)
+                  <span>共{{this.data[3].list.length}}位客户</span>
+                  <van-checkbox v-model="postCustomerData.isrecommend">
+                    我推荐的客户({{myRecommendUserList.length}}人)
                     <img
                       slot="icon"
                       slot-scope="props"
-                      :src="props.checked ? icon.active : icon.normal"
+                      :src="postCustomerData.isrecommend ? icon.active : icon.normal"
                       style="width:.2rem;height:.2rem;bottom: .02rem;position: relative;"
                     >
                   </van-checkbox>
                   <i class="iconfont icon-sousuo search-icon" @click="searchMask"></i>
                 </div>
-                <customerCard v-for="(item,index) in data[3].list" :key="index" :data='item' @remark='remark' @history='history' @record='record'></customerCard>
+                <customerCard v-for="(item,index) in postCustomerData.isrecommend ? myRecommendUserList : data[3].list" :key="index" :data='item' @record='record'></customerCard>
               </div>
             </li>
           <!-- </ul>
@@ -132,7 +131,6 @@ import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
-const { mapState: mapCustomerState, mapActions: mapCustomerActions } = createNamespacedHelpers('myCustomer')
 const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('myCard')
 const { mapActions: mapUserCenterActions } = createNamespacedHelpers('userCenter')
 
@@ -140,14 +138,22 @@ export default {
   name: '',
   data () {
     return {
+      myRecommendUserList: [],
+      forbidList: [],
+      postCustomerData: {
+        page: 1,
+        pagesize: 10000,
+        isrecommend: false,
+      },
+      couponTotalCount: 0,
       cardTotalCount: 0,
       postCouponData: {
         page: 1,
-        pageSize: 10
+        pageSize: 10000
       },
       postCardData: {
         page: 1,
-        pageSize: 10
+        pageSize: 10000
       },
       pullUpLoad: true,
       pullUpLoadThreshold: 40,
@@ -160,7 +166,6 @@ export default {
       active,
       normal,
       navActive: 0,
-      checked: true,
       showDialog: false,
       message: '',
       cutNavList: [{
@@ -245,9 +250,6 @@ export default {
     ...mapCaseState({
       caseTotal: x => x.caseTotal,
     }),
-    ...mapCustomerState({
-      customerList: x => x.customerList
-    }),
     ...mapCardState({
       cardList: x => x.cardList
     })
@@ -262,36 +264,64 @@ export default {
   created () {
     if (this.userInfo.customer.MapUser !== '') {
       this.getForbidInfo().then((res) => {
-        console.log(JSON.stringify(res))
-      })
-      this.getMyCouponList({
-        ...this.postCouponData
-      }).then((res) => {
-        console.log(JSON.stringify(res))
-      })
-      this.getMyCardList({
-        ...this.postCardData
-      }).then((res) => {
-        console.log(JSON.stringify(res))
-        res.list = res.list || []
-        for (var n = 0; n < res.list.length; n++) {
-          this.data[1].list.push({
-            invalid: this.returnInvalid(res.list[n]),
-            price: res.list[n].Price,
-            title: res.list[n].CardName,
-            desc: res.list[n].Share.CardUseRule,
-            startDate: this.toolClass.dateFormat(res.list[n].StartDate),
-            endDate: this.toolClass.dateFormat(res.list[n].EndDate),
-            totalCount: res.list[n].TotalCount,
-            SentCount: res.list[n].SentCount,
-            usedCount: res.list[n].UsedCount,
-          })
-        }
-        var count = 0
-        for (var n = 0; n < this.data[1].list.length; n++) {
-          count += this.data[1].list[n].price * this.data[1].list[n].totalCount - 0
-        }
-        this.cardTotalCount = count.toFixed(2)
+        this.forbidList = res || []
+        this.getCustomerList({
+          ...this.postCustomerData
+        }).then((res) => {
+          // console.log(JSON.stringify(res))
+          for (var n = 0; n < res.length; n++) {
+            if (res[n].RecommendId === this.userInfo.customer.MapUser) {
+              this.myRecommendUserList.push(res[n])
+            }
+            this.data[3].list.push(res[n])
+          }
+        })
+        this.getMyCouponList({
+          ...this.postCouponData
+        }).then((res) => {
+          res.list = res.list || []
+          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,
+              title: res.list[n].CouponName,
+              desc: res.list[n].Share.UseRule,
+              startDate: this.toolClass.dateFormat(res.list[n].StartDate),
+              endDate: this.toolClass.dateFormat(res.list[n].EndDate),
+              totalCount: res.list[n].TotalCount,
+              SentCount: res.list[n].SentCount,
+              usedCount: res.list[n].UsedCount,
+            })
+          }
+          var count = 0
+          for (var n = 0; n < this.data[2].list.length; n++) {
+            count += this.data[2].list[n].price * this.data[2].list[n].totalCount - 0
+          }
+          this.couponTotalCount = count.toFixed(2)
+        })
+        this.getMyCardList({
+          ...this.postCardData
+        }).then((res) => {
+          res.list = res.list || []
+          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,
+              title: res.list[n].CardName,
+              desc: res.list[n].Share.CardUseRule,
+              startDate: this.toolClass.dateFormat(res.list[n].StartDate),
+              endDate: this.toolClass.dateFormat(res.list[n].EndDate),
+              totalCount: res.list[n].TotalCount,
+              SentCount: res.list[n].SentCount,
+              usedCount: res.list[n].UsedCount,
+            })
+          }
+          var count = 0
+          for (var n = 0; n < this.data[1].list.length; n++) {
+            count += this.data[1].list[n].price * this.data[1].list[n].totalCount - 0
+          }
+          this.cardTotalCount = count.toFixed(2)
+        })
       })
     }
     this.getCaseList().then((res) => {
@@ -303,9 +333,6 @@ export default {
       this.getCaseTotal({
         caseid: this.topCaseInfoData.CaseId
       })
-      this.getCustomerList().then(() => {
-
-      })
     })
   },
   methods: {
@@ -313,6 +340,7 @@ export default {
       'getMyCardList',
       'getMyCouponList',
       'getForbidInfo',
+      'getCustomerList',
     ]),
     ...actions([
       'getCaseList',
@@ -323,13 +351,19 @@ export default {
     ...mapCaseActions([
       'getCaseTotal',
     ]),
-    ...mapCustomerActions(['getCustomerList']),
     ...mapCardActions(['getCardList']),
-    returnInvalid (item) {
+    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) {
+          return true
+        }
+      }
+      if (item.TotalCount - 0 === item.SentCount - 0 + item.UsedCount - 0 || new Date(item.EndDate).getTime() < Date.now()) {
+        return true
+      }
       return false
     },
     toSalesHistory () {
-      //console.log(this.getUrl('salesRecord'))
       window.location.href = this.getUrl('salesRecord')
     },
     getUrl (val) {
@@ -359,33 +393,23 @@ export default {
           this.data[this.navActive].page = 0
         }
         if (this.data[this.navActive].hasMore) {
-          // this.getgymCardList({ page: this.data[this.active].page, pageSize: this.data[this.active].pageSize }).then((res) => {
-          //   this.data[this.active].list = this.data[this.active].list.concat(this.gymCardList)
-          //   this.data[this.active].page++
-          //   if (this.gymCardList.length < this.data[this.active].pageSize) {
-          //     this.data[this.active].hasMore = false
-          //   }
-          //   if (this.data[this.active].list.length <= 0) {
-          //     this.data[this.active].hasPic = true
-          //   }
-          // })
         }
       }
     },
     share (item) {
-      console.log(item)
+      // console.log(item)
     },
     remark (item) {
-      console.log(item)
+      // console.log(item)
       this.showDialog = true
     },
     history (item) {
-      console.log(item)
+      // console.log(item)
       window.location.href = this.getUrl('history')
     },
     record (item) {
-      console.log(item)
-      window.location.href = this.getUrl('getRecord')
+      // console.log(item)
+      window.location.href = this.getUrl('getRecord') + '?' + item
     },
     searchMask () {
       window.location.href = this.getUrl('customerSearch')

src/store/userCenter/userCenter.js

@@ -17,7 +17,7 @@ http.getUserInfo = (data) => { // 获取用户信息
       method: api.user.info.method,
       queryData: queryData
     }).then(res => {
-      console.log(res)
+      // console.log(res)
       resolve(res)
     }).catch((err) => {
       reject(err)
@@ -41,7 +41,7 @@ http.getCaseInfo = (data) => { // 获取案场列表
 }
 
 http.getCaptcha = (data) => { // 获取验证码
-  console.log(data)
+  // console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.user.captcha.url, {
       method: api.user.captcha.method,
@@ -57,7 +57,7 @@ http.getCaptcha = (data) => { // 获取验证码
 }
 
 http.submitData = (data) => { // 绑定手机号
-  console.log(data)
+  // console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.user.wxsignup.url, {
       method: api.user.wxsignup.method,
@@ -101,6 +101,16 @@ export default {
     }
   },
   actions: {
+    getCustomerList (context, payload) { // 获取我的客户列表
+      return new Promise((resolve) => {
+        Ajax(api.sales.getCustomerList.url, {
+          method: api.sales.getCustomerList.method,
+          queryData: { ...payload }
+        }).then(res => {
+          resolve(res)
+        })
+      })
+    },
     getForbidInfo (context) { // 获取用户禁用信息
       return new Promise((resolve) => {
         Ajax(api.sales.getForbidInfo.url, {

src/util/ajax.js

@@ -10,10 +10,6 @@ const token = function (headers) {
     localStorage.setItem('JWT', headers.authorization)
     JWT = headers.authorization
   }
-<<<<<<< HEAD
-  // console.log(JWT)
-=======
->>>>>>> b68369c08a5ea2596032788891e94d4f27c159f1
   return JWT ? JWT : localStorage.getItem('JWT')
 }
 

src/util/api.js

@@ -148,17 +148,6 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${wechat}/user/detail/:id`
     },
-<<<<<<< HEAD
-=======
-    getCardNum: { // 获取卡数量
-      method: 'get',
-      url: `${baseUrl}${wechat}/card/detail/:id`
-    },
-    getCouponNum: { // 获取券数量
-      method: 'get',
-      url: `${baseUrl}${wechat}/coupon/detail/:id`
-    }
->>>>>>> b68369c08a5ea2596032788891e94d4f27c159f1
   },
   sales: {
     getCardList: { // 获取我的卡列表
@@ -173,6 +162,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${wechat}/user/forbid`
     },
+    getCustomerList: { // 获取客户列表
+      method: 'get',
+      url: `${baseUrl}${wechat}/customer/user`
+    },
   },
   login: { // 主管、销售端登陆
     login: {