cr před 4 roky
rodič
revize
45f76d75bb

+ 2 - 2
src/pages/coupon/detail.vue

@@ -328,7 +328,7 @@ export default {
328 328
             if (this.couponData.isCurrency) {
329 329
                 // 全店可用 跳转首页
330 330
                 uni.switchTab({
331
-                    url: "/pages/index/index",
331
+                    url: "/pages/goods/index",
332 332
                 });
333 333
             } else {
334 334
                 // 部分可用
@@ -344,7 +344,7 @@ export default {
344 344
         // 进店逛逛,(去首页)
345 345
         goHome() {
346 346
             uni.switchTab({
347
-                url: "/pages/index/index",
347
+                url: "/pages/goods/index",
348 348
             });
349 349
         },
350 350
 

+ 1 - 1
src/pages/coupon/index.vue

@@ -222,7 +222,7 @@ export default {
222 222
             if (val.isCurrency) {
223 223
                 // 全店可用 跳转首页
224 224
                 uni.switchTab({
225
-                    url: "/pages/index/index",
225
+                    url: "/pages/goods/index",
226 226
                 });
227 227
             } else {
228 228
                 this.router.push({

+ 13 - 3
src/pages/goods/detail.vue

@@ -307,7 +307,7 @@
307 307
         <!--<div class="back" @click="jump({isTabBer: true, path: '/pages/index/index'})">返回首页</div>-->
308 308
         <div class="navigation" :class="{ 'navigation--iphoneX': iphoneX }">
309 309
             <ul class="navigation__list">
310
-                <button class="button" open-type="contact">
310
+                <button class="button" @clixk="kefuTel">
311 311
                     <li class="navigation__item">
312 312
                         <i class="iconfont iconkefu navigation__icon"></i>
313 313
                         <div class="navigation__text">找客服</div>
@@ -316,7 +316,7 @@
316 316
                 <li
317 317
                     class="navigation__item"
318 318
                     @click="
319
-                        jump({ isTabBer: true, path: '/pages/index/index' })
319
+                        jump({ isTabBer: true, path: '/pages/goods/index' })
320 320
                     "
321 321
                 >
322 322
                     <i class="iconfont icondianpu navigation__icon"></i>
@@ -490,7 +490,7 @@ export default {
490 490
         } else {
491 491
             title += " [" + self.goods.priceInfo.nowPrice / 100 + "元]";
492 492
         }
493
-        console.log(obj)
493
+        console.log(obj);
494 494
         return {
495 495
             title: title,
496 496
             path: self.router.getPath(self.$mp.page.route, obj),
@@ -1240,6 +1240,16 @@ export default {
1240 1240
                 }
1241 1241
             }
1242 1242
         },
1243
+
1244
+        kefuTel() {
1245
+            if (this.activeShop.managerTelephone) {
1246
+                uni.makePhoneCall({
1247
+                    phoneNumber: this.activeShop.managerTelephone,
1248
+                });
1249
+            }else{
1250
+                this.fn.showToast('当前店铺未设置客服手机号');
1251
+            }
1252
+        },
1243 1253
     },
1244 1254
 
1245 1255
     // 数据计算

+ 1 - 1
src/pages/order/detail.vue

@@ -334,7 +334,7 @@
334 334
         </div>
335 335
         <div
336 336
             class="back"
337
-            @click="jump({ isTabBer: true, path: '/pages/index/index' })"
337
+            @click="jump({ isTabBer: true, path: '/pages/goods/index' })"
338 338
         >
339 339
             返回首页
340 340
         </div>

+ 6 - 5
src/pages/order/index.vue

@@ -317,7 +317,8 @@ export default {
317 317
 
318 318
                     self.list[1].num = data.countInfo.unpaidOrderCount
319 319
                     self.list[2].num = data.countInfo.waitShippedOrderCount
320
-                    self.list[3].num = data.countInfo.waitReceivedOrderCount
320
+                    self.list[3].num = data.countInfo.inDeliveryOrderCount
321
+                    self.list[4].num = data.countInfo.waitReceivedOrderCount
321 322
                     self.list[self.tab].list = data.orderList;
322 323
                     self.list = [...self.list];
323 324
                     self.loading = true;
@@ -341,10 +342,10 @@ export default {
341 342
                     if (data.orderList.length) {
342 343
                         self.list[self.tab].page++;
343 344
                     }
344
-
345
-                    self.list[1].num = data.countInfo.unpaidOrderCount;
346
-                    self.list[2].num = data.countInfo.waitShippedOrderCount;
347
-                    self.list[3].num = data.countInfo.waitReceivedOrderCount;
345
+                    self.list[1].num = data.countInfo.unpaidOrderCount
346
+                    self.list[2].num = data.countInfo.waitShippedOrderCount
347
+                    self.list[3].num = data.countInfo.inDeliveryOrderCount
348
+                    self.list[4].num = data.countInfo.waitReceivedOrderCount
348 349
                     self.list[self.tab].list = self.list[self.tab].list.concat(
349 350
                         data.orderList
350 351
                     );

+ 1 - 1
src/pages/pay/result.vue

@@ -13,7 +13,7 @@
13 13
                     class="pay__btn"
14 14
                     v-if="type === 'success'"
15 15
                     @click="
16
-                        jump({ isTabBer: true, path: '/pages/index/index' })
16
+                        jump({ isTabBer: true, path: '/pages/goods/index' })
17 17
                     "
18 18
                 >
19 19
                     去逛首页

+ 12 - 2
src/pages/recommend/detail.vue

@@ -144,7 +144,7 @@
144 144
         <!--<div class="back" @click="jump({isTabBer: true, path: '/pages/index/index'})">返回首页</div>-->
145 145
         <div class="navigation" :class="{ 'navigation--iphoneX': iphoneX }">
146 146
             <ul class="navigation__list">
147
-                <button class="button" open-type="contact">
147
+                <button class="button" @click="kefuTel">
148 148
                     <li class="navigation__item">
149 149
                         <i class="iconfont iconkefu navigation__icon"></i>
150 150
                         <div class="navigation__text">找客服</div>
@@ -153,7 +153,7 @@
153 153
                 <li
154 154
                     class="navigation__item"
155 155
                     @click="
156
-                        jump({ isTabBer: true, path: '/pages/index/index' })
156
+                        jump({ isTabBer: true, path: '/pages/goods/index' })
157 157
                     "
158 158
                 >
159 159
                     <i class="iconfont icondianpu navigation__icon"></i>
@@ -537,6 +537,16 @@ export default {
537 537
                 }
538 538
             }
539 539
         },
540
+
541
+        kefuTel() {
542
+            if (this.activeShop.managerTelephone) {
543
+                uni.makePhoneCall({
544
+                    phoneNumber: this.activeShop.managerTelephone,
545
+                });
546
+            }else{
547
+                this.fn.showToast('当前店铺未设置客服手机号');
548
+            }
549
+        },
540 550
     },
541 551
 
542 552
     // 数据计算

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

@@ -224,7 +224,7 @@
224 224
                         class="tool__icon"
225 225
                         :src="'/static/user/tool2.png'"
226 226
                     ></my-image>
227
-                    <button class="button" open-type="contact">
227
+                    <button class="button" @click="kefuTel">
228 228
                         <div class="tool__text">联系客服</div>
229 229
                     </button>
230 230
                 </li>
@@ -366,6 +366,16 @@ export default {
366 366
                 phoneNumber: "4006296782",
367 367
             });
368 368
         },
369
+
370
+        kefuTel() {
371
+            if (this.activeShop.managerTelephone) {
372
+                uni.makePhoneCall({
373
+                    phoneNumber: this.activeShop.managerTelephone,
374
+                });
375
+            }else{
376
+                this.fn.showToast('当前店铺未设置客服手机号');
377
+            }
378
+        },
369 379
     },
370 380
     onShareAppMessage() {
371 381
         let url = `/pages/goods/index?shopId=${this.activeShop.id}`;