优化客户管理&&优化预约跳转

src/components/common/layout/leftMenu.vue

@@ -143,7 +143,7 @@ export default {
         }
       });
       // 客户管理详情跳转测肤记录修改返回键显示
-      if (from.path == "/payUser/details") {
+      if (to.path == "/testSkin") {
         this.$emit("changeIsBack", this.$route.query.isback);
       }
     },

src/pages/customerMan/details/index.vue

@@ -4,13 +4,6 @@
       <div class="user-info">
         <div class="title">
           <div class="txt">个人信息</div>
-          <div
-            class="test-record"
-            @click="toTestRecord"
-            v-if="userInfo.analysis_id"
-          >
-            测肤记录
-          </div>
         </div>
         <div class="detail-info">
           <div class="user-img">
@@ -22,13 +15,13 @@
                 <span>{{ userInfo.nickname | ellipsis(3) }}</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,14 +39,9 @@
                 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>
         </div>
@@ -61,53 +49,69 @@
 
       <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> :
+          <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 @click="toOrder(2)">{{ order_total.card_num }}</span>
+          <span class="dataListTitle">次卡数量</span> :
+          <span class="JEcolor" @click="toOrder(2)">{{
+            order_total.card_num
+          }}</span>
         </div>
 
         <div class="myDataList coupon-num">
-          优惠券数量：
-          <span @click="toOrder(4)">{{ userInfo.card_num }}</span>
-        </div>
-
-        <div class="myDataList">
-          储值金额：
-          <span class="JEcolor">
-            ￥
-            <span class="bigSixe">{{ userInfo.amount }}</span>
-            <!-- .00 -->
-          </span>
+          <span class="dataListTitle">优惠券</span> :
+          <span class="JEcolor" @click="toOrder(4)">{{
+            userInfo.card_num
+          }}</span>
         </div>
         <div class="myDataList">
-          积分：
+          <span class="dataListTitle">积分</span> :
           <span>{{ userInfo.coin }}</span>
         </div>
-        <div class="myDataList" @click="remarkPupopVisible = true">
-          备注信息：
-          <span>{{ userInfo.remark | ellipsis(20) }}</span>
+        <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="myDataList">
+          <span class="dataListTitle">测肤时间</span> :
+          <span v-if="userDetail.detection">{{ userDetail.detection.create_time }}</span>
         </div>
       </div>
     </div>
@@ -287,6 +291,19 @@ export default {
       isPupop: false,
       nameInpVisible: false,
       remarkPupopVisible: false,
+      sourceValue: "", //客户来源值
+      sourceList: [
+        " ",
+        "线下进店",
+        "种子用户",
+        "美团/大众",
+        "抖音",
+        "达人探店",
+        "霸王餐",
+        "老带新/转介绍",
+      ], //客户来源下拉选择
+      userDetail: [], //客户管理详情
+      skin_type: ["干性肌肤", "中性肌肤", "油性肌肤", "混合型肌肤"], //肤质 (肤质类型 1-干性肌肤 2-中性肌肤 3-油性肌肤 4-混合型肌肤)
     };
   },
   components: { minePupop },
