上传

components/list/videoList.vue

@@ -55,7 +55,8 @@
 			queryVideoList(){
 				this.$api('queryVideoList', this.queryParams, res => {
 					if(res.code == 200){
-						this.list = res.result
+						this.list = res.result.records
+						this.total = res.result.total
 					}
 				})
 			},

pages/index/index.vue

@@ -130,6 +130,10 @@
 		},
 		computed : {
 		},
+		onPullDownRefresh(){
+			this.$refs.videoList.queryVideoList()
+			this.queryBannerList()
+		},
 		onShow() {
 			this.$refs.videoList.queryVideoList()
 			this.queryBannerList()
@@ -141,6 +145,7 @@
 		methods: {
 			queryBannerList(){
 				this.$api('queryBannerList', res => {
+					uni.stopPullDownRefresh()
 					if(res.code == 200){
 						this.bannerList = res.result
 					}

pages_order/components/list/cardList.vue

@@ -1,25 +1,31 @@
 <template>
 	<view>
 		<view class="card" 
-		@click="$utils.navigateTo(`/pages_order/service/reservationDetail?type=${type}&id=${item.id}`)"
-		v-for="(item,index) in 10" :key="index">
+		@click="toUrl(type, item)"
+		v-for="(item, index) in list" :key="index">
 			<view class="card-img">
 				<image src="../../static/applyRelic/jdz.png" mode="aspectFill"></image>
 			</view>
 			<view class="card-content">
 				<view style="display: flex; align-items: center;">
-					<view class="title text-ellipsis">刘申林</view>
-					<image class="card-content-img" src="../../static/tell/goldMedal.png"></image>
+					<view class="title text-ellipsis">{{ item.roleName }}</view>
+					<image 
+					class="card-content-img" 
+					v-if="showRoleLevel"
+					:src="`../../static/tell/goldMedal${item.roleLevel}.png`"></image>
 				</view>
-				<view class="card-content-tag">
-					提前一周预约
+				<view class="card-content-tag"
+				v-if="item.preTime">
+					{{ item.preTime || '提前一周预约' }}
 				</view>
-				<view class="tips text-ellipsis-2">
-					御窑厂、刘家弄、观音阁、观音阁观音阁观音阁陶瓷博物馆御窑博物馆...陶瓷博物馆御窑博物馆陶瓷博物馆御窑博物馆陶瓷博物馆御窑博物馆
+				<view class="tips text-ellipsis-2"
+				v-if="item.preInfo">
+					{{ item.preInfo}}
+					<!-- 御窑厂、刘家弄、观音阁、观音阁观音阁观音阁陶瓷博物馆御窑博物馆...陶瓷博物馆御窑博物馆陶瓷博物馆御窑博物馆陶瓷博物馆御窑博物馆 -->
 				</view>
 				<view class="card-content-bottom">
 					<view style="color: #FF280C;">
-						￥300起
+						￥{{ item.price }}起
 					</view>
 					<view class="card-content-bottom-one">
 						￥线上预约
@@ -35,14 +41,50 @@
 		props : {
 			type : {
 				default : 0
+			},
+			height : {
+				default : 'auto'
+			},
+			showRoleLevel : {
+				default : false,
 			}
 		},
 		data() {
 			return {
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+				total : 0,
+				list : [],
 			}
 		},
 		methods: {
-
+			// 1-遗产讲述，2-达人同游，3-我要跟拍
+			getList(){
+				this.queryParams.pageNo = 1
+				this.$api('queryRoleInfoList', {
+					...this.queryParams,
+					roleId : this.type + 1,
+				}, res => {
+					uni.stopPullDownRefresh()
+					if(res.code == 200){
+						this.list = res.result.records
+						this.total = res.result.total
+					}
+				})
+			},
+			loadMoreList(){
+				if(this.queryParams.pageSize < this.total){
+					this.queryParams.pageSize += 10
+					this.getList()
+				}
+			},
+			toUrl(type, item){
+				console.log(item.id);
+				let url = `/pages_order/service/reservationDetail?type=${type}&id=` + item.id
+				this.$utils.navigateTo(url)
+			},
 		}
 	}
 </script>

pages_order/order/orderSubscribe.vue

@@ -19,9 +19,10 @@
 				<view class="title">
 					预约日期
 				</view>
-				<view class="line">
+				<view class="line"
+				@click="$refs.calendars.open()">
 					<view class="">
-						2024年
+						{{ selectDate.split('-')[0] }}年
 						<view class="icon">
 							<uv-icon
 							name="arrow-down"
@@ -30,7 +31,7 @@
 						</view>
 					</view>
 					<view class="">
-						9月
+						{{ selectDate.split('-')[1] }}月
 						<view class="icon">
 							<uv-icon
 							name="arrow-down"
@@ -39,7 +40,7 @@
 						</view>
 					</view>
 					<view class="">
-						9日
+						{{ selectDate.split('-')[2] }}日
 						<view class="icon">
 							<uv-icon
 							name="arrow-down"
@@ -49,11 +50,12 @@
 					</view>
 				</view>
 				
-				<!-- 预约日期 -->
+				<!-- 预约时间 -->
 				<view class="title">
-					预约日期
+					预约时间
 				</view>
-				<view class="line">
+				<view class="line"
+				@click="$refs.picker.open()">
 					<view class="">
 						08:00
 						<view class="icon">
@@ -84,12 +86,38 @@
 				</view>
 				<view class="input">
 					<view class="label">
-						
+						姓名
+					</view>
+					<input type="text" 
+					placeholder="请输入姓名"
+					v-model="form.name"/>
+				</view>
+				<view class="input">
+					<view class="label">
+						联系方式
 					</view>
-					<input type="text" />
+					<input type="text" 
+					placeholder="请输入联系方式"
+					v-model="form.phone"/>
 				</view>
 			</view>
 		</view>
+		
+		
+		<!-- 选择日期 -->
+		<uv-calendars 
+		color="#B12026" 
+		:date="selectDate"
+		confirmColor="#B12026"
+		:clearDate="false"
+		ref="calendars" @confirm="confirmDate" />
+		
+		
+		<!-- 选择时间 -->
+		<uv-picker ref="picker" 
+		:columns="timeColumns" 
+		confirmColor="#B12026"
+		@confirm="confirmTime"></uv-picker>
 	</view>
 </template>
 
@@ -97,11 +125,33 @@
 	export default {
 		data() {
 			return {
-				
+				form : {
+					name : '',
+					phone : '',
+				},
+				selectDate : this.$dayjs().format('YYYY-MM-DD'),
+				timeColumns : [
+					[
+						'08',
+						'10',
+					],
+					[
+						'14',
+						'16',
+						'20',
+					]
+				],
 			}
 		},
 		methods: {
-			
+			// 选择日期
+			confirmDate(e){
+				this.selectDate = e.fulldate
+			},
+			// 选择时间
+			confirmTime(e){
+				console.log(e);
+			},
 		}
 	}
 </script>
@@ -154,6 +204,16 @@
 		}
 		.form-input{
 			padding: 40rpx;
+			.input{
+				display: flex;
+				padding-top: 30rpx;
+				.label{
+					width: 200rpx;
+				}
+				input{
+					font-size: 26rpx;
+				}
+			}
 		}
 	}
 }

pages_order/service/applyRelic.vue

@@ -19,13 +19,13 @@
 				</view>
 			</view>
 			<view class="middle-font">
-				<view>
+				<view @click="selectMiddle(0)">
 					申遗历程
 				</view>
-				<view>
+				<view @click="selectMiddle(1)">
 					申遗缘由
 				</view>
-				<view>
+				<view @click="selectMiddle(2)">
 					遗产价值
 				</view>
 			</view>
@@ -63,32 +63,56 @@
 				},
 				total : 0,
 				list : [],
