更新

pageA/payorder.vue

@@ -392,6 +392,13 @@ export default {
       this.calculate1(this.balance1);
     },
     confirm() {
+      if (this.orderType == "bond" && this.bondBalance < this.sum) {
+        uni.showToast({
+          title: "保证金余额不足以缴纳保证金，请先充值保证金。",
+          icon: "none",
+        });
+        return;
+      }
       // console.log(new Date().getTime());
       if (this.orderType == "difference") {
         //补差额

pageD/orderDetail/orderDetail.vue

@@ -206,14 +206,16 @@ export default {
 
     //获取订单详情
     getDetail(id) {
-      uni.$u.http.get(`/api/order/read?id=${id}`).then((res) => {
-        this.orderDetail = res;
-        //直接在dom中使用会报错，首先判断字段存不存在，重新复制后使用
-        if (res.container) {
-          this.transportType = res.container.transport_type.name;
-        }
-        this.title = res.status_name;
-      });
+      uni.$u.http
+        .post(`/api/order/merchant_order_detail`, { id })
+        .then((res) => {
+          this.orderDetail = res;
+          //直接在dom中使用会报错，首先判断字段存不存在，重新复制后使用
+          if (res.container) {
+            this.transportType = res.container.transport_type.name;
+          }
+          this.title = res.status_name;
+        });
     },
 
     //跳转支付

pageD/orderFormManage/component/detailCard.vue

@@ -76,7 +76,10 @@
       </button> -->
       <button
         class="btn-1"
-        v-if="itemInfo.order_goods[0].delivery_status == 'merdelivered'"
+        v-if="
+          itemInfo.status != 'unfill' &&
+          itemInfo.order_goods[0].delivery_status == 'merdelivered'
+        "
         @click.stop="toGoods"
       >
         发货