cr 4 роки тому
батько
коміт
2c9f50f875

+ 10 - 2
src/pages/order/affirm.vue

@@ -342,7 +342,14 @@
342 342
                 :class="{ disable: btnDisable }"
343 343
                 @click="submit"
344 344
             >
345
-                提交订单
345
+                {{
346
+                    (curTab === 2 &&
347
+                    !address.id &&
348
+                    !address.errMsg &&
349
+                    !address.lastAddress)
350
+                        ? "填写地址"
351
+                        : "提交订单"
352
+                }}
346 353
             </div>
347 354
         </div>
348 355
         <o-coupon
@@ -503,7 +510,7 @@ export default {
503 510
             this.$store.commit("common/update", {
504 511
                 addressData: null,
505 512
             });
506
-            if(this.$refs.addressSelect){
513
+            if (this.$refs.addressSelect) {
507 514
                 this.$refs.addressSelect.close();
508 515
             }
509 516
         }
@@ -898,6 +905,7 @@ export default {
898 905
                     !self.address.errMsg &&
899 906
                     !self.address.lastAddress
900 907
                 ) {
908
+                    self.openAddress();
901 909
                     return self.fn.showToast("请填写收货地址");
902 910
                 }
903 911
 

+ 5 - 3
src/pages/order/coupon.vue

@@ -98,10 +98,12 @@
98 98
                 self.api.post('/Coupon/GetAvailableCoupons', {
99 99
                     orderItemIds: self.couponIds,
100 100
                 },{pass:true}).then(res => {
101
-                    self.avalibleList = res.data.avalibleList
102
-                    self.unAvalibaleList = res.data.unAvalibaleList
101
+                    if(res.data){
102
+                        self.avalibleList = res.data.avalibleList
103
+                        self.unAvalibaleList = res.data.unAvalibaleList
103 104
 
104
-                    self.selectAuto()
105
+                        self.selectAuto()
106
+                    }
105 107
                 })
106 108
             },
107 109
 

+ 4 - 8
src/pages/recommend/detail.vue

@@ -529,6 +529,10 @@ export default {
529 529
                         console.log(self.goods);
530 530
                         self.creationShare2();
531 531
                         self.getGoodsList();
532
+                        if(data.skuList && data.skuList.length ===1){
533
+                            self.spec = data.skuList[0];
534
+                            self.spec.active = true;
535
+                        }
532 536
                     } else {
533 537
                         self.fn
534 538
                             .showModal({
@@ -558,14 +562,6 @@ export default {
558 562
                 });
559 563
         },
560 564
 
561
-        // 判断规格,只有一个默认选择
562
-        ifSpec() {
563
-            if (this.goods.skuDetail.skus.length === 1) {
564
-                this.spec = this.goods.skuDetail.skus[0];
565
-                this.goods.skuDetail.props[0].list[0].active = true;
566
-            }
567
-        },
568
-
569 565
         // 修改导航
570 566
         setNav(val) {
571 567
             const self = this;

+ 2 - 2
src/pages/recommend/list.vue

@@ -193,8 +193,8 @@ export default {
193 193
     data() {
194 194
         return {
195 195
             aid: "",
196
-            sort: -1, // 排序
197
-            asc: 1,
196
+            sort: 2, // 排序
197
+            asc: 0,
198 198
             page: 1, // 页码
199 199
             goodsList: [],
200 200
             isHaveMore: true, // 是否有更多数据

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

@@ -279,7 +279,7 @@
279 279
         </div>
280 280
 
281 281
         <div class="web-support">
282
-            <p class="text">0.0.92</p>
282
+            <p class="text">0.0.93</p>
283 283
             <!-- <div class="num" @click="makeCall">400-629-6782</div> -->
284 284
         </div>
285 285
     </div>