feat 订单查询

src/api/tool.js

@@ -1,40 +1,57 @@
-export default{
-    eosFormatTime2(oldTimes1,disparityTime) {
-        let time1 = oldTimes1.split(' ');
-        let time2 = time1[1].split(':');
-        let time3 = time1[0].split('-')
-        if(disparityTime%1 === 0){
-          return `${time3[1]}/${time3[2]} ${time2[0]-disparityTime}:00`
-        }else{
-          return `${time3[1]}/${time3[2]} ${time2[0]-Math.ceil(disparityTime)}:30`
-        }
-    },
-    timeago(hisTime){ 
-        var diffValue = new Date().getTime() - hisTime,
-        result='',
+export default {
+  // 将Thu Sep 20 2018 16:23:03 GMT+0800 (中国标准时间)转换为"2018-09-20 16:23:03"
+  formatDateTime(inputTime) {
+    var date = new Date(inputTime);
+    var y = date.getFullYear();
+    var m = date.getMonth() + 1;
+    m = m < 10 ? ('0' + m) : m;
+    var d = date.getDate();
+    d = d < 10 ? ('0' + d) : d;
+    var h = date.getHours();
+    h = h < 10 ? ('0' + h) : h;
+    var minute = date.getMinutes();
+    var second = date.getSeconds();
+    minute = minute < 10 ? ('0' + minute) : minute;
+    second = second < 10 ? ('0' + second) : second;
+    return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+  },
 
-        minute = 1000 * 60,
-        hour = minute * 60,
-        day = hour * 24,
-        halfamonth = day * 15,
-        month = day * 30,
-        year = month * 12,
+  eosFormatTime2(oldTimes1, disparityTime) {
+    let time1 = oldTimes1.split(' ');
+    let time2 = time1[1].split(':');
+    let time3 = time1[0].split('-')
+    if (disparityTime % 1 === 0) {
+      return `${time3[1]}/${time3[2]} ${time2[0] - disparityTime}:00`
+    } else {
+      return `${time3[1]}/${time3[2]} ${time2[0] - Math.ceil(disparityTime)}:30`
+    }
+  },
+  timeago(hisTime) {
+    var diffValue = new Date().getTime() - hisTime,
+      result = '',
 
-        _year = diffValue/year,
-        _month =diffValue/month,
-        _week =diffValue/(7*day),
-        _day =diffValue/day,
-        _hour =diffValue/hour,
-        _min =diffValue/minute;
+      minute = 1000 * 60,
+      hour = minute * 60,
+      day = hour * 24,
+      halfamonth = day * 15,
+      month = day * 30,
+      year = month * 12,
+
+      _year = diffValue / year,
+      _month = diffValue / month,
+      _week = diffValue / (7 * day),
+      _day = diffValue / day,
+      _hour = diffValue / hour,
+      _min = diffValue / minute;
+
+    if (_year >= 1) result = parseInt(_year) + "年";
+    else if (_month >= 1) result = parseInt(_month) + "个月";
+    else if (_week >= 1) result = parseInt(_week) + "周";
+    else if (_day >= 1) result = parseInt(_day) + "天";
+    else if (_hour >= 1) result = parseInt(_hour) + "个小时";
+    else if (_min >= 1) result = '' + parseInt(_min) + "分钟";
+    else result = "1分钟";
+    return result;
+  }
 
-        if(_year>=1) result=parseInt(_year) + "年";
-        else if(_month>=1) result=parseInt(_month) + "个月";
-        else if(_week>=1) result=parseInt(_week) + "周";
-        else if(_day>=1) result=parseInt(_day) +"天";
-        else if(_hour>=1) result=parseInt(_hour) +"个小时";
-        else if(_min>=1) result=''+parseInt(_min) +"分钟";
-        else result="1分钟";
-        return result;
-    }
-    
 }

src/components/orderComponents/orderDetail.vue

@@ -5,11 +5,11 @@
       <template v-if="orderDetail.detailItems">
         <div class="detail_title2">商品详情</div>
         <div class="shop_detail" v-for="(item,i) in orderDetail.detailItems" :key="i">
-          <img :src="item.foodPic" alt="" srcset="">
           <div class="info">
+            <img :src="item.foodPic" alt="" srcset="">
             <div class="shop_title">{{item.foodName}}</div>
-            <div class="shop_num">x{{item.quantity}}</div>
           </div>
+          <div class="shop_num">x{{item.quantity}}</div>
         </div>
         <div class="detail_ine"></div>
       </template>
@@ -136,27 +136,28 @@ export default {
   .shop_detail {
     width: 100%;
     display: flex;
+    align-items: flex-end;
     margin-bottom: 10px;
-    img {
-      width: 47px;
-      height: 47px;
-      border-radius: 4px 4px 4px 4px;
-      margin-right: 12px;
-    }
     .info {
       flex-grow: 1;
       display: flex;
-      justify-content: space-between;
+      align-items: flex-start;
+      img {
+        width: 47px;
+        height: 47px;
+        border-radius: 4px 4px 4px 4px;
+        margin-right: 12px;
+      }
       .shop_title {
-        width: 70%;
-        font-size: 14px;
+        font-size: 12px;
         font-weight: 500;
         color: #333333;
         line-height: 18px;
       }
-      .shop_num {
-        color: #b1b1b1;
-      }
+    }
+    .shop_num {
+      margin-left: 10px;
+      color: #b1b1b1;
     }
   }
   .detail_ine {

src/components/orderComponents/orderList.vue

@@ -6,276 +6,81 @@
           <div class="empty-data" v-if="list && list.length < 1">
             <img src="../../../static/image/empty-data.png" />
           </div>
-          <!-- <div style="width:100%;height:10px" v-if="!list.length"></div> -->
-          <!-- 新订单 -->
-          <div v-if="tabNum===0">
-            <div :class="curIdx === i ? 'order_item active-order-item' : 'order_item'" @click="chooseOrder(item,i)" v-for="(item,i) in list" :key="i">
-              <div class="order_item_header">
-                <div class="order_item_header_l">
-                  <div class="Serial_number">#{{item.daySeq}}</div>
-                  <img :src="item.logo" class="logo">
-                  <span class="name">{{item.shopName}}</span>
-                  <div class="sign_time" v-if="item.takeType==1">{{item.exceptTime}}前送达</div>
-                  <div class="sign_txt" v-if="item.takeType==0">立即送达</div>
-                  <!-- <div class="sign_d">预约 09/10 17:30自动发起配送</div> -->
-                </div>
-                <div class="order_item_header_r">
-                  <!-- <span class="header_r">已发单1分钟</span> -->
-                  <el-button size='small' class="btn" @click.stop="deleteItem(item)">发起配送</el-button>
-                </div>
-
-              </div>
-              <div class="order_item_cont">
-                <div class="content">{{item.receiptContactName}}<span>{{item.receiptPhone}}</span></div>
-                <div class="address">
-                  {{item.receiptProvinceName}}
-                  {{item.receiptCityName}}
-                  {{item.receiptDistrictName}}
-                  {{item.receiptAddress}}
-                  <span v-if="item.orderDistance" @click.stop="checkMap(item)">
-                    <i class="el-icon-location"></i>
-                    <span v-if="item.orderDistance < 1000">
-                      {{item.orderDistance}}m
-                    </span>
-                    <span v-else>
-                      {{item.orderDistance / 1000}}km
-                    </span>
-                  </span>
-                </div>
-                <div v-if="item.caution" class="itme_r">备注：{{item.caution}}</div>
+          <div :class="curIdx === i ? 'order_item active-order-item' : 'order_item'" @click="chooseOrder(item,i)" v-for="(item,i) in list" :key="i">
+            <div class="order_item_header">
+              <div class="order_item_header_l">
+                <div class="Serial_number">#{{item.daySeq}}</div>
+                <img :src="item.logo" class="logo">
+                <span class="name">{{item.shopName}}</span>
+                <div class="sign_time" v-if="item.takeType==1">{{item.exceptTime}}前送达</div>
+                <div class="sign_txt" v-if="item.takeType==0">立即送达</div>
+                <!-- <div class="sign_d">预约 09/10 17:30自动发起配送</div> -->
               </div>
-            </div>
-          </div>
-          <!-- 预约单 -->
-          <div v-if="tabNum===1">
-            <div :class="curIdx === i ? 'order_item active-order-item' : 'order_item'" @click="chooseOrder(item,i)" v-for="(item,i) in list" :key="i">
-              <div class="order_item_header">
-                <div class="order_item_header_l">
-                  <div class="Serial_number">#{{item.daySeq}}</div>
-                  <img :src="item.logo" class="logo">
-                  <span class="name">{{item.shopName}}</span>
-                  <div class="sign_d">预约 {{item.timeTxt}}自动发起配送</div>
-                </div>
-                <div class="order_item_header_r">
-                  <!-- <span class="header_r">已发单1分钟</span> -->
-                  <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 size='small' class="btn" @click.stop="settingTime(item)">定时发单</el-button>
-                  <el-button size='small' class="btn" @click.stop="deleteItem(item)">发起配送</el-button>
-                </div>
+              <!-- 订单查询 -->
+              <div class="order_item_header_r" v-if="tabNum === -1">
+                <span class="header_r">{{showDeliveryStatus(item)}}</span>
+                <el-button size='small' class="btn" @click.stop="orderPrinter(item.waimaiOrderId)">补打发票</el-button>
               </div>
-              <div class="order_item_cont">
-                <div class="content">{{item.receiptContactName}}<span>{{item.receiptPhone}}</span></div>
-                <div class="address">
-                  {{item.receiptProvinceName}}
-                  {{item.receiptCityName}}
-                  {{item.receiptDistrictName}}
-                  {{item.receiptAddress}}
-                  <span v-if="item.orderDistance" @click.stop="checkMap(item)">
-                    <i class="el-icon-location"></i>
-                    <span v-if="item.orderDistance < 1000">
-                      {{item.orderDistance}}m
-                    </span>
-                    <span v-else>
-                      {{item.orderDistance / 1000}}km
-                    </span>
-                  </span>
-                </div>
-                <div v-if="item.takeRemark" class="itme_r">备注：{{item.takeRemark}}</div>
+              <!-- 新订单 -->
+              <div class="order_item_header_r" v-if="tabNum === 0">
+                <!-- <span class="header_r">已发单1分钟</span> -->
+                <el-button size='small' class="btn" @click.stop="deleteItem(item)">发起配送</el-button>
               </div>
-            </div>
-          </div>
-          <!-- 待接单 -->
-          <div v-if="tabNum===2">
-            <div :class="curIdx === i ? 'order_item active-order-item' : 'order_item'" @click="chooseOrder(item,i)" v-for="(item,i) in list" :key="i">
-              <div class="order_item_header">
-                <div class="order_item_header_l">
-                  <div class="Serial_number" v-if="item.daySeq">#{{item.daySeq}}</div>
-                  <img :src="item.logo" class="logo">
-                  <span class="name">{{item.shopName}}</span>
-                  <div class="sign_d" v-if="item.exceptTime">预约 {{item.timeTxt}}送达</div>
-                </div>
-                <div class="order_item_header_r">
-                  <span class="header_r">已发单{{item.takeTimeTxt}}</span>
-                  <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>
-                </div>
-
+              <!-- 预约单 -->
+              <div class="order_item_header_r" v-if="tabNum === 1">
+                <!-- <span class="header_r">已发单1分钟</span> -->
+                <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 size='small' class="btn" @click.stop="settingTime(item)">定时发单</el-button>
+                <el-button size='small' class="btn" @click.stop="deleteItem(item)">发起配送</el-button>
               </div>
-              <div class="order_item_cont">
-
-                <div class="content">{{item.receiptContactName}}<span>{{item.receiptPhone}}</span></div>
-                <div class="address">
-                  {{item.receiptProvinceName}}
-                  {{item.receiptCityName}}
-                  {{item.receiptDistrictName}}
-                  {{item.receiptAddress}}
-                  <span v-if="item.orderDistance" @click.stop="checkMap(item)">
-                    <i class="el-icon-location"></i>
-                    <span v-if="item.orderDistance < 1000">
-                      {{item.orderDistance}}m
-                    </span>
-                    <span v-else>
-                      {{item.orderDistance / 1000}}km
-                    </span>
-                  </span>
-                </div>
-                <div v-if="item.caution" class="itme_r">备注：{{item.caution}}</div>
+              <!-- 待接单 -->
+              <div class="order_item_header_r" v-if="tabNum === 2">
+                <span class="header_r">已发单{{item.takeTimeTxt}}</span>
+                <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>
               </div>
-            </div>
-          </div>
-          <!-- 取货中 -->
-          <div v-if="tabNum===3">
-            <div :class="curIdx === i ? 'order_item active-order-item' : 'order_item'" @click="chooseOrder(item,i)" v-for="(item,i) in list" :key="i">
-              <div class="order_item_header">
-                <div class="order_item_header_l">
-                  <div class="Serial_number" v-if="item.daySeq">#{{item.daySeq}}</div>
-                  <img :src="item.logo" class="logo">
-                  <span class="name">{{item.shopName}}</span>
-                  <div class="sign_d" v-if="item.exceptTime">预约 {{item.timeTxt}}送达</div>
-                </div>
-                <div class="order_item_header_r">
-                  <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)">补打发票</el-button>
-                </div>
+              <!-- 取货中 -->
+              <div class="order_item_header_r" v-if="tabNum === 3">
+                <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)">补打发票</el-button>
               </div>
-              <div class="order_item_cont">
-                <div class="content">{{item.receiptContactName}}<span>{{item.receiptPhone}}</span></div>
-                <div class="address">
-                  {{item.receiptProvinceName}}
-                  {{item.receiptCityName}}
-                  {{item.receiptDistrictName}}
-                  {{item.receiptAddress}}
-                  <span v-if="item.orderDistance" @click.stop="checkMap(item)">
-                    <i class="el-icon-location"></i>
-                    <span v-if="item.orderDistance < 1000">
-                      {{item.orderDistance}}m
-                    </span>
-                    <span v-else>
-                      {{item.orderDistance / 1000}}km
-                    </span>
-                  </span>
-                </div>
-                <div v-if="item.caution" class="itme_r">备注：{{item.caution}}</div>
+              <!-- 配送中 -->
+              <div class="order_item_header_r" v-if="tabNum === 4">
+                <span class="header_r" v-if="item.exceptTime">预计{{item.exceptTime}}送达</span>
+                <el-button size='small' class="btn" @click.stop="orderPrinter(item.waimaiOrderId)">补打发票</el-button>
               </div>
-            </div>
-          </div>
-          <!-- 配送中 -->
-          <div v-if="tabNum===4">
-            <div :class="curIdx === i ? 'order_item active-order-item' : 'order_item'" @click="chooseOrder(item,i)" v-for="(item,i) in list" :key="i">
-              <div class="order_item_header">
-                <div class="order_item_header_l">
-                  <div class="Serial_number" v-if="item.daySeq">#{{item.daySeq}}</div>
-                  <img :src="item.logo" class="logo">
-                  <span class="name">{{item.shopName}}</span>
-                  <div class="sign_d" v-if="item.exceptTime">预约 {{item.timeTxt}}送达</div>
-                </div>
-                <div class="order_item_header_r">
-                  <span class="header_r" v-if="item.exceptTime">预计{{item.exceptTime}}送达</span>
-                  <el-button size='small' class="btn" @click.stop="orderPrinter(item.waimaiOrderId)">补打发票</el-button>
-                </div>
+              <!-- 异常单 -->
+              <div class="order_item_header_r" v-if="tabNum === 5">
+                <span class="header_r">{{showCancelType(item.cancelType)}}</span>
+                <el-button size='small' class="btn" @click.stop="orderBack(item.id)">撤回订单</el-button>
               </div>
-              <div class="order_item_cont">
-                <div class="content">{{item.receiptContactName}}<span>{{item.receiptPhone}}</span></div>
-                <div class="address">
-                  {{item.receiptProvinceName}}
-                  {{item.receiptCityName}}
-                  {{item.receiptDistrictName}}
-                  {{item.receiptAddress}}
-                  <span v-if="item.orderDistance" @click.stop="checkMap(item)">
-                    <i class="el-icon-location"></i>
-                    <span v-if="item.orderDistance < 1000">
-                      {{item.orderDistance}}m
-                    </span>
-                    <span v-else>
-                      {{item.orderDistance / 1000}}km
-                    </span>
-                  </span>
-                </div>
-                <div v-if="item.caution" class="itme_r">备注：{{item.caution}}</div>
+              <!-- 取消单 -->
+              <div class="order_item_header_r" v-if="tabNum === 6">
+                <span class="header_r">{{showCancelType(item.cancelType)}}</span>
+                <!-- <el-button size='small' class="btn" @click.stop="orderBack(item.id)">撤回订单</el-button> -->
               </div>
             </div>
-          </div>
-          <!-- 异常单 -->
-          <div v-if="tabNum===5">
-            <div :class="curIdx === i ? 'order_item active-order-item' : 'order_item'" @click="chooseOrder(item,i)" v-for="(item,i) in list" :key="i">
-              <div class="order_item_header">
-                <div class="order_item_header_l">
-                  <div class="Serial_number" v-if="item.daySeq">#{{item.daySeq}}</div>
-                  <img :src="item.logo" class="logo">
-                  <span class="name">{{item.shopName}}</span>
-                  <div class="sign_d" v-if="item.exceptTime">预约 {{item.timeTxt}}送达</div>
-                </div>
-                <div class="order_item_header_r">
-                  <span class="header_r" v-if="item.cancelType == 1">商家取消</span>
-                  <span class="header_r" v-if="item.cancelType == 2">骑手取消</span>
-                  <span class="header_r" v-if="item.cancelType == 3">系统取消</span>
-                  <span class="header_r" v-if="item.cancelType == 4">用户取消</span>
-                  <span class="header_r" v-if="item.cancelType == 5">平台取消</span>
-                  <el-button size='small' class="btn" @click.stop="orderBack(item.id)">撤回订单</el-button>
-                </div>
-              </div>
-              <div class="order_item_cont">
-                <div class="content">{{item.receiptContactName}}<span>{{item.receiptPhone}}</span></div>
-                <div class="address">
-                  {{item.receiptProvinceName}}
-                  {{item.receiptCityName}}
-                  {{item.receiptDistrictName}}
-                  {{item.receiptAddress}}
-                  <span v-if="item.orderDistance" @click.stop="checkMap(item)">
-                    <i class="el-icon-location"></i>
-                    <span v-if="item.orderDistance < 1000">
-                      {{item.orderDistance}}m
-                    </span>
-                    <span v-else>
-                      {{item.orderDistance / 1000}}km
-                    </span>
+            <div class="order_item_cont">
+              <div class="content">{{item.receiptContactName}}<span>{{item.receiptPhone}}</span></div>
+              <div class="address">
+                {{item.receiptProvinceName}}
+                {{item.receiptCityName}}
+                {{item.receiptDistrictName}}
+                {{item.receiptAddress}}
+                <span v-if="item.orderDistance" @click.stop="checkMap(item)">
+                  <i class="el-icon-location"></i>
+                  <span v-if="item.orderDistance < 1000">
+                    {{item.orderDistance}}m
                   </span>
-                </div>
-                <div v-if="item.caution" class="itme_r">备注：{{item.caution}}</div>
-              </div>
-            </div>
-          </div>
-          <!-- 取消单 -->
-          <div v-if="tabNum===6">
-            <div :class="curIdx === i ? 'order_item active-order-item' : 'order_item'" @click="chooseOrder(item,i)" v-for="(item,i) in list" :key="i">
-              <div class="order_item_header">
-                <div class="order_item_header_l">
-                  <div class="Serial_number" v-if="item.daySeq">#{{item.daySeq}}</div>
-                  <img :src="item.logo" class="logo">
-                  <span class="name">{{item.shopName}}</span>
-                  <div class="sign_d" v-if="item.exceptTime">预约 {{item.timeTxt}}送达</div>
-                </div>
-                <div class="order_item_header_r">
-                  <span class="header_r" v-if="item.cancelType == 1">商家取消</span>
-                  <span class="header_r" v-if="item.cancelType == 2">骑手取消</span>
-                  <span class="header_r" v-if="item.cancelType == 3">系统取消</span>
-                  <span class="header_r" v-if="item.cancelType == 4">用户取消</span>
-                  <span class="header_r" v-if="item.cancelType == 5">平台取消</span>
-                  <!-- <el-button size='small' class="btn" @click.stop="orderBack(item.id)">撤回订单</el-button> -->
-                </div>
-              </div>
-              <div class="order_item_cont">
-                <div class="content">{{item.receiptContactName}}<span>{{item.receiptPhone}}</span></div>
-                <div class="address">
-                  {{item.receiptProvinceName}}
-                  {{item.receiptCityName}}
-                  {{item.receiptDistrictName}}
-                  {{item.receiptAddress}}
-                  <span v-if="item.orderDistance" @click.stop="checkMap(item)">
-                    <i class="el-icon-location"></i>
-                    <span v-if="item.orderDistance < 1000">
-                      {{item.orderDistance}}m
-                    </span>
-                    <span v-else>
-                      {{item.orderDistance / 1000}}km
-                    </span>
+                  <span v-else>
+                    {{item.orderDistance / 1000}}km
                   </span>
-                </div>
-                <div v-if="item.caution" class="itme_r">备注：{{item.caution}}</div>
+                </span>
               </div>
+              <div v-if="item.caution" class="itme_r">备注：{{item.caution}}</div>
             </div>
           </div>
           <div v-if="item.caution" class="itme_r">备注：{{item.caution}}</div>
@@ -314,6 +119,10 @@
               <el-button size='small' @click.native="settingTime(list[curIdx])" class="btn_bots btn">定时发单</el-button>
               <el-button size='small' @click.native="deleteItem(list[curIdx])" class="btn_bots btn">发起配送</el-button>
             </div>
+            <!-- 订单查询 -->
+            <div class="btns" v-if="tabNum === -1">
+              <el-button size='small' @click.native="orderPrinter(list[curIdx].waimaiOrderId)" class="btn_bots btn">补打发票</el-button>
+            </div>
             <!-- 待接单 -->
             <div class="btns" v-if="tabNum === 2">
               <el-button size='small' @click.native="cancelOrder(list[curIdx].id)" class="btn_bots">取消订单</el-button>
@@ -997,6 +806,43 @@ export default {
         }
       });
     },
