上传

App.vue

@@ -3,7 +3,7 @@
 		onLaunch: function() {
 		},
 		onShow: function() {
-			// this.$store.commit('initConfig')
+			this.$store.commit('initConfig')
 		},
 		onHide: function() {
 		}

api/api.js

@@ -17,7 +17,7 @@ const config = {
 	// 微信登录接口
 	wxLogin: {
 		url: '/login/login',
-		method: 'POST',
+		method: 'GET',
 		limit: 500,
 		showLoading: true,
 	},

pages/index/index.vue

@@ -17,9 +17,6 @@
 					search-icon-size="40rpx"
 					v-model="keyword"></uv-search>
 				</view>
-				<view class="title">
-					<image src="/static/image/home/title.png" mode=""></image>
-				</view>
 			</view>
 		</view>
 		

pages_order/components/list/cardList.vue

@@ -65,7 +65,7 @@
 				this.queryParams.pageNo = 1
 				this.$api('queryRoleInfoList', {
 					...this.queryParams,
-					roleId : parseInt(this.type),
+					roleId : this.type,
 				}, res => {
 					uni.stopPullDownRefresh()
 					if(res.code == 200){

pages_order/mine/volunteer.vue

@@ -76,7 +76,6 @@
 				height: 500rpx;
 				flex-direction: column;
 				justify-content: space-around;
-			
 			}
 		}
 	}

pages_order/service/StudyFurther.vue

@@ -17,7 +17,7 @@
 		
 		<view class="list">
 			<view class="item"
-			@click="$utils.navigateTo('/pages_order/service/StudyAndPathDetail?type=0&title=我要研学')"
+			@click="$utils.navigateTo('/pages_order/service/StudyAndPathDetail?type=0&id=' + item.id)"
 			v-for="(item,index) in 3"
 			:key="index">
 				<view class="image">

pages_order/service/applyRelic.vue

@@ -102,7 +102,7 @@
 			},
 			toUrl(item){
 				console.log(item);
-				this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}`)
+				this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=1`)
 			},
 			selectMiddle(e){
 				console.log(e);

pages_order/service/articleDetail.vue

@@ -1,7 +1,7 @@
 <template>
-	<!-- 文化遗产详情、申遗历程详情、非遗体验详情 三合一 -->
+	<!-- 0文化遗产详情、1申遗历程详情、2非遗体验详情 三合一 -->
 	<view class="page">
-		<navbar title="申遗历程" leftClick @leftClick="$utils.navigateBack" />
+		<navbar :title="titles[type]" leftClick @leftClick="$utils.navigateBack" />
 		<uv-parse :content="detail.articleContent"></uv-parse>
 	</view>
 </template>
@@ -10,8 +10,10 @@
 	export default {
 		data() {
 			return {
+				titles: ['文化遗产', '申遗历程', '非遗体验'],
 				detail : {},
 				id : 0,
+				type : 0,
 			}
 		},
 		onLoad(args) {

pages_order/service/experience.vue

@@ -5,7 +5,9 @@
 		<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" v-for="(item,index) in 10" 
+		@click="toUrl(item)"
+		: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" />
@@ -32,7 +34,10 @@
 			}
 		},
 		methods: {
-
+			toUrl(item){
+				console.log(item);
+				this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=2`)
+			},
 		}
 	}
 </script>
@@ -53,7 +58,7 @@
 			margin-left: 3%;
 			margin-top: 20rpx;
 			background-color: #fff;
-			box-shadow: 0px 0px 3px 0px #000;
+			box-shadow: 0px 0px 10rpx 0rpx #00000022;
 			border-radius: 12rpx;
 
 			.experience-box-img {

pages_order/service/heritagePath.vue

@@ -9,7 +9,9 @@
 			<view @click="isShow = 0" :class="{ fontColor:isShow == 0}">路径定制</view>
 			<view @click="isShow = 1" :class="{ fontColor:isShow == 1}">推荐路径</view>
 		</view>
-		<view class="heritagePath-card" v-for="(item,index) in 10" :key="index">
+		<view class="heritagePath-card" v-for="(item,index) in 10" 
+		@click="$utils.navigateTo('/pages_order/service/StudyAndPathDetail?type=1&id=' + item.id)"
+		:key="index">
 			<view class="heritagePath-card-box">
 				<view class="heritagePath-card-pic">
 					<view class="heritagePath-card-img">
@@ -120,6 +122,7 @@
 					image {
 						height: 100%;
 						width: 100%;
+						border-radius: 20rpx;
 					}
 				}
 

pages_order/service/reservationDetail.vue

@@ -96,7 +96,7 @@
 			
 			<view class="video-list">
 				<view class="title">
-					讲解现场
+					{{ video_list_titles[type] }}
 				</view>
 			</view>
 			<videoList ref="videoList" :roleId="id"/>
@@ -115,6 +115,7 @@
 		data() {
 			return {
 				titles: ['遗产讲述', '达人同游', '我要跟拍'],
+				video_list_titles: ['讲解现场', '同游现场', '跟拍现场'],
 				type: 0,
 				id : 0,
 				detail : {},

pages_order/service/tellList.vue

@@ -27,11 +27,11 @@
 		},
 		onLoad(args) {
 			this.type = args.type || 0
-			console.log(this.type);
 		},
 		onShow() {
-			this.$refs.cardList.getList()
-			console.log(this.type);
+			this.$nextTick(() => {
+				this.$refs.cardList.getList()
+			})
 		},
 		onPullDownRefresh(){
 			this.$refs.cardList.getList()