yuhao 2 years ago
parent
commit
10c2104046

File diff suppressed because it is too large
+ 581 - 298
src/components/common/layout/layout.vue


+ 7 - 1
src/pages/confirmOrder/details/index.vue

@@ -581,6 +581,7 @@ export default {
581
         },
581
         },
582
       ],
582
       ],
583
       //优惠券类型
583
       //优惠券类型
584
+      // 优惠券平台,0本地(用户券:默认),1美团券,2抖音券,3联联
584
       couponTatleList: [
585
       couponTatleList: [
585
         {
586
         {
586
           id: 0,
587
           id: 0,
@@ -597,6 +598,11 @@ export default {
597
           name: '抖音券',
598
           name: '抖音券',
598
           display: false
599
           display: false
599
         },
600
         },
601
+        {
602
+          id: 3,
603
+          name: '联联',
604
+          display: false
605
+        },
600
       ],
606
       ],
601
       platform: 0,
607
       platform: 0,
602
       timesInfo: '',
608
       timesInfo: '',
@@ -1132,7 +1138,7 @@ export default {
1132
         this.isCoupun = true
1138
         this.isCoupun = true
1133
         return
1139
         return
1134
       }
1140
       }
1135
-      // platform 优惠券平台,0本地(用户券:默认),1美团券,2抖音券
1141
+      // platform 优惠券平台,0本地(用户券:默认),1美团券,2抖音券,3联联
1136
       let params = {
1142
       let params = {
1137
         id: this.id,
1143
         id: this.id,
1138
         page: this.page,
1144
         page: this.page,

+ 11 - 1
src/pages/historicalOrder/index.vue

@@ -36,7 +36,7 @@
36
       >
36
       >
37
         <el-table-column label="头像" width="120">
37
         <el-table-column label="头像" width="120">
38
           <template slot-scope="scope">
38
           <template slot-scope="scope">
39
-            <div class="head-img">
39
+            <div @click.stop="goUserDetail(scope.row)" class="head-img">
40
               <img :src="scope.row.avatar_url" alt />
40
               <img :src="scope.row.avatar_url" alt />
41
             </div>
41
             </div>
42
           </template>
42
           </template>
@@ -189,6 +189,16 @@ export default {
189
   watch: {},
189
   watch: {},
190
 
190
 
191
   methods: {
191
   methods: {
192
+        // 跳入用户详情
193
+    goUserDetail(e) {
194
+      console.log(e);
195
+      this.$router.push({
196
+        path: "/customerMan/details",
197
+        query: {
198
+          id: e.user_id,
199
+        },
200
+      });
201
+    },
192
     // 分配美容师
202
     // 分配美容师
193
     selectType(type, index) {
203
     selectType(type, index) {
194
       // 给表单添加美容师
204
       // 给表单添加美容师

+ 11 - 1
src/pages/home/index.vue

@@ -27,7 +27,7 @@
27
                :key="index"
27
                :key="index"
28
                @click="toOrderDetails(item)"
28
                @click="toOrderDetails(item)"
29
                :style="index==orderList.length-1?'border-bottom:0px':''">
29
                :style="index==orderList.length-1?'border-bottom:0px':''">
30
-            <div class="head-img">
30
+            <div @click.stop="goUserDetail(item)" class="head-img">
31
               <div class="new"
31
               <div class="new"
32
                    v-if="item.is_new==1">新</div><img :src="item.avatar_url"
32
                    v-if="item.is_new==1">新</div><img :src="item.avatar_url"
33
                    alt="">
33
                    alt="">
@@ -106,6 +106,16 @@ export default {
106
     // this.getToday()
106
     // this.getToday()
107
   },
107
   },
108
   methods: {
108
   methods: {
109
+    // 跳入用户详情
110
+    goUserDetail(e){
111
+      console.log(e);
112
+      this.$router.push({
113
+        path:"/customerMan/details",
114
+        query:{
115
+          id:e.user_id
116
+        }
117
+      })
118
+    },
109
     getTotal () {
119
     getTotal () {
110
       api.getTotal().then(res => {
120
       api.getTotal().then(res => {
111
         if (res.code == 200) {
121
         if (res.code == 200) {

+ 12 - 2
src/pages/productOrder/index.vue

@@ -25,9 +25,9 @@
25
         style="width: 100%; border-radius: 8px"
25
         style="width: 100%; border-radius: 8px"
26
         @row-click="handleSelectionChange"
26
         @row-click="handleSelectionChange"
27
       >
27
       >
28
-        <el-table-column label="头像" width="120">
28
+        <el-table-column  label="头像" width="120">
29
           <template slot-scope="scope">
29
           <template slot-scope="scope">
30
-            <div class="head-img">
30
+            <div @click.stop="goUserDetail(scope.row)" class="head-img">
31
               <img :src="scope.row.avatar_url" alt />
31
               <img :src="scope.row.avatar_url" alt />
32
             </div>
32
             </div>
33
           </template>
33
           </template>
@@ -180,6 +180,16 @@ export default {
180
   watch: {},
180
   watch: {},
181
 
181
 
182
   methods: {
182
   methods: {
183
+            // 跳入用户详情
184
+    goUserDetail(e) {
185
+      console.log(e);
186
+      this.$router.push({
187
+        path: "/customerMan/details",
188
+        query: {
189
+          id: e.user_id,
190
+        },
191
+      });
192
+    },
183
     // 分配美容师
193
     // 分配美容师
184
     selectType(type, index) {
194
     selectType(type, index) {
185
       // 给表单添加美容师
195
       // 给表单添加美容师

+ 11 - 1
src/pages/rechargeOrder/index.vue

@@ -26,7 +26,7 @@
26
       >
26
       >
27
         <el-table-column label="头像" width="120">
27
         <el-table-column label="头像" width="120">
28
           <template slot-scope="scope">
28
           <template slot-scope="scope">
29
-            <div class="head-img">
29
+            <div @click.stop="goUserDetail(scope.row)" class="head-img">
30
               <img :src="scope.row.avatar_url" alt />
30
               <img :src="scope.row.avatar_url" alt />
31
             </div>
31
             </div>
32
           </template>
32
           </template>
@@ -187,6 +187,16 @@ export default {
187
   watch: {},
187
   watch: {},
188
 
188
 
189
   methods: {
189
   methods: {
190
+            // 跳入用户详情
191
+    goUserDetail(e) {
192
+      console.log(e);
193
+      this.$router.push({
194
+        path: "/customerMan/details",
195
+        query: {
196
+          id: e.user_id,
197
+        },
198
+      });
199
+    },
190
     // 分配美容师
200
     // 分配美容师
191
     selectType(type, index) {
201
     selectType(type, index) {
192
       // 给表单添加美容师
202
       // 给表单添加美容师

+ 13 - 1
src/pages/testSkin/index.vue

@@ -32,7 +32,9 @@
32
           :key="index"
32
           :key="index"
33
           @click="onDetails(item.id)"
33
           @click="onDetails(item.id)"
34
         >
34
         >
35
-          <div class="head-img"><img :src="item.avatar_url" alt="" /></div>
35
+          <div @click.stop="goUserDetail(item)" class="head-img">
36
+            <img :src="item.avatar_url" alt="" />
37
+          </div>
36
           <div class="head-name">{{ item.nickname }}</div>
38
           <div class="head-name">{{ item.nickname }}</div>
37
           <div class="head-phone">{{ item.mobile }}</div>
39
           <div class="head-phone">{{ item.mobile }}</div>
38
           <div class="head-ts">{{ item.check_time }}</div>
40
           <div class="head-ts">{{ item.check_time }}</div>
@@ -76,6 +78,16 @@ export default {
76
   watch: {},
78
   watch: {},
77
 
79
 
78
   methods: {
80
   methods: {
81
+    // 跳入用户详情
82
+    goUserDetail(e) {
83
+      console.log(e);
84
+      this.$router.push({
85
+        path: "/customerMan/details",
86
+        query: {
87
+          id: e.user_id,
88
+        },
89
+      });
90
+    },
79
     getSkinList() {
91
     getSkinList() {
80
       let start_date = "",
92
       let start_date = "",
81
         end_date = "";
93
         end_date = "";

+ 4 - 1
src/router/index.js

@@ -5,7 +5,10 @@ import home from './map/home'
5
 import login from "./map/login";
5
 import login from "./map/login";
6
 
6
 
7
 Vue.use(Router)
7
 Vue.use(Router)
8
-
8
+const originalPush = Router.prototype.push
9
+Router.prototype.push = function push(location) {
10
+   return originalPush.call(this, location).catch(err => err)
11
+}
9
 export default  new Router({
12
 export default  new Router({
10
   mode: 'hash',
13
   mode: 'hash',
11
   base: process.env.BASE_URL,
14
   base: process.env.BASE_URL,

+ 4 - 0
src/server/home.js

@@ -289,4 +289,8 @@ export default class Home {
289
   static getGoodsOrderList(params) {
289
   static getGoodsOrderList(params) {
290
     return $http.get(url.getGoodsOrderList, params)
290
     return $http.get(url.getGoodsOrderList, params)
291
   }
291
   }
292
+  // 后台发送美容师的消息
293
+  static getCosmetMessageList(params) {
294
+    return $http.get(url.getCosmetMessageList, params)
295
+  }
292
 }
296
 }

+ 3 - 0
src/server/urls.js

@@ -186,4 +186,7 @@ export default {
186
 
186
 
187
   //美妆产品订单列表
187
   //美妆产品订单列表
188
   getGoodsOrderList: '/v2/pad/list/goods',
188
   getGoodsOrderList: '/v2/pad/list/goods',
189
+
190
+  // 后台发送美容师的消息
191
+  getCosmetMessageList:"/v2/pad/message/message_list",
189
 }
192
 }