+    showCancelType(type) {
+      let name = "";
+      switch (type) {
+        case 1:
+          name = "商家取消";
+          break;
+        case 2:
+          name = "骑手取消";
+          break;
+        case 3:
+          name = "系统取消";
+          break;
+        case 4:
+          name = "用户取消";
+          break;
+        case 5:
+          name = "平台取消";
+          break;
+
+        default:
+          break;
+      }
+      return name;
+    },
+    showDeliveryStatus(item) {
+      let name = "";
+      if (item.wmstatus === 4) {
+        name = "其他平台完成";
+      }
+      if (item.deliveryStatus === 4) {
+        name = "已完成";
+      }
+      if (item.deliveryStatus === -1) {
+        name = "已取消";
+      }
+      return name;
+    },
   },
 };
 </script>

src/components/orderSearch.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="mainContent">
     <el-row class="order_tab">
-      <el-col :span="9" class="search">
+      <el-col :span="12" class="search">
         <div class="header_serch">
           <div class="search_inp">
             <el-input size="medium" class="inp" v-model="params.searchKey" placeholder="请输入手机号/姓名/地址/订单编号"></el-input>
-            <el-button size="medium" @click.stop="search" type="primary" slot="append" icon="el-icon-search"></el-button>
+            <el-button size="medium" @click="search" type="primary" slot="append" icon="el-icon-search"></el-button>
           </div>
           <!-- 1.0.0版本暂不开发该功能 -->
           <!-- <div class="Manual">手动发单</div> -->
