ytj

src/components/salesRecordItem/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="salesRecordItem">
-    <div class="top flex-h">
+    <div class="top flex-h" @click="toDetail">
       <span>销售名称：</span>
       <span>{{data.name}}</span>
       <div class="flex-item">
@@ -11,19 +11,19 @@
       <div class="flex-item">
         <div>
           <span>已发出<em>{{data.cardAndCoupon.usedNum}}</em>张卡券</span>
-          <div class="progress">
+          <!-- <div class="progress">
             <div :style="{width: (data.cardAndCoupon.usedNum/data.cardAndCoupon.totalNum).toFixed(2) * 100 + '%', background: returnProgressColor((data.cardAndCoupon.usedNum/data.cardAndCoupon.totalNum).toFixed(2) * 100)}"></div>
-          </div>
-          <a :class="{'grey': data.cardAndCoupon.status === 1}" @click="triggerCardAndCoupon(data)">{{data.cardAndCoupon.status === 1 ? '关闭卡券' : '开启卡券'}}</a>
+          </div> -->
+          <a :class="{'grey': !fibdata.coupon }" @click="triggerCardAndCoupon(data)">{{ fibdata.coupon ? '开启卡券' : '关闭卡券' }}</a>
         </div>
       </div>
       <div class="flex-item">
         <div>
-          <span>已送出<em>12</em>杯饮品</span>
-          <div class="progress">
+          <span>已送出<em>{{data.drink.usedNum}}</em>杯饮品</span>
+          <!-- <div class="progress">
             <div :style="{width: (data.drink.usedNum/data.drink.totalNum).toFixed(2) * 100 + '%', background: returnProgressColor((data.drink.usedNum/data.drink.totalNum).toFixed(2) * 100)}"></div>
-          </div>
-          <a :class="{'grey': data.drink.status === 1}" @click="triggerDrink(data)">{{data.drink.status === 1 ? '关闭饮品' : '开启饮品'}}</a>
+          </div> -->
+          <a :class="{'grey': !fibdata.order }" @click="triggerDrink(data)">{{ fibdata.order ? '开启饮品' : '关闭饮品' }}</a>
         </div>
       </div>
     </div>
