bugfix

src/components/accountCompoents/wallet.vue

@@ -19,10 +19,10 @@
         <div @click="paymentType = 1" :class="paymentType === 1 ? 'item item_ac' : 'item'"><img src="../../../static/image/alipay.png" alt="" srcset=""> 支付宝支付</div>
         <div @click="paymentType = 2" :class="paymentType === 2 ? 'item item_ac' : 'item'"><img src="../../../static/image/we-chat.png" alt="" srcset="">微信支付</div>
       </div>
-      <div>
+      <div v-if="memberType!==3">
         <el-checkbox v-model="checked">我已阅读并同意 <span @click="getExplain" class="agreement">《充值协议》</span> </el-checkbox>
       </div>
-      <el-button @click="recharge" class="recharge_color">去充值</el-button>
+      <el-button v-if="memberType!==3" @click="recharge" class="recharge_color">去充值</el-button>
       <!-- <div class="agreement">充值即同意 <span @click="getExplain">《充值协议》</span> </div> -->
     </el-col>
     <!-- 支付二维码 -->
@@ -69,6 +69,7 @@ export default {
       text: "",
       value: "",
       checked: false,
+      memberType: this.$store.state.userInfo.memberType,
     };
   },
   components: {
@@ -145,9 +146,7 @@ export default {
           message: "请先选择支付方式再充值！",
         });
       }
-      let reg = new RegExp(
-        /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/
-      );
+      let reg = new RegExp(/^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/);
       if (!reg.test(Number(params.money))) {
         return this.$message({
           type: "info",
@@ -160,7 +159,7 @@ export default {
           message: "请先勾选同意后再充值！",
         });
       }
-      
+
       recharge(params).then((res) => {
         if (res.code === 200) {
           this.link = res.data.data;

src/components/orderComponents/orderDetail.vue

@@ -60,7 +60,6 @@
       </div>
       <div class="detail_ine"></div>
       <div class="detail_title2">订单信息</div>
-
       <div class="info2 info4" v-if="orderDetail.waimaiOrderId">
         <div class="title">送达时间：</div>
         <div class="cont cont2">{{ !orderDetail.exceptTime ? '立即送达' : orderDetail.exceptTime}}</div>

src/components/orderComponents/orderList.vue

@@ -16,12 +16,13 @@
                 </div>
                 <img :src="item.logo || item.waimaiLogo" class="logo" />
                 <span class="name">{{ item.shopName }}</span>
-                <div class="sign_time" v-if="item.waimaiOrderId && item.takeType == 1">
+                <div class="sign_time" v-if="item.waimaiOrderId && [1,2].includes(item.takeType)">
                   {{ item.exceptTime.slice(5) }}前送达
                 </div>
                 <div class="sign_txt" v-if="item.waimaiOrderId && item.takeType == 0">
                   立即送达
                 </div>
+                <div class="sign_d" v-if="item.buttonStatus === 10">{{item.timeTxt}}自动发起配送</div>
                 <!-- <div class="sign_d">预约 09/10 17:30自动发起配送</div> -->
               </div>
               <!-- 新订单 -->

src/components/orderComponents/sendOrderPopup.vue

@@ -136,7 +136,9 @@
             </div>
           </div>
         </div>
-        <el-button :loading="loading" type="primary" class="submit-btn" @click.stop="payMoney">确定支付</el-button>
+        <div class="btn-wrap">
+          <el-button :loading="loading" type="primary" class="submit-btn" @click.stop="payMoney">确定支付</el-button>
+        </div>
       </div>
     </el-dialog>
     <!-- 支付二维码弹出层 -->
@@ -996,12 +998,17 @@ export default {
     }
   }
 }
-.submit-btn {
-  border: none;
-  background: #fc7200;
-  color: #ffffff;
-  margin-top: 20px;
+.btn-wrap {
+  display: flex;
+  justify-content: flex-end;
+  .submit-btn {
+    border: none;
+    background: #fc7200;
+    color: #ffffff;
+    margin-top: 20px;
+  }
 }
+
 .choose-coupon {
   display: flex;
   justify-content: space-between;

src/components/shopCompoents/bindDelivery.vue

@@ -7,7 +7,7 @@
             <img :src="v.logo" alt="" class="top-left-img" />
             <div class="name">{{ v.name }}</div>
           </div>
-          <div v-if="v.bindStatus === 1" class="top-right">
+          <div v-if="v.bindStatus === 1 && memberType === 2" class="top-right">
             <span>开启后首选该账号平台为配送平台</span>
             <el-switch @change="statusDelivery(v)" v-model="v.preferredDelivery" :active-value="1" :inactive-value="0" />
           </div>
@@ -23,7 +23,7 @@
             </div>
           </div>
           <!-- 1->绑定，0：未绑定，2-> 审核中，3->拒绝，4->待完善资料 -->
-          <div class="right">
+          <div class="right" v-if="memberType === 2">
             <span class="reason">{{
               v.bindStatus === 2 ? "审核中" : v.bindStatus === 3 ? `已拒绝` : ""
             }}</span>
@@ -119,6 +119,7 @@ export default {
         deliveryId: "",
         shopNo: "",
       },
+      memberType: this.$store.state.userInfo.memberType
     };
   },
   watch: {
@@ -315,6 +316,7 @@ export default {
             type: "success",
             message: "已成功解除绑定！",
           });
+          this.centerDialogVisible = false;
           this.getDeliveryList();
         } else {
           this.$message({
@@ -322,7 +324,6 @@ export default {
             message: res.msg,
           });
         }
-        this.centerDialogVisible = true;
       });
     },
     releaseSF(v) {
@@ -331,15 +332,15 @@ export default {
         cancelButtonText: "取消",
         center: true,
       }).then(({ value }) => {
-        console.log(111, value);
-        if (!value) {
-          return this.$message({
+        if (!value || v.thirdShopId !== value) {
+          this.$message({
             type: "error",
-            message: "请输入正确的顺丰同城ID",
+            message: "请输入已绑定的顺丰同城ID",
           });
+        } else {
+          v.sfId = value;
+          this.confirmRelease(v);
         }
-        v.sfId = value;
-        this.confirmRelease(v);
       });
     },
     unBindDelivery(v) {