fix: 志愿者端订单状态

config.js

@@ -2,7 +2,7 @@
 const config = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	//cloud后台网关地址
-	baseUrl: 'http://192.168.100.121:9527',
+	baseUrl: 'http://192.168.100.133:9527',
 	// baseUrl: 'https://zybooks.tech/prod-api',
 	mapKey:'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C',
 	appName: '金邻助家',

pages/classify.vue

@@ -93,31 +93,6 @@
 		}
 	]
 
-	const column2 = [{
-			name: "全部",
-			value: "",
-		},
-		{
-			name: "待支付",
-			value: "1",
-		},
-		{
-			name: "待服务",
-			value: "2",
-		},
-		{
-			name: "进行中",
-			value: "3",
-		},
-		{
-			name: "已完成",
-			value: "4",
-		},
-		{
-			name: "已取消",
-			value: "5",
-		}
-	]
 
 	//获取用户订单列表状态
 	async function getData() {

pages/common/orderList/listItem.vue

@@ -10,7 +10,7 @@
                     <view class="item-name">
                         {{ data.name }}
                     </view>
-                    <view v-if="data.score || ['0', '1'].includes(String(data.orderStatus))">
+                    <view v-if="data.score || ['0', '1','3'].includes(String(data.orderStatus))">
                         <dict-tag :options="order_status" :value="String(data.orderStatus)" />
                     </view>
                     <text v-else class="color-blue ">
@@ -28,14 +28,14 @@
             </view>
             <view class="item-box">
                 <view class="item-btns">
-                    <view class="btn-m" @click="onClick(1)" v-if="['2', '3'].includes(data.orderStatus)">查看</view>
+                    <view class="btn-m" @click="onClick(1)" v-if="['2','4'].includes(data.orderStatus)">查看</view>
                     <view class="btn-m" @click="onClick(2)">
                         <!-- <up-icon name="chat" color="#ffffff" size="20"></up-icon> -->
                         <text style="margin-left: 8rpx;">沟通</text>
                     </view>
-                    <view class="btn-m" @click="onClick(1)"  v-if="['0', '1'].includes(data.orderStatus)">
+                    <view class="btn-m" @click="onClick(1)"  v-if="['3', '1'].includes(data.orderStatus)">
                         <!-- <up-icon name="chat" color="#ffffff" size="20"></up-icon> -->
-                       {{ data.orderStatus === '0' ? '开始' : '完成' }}服务
+                       {{ data.orderStatus === '1' ? '开始' : '完成' }}服务
                     </view>
                 </view>
             </view>

pages_classify/pages/handle/index.vue

@@ -107,7 +107,7 @@ const getOrderDetail = async () => {
 
         let data = res.data.secondOrder;
         detaile.value = { ...res.data.secondOrder, ...res.data.address,serveTimes:res.data.secondOrder.updateTime }
-        if (data.orderStatus === '1') {
+        if (data.orderStatus === '3') {
 
             orderStatus.value = true;
         }

pages_classify/pages/order/index.vue

@@ -19,14 +19,14 @@
 				{{ detaile.remark }}
 			</view>
 		</view>
-		<view class="service-info order-card" v-if="detaile.orderStatus === '1'">
+		<view class="service-info order-card" v-if="detaile.orderStatus === '3'">
 			<view class="font-title ">反馈信息</view>
 			<view class="info-list">
 				<up-textarea v-model="detaile.volunteerReview" placeholder="请输入内容" ></up-textarea>
 			</view>
 		</view>
 
-		<view v-if="detaile.orderStatus !== '1'">
+		<view v-if="detaile.orderStatus !== '3'">
 			<view class="user-info order-card">
 				<view class="font-title">志愿者反馈信息</view>
 				<view class="user-box">
@@ -58,22 +58,22 @@
 
 
 
-		<view class="service-info order-card" v-if="detaile.orderStatus === '1'">
+		<view class="service-info order-card" v-if="detaile.orderStatus === '3'">
 			<view class="font-title">图片上传</view>
 			<view class="upload-box">
 				<view class="upload-img-item" v-for="(item, index) in fileList" :key="item.url">
 					<view class="delete-icon" @click="deletePic(index)"><up-icon name="close-circle-fill"
-							color="#f64a1f" size="18" v-if="detaile.orderStatus === '1'"></up-icon></view>
+							color="#f64a1f" size="18" v-if="detaile.orderStatus === '3'"></up-icon></view>
 					<img class="upload-img" :src="item.url" :alt="item.fileName" srcset="">
 				</view>
 				<img src="/static/img/upload.png" alt="" class="upload-img" @click="uploadClick('img')"
-					v-if="fileList.length < 10 && detaile.orderStatus === '1'">
+					v-if="fileList.length < 10 && detaile.orderStatus === '3'">
 			</view>
 		</view>
 
 
 
-		<view class=" footer-g" v-if="detaile.orderStatus === '1'">
+		<view class=" footer-g" v-if="detaile.orderStatus === '3'">
 			<!-- <up-button type="primary" text="确定结束" @click="onSubmit"></up-button> -->
 			<view class="status-btn" @click="onSubmit">确定结束</view>
 		</view>