From 0ff138613fd0c26bf5b20a3f1247c476c12411fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Thu, 16 Mar 2023 01:51:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/item.vue |  1 -
 src/core/models/order.js      | 13 ++++++++++
 src/pages/order/detail.vue    | 46 ++++++++++++++++++++++-------------
 src/pages/order/order.vue     |  3 ++-
 4 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/components/order/item.vue b/src/components/order/item.vue
index 51b0986..b5d55ec 100644
--- a/src/components/order/item.vue
+++ b/src/components/order/item.vue
@@ -61,7 +61,6 @@ export default {
     components: {},
     created() {},
     mounted() {
-        // console.log(this.order);
         let [typeText, typeTextBg] = this.$models.order.orderTypeText(this.order.listType, this.order.orderType);
         this.typeText = typeText;
         this.typeTextBg = typeTextBg ? typeTextBg : "#8b9beb";
diff --git a/src/core/models/order.js b/src/core/models/order.js
index 3ab1887..0fdf8c9 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -41,5 +41,18 @@ export default {
                 return reject(response.msg);
             }).catch(e => { });
         });
+    },
+    /**
+     * 获取详情
+     */
+    getDetail(options) {
+        return new Promise((resolve, reject) => {
+            prototype.$request(options.request).then(response => {
+                if (response.code == 1) {
+                    return resolve(response.data);
+                }
+                return reject(response.msg);
+            }).catch(e => { });
+        });
     }
 }
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 6b5cb5f..aea32eb 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -37,9 +37,8 @@
                         <view class="title">上门时间：</view>
                         <view class="content service-time">
                             <text class="datetime">
-                                {{ order.serviceDateTime.date }} {{ order.serviceDateTime.time[0] }}-{{
-                                    order.serviceDateTime.time[1]
-                                }}
+                                {{ order.serviceDateTime.date }}
+                                {{ order.serviceDateTime.time[0] }}-{{ order.serviceDateTime.time[1] }}
                             </text>
                             <text class="iconfont icon-bianji"></text>
                         </view>
@@ -78,12 +77,7 @@
                 <text class="text">客服</text>
             </view>
             <view class="action">
-                <block v-if="type == 'detail'">
-                    <order-action :order="order" @confirmPrice="confirmPrice(order.id)" />
-                </block>
-                <block v-if="type == 'preview'">
-                    <get-action :order="order" @postPrice="postPrice(order.id)" />
-                </block>
+                <order-action :order="order" @confirmPrice="confirmPrice(order.id)" />
             </view>
         </view>
         <order-confirm-price v-show="showConfirmModal" @close="showConfirmModal = false" @confirm="showConfirmModal = false" />
@@ -106,7 +100,9 @@ export default {
             pageConfig: {},
             showPriceModal: false,
             showConfirmModal: false,
-            type: "detail",
+            listType: "",
+            typeText: "",
+            typeTextBg: "",
             order: {
                 id: 1,
                 orderId: "xxgfdkgn1223",
@@ -145,7 +141,7 @@ export default {
         OrderConfirmPrice,
         GetPostPrice,
     },
-    onLoad(e) {
+    async onLoad(e) {
         this.pageConfig = getApp().globalData.pageConfig;
         if (e.id && e.id > 0) {
             this.id = e.id;
@@ -153,9 +149,11 @@ export default {
             this.$utils.toast("参数错误");
             return;
         }
-        if (e.type == "preview") {
-            this.type = e.type;
-        }
+        this.listType = e.type;
+        await this.loadDetail();
+        let [typeText, typeTextBg] = this.$models.order.orderTypeText(this.listType, this.order.orderType);
+        this.typeText = typeText;
+        this.typeTextBg = typeTextBg ? typeTextBg : "#8b9beb";
     },
     onShow() {},
     onReady() {},
@@ -178,9 +176,23 @@ export default {
             this.$store.commit("order/setConfirmId", id);
             this.showConfirmModal = true;
         },
-        postPrice(id) {
-            this.$store.commit("order/setPostId", id);
-            this.showPriceModal = true;
+        /**
+         * 订单详情
+         */
+        loadDetail() {
+            this.$models.order
+                .getDetail({
+                    request: {
+                        api: "order.detail." + this.listType,
+                        data: {
+                            id: this.id,
+                        },
+                    },
+                    listType: this.listType,
+                })
+                .then((response) => {
+                    console.log(response);
+                });
         },
     },
 };
diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue
index 3fc6551..cd4345b 100644
--- a/src/pages/order/order.vue
+++ b/src/pages/order/order.vue
@@ -168,7 +168,8 @@ export default {
             });
         },
         toDetail(id) {
-            this.$utils.toPage("/pages/order/detail?type=detail&id=" + id);
+            let currentTab = this.tabList[this.tabIndex];
+            this.$utils.toPage("/pages/order/detail?list=" + currentTab.listType + "&id=" + id);
         },
     },
 };