feat 代码优化

src/components/Home.vue

@@ -159,7 +159,10 @@ export default {
     this.getMarker();
     this.timer = setInterval(() => {
       this.getMarker();
-      this.getRefreshOrder();
+      // 近三日不用插入或者删除数据
+      if (this.tabNum !== 7) {
+        this.getRefreshOrder();
+      }
     }, 5000);
   },
   mounted() {},
@@ -180,7 +183,7 @@ export default {
       this.params.pageNum = 1;
       this.orderList = [];
       this.getOrder();
-      this.getMarker()
+      this.getMarker();
     },
     getShopList() {
       getShopList().then((res) => {
@@ -268,8 +271,8 @@ export default {
     },
     changeTab(i, status) {
       // 切换状态不是近三天，搜索输入框清空
-      if(i !== 7){
-        this.params.searchKey = ''
+      if (i !== 7) {
+        this.params.searchKey = "";
       }
       this.tabNum = i;
       this.params.status = status;

src/components/orderComponents/orderList.vue

@@ -85,27 +85,27 @@
                 <span class="name">{{ item.shopName }}</span>
                 <!-- <span class="name">{{item.sendAddress}}</span> -->
                 <div class="sign_time" v-if="item.waimaiOrderId && [1,2].includes(item.takeType)">
-                  {{ item.exceptTime.slice(5) }}前送达
+                  {{ item.exceptTime.slice(5,16) }}前送达
                 </div>
-                <div class="sign_txt" v-if="[-1,0,7].includes(tabNum) && item.waimaiOrderId && item.takeType == 0">
-                  立即送达，{{item.orderTime.slice(-8)}}下单
+                <div class="sign_txt" v-if="item.buttonStatus === 0 && item.waimaiOrderId && item.takeType == 0">
+                  立即送达，{{item.orderTime.slice(-8,-3)}}下单
                 </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>
                 <!-- 近三日订单 -->
-                <div class="sign_d" v-if="tabNum === 7 &&item.finishTime">{{item.finishTime && item.finishTime.slice(5)}}已完成</div>
+                <!-- <div class="sign_f" v-if="[-1,7].includes(tabNum) &&item.finishTime">{{item.finishTime && item.finishTime.slice(5)}}已完成</div> -->
               </div>
               <!-- 新订单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 0">
                 <!-- <span class="header_r">已发单1分钟</span> -->
-                <el-tag v-if="tabNum === -1" class="header_r">新订单</el-tag>
+                <el-tag v-if="[-1,7].includes(tabNum)" class="header_r">新订单</el-tag>
                 <el-button size="small" class="btn" @click.stop="sendNow(item)">发起配送</el-button>
               </div>
               <!-- 预约单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 10">
                 <!-- <span class="header_r">已发单1分钟</span> -->
-                <el-tag v-if="tabNum === -1" class="header_r">预约单</el-tag>
+                <el-tag v-if="[-1,7].includes(tabNum)" class="header_r">预约单</el-tag>
                 <!-- <el-button size='small' @click.stop="iGnoreOrder(item.id)">忽略订单</el-button> -->
                 <!-- <el-button size='small' @click.stop="itemAddRemark(item.id, item)">添加备注</el-button> -->
                 <el-button v-if="item.waimaiOrderId" size="small" class="btn" @click.stop="settingTime(item)">{{
@@ -116,7 +116,7 @@
               </div>
               <!-- 待接单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 1">
-                <el-tag v-if="tabNum === -1" class="header_r">待接单</el-tag>
+                <el-tag v-if="[-1,7].includes(tabNum)" class="header_r">待接单</el-tag>
                 <span class="header_r">已发单{{ item.takeTimeTxt }}</span>
                 <!-- <el-button size='small' @click.stop="cancelOrder(item.id)">取消订单</el-button> -->
                 <el-button size="small" class="btn" @click.stop="orderPrinter(item.waimaiOrderId)" v-if="item.waimaiOrderId">补打发票</el-button>
@@ -124,14 +124,14 @@
               </div>
               <!-- 取货中 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 2">
-                <el-tag v-if="tabNum === -1" class="header_r">取货中</el-tag>
+                <el-tag v-if="[-1,7].includes(tabNum)" class="header_r">取货中</el-tag>
                 <span v-show="Number(item.riderArriveMinute)" class="header_r">预计{{Number(item.riderArriveMinute)}}分钟取件</span>
                 <!-- <el-button size='small' @click.stop="cancelOrder(item.id)">取消订单</el-button> -->
                 <el-button size="small" class="btn" @click.stop="orderPrinter(item.waimaiOrderId)" v-if="item.waimaiOrderId">补打发票</el-button>
               </div>
               <!-- 配送中 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 3">
-                <el-tag v-if="tabNum === -1" class="header_r">配送中</el-tag>
+                <el-tag v-if="[-1,7].includes(tabNum)" class="header_r">配送中</el-tag>
                 <span class="header_r" v-if="item.exceptTime">预计{{ item.exceptTime }}送达,{{item.surPlusMinute >= 0 ? '剩余'+item.surPlusMinute + '分钟' : '超时' +item.surPlusMinute +"分钟" }}</span>
                 <el-button size="small" class="btn" @click.stop="orderPrinter(item.waimaiOrderId)" v-if="item.waimaiOrderId">补打发票</el-button>
               </div>
@@ -151,11 +151,11 @@
               </div>
               <!-- 猎豹平台已完成 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 97">
-                <el-tag v-if="tabNum === -1" class="header_r">已完成</el-tag>
+                <el-tag v-if="[-1,7].includes(tabNum)" class="header_r">已完成</el-tag>
               </div>
               <!-- 其他平台已完成 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 98">
-                <el-tag v-if="tabNum === -1" class="header_r">其他平台已完成</el-tag>
+                <el-tag v-if="[-1,7].includes(tabNum)" class="header_r">其他平台已完成</el-tag>
               </div>
             </div>
             <div class="order_item_cont">
@@ -1127,14 +1127,14 @@ export default {
     .sign_time {
       padding: 0 8px;
       height: 20px;
-      border: 1px solid #009cff;
-      background: #f2faff;
+      border: 1px solid #fc7200;
+      background: #fff;
       border-radius: 2px;
       text-align: center;
       line-height: 20px;
       font-size: 12px;
       font-weight: 600;
-      color: #009cff;
+      color: #fc7200;
       margin-left: 15px;
     }
 
@@ -1166,6 +1166,19 @@ export default {
       margin-left: 10px;
       padding: 0 7px;
     }
+    .sign_f {
+      height: 20px;
+      border: 1px solid #999;
+      background: #fff;
+      border-radius: 2px;
+      text-align: center;
+      line-height: 20px;
+      font-size: 12px;
+      font-weight: 600;
+      color: #999;
+      margin-left: 10px;
+      padding: 0 7px;
+    }
 
     .header_r {
       font-size: 14px;