解决冲突

src/components/common/layout/layout.vue

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

src/components/common/layout/leftMenu.vue

@@ -1,17 +1,20 @@
 <template>
-  <el-menu :collapse="isCollapse"
-           background-color="#FA7D22"
-           text-color="#FFFFFF"
-           active-text-color="#FA7D22"
-           :default-active="$route.path"
-           style="width: 115px;"
-           router>
+  <el-menu
+    :collapse="isCollapse"
+    background-color="#FA7D22"
+    text-color="#FFFFFF"
+    active-text-color="#FA7D22"
+    :default-active="$route.path"
+    style="width: 115px"
+    router
+  >
     <div class="logo">
-      <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/logo.png"
-           alt="">
+      <img
+        src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/logo.png"
+        alt=""
+      />
     </div>
-    <div v-for="(item,index1) in menu"
-         :key="index1">
+    <div v-for="(item, index1) in menu" :key="index1">
       <!--      <el-submenu :index="index1+'a'" v-if="item.children && item.children.length > 0">-->
       <!--        <template slot="title">-->
       <!--          <i :class="item.icon"></i>-->
@@ -24,12 +27,23 @@
       <!--          </el-menu-item>-->
       <!--        </div>-->
       <!--      </el-submenu>-->
-      <div class="el-menu-item"
-           @click="handleSelect(index1,item)"
-           :index="item.path"
-           :class="index1==nowIndex?'active':''"
-           :style="index1+1==nowIndex?'padding-bottom:0px':index1-1==nowIndex?'padding-top:0px':''">
-        <img :src="index1==nowIndex?item.icon:item.unicon"><span slot="title">{{ item.name }}</span>
+      <div
+        class="el-menu-item"
+        @click="handleSelect(index1, item)"
+        :index="item.path"
+        :class="index1 == nowIndex ? 'active' : ''"
+        :style="
+          index1 + 1 == nowIndex
+            ? 'padding-bottom:0px'
+            : index1 - 1 == nowIndex
+            ? 'padding-top:0px'
+            : ''
+        "
+      >
+        <img :src="index1 == nowIndex ? item.icon : item.unicon" /><span
+          slot="title"
+          >{{ item.name }}</span
+        >
       </div>
     </div>
   </el-menu>
@@ -39,89 +53,100 @@
 // import memberLogic from '@/server/memberLogic.js'
 
 export default {
-  props: ['isCollapse'],
-  data () {
+  props: ["isCollapse"],
+  data() {
     return {
       menu: [
         {
           name: "首页",
           path: "/home",
-          unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unhome.png',
-          icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/home.png'
-
+          unicon:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unhome.png",
+          icon: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/home.png",
         },
         {
           name: "测肤记录",
           path: "/testSkin",
-          unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unskin.png',
-          icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/Skin.png',
+          unicon:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unskin.png",
+          icon: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/Skin.png",
         },
         {
           name: "发券中心",
           path: "/coupon",
-          unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/uncoupon.png',
-          icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/coupon.png',
-        }, {
+          unicon:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/uncoupon.png",
+          icon: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/coupon.png",
+        },
+        {
           name: "历史订单",
           path: "/historicalOrder",
-          unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unhistory.png',
-          icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/history.png',
-        }, {
+          unicon:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unhistory.png",
+          icon: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/history.png",
+        },
+        {
           name: "确定订单",
           path: "/confirmOrder",
-          unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unconfirmOrder.png',
-          icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/confirmOrder.png'
+          unicon:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unconfirmOrder.png",
+          icon: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/confirmOrder.png",
         },
         //  {
         //   name: "门店检测",
         //   path: "/storeDetection",
         //   icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/testing.png',
         //   unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/untesting.png'
-        // },   
+        // },
         {
           name: "客户管理",
           path: "/customerMan",
-          unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unskin.png',
-          icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/Skin.png',
-        }
+          unicon:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unskin.png",
+          icon: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/Skin.png",
+        },
       ],
-      nowIndex: 0
-    }
+      nowIndex: 0,
+    };
   },
   watch: {
-    $route (to, from) {
-      console.log(to, 'tootototo');
-      let patname = `/${to.path.split('/')[1]}`
-      console.log(window.location, 'window.location.pathname', to);
-      this.$emit('changeIsBack', to.meta.isback)
+    $route(to, from) {
+      console.log(to, "tootototo");
+      let patname = `/${to.path.split("/")[1]}`;
+      console.log(window.location, "window.location.pathname", to);
+      this.$emit("changeIsBack", to.meta.isback);
       this.menu.forEach((item, index) => {
         if (patname == item.path) {
-          this.nowIndex = index
-          this.$emit('changeMenu', index)
+          this.nowIndex = index;
+          this.$emit("changeMenu", index);
         }
-      })
-    }
+      });
+      // 客户管理详情跳转测肤记录修改返回键显示
+      if (from.path == "/customerMan/details") {
+        this.$emit("changeIsBack", this.$route.query.isback);
+      }
+    },
   },
-  mounted () {
-    let patname = `/${window.location.hash.substr(1).split('/')[1]}`
-    console.log(window.location, 'window.location.pathname', patname);
+  mounted() {
+    let patname = `/${window.location.hash.substr(1).split("/")[1]}`;
+    console.log(window.location, "window.location.pathname", patname);
     this.menu.forEach((item, index) => {
       if (patname == item.path) {
-        this.nowIndex = index
-        this.$emit('changeMenu', index)
+        this.nowIndex = index;
+        this.$emit("changeMenu", index);
       }
-    })
+    });
   },
   methods: {
-    handleSelect (index, item) {
-      this.nowIndex = index
+    handleSelect(index, item) {
+      this.nowIndex = index;
       this.$router.push({
-        path: item.path
-      })
-      this.$emit('changeMenu', index)
-    }
-  }
-}
+        path: item.path,
+      });
+      this.$emit("changeMenu", index);
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>

src/pages/customerMan/details/index.vue

@@ -4,13 +4,13 @@
       <div class="user-info">
         <div class="title">
           <div class="txt">个人信息</div>
-          <div
+          <!-- <div
             class="test-record"
             @click="toTestRecord"
             v-if="userInfo.analysis_id"
           >
             测肤记录