@@ -34,7 +34,16 @@
 
 export default {
   name: '',
-  props: ['data'],
+  props: {
+    data: {
+      type: Object,
+      default: () => { }
+    },
+    fibdata: {
+      type: Object,
+      default: () => { }
+    }
+  },
   data () {
     return {
 
@@ -47,14 +56,17 @@ export default {
 
   },
   created () {
-
+    console.log(this.fibdata)
   },
   methods: {
     triggerCardAndCoupon (item) { // 切换卡券状态
-      this.$emit('triggerCardAndCoupon', {type: this.data.cardAndCoupon.status === 1 ? 'close' : 'open', data: item})
+      this.$emit('triggerCardAndCoupon', { type: this.fibdata.coupon ? 'open' : 'close', data: item })
     },
     triggerDrink (item) { // 切换饮品状态
-      this.$emit('triggerDrink', {type: this.data.drink.status === 1 ? 'close' : 'open', data: item})
+      this.$emit('triggerDrink', { type: this.fibdata.order ? 'open' : 'close', data: item })
+    },
+    toDetail () {
+      this.$emit('toDetail', this.data)
     },
     returnProgressColor (val) { // 返回进度条颜色
       if (val <= 33) {

src/pages/sales/salesRecord/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" @selectCase="showSelect = true"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <div class="flex-item body">
       <div>
         <ul>
-          <router-link tag="li" v-for="(item,index) in list" :key="index" :to="{name: 'salesGiveOutDetail', query: {}}">
-            <salesRecordItem :data="item" @triggerCardAndCoupon="triggerCardAndCoupon" @triggerDrink="triggerDrink"></salesRecordItem>
-          </router-link>
+          <li v-for="(item,index) in list" :key="index">
+            <salesRecordItem :data="item" :fibdata="fibdata(item)" @triggerCardAndCoupon="triggerCardAndCoupon" @triggerDrink="triggerDrink" @toDetail='toDetail'></salesRecordItem>
+          </li>
         </ul>
       </div>
     </div>
@@ -18,125 +18,123 @@
 <script>
 import topCaseInfo from '../../../components/topCaseInfo/index'
 import salesRecordItem from '../../../components/salesRecordItem/index'
-
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapState: mapForbidState, mapActions: mapForbidActions } = createNamespacedHelpers('forbid')
+const { mapActions: actions } = createNamespacedHelpers('app')
+const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
+const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
 export default {
   name: '',
   data () {
     return {
       topCaseInfoData: {
-        caseName: '',
+        CaseName: '',
         caseId: '',
-        showSelect: false,
-        userName: 'xxx'
+        showSelect: false
       },
-      list: [{
-        name: '柳依依',
-        id: '1',
-        cardAndCoupon: {
-          totalNum: '100',
-          usedNum: '35',
-          status: 1,
-        },
-        drink: {
-          totalNum: '100',
-          usedNum: '68',
-          status: 0,
-        },
-      }, {
-        name: '柳依依',
-        id: '1',
-        cardAndCoupon: {
-          totalNum: '100',
-          usedNum: '10',
-          status: 1,
-        },
-        drink: {
-          totalNum: '100',
-          usedNum: '45',
-          status: 1,
-        },
-      }, {
-        name: '柳依依',
-        id: '1',
-        cardAndCoupon: {
-          totalNum: '100',
-          usedNum: '35',
-          status: 1,
-        },
-        drink: {
-          totalNum: '100',
-          usedNum: '68',
-          status: 1,
-        },
-      }, {
-        name: '柳依依',
-        id: '1',
-        cardAndCoupon: {
-          totalNum: '100',
-          usedNum: '35',
-          status: 1,
-        },
-        drink: {
-          totalNum: '100',
-          usedNum: '68',
-          status: 1,
-        },
-      }, {
-        name: '柳依依',
-        id: '1',
-        cardAndCoupon: {
-          totalNum: '100',
-          usedNum: '35',
-          status: 1,
-        },
-        drink: {
-          totalNum: '100',
-          usedNum: '68',
-          status: 1,
-        },
-      }, {
-        name: '柳依依',
-        id: '1',
-        cardAndCoupon: {
-          totalNum: '100',
-          usedNum: '35',
-          status: 1,
-        },
-        drink: {
-          totalNum: '100',
-          usedNum: '68',
-          status: 1,
-        },
-      }, {
-        name: '柳依依',
-        id: '1',
-        cardAndCoupon: {
-          totalNum: '100',
-          usedNum: '35',
-          status: 1,
-        },
-        drink: {
-          totalNum: '100',
-          usedNum: '68',
-          status: 1,
-        },
-      }],
+      list: []
     }
   },
   components: {
     topCaseInfo,
-    salesRecordItem,
+    salesRecordItem
+  },
+  computed: {
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+      CaseList: x => x.app.CaseList,
+      CaseTableList: x => x.placeOrderForCoffee.CaseTableList,
+    }),
+    ...mapCaseState({
+      caseTotal: x => x.caseTotal,
+    }),
+    ...mapForbidState({
+      salesList: x => x.salesList,
+      forbidList: x => x.forbidList,
+    }),
   },
   created () {
-
+    this.getCaseList().then((res) => {
+      this.topCaseInfoData.CaseName = res.cases[0].CaseName
+      this.topCaseInfoData.CaseId = res.cases[0].CaseId
+    })
+    this.init()
   },
   methods: {
+    ...actions([
+      'getCaseList',
+    ]),
+    ...mapCaseActions([
+      'getCaseTotal',
+    ]),
+    fibdata (item) {
+      const couponfib = this.forbidList.filter(x => x.UserId === item.UserId && x.ForbidType === 'coupon').length > 0 ? true : false
+      const orderfib = this.forbidList.filter(x => x.UserId === item.UserId && x.ForbidType === 'order').length > 0 ? true : false
+      return {
+        'coupon': couponfib,
+        'order': orderfib
+      }
+    },
+    showVanPicker () {
+      this.showSelect = true
+    },
+    selectCase (val) { // 选择案场
+      this.topCaseInfoData.CaseName = val.CaseName
+      this.topCaseInfoData.CaseId = val.CaseId
+      this.getCaseTableList({
+        caseid: this.topCaseInfoData.CaseId
+      })
+      this.showSelect = false
+    },
+    ...mapForbidActions(['getSales', 'getForbidList', 'putForbid', 'putForbidOpen']),
     triggerCardAndCoupon (val) { // 切换卡券状态 type='close'：关闭；type='open'：开启；
       console.log(val)
+      if (val.type === 'open') {
+        this.putForbid({ userid: val.data.UserId, type: 'coupon' })
+      } else {
+        this.putForbidOpen({ userid: val.data.UserId, type: 'coupon' })
+      }
+      this.init()
     },
     triggerDrink (val) { // 切换饮品状态 type='close'：关闭；type='open'：开启；
       console.log(val)
+      if (val.type === 'open') {
+        this.putForbid({ userid: val.data.UserId, type: 'order' })
+      } else {
+        this.putForbidOpen({ userid: val.data.UserId, type: 'order' })
+      }
+      this.init()
     },
+    toDetail (item) {
+      console.log(item)
+      this.$router.push({ name: 'salesGiveOutDetail', query: { id: item.UserId } })
+    },
+    init () {
+      this.getSales({ type: 'sales' }).then(() => {
+        this.getForbidList().then(() => {
+          this.list = []
+          for (let i = 0; i < this.salesList.length; i++) {
+            let CustomerCard = this.salesList[i].CustomerCard || []
+            let CustomerCoupon = this.salesList[i].CustomerCoupon || []
+            let OrdersDetail = this.salesList[i].OrdersDetail || []
+            let item = {
+              name: this.salesList[i].RealName,
+              id: i,
+              cardAndCoupon: {
+                totalNum: '100',
+                usedNum: CustomerCard.length + CustomerCoupon.length
+              },
+              drink: {
+                totalNum: '100',
+                usedNum: OrdersDetail.length
+              },
+              UserId: this.salesList[i].UserId
+            }
+            this.list.push(item)
+          }
+        })
+      })
+    }
   }
 }
 </script>

src/pages/user/card/index.vue

@@ -167,6 +167,8 @@ export default {
               this.data[this.active].hasPic = true
             }
           })
+        } else {
+          this.$refs.scroll.forceUpdate()
         }
       }
     },
