bugfix

src/components/orderComponents/orderDetail.vue

@@ -112,8 +112,8 @@
       <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>
+        <div class="title">期望送达时间：</div>
+        <div class="cont cont2">{{ exceptTimeFn()}}</div>
       </div>
       <div class="info2 info4" v-if="orderDetail.deliveryTime && buttonStatus === 10 && !orderDetail.waimaiOrderId">
         <div class="title">预约发单时间：</div>
@@ -264,6 +264,10 @@ export default {
     },
   },
   methods: {
+    exceptTimeFn() {
+      let con = this.orderDetail.exceptTime || this.orderDetail.takeDate;
+      return con || "立即送达";
+    },
     takeOUtType(type) {
       let name = "";
       switch (type) {

src/components/orderComponents/orderList.vue

@@ -92,12 +92,15 @@
                 </div>
                 <img :src="item.logo || item.waimaiLogo" class="logo" />
                 <span class="name">{{ item.shopName }}</span>
-                <div class="sign_time" v-if="item.waimaiOrderId && [1,2].includes(item.takeType)">
+                <div class="sign_txt">
+                  {{ exceptTimeFn(item) }}
+                </div>
+                <!-- <div class="sign_time" v-if="item.waimaiOrderId && [1,2].includes(item.takeType)">
                   {{ item.exceptTime.slice(5,16) }}前送达
                 </div>
                 <div class="sign_txt" v-if="item.buttonStatus === 0 && item.waimaiOrderId && item.takeType == 0">
                   立即送达，{{item.orderTime.slice(-8,-3)}}下单
-                </div>
+                </div> -->
                 <div class="sign_d" v-if="item.buttonStatus === 10 && item.timeTxt">{{item.timeTxt}}自动发起配送</div>
 
                 <div v-if="item.buttonStatus === 10 && !item.waimaiOrderId" class="sign_d">{{item.deliveryTime.slice(5)}}自动发起配送</div>
@@ -398,6 +401,10 @@ export default {
     ...mapState(["userInfo"]),
   },
   methods: {
+    exceptTimeFn(item) {
+      let con = item.exceptTime || item.takeDate;
+      return con ? `${con.slice(5)}前送达` : "立即送达";
+    },
     daySeqColor(type) {
       let bgColor = "";
       switch (type) {