-          </div>
+          </div> -->
         </div>
         <div class="detail-info">
           <div class="user-img">
@@ -21,14 +21,17 @@
               <div class="name">
                 <span>{{ userInfo.nickname | ellipsis(3) }}</span>
               </div>
+              <!-- <div class="skin-type">
+                肤龄：<span>{{ userInfo.age }}</span>
+              </div> -->
               <div class="sex"><img :src="gender" alt="" /></div>
-              <!-- <div class="age">
+              <div class="age">
                 <span>{{ userInfo.skin_age }}</span
                 ><span class="min-size">肤龄</span>
-              </div> -->
+              </div>
             </div>
             <div class="real-name">
-              姓名：
+              真实姓名：
               <span v-show="!nameInpVisible">{{ userInfo.real_name }}</span>
               <el-input
                 size="mini"
@@ -46,84 +49,116 @@
                 srcset=""
               />
             </div>
+
             <div class="skin-type">
-              肤质：<span>{{ userInfo.skin_type }}</span>
-            </div>
-            <div class="skin-type">
-              肤龄：<span>{{ userInfo.age }}</span>
-            </div>
-            <div class="skin-color">
-              肤色：<span>{{ userInfo.skin_color }}</span>
+              用户ID:<span> {{ userInfo.user_id }}</span>
             </div>
+            <!-- <div class="skin-type">
+              上传报告时间:<span> {{ userDetail.create_time }}</span>
+            </div> -->
           </div>
         </div>
       </div>
 
       <div class="personage-data">
         <div class="myDataList">
-          检测时间：
-          <span>{{ userInfo.check_time }}</span>
-        </div>
-        <div class="myDataList">
-          出生日期：
+          <span class="dataListTitle">出生日期</span> :
+
           <span>{{ userInfo.birthday }}</span>
         </div>
         <div class="myDataList">
-          手机号：
+          <span class="dataListTitle">联系电话</span> :
           <span>{{ userInfo.mobile }}</span>
         </div>
 
         <div class="myDataList">
-          所在地：
+          <span class="dataListTitle">所在地</span> :
           <span>{{ userInfo.city }}</span>
         </div>
 
         <div class="myDataList">
-          开卡店铺：
-          <span>{{ userInfo.store_name }}</span>
+          <span class="dataListTitle">客户来源</span> :
+          <!-- <span>{{ userInfo.store_name }}</span> -->
+          <el-select
+            v-model="sourceValue"
+            placeholder="请选择"
+            size="mini"
+            @change="selectSource"
+          >
+            <el-option
+              v-for="(item, index) in sourceList"
+              :key="index"
+              :label="item"
+              :value="index"
+            >
+            </el-option>
+          </el-select>
         </div>
+        <div class="assetInfo">资产信息</div>
 
         <div class="myDataList coupon-num">
-          次卡数量：
+          <span class="dataListTitle">次卡数量</span> :
           <span @click="toOrder(2)">{{ order_total.card_num }}</span>
         </div>
 
         <div class="myDataList coupon-num">
-          优惠券数量：
+          <span class="dataListTitle">优惠券</span> :
           <span @click="toOrder(4)">{{ userInfo.card_num }}</span>
         </div>
 
         <div class="myDataList">
-          储值金额：
-          <span class="JEcolor">
-            ￥
-            <span class="bigSixe">{{ userInfo.amount }}</span>
+          <span class="dataListTitle">储值金额</span> :
+          <span class="JEcolor" @click="toOrder(5)"> 
+            ￥<span class="bigSixe">{{ userInfo.amount }}</span>
             <!-- .00 -->
           </span>
         </div>
         <div class="myDataList">
-          积分：
+          <span class="dataListTitle">积分</span> :
           <span>{{ userInfo.coin }}</span>
         </div>
-        <div class="myDataList" @click="remarkPupopVisible = true">
+        <div class="detectionInfo">
+          <div>检测信息</div>
+          <div @click="goTestSkin">测肤记录</div>
+        </div>  
+        <div class="skin-type">
+          <span class="dataListTitle">肤质</span> :
+          <span class="item" v-if="userDetail.detection">{{
+            skin_type[userDetail.detection.skin_type - 1]
+          }}</span>
+        </div>
+        <!-- <div class="skin-color">
+          <span class="dataListTitle">肤色</span> :
+          <span>{{ userInfo.skin_color }}</span>
+        </div> -->
+        <div class="myDataList">
+          <span class="dataListTitle">测肤时间</span> :
+          <span v-if="userDetail.detection">{{ userDetail.detection.create_time }}</span>
+        </div>
+        <!-- <div class="myDataList" @click="remarkPupopVisible = true">
           备注信息：
           <span>{{ userInfo.remark | ellipsis(20) }}</span>
-        </div>
+        </div> -->
       </div>
     </div>
     <div class="right">
       <div class="right-top">
         <div class="right-top-data">
           <div class="lable">
-            <div class="lable-title">面诊标签</div>
+            <div class="lable-title" v-if="userDetail.detection">
+              <div>面诊标签</div>
+              <div @click="goTestSkinDetials" v-if='userDetail.detection.id'>执行方案</div>
+            </div>
             <div class="problem">
-              <div class="problem-title">问题标签</div>
+              <div class="problem-title">问题标签&nbsp;</div>
+              :
               <div class="problem-lable">
                 <div class="lable-text problem-text">{{ problem }}</div>
               </div>
             </div>
             <div class="problem">
-              <div class="problem-title">面部标签</div>
+              <div class="problem-title">面部标签&nbsp;</div>
+              :
               <div class="problem-lable">
                 <div
                   class="lable-text"
@@ -172,54 +207,90 @@
       </div>
       <div class="right-bottom">
         <div class="programme">
