ytj

src/components/customerCard/customerCard.vue

@@ -17,7 +17,7 @@
       </div>
     </div>
     <div class="card-bottom">
-      <span>备注：{{data.remark}}</span>
+      <span>备注：{{data.Remark}}</span>
       <span @click="remark">+ 添加备注</span>
     </div>
   </div>

src/components/myCard/myCard.vue

@@ -9,7 +9,8 @@
       <div>
         <h2>{{data.title}}</h2>
         <span class="descs">{{data.desc}}</span>
-        <span>{{data.startDate}}-{{data.endDate}}</span>
+        <span v-if="data.ValidDays">领取后{{data.ValidDays}}天内有效</span>
+        <span v-else>{{data.startDate}}-{{data.endDate}}</span>
       </div>
     </div>
     <div class="card-main flex-h" @click="detail">

src/pages/sales/customerSearch/index.vue

@@ -50,6 +50,7 @@ const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
 const { mapActions: mapUserCenterActions } = createNamespacedHelpers('userCenter')
+const { mapState: mpRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
 
 export default {
   name: '',
@@ -70,7 +71,8 @@ export default {
       mask: true,
       checked: true,
       cardList: [],
-      showDialog: false
+      showDialog: false,
+      remarkCustomerId: ''
     }
   },
   computed: {
@@ -111,6 +113,7 @@ export default {
     ...mapCaseActions([
       'getCaseTotal',
     ]),
+    ...mapRemarkActions(['setRemark']),
     record (item) {
       // console.log(item)
       this.$router.push({ name: 'getRecord', query: { name: item.Name, phone: item.Phone, id: item.CustomerId } })
@@ -118,10 +121,11 @@ export default {
     remark (item) {
       // console.log(item)
       this.showDialog = true
+      this.remarkCustomerId = item.CustomerId
     },
     history (item) {
       // console.log(item)
-      window.location.href = this.getUrl('history')
+      this.$router.push({ name: 'history', query: { customerId: item.CustomerId } })
     },
     searchMask () {
       this.getCustomerList({
@@ -160,7 +164,16 @@ export default {
         caseid: this.topCaseInfoData.caseId
       })
       this.showSelect = false
-    }
+    },
+    beforeClose (action, done) {
+      if (action === 'confirm') {
+        this.setRemark({ salesId: this.userInfo.customer.MapUser, customerId: this.remarkCustomerId, remark: this.message }).then(() => {
+          done()
+        })
+      } else {
+        done()
+      }
+    },
   }
 }
 </script>

src/pages/sales/history/index.vue

@@ -23,11 +23,12 @@
 import topCaseInfo from '../../../components/topCaseInfo/index'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
+const { mapState: mpRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
 export default {
   name: '',
   data () {
     return {
-      list: [1,1,1,1,1],
+      // list: [1,1,1,1,1],
       topCaseInfoData: {
         caseName: '',
         caseId: '',
@@ -43,6 +44,9 @@ export default {
       userInfo: x => x.userCenter.userInfo,
       CaseList: x => x.app.CaseList,
     }),
+    ...mapRemarkActions({
+      list: x => x.remarkList
+    }),
   },
   created () {
     this.getCaseList().then((res) => {
@@ -52,11 +56,16 @@ export default {
           this.topCaseInfoData.caseName = this.CaseList[i].CaseName
         }
       }
+      console.log(this.userInfo)
+      this.getRemark({ salesId: this.userInfo.MappingId, customerId: this.$route.query.customerId })
     })
   },
   methods: {
     ...actions([
       'getCaseList',
+    ]),
+    ...mapRemarkActions([
+      'getRemark',
     ])
   }
 }

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

@@ -138,6 +138,7 @@ import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
+const { mapState: mpRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
 const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('myCard')
 const { mapActions: mapUserCenterActions } = createNamespacedHelpers('userCenter')
 const wx = require('weixin-js-sdk')
@@ -238,7 +239,8 @@ export default {
           pagesize: 1,
           list: []
         }
-      ]
+      ],
+      remarkCustomerId: ''
     }
   },
   computed: {
@@ -372,6 +374,7 @@ export default {
       'changeChoosedCase'
     ]),
     ...mapCardActions(['getCardList']),
+    ...mapRemarkActions(['setRemark']),
     checkCanDo () {
       const _that = this
       return this.forbidList.filter(x => x.UserId === _that.userInfo.customer.MapUser && x.ForbidType === 'coupon').length > 0
@@ -466,10 +469,11 @@ export default {
     remark (item) {
       // console.log(item)
       this.showDialog = true
+      this.remarkCustomerId = item.CustomerId
     },
     history (item) {
       // console.log(item)
-      window.location.href = this.getUrl('history')
+      window.location.href = this.getUrl(`history?customerId=${item.CustomerId}`)
     },
     record (item) {
       // console.log(item)
@@ -557,7 +561,9 @@ export default {
     },
     beforeClose (action, done) {
       if (action === 'confirm') {
-        setTimeout(done, 1000)
+        this.setRemark({ salesId: this.userInfo.customer.MapUser, customerId: this.remarkCustomerId, remark: this.message }).then(() => {
+          done()
+        })
       } else {
         done()
       }

src/pages/user/rush/index.vue

@@ -31,12 +31,15 @@
       </div>
     </div>
     <div class="submit">
-      <div :class="{light:timeStatus === 1}">{{btnText[timeStatus]}}</div>
+      <div :class="{light:timeStatus === 1}" @click="submit()">{{btnText[timeStatus]}}</div>
     </div>
   </div>
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: actions } = createNamespacedHelpers('app')
+const { mapState: mapRushState, mapActions: mapRushActions } = createNamespacedHelpers('rush')
 export default {
   data () {
     return {
@@ -57,9 +60,12 @@ export default {
     this.timing(start, end)
   },
   computed: {
-
+    ...mapRushState({
+      detail: item => item.rushDetail
+    })
   },
   methods: {
+    ...mapRushActions(['setRush']),
     timing (startTime, endTime) {
       this.Interval = setInterval(() => {
         let nowTime = new Date().getTime()
@@ -87,6 +93,12 @@ export default {
       this.minute = minute < 10 ? '0' + minute : minute
       this.hour = hour < 10 ? '0' + hour : hour
       this.day = day < 10 ? '0' + day : day
+    },
+    submit () {
+      if (this.timeStatus !== 1) {
+        return
+      }
+      this.setRush()
     }
   }
 }

src/pages/user/vipDetail/index.vue

@@ -14,7 +14,7 @@
             <div class="title">账单明细</div>
             <div class="list-box">
               <div class="list" v-for="(items,indexs) in item.Changes" :key="indexs">
-                <span>{{items.ChangeSource === 'recharge' ? '充值' : items.SourceName}}</span>
+                <span>{{items.SourceName}}</span>
                 <span>{{items.FloatType}}{{items.Amount}}</span>
                 <span class="date">{{toolClass.dateFormat(items.CreateDate)}}</span>
               </div>

src/store/index.js

@@ -26,6 +26,8 @@ export const modules = {
   share: () => require('./share/index').default,
   bodyCheck: () => require('./bodyCheck/index').default,
   vip: () => require('./vip/index').default,
+  remark: () => require('./remark/index').default,
+  rush: () => require('./rush/index').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/store/remark/index.js

@@ -0,0 +1,46 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    remakrList: []
+  },
+  mutations: {
+    setRemark (state, data) {
+      state.remakrList = data || []
+    }
+  },
+  actions: {
+    getRemark (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.remark.getRemark,
+          urlData: { ...data }
+        }).then(res => {
+          context.commit('setRemark', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    setRemark (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.remark.setRemark,
+          data: {
+            SalesId: data.salesId,
+            CustomerId: data.customerId,
+            Remark: data.remark
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/store/rush/index.js

@@ -0,0 +1,40 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    rushDetail: {}
+  },
+  mutations: {
+    setDetail (state, data) {
+      state.rushDetail = data || []
+    }
+  },
+  actions: {
+    getRush (context) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.user.getRush
+        }).then(res => {
+          context.commit('setDetail', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    setRush (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.user.setRush
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/util/api.js

@@ -256,5 +256,25 @@ const $api = {
       url: `${baseUrl}${wechat}/GetCheckByUser`
     }
   },
+  remark:{
+    setRemark: {
+      method: 'post',
+      url: `${baseUrl}${wechat}/customerremark`
+    },
+    getRemark: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/customerremark/:salesId/:customerId`
+    }
+  },
+  rush:{
+    setRush: {
+      method: 'post',
+      url: `${baseUrl}${wechat}/customerremark`
+    },
+    getRush: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/customerremark`
+    }
+  }
 }
 export default $api