bugfix

src/api/order.js

@@ -52,7 +52,7 @@ export const setDeliveryTime = ( params ) => {
 
 // 取消定时发单
 export const cancelTimingPublish = ( params ) => {
-  return post('app/order/cancelTimingPublish', params);
+  return postJson('app/order/cancelTimingPublish', params);
 }
 
 // 取消订单

src/components/Home.vue

@@ -3,13 +3,7 @@
     <el-row class="order_tab">
       <el-col :span="15">
         <div class="tabList">
-          <div
-            class="tab_item"
-            @click="changeTab(i, item.status)"
-            :class="{ tab_item_ac: tabNum == i ? true : false }"
-            v-for="(item, i) in tabList"
-            :key="i"
-          >
+          <div class="tab_item" @click="changeTab(i, item.status)" :class="{ tab_item_ac: tabNum == i ? true : false }" v-for="(item, i) in tabList" :key="i">
             <div class="point" v-show="item.num">{{ item.num }}</div>
             <span>{{ item.name }}</span>
             <div class="tab_line"></div>
@@ -19,21 +13,8 @@
       <el-col :span="9" class="search">
         <div class="header_serch">
           <div class="search_inp">
-            <el-input
-              size="medium"
-              class="inp"
-              v-model="searchKey"
-              placeholder="请输入手机号/姓名/地址/订单编号"
-              @keydown.enter.native="seachEnterFun"
-              clearable
-            ></el-input>
-            <el-button
-              size="medium"
-              type="primary"
-              @click.stop="search"
-              slot="append"
-              icon="el-icon-search"
-            ></el-button>
+            <el-input size="medium" class="inp" v-model="searchKey" placeholder="请输入手机号/姓名/地址/订单编号" @keydown.enter.native="seachEnterFun" clearable></el-input>
+            <el-button size="medium" type="primary" @click.stop="search" slot="append" icon="el-icon-search"></el-button>
           </div>
           <!-- 1.0.0版本暂不开发该功能 -->
           <!-- <div class="Manual">手动发单</div> -->
@@ -45,16 +26,7 @@
       <el-col :span="24" v-loading="isLoading">
         <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 :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>
         </div>
       </el-col>
@@ -131,19 +103,7 @@ export default {
   },
 
   created() {
-    bus.$on("pullData", (index) => {
-      this.tabNum = index;
-      this.params.status = this.tabList[index].status;
-      this.params.pageNum = 1;
-      this.orderList = [];
-      Promise.all([this.getOrder(), this.getMarker()]);
-    });
-    bus.$on("refreshData", () => {
-      console.log("执行refreshData");
-      this.params.pageNum = 1;
-      this.orderList = [];
-      Promise.all([this.getOrder(), this.getMarker()]);
-    });
+    this.init();
     this.getOrder();
     this.getMarker();
     this.timer = setInterval(() => {
@@ -165,6 +125,21 @@ export default {
     bus.$off("refreshData");
   },
   methods: {
+    init() {
+      bus.$on("pullData", (index) => {
+        this.tabNum = index;
+        this.params.status = this.tabList[index].status;
+        this.params.pageNum = 1;
+        this.orderList = [];
+        Promise.all([this.getOrder(), this.getMarker()]);
+      });
+      bus.$on("refreshData", () => {
+        console.log("执行refreshData");
+        this.params.pageNum = 1;
+        this.orderList = [];
+        Promise.all([this.getOrder(), this.getMarker()]);
+      });
+    },
     seachEnterFun(e) {
       var keyCode = window.event ? e.keyCode : e.which;
       if (keyCode == 13) {
@@ -294,9 +269,9 @@ export default {
           } else {
             this.orderList = this.orderList.concat(normalList);
           }
-          deliveryList.forEach((v) => {
+          deliveryList.forEach((item) => {
             this.orderList = this.orderList.filter((v) => {
-              return v.id !== v.id;
+              return v.id !== item;
             });
           });
           this.total = this.orderList.length;

src/components/accountCompoents/consumption.vue

@@ -38,7 +38,7 @@
             <div v-if="!scope.row.payType">--</div>
           </template>
         </el-table-column> -->
-        <el-table-column prop="amount" label="充值金额">
+        <el-table-column prop="amount" label="金额">
           <template slot-scope="scope">
             <div>{{scope.row.type === 1 ? '+' : '-'}}{{ scope.row.amount.toFixed(2) }}</div>
           </template>

src/components/orderComponents/orderDetail.vue

@@ -14,7 +14,7 @@
         <div class="detail_ine"></div>
       </template>
 
-      <template v-if="orderDetail.caution || orderDetail.caution">
+      <template v-if="orderDetail.caution || orderDetail.takeRemark">
         <div class="info2" v-if="orderDetail.caution">
           <div class="title">用户备注：</div>
           <div class="cont cont1">{{orderDetail.caution.length > 60 ? orderDetail.caution.slice(0,60) + '...' : orderDetail.caution}}</div>
@@ -67,7 +67,7 @@
       </div>
       <div class="info2 info4" v-if="!orderDetail.waimaiOrderId">
         <div class="title">取件时间：</div>
-        <div class="cont cont2">{{ !orderDetail.exceptTime ? '立即取件' : orderDetail.takeTime}}</div>
+        <div class="cont cont2">{{ !orderDetail.orderType ? '立即取件' : orderDetail.takeTime}}</div>
       </div>
       <!-- <div class="info2 info4" v-if="orderDetail.takeTime && buttonStatus !== 0 && buttonStatus !== 10 ">
         <div class="title">发单时间：</div>

src/components/orderComponents/orderList.vue

@@ -113,7 +113,7 @@
               </div>
             </div>
           </div>
-          <div v-if="item.caution" class="itme_r">备注：{{ item.caution }}</div>
+          <!-- <div v-if="item.caution" class="itme_r">备注：{{ item.caution }}</div> -->
         </div>
       </el-col>
       <!-- 订单追踪、订单详情 -->
@@ -184,13 +184,13 @@
       </el-col>
     </el-row>
     <!-- 发起配送 -->
-    <send-order-popup ref="sendOrderPopup"></send-order-popup>
+    <send-order-popup :tabNum="tabNum" ref="sendOrderPopup"></send-order-popup>
     <!-- 骑手、商家、发件人地图 -->
     <order-map ref="orderMap"></order-map>
     <!-- 备注弹出层 -->
     <el-dialog width="580px" center title="新增备注" destroy-on-close :visible.sync="dialogTableVisible">
       <div>
-        <el-input placeholder="请添加备注信息，最多输入20个字！" v-model="remark" :maxlength="20" />
+        <el-input placeholder="请添加备注信息，最多输入20个字！" v-model="remark" clearable :maxlength="20" />
       </div>
       <div style="text-align: center; margin-top: 20px">
         <el-button @click.stop="dialogTableVisible = false">取消</el-button>
@@ -207,11 +207,11 @@
         <span>小时</span>
       </div>
       <p style="color: #f74141">
-        提示：设置后系统将根据您设置的提前时间自动发单。
+        提示：设置后系统将根据您设置的提前时间自动发单。{{delayTime ? '' : '如需骑手立即取件请点击立即配送!'}}
       </p>
       <div style="text-align: center; margin-top: 20px">
-        <el-button @click.stop="settingTimeStatus = false">取消预约发单</el-button>
-        <el-button type="primary" class="submit-btn" @click.stop="commitTimeValue(orderId)">确定修改</el-button>
+        <el-button v-if="delayTime" @click.stop="cancalSettingTime">取消预约发单</el-button>
+        <el-button type="primary" class="submit-btn" @click.stop="commitTimeValue(orderId)">{{delayTime ? '确定修改' : '保存'}}</el-button>
       </div>
     </el-dialog>
     <!-- 取消订单弹出层 -->
@@ -354,6 +354,7 @@ export default {
       buttonStatus: 0,
       exceptTime: "",
       hasLocation: false, // 是否有骑手位置
+      delayTime: "", // 预约延迟时间
     };
   },
   props: {
@@ -369,13 +370,6 @@ export default {
   },
   watch: {
     tabNum(newVal, oldVal) {
-      if (newVal === 0 || newVal === 1) {
-        this.needTrack = false;
-        this.orderDetailStutus = 1;
-      } else {
-        this.needTrack = true;
-        this.orderDetailStutus = 0;
-      }
       this.curIdx = 0;
     },
     list(newVal, oldVal) {
@@ -399,6 +393,7 @@ export default {
       this.showCode = false;
       this.addTipStatus = false;
       bus.$emit("refreshData");
+      bus.$emit("refreshData2");
     },
     richMoney() {
       let reg = /(^[1-9]\d*$)/g;
@@ -426,6 +421,7 @@ export default {
               type: "success",
             });
             bus.$emit("refreshData");
+            bus.$emit("refreshData2");
             this.addTipStatus = false;
             this.tipAmount = "";
           } else if (this.paymentType == 1 || this.paymentType == 2) {
@@ -471,7 +467,6 @@ export default {
         cancelReason:
           this.reasonIndex != 8 ? this.chooseReason : this.cancelReason,
       }).then((res) => {
-        this.cancelStatus = false;
         if (res.code == 200) {
           this.$message({
             message: "取消订单成功",
@@ -482,6 +477,8 @@ export default {
           this.chooseReason = "";
           this.reasonIndex = null;
           bus.$emit("refreshData");
+          bus.$emit("refreshData2");
+          this.cancelStatus = false;
         } else {
           this.$message({
             message: res.msg,
@@ -490,8 +487,9 @@ export default {
         }
       });
     },
+    // 取消定时发单
     cancalSettingTime() {
-      cancelTimingPublish({ orderId: this.item.orderId }).then((res) => {
+      cancelTimingPublish({ orderId: this.item.id }).then((res) => {
         this.settingTimeStatus = false;
         if (res.code == 200) {
           this.$message({
@@ -500,6 +498,7 @@ export default {
           });
           this.item = {};
           bus.$emit("refreshData");
+          bus.$emit("refreshData2");
         } else {
           this.$message({
             message: res.msg,
@@ -534,6 +533,7 @@ export default {
           });
           this.item = {};
           bus.$emit("refreshData");
+          bus.$emit("refreshData2");
         } else {
           this.$message({
             message: res.msg,
@@ -546,6 +546,7 @@ export default {
     settingTime(item) {
       this.item = item;
       this.settingTimeStatus = true;
+      this.delayTime = item.delayTime;
       this.timeValue = item.delayTime ? item.delayTime : 1;
       this.exceptTime = `预约期望${item.exceptTime.slice(5)}送达`;
     },
@@ -584,6 +585,7 @@ export default {
                 message: "已忽略!",
               });
               bus.$emit("refreshData");
+              bus.$emit("refreshData2");
             } else {
               this.$message({
                 message: res.msg,
@@ -607,6 +609,12 @@ export default {
     },
     // 一键发单备注
     commitRemark(orderId, item) {
+      // if(!this.remark.trim()){
+      //   return this.$message({
+      //       message: '请输入发单备注再确认！',
+      //       type: "error",
+      //     });
+      // }
       let params = {
         orderId,
         remark: this.remark.trim(),
@@ -618,14 +626,16 @@ export default {
             message: "添加备注成功",
             type: "success",
           });
-          this.$set(
-            this.list.find((v) => {
-              return item.id == v.id;
-            }),
-            "takeRemark",
-            this.remark
-          );
-          this.$forceUpdate();
+          bus.$emit("refreshData");
+          bus.$emit("refreshData2");
+          // this.$set(
+          //   this.list.find((v) => {
+          //     return item.id == v.id;
+          //   }),
+          //   "takeRemark",
+          //   this.remark
+          // );
+          // this.$forceUpdate();
         } else {
           this.$message({
             message: res.msg,
@@ -660,6 +670,7 @@ export default {
             type: "success",
           });
           bus.$emit("refreshData");
+          bus.$emit("refreshData2");
         } else {
           this.$message({
             message: res.msg,

src/components/orderComponents/orderTrack.vue

@@ -98,7 +98,7 @@
                     }})</span>
                   已接单
                 </div>
-                <div class="p-bottom" v-if="v.orderStatus === 3">
+                <div class="p-bottom" v-if="v.orderStatus === 3 && buttonStatus === 3">
                   <span class="send">正在派送中</span>
                 </div>
               </div>

src/components/orderComponents/sendOrderPopup.vue

@@ -27,14 +27,18 @@
                元
             </div>
             <div class="youhui" v-if="deliveryList.length >= 1">
-              优惠合计最高{{
+              {{
+                order.firstCoupon
+                        ? `新人首单立减${order.firstCoupon}元，`
+                        : ""
+                }}优惠合计最高{{
                 discount(
                   deliveryList.length > 1
                     ? computedAmountMax
                     : computedAmountOther,
                   tipAmount,
                   couponPrice,
-                  order.firstCoupon || 0,
+                  Number(order.firstCoupon),
                   0
                 )
               }}元
@@ -67,7 +71,7 @@
                         item.deliveryAmount,
                         tipAmount,
                         couponPrice,
-                        order.firstCoupon || 0,
+                        Number(order.firstCoupon),
                         item.isMine
                       )
                     }}</span>&nbsp;元
@@ -78,14 +82,14 @@
                     " class="item-coupon">
                     {{
                       order.firstCoupon
-                        ? `新人首单立减${order.firstCoupon}元 `
+                        ? `新人首单立减${order.firstCoupon}元，`
                         : ""
                     }}优惠合计{{
                       discount(
                         item.deliveryAmount,
                         tipAmount,
                         couponPrice,
-                        order.firstCoupon || 0,
+                        Number(order.firstCoupon),
                         item.isMine
                       )
                     }}元
@@ -136,7 +140,7 @@
       </div>
     </el-dialog>
     <!-- 支付二维码弹出层 -->
-    <qr-code v-if="showCode" @paySuccess="paySuccess" @refreshCode="payMoney" @closeCode="showCode = false" ref="code" :payAmount="payAmount" :link="link" :paymentType="payId" :orderSn="orderSn"></qr-code>
+    <qr-code v-if="showCode" @paySuccess="paySuccess" @refreshCode="payMoney" @closeCode="closeCode" ref="code" :payAmount="payAmount" :link="link" :paymentType="payId" :orderSn="orderSn"></qr-code>
   </div>
 </template>
 
@@ -193,6 +197,7 @@ export default {
       loading: false,
     };
   },
+  props: { tabNum: Number },
   components: {
     qrCode,
   },
@@ -393,10 +398,18 @@ export default {
     },
   },
   methods: {
+    closeCode() {
+      this.showCode = false;
+      this.loading = false;
+    },
     paySuccess() {
       this.showCode = false;
       this.dialogTableVisible = false;
       this.loading = false;
+      if (this.tabNum === -1) {
+        bus.$emit("refreshData2");
+        return;
+      }
       bus.$emit("pullData", 2);
     },
     payMoney() {
@@ -431,6 +444,10 @@ export default {
           if (this.payId == 4) {
             this.dialogTableVisible = false;
             this.loading = false;
+            if (this.tabNum === -1) {
+              bus.$emit("refreshData2");
+              return;
+            }
             bus.$emit("pullData", 2);
           } else if (
             (this.payId == 1 || this.payId == 2) &&

src/components/orderSearch.vue

@@ -139,13 +139,12 @@ export default {
     if (searchKey) {
       this.params.searchKey = searchKey;
     }
-    this.getShopList();
     this.init();
+    this.getShopList();
     this.getOrder();
   },
   destroyed() {
-    bus.$off("pullData");
-    bus.$off("refreshData");
+    bus.$off("refreshData2");
   },
   methods: {
     seachEnterFun(e) {
@@ -155,18 +154,10 @@ export default {
       }
     },
     init() {
-      bus.$on("pullData", (index) => {
-        this.tabNum = index;
-        this.params.status = this.tab_list[index].status;
-        this.params.pageNum = 1;
-        this.orderList = [];
-        Promise.all([this.getOrder(), this.getMarker()]);
-      });
-      bus.$on("refreshData", () => {
-        console.log("执行refreshData");
-        this.params.pageNum = 1;
+      bus.$on("refreshData2", () => {
+        console.log("执行refreshData2");
         this.orderList = [];
-        Promise.all([this.getOrder(), this.getMarker()]);
+        this.getOrder();
       });
     },
     search() {
@@ -206,7 +197,7 @@ export default {
           this.params.pageNum = res.data.pageNum;
           res.data.data.forEach((element) => {
             element.takeTimeTxt = this.$tool.timeago(
-              new Date(element.takeTime).getTime()
+              new Date(element.sendTime).getTime()
             );
             if (_this.tabNum == 1) {
               if (element.exceptTime) {

src/components/settingComponents/voiceSetting.vue

@@ -56,7 +56,7 @@
     <!-- // 选择自动配送运力 -->
     <el-dialog title="自动配送设置" @close="cancel" :visible.sync="centerDialogVisible" width="800px" center>
       <el-input placeholder="请输入自动配送时长" v-model="autodeliveryOrderTime" clearable>
-      <template slot="append">分钟</template>
+        <template slot="append">分钟</template>
       </el-input>
       <div class="delivery-list">
         <div @click="chooseDelivery(v.deliveryId)" :class="autodeliveryIds.includes(String(v.deliveryId)) ? 'delivery active' : 'delivery'" v-for="(v,i) in deliveryList" :key="i">{{v.name}}</div>
@@ -148,7 +148,9 @@ export default {
           this.openAutodelivery = res.data.openAutodelivery;
           this.openAutoorder = res.data.openAutoorder;
           this.openPrintSwitch = res.data.openPrintSwitch;
-          this.autodeliveryIds = res.data.autodeliveryIds ? res.data.autodeliveryIds.split(",") : [];
+          this.autodeliveryIds = res.data.autodeliveryIds
+            ? res.data.autodeliveryIds.split(",")
+            : [];
         } else {
           this.$message({
             type: "error",
@@ -197,6 +199,8 @@ export default {
       if (this.openAutodelivery === 1) {
         this.centerDialogVisible = true;
       } else {
+        this.autodeliveryIds = "";
+        this.autodeliveryOrderTime = 5;
         this.updateConfig();
       }
     },

src/components/shopCompoents/bindDelivery.vue

@@ -362,6 +362,7 @@ export default {
       // UU跑腿解除绑定
       if (v.type === 7) {
         this.title = "UU跑腿解绑";
+        this.UUData.mobile = "";
         this.centerDialogVisible = true;
         return;
       }

src/components/shopCompoents/printerAdd.vue

@@ -150,8 +150,6 @@ export default {
     };
   },
   created(){
-    this.saveFun = this.$tool.throttle(this.savePrinter, 2000);
-    console.log(1111,this.saveFun);
   },
   methods: {
     changeType(v) {
@@ -178,7 +176,7 @@ export default {
       }
       this.showVisible = true;
     },
-    savePrinter() {
+    save() {
       if (!String(this.form.deviceId).trim()) {
         return this.$message({
           type: "error",
@@ -221,9 +219,6 @@ export default {
         this.loading = false;
       });
     },
-    save() {
-      this.saveFun()
-    },
     add(type) {
       switch (type) {
         case 1: