解决冲突

package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "axios": "^0.21.4",
     "element-ui": "^2.15.5",
+    "moment": "^2.29.1",
     "node-sass": "^6.0.1",
     "qrcodejs2": "0.0.2",
     "qs": "^6.10.1",

src/api/order.js

@@ -45,3 +45,18 @@ export const ignoreOrder = ( params ) => {
 export const rollOrder = ( params ) => {
   return post('app/order/rollOrder', params);
 }
+
+// 定时发单
+export const setDeliveryTime = ( params ) => {
+  return get('app/order/setDeliveryTime', params);
+}
+
+// 取消定时发单
+export const cancelTimingPublish = ( params ) => {
+  return post('app/order/cancelTimingPublish', params);
+}
+
+// 取消订单
+export const cancelOrder = ( params ) => {
+  return post('app/order/cancel', params);
+}

src/components/Home.vue

@@ -15,7 +15,7 @@
         <div class="header_serch">
           <div class="search_inp">
             <el-input class="inp" v-model="params.searchKey" placeholder="请输入手机号/姓名/地址/订单编号"></el-input>
-            <div class="btn"><i class="el-icon-search"></i></div>
+            <div class="btn" @click.stop="search"><i class="el-icon-search"></i></div>
           </div>
           <!-- 1.0.0版本暂不开发该功能 -->
           <!-- <div class="Manual">手动发单</div> -->
@@ -130,6 +130,11 @@
       console.log(this.$tool.eosFormatTime2("2017-07-10 16:00:00", 2.5))
     },
     methods: {
+      search() {
+        this.params.pageNum = 1;
+        this.orderList = [];
+        this.getOrder();
+      },
       handleSizeChange(val) {
         this.params.pageNum = 1;
         this.params.pageSize = val;