跳转优化&7修复优惠券到期时间

src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app">
     <keep-alive>
-      <router-view v-if="$route.meta.keepAlive"></router-view>
+      <router-view v-if="$route.meta.keepAlive" :key="$route.fullpath"></router-view>
     </keep-alive>
     <router-view v-if="!$route.meta.keepAlive"></router-view>
   </div>

src/components/common/layout/layout.vue

@@ -162,7 +162,10 @@
               >
                 <div class="content" v-html="item.msg"></div>
                 <!-- 是否已读0未读 1已读 -->
-                <div class="time">{{ item.create_time }} <div v-if="item.is_read==0" class="icon"></div> </div>
+                <div class="time">
+                  {{ item.create_time }}
+                  <div v-if="item.is_read == 0" class="icon"></div>
+                </div>
               </div>
             </van-list>
           </el-tab-pane>
@@ -291,10 +294,10 @@ import api from "@/server/home";
 export default {
   data() {
     return {
+      isback:false,
       isFold: false, //导航菜单面板是否折叠
       userId: 0,
       menuIndex: 0,
-      isback: false,
       userInfo: {
         name: "333",
       },
@@ -326,7 +329,7 @@ export default {
       successUnread: true,
       cancelUnread: true,
       allUnread: true,
-      cosmetMessageShow:false,//消息弹窗开关
+      cosmetMessageShow: false, //消息弹窗开关
       activeName: "first", //默认选中消息模块
       cosmetMessageList: [], //后台发送美容师的消息列表
       cosmetMessageLoading: false, //后台发送美容师的消息加载
@@ -381,13 +384,10 @@ export default {
       await this.queryHasUnreadMessage();
     }, 20000);
   },
-  mounted() {
-    if (
-      this.$route.path == "/payUser/details" ||
-      this.$route.path == "/testSkin/details"
-    ) {
-      this.isback = true;
-    }
+  mounted () {
+      if(this.$route.path=='/payUser/details'||this.$route.path=='/testSkin/details'||this.$route.path=='/customerMan/details'){
+        this.isback=true
+      }
   },
   beforeDestroy() {
     // 关闭WebSocket连接并清除定时器
@@ -405,7 +405,7 @@ export default {
     onAppMessage() {
       this.msgPanelList = [];
       this.mainPanelMessagePage = 1;
-      this.cosmetMessagePage=1
+      this.cosmetMessagePage = 1;
       this.mainPanelMsgListLoading = false;
       this.mainPanelMsgListFinished = false;
       this.getMainPanelMessageList(1);
@@ -531,12 +531,12 @@ export default {
     // 切换消息标题获取消息列表
     handleClick(tab) {
       if (tab.name == "second") {
-        this.cosmetMessageList = []
-        this.cosmetMessagePage=1
+        this.cosmetMessageList = [];
+        this.cosmetMessagePage = 1;
         this.getCosmetMessageList();
       } else {
-        this.msgPanelList = []
-        this.cosmetMessagePage=1
+        this.msgPanelList = [];
+        this.cosmetMessagePage = 1;
         this.getMainPanelMessageList();
       }
     },
@@ -555,7 +555,7 @@ export default {
           if (this.cosmetMessagePage == 1) {
             list = [];
           }
-          list = [...list,...res.data.list];
+          list = [...list, ...res.data.list];
           this.cosmetMessageList = list;
           ++this.cosmetMessagePage;
           this.cosmetMessageLoading = false;
@@ -609,7 +609,7 @@ export default {
     backMsgPanel() {
       this.msgSuccessDetailPupopVisible = false;
       this.msgCancelDetailPupopVisible = false;
-      this.mainPanelMessagePage=1
+      this.mainPanelMessagePage = 1;
       this.getMainPanelMessageList();
       // this.msgPupopVisible = true;
       this.cosmetMessageShow = true;
@@ -1013,7 +1013,7 @@ export default {
     align-items: center;
     color: #999999;
     position: absolute;
-    top: 10px;
+    top: 20px;
     right: 300px;
     z-index: 999;
     img {
@@ -1105,7 +1105,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: flex-end;
-        .icon{
+        .icon {
           width: 6px;
           height: 6px;
           background-color: #e54635;

src/components/common/layout/leftMenu.vue

@@ -88,7 +88,6 @@ export default {
         {
           name: "订单中心",
           path: "/orderCenter",
-          // /orderCenter
           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",
@@ -122,7 +121,7 @@ export default {
         },
         {
           name: "店铺排班",
-          path: "/scheduling/details",
+          path: "/schedulingDetail",
           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",
@@ -133,9 +132,9 @@ export default {
   },
   watch: {
     $route(to, from) {
-      console.log(to, "tootototo");
+      // console.log(to, "tootototo");
       let patname = `/${to.path.split("/")[1]}`;
-      console.log(window.location, "window.location.pathname", to);
+      // console.log(window.location, "window.location.pathname", to);
       this.$emit("changeIsBack", to.meta.isback);
       this.menu.forEach((item, index) => {
         if (patname == item.path) {
@@ -151,7 +150,7 @@ export default {
   },
   mounted() {
     let patname = `/${window.location.hash.substr(1).split("/")[1]}`;
-    console.log(window.location, "window.location.pathname", patname);
+    // console.log(window.location, "window.location.pathname", patname);
     this.menu.forEach((item, index) => {
       if (patname == item.path) {
         this.nowIndex = index;

src/pages/cardOrder/index.vue

@@ -27,7 +27,7 @@
       >
         <el-table-column label="头像" width="120">
           <template slot-scope="scope">
-            <div class="head-img">
+            <div @click.stop="goUserDetail(scope.row)" class="head-img">
               <img :src="scope.row.avatar_url" alt />
             </div>
           </template>
@@ -187,6 +187,15 @@ export default {
   watch: {},
 
   methods: {
+    // 跳入用户详情
+    goUserDetail(e) {
+      this.$router.push({
+        path: "/customerMan/details",
+        query: {
+          id: e.user_id,
+        },
+      });
+    },
     // 分配美容师
     selectType(type, index) {
       // 给表单添加美容师
@@ -256,7 +265,6 @@ export default {
       api.getStaffList().then((res) => {
         if (res.code == 200) {
           this.nameList = res.data;
-          console.log(res);
         }
       });
     },

src/pages/coupon/index.vue

@@ -112,7 +112,6 @@ export default {
   methods: {
     // 发券中心点击用户跳转到用户详情
     goDetail(row, column, event) {
-      console.log(1);
       this.$router.push({
         path: "/customerMan/details",
         query: {
@@ -176,7 +175,6 @@ export default {
       api.getCouponInfo(params).then((res) => {
         if (res.code == 200) {
           this.couponList = res.data.list;
-          console.log(res.data.list);
         }
       });
     },

src/pages/customerMan/myOrder/index.vue

@@ -247,7 +247,7 @@ type: "全额券" -->
                 show-overflow-tooltip
               ></el-table-column>
               <el-table-column
-                prop="create_time"
+                prop="ex_time"
                 label="到期时间"
                 width="180"
                 show-overflow-tooltip

src/pages/historicalOrder/index.vue

@@ -44,7 +44,12 @@
         <el-table-column
           prop="user_id"
           label="用户ID"
-          width="120"
+          width="80"
+        ></el-table-column>
+        <el-table-column
+          prop="real_name"
+          label="真实姓名"
+          width="100"
         ></el-table-column>
         <el-table-column
           prop="nickname"
@@ -189,7 +194,7 @@ export default {
   watch: {},
 
   methods: {
-        // 跳入用户详情
+    // 跳入用户详情
     goUserDetail(e) {
       console.log(e);
       this.$router.push({

src/pages/orderCenter/orderCenter.vue

@@ -1,27 +1,27 @@
 <template>
   <div class="box">
-    <div class="orderForm" @click="$router.push('/historicalOrder')">
+    <div class="orderForm" @click="$router.push('/orderCenter/historicalOrder')">
       <img
         src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E7%BE%8E%E5%A6%86%E4%BA%A7%E5%93%81%402x%281%29.png"
         alt=""
       />
       <div class="title">订单项目</div>
     </div>
-        <div class="orderForm" @click="$router.push('/cardOrder')">
+        <div class="orderForm" @click="$router.push('/orderCenter/cardOrder')">
       <img
         src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E5%8D%A1%402x.png"
         alt=""
       />
       <div class="title">次卡订单</div>
     </div>
-        <div class="orderForm" @click="$router.push('/productOrder')">
+        <div class="orderForm" @click="$router.push('/orderCenter/productOrder')">
       <img
         src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E7%BE%8E%E5%A6%86%E4%BA%A7%E5%93%81%402x.png"
         alt=""
       />
       <div class="title">美妆产品订单</div>
     </div>
-        <div class="orderForm" @click="$router.push('/rechargeOrder')">
+        <div class="orderForm" @click="$router.push('/orderCenter/rechargeOrder')">
       <img
         src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E5%85%85%E5%80%BC%20%281%29%402x.png"
         alt=""

src/pages/payUser/details/index.vue

@@ -430,7 +430,6 @@ export default {
     },
     getPadUserInfo() {
       api.getPadUserInfo({ id: this.id }).then((res) => {
-        console.log(res, "aaaaaaaa");
         // 将用户手机号中间四位变成****
         res.data.user.mobile =
           res.data.user.mobile.substring(0, 3) +
@@ -510,7 +509,7 @@ export default {
         activeName = "five";
       }
       this.$router.push({
-        path: "/customerMan/projectOrder",
+        path: "/payUser/Order",
         query: {
           id: this.id,
           activeName: activeName,
@@ -523,6 +522,7 @@ export default {
         path: "/testSkin/details",
         query: {
           id: this.userInfo.analysis_id,
+          isback:true
         },
       });
     },

src/pages/payUser/index.vue

@@ -194,7 +194,6 @@ export default {
           });
           this.tableData = res.data.list;
           this.total = res.data.total;
-          console.log(this.tableData);
         }
       });
     },

src/pages/payUser/myOrder/index.vue

@@ -580,7 +580,6 @@ export default {
       };
       let resp = await api.getCardList(params);
       if (resp.code === 200) {
-        console.log(resp, "asdasdasd");
         this.cardListData = resp.data.list;
         this.total = resp.data.total;
       }
@@ -594,7 +593,6 @@ export default {
       };
       let resp = await api.getBalanceRecord(params);
       if (resp.code === 200) {
-        console.log(resp, "asdasdasd");
         this.balanceListData = resp.data.list;
         this.total = resp.data.count;
       }

src/pages/rechargeOrder/index.vue

@@ -100,11 +100,12 @@
           prop=""
           label="分配"
           show-overflow-tooltip
-          v-if='level==10'
+          v-if="level == 10"
         >
           <template slot-scope="scope">
             <el-dropdown
-              @command="(command) => selectType(command, scope.$index)" trigger='click'
+              @command="(command) => selectType(command, scope.$index)"
+              trigger="click"
             >
               <el-button @click.stop type="primary" class="amend" size="mini">
                 分配
@@ -149,7 +150,7 @@ export default {
       total: 0,
       product: "",
       coupon: "",
-      level:'', //等级权限
+      level: "", //等级权限
       couponList: [
         {
           value: "选项1",
@@ -187,11 +188,11 @@ export default {
   watch: {},
 
   methods: {
-            // 跳入用户详情
+    // 跳入用户详情
     goUserDetail(e) {
       console.log(e);
       this.$router.push({
-        path: "/customerMan/details",
+        path: "/payUser/Details",
         query: {
           id: e.user_id,
         },

src/router/map/home.js

@@ -89,14 +89,22 @@ export default {
   },
   {
     path: '/payUser/Details',
+    meta: {
+      isback: true,
+      keepAlive: true
+    },
     component: payUserDetails,
   },
   {
     path: '/payUser/Order',
+    meta: {
+      isback: true,
+      keepAlive: true
+    },
     component: payUserOrder,
   },
   {
-    path: '/historicalOrder',
+    path: '/orderCenter/historicalOrder',
     meta: {
       isback: true,
     },
@@ -141,18 +149,15 @@ export default {
     component: scheduling,
   },
   {
-    path: '/scheduling/details',
+    path: '/schedulingDetail',
     component: schedulingDetails,
-    meta: {
-      isback: true,
-    },
   },
   {
     path: '/orderCenter',
     component: orderCenter
   },
   {
-    path: '/productOrder',
+    path: '/orderCenter/productOrder',
     component: productOrder,
     meta: {
       isback: true,
@@ -166,7 +171,7 @@ export default {
     },
   },
   {
-    path: '/cardOrder',
+    path: '/orderCenter/cardOrder',
     component: cardOrder,
     meta: {
       isback: true,
@@ -180,7 +185,7 @@ export default {
     },
   },
   {
-    path: '/rechargeOrder',
+    path: '/orderCenter/rechargeOrder',
     component: rechargeOrder,
     meta: {
       isback: true,

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