fix：冲突解决

api/volunteerDetailsApi/details.js

@@ -66,12 +66,14 @@ export function volunteerwork(params) {
   return request({
     url: '/core/volunteer/work-date/getVolunteerWorkDate',  
     method: 'get',
-	params:params
+	  params:params
   });
 }
 
 
 
+
+
 // 确认支付
 export function ordersCreateOrder(data) {
   return request({

components/pages/classify/orderlist.vue

@@ -21,7 +21,7 @@
 				<up-list-item v-for="(item, index) in dataList" :key="index">
 					<view class="list-item">
 						<!-- 左侧图片 -->
-						<image src="../../static/img/dd.png" mode="aspectFill" class="item-image"></image>
+						<image src="/static/img/dd.png" mode="aspectFill" class="item-image"></image>
 
 						<!-- 中间信息 -->
 						<view class="item-info">

pages/Client/new_file.vue

@@ -179,13 +179,14 @@
 			const data = serviceList2.value[index]
 			if (data.key !== 7) {
 				data.key === 1 || data.key === 2 ? uni.navigateTo({
-					url: `/pages/register/register?data=${encodeURIComponent(JSON.stringify(data))}`
+					url: `/pages_home/pages/register/index?data=${encodeURIComponent(JSON.stringify(data))}`
 				}) : uni.showToast({
 					title: '敬请期待',
 					icon: 'none'
 				})
 				return;
 			}
+			init();
 			calendar.value.open();
 		}
 	};
@@ -269,7 +270,7 @@
 
 
 	onMounted(() => {
-		init();
+		// init();
 	});
 </script>
 

pages/mine.vue

@@ -76,9 +76,9 @@ import {
 	getVolunteerAccount
 } from '@/api/volunteer.js'
 import {
-		onLoad,
-		onShow
-	} from '@dcloudio/uni-app';
+	onLoad,
+	onShow
+} from '@dcloudio/uni-app';
 import store from "@/store"
 const userType = uni.getStorageSync('userType') //读取本地存储
 
@@ -250,9 +250,9 @@ const geUserInfo = () => {
 }
 
 onShow(() => {
-		geUserInfo();
+	geUserInfo();
 
-	})
+})
 </script>
 
 <style lang="scss" scoped>