@@ -301,6 +318,36 @@ export default {
   watch: {},
 
   methods: {
+    // 跳转到测肤记录列表
+    goTestSkin() {
+      this.$router.push({
+        path: "/testSkin",
+        query: {
+          isback: true,
+          id: this.id,
+        },
+      });
+    },
+    // 获取客户管理详情
+    getUserDetail() {
+      api.getUserDetail({ id: this.id }).then((res) => {
+        this.userDetail = res.data;
+        this.sourceValue = this.sourceList[res.data.tag];
+      });
+    },
+    // 选择客户来源
+    selectSource(e) {
+      this.editSign(e);
+    },
+    // 编辑客户管理用户标签
+    editSign(tag) {
+      api
+        .editSign({
+          tag,
+          id: this.id,
+        })
+        .then();
+    },
     getPadUserInfo() {
       api.getPadUserInfo({ id: this.id }).then((res) => {
         console.log(res, "aaaaaaaa");
@@ -377,8 +424,8 @@ export default {
         activeName = "third";
       } else if (index == 2) {
         activeName = "second";
-      }else if(index==4){
-        activeName = 'fourth'
+      } else if (index == 4) {
+        activeName = "fourth";
       }
       this.$router.push({
         path: "/customerMan/projectOrder",
@@ -425,6 +472,8 @@ export default {
   created() {
     let id = this.$route.query.id;
     this.id = id;
+    // 获取客户管理详情
+    this.getUserDetail();
     this.getPadUserInfo();
   },
 
@@ -489,11 +538,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 +579,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 +635,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;
         }

src/pages/historicalOrder/details/index.vue

@@ -2,7 +2,7 @@
   <div class="mine">
     <div class="left">
       <div class="user-info">
-        <div class="user-img"><img :src="userInfo.avatar_url"
+        <div class="user-img" @click="toCustomerManDetail"><img :src="userInfo.avatar_url"
                alt=""></div>
         <div class="user-span">
           <div class="info">
@@ -190,6 +190,15 @@ export default {
   watch: {},
 
   methods: {
+    // 跳转到客户管理详情
+    toCustomerManDetail(){
+      this.$router.push({
+        path:'/customerMan/details',
+        query:{
+          id:this.userInfo.user_id
+        }
+      })
+    },
     getOrderInfo () {
       api.getOrderInfo({ id: this.id }).then(res => {
         this.userInfo = res.data.user;

src/pages/home/detailList/index.vue

@@ -83,14 +83,22 @@
           class="el-icon-plus"
           @click="orderCreate(orderListItem.time)"
           v-if="
-            thisDays > Days? false: thisDays == Days? orderListItem.time.end > nowTime: true
+            thisDays > Days
+              ? false
+              : thisDays == Days
+              ? orderListItem.time.end > nowTime
+              : true
           "
         ></i>
       </div>
     </div>
     <!-- 侧边图标 -->
     <div class="calendar" @click="openCalendar">
-      <i class="el-icon-date"></i>
+      <img
+        src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/%E6%97%A5%E5%8E%86%20%281%29.png"
+        alt=""
+      />
+      <div class="time">{{ thisToday }}</div>
       <span>日历</span>
     </div>
     <div class="setUp" @click="orderCreate">
@@ -154,8 +162,16 @@ export default {
       Days: "", //要查询的日期
       thisDays: "", //当前日期
       isBackToday: false, //是否显示返回今天
+      thisToday: "", //今天的日
     };
   },
+  watch: {
+    Days(newValue, oldValue) {
+      var index = newValue.lastIndexOf("-");
+      let str = newValue.substring(index + 1, newValue.length);
+      this.thisToday = str;
+    },
+  },
   created() {
     this.nowTime = `${new Date().getHours()}:${new Date().getMinutes()}`;
     this.fetchOrderList();
@@ -167,6 +183,7 @@ export default {
     let day = date.getFullYear() + "-" + moth + "-" + date.getDate();
     this.thisDays = day;
     this.Days = day;
+    this.thisToday = date.getDate();
   },
   mounted() {
     if (this.$refs.row) {
@@ -212,17 +229,17 @@ export default {
     },
     // 删除创建订单
     delOrder(id) {
-      api.delOrder(
-        {
+      api
+        .delOrder({
           id,
           type: 1,
-        },
-      ).then(res=>{
+        })
+        .then((res) => {
           this.$message({
             message: "删除成功",
             type: "success",
           });
-      });
+        });
     },
     // 打开日历弹窗
     openCalendar() {
@@ -271,7 +288,7 @@ export default {
       if (e.command == "b") {
         if (e.orderInfo.end) {
           e.orderInfo.isClick = true;
-          e.orderInfo.day = this.Days
+          e.orderInfo.day = this.Days;
           this.toTime = e.orderInfo;
         } else {
           e.orderInfo.isClick = false;
@@ -279,16 +296,18 @@ export default {
         }
         this.orderShow = true;
       } else if (e.command == "a") {
-        api.userOrderDetail({
-          id:e.orderInfo.order_id
-        }).then(res=>{
-        this.$router.push({
-          path: "/customerMan/details",
-          query:{
-            id:res.data[0].user_id
-          }
-        });
-        })
+        api
+          .userOrderDetail({
+            id: e.orderInfo.order_id,
+          })
+          .then((res) => {
+            this.$router.push({
+              path: "/customerMan/details",
+              query: {
+                id: res.data[0].user_id,
+              },
+            });
+          });
       } else {
         this.delOrder(e.orderInfo.order_id);
         this.fetchOrderList();
@@ -434,6 +453,8 @@ export default {
   }
   .calendar {
     top: 102px;
+    display: flex;
+    align-items: center;
     span {
       width: 64px;
       display: inline-block;
@@ -441,6 +462,18 @@ export default {
       text-justify: distribute-all-lines;
       text-align-last: justify;
     }
+    img {
+      width: 20px;
+      height: 20px;
+      margin-left: 15px;
+      margin-right: 15px;
+    }
+    .time {
+      font-size: 8px;
+      position: absolute;
+      left: 20px;
+      top: 3.5px;
+    }
   }
   .setUp {
     top: 154px;

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',
   /**