From bd17c7b4250c96463375603f1a33709d2f585c24 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:52:53 +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/order/item.vue |  4 ++--
 src/core/models/order.js      |  8 ++++----
 src/pages/demand/demand.vue   | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/order/item.vue b/src/components/order/item.vue
index e28aaa1..cba48bb 100644
--- a/src/components/order/item.vue
+++ b/src/components/order/item.vue
@@ -32,10 +32,10 @@
                 <text class="text">{{ order.serviceTime }}</text>
             </view>
             <!-- 购买订单|报/议价订单|货运订单 可展示师傅信息 -->
-            <block v-if="order.listType == 't1' || order.listType == 't2' || 't3'">
+            <block v-if="order.listType == 't1' || order.listType == 't2' || order.listType == 't3'">
                 <view class="order-worker-box">
                     <!-- 报价订单未选择师傅 展示师傅列表 -->
-                    <block v-if="order.listType == 't2' && order.orderType == 1 && order.state == 0">
+                    <block v-if="order.listType == 't2' && order.orderType == 2 && order.state == 0">
                         <view class="worker-list-group">
                             <view class="list-group">
                                 <view class="list-item" v-for="(item, index) in previewWorkerList" :key="index">
diff --git a/src/core/models/order.js b/src/core/models/order.js
index 588697e..73db1d6 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -19,14 +19,14 @@ export default {
             switch (state) {
                 case 0:
                     if (orderType == 2) {
-                        return ['待师傅接单'];
+                        return ['待选择师傅'];
                     }
-                    return ['待选择师傅'];
+                    return ['待师傅接单'];
                 case 1:
                     if (orderType == 2) {
-                        return ['师傅已接单，待支付'];
+                        return ['已选择师傅，待支付'];
                     }
-                    return ['已选择师傅，待支付'];
+                    return ['师傅已接单，待支付'];
                 case 2: return ['服务中'];
                 case 4: return ['待支付尾款'];
                 case 5: return ['服务已完成，待确认'];
diff --git a/src/pages/demand/demand.vue b/src/pages/demand/demand.vue
index 7b635c8..0fbea8d 100644
--- a/src/pages/demand/demand.vue
+++ b/src/pages/demand/demand.vue
@@ -38,10 +38,10 @@
                     </view>
                     <view class="input-box">
                         <view class="checkbox">
-                            <view class="checkbox-item" :class="[type == 1 ? 'active' : '']" @click="type = 1">
+                            <view class="checkbox-item" :class="[type == 2 ? 'active' : '']" @click="type = 2">
                                 <text>多位师傅报价</text>
                             </view>
-                            <view class="checkbox-item" :class="[type == 2 ? 'active' : '']" @click="type = 2">
+                            <view class="checkbox-item" :class="[type == 1 ? 'active' : '']" @click="type = 1">
                                 <text>议价</text>
                             </view>
                         </view>
@@ -90,7 +90,7 @@
                             <text>
                                 <text>需求说明</text>
                                 <text class="small-cate">{{ cateText }}</text>
-                                <text class="small-cate">{{ type == 1 ? "多位师傅报价" : "议价" }}</text>
+                                <text class="small-cate">{{ type == 2 ? "多位师傅报价" : "议价" }}</text>
                             </text>
                         </view>
                         <view class="textarea-box">
@@ -138,7 +138,7 @@
                     </view>
                 </view>
                 <view class="common-form-container ext-box">
-                    <view v-if="type == 2" class="custom-price">
+                    <view v-if="type == 1" class="custom-price">
                         <view class="title-box">
                             <text>需求价格</text>
                             <text class="desc"> 请勿填写过低价格，避免无师傅接单 </text>
@@ -160,10 +160,10 @@
                 </view>
                 <view class="common-bottom-components" :style="{ bottom: pageConfig.safeAreaInsets.bottom + 'px' }">
                     <text class="price">¥ {{ utils.formatNumber(total, 2) }}</text>
-                    <view v-if="type == 1" class="btn" @click="submit">
+                    <view v-if="type == 2" class="btn" @click="submit">
                         <div class="text">立即发布</div>
                     </view>
-                    <view v-if="type == 2" class="btn" @click="submit">
+                    <view v-if="type == 1" class="btn" @click="submit">
                         <div class="text">去支付</div>
                     </view>
                 </view>
@@ -213,7 +213,7 @@ export default {
             cateList: [],
             cateText: "",
             // 保存数据
-            type: 1,
+            type: 2,
             content: "",
             cateId: 0,
             uploadImages: [],