chenjj преди 4 месеца
родител
ревизия
6a93c09f36
променени са 4 файла, в които са добавени 81 реда и са изтрити 36 реда
  1. 3 3
      components/Client/new_file.vue
  2. 64 0
      pages/index.vue
  3. 11 30
      pages/mine.vue
  4. 3 3
      pages_classify/pages/handle/index.vue

+ 3 - 3
components/Client/new_file.vue

@@ -22,8 +22,8 @@
 			<view class="Wrapper-grid">
 				<swiper :indicator-dots="true" class="swiper">
 					<swiper-item>
-						<up-grid :border="false" col="4" @click="handleGridClick">
-							<up-grid-item v-for="(item, index) in serviceList2.slice(0,8)" :key="index" :custom-style="custmoStyle">
+						<up-grid :border="false" col="5" @click="handleGridClick">
+							<up-grid-item v-for="(item, index) in serviceList2.slice(0,10)" :key="index" :custom-style="custmoStyle">
 								<view class="grid-box">
 									<view class="grid-icon">
 										<image :src="item.icon" class="service-img" mode="aspectFit" />
@@ -36,7 +36,7 @@
 					</swiper-item>
 					<swiper-item>
 						<up-grid :border="false" col="4" @click="handleGridClick">
-							<up-grid-item v-for="(item, index) in serviceList2.slice(8,12)" :key="index" :custom-style="custmoStyle">
+							<up-grid-item v-for="(item, index) in serviceList2.slice(10,12)" :key="index" :custom-style="custmoStyle">
 								<view class="grid-box">
 									<view class="grid-icon">
 										<image :src="item.icon" class="service-img" mode="aspectFit" />

+ 64 - 0
pages/index.vue

@@ -21,6 +21,16 @@
 			<Client />
 		</view>
 
+		<!-- <view class="home-grid hot-box">
+			<view v-for="item in hotList" :key="item.key" class="hot-item">
+				<view>
+					<view>{{item.name}}</view>
+					<view>{{item.text}}</view>
+				</view>
+				<up-icon :name="listItem.iconName" :size="22"></up-icon>
+			</view>
+		</view> -->
+
 		<view class="home-ranking">
 			<ServIces :listData="listData" :rightList="rightList" v-if="userType == 1"></ServIces>
 			<RankingList v-if="userType === 2" />
@@ -61,6 +71,47 @@
 	})
 	const list3 = ref([]);
 
+	const hotList = [
+		{
+			key: 1,
+			icon: '/static/img/构建.png',
+			name: '专业辅导',
+			text:'与家长协同制定成长计划',
+		},
+		{
+			key: 2,
+			icon: '/static/img/构建.png',
+			name: '暖心陪护',
+			text:'倾听烦恼、缓解孤独感',
+		},
+	]
+	const hotList2 = [
+		{
+			key: 1,
+			icon: '/static/img/构建.png',
+			name: '专业辅导',
+			text:'与家长协同制定成长计划',
+		},
+		{
+			key: 2,
+			icon: '/static/img/构建.png',
+			name: '暖心陪护',
+			text:'倾听烦恼、缓解孤独感',
+		},
+		{
+			key: 3,
+			icon: '/static/img/构建.png',
+			name: '专业辅导',
+			text:'与家长协同制定成长计划',
+		},
+		{
+			key: 4,
+			icon: '/static/img/构建.png',
+			name: '暖心陪护',
+			text:'倾听烦恼、缓解孤独感',
+		},
+	]
+
 	const getList = async () => {
 		try {
 			const res = await volunteerinfolist();
@@ -134,5 +185,18 @@
 		}
 	}
 
+	.hot-box {
+		padding: 12px 16px;
+		display: grid;
+		grid-template-columns: repeat(2, 1fr);
+				/* 3 列,每列等宽 */
+		gap: 32rpx;
+		.hot-item {
+			.hot-item {
+				padding: 12px 16px;
+			}
+		}
+	}
+
 
 </style>

+ 11 - 30
pages/mine.vue