@@ -36,7 +36,7 @@
             <el-date-picker size="small" v-model="value1" class="item3" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
           </div>
-          <el-button size='small' style="background: #0D1E40;color:#fff">查询</el-button>
+          <el-button size='small' @click="search" style="background: #0D1E40;color:#fff">查询</el-button>
 
         </div>
       </el-col>
@@ -44,7 +44,7 @@
 
     <el-row class="order_list">
       <el-col :span="24" v-loading="isLoading">
-        <order-list :list='orderList' :tabNum='tab_ac'></order-list>
+        <order-list :list='orderList' :tabNum='tabNum'></order-list>
         <div style="text-align: center;">
           <el-pagination :current-page.sync="params.pageNum" @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[10, 20, 50, 100]" :page-size="params.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" background>
           </el-pagination>
@@ -58,7 +58,7 @@
 import bus from "../common/bus.js";
 import sendOrderPopup from "./orderComponents/sendOrderPopup.vue";
 import OrderList from "./orderComponents/orderList.vue";
-import { getOrderList, getOrderMarker } from "../api/order.js";
+import { getOrderList } from "../api/order.js";
 import { getShopList } from "../api/shop.js";
 export default {
   data() {
@@ -117,7 +117,7 @@ export default {
           status: 98,
         },
       ],
-      tab_ac: 0,
+      tabNum: -1,
       isLoading: false,
       total: 0,
       orderList: [],
@@ -134,7 +134,7 @@ export default {
   created() {
     this.getShopList();
     bus.$on("pullData", (index) => {
-      this.tab_ac = index;
+      this.tabNum = index;
       this.params.status = this.tab_list[index].status;
       this.params.pageNum = 1;
       this.orderList = [];
@@ -153,6 +153,19 @@ export default {
     bus.$off("refreshData");
   },
   methods: {
+    search() {
+      if(this.value1 && this.value1.length){
+        this.params.startDate = this.$tool.formatDateTime(this.value1[0])
+        this.params.endtDate = this.$tool.formatDateTime(this.value1[1])
+      }else {
+        this.params.startDate = ''
+        this.params.endDate = ''
+      }
+        
+      this.params.pageNum = 1;
+      this.orderList = [];
+      this.getOrder();
+    },
     handleSizeChange(val) {
       this.params.pageNum = 1;
       this.params.pageSize = val;
@@ -179,7 +192,7 @@ export default {
             element.takeTimeTxt = this.$tool.timeago(
               new Date(element.takeTime).getTime()
             );
-            if (_this.tab_ac == 1) {
+            if (_this.tabNum == 1) {
               if (element.exceptTime) {
                 element.timeTxt = _this.$tool.eosFormatTime2(
                   element.exceptTime,