付费用户管理优化

src/components/common/layout/layout.vue

@@ -313,7 +313,9 @@ export default {
     }, 20000)
   },
   mounted () {
-    
+    if(this.$route.path=='/customerMan/details'){
+      this.isback=true
+    }
   },
   beforeDestroy () {
     // 关闭WebSocket连接并清除定时器

src/pages/customerMan/details/index.vue

@@ -384,7 +384,11 @@ export default {
     },
   },
   watch: {},
-
+  // 返回页面缓存客户管理页面
+    beforeRouteLeave(to,from,next){
+    to.meta.keepAlive=true
+    next()
+  },
   methods: {
     // 获取客户管理详情
     getUserDetail() {
@@ -420,6 +424,7 @@ export default {
         path: "/testSkin",
         query: {
           isback: true,
+          id:this.id
         },
       });
     },

src/pages/customerMan/index.vue

@@ -35,6 +35,8 @@
       <select-pop
         :visible.sync="dialogVisible"
         @saveSelectList="saveSelectList"
+        :resetPop='resetPop'
+        :key='key'
       ></select-pop>
     </div>
 
@@ -65,6 +67,12 @@
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column
+          prop="last_login_time"
+          label="最后登录时间"
+          show-overflow-tooltip
+        >
+        </el-table-column>
       </el-table>
 
       <div class="pagin">
@@ -117,11 +125,13 @@ export default {
       superpositionNum: 0,
       StoredPrice: 0,
       transitionNum: 0,
+      consumeprice:0,
+      resetPop:false, //设置筛选弹窗开关
+      key:1 //筛选弹框组件刷新加载
     };
   },
   computed: {},
   watch: {},