@@ -291,65 +291,66 @@ onShow(() => {
 			background: rgba(255, 255, 255, 1);
 			margin-bottom: 12px;
 
-				.user-name-box {
-					display: flex;
-					align-items: center;
-					padding: 12px 12px 0;
+			.user-name-box {
+				display: flex;
+				align-items: center;
+				padding: 12px 12px 0;
 
-					.user-avatar {}
+				.user-avatar {}
 
-					.user-name {
-						font-size: 18px;
-						font-weight: 700;
-						line-height: 21.09px;
-						color: rgba(51, 51, 51, 1);
-						margin-left: 12px;
-					}
+				.user-name {
+					font-size: 18px;
+					font-weight: 700;
+					line-height: 21.09px;
+					color: rgba(51, 51, 51, 1);
+					margin-left: 12px;
 				}
 			}
 		}
+	}
 
-		.service-img {
-			width: 60rpx;
-			height: 60rpx;
-			margin-bottom: 10rpx;
-		}
+	.service-img {
+		width: 60rpx;
+		height: 60rpx;
+		margin-bottom: 10rpx;
+	}
 
-		.service-list {
-			padding-bottom: 12px;
-		}
+	.service-list {
+		padding-bottom: 12px;
+	}
 
-		.grid-text {
-			font-size: 14px;
-			color: #909399;
-			padding: 10rpx 0 20rpx 0rpx;
-			/* #ifndef APP-PLUS */
-			box-sizing: border-box;
-			/* #endif */
-		}
+	.grid-text {
+		font-size: 14px;
+		color: #909399;
+		padding: 10rpx 0 20rpx 0rpx;
+		/* #ifndef APP-PLUS */
+		box-sizing: border-box;
+		/* #endif */
+	}
 
 
-		.grid-box {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-			position: relative;
+	.grid-box {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		position: relative;
 
-			.item-badge {
-				position: absolute;
-			}
+		.item-badge {
+			position: absolute;
 		}
+	}
 
-		.price-box {
-			display: flex;
-			align-content: center;
-			justify-content: space-between;
-			// padding: 12px;
+	.price-box {
+		display: flex;
+		align-content: center;
+		justify-content: space-between;
+		// padding: 12px;
+
+		.price-item {
+			width: 50%;
+			padding: 12px;
 
-			.price-item {
-				width: 50%;
-				padding: 12px;
 			.user-name-box {
 				display: flex;
 				flex-direction: column;
@@ -509,41 +510,38 @@ onShow(() => {
 
 		}
 
-
+	}
 
 	.rate-box {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
 
-			.rate-left {
-				font-size: 14px;
-				font-weight: 500;
-				letter-spacing: 0px;
-				line-height: 20.27px;
-				color: rgba(0, 0, 0, 1);
+		.rate-left {
+			font-size: 14px;
+			font-weight: 500;
+			letter-spacing: 0px;
+			line-height: 20.27px;
+			color: rgba(0, 0, 0, 1);
 
-				display: flex;
-				align-items: center;
-				justify-content: left;
+			display: flex;
+			align-items: center;
+			justify-content: left;
 
-				flex: 1;
-			}
+			flex: 1;
+		}
 
-			.rate-rigth {
-				font-size: 14px;
-				font-weight: 500;
-				letter-spacing: 0px;
-				line-height: 20.27px;
-				color: rgba(0, 0, 0, 1);
+		.rate-rigth {
+			font-size: 14px;
+			font-weight: 500;
+			letter-spacing: 0px;
+			line-height: 20.27px;
+			color: rgba(0, 0, 0, 1);
 
-				.rate-count {
-					color: rgba(237, 123, 47, 1);
-				}
+			.rate-count {
+				color: rgba(237, 123, 47, 1);
 			}
 		}
-
-
 	}
 }
 </style>

pages_classify/components/orderList/listItem.vue

@@ -7,7 +7,7 @@
             <view class="item-title-box">
                 <view class="item-title">
                     <view class="item-name">
-                         姓名: {{ data.name }}
+                         {{ data.name }}
                     </view>
                     <dict-tag :options="lrr_service_status" :value="data.orderStatus" />
                 </view>

pages_home/pages/register/index.vue

@@ -3,7 +3,7 @@
 		<up-alert description="您已完成账户注册" type="success" showIcon closable v-if="!isAdd"></up-alert>
 		<view class="register-user-info">
 			<FontTitle title="请完成注册信息填报" />
-			<CustForm :column="com_column" ref="cust_form_ref" :isCode="isAdd"/>
+			<CustForm :column="com_column" ref="cust_form_ref" :isCode="isAdd" />
 		</view>
 
 		<view v-for="item in updata_list" :key="item.key" class="updata-imgs">
@@ -81,12 +81,14 @@ const register_column = {
 
 //根据类型获取表单item 值
 const com_column = computed(() => {
-	let column_list =  data.value ? register_column[data.value.key] : [];
+	let column_list = data.value ? register_column[data.value.key] : [];
 	return column_list
 })
 
 function onSubmit() {
 	try {
+
+		// return;
 		// 校验表单并获取数据
 		cust_form_ref.value.onSubmit().then(async (res) => {
 			console.log('===res===>', res, file_url);
@@ -125,9 +127,13 @@ function onSubmit() {
 			if (submit_res.code == 200) {
 				uni.showToast({
 					title: '注册成功',
-					icon: 'none'
+					icon: 'success',
+					success: () => {
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 1000)
+					}
 				})
-				uni.navigateBack();
 				return;
 			}
 			uni.showToast({
@@ -154,9 +160,13 @@ function onChange({ key, url }) {
 	})
 }
 
-function getRegister() {
-	getVolunteerInfo({ serviceCategory: data.value.key }).then(res => {
-		console.log('xxxxxxxxxxres', res, cust_form_ref.value);
+async function getRegister() {
+
+	try {
+		uni.showLoading({
+			title: '数据加载中...'
+		});
+		const res = await getVolunteerInfo({ serviceCategory: data.value.key });
 		if (res.data) {
 			cust_form_ref.value.setData(res.data);
 			Object.assign(file_url, {
@@ -166,10 +176,15 @@ function getRegister() {
 			})
 			isAdd.value = false;
 		}
-
-
-
-	})
+	} catch (error) {
+		console.log('error', error);
+		uni.showToast({
+			title: error.msg,
+			icon: 'error',
+		});
+	} finally {
+		uni.hideLoading();
+	}
 }
 
 // onMounted(() => {

pages_orderuser/pages/order/orderItem.vue

@@ -4,7 +4,7 @@
 			<up-list-item v-for="(item, index) in dataList" :key="index">
 				<view class="list-item">
 					<!-- 左侧图片 -->
-					<image src="../../static/img/dd.png" mode="aspectFill" class="item-image"></image>
+					<image src="/static/img/dd.png" mode="aspectFill" class="item-image"></image>
 
 					<!-- 中间信息 -->
 					<view class="item-info">