Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp

pages/order/fillorder.vue

@@ -664,7 +664,7 @@ export default {
         this.$store.state.canUseCoupons = res.data.result.canUseCoupons;
         this.$store.state.cantUseCoupons = res.data.result.cantUseCoupons;
 
-        if (!res.data.result.memberAddress.id) {
+        if (!res.data.result.memberAddress) {
           // 获取会员默认地址
           this.getUserAddress();
         } else {

pages/order/myOrder.vue

@@ -297,6 +297,9 @@ export default {
         {
           orderStatus: "CANCELLED", //已取消
         },
+        {
+          orderStatus: "STAY_PICKED_UP", //待自提
+        },
       ],
       cancelShow: false, //是否显示取消
       orderSn: "", //ordersn

pages/order/orderDetail.vue

@@ -21,7 +21,7 @@
 
       <view class="logistics-List" v-else>
         <view class="verificationCode" v-if="order.verificationCode">
-          券码： {{ order.verificationCode }}
+          券码： {{ order.orderStatus == 'CANCELLED' ?  '已失效' : order.verificationCode }}
         </view>
         <view v-else class="logistics-List-title">
           {{ '暂无物流信息' }}

utils/filters.js

@@ -499,6 +499,7 @@ export function orderStatusList (val) {
     COMPLETED: "已完成",
     COMPLETE: "已完成",
     TAKE: "待核验",
+    STAY_PICKED_UP: "待自提",
   };
   return orderStatusList[val];
 }