-
   methods: {
     // 筛选其他条件
     saveSelectList(
@@ -131,15 +141,17 @@ export default {
       latelyKey,
       superpositionNum,
       StoredPrice,
-      transitionNum
+      transitionNum,
+      consumeprice,
     ) {
       (this.customerKey = customerKey),
         (this.couponKey = couponKey),
         (this.cardKey = cardKey),
-        (this.latelyKey = cardKey),
+        (this.latelyKey = latelyKey),
         (this.superpositionNum = superpositionNum),
         (this.StoredPrice = StoredPrice),
         (this.transitionNum = transitionNum),
+        this.consumeprice = consumeprice
         this.getUserList();
     },
     // 筛选沉默用户
@@ -169,8 +181,9 @@ export default {
         project_add: this.superpositionNum,
         balance_money: this.StoredPrice,
         change_add: this.transitionNum,
+        consume_money:this.consumeprice
       };
-      api.getUserList(params).then((res) => {
+      api.getUserPayList(params).then((res) => {
         if (res.code == 200) {
           // 将用户手机号中间四位变成****
           res.data.list.map((item) => {
@@ -207,6 +220,20 @@ export default {
   },
 
   mounted() {},
+  // 不是客户详情页面返回重置数据
+  beforeRouteEnter(to, from, next) {
+    if (from.path != "/customerMan/details") {
+      next((vm)=>{
+        let key = vm.key
+        Object.assign(vm.$data, vm.$options.data());
+        vm.key=key+1 
+        vm.resetPop = true
+        vm.getUserList()
+      })
+    }else{
+      next()
+    }
+  },
 };
 </script>
 

src/pages/customerMan/myOrder/index.vue

@@ -313,13 +313,13 @@ type: "全额券" -->
                   <div>
                     {{
                       scope.row.type == 1
-                        ? "重置"
+                        ? "充值"
                         : scope.row.type == 2
                         ? "充值赠送"
                         : scope.row.type == 3
                         ? "订单退款"
                         : scope.row.type == 5
-                        ? "体现驳回"
+                        ? "提现驳回"
                         : scope.row.type == -1
                         ? "消费"
                         : scope.row.type == -2

src/pages/customerMan/selectPop/index.vue

@@ -94,14 +94,20 @@
               @change="transitionChange"
             ></el-input-number>
           </div>
-          <!-- <div class="consumePrice">
+          <div class="consumePrice">
             <div class="consumePrice-title">总消费金额</div>
             <div class="consumePrice-content">
-              <el-input v-model="minConsumePrice"></el-input>
+              <el-input
+                v-model="minConsumePrice"
+                @change="minConsume"
+              ></el-input>
               <div>-</div>
-              <el-input v-model="maxConsumePrice"></el-input>
+              <el-input
+                v-model="maxConsumePrice"
+                @change="maxConsume"
+              ></el-input>
             </div>
-          </div> -->
+          </div>
           <div class="StoredPrice">
             <div class="StoredPrice-title">总储值金额</div>
             <div class="StoredPrice-content">
@@ -135,7 +141,7 @@
 <script>
 import api from "../../../server/home";
 export default {
-  props: ["visible"],
+  props: ["visible",'resetPop'],
   data() {
     return {
       total: 0,
@@ -191,6 +197,9 @@ export default {
       let StoredPrice = [];
       StoredPrice.push(this.minStoredPricePrice);
       StoredPrice.push(this.maxStoredPricePrice);
+      let consumeprice = [];
+      consumeprice.push(this.minConsumePrice);
+      consumeprice.push(this.maxConsumePrice);
       let params = {
         page: this.currentPage1,
         limit: this.limit,
@@ -202,15 +211,18 @@ export default {
         balance_money:
           this.maxStoredPricePrice.length == 0 ? 0 : StoredPrice.toString(),
         change_add: this.transitionNum,
+        consume_money:
+          this.maxConsumePrice.length == 0 ? 0 : consumeprice.toString(),
       };
-      api.getUserList(params).then((res) => {
+      api.getUserPayList(params).then((res) => {
         if (
           this.customerKey.length == 0 &&
           this.couponKey.length == 0 &&
           this.cardKey.length == 0 &&
           this.latelyKey.length == 0 &&
           this.superpositionNum == 0 &&
-          this.maxStoredPricePrice.length == 0
+          this.maxStoredPricePrice.length == 0 &&
+          this.maxConsumePrice.length == 0
         ) {
           this.total = 0;
           return;
@@ -228,6 +240,9 @@ export default {
       let StoredPrice = [];
       StoredPrice.push(this.minStoredPricePrice);
       StoredPrice.push(this.maxStoredPricePrice);
+      let consumeprice = [];
+      consumeprice.push(this.minConsumePrice);
+      consumeprice.push(this.maxConsumePrice);
       this.$emit("update:visible", false);
       this.$emit(
         "saveSelectList",
@@ -237,13 +252,22 @@ export default {
         this.latelyKey.length == 0 ? 0 : this.latelyKey,
         this.superpositionNum,
         this.maxStoredPricePrice.length == 0 ? 0 : StoredPrice.toString(),
-        this.transitionNum
+        this.transitionNum,
+        this.maxConsumePrice.length == 0 ? 0 : consumeprice.toString()
       );
     },
     // 关闭弹窗
     closeFilterPop() {
       this.$emit("update:visible", false);
     },
+    // 消费最小值改变
+    minConsume() {
+      this.getUserList();
+    },
+    // 消费最大值改变
+    maxConsume() {
+      this.getUserList();
+    },
     // 最小值改变
     minChange() {
       this.getUserList();
@@ -311,10 +335,9 @@ export default {
     },
   },
   watch: {
-    visible(newValue, oldValue) {
-      // 关闭打开弹框重置数据
-      this.reset();
-    },
+    resetPop(newValue,oldValue){
+      this.reset()
+    }
   },
 };
 </script>

src/pages/testSkin/index.vue

@@ -86,7 +86,7 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        keywords: this.searchText,
+        keywords: this.searchText||this.$route.query.id,
         start_date: start_date,
         end_date: end_date,
       };

src/router/map/home.js

@@ -54,7 +54,10 @@ export default {
   },
   {
     path: '/customerMan',
-    component: CustomerMan
+    component: CustomerMan,
+    meta:{
+      keepAlive:true
+    }
   },
   {
     path: '/customerMan/details',

src/server/home.js

@@ -229,4 +229,8 @@ export default class Home {
   static getBalanceRecord (params) {
     return $http.post(url.getBalanceRecord, params)
   }
+  // 获取付费用户列表
+  static getUserPayList (params) {
+    return $http.get(url.getUserPayList, params)
+  }
 }

src/server/urls.js

@@ -140,5 +140,8 @@ export default {
   editSign:'/v2/pad/detail/sign',
 
   // 余额变更记录
-  getBalanceRecord:'/v2/pad/detail/balance'
+  getBalanceRecord:'/v2/pad/detail/balance',
+
+  // 获取付费用户列表
+  getUserPayList:'/v2/pad/user/pay_list',
 }