diff --git a/components/list/videoList.vue b/components/list/videoList.vue
index ad093a3..cf3fb29 100644
--- a/components/list/videoList.vue
+++ b/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
}
})
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a49f174..3dd2f83 100644
--- a/pages/index/index.vue
+++ b/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
}
diff --git a/pages_order/components/list/cardList.vue b/pages_order/components/list/cardList.vue
index f6af4c0..96ea4d2 100644
--- a/pages_order/components/list/cardList.vue
+++ b/pages_order/components/list/cardList.vue
@@ -1,25 +1,31 @@
+ @click="toUrl(type, item)"
+ v-for="(item, index) in list" :key="index">
- 刘申林
-
+ {{ item.roleName }}
+
-
- 提前一周预约
+
+ {{ item.preTime || '提前一周预约' }}
-
- 御窑厂、刘家弄、观音阁、观音阁观音阁观音阁陶瓷博物馆御窑博物馆...陶瓷博物馆御窑博物馆陶瓷博物馆御窑博物馆陶瓷博物馆御窑博物馆
+
+ {{ item.preInfo}}
+
- ￥300起
+ ￥{{ item.price }}起
￥线上预约
@@ -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)
+ },
}
}
diff --git a/pages_order/order/orderSubscribe.vue b/pages_order/order/orderSubscribe.vue
index 5943c79..67f5d4f 100644
--- a/pages_order/order/orderSubscribe.vue
+++ b/pages_order/order/orderSubscribe.vue
@@ -19,9 +19,10 @@
预约日期
-
+
- 2024年
+ {{ selectDate.split('-')[0] }}年
- 9月
+ {{ selectDate.split('-')[1] }}月
- 9日
+ {{ selectDate.split('-')[2] }}日
-
+
- 预约日期
+ 预约时间
-
+
08:00
@@ -84,12 +86,38 @@
-
+ 姓名
+
+
+
+
+
+ 联系方式
-
+
+
+
+
+
+
+
+
+
@@ -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);
+ },
}
}
@@ -154,6 +204,16 @@
}
.form-input{
padding: 40rpx;
+ .input{
+ display: flex;
+ padding-top: 30rpx;
+ .label{
+ width: 200rpx;
+ }
+ input{
+ font-size: 26rpx;
+ }
+ }
}
}
}
diff --git a/pages_order/service/applyRelic.vue b/pages_order/service/applyRelic.vue
index 3e8d79c..da081b8 100644
--- a/pages_order/service/applyRelic.vue
+++ b/pages_order/service/applyRelic.vue
@@ -19,13 +19,13 @@
-
+
申遗历程
-
+
申遗缘由
-
+
遗产价值
@@ -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()
+ },
}
}
diff --git a/pages_order/service/articleDetail.vue b/pages_order/service/articleDetail.vue
index dd65464..89f9d9e 100644
--- a/pages_order/service/articleDetail.vue
+++ b/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
}
diff --git a/pages_order/service/following.vue b/pages_order/service/following.vue
index 819d834..7c1b153 100644
--- a/pages_order/service/following.vue
+++ b/pages_order/service/following.vue
@@ -5,7 +5,7 @@
-
+
@@ -21,6 +21,16 @@
}
},
+ onShow() {
+ this.$refs.cardList.getList()
+ },
+ onPullDownRefresh(){
+ this.$refs.cardList.getList()
+ },
+ //滚动到屏幕底部
+ onReachBottom() {
+ this.$refs.videoList.loadMoreList()
+ },
methods: {
}
diff --git a/pages_order/service/reservationDetail.vue b/pages_order/service/reservationDetail.vue
index 635d583..4c7aee3 100644
--- a/pages_order/service/reservationDetail.vue
+++ b/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
+ }
+ })
+ },
}
}
diff --git a/pages_order/service/tellList.vue b/pages_order/service/tellList.vue
index f21258a..a87176e 100644
--- a/pages_order/service/tellList.vue
+++ b/pages_order/service/tellList.vue
@@ -8,7 +8,7 @@
遗产点
-
+
@@ -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: {
}
diff --git a/pages_order/static/tell/goldMedal.png b/pages_order/static/tell/goldMedal1.png
similarity index 100%
rename from pages_order/static/tell/goldMedal.png
rename to pages_order/static/tell/goldMedal1.png