上传跳转预约订单

pages_order/components/submit/StudyAndPathDetailSubmit.vue

@@ -17,7 +17,7 @@
 		</view>
 		
 		<view class=""
-		@click="">
+		@click="addCollection">
 			<button
 			class="share">
 				<uv-icon 
@@ -46,7 +46,6 @@
 		</view>
 		
 		<view class=""
-		@click="$emit('share')"
 		v-if="!article">
 			<button
 			open-type="share"
@@ -61,6 +60,7 @@
 		</view>
 		
 		<view class="btn"
+		v-if="isPay"
 		@click="$emit('submit')">
 			{{ submiitTitle }}
 		</view>
@@ -84,6 +84,14 @@
 			},
 			article : {
 				default : false
+			},
+			detail : {
+				default : {}
+			},
+			collectType : {
+			},
+			isPay : {
+				default : true,
 			}
 		},
 		data() {
@@ -92,7 +100,23 @@
 			}
 		},
 		methods: {
-			
+			// 添加收藏
+			addCollection(){
+				this.$api('addCollection', {
+					itemId : this.detail.id,
+					collectionType : this.collectType,
+				}, res => {
+					if(res.code == 200){
+						
+						this.$emit('getData')
+						
+						uni.showToast({
+							title: res.message,
+							icon:'none'
+						})
+					}
+				})
+			},
 		}
 	}
 </script>

pages_order/mine/collect.vue

