From deb30c1c40be52f9bae23316f17e35cb1f0a50fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Wed, 15 Mar 2023 11:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=9C=80=E6=B1=82=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=B1=BB=E5=9E=8B=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/get/action.vue |  4 +--
 src/core/models/get.js        | 44 ++++++++++++++++++++++-
 src/core/models/order.js      |  4 +--
 src/pages/get/detail.vue      | 67 +++--------------------------------
 src/pages/get/index.vue       |  2 +-
 5 files changed, 53 insertions(+), 68 deletions(-)

diff --git a/src/components/get/action.vue b/src/components/get/action.vue
index 16d8001..bfc44a3 100644
--- a/src/components/get/action.vue
+++ b/src/components/get/action.vue
@@ -1,11 +1,11 @@
 <template>
     <view class="component-get-action">
-        <block v-if="order.listType == 't1' || order.listType == 't3' || (order.listType == 't2' && order.orderType == 2)">
+        <block v-if="order.listType == 't1' || order.listType == 't3' || (order.listType == 't2' && order.orderType == 1)">
             <view class="btn active" @click.stop="getOrder">
                 <text>立即抢单</text>
             </view>
         </block>
-        <block v-if="order.listType == 't2' && order.orderType == 1">
+        <block v-if="order.listType == 't2' && order.orderType == 2">
             <view class="btn active" @click.stop="postPrice">
                 <text>立即报价</text>
             </view>
diff --git a/src/core/models/get.js b/src/core/models/get.js
index 25e2830..fec070a 100644
--- a/src/core/models/get.js
+++ b/src/core/models/get.js
@@ -38,7 +38,49 @@ export default {
         return new Promise((resolve, reject) => {
             prototype.$request(options.request).then(response => {
                 if (response.code == 1) {
-                    return resolve(response.data);
+                    let order = {};
+                    if (options.listType == "t1" || options.listType == "t2") {
+                        order = {
+                            listType: options.listType,
+                            id: response.data.id,
+                            orderId: response.data.order,
+                            username: "用户名称",
+                            cate: "待返数据",
+                            content: response.data.desc,
+                            createTime: response.data.time,
+                            serviceTime: response.data.times,
+                            orderType: response.data.types,
+                            state: response.data.status,
+                            price: response.data.money,
+                            orderId: response.data.order,
+                            address: {
+                                address: response.data.address.address,
+                                detail: response.data.address.doorplate,
+                                name: response.data.address.name,
+                                mobile: response.data.address.mobil,
+                            },
+                        };
+                        if (options.listType == "t1") {
+                            order.images = response.data.goods.map((item) => item.thumbnail);
+                        } else {
+                            order.images = response.data.img;
+                        }
+                    } else if (options.listType == "t3") {
+                        order = {
+                            listType: options.listType,
+                            id: response.data.id,
+                            orderId: response.data.order,
+                            username: "用户名称",
+                            cate: "待返数据",
+                            createTime: response.data.times,
+                            serviceTime: response.data.starttime,
+                            pickupAddress: response.data.address,
+                            unloadAddress: response.data.addressb,
+                            state: response.data.status,
+                            price: response.data.money,
+                        };
+                    }
+                    return resolve(order);
                 }
                 return reject(response.msg);
             }).catch(e => { });
diff --git a/src/core/models/order.js b/src/core/models/order.js
index 727ca73..3ab1887 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -7,9 +7,9 @@ export default {
             case "t1": return ["购买服务", "#3ABCF6"];
             case "t2":
                 if (orderType == 2) {
-                    return ["一口价", "#3ABCF6"];
+                    return ["报价"];
                 }
-                return ["报价"];
+                return ["一口价", "#3ABCF6"];
             case "t3": return ["货运", "#628BE7"];
         }
     },
diff --git a/src/pages/get/detail.vue b/src/pages/get/detail.vue
index dccca1d..0cfc89b 100644
--- a/src/pages/get/detail.vue
+++ b/src/pages/get/detail.vue
@@ -104,7 +104,7 @@
                     </view>
                 </view>
             </block>
-            <block v-if="listType == 't1' || (listType == 't2' && order.orderType == 2)">
+            <block v-if="listType == 't1' || (listType == 't2' && order.orderType == 1)">
                 <view class="detail-section">
                     <text class="price-box">¥ {{ utils.formatNumber(order.price, 2) }}</text>
                 </view>
@@ -236,70 +236,13 @@ export default {
                             id: this.id,
                         },
                     },
+                    listType: this.listType,
                 })
-                .then((response) => {
-                    if (this.listType == "t1") {
-                        this.order = {
-                            listType: this.listType,
-                            id: response.id,
-                            orderId: response.order,
-                            username: "用户名称",
-                            cate: "待返数据",
-                            content: response.desc,
-                            createTime: response.time,
-                            serviceTime: response.times,
-                            orderType: response.types,
-                            state: response.status,
-                            price: response.money,
-                            orderId: response.order,
-                            images: response.goods.map((item) => item.thumbnail),
-                            address: {
-                                address: response.address.address,
-                                detail: response.address.doorplate,
-                                name: response.address.name,
-                                mobile: response.address.mobil,
-                            },
-                        };
-                    } else if (this.listType == "t2") {
-                        this.order = {
-                            listType: this.listType,
-                            id: response.id,
-                            orderId: response.order,
-                            username: "用户名称",
-                            cate: "待返数据",
-                            content: response.desc,
-                            createTime: response.time,
-                            serviceTime: response.times,
-                            orderType: response.types,
-                            state: response.status,
-                            price: response.money,
-                            orderId: response.order,
-                            images: response.img,
-                            address: {
-                                address: response.address.address,
-                                detail: response.address.doorplate,
-                                name: response.address.name,
-                                mobile: response.address.mobil,
-                            },
-                        };
-                    } else if (this.listType == "t3") {
-                        this.order = {
-                            listType: this.listType,
-                            id: response.id,
-                            orderId: response.order,
-                            username: "用户名称",
-                            cate: "待返数据",
-                            createTime: response.times,
-                            serviceTime: response.starttime,
-                            pickupAddress: response.address,
-                            unloadAddress: response.addressb,
-                            state: response.status,
-                            price: response.money,
-                        };
-                    }
-                    let [typeText, typeTextBg] = this.$models.order.orderTypeText(this.listType, this.order.orderType);
+                .then((order) => {
+                    let [typeText, typeTextBg] = this.$models.order.orderTypeText(this.listType, order.orderType);
                     this.typeText = typeText;
                     this.typeTextBg = typeTextBg ? typeTextBg : "#8b9beb";
+                    this.order = order;
                 });
         },
     },
diff --git a/src/pages/get/index.vue b/src/pages/get/index.vue
index 210c6c6..e0ce768 100644
--- a/src/pages/get/index.vue
+++ b/src/pages/get/index.vue
@@ -27,7 +27,7 @@
                                             v-if="
                                                 v.listType == 't1' ||
                                                 v.listType == 't3' ||
-                                                (v.listType == 't2' && v.orderType == 2)
+                                                (v.listType == 't2' && v.orderType == 1)
                                             "
                                             class="price"
                                             >¥ {{ v.price }}</view