@@ -174,7 +176,7 @@ export default {
       this.$router.push({ name: 'cardDetail', query: { CustomerGymId: item.CustomerGymId } })
     },
     toCouponsDetail () {
-      this.$router.push({ name: 'couponsDetail'})
+      this.$router.push({ name: 'couponsDetail' })
     }
   }
 }

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

@@ -8,8 +8,8 @@
     </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">
@@ -90,11 +90,11 @@
                   </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' @share='share'></customerCard>
+                <customerCard v-for="(item,index) in data[3].list" :key="index" :data='item' @remark='remark' @history='history' @record='record'></customerCard>
               </div>
             </li>
-          </ul>
-        </div>
+          <!-- </ul>
+        </div> -->
       </div>
     </scroll>
     <div class="selectCase" :hidden="!showSelect"></div>
@@ -364,7 +364,6 @@ export default {
     },
     cutNav (index) { // 切换nav
       this.navActive = index
-      console.log(this.navActive)
       // this.getList('change')
     },
     getList (param) {
@@ -372,9 +371,9 @@ export default {
         return
       } else {
         if (param === 'change') {
-          this.data[this.active].page = 0
+          this.data[this.navActive].page = 0
         }
-        if (this.data[this.active].hasMore) {
+        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++

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

@@ -32,18 +32,18 @@
     }
   }
   .content{
-    &>div{
-      width: 100%;
-      position: absolute;
-      left: 0;
-      top: 0;
-      bottom: 0;
-      overflow: hidden;
-      &>ul{
-        width: 100%;
-        height: 100%;
-        position: relative;
-        overflow: hidden;
+    // &>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%;
@@ -179,8 +179,8 @@
             }
           }
         }
-      }
-    }
+    //   }
+    // }
   }
   .selectCase{
     width: 100%;

src/pages/user/router.js

@@ -20,6 +20,7 @@ import coupons from './coupons/index' // 优惠券
 import lessonDetail from './lessonDetail/index' // 课程详情
 import cardDetail from './cardDetail/index' // 体验卡详情
 import couponsDetail from './couponsDetail/index' // 体验券详情
+import share from './share/index' // 卡券分享页面
 
 Vue.use(Router)
 
@@ -33,92 +34,97 @@ const router = new Router({
       name: 'indexPage',
       component: indexPage,
       children: []
-    },{ // 城咖啡
+    }, { // 城咖啡
       path: 'coffeeIndex',
       name: 'coffeeIndex',
       component: coffeeIndex,
       children: []
-    },{ // 个人中心
+    }, { // 个人中心
       path: 'userCenter',
       name: 'userCenter',
       component: userCenter,
       children: []
     }]
-  },{ // 城咖啡-点单
+  }, { // 城咖啡-点单
     path: '/placeOrder',
     name: 'placeOrder',
     component: placeOrder,
     children: []
-  },{ // 城咖啡-点单详情
+  }, { // 城咖啡-点单详情
     path: '/placeOrderDetail',
     name: 'placeOrderDetail',
     component: placeOrderDetail,
     children: []
-  },{ // 城咖啡-点单列表
+  }, { // 城咖啡-点单列表
     path: '/orderList',
     name: 'orderList',
     component: orderList,
     children: []
-  },{ // 项目专题
+  }, { // 项目专题
     path: '/majorProjects',
     name: 'majorProjects',
     component: majorProjects,
     children: []
-  },{ // 项目专题详情
+  }, { // 项目专题详情
     path: '/majorProjectsDetail',
     name: 'majorProjectsDetail',
     component: majorProjectsDetail,
     children: []
-  },{ // 购买课程下单
+  }, { // 购买课程下单
     path: '/placeOrderForCourse',
     name: 'placeOrderForCourse',
     component: placeOrderForCourse,
     children: []
-  },{ // 5A
+  }, { // 5A
     path: '/fiveA',
     name: 'fiveA',
     component: fiveA,
     children: []
-  },{ // 绑定手机号
+  }, { // 绑定手机号
     path: '/bindMobile',
     name: 'bindMobile',
     component: bindMobile,
     children: []
-  },{ // 我的订单
+  }, { // 我的订单
     path: '/lessonOrder',
     name: 'lessonOrder',
     component: lessonOrder,
     children: []
-  },{ // vip卡说明
+  }, { // vip卡说明
     path: '/vip',
     name: 'vip',
     component: vip,
     children: []
-  },{ // 卡
+  }, { // 卡
     path: '/card',
     name: 'card',
     component: card,
     children: []
-  },{ // 优惠券
+  }, { // 优惠券
     path: '/coupons',
     name: 'coupons',
     component: coupons,
     children: []
-  },{ // 课程详情
+  }, { // 课程详情
     path: '/lessonDetail',
     name: 'lessonDetail',
     component: lessonDetail,
     children: []
-  },{ // 体验卡详情
+  }, { // 体验卡详情
     path: '/cardDetail',
     name: 'cardDetail',
     component: cardDetail,
     children: []
-  },{ // 体验券详情
+  }, { // 体验券详情
     path: '/couponsDetail',
     name: 'couponsDetail',
     component: couponsDetail,
     children: []
+  }, { // 卡券分享
+    path: '/share',
+    name: 'share',
+    component: share,
+    children: []
   }],
   linkActiveClass: 'active',
 })
