新增非遗体验和我要跟拍和遗产概况

pages.json

@@ -83,6 +83,9 @@
 			{
 				"path": "service/StudyFurther"
 			},
+			{
+				"path": "service/situation"
+			},
 			{
 				"path": "order/orderSubscribe"
 			}

pages/index/index.vue

@@ -75,7 +75,7 @@
 					{
 						icon : '/static/image/home/g2.png',
 						title : '遗产概况',
-						path : '',
+						path : '/pages_order/service/situation',
 					},
 					{
 						icon : '/static/image/home/g3.png',

pages_order/components/list/cardList.vue

@@ -49,8 +49,8 @@
 		align-items: center;
 
 		.card-img {
-			height: 260rpx;
-			width: 230rpx;
+			height: 240rpx;
+			width: 260rpx;
 			flex-shrink: 0;
 			image {
 				height: 100%;
@@ -70,8 +70,8 @@
 			.card-content-img {
 				display: flex;
 				margin-left: 10rpx;
-				width: 100rpx;
-				height: 40rpx;
+				width: 130rpx;
+				height: 50rpx;
 			}
 
 			.card-content-tag {

pages_order/service/StudyFurther.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 我要研学 -->
 	<view class="page">
 		<navbar title="我要研学" leftClick @leftClick="$utils.navigateBack" />
 		
@@ -34,7 +35,6 @@
 				</view>
 			</view>
 		</view>
-		
 		<tabber/>
 	</view>
 </template>

pages_order/service/applyRelic.vue

@@ -1,6 +1,6 @@
 <template>
+	<!-- 申请遗迹 -->
 	<view class="apply">
-
 		<navbar title="申请遗迹" leftClick @leftClick="$utils.navigateBack" />
 		<view class="top-img">
 			<image src="../static/applyRelic/jdz.png" mode="aspectFill" style="width: 100%; height: 100%;"></image>

pages_order/service/experience.vue

@@ -1,6 +1,26 @@
 <template>
+	<!-- 非遗体验 -->
 	<view class="experience">
 		<navbar title="非遗体验" leftClick @leftClick="$utils.navigateBack" />
+		<view class="experience-img">
+			<image src="https://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1msKSi.img" mode="aspectFill" />
+		</view>
+		<view class="experience-box" v-for="(item,index) in 10" :key="index">
+			<view class="experience-box-img">
+				<uv-image src="https://cdn.uviewui.com/uview/album/1.jpg" radius="16rpx" width="100%" height="360rpx"
+					:fade="false" />
+			</view>
+
+			<view class="experience-box-font">
+				<view style="font-weight: 600;">孙天天陶瓷工作室</view>
+				<view style="font-size: 24rpx; color: #999999;">开放时间：08：00-21：00</view>
+				<view class="experience-box-button">
+					<view>线上预订</view>
+				</view>
+			</view>
+		</view>
+		
+		<tabber/>
 	</view>
 </template>
 
@@ -17,5 +37,51 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	.experience {
+		.experience-img {
+			height: 400rpx;
+
+			image {
+				height: 100%;
+				width: 100%;
+			}
+		}
+
+		.experience-box {
+			width: 94%;
+			margin-left: 3%;
+			margin-top: 20rpx;
+			background-color: #fff;
+			box-shadow: 0px 0px 3px 0px #000;
+			border-radius: 12rpx;
+
+			.experience-box-img {
+				width: 94%;
+				margin-left: 3%;
+				padding-top: 20rpx;
+			}
+
+			.experience-box-font {
+				width: 94%;
+				margin-left: 3%;
+				margin-top: 30rpx;
+
+				.experience-box-button {
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					font-size: 28rpx;
+					color: #fff;
+					padding-bottom: 40rpx;
+					
+					view {
+						padding: 10rpx 40rpx;
+						border-radius: 40rpx;
+						background-color: #C83741;
+					}
+				}
+			}
+		}
+	}
 </style>

pages_order/service/following.vue

@@ -1,11 +1,41 @@
 <template>
+	<!-- 我要跟拍 -->
 	<view class="following">
-		
+		<navbar title="我要跟拍" leftClick @leftClick="$utils.navigateBack" />
+		<view class="following-top-img">
+			<image src="https://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1msKSi.img" mode="aspectFill" />
+		</view>
+		<cardList />
+		<tabber/>
 	</view>
 </template>
 
 <script>
+	import cardList from '../components/list/cardList.vue'
+	export default {
+		components: {
+			cardList
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	.following {
+		.following-top-img {
+			height: 600rpx;
+
+			image {
+				height: 100%;
+				width: 100%;
+			}
+		}
+	}
 </style>

pages_order/service/situation.vue

@@ -0,0 +1,72 @@
+<template>
+	<!-- 遗产概况 -->
+	<view class="situation">
+		<navbar title="遗产概况" leftClick @leftClick="$utils.navigateBack" />
+		<view class="situation-imgs">
+			<view class="situation-imgs-one">
+				<uv-image src="https://cdn.uviewui.com/uview/album/1.jpg" radius="12rpx" width="100%" height="100%" />
+			</view>
+			<view class="situation-imgs-two">
+				<uv-image src="https://cdn.uviewui.com/uview/album/1.jpg"  width="100%" height="100%" />
+			</view>
+			<view class="situation-imgs-four">
+				<view>
+					<uv-image src="https://cdn.uviewui.com/uview/album/1.jpg" mode="aspectFit" width="100%" height="100%" />
+				</view>
+				<view>
+					<uv-image src="https://cdn.uviewui.com/uview/album/1.jpg" mode="aspectFit" width="100%" height="100%" />
+				</view>
+				<view>
+					<uv-image src="https://cdn.uviewui.com/uview/album/1.jpg" mode="aspectFit" width="100%" height="100%" />
+				</view>
+				<view>
+					<uv-image src="https://cdn.uviewui.com/uview/album/1.jpg" mode="aspectFit" width="100%" height="100%" />
+				</view>
+			</view>
+		</view>
+		<tabber />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.situation {
+		.situation-imgs {
+			width: 92%;
+			margin-top: 20rpx;
+			margin-left: 4%;
+
+			.situation-imgs-one {
+				height: 360rpx;
+			}
+
+			.situation-imgs-two {
+				margin-top: 10rpx;
+				height: 300rpx;
+			}
+
+			.situation-imgs-four {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				view {
+					width: 48%;
+					height: 260rpx;
+				}
+			}
+		}
+	}
+</style>

pages_order/service/tellList.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 达人和讲述 -->
 	<view class="tell">
 		<navbar :title="titles[type]" leftClick @leftClick="$utils.navigateBack" />