ytj

src/pages/sales/customerSearch/index.vue

@@ -116,7 +116,30 @@ export default {
     ...mapRemarkActions(['setRemark']),
     record (item) {
       // console.log(item)
-      this.$router.push({ name: 'getRecord', query: { name: item.Name, phone: item.Phone, id: item.CustomerId } })
+      this.$router.push({ name: 'getRecord', query: { name: item.Name, phone: item.Phone, id: item.CustomerId } }).then(() => {
+        this.getCustomerList({
+          page: 1,
+          pagesize: 10000,
+          isrecommend: false,
+          key: this.key,
+        }).then((res) => {
+          this.cardList = []
+          if (res) {
+            for (var n = 0; n < res.length; n++) {
+              if (res[n].RecommendId === this.userInfo.customer.MapUser) {
+                res[n].showTag = true
+              } else {
+                res[n].showTag = false
+              }
+              this.cardList.push(res[n])
+            }
+          } else {
+            this.hasPic = true
+          }
+          this.mask = false
+          this.ajaxOff = true
+        })
+      })
     },
     remark (item) {
       // console.log(item)

src/pages/sales/history/index.vue

@@ -4,16 +4,16 @@
       <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.CustomerName"></topCaseInfo>
     </div>
     <div class="info">
-      <span><em>姓名</em>：顶顶顶</span>
-      <span><em>手机号</em>：13888888888</span>
+      <span><em>姓名</em>：{{list[0].CustomerName}}</span>
+      <span><em>手机号</em>：{{list[0].Phone}}</span>
     </div>
     <div class="list-content">
-      <div class="list-year">2018年备注记录</div>
+      <div class="list-year">备注记录</div>
       <div class="list-card" v-for="(item,index) in list" :key="index">
         <div class="point-top"></div>
         <div class="point-bottom"></div>
-        <div class="card-time">7.29</div>
-        <div class="card-content">更多备注信息更多备注信息，更多备注信息更多备注信息更多备注信息更多备注信息。更多备注信息更多备注信息。</div>
+        <div class="card-time">{{toolClass.dateFormat(item.CreateDate,'MM-dd')}}</div>
+        <div class="card-content">{{item.Remark}}</div>
       </div>
     </div>
   </div>
@@ -23,12 +23,11 @@
 import topCaseInfo from '../../../components/topCaseInfo/index'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
-const { mapState: mpRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
+const { mapState: mapRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
 export default {
   name: '',
   data () {
     return {
-      // list: [1,1,1,1,1],
       topCaseInfoData: {
         caseName: '',
         caseId: '',
@@ -44,7 +43,7 @@ export default {
       userInfo: x => x.userCenter.userInfo,
       CaseList: x => x.app.CaseList,
     }),
-    ...mapRemarkActions({
+    ...mapRemarkState({
       list: x => x.remarkList
     }),
   },
@@ -56,8 +55,9 @@ export default {
           this.topCaseInfoData.caseName = this.CaseList[i].CaseName
         }
       }
-      console.log(this.userInfo)
-      this.getRemark({ salesId: this.userInfo.MappingId, customerId: this.$route.query.customerId })
+      this.getRemark({ salesId: this.userInfo.customer.MapUser, customerId: this.$route.query.customerId }).then(() => {
+        console.log(this.list)
+      })
     })
   },
   methods: {

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

@@ -562,6 +562,24 @@ export default {
     beforeClose (action, done) {
       if (action === 'confirm') {
         this.setRemark({ salesId: this.userInfo.customer.MapUser, customerId: this.remarkCustomerId, remark: this.message }).then(() => {
+          this.getCustomerList({
+            ...this.postCustomerData
+          }).then((res) => {
+            this.data[3].list = []
+            if (res) {
+              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])
+              }
+            } else {
+              this.data[3].hasPic = true
+            }
+          })
           done()
         })
       } else {

src/pages/user/rush/index.vue

@@ -54,6 +54,9 @@ export default {
     }
   },
   created () {
+    this.getRush({ flashBuyId: this.$route.query.flashBuyId }).then(() => {
+
+    })
     let start = 1540275765202
     let end = 1540481765202
     console.log(this)
@@ -65,7 +68,7 @@ export default {
     })
   },
   methods: {
-    ...mapRushActions(['setRush']),
+    ...mapRushActions(['setRush', 'getRush']),
     timing (startTime, endTime) {
       this.Interval = setInterval(() => {
         let nowTime = new Date().getTime()

src/store/remark/index.js

@@ -5,11 +5,11 @@ import api from '../../util/api'
 export default {
   namespaced: true,
   state: {
-    remakrList: []
+    remarkList: []
   },
   mutations: {
     setRemark (state, data) {
-      state.remakrList = data || []
+      state.remarkList = data.list || []
     }
   },
   actions: {
@@ -17,7 +17,11 @@ export default {
       return new Promise((resolve, reject) => {
         Ajax({
           ...api.remark.getRemark,
-          urlData: { ...data }
+          urlData: { ...data },
+          queryData: {
+            page: 1,
+            pagesize: 10000
+          }
         }).then(res => {
           context.commit('setRemark', res)
           resolve(res)

src/store/rush/index.js

@@ -13,10 +13,11 @@ export default {
     }
   },
   actions: {
-    getRush (context) {
+    getRush (context, data) {
       return new Promise((resolve, reject) => {
         Ajax({
-          ...api.user.getRush
+          ...api.rush.getRush,
+          urlData: { ...data }
         }).then(res => {
           context.commit('setDetail', res)
           resolve(res)
@@ -28,7 +29,7 @@ export default {
     setRush (context, data) {
       return new Promise((resolve, reject) => {
         Ajax({
-          ...api.user.setRush
+          ...api.rush.setRush
         }).then(res => {
           resolve(res)
         }).catch((err) => {

src/util/api.js

@@ -277,7 +277,7 @@ const $api = {
     },
     getRush: {
       method: 'get',
-      url: `${baseUrl}${wechat}/customerremark`
+      url: `${baseUrl}${wechat}/flashbuy/flash/:flashBuyId`
     }
   }
 }