bugfix

src/components/orderComponents/orderDetail.vue

@@ -60,13 +60,17 @@
       </div>
       <div class="detail_ine"></div>
       <div class="detail_title2">订单信息</div>
-      <div class="info2 info4" v-if="tabNum !== 2">
+      <div class="info2 info4">
         <div class="title">送达时间：</div>
-        <div class="cont cont2">立即送达</div>
+        <div class="cont cont2">{{ buttonStatus !== 10 ? '立即送达' : orderDetail.exceptTime}}</div>
       </div>
-      <div class="info2 info4" v-if="orderDetail.takeTime">
+      <!-- <div class="info2 info4" v-if="orderDetail.takeTime && buttonStatus !== 0 && buttonStatus !== 10 ">
         <div class="title">发单时间：</div>
         <div class="cont">{{orderDetail.takeTime}}</div>
+      </div> -->
+      <div class="info2 info4" v-if="orderDetail.waimaiOrderId">
+        <div class="title">下单时间：</div>
+        <div class="cont">{{orderDetail.orderTime}}</div>
       </div>
       <div class="info2 info4" v-if="orderDetail.createTime">
         <div class="title">创建时间：</div>
@@ -93,7 +97,7 @@ export default {
     return {};
   },
   props: {
-    tabNum: Number,
+    buttonStatus: Number,
     orderDetail: Object,
   },
   methods: {

src/components/orderComponents/orderList.vue

@@ -37,9 +37,9 @@
               <!-- 待接单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 1">
                 <span class="header_r">已发单{{item.takeTimeTxt}}</span>
-                <el-button size='small' @click.stop="cancelOrder(item.id)">取消订单</el-button>
+                <!-- <el-button size='small' @click.stop="cancelOrder(item.id)">取消订单</el-button> -->
                 <el-button size='small' @click.stop="orderPrinter(item.waimaiOrderId)">补打发票</el-button>
-                <el-button size='small' class="btn" @click.stop="addTip(item.id)">加&nbsp;小&nbsp;费</el-button>
+                <!-- <el-button size='small' class="btn" @click.stop="addTip(item.id)">加&nbsp;小&nbsp;费</el-button> -->
               </div>
               <!-- 取货中 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 2">
@@ -93,8 +93,8 @@
             <div v-show="buttonStatus !== 0 && buttonStatus !==10" class="detail_txt" @click="orderDetailStutus=0" :class="{'detail_txt_ac':!orderDetailStutus}">订单跟踪</div>
             <div class="detail_txt" @click="orderDetailStutus=1" :class="{'detail_txt_ac':!!orderDetailStutus}">订单详情</div>
           </div>
-          <order-track v-show="showTrack" :tabNum="tabNum" :trackOrder="trackOrder" v-if="!orderDetailStutus && needTrack"></order-track>
-          <order-detail v-show="showDetail" :tabNum="tabNum" :orderDetail="orderDetail" v-else></order-detail>
+          <order-track v-show="showTrack" :buttonStatus="buttonStatus" :trackOrder="trackOrder" v-if="!orderDetailStutus && needTrack"></order-track>
+          <order-detail v-show="showDetail" :buttonStatus="buttonStatus" :orderDetail="orderDetail" v-else></order-detail>
           <!-- 订单跟踪、订单详情底部按钮 -->
           <div v-show="showDetail || showTrack">
             <!-- 新订单 -->

src/components/orderComponents/orderTrack.vue

@@ -2,13 +2,13 @@
   <div class="order-detail">
     <!-- 取货中 -->
     <div class="picking-up">
-      <div class="top" v-if="tabNum === 3 || tabNum === 4">
+      <div class="top" v-if="buttonStatus === 2 || buttonStatus === 3">
         <div class="top-l">
           <img src="../../../static/image/time-icon.png" class="time-icon" />
           <span class="top-tlt">骑手预计</span>
         </div>
-        <span v-if="tabNum === 3" class="top-tlt-l">{{trackOrder.riderArriveMinute}}分钟到店取件</span>
-        <span v-if="tabNum === 4" class="top-tlt-l">{{trackOrder.estimateArriveTime}}送达</span>
+        <span v-if="buttonStatus === 2" class="top-tlt-l">{{trackOrder.riderArriveMinute}}分钟到店取件</span>
+        <span v-if="buttonStatus === 3" class="top-tlt-l">{{trackOrder.estimateArriveTime}}送达</span>
       </div>
       <!-- 配送信息 ( 待接单无配送信息 ) -->
       <div class="send-info" v-if="trackOrder.deliveryName">
@@ -98,7 +98,7 @@ export default {
   name: "orderTrack",
   props: {
     trackOrder: Object,
-    tabNum: Number,
+    buttonStatus: Number,
   },
   data() {
     return {};

src/components/orderComponents/sendOrderPopup.vue

@@ -46,7 +46,7 @@
               <div class="item-right">
                 <div>
                   <div class="item-price">预估&nbsp;<span>{{ computePrice(item.deliveryAmount, tipAmount, couponPrice, order.firstCoupon || 0, item.isMine) }}</span>&nbsp;元</div>
-                  <!-- <div class="item-coupon">优惠合计2元</div> -->
+                  <div v-if="!item.isMine && item.deliveryAmount.toFixed(2) > couponParams.limitFee" class="item-coupon">优惠合计{{discount(item.deliveryAmount, tipAmount, couponPrice, order.firstCoupon || 0, item.isMine)}}元</div>
                 </div>
                 <div class="item-choose">
                   <img v-if="!item.isChoose" src="../../../static/image/item-choose-icon.png" />
@@ -451,6 +451,31 @@ export default {
         });
       }
     },
+    discount(cost, tipPrice, couponPrice, firstCoupon, select) {
+      if (
+        this.couponParams.type == 1 &&
+        select == 0 &&
+        cost >= this.couponParams.limitFee
+      ) {
+        let price = couponPrice + firstCoupon;
+        return price >= 0 ? price.toFixed(2) : 0;
+      } else if (this.couponParams.type == 3 && select == 0) {
+        let price = couponPrice + firstCoupon;
+        return price >= 0 ? price.toFixed(2) : 0;
+      } else if (this.couponParams.type == 2 && select == 0) {
+        let newCouponPrice =
+          cost * (1 - this.couponParams.discount / 10) <
+          this.couponParams.maxDiscount
+            ? cost * (1 - this.couponParams.discount / 10)
+            : this.couponParams.maxDiscount;
+        let price = newCouponPrice + firstCoupon;
+        return price >= 0 ? price.toFixed(2) : 0;
+      } else {
+        let price = firstCoupon;
+        console.log("初始加载值", this.couponParams.type);
+        return price >= 0 ? price.toFixed(2) : 0;
+      }
+    },
     computePrice(cost, tipPrice, couponPrice, firstCoupon, select) {
       if (
         this.couponParams.type == 1 &&
@@ -482,6 +507,7 @@ export default {
         this.couponList.find((item) => {
           return item.id == e && e != -1;
         }) || {};
+      console.log("couponParams", this.couponParams);
       if (this.couponParams.type == 1 || this.couponParams.type == 3) {
         this.couponPrice = this.couponParams.money;
       } else if (this.couponParams.type == 2) {
@@ -539,7 +565,12 @@ export default {
       getCouponList(params).then((res) => {
         if (res.code == 200) {
           console.log(res.data);
-          this.couponList = this.couponList.concat(res.data.data);
+          this.couponList = [
+            {
+              id: -1,
+              name: "不使用优惠券",
+            },
+          ].concat(res.data.data);
         }
       });
     },