@@ -29,7 +29,6 @@
 				<view class="status-card-item" v-for="(listItem, listIndex) in adminList" :key="listIndex"
 					@click="onClick(listItem)">
 					<view class="grid-img-box">
-						<!-- <img :src="listItem.iconName" alt="" style="width: 52rpx;height: 52rpx;"> -->
 						<up-icon :name="listItem.iconName" color="rgba(51, 51, 51, 1)" size="25" ></up-icon>
 					</view>
 					<text class="grid-text">{{ listItem.name }}</text>
@@ -40,7 +39,6 @@
 				<view class="status-card-item" v-for="(listItem, listIndex) in userList" :key="listIndex"
 					@click="onClick(listItem)">
 					<view class="grid-img-box">
-						<!-- <img :src="listItem.iconName" alt="" style="width: 52rpx;height: 52rpx;"> -->
 						<up-icon :name="listItem.iconName" :size="22"></up-icon>
 					</view>
 					<text class="grid-text">{{ listItem.name }}</text>
@@ -142,34 +140,11 @@ const userType = uni.getStorageSync('userType') //读取本地存储
 
 const adminList = ref(
 	[
-	// 	{
-	// 	name: '待服务',
-	// 	iconName: '/static/serverImg/mine/icon1.png',
-	// 	page: '/pages/classify',
-	// 	value: 1
-	// },
-	// {
-	// 	name: '进行中',
-	// 	iconName: '/static/serverImg/mine/icon2.png',
-	// 	page: '/pages/classify',
-	// 	value: 2
-	// },
-	// {
-	// 	name: '已完成',
-	// 	iconName: '/static/serverImg/mine/icon3.png',
-	// 	page: '/pages/classify',
-	// 	value: 3
-	// },
 	{
 		name: '差评申述',
 		iconName: 'chat',
 		page: '/pages_mine/pages/bad/index'
 	},
-	// {
-	// 	name: '钱包',
-	// 	iconName: '/static/serverImg/mine/icon5.png',
-	// 	page: '/pages_mine/pages/wallet/index'
-	// },
 	{
 		name: '帮助与客服',
 		iconName: 'kefu-ermai',
@@ -226,12 +201,17 @@ const userList = ref(
 	},
 	{
 		name: '地址',
-		iconName: 'kefu-ermai',
+		iconName: 'map',
 		page: '/pages_mine/pages/selectAddress/index'
 	},
 	{
 		name: '志愿者',
-		iconName: 'kefu-ermai',
+		iconName: 'account',
+		operate:()=>{
+			uni.reLaunch({ 
+				url: '/pages/UserSelection'
+			});
+		}
 	},
 	]);
 
@@ -334,9 +314,10 @@ const init = async() => {
 	overflow-y: auto;
 
 	.mine-header {
-		padding: 42rpx 44rpx;
+		padding: 36rpx 44rpx;
 		background: #fff;
 		display: flex;
+		
 
 		.header-info {
 			display: flex;
@@ -495,7 +476,7 @@ const init = async() => {
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					margin-bottom: 18rpx;
+					margin-bottom: 12rpx;
 				}
 
 				.grid-text {
@@ -577,6 +558,6 @@ const init = async() => {
 	font-weight: 400;
 	line-height: 48rpx;
 	color: rgba(51, 51, 51, 1);
-	margin-bottom: 32rpx;
+	margin-bottom: 8rpx;
 }
 </style>

+ 3 - 3
pages_classify/pages/handle/index.vue

@@ -1,7 +1,7 @@
 <!-- 订单详情 -->
 <template>
     <view class="order-detail">
-        <view class="service-info order-card">
+        <view class="service-info">
             <PositioningMap :address="detaile.address" />
         </view>
         <view class="user-info order-card">
@@ -150,8 +150,8 @@ onLoad((options) => {
     left: 0;
     right: 0;
     bottom: 0;
-    padding: 12px 12px 24px;
-    background: rgba(245, 245, 245, 1);
+    // padding: 12px 12px 24px;
+    // background: rgba(245, 245, 245, 1);
 
 
     .order-card {