diff --git a/api/api.js b/api/api.js index b682a12..274f807 100644 --- a/api/api.js +++ b/api/api.js @@ -115,6 +115,12 @@ const config = { method: 'GET', showLoading: true, }, + // 获取地点详情 + querySpotById: { + url: '/info/querySpotById', + method: 'GET', + showLoading: true, + }, // 获取视频列表 queryVedioById: { url: '/info/queryVedioById', @@ -315,6 +321,13 @@ const config = { showLoading: true, limit : 500, }, + // 查询文创好物订单详情 + queryWaresOrderById: { + url: '/info/queryWaresOrderById', + method: 'GET', + showLoading: true, + limit : 500, + }, // 搜索文章 queryArticleListByTitle: { url: '/info/queryArticleListByTitle', diff --git a/components/list/videoList.vue b/components/list/videoList.vue index e9dc930..8b083e1 100644 --- a/components/list/videoList.vue +++ b/components/list/videoList.vue @@ -7,7 +7,7 @@ - + @@ -18,13 +18,13 @@ - {{ item.videoTitle }} + {{ item.travelVideo.videoTitle }} @@ -64,7 +64,7 @@ import index from '../../uni_modules/uv-ui-tools' this.list.forEach(n => { sources.push({ - url : n.videoContent, + url : n.travelVideo.videoContent, type : 'video' }) }) @@ -81,15 +81,19 @@ import index from '../../uni_modules/uv-ui-tools' this.queryParams.roleInfoId = this.roleId } + if(uni.getStorageSync('token')){ + this.queryParams.token = uni.getStorageSync('token') + } + this.$api('queryVedioById', this.queryParams, res => { if(res.code == 200){ - this.list = res.result.records - this.total = res.result.total + this.list = res.result + // this.total = res.result.total } }) }, loadMoreData(){ - if(this.queryParams.pageSize < this.total){ + if(this.queryParams.pageSize <= this.list.length){ this.queryParams.pageSize += 10 this.queryVideoList() } diff --git a/components/tourGuide/locations.vue b/components/tourGuide/locations.vue index 6dac16b..0047159 100644 --- a/components/tourGuide/locations.vue +++ b/components/tourGuide/locations.vue @@ -125,7 +125,7 @@ diff --git a/pages_order/order/orderSubscribe.vue b/pages_order/order/orderSubscribe.vue index d93c700..7da6bee 100644 --- a/pages_order/order/orderSubscribe.vue +++ b/pages_order/order/orderSubscribe.vue @@ -188,11 +188,11 @@ detailTitle(){ return this.detail.roleName || this.detail.amusementTitle || - this.detail.experienceTitle + this.detail.experienceTitle || '' }, price(){ return this.detail.price || - this.detail.amusementPrice + this.detail.amusementPrice || 0 } }, onLoad(args) { @@ -216,7 +216,7 @@ }, res => { uni.stopPullDownRefresh() if(res.code == 200){ - this.detail = res.result + this.detail = res.result.travelRoleInfo || res.result.travelExperience || res.result.travelAmusement } }) }, diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue index d26fa0e..d056129 100644 --- a/pages_order/product/productDetail.vue +++ b/pages_order/product/productDetail.vue @@ -57,6 +57,7 @@ @@ -77,6 +78,7 @@ return { productDetail: {}, productId : 0, + collectonFlag : false, } }, onLoad(args) { @@ -104,13 +106,18 @@ }, getData() { - this.$api('queryWaresById', { + let data = { waresId: this.productId - }, + } + if(uni.getStorageSync('token')){ + data.token = uni.getStorageSync('token') + } + this.$api('queryWaresById', data, res => { uni.stopPullDownRefresh() if (res.code == 200) { - this.productDetail = res.result + this.productDetail = res.result.travelWares + this.collectonFlag = res.result.collectonFlag } }) }, diff --git a/pages_order/service/StudyAndPathDetail.vue b/pages_order/service/StudyAndPathDetail.vue index 0a8c8fe..96cb0db 100644 --- a/pages_order/service/StudyAndPathDetail.vue +++ b/pages_order/service/StudyAndPathDetail.vue @@ -49,6 +49,7 @@ @getData="getData" @submit="toPayUrl(detail, type)" :isPay="detail.isPay == '1'" + :collectonFlag="collectonFlag" :collectType="dict.collectType"/> @@ -78,6 +79,7 @@ contentKey : ['amusementRoute', 'amusementAttention', 'amusementStatement'], content : '', dict : {}, + collectonFlag : false, } }, onLoad(args) { @@ -104,13 +106,17 @@ this.content = this.detail[this.contentKey[index]] }, getData(){ - this.$api('queryAmusementById', - { + let data = { amusementId : this.id, - }, res => { + } + if(uni.getStorageSync('token')){ + data.token = uni.getStorageSync('token') + } + this.$api('queryAmusementById', data, res => { uni.stopPullDownRefresh() if(res.code == 200){ - this.detail = res.result + this.detail = res.result.travelAmusement + this.collectonFlag = res.result.collectonFlag this.content = this.detail[this.contentKey[0]] } }) diff --git a/pages_order/service/articleDetail.vue b/pages_order/service/articleDetail.vue index c91b7ad..9ba2391 100644 --- a/pages_order/service/articleDetail.vue +++ b/pages_order/service/articleDetail.vue @@ -2,7 +2,7 @@ - + @@ -29,6 +30,7 @@ id : 0, type : '', dict : {}, + collectonFlag : false, } }, onLoad(args) { @@ -44,13 +46,19 @@ }, methods: { queryArticleById(){ - this.$api(this.dict.api, { + let data = { articleId : this.id, experienceId : this.id, - }, res => { + spotId : this.id, + } + if(uni.getStorageSync('token')){ + data.token = uni.getStorageSync('token') + } + this.$api(this.dict.api, data, res => { uni.stopPullDownRefresh() if(res.code == 200){ - this.detail = res.result + this.detail = res.result.travelExperience || res.result + this.collectonFlag = res.result.collectonFlag } }) }, diff --git a/pages_order/service/carefree.vue b/pages_order/service/carefree.vue index 0f33290..70988bf 100644 --- a/pages_order/service/carefree.vue +++ b/pages_order/service/carefree.vue @@ -16,19 +16,19 @@ 无忧服务 - + 瓷都美食 - + 精品民宿 - + 无忧租车 @@ -60,7 +60,51 @@ ...mapState(['banner']), }, methods: { - + // 跳转美团民宿 + toMS(){ + uni.navigateToMiniProgram({ + appId: 'wxc147016e2b3bf9d6', + // path: '', + envVersion: "release", + success: res => { + // 打开成功 + console.log("打开成功", res); + }, + fail: err => { + console.log(err); + } + }) + }, + // 跳转美团美食 + toM(){ + uni.navigateToMiniProgram({ + appId: 'wxde8ac0a21135c07d', + // path: '', + envVersion: "release", + success: res => { + // 打开成功 + console.log("打开成功", res); + }, + fail: err => { + console.log(err); + } + }) + }, + // 跳转DD打车 + toDD(){ + uni.navigateToMiniProgram({ + appId: 'wxaf35009675aa0b2a', + // path: '', + envVersion: "release", + success: res => { + // 打开成功 + console.log("打开成功", res); + }, + fail: err => { + console.log(err); + } + }) + }, } } diff --git a/pages_order/service/reservationDetail.vue b/pages_order/service/reservationDetail.vue index 411f82b..832323f 100644 --- a/pages_order/service/reservationDetail.vue +++ b/pages_order/service/reservationDetail.vue @@ -16,8 +16,12 @@ @click="addCollection">