-          <div class="tab">
-            <div class="tab-title">执行方案</div>
-          </div>
-          <div class="programmeList" v-if="programmeList.length > 0">
-            <div class="programmeWeek">
-              <div
-                class="programmeItem"
-                v-for="(item, index) in programmeList"
-                :key="index"
-              >
-                <div
-                  :class="selectWeek == index ? 'weekItemSelect' : 'weekItem'"
-                  @click="weekSelect(index)"
-                >
-                  {{ item.name }}
+          <div class="consume">
+            <div class="consume-box">
+              <div class="consume-title">总消费</div>
+              <div class="consume-content">
+                <div class="consume-one">
+                  <div class="consume-type">
+                    总消费金额:<span class="consume-price">{{
+                      userDetail.total_price
+                    }}</span>
+                  </div>
+                  <div class="consume-type">
+                    项目叠加次数:<span class="consume-price">{{
+                      userDetail.overlay
+                    }}</span>
+                  </div>
+                </div>
+                <div class="consume-two">
+                  <div class="consume-type">
+                    总储值金额:<span class="consume-price">{{
+                      userDetail.balance==null?0:userDetail.balance
+                    }}</span>
+                  </div>
+
+                  <div class="consume-type">
+                    转化次数:<span class="consume-price">{{
+                      userDetail.conversion
+                    }}</span>
+                  </div>
                 </div>
-                <div class="weekLine" v-if="index == 3 ? false : true"></div>
               </div>
             </div>
-            <div class="doTime">{{ programmeList[selectWeek].time }}</div>
-            <div class="weekDetails" v-if="programmeList.length > 0">
-              <div
-                class="contentItem"
-                v-for="(item, index1) in programmeList[selectWeek].list"
-                :key="index1"
-              >
-                <div class="itemTitle">
-                  <div>{{ item.name }}</div>
-                  <div>{{ item.classify_name }}</div>
-                  <!-- <div>{{item.time}}</div> -->
+            <div class="consume-title">最近消费记录</div>
+            <div class="consume-record">
+              <div class="record-item">
+                <div class="record-title">项目</div>
+                :
+                <div v-if="userDetail.project" class="record-name">
+                  {{ userDetail.project.project_name }}
                 </div>
-                <div
-                  class="itemContent"
-                  v-for="(items, index2) in item.list"
-                  :key="index2"
-                >
-                  <img class="itemContent-img" :src="items.cover_url" />
-                  <div class="itemContent-right">
-                    <div class="right-content">
-                      <div class="right-name">
-                        {{ items.name | ellipsis(14) }}
-                      </div>
-                      <div class="right-price">
-                        {{ items.price | doubleNum(2) }}
-                      </div>
-                    </div>
-                    <div class="right-project">{{ items.product_name }}</div>
-                  </div>
+                <div v-if="userDetail.project">
+                  {{ userDetail.project.create_time }}
+                </div>
+              </div>
+              <div class="record-item">
+                <div class="record-title">次卡</div>
+                :
+                <div v-if="userDetail.user_card" class="record-name">
+                  {{ userDetail.user_card.card_name }}
+                </div>
+                <div v-if="userDetail.user_card">
+                  {{ userDetail.user_card.create_time }}
+                </div>
+              </div>
+              <div class="record-item">
+                <div class="record-title">美妆产品</div>
+                :
+                <div v-if="userDetail.goods" class="record-name">
+                  {{ userDetail.goods.goods_name }}
+                </div>
+                <div v-if="userDetail.goods">
+                  {{ userDetail.goods.create_time }}
+                </div>
+              </div>
+              <div class="record-item">
+                <div class="record-title">充值</div>
+                :
+                <div v-if="userDetail.recharge" class="record-name">
+                  {{ userDetail.recharge.price }}
+                </div>
+                <div v-if="userDetail.recharge">
+                  {{ userDetail.recharge.create_time }}
+                </div>
+              </div>
+            </div>
+            <div class="consume-title">最近消耗</div>
+            <div class="card-record">
+              <div class="record-item">
+                <div class="record-title">消耗次卡</div>
+                :
+                <div v-if="userDetail.time_card" class="record-name">
+                  {{ userDetail.time_card.card_name }}
+                </div>
+                <div v-if="userDetail.time_card">
+                  {{ userDetail.time_card.create_time }}
                 </div>
               </div>
             </div>
@@ -287,6 +358,20 @@ export default {
       isPupop: false,
       nameInpVisible: false,
       remarkPupopVisible: false,
+      sourceList: [
+        " ",
+        "线下进店",
+        "种子用户",
+        "美团/大众",
+        "抖音",
+        "达人探店",
+        "霸王餐",
+        "老带新/转介绍",
+      ], //客户来源下拉选择
+      sourceValue: "", //客户来源值
+      id: this.$route.id, //用户的id
+      userDetail: [], //客户管理详情
+      skin_type: ["干性肌肤", "中性肌肤", "油性肌肤", "混合型肌肤"], //肤质 (肤质类型 1-干性肌肤 2-中性肌肤 3-油性肌肤 4-混合型肌肤)
     };
   },
   components: { minePupop },
@@ -299,8 +384,50 @@ export default {
     },
   },
   watch: {},