@@ -126,7 +132,7 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   // console.log(to)
   // if(){
-    
+
   // }
   next()
 })

src/pages/user/share/index.vue

@@ -0,0 +1,39 @@
+<template>
+  <div class="mainPage">
+    <div class="banner">
+      <img src="" alt="" width="100%" height="100%">
+    </div>
+    <div class="content">
+      <div class="title">彻天彻地童玩探险乐园家庭套餐</div>
+      <div class="text">
+        <div>
+          <i class="icon-shuoming iconfont"></i>
+          <span>卡券使用说明</span>
+        </div>
+        <pre>工作工作工作工作工作工作工作工作工作给</pre>
+      </div>
+      <div class="text">
+        <div>
+          <i class="icon-shuoming iconfont"></i>
+          <span>卡券使用说明</span>
+        </div>
+        <pre>工作工作工作工作工作工作工作工作工作给</pre>
+      </div>
+      <div class="submit">确认领取</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import 'page.scss';
+</style>

src/pages/user/share/page.scss

@@ -0,0 +1,37 @@
+.mainPage{
+  .banner{
+    width: 100%;
+    height: 1.8rem;
+  }
+  .content{
+    padding: .2rem;
+    box-sizing: border-box;
+    .title{
+      font-size: .18rem;
+      padding-bottom: .2rem;
+    }
+    .text{
+      padding-bottom: .2rem;
+      >div:nth-of-type(1){
+        display: flex;
+        align-items: center;
+        padding-bottom: .1rem;
+        i,span{
+          color: rgba(168,182,200,1);
+        }
+      }
+      pre{
+        color: #323232;
+      }
+    }
+    .submit{
+      height: .46rem;
+      background: rgba(252,98,67,1);
+      border-radius: .25rem;
+      text-align: center;
+      line-height: .46rem;
+      font-size: .16rem;
+      color: #fff;
+    }
+  }
+}

