Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/src/pages/home/userCenter/MyTracks.vue

@@ -112,7 +112,9 @@ export default {
       tracksList(this.params).then((res) => {
         this.spinShow = false;
         if (res.success && res.result.records.length) {
-          this.list = res.result.records;
+          this.list = res.result.records.filter(item =>{
+            return item != null
+          });
           this.total = res.result.total
         } else {
           this.list = [];

manager/src/views/page/article-manage/hotWords.vue

@@ -34,7 +34,7 @@ export default {
       templatesWay: [
         {
           template: "todayHotWords",
-          label: "今日热次",
+          label: "今日热词",
         },
         {
           template: "historyHotWords",

seller/src/views/order/order/orderDetail.vue

@@ -117,7 +117,7 @@
           </template>
         </Col>
         <Col span="12">
-          <div class="div-item">
+          <div class="div-item" v-if="orderInfo.order.deliveryMethod != 'SELF_PICK_UP'">
             <div class="div-item-left">收货信息：</div>
             <div class="div-item-right">
               {{ orderInfo.order.consigneeName }}
@@ -126,6 +126,13 @@
               {{ orderInfo.order.consigneeDetail }}
             </div>
           </div>
+          <div class="div-item"  v-if="orderInfo.order.deliveryMethod == 'SELF_PICK_UP'">
+            <div class="div-item-left">自提信息：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.storeAddressPath }}
+              {{ orderInfo.order.storeAddressMobile }}
+            </div>
+          </div>
           <div class="div-item">
             <div class="div-item-left">支付方式：</div>
             <div class="div-item-right">

seller/src/views/order/order/orderList.vue

@@ -39,6 +39,7 @@
             <Option value="DELIVERED">已发货</Option>
             <Option value="COMPLETED">已完成</Option>
             <Option value="CANCELLED">已取消</Option>
+            <Option value="STAY_PICKED_UP">待自提</Option>
           </Select>
         </Form-item>
         <Form-item label="订单类型" prop="orderType">
@@ -225,6 +226,10 @@ export default {
               return h("div", [
                 h("tag", { props: { color: "geekblue" } }, "待发货"),
               ]);
+            }else if (params.row.orderStatus == "STAY_PICKED_UP") {
+              return h("div", [
+                h("tag", { props: { color: "geekblue" } }, "待自提"),
+              ]);
             } else if (params.row.orderStatus == "DELIVERED") {
               return h("div", [
                 h("tag", { props: { color: "cyan" } }, "已发货"),