-
+  // 返回页面缓存客户管理页面
+    beforeRouteLeave(to,from,next){
+    to.meta.keepAlive=true
+    next()
+  },
   methods: {
+    // 获取客户管理详情
+    getUserDetail() {
+      api.getUserDetail({ id: this.id }).then((res) => {
+        this.userDetail = res.data;
+        this.sourceValue = this.sourceList[res.data.tag];
+      });
+    },
+    // 编辑客户管理用户标签
+    editSign(tag){
+      api.editSign({
+        tag,
+        id:this.id
+      }).then()
+    },
+    // 选择客户来源
+    selectSource(e) {
+      this.editSign(e)
+    },
+    // 跳转到测肤记录详情
+    goTestSkinDetials() {
+      this.$router.push({
+        path: "/testSkin/details",
+        query: {
+          id: this.userDetail.detection.id,
+          isback:true
+        }
+      });
+    },
+    // 跳转到测肤记录列表
+    goTestSkin() {
+      this.$router.push({
+        path: "/testSkin",
+        query: {
+          isback: true,
+          id:this.id
+        },
+      });
+    },
     getPadUserInfo() {
       api.getPadUserInfo({ id: this.id }).then((res) => {
         console.log(res, "aaaaaaaa");
@@ -377,14 +504,17 @@ export default {
         activeName = "third";
       } else if (index == 2) {
         activeName = "second";
-      }else if(index==4){
-        activeName = 'fourth'
+      } else if (index == 4) {
+        activeName = "fourth";
+      }else if(index==5){
+        activeName = "five";
       }
       this.$router.push({
         path: "/customerMan/projectOrder",
         query: {
           id: this.id,
           activeName: activeName,
+          isback:true
         },
       });
     },
@@ -425,6 +555,8 @@ export default {
   created() {
     let id = this.$route.query.id;
     this.id = id;
+    // 获取客户管理详情
+    this.getUserDetail();
     this.getPadUserInfo();
   },
 
@@ -489,11 +621,12 @@ export default {
             justify-content: space-between;
             .name {
               font-size: 14px;
+              width: 60px;
             }
             .sex {
               img {
-                width: 24px;
-                height: 24px;
+                width: 19px;
+                height: 19px;
               }
             }
             .age {
@@ -529,11 +662,55 @@ export default {
     }
     .personage-data {
       margin-top: 14px;
+      .assetInfo {
+        font-size: 14px;
+        color: #333;
+        font-weight: 600;
+        margin-top: 10px;
+      }
+      .detectionInfo {
+        margin-top: 10px;
+        display: flex;
+        justify-content: space-between;
+        font-size: 14px;
+        font-weight: 600;
+        color: #fa7d22;
+        div:first-child {
+          color: #333333;
+        }
+      }
+      .skin-type {
+        margin-top: 10px;
+        .dataListTitle {
+          display: inline-block;
+          font-size: 13px;
+          color: #999999;
+          width: 55px;
+          text-align: justify;
+          text-justify: distribute-all-lines;
+          text-align-last: justify;
+        }
+        .item{
+          color: #333;
+        }
+      }
+      .skin-color {
+        margin-top: 10px;
+        .dataListTitle {
+          display: inline-block;
+          font-size: 13px;
+          color: #999999;
+          width: 55px;
+          text-align: justify;
+          text-justify: distribute-all-lines;
+          text-align-last: justify;
+        }
+      }
       .myDataList {
-        margin-top: 15px;
+        margin-top: 10px;
         .bigSixe {
           font-size: 18px;
-          color: #fa7d22;
+          color: #ff3007;
         }
         span {
           color: #333333;
@@ -541,10 +718,21 @@ export default {
         .JEcolor {
           color: #fa7d22;
         }
+        .dataListTitle {
+          display: inline-block;
+          font-size: 13px;
+          color: #999999;
+          width: 55px;
+          text-align: justify;
+          text-justify: distribute-all-lines;
+          text-align-last: justify;
+        }
+        /deep/.el-select {
+          width: 150px;
+        }
       }
       .coupon-num {
         span {
-          color: #fa7d22;
           font-size: 16px;
           font-weight: 500;
         }
@@ -611,10 +799,15 @@ export default {
           .lable-title {
             font-size: 14px;
             font-family: PingFangSC-Medium, PingFang SC;
-            font-weight: 500;
+            font-weight: 600;
             color: #333333;
             line-height: 20px;
             margin-bottom: 14px;
+            display: flex;
+            justify-content: space-between;
+            div:last-child {
+              color: #fa7d22;
+            }
           }
           .problem {
             display: flex;
@@ -874,16 +1067,67 @@ export default {
             color: #ffc630;
           }
         }
-        .tab {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          .tab-title {
+        .consume {
+          .consume-box {
+            display: flex;
+          }
+          .consume-title {
             font-size: 14px;
             font-family: PingFangSC-Medium, PingFang SC;
-            font-weight: 500;
+            font-weight: 700;
             color: #333333;
             line-height: 20px;
+            margin-top: 15px;
+          }
+          .consume-title:first-child {
+            margin-top: 0;
+          }
+          .consume-content {
+            display: flex;
+            justify-content: space-between;
+            flex-wrap: wrap;
+            .consume-two {
+              margin-left: 90px;
+            }
+            .consume-type {
+              line-height: 25px;
+              width: 160px;
+              font-size: 13px;
+              color: #999999;
+              margin-left: 20px;
+            }
+            .consume-price {
+              font-size: 13px;
+              color: #333333;
+              margin-left: 14px;
+            }
+          }
+          .consume-record,
+          .card-record {
+            .record-item {
+              display: flex;
+              font-size: 13px;
+              color: #666666;
+              margin-top: 15px;
+              .record-title {
+                width: 65px;
+                text-align: justify;
+                text-justify: distribute-all-lines;
+                text-align-last: justify;
+              }
+              .record-name {
+                color: #333333;
+                width: 260px;
+                margin-left: 36px;
+                margin-right: 36px;
+                /* 强制超出不换行 */
+                white-space: nowrap;
+                /* 超出隐藏 */
+                overflow: hidden;
+                /* 文本超出显示成... */
+                text-overflow: ellipsis;
+              }
+            }
           }
         }
         .programme-list {

src/pages/customerMan/index.vue

@@ -7,6 +7,37 @@
       <el-button type="primary" class="searchButton" @click="getUserList()"
         >搜索</el-button
       >
+      <div class="silenceUser">
+        <div class="title">显示沉默付费用户</div>
+        <el-switch
+          v-model="silence"
+          active-color="#fa7d22"
+          inactive-color="#e7e7e7"
+          @change="showSilence"
+        >
+        </el-switch>
+      </div>
+      <div class="faceUser">
+        <div class="title">显示未面诊付费用户</div>
+        <el-switch
+          v-model="face"
+          active-color="#fa7d22"
+          inactive-color="#e7e7e7"
+          @change="showFace"
+        >
+        </el-switch>
+      </div>
+      <div class="filter">
+        <div class="title">筛选</div>
+        <i @click="openFilterPop" class="el-icon-s-operation"></i>
+      </div>
+      <!-- 筛选条件弹窗 -->
+      <select-pop
+        :visible.sync="dialogVisible"
+        @saveSelectList="saveSelectList"
+        :resetPop='resetPop'
+        :key='key'
+      ></select-pop>
     </div>
 
     <div class="user-list">
@@ -25,9 +56,9 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="id" label="用户ID" width="120"></el-table-column>
         <el-table-column prop="nickname" label="昵称" width="120">
         </el-table-column>
+        <el-table-column prop="id" label="用户ID" width="120"></el-table-column>
         <el-table-column prop="mobile" label="联系电话" show-overflow-tooltip>
         </el-table-column>
         <el-table-column
@@ -36,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">
@@ -55,8 +92,9 @@
 
 <script>
 import api from "../../server/home";
+import selectPop from "./selectPop/index.vue";
 export default {
-  components: {},
+  components: { selectPop },
   data() {
     return {
       searchText: "",
@@ -76,29 +114,87 @@ export default {
       currentPage1: 1,
       multipleSelection: "",
       total: 0,
-      // limit:10
+      face: false, //未面诊用户开关
+      silence: false, //沉默用户开关
+      dialogVisible: false, // 控制筛选弹框
+      // 筛选框内的变量内容
+      customerKey: 0,
+      couponKey: 0,
+      cardKey: 0,
+      latelyKey: 0,
+      superpositionNum: 0,
+      StoredPrice: 0,
+      transitionNum: 0,
+      consumeprice:0,
+      resetPop:false, //设置筛选弹窗开关
+      key:1 //筛选弹框组件刷新加载
     };
   },
   computed: {},
   watch: {},
-
   methods: {
+    // 筛选其他条件
+    saveSelectList(
+      customerKey,
+      couponKey,
+      cardKey,
+      latelyKey,
+      superpositionNum,
+      StoredPrice,
+      transitionNum,
+      consumeprice,
+    ) {
+      (this.customerKey = customerKey),
+        (this.couponKey = couponKey),
+        (this.cardKey = cardKey),
+        (this.latelyKey = latelyKey),
+        (this.superpositionNum = superpositionNum),
+        (this.StoredPrice = StoredPrice),
+        (this.transitionNum = transitionNum),
+        this.consumeprice = consumeprice
+        this.getUserList();
+    },
+    // 筛选沉默用户
+    showSilence(e) {
+      this.getUserList();
+    },
+    // 筛选未面诊用户
+    showFace(e) {
+      this.getUserList();
+    },
+    // 打开筛选条件弹框
+    openFilterPop() {
+      this.dialogVisible = true;
+    },
     // 获取订单列表
     getUserList() {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
         keywords: this.searchText,
+        silence_user: this.silence ? 1 : 0, //沉默付费用户1是显示 0是不显示
+        face_user: this.face ? 1 : 0, //显示未面诊付费用户 1是显示 0是不显示
+        tag: this.customerKey,
+        coupon_days: this.couponKey,
+        card_days: this.cardKey,
+        buying_time: this.latelyKey,
+        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) => {
-            item.mobile =
-              item.mobile.substring(0, 3) + "****" + item.mobile.substring(7);
+            if (item.mobile) {
+              item.mobile =
+                item.mobile.substring(0, 3) + "****" + item.mobile.substring(7);
+            }
           });
           this.tableData = res.data.list;
           this.total = res.data.total;
+          console.log(this.tableData);
         }
       });
     },
@@ -124,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>
 
@@ -147,6 +257,35 @@ export default {
       border-radius: 2px;
       border-color: #fa7d22;
     }
+    .silenceUser {
+      display: flex;
+      margin-left: 53px;
+      align-items: center;
+      .title {
+        line-height: 40px;
+        margin-right: 16px;
+      }
+    }
+    .faceUser {
+      display: flex;
+      margin-left: 53px;
+      align-items: center;
+      .title {
+        line-height: 40px;
+        margin-right: 16px;
+      }
+    }
+    .filter {
+      display: flex;
+      align-items: center;
+      margin-left: 53px;
+      .title {
+        margin-right: 17px;
+      }
+      i {
+        font-size: 17px;
+      }
+    }
   }
   .user-list {
     margin-top: 18px;

src/pages/customerMan/myOrder/index.vue

@@ -79,7 +79,12 @@
                   <div>{{ scope.row.card_name | ellipsis(8) }}</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="total_num" label="总次数" show-overflow-tooltip align="center">
+              <el-table-column
+                prop="total_num"
+                label="总次数"
+                show-overflow-tooltip
+                align="center"
+              >
               </el-table-column>
               <el-table-column
                 prop="num"
@@ -258,6 +263,88 @@ type: "全额券" -->
             </div>
           </div>
         </el-tab-pane>
+        <el-tab-pane label="余额记录" name="five">
+          <div class="user-list">
+            <el-table
+              ref="multipleTable"
+              :data="balanceListData"
+              tooltip-effect="dark"
+              height="354"
+              style="width: 100%; border-radius: 8px"
+            >
+              <el-table-column prop="goods" label="变更时间" width="200">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.create_time }}</div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="goods" label="变更前金额">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.before_amount }}</div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="goods"
+                label="变更后金额"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <div>{{ scope.row.after_amount }}</div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="price"
+                label="变更金额"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.is_add == 1 ? "+" : "-" }}{{ scope.row.amount }}
+                  </div>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column prop="status" label="状态" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <div>{{ scope.row.msg }}</div>
+                </template>
+              </el-table-column> -->
+              <!--  余额类型(记录类型，1充值，2充值赠送，3订单退款，5提现驳回，-1消费，-2提现冻结，10客服添加，-10客服扣除) -->
+              <el-table-column prop="status" label="类型" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <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
+                        ? "提现冻结"
+                        : scope.row.type == 10
+                        ? "客服添加"
+                        : scope.row.type == -10
+                        ? "客服扣除"
+                        : ""
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="pagin">
+              <el-pagination
+                background
+                layout="prev, pager, next"
+                @current-change="handleCurrentChange"
+                :current-page.sync="currentPage1"
+                :total="total"
+              ></el-pagination>
+            </div>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </div>
     <!-- 次卡详情 -->
@@ -380,6 +467,7 @@ export default {
       cardInfo: {}, //订单详情
       cardLogList: [], //次卡消耗记录
       cardListData: [], //用户次卡列表
+      balanceListData: [], //用户余额变更记录
     };
   },
   computed: {},
@@ -496,6 +584,20 @@ export default {
         this.total = resp.data.total;
       }
     },
+    // 获取余额变更记录
+    async getBalanceRecord() {
+      let params = {
+        page: this.currentPage1,
+        limit: this.limit,
+        id: this.id,
+      };
+      let resp = await api.getBalanceRecord(params);
+      if (resp.code === 200) {
+        console.log(resp, "asdasdasd");
+        this.balanceListData = resp.data.list;
+        this.total = resp.data.count;
+      }
+    },
     handleCurrentChange(val) {
       this.currentPage1 = val;
       if (this.activeName == "first") {
@@ -507,6 +609,8 @@ export default {
         this.getUserGoods();
       } else if (this.activeName == "fourth") {
         this.getUserCoupon();
+      } else if (this.activeName == "five") {
+        this.getBalanceRecord();
       }
     },
     handleSelectionChange(row, column, event) {
@@ -521,6 +625,7 @@ export default {
     submitFrequency() {},
     changeTab(e) {
       this.currentPage1 = 1;
+      console.log(this.currentPage1);
       if (e.index == 0) {
         this.getUserProject();
       } else if (e.index == 1) {
@@ -530,6 +635,8 @@ export default {
         this.getUserGoods();
       } else if (e.index == 3) {
         this.getUserCoupon();
+      } else if (e.index == 4) {
+        this.getBalanceRecord();
       }
     },
   },
@@ -546,8 +653,10 @@ export default {
       this.getCardList();
     } else if (this.activeName == "third") {
       this.getUserGoods();
-    }else if (this.activeName == 'fourth'){
-      this.getUserCoupon()
+    } else if (this.activeName == "fourth") {
+      this.getUserCoupon();
+    } else if (this.activeName == "five") {
+      this.getBalanceRecord();
     }
   },
 

src/pages/customerMan/selectPop/index.vue

@@ -0,0 +1,555 @@
+<template>
+  <div>
+    <div class="filterPop">
+      <el-dialog
+        top="130px"
+        :visible.sync="visible"
+        width="52.5%"
+        :close-on-click-modal="false"
+      >
+        <span slot="title" class="slot-title">
+          <i @click="closeFilterPop" class="el-icon-arrow-left"></i>
+          筛选条件
+        </span>
+        <div class="customer-source">
+          <div class="center">
+            <div class="item-title">{{ customerSource.name }}</div>
+            <div class="content">
+              <div
+                class="content-item"
+                :class="{
+                  activeFilter: customerSelect.indexOf(index) != -1,
+                }"
+                v-for="(item, index) in customerSource.title"
+                :key="index"
+                @click="customerFilter(item, index)"
+              >
+                {{ item }}
+              </div>
+            </div>
+          </div>
+          <div class="center">
+            <div class="item-title">{{ couponSource.name }}</div>
+            <div class="content">
+              <div
+                class="content-item"
+                :class="{
+                  activeFilter: index == couponSelect,
+                }"
+                v-for="(item, index) in couponSource.title"
+                :key="index"
+                @click="couponFilter(item, index)"
+              >
+                {{ item }}
+              </div>
+            </div>
+          </div>
+          <div class="center">
+            <div class="item-title">{{ cardSource.name }}</div>
+            <div class="content">
+              <div
+                class="content-item"
+                :class="{
+                  activeFilter: index == cardSelect,
+                }"
+                v-for="(item, index) in cardSource.title"
+                :key="index"
+                @click="cardFilter(item, index)"
+              >
+                {{ item }}
+              </div>
+            </div>
+          </div>
+          <div class="center">
+            <div class="item-title">{{ latelySource.name }}</div>
+            <div class="content">
+              <div
+                class="content-item"
+                :class="{
+                  activeFilter: index == latelySelect,
+                }"
+                v-for="(item, index) in latelySource.title"
+                :key="index"
+                @click="latelyFilter(item, index)"
+              >
+                {{ item }}
+              </div>
+            </div>
+          </div>
+          <div class="superposition">
+            <div class="superposition-title">项目叠加次数</div>
+            <el-input-number
+              v-model="superpositionNum"
+              :min="0"
+              size="mini"
+              @change="superpositionChange"
+            ></el-input-number>
+          </div>
+          <div class="transition">
+            <div class="transition-title">转换次数</div>
+            <el-input-number
+              v-model="transitionNum"
+              :min="0"
+              size="mini"
+              @change="transitionChange"
+            ></el-input-number>
+          </div>
+          <div class="consumePrice">
+            <div class="consumePrice-title">总消费金额</div>
+            <div class="consumePrice-content">
+              <el-input
+                v-model="minConsumePrice"
+                @change="minConsume"
+              ></el-input>
+              <div>-</div>
+              <el-input
+                v-model="maxConsumePrice"
+                @change="maxConsume"
+              ></el-input>
+            </div>
+          </div>
+          <div class="StoredPrice">
+            <div class="StoredPrice-title">总储值金额</div>
+            <div class="StoredPrice-content">
+              <el-input
+                @change="minChange"
+                v-model="minStoredPricePrice"
+              ></el-input>
+              <div>-</div>
+              <el-input
+                @change="maxChange"
+                v-model="maxStoredPricePrice"
+              ></el-input>
+            </div>
+          </div>
+        </div>
+        <div class="slot-footer" slot="footer">
+          <div class="item-title">
+            共有<i>{{ total }}</i
+            >位用户
+          </div>
+          <div>
+            <button @click="reset">重置</button>
+            <button @click="save">保存</button>
+          </div>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import api from "../../../server/home";
+export default {
+  props: ["visible",'resetPop'],
+  data() {
+    return {
+      total: 0,
+      currentPage1: 1,
+      customerSource: {
+        name: "客户来源",
+        title: [
+          "线下进店",
+          "种子用户",
+          "美团/大众",
+          "抖音",
+          "达人探店",
+          "霸王餐",
+          "老带新/转介绍",
+        ],
+      },
+      couponSource: {
+        name: "优惠券快过期付费用户",
+        title: ["3天", "5天", "7天", "15天"],
+        day: ["3", "5", "7", "15"],
+      },
+
+      cardSource: {
+        name: "次卡快过期付费用户",
+        title: ["3天", "5天", "7天", "15天", "30天"],
+        day: ["3", "5", "7", "15", "30"],
+      },
+
+      latelySource: {
+        name: "距离最近消费时间",
+        title: ["3天", "5天", "7天", "15天", "15天以上"],
+        day: ["3", "5", "7", "15", "16"],
+      },
+      customerSelect: [], //客户来源下标
+      couponSelect: 99, //优惠券快过期付费用户下标
+      cardSelect: 99, //此卡快过期下标
+      latelySelect: 99, //距离最近消费时间
+      superpositionNum: 0, //项目叠加次数
+      transitionNum: 0, //转换次数
+      minConsumePrice: 0, //消费最小金额
+      maxConsumePrice: "", //消费最大金额
+      minStoredPricePrice: 0, //储值最小金额
+      maxStoredPricePrice: "", //储值最大金额
+      customerKey: [], //选择客户来源列表
+      couponKey: "", //优惠券快过期天数
+      cardKey: "", //此卡过期天数
+      latelyKey: "", //距离最近消费时间天数
+    };
+  },
+  methods: {
+    // 获取订单列表
+    getUserList() {
+      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,
+        tag: this.customerKey.length == 0 ? 0 : this.customerKey,
+        coupon_days: this.couponKey.length == 0 ? 0 : this.couponKey,
+        card_days: this.cardKey.length == 0 ? 0 : this.cardKey,
+        buying_time: this.latelyKey.length == 0 ? 0 : this.latelyKey,
+        project_add: this.superpositionNum,
+        balance_money:
+          this.maxStoredPricePrice.length == 0 ? 0 : StoredPrice.toString(),
+        change_add: this.transitionNum,
+        consume_money:
+          this.maxConsumePrice.length == 0 ? 0 : consumeprice.toString(),
+      };
+      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.maxConsumePrice.length == 0
+        ) {
+          this.total = 0;
+          return;
+        }
+        this.total = res.data.total;
+      });
+    },
+    // 重置筛选条件
+    reset() {
+      // 重置data里的值
+      Object.assign(this.$data, this.$options.data.call(this));
+    },
+    // 保存筛选条件
+    save() {
+      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",
+        this.customerKey.length == 0 ? 0 : this.customerKey,
+        this.couponKey.length == 0 ? 0 : this.couponKey,
+        this.cardKey.length == 0 ? 0 : this.cardKey,
+        this.latelyKey.length == 0 ? 0 : this.latelyKey,
+        this.superpositionNum,
+        this.maxStoredPricePrice.length == 0 ? 0 : StoredPrice.toString(),
+        this.transitionNum,
+        this.maxConsumePrice.length == 0 ? 0 : consumeprice.toString()
+      );
+    },
+    // 关闭弹窗
+    closeFilterPop() {
+      this.$emit("update:visible", false);
+    },
+    // 消费最小值改变
+    minConsume() {
+      this.getUserList();
+    },
+    // 消费最大值改变
+    maxConsume() {
+      this.getUserList();
+    },
+    // 最小值改变
+    minChange() {
+      this.getUserList();
+    },
+    // 最大值改变
+    maxChange() {
+      this.getUserList();
+    },
+    // 项目叠加事件
+    superpositionChange() {
+      this.getUserList();
+    },
+    // 转换次数事件
+    transitionChange() {
+      this.getUserList();
+    },
+    // 选择
+    customerFilter(item, index) {
+      if (this.customerSelect.indexOf(index) != -1) {
+        this.customerSelect.splice(this.customerSelect.indexOf(index), 1);
+        this.customerKey.splice(this.customerKey.indexOf(index), 1);
+        this.getUserList();
+        return;
+      }
+      this.customerSelect.push(index);
+      // 0 无1线下进店 2种子用户 3美团/大众 4抖音 5达人探店 6霸王餐 7老带新/转介绍,多个使用数组
+      this.customerKey.push(index + 1);
+      this.getUserList();
+    },
+    // 选择优惠券快过期付费用户
+    couponFilter(item, index) {
+      if (this.couponSelect == index) {
+        this.couponSelect = 99;
+        this.couponKey = "";
+        this.getUserList();
+        return;
+      }
+      this.couponSelect = index;
+      this.couponKey = this.couponSource.day[index];
+      this.getUserList();
+    },
+    // 选择此卡快过期下标
+    cardFilter(item, index) {
+      if (this.cardSelect == index) {
+        this.cardSelect = 99;
+        this.cardKey = "";
+        this.getUserList();
+        return;
+      }
+      this.cardSelect = index;
+      this.cardKey = this.cardSource.day[index];
+      this.getUserList();
+    },
+    // 选择距离最近消费时间
+    latelyFilter(item, index) {
+      if (this.latelySelect == index) {
+        this.latelySelect = 99;
+        this.latelyKey = "";
+        this.getUserList();
+        return;
+      }
+      this.latelySelect = index;
+      this.latelyKey = this.latelySource.day[index];
+      this.getUserList();
+    },
+  },
+  watch: {
+    resetPop(newValue,oldValue){
+      this.reset()
+    }
+  },
+};
+</script>
+
+<style lang='less' scoped>
+// 筛选弹窗
+.filterPop {
+  .slot-title {
+    display: inline-block;
+    font-size: 14px;
+    margin-top: 24px;
+    font-weight: 600;
+    i {
+      font-size: 24px;
+      color: #666666;
+      margin-left: 22px;
+      margin-right: 175px;
+    }
+  }
+  // 筛选条件
+  .customer-source {
+    .item-title {
+      font-size: 14px;
+      color: #333;
+      margin-top: 10px;
+      font-weight: 600;
+    }
+    .content {
+      margin-top: 10px;
+      display: flex;
+      width: 442px;
+      flex-wrap: wrap;
+      box-sizing: border-box;
+    }
+    .content-item {
+      font-size: 12px;
+      height: 24px;
+      padding: 3px 12px;
+      background-color: #f5f5f5;
+      line-height: 18px;
+      border-radius: 2px;
+      margin-left: 20px;
+      box-sizing: border-box;
+    }
+    .activeFilter {
+      border: 1px solid #fa7d22;
+      color: #fa7d22;
+    }
+    .content-item:first-child,
+    .content-item:nth-child(6) {
+      margin-left: 0;
+    }
+    .content-item:nth-child(n + 6) {
+      margin-top: 10px;
+    }
+    .superposition {
+      display: flex;
+      .superposition-title {
+        font-size: 14px;
+        color: #333;
+        margin-top: 14px;
+        font-weight: 600;
+        margin-right: 20px;
+      }
+      /deep/.el-input-number {
+        margin-top: 10px;
+      }
+      /deep/input.el-input__inner,
+      /deep/span.el-input-number__decrease.is-disabled,
+      /deep/span.el-input-number__increase,
+      /deep/span.el-input-number__decrease {
+        border: none;
+      }
+    }
+    .transition {
+      display: flex;
+      .transition-title {
+        font-size: 14px;
+        color: #333;
+        margin-top: 14px;
+        font-weight: 600;
+        margin-right: 20px;
+      }
+      /deep/.el-input-number {
+        margin-top: 10px;
+      }
+      /deep/input.el-input__inner,
+      /deep/span.el-input-number__decrease.is-disabled,
+      /deep/span.el-input-number__increase,
+      /deep/span.el-input-number__decrease {
+        border: none;
+      }
+    }
+    .consumePrice {
+      display: flex;
+      .consumePrice-title {
+        font-size: 14px;
+        color: #333;
+        margin-top: 14px;
+        font-weight: 600;
+        margin-right: 20px;
+      }
+      .consumePrice-content {
+        width: 134px;
+        height: 24px;
+        border: 1px solid #f5f5f5;
+        border-radius: 2px;
+        margin-top: 10px;
+        display: flex;
+        align-items: center;
+        div {
+          color: #999999;
+        }
+        /deep/input.el-input__inner {
+          height: 21px;
+          width: 60px;
+          border: none;
+          text-align: center;
+          font-size: 12px;
+          padding: 0;
+        }
+      }
+    }
+    .StoredPrice {
+      display: flex;
+      .StoredPrice-title {
+        font-size: 14px;
+        color: #333;
+        margin-top: 14px;
+        font-weight: 600;
+        margin-right: 20px;
+      }
+      .StoredPrice-content {
+        width: 134px;
+        height: 24px;
+        border: 1px solid #f5f5f5;
+        border-radius: 2px;
+        margin-top: 10px;
+        display: flex;
+        align-items: center;
+        div {
+          color: #999999;
+        }
+        /deep/input.el-input__inner {
+          height: 21px;
+          width: 60px;
+          border: none;
+          text-align: center;
+          font-size: 12px;
+          padding: 0;
+        }
+      }
+    }
+  }
+  /deep/.el-dialog {
+    border-radius: 8px;
+    height: 500px;
+    margin-left: 300px;
+    position: relative;
+  }
+  /deep/.el-dialog__header {
+    padding: 0;
+    padding-bottom: 30px;
+  }
+  /deep/button.el-dialog__headerbtn {
+    display: none;
+  }
+  /deep/.el-dialog__body {
+    overflow: hidden;
+    height: 350px;
+    padding-left: 38px;
+    padding-top: 0;
+    color: #333;
+    overflow-y: auto; // 设置滚动条
+    padding-bottom: 60px;
+  }
+  .slot-footer {
+    padding: 0;
+    border-radius: 0 0 8px 8px;
+    border-top: solid 1px #f5f5f5;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 80px;
+    background-color: #ffffff;
+    text-align: center;
+    z-index: 999;
+    .item-title {
+      margin-top: 10px;
+      font-size: 14px;
+      color: #333;
+      i {
+        color: #ff3007;
+      }
+    }
+    button {
+      margin-top: 10px;
+      width: 176px;
+      height: 28px;
+      border: 1px solid #fa7d22;
+      border-radius: 14px;
+      color: #fa7d22;
+      background-color: #fff;
+    }
+    button:last-child {
+      background-color: #fa7d22;
+      margin-left: 14px;
+      color: #fff;
+    }
+  }
+  /deep/.el-dialog__footer {
+    padding: 0;
+  }
+}
+</style>

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

@@ -217,4 +217,20 @@ export default class Home {
   static getOrderCard (params) {
     return $http.get(url.getOrderCard, params)
   }
+  // 获取项目可用的次卡
+  static getUserDetail (params) {
+    return $http.post(url.getUserDetail, params)
+  }
+  // 客户管理编辑用户标签
+  static editSign (params) {
+    return $http.post(url.editSign, params)
+  }
+  // 余额变更记录
+  static getBalanceRecord (params) {
+    return $http.post(url.getBalanceRecord, params)
+  }
+  // 获取付费用户列表
+  static getUserPayList (params) {
+    return $http.get(url.getUserPayList, params)
+  }
 }

src/server/urls.js

@@ -131,5 +131,17 @@ export default {
   getCardOrders: '/v2/pad/user/card',
 
   //获取用户次卡列表
-  getCardList:'/v2/pad/user/card_list'
+  getCardList:'/v2/pad/user/card_list',
+  
+  // 获取客户管理详情
+  getUserDetail:'/v2/pad/detail/user_detail',
+
+  // 客户管理编辑用户标签
+  editSign:'/v2/pad/detail/sign',
+
+  // 余额变更记录
+  getBalanceRecord:'/v2/pad/detail/balance',
+
+  // 获取付费用户列表
+  getUserPayList:'/v2/pad/user/pay_list',
 }

vue.config.js

@@ -4,11 +4,11 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = {
   // 测试
-  // publicPath: process.env.env_config === 'prod' ? 'https://h5-cms-vue.ijolijoli.com/test_pad/dist' :
-  //   process.env.env_config === 'test' ? '/vapps/calory/' : '/dist/',
-  // 正式
-  publicPath: process.env.env_config === 'prod' ? 'https://h5-cms-vue.ijolijoli.com/dist' :
+  publicPath: process.env.env_config === 'prod' ? 'https://h5-cms-vue.ijolijoli.com/test_pad/dist' :
     process.env.env_config === 'test' ? '/vapps/calory/' : '/dist/',
+  // 正式
+  // publicPath: process.env.env_config === 'prod' ? 'https://h5-cms-vue.ijolijoli.com/dist' :
+  //   process.env.env_config === 'test' ? '/vapps/calory/' : '/dist/',
   // 设置跨域
   crossorigin: 'anonymous',
   /**