src/store/forbid/index.js

@@ -0,0 +1,95 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    salesList: [],
+    forbidList: [],
+    salesCardList: []
+  },
+  mutations: {
+    setSalesList (state, data) {
+      state.salesList = data || []
+    },
+    setForbidList (state, data) {
+      state.forbidList = data || []
+    },
+    setSalesCardList (state, data) {
+      state.salesCardList = data || []
+    }
+  },
+  actions: {
+    getSales (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.director.getSales.url, {
+          method: api.director.getSales.method,
+          urlData: {
+            type: data.type
+          }
+        }).then(res => {
+          context.commit('setSalesList', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    getForbidList (context) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.director.getForbidList.url, {
+          method: api.director.getForbidList.method
+        }).then(res => {
+          context.commit('setForbidList', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    putForbid (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.director.putForbid.url, {
+          method: api.director.putForbid.method,
+          urlData: {
+            ...data
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    putForbidOpen (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.director.putForbidOpen.url, {
+          method: api.director.putForbidOpen.method,
+          urlData: {
+            ...data
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    getSalesCardList (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.director.getSalesCardList.url, {
+          method: api.director.getSalesCardList.method,
+          urlData: {
+            ...data
+          }
+        }).then(res => {
+          context.commit('setForbidList', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/store/index.js

@@ -21,7 +21,8 @@ export const modules = {
   login: () => require('./login/login').default,
   myCustomer: () => require('./myCustomer/index').default,
   myCard: () => require('./myCard/index').default,
-  card: () => require('./card/index').default
+  card: () => require('./card/index').default,
+  forbid: () => require('./forbid/index').default
 }
 
 Object.keys(modules).forEach((modKey) => {

src/util/ajax.js

@@ -3,7 +3,7 @@ import qs from 'qs'
 import toolClass from './util'
 import router from '../pages/user/router'
 import { Toast } from '../../node_modules/vant';
-
+var JWT = localStorage.getItem('JWT')
 const Axios = axios.create({
   timeout: 60000,
   responseType: 'json',
@@ -11,7 +11,8 @@ const Axios = axios.create({
   queryData: {},
   urlData: {},
   headers: {
-    'Content-Type': 'multipart/form-data'
+    'Content-Type': 'multipart/form-data',
+    'authorization': JWT
   }
 })
 
@@ -48,8 +49,11 @@ Axios.interceptors.request.use((config) => {
 
 const ajax = (...args) => {
   return new Promise((resolve, reject) => {
-    Axios(...args).then(({ data }) => {
-      // console.log(111)
+    Axios(...args).then(({ data, headers }) => {
+      if (headers.authorization) {
+        localStorage.setItem('JWT', headers.authorization)
+        JWT = headers.authorization
+      }
       const { code, message, result } = data
       if (code === 200) {
         resolve(result)

src/util/api.js

@@ -63,8 +63,8 @@ const $api = {
       url: `${baseUrl}${wechat}/order/course`
     },
   },
-  card:{
-    myCustomer:{ // 我的客户
+  card: {
+    myCustomer: { // 我的客户
       method: 'get',
       url: `${baseUrl}${wechat}/customer/user`
     }
@@ -111,6 +111,28 @@ const $api = {
       url: `${baseUrl}${wechat}/gymcard/:customerGymId`
     },
   },
+  director: {
+    getSales: { // 获取销售列表
+      method: 'get',
+      url: `${baseUrl}${wechat}/user/:type`
+    },
+    getForbidList: { // 获取禁用列表
+      method: 'get',
+      url: `${baseUrl}${wechat}/user/forbid`
+    },
+    putForbidOpen: { // 打开禁用状态
+      method: 'post',
+      url: `${baseUrl}${wechat}/user/forbid/:userid/:type`
+    },
+    putForbid:{ // 关闭禁用状态
+      method: 'put',
+      url: `${baseUrl}${wechat}/user/forbid/:userid/:type`
+    },
+    getSalesCardList: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/user/detail/:id`
+    }
+  },
   login: { // 主管、销售端登陆
     login: {
       method: 'post',