fix: 志愿者注册调整

components/Client/new_file.vue

@@ -366,7 +366,7 @@
 	height: 96rpx;
 	opacity: 1;
 	border-radius: 8rpx;
-	background: rgba(251, 229, 225, 1);;
+	background: rgba(251, 229, 225, 1);
 	display: flex;
 	align-items: center;
 	justify-content: center;

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxf8cc1f7fffc41354",
+        "appid" : "wxe8a05852410396cf",
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

pages/classify.vue

@@ -161,7 +161,7 @@ const getListData = async (orderStatus = tab.value) => {
  */
 function btnClick(row, type) {
 	console.log('btnClick', type, row, row.orderStatus);
-	if (type === 1 && row.orderStatus === 2) {
+	if (type === 1 && row.orderStatus === '2') {
 		uni.navigateTo({
 			url: `/pages_classify/pages/order/index?orderId=${row.secondOrderId}`
 		});

pages/common/classify/orderlist.vue

@@ -34,9 +34,9 @@
 						<view class="item-right">
 							<view class="rating">评分：9.5</view>
 							<view class="status-tags">
-								<up-tag v-if="item.orderStatus == 0" type="info">未开始</up-tag>
-								<up-tag v-else-if="item.orderStatus == 1" type="warning">进行中</up-tag>
-								<up-tag v-else-if="item.orderStatus == 2" type="success">已完成</up-tag>
+								<up-tag v-if="item.orderStatus == '0'" type="info">未开始</up-tag>
+								<up-tag v-else-if="item.orderStatus == '1'" type="warning">进行中</up-tag>
+								<up-tag v-else-if="item.orderStatus == '2'" type="success">已完成</up-tag>
 							</view>
 							<view class="Wrap-Btn">
 								<up-button type="primary" text="沟通" size="mini" shape="circle"

pages/common/orderList/listItem.vue

@@ -9,8 +9,8 @@
                     <view class="item-name">
                         {{ data.name }}
                     </view>
-                    <view v-if="data.score || ['0','1'].includes(String(data.orderStatus))">
-                        <dict-tag :options="lrr_service_status" :value="String(data.orderStatus)"  />
+                    <view v-if="data.score || ['0', '1'].includes(String(data.orderStatus))">
+                        <dict-tag :options="lrr_service_status" :value="String(data.orderStatus)" />
                     </view>
                     <text v-else class="color-blue ">
                         待评价
@@ -23,17 +23,19 @@
                 <view class="item-time">
                     {{ data.createTime }}
                 </view>
+                <view class="item-price"><span class="item-price-yuan">¥</span> {{ data.serviceOnePrice || 0 }}</view>
             </view>
             <view class="item-box">
-                <view class="item-price"><span class="item-price-yuan">¥</span> {{ data.serviceOnePrice || 0 }}</view>
                 <view class="item-btns">
-                    <view class="btn-s" @click="onClick(1)">查看</view>
+                    <view class="btn-m" @click="onClick(1)" v-if="['2', '3'].includes(data.orderStatus)">查看</view>
                     <view class="btn-m" @click="onClick(2)">
-
-                        <up-icon name="chat" color="#ffffff" size="20" ></up-icon>
-                        <!-- <img src="/static/serverImg/list/mess.png" alt=""
-                            style="width: 28rpx;height: 28rpx;margin-right: 8rpx;margin-top: 6rpx;"> -->
-                            <text style="margin-left: 8rpx;">沟通</text></view>
+                        <!-- <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)">
+                        <!-- <up-icon name="chat" color="#ffffff" size="20"></up-icon> -->
+                       {{ data.orderStatus === '0' ? '开始' : '完成' }}服务
+                    </view>
                 </view>
             </view>
         </view>
@@ -73,8 +75,6 @@ function onClick(type) {
 
 <style lang="scss" scoped>
 .item {
-    height: 294rpx;
-    opacity: 1;
     border-radius: 24rpx;
     background: rgba(255, 255, 255, 1);
     margin-bottom: 24rpx;
@@ -126,18 +126,20 @@ function onClick(type) {
             margin-bottom: 40rpx;
         }
 
+        .item-price {
+            font-size: 30rpx;
+            font-weight: 400;
+            letter-spacing: 0rpx;
+            line-height: 45rpx;
+            color: rgba(203, 26, 28, 1);
+            margin-bottom: 16rpx;
+        }
+
         .item-box {
             display: flex;
             align-items: center;
-            justify-content: space-between;
+            justify-content: flex-end;
 
-            .item-price {
-                font-size: 30rpx;
-                font-weight: 400;
-                letter-spacing: 0rpx;
-                line-height: 45rpx;
-                color: rgba(203, 26, 28, 1);
-            }
 
             .item-btns {
                 display: flex;
@@ -147,7 +149,6 @@ function onClick(type) {
                 .btn-s {
                     font-size: 26rpx;
                     font-weight: 400;
-                    line-height: 39rpx;
                     color: rgba(221, 94, 69, 1);
                     text-align: center;
                     padding: 16rpx 0;
@@ -160,20 +161,19 @@ function onClick(type) {
                 }
 
                 .btn-m {
-                    width: 188.03rpx;
-                    border-radius: 8rpx;
+                    border-radius: 59rpx;
                     font-size: 26rpx;
-                    background: rgba(221, 94, 69, 1);
-
                     text-align: left;
                     margin-left: 24rpx;
                     display: flex;
                     justify-content: center;
-                    color: rgba(255, 255, 255, 1);
-                    padding: 16rpx 0;
-
-                    width: 188.03rpx;
+                    color: #dd5e45;
+                    padding: 12rpx 32rpx;
+                    border: 1px solid;
+                    border-radius: 59rpx;
                 }
+
+
             }
         }
     }

pages_classify/pages/handle/index.vue

@@ -82,7 +82,7 @@ const getOrderDetail = async () => {
         //     }
         // }
         // detaile.value = data;
-        if (data.orderStatus === 1) {
+        if (data.orderStatus === '1') {
 
             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 === '1'">
 			<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 !== '1'">
 			<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 === '1'">
 			<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 === '1'"></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 === '1'">
 			</view>
 		</view>
 
 
 
-		<view class=" footer-g" v-if="detaile.orderStatus === 1">
+		<view class=" footer-g" v-if="detaile.orderStatus === '1'">
 			<up-button type="primary" text="确定结束" @click="onSubmit"></up-button>
 		</view>
 	</view>

pages_classify/pages/orderItem/orderdetails.vue

@@ -73,9 +73,9 @@
 						</view>
 						<view class="item-right">
 							<view class="rating" v-if="score === null">待评价</view>
-							<up-tag v-if="item.orderStatus === 0">未开始</up-tag>
-							<up-tag v-else-if="item.orderStatus === 1">进行中</up-tag>
-							<up-tag v-else-if="item.orderStatus === 2">已完成</up-tag>
+							<up-tag v-if="item.orderStatus === '0'">未开始</up-tag>
+							<up-tag v-else-if="item.orderStatus === '1'">进行中</up-tag>
+							<up-tag v-else-if="item.orderStatus === '2'">已完成</up-tag>
 						</view>
 					</view>
 				</up-list-item>