Funny 3 years ago
parent
commit
1ac3f6138d
2 changed files with 31 additions and 12 deletions
  1. 30 11
      src/components/manualCreate.vue
  2. 1 1
      src/components/orderComponents/orderList.vue

+ 30 - 11
src/components/manualCreate.vue

@@ -159,7 +159,6 @@ export default {
   data() {
     return {
       products: [],
-      sendType: this.$store.state.userInfo.memberType === 1 ? 0 : 1, // 0是个人地址发单 1是门店地址发单
       addressType: 1,
       name: "",
       form: {
@@ -216,7 +215,6 @@ export default {
           );
         },
       },
-      memberType: this.$store.state.userInfo.memberType,
       min: 15,
       showAddress: false,
       personalSendAddressId: "",
@@ -229,7 +227,16 @@ export default {
     addressManagement,
   },
   // 监听属性 类似于data概念
-  computed: {},
+  computed: {
+    // sendType: this.$store.state.userInfo.memberType === 1 ? 0 : 1, // 0是个人地址发单 1是门店地址发单
+    sendType() {
+      return this.$store.state.userInfo.memberType === 1 ? 0 : 1;
+    },
+    // memberType: this.$store.state.userInfo.memberType,
+    memberType() {
+      return this.$store.state.userInfo.memberType;
+    },
+  },
   // 监控data中的数据变化
   watch: {
     sendType: {
@@ -492,20 +499,32 @@ export default {
           if (res.code === 200) {
             let amount = res.data.amount;
             if (amount < 100) {
-              this.$confirm("您的账户余额小于100元,请及时充值!", "提示", {
-                confirmButtonText: "去充值",
-                cancelButtonText: "知道了!",
-                center: true,
-                type: "warning",
-              })
+              this.$confirm(
+                "您的账户余额不足100元,可能会导致预约发单失败,请及时充值!",
+                "提示",
+                {
+                  confirmButtonText: "去充值",
+                  cancelButtonText: "知道了!",
+                  distinguishCancelAndClose: true,
+                  center: true,
+                  type: "warning",
+                }
+              )
                 .then(() => {
                   this.$router.push({
                     path: "/shopInfo/shopAccount",
                   });
                 })
-                .catch(() => {
-                  this.saveOrder();
+                .catch((action) => {
+                  console.log("action:", action);
+                  if (action === "close") {
+                    return;
+                  } else {
+                    this.saveOrder();
+                  }
                 });
+            } else {
+              this.saveOrder();
             }
           } else {
             this.$message({

+ 1 - 1
src/components/orderComponents/orderList.vue

@@ -159,7 +159,7 @@
             <div class="order_item_cont">
               <div class="content">
                 {{ item.receiptContactName
-                }}<span>{{ item.receiptPhone }}</span>
+                }}<span>{{ item.receiptPhone }}{{orderDetail.receiptExtension ? "_" + orderDetail.receiptExtension : ""}}</span>
               </div>
               <div class="address">
                 <!-- {{ item.receiptProvinceName }}