@@ -126,7 +126,11 @@
 				let self = this
 				uni.showModal({
 					title: '确认删除吗？',
-					success() {
+					success(r) {
+						if(!r.confirm){
+							return
+						}
+						console.log(r);
 						self.$api('deleteCollection', {
 							collectionId : item.id
 						}, res => {

pages_order/mine/subscribe.vue

@@ -76,7 +76,8 @@
 		mixins : [mixinsList],
 		data() {
 			return {
-				tabs: [{
+				tabs: [
+					{
 						name: '路径定制'
 					},
 					{
@@ -91,9 +92,6 @@
 					{
 						name: '非遗体验'
 					},
-					{
-						name: '遗产路径'
-					},
 					{
 						name: '我要研学'
 					},

pages_order/order/orderSubscribe.vue

@@ -7,16 +7,17 @@
 					{{ title }}
 				</view>
 				<view class="tips">
-					项目：{{ detail.roleName }}
+					项目/负责人：{{ detailTitle }}
 				</view>
 				<view class="tips">
-					开放时间：06:00-21:00
+					开放时间：{{ detail.openTime }}
 				</view>
 				<view class="tips">
-					联系电话：1311311311313
+					联系电话：{{ detail.phone }}
 				</view>
-				<view class="tips">
-					价格：￥{{ detail.price }}
+				<view class="tips"
+				v-if="price">
+					价格：￥ {{ price }}
 				</view>
 			</view>
 			<view class="form-time">
@@ -147,9 +148,9 @@
 					{
 						name: '非遗体验'
 					},
-					{
-						name: '遗产路径'
-					},
+					// {
+					// 	name: '遗产路径'
+					// },
 					{
 						name: '我要研学'
 					},
@@ -164,6 +165,28 @@
 				id : 0,
 				payType : 0,
 				detail : {},
+				//订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)
+				// 5-遗产路径待定
+				api : {
+					0 : 'queryAmusementById',//路径定制
+					1 : 'queryRoleInfoById',//遗产讲述
+					2 : 'queryRoleInfoById',//达人同游
+					3 : 'queryRoleInfoById',//我要跟拍
+					4 : 'queryExperienceById',//非遗体验
+					5 : 'queryAmusementById',//我要研学
+					// 6 : 'queryAmusementById',
+				},
+			}
+		},
+		computed : {
+			detailTitle(){
+				return this.detail.roleName ||
+				this.detail.amusementTitle ||
+				this.detail.experienceTitle
+			},
+			price(){
+				return this.detail.price ||
+				this.detail.amusementPrice
 			}
 		},
 		onLoad(args) {
@@ -179,8 +202,10 @@
 		methods: {
 			// 获取预约信息
 			getData(){
-				this.$api('queryRoleInfoById', {
+				this.$api(this.api[this.payType], {
 					roleInfoId : this.id,
+					amusementId : this.id,
+					experienceId : this.id,
 				}, res => {
 					uni.stopPullDownRefresh()
 					if(res.code == 200){

pages_order/service/StudyAndPathDetail.vue

@@ -44,7 +44,12 @@
 		</view>
 		
 		
-		<StudyAndPathDetailSubmit v-if="detail.isPay == 1"/>
+		<StudyAndPathDetailSubmit 
+		:detail="detail" 
+		@getData="getData"
+		@submit="toPayUrl(detail, payType[type])"
+		:isPay="detail.isPay == '1' || type == 1"
+		:collectType="collectType[type]"/>
 	</view>
 </template>
 
@@ -57,6 +62,8 @@
 		data() {
 			return {
 				titles: ['遗产路径', '我要研学'],
+				collectType : [2, 5],
+				payType : [0, 5],
 				type: 0,
 				tabs: [
 					{
@@ -106,6 +113,11 @@
 					}
 				})
 			},
+			toPayUrl(item, payType){
+				uni.navigateTo({
+					url: `/pages_order/order/orderSubscribe?payType=${payType}&id=${item.id}`
+				})
+			},
 		}
 	}
 </script>

pages_order/service/articleDetail.vue

@@ -9,6 +9,10 @@
 		article
 		submiitTitle="线上预约"
 		v-if="type == 2"
+		:detail="detail" 
+		@getData="queryArticleById"
+		@submit="toPayUrl(detail, payType[type])"
+		:collectType="collectType[type]"
 		/>
 	</view>
 </template>
@@ -22,6 +26,8 @@
 		data() {
 			return {
 				titles: ['文化遗产', '申遗历程', '非遗体验'],
+				collectType: [0, 0, 4],
+				payType : [0, 0, 4],
 				detail : {},
 				id : 0,
 				type : 0,
@@ -50,6 +56,11 @@
 					}
 				})
 			},
+			toPayUrl(item, payType){
+				uni.navigateTo({
+					url: `/pages_order/order/orderSubscribe?payType=${payType}&id=${item.id}`
+				})
+			},
 		}
 	}
 </script>

pages_order/service/experience.vue

@@ -20,7 +20,8 @@
 			<view class="experience-box-font">
 				<view style="font-weight: 600;">{{ item.experienceTitle }}</view>
 				<view style="font-size: 24rpx; color: #999999;">{{ item.experienceOpentime }}</view>
-				<view class="experience-box-button">
+				<view class="experience-box-button"
+				@click="toPayUrl(item)">
 					<view>线上预订</view>
 				</view>
 			</view>
@@ -53,6 +54,11 @@
 			toUrl(item){
 				this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=2`)
 			},
+			toPayUrl(item, payType){
+				uni.navigateTo({
+					url: `/pages_order/order/orderSubscribe?payType=4&id=${item.id}`
+				})
+			},
 		}
 	}
 </script>

pages_order/service/heritagePath.vue

@@ -36,7 +36,9 @@
 						<view style="font-size: 28rpx; font-weight: 600;">{{ item.amusementTitle }}</view>
 						<view style="font-size: 20rpx; color: #999999;" v-if="item.isPay == '1'">￥{{ item.amusementPrice }}起</view>
 					</view>
-					<view class="heritagePath-card-font-button" v-if="item.isPay == '1'">线上预订</view>
+					<view class="heritagePath-card-font-button" 
+					@click="toPayUrl(item)"
+					v-if="item.isPay == '1'">线上预订</view>
 				</view>
 				<view style="height: 40rpx;" />
 			</view>
@@ -82,6 +84,11 @@
 			beforeGetData(){
 				
 			},
+			toPayUrl(item){
+				uni.navigateTo({
+					url: `/pages_order/order/orderSubscribe?payType=0&id=${item.id}`
+				})
+			},
 		}
 	}
 </script>

pages_order/service/reservationDetail.vue

@@ -167,6 +167,7 @@
 		    }
 		},
 		methods: {
+			// 添加收藏
 			addCollection(){
 				this.$api('addCollection', {
 					itemId : this.detail.id,