用户端

pages/Client/new_file.vue

@@ -155,6 +155,7 @@
 	
 	 
 	
+
 	// 宫格点击事件
 	const handleGridClick = async (index) => {
 		 const service = serviceList1.value[index]; // 获取点击的服务条目

pages/mine.vue

@@ -10,7 +10,7 @@
 					<view class="user-name">战三</view>
 				</view>
 				<up-divider></up-divider>
-				<view class="service-list" v-if="userType == '2'">
+				<view class="service-list">
 					<up-grid :border="false" col="4">
 						<up-grid-item v-for="(listItem, listIndex) in serviceList" :key="listIndex"
 							@click="onClick(listItem)">
@@ -24,22 +24,9 @@
 						</up-grid-item>
 					</up-grid>
 				</view>
-				<view class="service-list" v-if="userType == '1'">
-					<up-grid :border="false" col="4">
-						<up-grid-item v-for="(listItem, listIndex) in serviceList2" :key="listIndex"
-							@click="onClick(listItem)">
-							<view class="grid-box">
-								<!-- <up-badge :isDot="true" type="success" class="item-badge"></up-badge> -->
-								<up-icon :customStyle="{ paddingTop: 20 + 'rpx' }" :name="listItem.iconName"
-									:size="22"></up-icon>
-								<text class="grid-text">{{ listItem.name }}</text>
-							</view>
-						</up-grid-item>
-					</up-grid>
-				</view>
 			</view>
 
-			<view class="mine-card price-box" v-if="userType == '2'">
+			<view class="mine-card price-box">
 				<view class="price-item" v-for="item in priceList" :key="item.key">
 					<view class="price-name flex-center"> {{ item.name }} </view>
 					<view class="price-data flex-center">
@@ -50,7 +37,7 @@
 				</view>
 			</view>
 
-			<view class="mine-card" v-if="userType == '2'">
+			<view class="mine-card">
 				<up-grid :border="false" col="4">
 					<up-grid-item v-for="(listItem, listIndex) in orderList" :key="listIndex">
 						<view class="grid-box">
@@ -62,14 +49,14 @@
 				</up-grid>
 			</view>
 
-			<view class="mine-card rate-box" v-if="userType == '2'">
+			<view class="mine-card rate-box">
 				<view class="rate-left">
 					<label>好评率：</label>
 					<up-rate v-model="rateValue" active-color="rgba(255, 87, 4, 1)" inactive-color="#b2b2b2" gutter="20"
 						readonly></up-rate>
 				</view>
 
-				<view class="rate-rigth" v-if="userType == '2'">
+				<view class="rate-rigth">
 					<label class="rate-count">{{ rateValue }}</label>
 					分
 				</view>
@@ -88,52 +75,8 @@
 	import {
 		getVolunteerAccount
 	} from '@/api/volunteer.js'
-	const userType = uni.getStorageSync('userType') //读取本地存储
-
-	// 用户/志愿者 识别标识
-	const userOrWorker = uni.getStorageSync('storage_data').vuex_userOrWorker //读取本地存储
-
-
-
-	const serviceList = ref(
-		[{
-				name: '待服务',
-				iconName: 'clock',
-				page: '/pages/classify',
-				value: 1
-			},
-			{
-				name: '进行中',
-				iconName: 'car',
-				page: '/pages/classify',
-				value: 2
-			},
-			{
-				name: '已完成',
-				iconName: 'car-fill',
-				page: '/pages/classify',
-				value: 3
-			},
-			{
-				name: '差评申述',
-				iconName: 'edit-pen',
-				page: '/pages/myCenter/bad'
-			},
-			{
-				name: '钱包',
-				iconName: 'rmb-circle',
-				page: '/pages/myCenter/wallet'
-			},
-			{
-				name: '帮助与客服',
-				iconName: 'kefu-ermai',
-			},
-		]);
-
-
-
-
-	const serviceList2 = ref([{
+
+	const serviceList = ref([{
 			name: '待服务',
 			iconName: 'clock',
 			page: '/pages/classify',
@@ -153,28 +96,19 @@
 			value: 3
 		},
 		{
-			name: '评论',
+			name: '差评申述',
 			iconName: 'edit-pen',
-			// page: '/pages/myCenter/bad'
+			page: '/pages/myCenter/bad'
 		},
 		{
 			name: '钱包',
 			iconName: 'rmb-circle',
-			page: '/pages/myCenter/withdrawal'
+			page: '/pages/myCenter/wallet'
 		},
 		{
 			name: '帮助与客服',
 			iconName: 'kefu-ermai',
 		},
-		{
-			name: '浏览记录',
-			iconName: 'eye',
-			page: '/pages/myCenter/withdrawal'
-		},
-		{
-			name: '收藏',
-			iconName: 'star',
-		},
 	]);
 
 	const priceList = [{
@@ -188,13 +122,11 @@
 			decimals: 0
 		}
 	]
-
-
-	
 	const orderList = ref([{
 			name: '预约单',
 			key: 'orderCount'
 		},
+
 		{
 			name: '进行单',
 			key: 'orderCount'
@@ -248,6 +180,8 @@
 
 		}
 	}
+
+	onMounted(getDetails)
 </script>
 
 <style lang="scss" scoped>
@@ -304,99 +238,116 @@
 			}
 		}
 
-		
+		.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;
 
-					.item-badge {
-						position: absolute;
-					}
-				}
+		.grid-box {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			position: relative;
 
-				.price-box {
-					display: flex;
-					align-content: center;
-					justify-content: space-between;
-					// padding: 12px;
-
-					.price-item {
-						width: 50%;
-						padding: 12px;
-
-						.price-name {
-							font-size: 16px;
-							font-weight: 700;
-							line-height: 23.17px;
-							color: rgba(51, 51, 51, 1);
-							margin-bottom: 12px;
-						}
-
-						.price-data {
-							font-size: 20px;
-							font-weight: 700;
-							line-height: 23.44px;
-							color: rgba(51, 51, 51, 1);
-						}
-					}
+			.item-badge {
+				position: absolute;
+			}
+		}
 
-					.price-item:first-child {
-						border-right: 1px solid #dcdfe6;
+		.price-box {
+			display: flex;
+			align-content: center;
+			justify-content: space-between;
+			// padding: 12px;
+
+			.price-item {
+				width: 50%;
+				padding: 12px;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+
+				.price-name {
+					font-size: 16px;
+					font-weight: 700;
+					line-height: 23.17px;
+					color: rgba(51, 51, 51, 1);
+					margin-bottom: 12px;
+				}
 
-					}
+				.price-data {
+					font-size: 20px;
+					font-weight: 700;
+					line-height: 23.44px;
+					color: rgba(51, 51, 51, 1);
+				}
 
+				.grid-min-price {
+					font-size: 12px;
+					font-weight: 500;
+					line-height: 17.38px;
+					color: rgba(153, 153, 153, 1);
+					margin-top: 4px;
 				}
+			}
 
+			.price-item:first-child {
+				border-right: 1px solid #dcdfe6;
 
-				.rate-box {
-					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);
+		}
 
-						display: flex;
-						align-items: center;
-						justify-content: left;
 
-						flex: 1;
-					}
+		.rate-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
 
-					.rate-rigth {
-						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);
 
-						.rate-count {
-							color: rgba(237, 123, 47, 1);
-						}
-					}
-				}
+				display: flex;
+				align-items: center;
+				justify-content: left;
+
+				flex: 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);
+				}
 			}
+		}
+
+
+	}
 </style>