增加待提货

releaselog.md

@@ -1,4 +1,7 @@
 
+# 0.1.5 (20.10.15 14:20)
+### 增加待提货
+
 # 0.1.4 (20.10.15 14:20)
 ### 修改不能拨打电话
 

src/pages/index/index.vue

@@ -49,7 +49,15 @@
                                         <div class="des">
                                             <span>订单号：</span>
                                             {{ order.orderInfo.tradeNo }}
-                                            <span class="copy" @click="copy(order.orderInfo.tradeNo)">复制</span>
+                                            <span
+                                                class="copy"
+                                                @click="
+                                                    copy(
+                                                        order.orderInfo.tradeNo
+                                                    )
+                                                "
+                                                >复制</span
+                                            >
                                         </div>
                                     </div>
                                     <div class="tags">
@@ -93,18 +101,25 @@
                                                 ""
                                             }}
                                         </p>
-                                        <div
-                                            class="order__title on order__title2"
+                                        <block
+                                            v-if="
+                                                order.orderInfo
+                                                    .deliveryMethod === 2
+                                            "
                                         >
-                                            {{ order.toAddress.address }}
-                                        </div>
-                                        <p class="order__des on">
-                                            {{
-                                                order.toAddress.province +
-                                                order.toAddress.city +
-                                                order.toAddress.county
-                                            }}
-                                        </p>
+                                            <div
+                                                class="order__title on order__title2"
+                                            >
+                                                {{ order.toAddress.address }}
+                                            </div>
+                                            <p class="order__des on">
+                                                {{
+                                                    order.toAddress.province +
+                                                    order.toAddress.city +
+                                                    order.toAddress.county
+                                                }}
+                                            </p>
+                                        </block>
                                     </div>
                                 </div>
                                 <!-- <div class="yuji" v-if="tab!==4">预计{{order | yujiTime}}送达</div> -->
@@ -199,13 +214,20 @@
                                     <div
                                         class="btn active"
                                         v-if="tab === 2"
+                                        @click="completeOrder(order, oindex)"
+                                    >
+                                        已提货
+                                    </div>
+                                    <div
+                                        class="btn active"
+                                        v-if="tab === 3"
                                         @click="deliveryOrder(order, oindex)"
                                     >
                                         配送中
                                     </div>
                                     <div
                                         class="btn active"
-                                        v-if="tab === 3"
+                                        v-if="tab === 4"
                                         @click="completeOrder(order, oindex)"
                                     >
                                         完成订单
@@ -259,6 +281,13 @@ export default {
                     page: 1,
                     list: [],
                 },
+                {
+                    title: "待提货",
+                    status: "26",
+                    num: 0,
+                    page: 1,
+                    list: [],
+                },
                 {
                     title: "待配送",
                     status: "23",
@@ -274,7 +303,7 @@ export default {
                     list: [],
                 },
                 {
-                    title: "已送达",
+                    title: "已完成",
                     status: "9",
                     num: 0,
                     page: 1,
@@ -327,7 +356,7 @@ export default {
         //     return;
         // }
         await self.fn.init();
-        
+
         self.fn.shareMenu({});
         this.getList();
     },
@@ -460,6 +489,28 @@ export default {
                     }
                 });
         },
+        // 提货
+        completeOrder(val, index) {
+            this.api
+                .get(
+                    "/Order/CompleteOrder ",
+                    {
+                        id: val.orderInfo.id,
+                    },
+                    {
+                        repeat: true,
+                    }
+                )
+                .then((res) => {
+                    if (res.success) {
+                        this.fn.showToast("提货成功");
+                        this.orderList.splice(index, 1);
+                        this.orderList = [...this.orderList];
+                    } else {
+                        this.fn.showToast("提货失败：" + res.message);
+                    }
+                });
+        },
         // 配送中
         deliveryOrder(val, index) {
             this.api
@@ -664,7 +715,7 @@ page {
     }
     &__top2 {
         margin-top: px(20);
-        .copy{
+        .copy {
             display: inline-block;
             font-size: px(32);
             line-height: px(44);