+				articleType : -1,
 			}
 		},
 		onShow() {
-			this.queryArticleList()
+			this.queryArticleListByType()
 		},
 		onReachBottom() {
 			this.loadMoreData()
 		},
+		onPullDownRefresh(){
+			this.queryArticleListByType()
+		},
 		methods: {
-			queryArticleList(){
-				this.$api('queryArticleList', res => {
+			queryArticleListByType(){
+				
+				let query = {
+					...this.queryParams,
+				}
+				
+				if(this.articleType != -1){
+					query.articleType = this.articleType
+				}
+				
+				this.$api('queryArticleListByType', query, res => {
+					uni.stopPullDownRefresh()
 					if(res.code == 200){
-						this.list = res.result
+						this.list = res.result.records
+						this.total = res.result.total
 					}
 				})
 			},
 			loadMoreData(){
 				if(this.queryParams.pageSize < this.total){
 					this.queryParams.pageSize += 10
-					this.queryArticleList()
+					this.queryArticleListByType()
 				}
 			},
 			toUrl(item){
 				console.log(item);
 				this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}`)
 			},
+			selectMiddle(e){
+				console.log(e);
+				if(this.articleType != e){
+					this.articleType = e
+				}else{
+					this.articleType = -1
+				}
+				this.queryArticleListByType()
+			},
 		}
 	}
 </script>

pages_order/service/articleDetail.vue

@@ -16,6 +16,11 @@
 		},
 		onLoad(args) {
 			this.id = args.id
+		},
+		onShow() {
+			this.queryArticleById()
+		},
+		onPullDownRefresh(){
 			this.queryArticleById()
 		},
 		methods: {
@@ -23,6 +28,7 @@
 				this.$api('queryArticleById', {
 					id : this.id
 				}, res => {
+					uni.stopPullDownRefresh()
 					if(res.code == 200){
 						this.detail = res.result
 					}

pages_order/service/following.vue

@@ -5,7 +5,7 @@
 		<view class="following-top-img">
 			<image src="https://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1msKSi.img" mode="aspectFill" />
 		</view>
-		<cardList :type="2"/>
+		<cardList :type="2" ref="cardList"/>
 		<tabber/>
 	</view>
 </template>
@@ -21,6 +21,16 @@
 
 			}
 		},
+		onShow() {
+			this.$refs.cardList.getList()
+		},
+		onPullDownRefresh(){
+			this.$refs.cardList.getList()
+		},
+		//滚动到屏幕底部
+		onReachBottom() {
+			this.$refs.videoList.loadMoreList()
+		},
 		methods: {
 
 		}

pages_order/service/reservationDetail.vue

@@ -123,20 +123,37 @@
 			return {
 				titles: ['遗产讲述', '达人同游', '我要跟拍'],
 				type: 0,
+				id : 0,
+				detail : {},
 			}
 		},
 		onLoad(args) {
 			this.type = args.type
+			this.id = args.id
 		},
 		onShow() {
 			this.$refs.videoList.queryVideoList()
+			this.getData()
+		},
+		onPullDownRefresh(){
+			this.$refs.videoList.queryVideoList()
+			this.getData()
 		},
 		//滚动到屏幕底部
 		onReachBottom() {
 			this.$refs.videoList.loadMoreData()
 		},
 		methods: {
-			
+			getData(){
+				this.$api('queryRoleInfoById', {
+					id : this.id,
+				}, res => {
+					uni.stopPullDownRefresh()
+					if(res.code == 200){
+						this.detail = res.result
+					}
+				})
+			},
 		}
 	}
 </script>

pages_order/service/tellList.vue

@@ -8,7 +8,7 @@
 			<view>遗产点</view>
 		</view>
 
-		<cardList :type="type"/>
+		<cardList :type="type" ref="cardList" :showRoleLevel="type == 1"/>
 		<tabber/>
 	</view>
 </template>
@@ -28,6 +28,16 @@
 		onLoad(args) {
 			this.type = args.type || 0
 		},
+		onShow() {
+			this.$refs.cardList.getList()
+		},
+		onPullDownRefresh(){
+			this.$refs.cardList.getList()
+		},
+		//滚动到屏幕底部
+		onReachBottom() {
+			this.$refs.cardList.loadMoreList()
+		},
 		methods: {
 
 		}