feat 代码优化

src/components/Home.vue

@@ -31,7 +31,7 @@
               <el-option label="手机号" value="2"></el-option>
               <el-option label="姓名" value="3"></el-option>
               <el-option label="地址" value="4"></el-option>
-              <el-option label="订单号" value="5"></el-option>
+              <!-- <el-option label="订单号" value="5"></el-option> -->
               <el-option label="外卖订单号" value="6"></el-option>
             </el-select>
           </el-input>
@@ -177,6 +177,10 @@ export default {
     changeShopIds() {
       this.params.searchShopIdStr = String(this.searchShopIdStr);
       localStorage.setItem("searchShopIdStr", this.params.searchShopIdStr);
+      this.params.pageNum = 1;
+      this.orderList = [];
+      this.getOrder();
+      this.getMarker()
     },
     getShopList() {
       getShopList().then((res) => {
@@ -218,9 +222,14 @@ export default {
       //     searchKey: this.searchKey,
       //   },
       // });
-      this.params.pageNum = 1;
-      this.orderList = [];
-      this.getOrder();
+      //
+      if (!this.params.searchKey) {
+        this.params.pageNum = 1;
+        this.orderList = [];
+        this.getOrder();
+      } else {
+        this.changeTab(7, 94);
+      }
     },
     handleSizeChange(val) {
       this.params.pageNum = 1;
@@ -258,6 +267,10 @@ export default {
       this.$refs.sendOrderPopup.init();
     },
     changeTab(i, status) {
+      // 切换状态不是近三天，搜索输入框清空
+      if(i !== 7){
+        this.params.searchKey = ''
+      }
       this.tabNum = i;
       this.params.status = status;
       this.orderList = [];
@@ -300,8 +313,8 @@ export default {
       });
     },
     getRefreshOrder() {
-      if(this.params.status === 94){
-        return
+      if (this.params.status === 94) {
+        return;
       }
       let orderIds = this.orderList.map((v) => {
         return v.id;
@@ -380,7 +393,7 @@ export default {
       display: flex;
       justify-content: space-around;
       width: 100%;
-      padding-top: 20px;
+      padding-top: 26px;
       padding-left: 36px;
       box-sizing: border-box;
       overflow-x: auto;

src/components/orderComponents/orderList.vue

@@ -87,12 +87,14 @@
                 <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 class="sign_txt" v-if="tabNum===0 && item.waimaiOrderId && item.takeType == 0">
+                  立即送达，{{item.orderTime.slice(-8)}}下单
                 </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>
               <!-- 新订单 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 0">
@@ -123,14 +125,14 @@
               <!-- 取货中 -->
               <div class="order_item_header_r" v-if="item.buttonStatus === 2">
                 <el-tag v-if="tabNum === -1" class="header_r">取货中</el-tag>
-                <!-- <span v-show="Number(item.riderArriveMinute)" class="header_r">预计{{Number(item.riderArriveMinute)}}分钟取件</span> -->
+                <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>
-                <!-- <span class="header_r" v-if="item.exceptTime">预计{{ item.exceptTime }}送达</span> -->
+                <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>
               <!-- 异常单 -->
@@ -1137,7 +1139,7 @@ export default {
     }
 
     .sign_txt {
-      width: 64px;
+      // width: 64px;
       height: 20px;
       border: 1px solid #009cff;
       background: #f2faff;
@@ -1148,6 +1150,7 @@ export default {
       font-weight: 600;
       color: #009cff;
       margin-left: 10px;
+      padding: 0 5px;
     }
 
     .sign_d {
@@ -1168,13 +1171,14 @@ export default {
       font-size: 14px;
       font-weight: 400;
       color: #333333;
-      margin-right: 22px;
+      // margin-right: 22px;
     }
 
     .btn {
       background: #fc7200;
       border-color: #fc7200;
       color: #fff;
+      margin-left: 20px;
       //  position: absolute;
       //  right: 10px;
     }

src/components/orderSearch.vue

@@ -7,7 +7,16 @@
       <el-col :span="24">
         <div class="order_list_sel">
           <div class="sel_item">
-            <el-input size="small" @keydown.enter.native="seachEnterFun" class="inp" clearable v-model="params.searchKey" placeholder="手机号/姓名/地址/订单编号"></el-input>
+            <el-input size="small" class="item1" v-model="params.searchKey" placeholder="请输入关键字" @keydown.enter.native="seachEnterFun" clearable>
+              <el-select v-model="params.searchKeyType" slot="prepend" placeholder="请选择关键字">
+                <el-option label="流水号" value="1"></el-option>
+                <el-option label="手机号" value="2"></el-option>
+                <el-option label="姓名" value="3"></el-option>
+                <el-option label="地址" value="4"></el-option>
+                <!-- <el-option label="订单号" value="5"></el-option> -->
+                <el-option label="外卖订单号" value="6"></el-option>
+              </el-select>
+            </el-input>
           </div>
           <div class="sel_item" v-if="memberType !== 1">
             <span class="name">门店：</span>
@@ -33,7 +42,7 @@
             </el-date-picker>
           </div>
           <el-button size='small' @click="search" style="background: #0D1E40;color:#fff">查询</el-button>
-          <el-button size='small' @click="$router.push({path:'/manualCreate'})" class="btn">手动发单</el-button>
+          <!-- <el-button size='small' @click="$router.push({path:'/manualCreate'})" class="btn">手动发单</el-button> -->
         </div>
       </el-col>
     </el-row>
@@ -70,6 +79,7 @@ export default {
         orderType: 0,
         searchType: 1,
         searchKey: "",
+        searchKeyType: '1',
         shopId: "",
         startDate: "",
         endDate: "",
@@ -171,7 +181,7 @@ export default {
     sendOrderPopup,
     OrderList,
   },
-  watch:{
+  watch: {
     "$store.state.userInfo": {
       handler(newVal, oldVal) {
         this.memberType = newVal.memberType;
@@ -326,6 +336,12 @@ export default {
         display: flex;
         align-items: center;
         margin-right: 10px;
+        /deep/ .el-input-group__prepend {
+          background: #fff;
+          .el-input__inner {
+            width: 114px;
+          }
+        }
         .name {
           font-size: 14px;
           flex-shrink: 0;