feat 订单

src/components/orderComponents/orderAMap.vue

@@ -1,10 +1,10 @@
 <template>
   <el-dialog width="80%" :show-close="false" destroy-on-close :visible.sync="dialogTableVisible">
     <!-- <div id="container"></div> -->
-    <div>
+    <div class="search">
       <el-row>
         <el-col :span="8">
-          <el-input v-model="searchKey" />
+          <el-input placeholder="请输入地址搜索" v-model="searchKey" />
         </el-col>
         <el-col :span="4">
           <el-button @click.stop="searchMap" type="primary">搜&nbsp;索</el-button>
@@ -102,6 +102,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.search {
+  margin-bottom: 10px;
+}
 /* 图标大小修改 */
 /deep/ .el-dialog__header {
   display: none !important;

src/components/orderComponents/orderList.vue

@@ -58,10 +58,10 @@
                 </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>
-                  <el-button size='small' class="btn" @click.stop="itemAddRemark(item.id, item)">添加备注</el-button>
-                  <el-button size='small' class="btn" @click.stop="iGnoreOrder(item.id)">忽略订单</el-button>
                 </div>
               </div>
               <div class="order_item_cont">
@@ -294,7 +294,7 @@
           <div v-show="showDetail || showTrack">
             <!-- 新订单 -->
             <div class="btns" v-if="tabNum === 0">
-              <el-button size='small' @click.native="itemAddRemark(list[curIdx].id, list[curIdx])" class="btn_bots">发单备注</el-button>
+              <el-button size='small' @click.native="itemAddRemark(list[curIdx].id, list[curIdx])" class="btn_bots">添加备注</el-button>
               <el-button size='small' @click.native="iGnoreOrder(list[curIdx].id)" class="btn_bots">忽略订单</el-button>
               <el-button size='small' @click.native="orderPrinter(list[curIdx].waimaiOrderId)" class="btn_bots">补打发票</el-button>
               <el-button size='small' @click.native="deleteItem(list[curIdx])" class="btn_bots btn">发起配送</el-button>
@@ -310,15 +310,15 @@
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
-              <el-button size='small' @click.native="itemAddRemark(list[curIdx].id, list[curIdx])" class="btn_bots">发单备注</el-button>
+              <el-button size='small' @click.native="itemAddRemark(list[curIdx].id, list[curIdx])" class="btn_bots">添加备注</el-button>
               <el-button size='small' @click.native="settingTime(list[curIdx])" class="btn_bots btn">定时发单</el-button>
-              <el-button size='small' @click.native="deleteItem(list[curIdx])" type="primary" class="btn_bots">发起配送</el-button>
+              <el-button size='small' @click.native="deleteItem(list[curIdx])" 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>
-              <el-button size='small' @click.native="orderPrinter(list[curIdx].waimaiOrderId)" class="btn_bots btn">补打发票</el-button>
-              <el-button size='small' @click.native="addTip(list[curIdx].id)" type="primary" class="btn_bots">加小费</el-button>
+              <el-button size='small' @click.native="orderPrinter(list[curIdx].waimaiOrderId)" class="btn_bots">补打发票</el-button>
+              <el-button size='small' @click.native="addTip(list[curIdx].id)" class="btn_bots btn">加小费</el-button>
             </div>
             <!-- 取货中 -->
             <div class="btns" v-if="tabNum === 3">