manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "hotel_uni",
-    "appid" : "__UNI__9140D70",
+    "appid" : "__UNI__807A871",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/goods/goods-detail/index.vue

@@ -3,15 +3,6 @@
 		<navbarTransparent :title="page.title" />
 		<!-- swiper -->
 		<view class="home-swiper">
-			<!-- <uni-swiper-dot :info="info" :current="current1" :mode="mode" :dots-styles="dotsStyles">
-				<swiper class="swiper-box" @change="change1" circular>
-					<swiper-item v-for="(item ,index) in info" :key="index">
-						<view class="swiper-item" >
-							<image style="width: 100%;height:576rpx;" :src="item.img" mode="aspectFill"></image>
-						</view>
-					</swiper-item>
-				</swiper>
-			</uni-swiper-dot> -->
 			<uni-swiper-dot :mode="mode" :info="info" :current="current1" :dots-styles="dotsStyles">
 				<swiper class="swiper-box" @change="change1" circular>
 					<swiper-item v-for="(item ,index) in info" :key="index" v-if="resource_type == 1 ">
@@ -42,10 +33,17 @@
 					<text>积分</text>
 				</view>
 				<text class="price-text">{{productDetail.name}}</text>
-				<view @click="goOther" class="price-banner" :style="{backgroundImage:'url('+backImageUrl+')'}">
+				<view @click="goOther" class="price-banner" :style="{backgroundImage:'url('+backImageUrl+')'}" v-if="produceType == 1">
+					<text>加入IHG优悦会会员享受更多福利</text>
+					<image style="width: 12rpx;height: 20rpx;" src="/static/icon/right02.png" mode=""></image>
+				</view>
+				
+				<view @click="goOtherIntegral" class="price-banner" :style="{backgroundImage:'url('+backImageUrl+')'}"  v-if="produceType == 2">
 					<text>加入IHG优悦会会员享受更多福利</text>
 					<image style="width: 12rpx;height: 20rpx;" src="/static/icon/right02.png" mode=""></image>
 				</view>
+				
+				
 				<!--规格-->
 				<view class="price-specs" @click="Recipientopen()">
 					<view class="price-specs-left">
@@ -172,6 +170,16 @@
 		},
 		data() {
 			return {
+	
+				//积分跳转h5,小程序,其他页面
+				jump_type_integral: '',
+				jump_config_integral: {},
+				//产品跳转h5,小程序,其他页面
+				jump_type_vip: '',
+				jump_config_vip: {},
+				//加入会员广告配置
+				advise: '',
+				
 				jump_type: '',
 				jump_config: '',
 				resource_type: '',
@@ -233,6 +241,33 @@
 			this.product_id = id
 			this.produceType = type
 			this.getProductDetail(this.product_id, true)
+			
+			//vip跳转
+			this.advise = this.$store.getters.allset.add_member
+			this.jump_type_vip = this.advise.value.product_jump_type
+			if (this.jump_type_vip == 1) {
+				this.jump_config_vip = this.advise.value.product_h5_url
+			} else if (this.jump_type_vip == 2) {
+				this.jump_config_vip.appid = this.advise.value.product_appid
+				this.jump_config_vip.path = this.advise.value.product_path
+			} else if (this.jump_type_vip == 3) {
+				this.jump_config_vip = this.advise.value.product_other_path
+			}
+
+			this.jump_type_integral = this.advise.value.integral_jump_type
+			if (this.jump_type_integral == 1) {
+				this.jump_config_integral = this.advise.value.integral_h5_url
+			} else if (this.jump_type_integral == 2) {
+				this.jump_config_integral.appid = this.advise.value.integral_appid
+				this.jump_config_integral.path = this.advise.value.integral_path
+			} else if (this.jump_type_integral == 3) {
+				this.jump_config_integral = this.advise.value.integral_other_path
+			}
+			
+			
+			
+			
+			
 		},
 		computed: {
 			showAttr: function() {
@@ -267,37 +302,75 @@
 					console.log('当前页面url：', pageUrl);
 				}
 			},
+			
+			
+			// 跳转其他小程序
+			jumpHAppID(id, urls) {
+				if (id == 1) {
+					const url = urls; // 跳转的外链
+					const navtitle = 'H5'; // 这个标题是你自己可以设置的
+					uni.navigateTo({
+						// 跳转到webview页面
+						url: `/pages/webview/webview?url=${url}&nav=${navtitle}`,
+						success: () => {
+							console.log('成功')
+						},
+						fail: (e) => {
+							console.log(e, "失败")
+						}
+					});
+				} else if (id == 2) {
+					let _this = this
+					let obj = urls;
+					console.log(obj, '----->obj');
+					wx.navigateToMiniProgram({
+						appId: `${obj.appid}`, //appid
+						path: `${obj.path}`, //path
+						extraData: { //参数
+							foo: 'bar'
+						},
+						// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+						success(res) {
+							let page = _this.getPageUrl()
+							let user_id = ''
+							if (_this.admin != null) {
+								user_id = _this.admin.id
+							} else {
+								user_id = 0
+							}
+							_this.$api.my.userMemberAdd({
+								user_id,
+								page,
+							}).then(res => {
+								console.log(res.data);
+							})
+							// 打开成功
+						},
+						fail(e) {
+							console.log(e, '失败')
+						}
+					})
+				} else if (id == 3) {
+					uni.redirectTo({
+						url: urls,
+						fail: (err) => {
+							uni.reLaunch({
+								url: urls
+							})
+						}
+					})
+				}
+			},
+			
 			// 跳转其他小程序
 			goOther() {
 				let _this = this
-				wx.navigateToMiniProgram({
-					appId: 'wx255b58f0992b3c53', //appid
-					path: 'newUIMain/enrollment/enrollment', //path
-					extraData: { //参数
-						foo: 'bar'
-					},
-					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
-					success(res) {
-						let page = _this.getPageUrl()
-						let user_id = ''
-						if (_this.admin != null) {
-							user_id = _this.admin.id
-						} else {
-							user_id = 0
-						}
-						console.log('成功', page)
-						_this.$api.my.userMemberAdd({
-							user_id,
-							page,
-						}).then(res => {
-							console.log(res.data);
-						})
-						// 打开成功
-					},
-					fail(e) {
-						console.log(e, '失败')
-					}
-				})
+				this.jumpHAppID(this.jump_type_vip, this.jump_config_vip)
+			},
+			
+			goOtherIntegral(){
+				let _this = this
+				this.jumpHAppID(this.jump_type_integral, this.jump_config_integral)
 			},
 			//视频自动播放
 			openVideoPlay() {
@@ -430,7 +503,7 @@
 				const selectedIds = resArr.join(':');
 				console.log(this.productDetail.integral);
 				uni.navigateTo({
-					url: `/pages/my/integral/integralOrder?product_id=${this.productDetail.id}&attr=${selectedIds}&integral=${this.productDetail.integral}`
+					url: `/pages/my/integral/integralOrder?product_id=${this.productDetail.id}&attr=${selectedIds}&integral=${this.productDetail.integral}&attrName=${this.showAttr}`
 				})
 				this.Recipientclose()
 			},
@@ -464,7 +537,7 @@
 				}
 				const selectedIds = resArr.join(':');
 				uni.navigateTo({
-					url: `/pages/my/integral/integralOrder?product_id=${this.productDetail.id}&attr=${selectedIds}&integral=${this.productDetail.integral}`
+					url: `/pages/my/integral/integralOrder?product_id=${this.productDetail.id}&attr=${selectedIds}&integral=${this.productDetail.integral}&attrName=${this.showAttr}`
 				})
 
 			},

pages/index/index.vue

@@ -199,6 +199,10 @@
 		},
 		data() {
 			return {
+				//加入会员跳转
+				adviseVip:'',
+				jump_type_vip:'', 
+				jump_config_vip:{},
 				//用户个人信息,判断是否登录
 				admin: '',
 				//获取token
@@ -310,13 +314,6 @@
 			this.getAllSet()
 			// this.isDevelopment = process.env.NODE_ENV === 'development';
 			this.isDevelopment = true;
-			//用户访问
-			this.getUserVisits()
-			
-			// uni.navigateTo({
-			// 	url: "/pages/goods/goods-lucky/index?draw_no=k8PgR7PS5ZLQ"
-			// })
-			// this.isDevelopment = true;
 
 
 		},
@@ -361,6 +358,17 @@
 					this.jump_type = this.popupData?.jump_type,
 						this.jump_config = this.popupData?.jump_config
 					this.open()
+					//加入vip跳转
+					this.adviseVip = this.$store.getters.allset.add_member
+					this.jump_type_vip = this.adviseVip.value.index_jump_type
+					if( this.jump_type_vip == 1){
+						this.jump_config_vip = this.adviseVip.value.index_h5_url
+					}else if(this.jump_type_vip == 2){
+						this.jump_config_vip.appid = this.adviseVip.value.index_appid
+						this.jump_config_vip.path = this.adviseVip.value.index_path
+					}else if(this.jump_type_vip == 3){
+						this.jump_config_vip =this.adviseVip.value.index_other_path
+					}
 				})
 			},
 			// 获取活动列表
@@ -539,35 +547,64 @@
 			// 跳转其他小程序
 			goJoin() {
 				let _this = this
-				wx.navigateToMiniProgram({
-					appId: 'wx255b58f0992b3c53', //appid
-					path: 'newUIMain/enrollment/enrollment', //path
-					extraData: { //参数
-						foo: 'bar'
-					},
-					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
-					success(res) {
-						let page = _this.getPageUrl()
-						let user_id = ''
-						if (_this.admin != null) {
-							user_id = _this.admin.id
-						} else {
-							user_id = 0
+				this.jumpHAppID(this.jump_type_vip, this.jump_config_vip)
+			},
+			// 跳转其他小程序
+			jumpHAppID(id, urls) {
+				if (id == 1) {
+					const url = urls; // 跳转的外链
+					const navtitle = 'H5'; // 这个标题是你自己可以设置的
+					uni.navigateTo({
+						// 跳转到webview页面
+						url: `/pages/webview/webview?url=${url}&nav=${navtitle}`,
+						success: () => {
+							console.log('成功')
+						},
+						fail: (e) => {
+							console.log(e, "失败")
 						}
-						console.log('成功', page)
-						_this.$api.my.userMemberAdd({
-							user_id,
-							page,
-						}).then(res => {
-							console.log(res.data);
-						})
-
-						// 打开成功
-					},
-					fail(e) {
-						console.log(e, '失败')
-					}
-				})
+					});
+				} else if (id == 2) {
+					let _this = this
+					let obj = urls;
+					console.log(obj, '----->obj');
+					wx.navigateToMiniProgram({
+						appId: `${obj.appid}`, //appid
+						path: `${obj.path}`, //path
+						extraData: { //参数
+							foo: 'bar'
+						},
+						// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+						success(res) {
+							let page = _this.getPageUrl()
+							let user_id = ''
+							if (_this.admin != null) {
+								user_id = _this.admin.id
+							} else {
+								user_id = 0
+							}
+							_this.$api.my.userMemberAdd({
+								user_id,
+								page,
+							}).then(res => {
+								console.log(res.data);
+							})
+							// 打开成功
+						},
+						fail(e) {
+							console.log(e, '失败')
+						}
+					})
+				} else if (id == 3) {
+					uni.redirectTo({
+						url: urls,
+						fail: (err) => {
+							uni.reLaunch({
+								url: urls
+							})
+						}
+					})
+				}
 			},
 
 			//用户访问

pages/index/vote-detail/index.vue

@@ -105,7 +105,7 @@
 						mode=""></image>
 					<text>预约</text>
 				</view>
-				<view class="reserve-right" @click="goJoin">
+				<view class="reserve-right" @click="goJoinActivity">
 					<image style="width: 60rpx;height: 56rpx; margin-right: 4rpx; " src="/static/icon/reserve01.png"
 						mode=""></image>
 					<text>加入IHG会员</text>
@@ -136,7 +136,7 @@
 						@click="isVoteNum?goVote(activity_project_id,true):closeVote()">
 						<text>{{isVoteNum?'再次投票':'关闭'}}</text>
 					</view>
-					<view v-if="is_prize==0" class="download" @click="isVoteNum||is_vip?goOtherItem():goJoin()">
+					<view v-if="is_prize==0" class="download" @click="isVoteNum||is_vip?goOtherItem():goJoinActivity()">
 						<text>{{isVoteNum||is_vip?'其他项目':'加入IHG会员' }}</text>
 					</view>
 
@@ -175,7 +175,16 @@
 	export default {
 		components:{Poster},
 		data() {
-			return {
+			return {
+				
+				//活动加入vip跳转
+				jump_type_vip_Activity: '',
+				jump_config_vip_Activity: {},
+				//图标跳转h5,小程序,其他页面
+				jump_type_vip: '',
+				jump_config_vip: {},
+				//加入会员广告配置
+				advise: '',
 				is_vip: false,
 				pupopSuccess: true,
 				pupopWidth: 590,
@@ -248,11 +257,26 @@
 			this.activity_project_id = op.id
 			this.getDetail(op.id)
 			this.admin = this.$store.getters.userInfo
-			// //海报
-			// this.pupopWidth = this.pupopWidth * this.pixelRatio
-			// this.pupopHeight = this.pupopHeight * this.pixelRatio
-
-
+			this.advise = this.$store.getters.allset.add_member
+			this.jump_type_vip = this.advise.value.index_jump_type
+			if( this.jump_type_vip == 1){
+				this.jump_config_vip = this.advise.value.index_h5_url
+			}else if(this.jump_type_vip == 2){
+				this.jump_config_vip.appid = this.advise.value.index_appid
+				this.jump_config_vip.path = this.advise.value.index_path
+			}else if(this.jump_type_vip == 3){
+				this.jump_config_vip =this.advise.value.index_other_path
+			}
+			//活动投票跳转vip
+			this.jump_type_vip_Activity =  this.advise.value.vote_activity_jump_type
+			if( this.jump_type_vip_Activity == 1){
+				this.jump_config_vip_Activity = this.advise.value.vote_activity_h5_url
+			}else if(this.jump_type_vip_Activity == 2){
+				this.jump_config_vip_Activity.appid = this.advise.value.vote_activity_appid
+				this.jump_config_vip_Activity.path = this.advise.value.vote_activity_path
+			}else if(this.jump_type_vip_Activity == 3){
+				this.jump_config_vip_Activity =this.advise.value.vote_activity_other_path
+			}
 		},
 		watch: {
 			vipRewardTicketNum: {
@@ -412,37 +436,115 @@
 					let pageUrl = `/${currentPage.route}`;
 					return pageUrl
 				}
-			},
-
+			},
+			
+			// 跳转其他小程序
+			goJoinActivity(){
+				let _this = this
+				this.jumpHAppID(this.jump_type_vip_Activity, this.jump_config_vip_Activity)
+			},
+			goJoin() {
+				let _this = this
+				this.jumpHAppID(this.jump_type_vip, this.jump_config_vip)
+			},
+			// 跳转其他小程序
+			jumpHAppID(id, urls) {
+				if (id == 1) {
+					const url = urls; // 跳转的外链
+					const navtitle = 'H5'; // 这个标题是你自己可以设置的
+					uni.navigateTo({
+						// 跳转到webview页面
+						url: `/pages/webview/webview?url=${url}&nav=${navtitle}`,
+						success: () => {
+							console.log('成功')
+						},
+						fail: (e) => {
+							console.log(e, "失败")
+						}
+					});
+				} else if (id == 2) {
+					let _this = this
+					let obj = urls;
+					console.log(obj, '----->obj');
+					wx.navigateToMiniProgram({
+						appId: `${obj.appid}`, //appid
+						path: `${obj.path}`, //path
+						extraData: { //参数
+							foo: 'bar'
+						},
+						// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+						success(res) {
+							const page = _this.getPageUrl()
+							let user_id = ''
+							if (_this.admin != null) {
+								user_id = _this.admin.id
+							} else {
+								user_id = 0
+							}
+							_this.$api.my.userMemberAdd({
+								user_id,
+								page,
+							})
+							//增加票数
+							_this.$api.my.userJoinVip({
+								source_type: 1,
+								source_id: _this.sourceId
+							}).then(res => {
+								console.log(res)
+								uni.setStorage({
+									key: `is_vip_${_this.voteDetail.id}`,
+									data: 1,
+								});
+								_this.is_vip = true
+								_this.closeVote()
+							})
+							// 打开成功
+						},
+						fail(e) {
+							console.log(e, '失败')
+						}
+					})
+				} else if (id == 3) {
+					uni.redirectTo({
+						url: urls,
+						fail: (err) => {
+							uni.reLaunch({
+								url: urls
+							})
+						}
+					})
+				}
+			},
+						
 			// 跳转其他小程序
-			goJoin() {
-				this.$utils.jumpJoinVip().then( _=>{
-					const page = this.getPageUrl()
-					let user_id = ''
-					if (this.admin != null) {
-						user_id = this.admin.id
-					} else {
-						user_id = 0
-					}
-					this.$api.my.userMemberAdd({
-						user_id,
-						page,
-					})
-					//增加票数
-					this.$api.my.userJoinVip({
-						source_type: 1,
-						source_id: this.sourceId
-					}).then(res => {
-						console.log(res)
-						uni.setStorage({
-							key: `is_vip_${this.voteDetail.id}`,
-							data: 1,
-						});
-						this.is_vip = true
-						this.closeVote()
-					})
-				})
-			},
+			// goJoin() {
+			// 	this.$utils.jumpJoinVip().then( _=>{
+			// 		const page = this.getPageUrl()
+			// 		let user_id = ''
+			// 		if (this.admin != null) {
+			// 			user_id = this.admin.id
+			// 		} else {
+			// 			user_id = 0
+			// 		}
+			// 		this.$api.my.userMemberAdd({
+			// 			user_id,
+			// 			page,
+			// 		})
+			// 		//增加票数
+			// 		this.$api.my.userJoinVip({
+			// 			source_type: 1,
+			// 			source_id: this.sourceId
+			// 		}).then(res => {
+			// 			console.log(res)
+			// 			uni.setStorage({
+			// 				key: `is_vip_${this.voteDetail.id}`,
+			// 				data: 1,
+			// 			});
+			// 			this.is_vip = true
+			// 			this.closeVote()
+			// 		})
+			// 	})
+			// },
 			// 投票
 			goVote(id, again = false) {
 				again && this.closeVote();

pages/login/youyue.vue

@@ -7,7 +7,7 @@
 			IHG优悦会忠诚计划优悦随行悦享世界
 		</view>
 		<view class="detail">
-			<view><text>HG优悦会是洲际酒店集团的会员忠诚计划。在全球拥有超过1亿会员。</text></view>
+			<view><text>IHG优悦会是洲际酒店集团的会员忠诚计划。在全球拥有超过1亿会员。</text></view>
 			<view><text> 即刻加入HG优悦会，一键开启会员专享价及会员专属礼遇。轻松赚取积分，使用灵活的积分兑换及竞拍，畅享独特且多元的犒赏体验。</text></view>
 		</view>
 
@@ -40,7 +40,6 @@
 		<view class="btn" @click="goOther">
 			<text>立即加入会员</text>
 		</view>
-
 		<view class="logintitle">
 			<view class="line"></view>
 			<view class="logintype"><text>其他登录</text></view>
@@ -72,6 +71,11 @@
 	export default {
 		data() {
 			return {
+				//跳转h5,小程序,其他页面
+				jump_type: '',
+				jump_config: {},
+				//加入会员广告配置
+				advise: '',
 				imgBase64: '',
 				isLoginOff: false,
 				modal: {
@@ -88,8 +92,75 @@
 		},
 		onLoad() {
 			this.isLoginOff = this.$store.getters.userInfo
+			this.advise = this.$store.getters.allset.add_member
+			this.jump_type = this.advise.value.member_info_jump_type
+			if( this.jump_type == 1){
+				this.jump_config = this.advise.value.member_info_h5_url
+			}else if(this.jump_type == 2){
+				this.jump_config.appid = this.advise.value.member_info_appid
+				this.jump_config.path = this.advise.value.member_info_path
+			}else if(this.jump_type == 3){
+				this.jump_config =this.advise.value.member_info_other_path
+			}
+			
 		},
 		methods: {
+			// 跳转其他小程序
+			goOther() {
+				this.jumpHAppID(this.jump_type, this.jump_config)
+			},
+			jumpHAppID(id, urls) {
+				if (id == 1) {
+					const url = urls; // 跳转的外链
+					const navtitle = 'H5'; // 这个标题是你自己可以设置的
+					uni.navigateTo({
+						// 跳转到webview页面
+						url: `/pages/webview/webview?url=${url}&nav=${navtitle}`,
+						success: () => {
+							console.log('成功')
+						},
+						fail: (e) => {
+							console.log(e, "失败")
+						}
+					});
+				} else if (id == 2) {
+					let _this = this
+					let obj = urls;
+					console.log(obj, '----->obj');
+					wx.navigateToMiniProgram({
+						appId: `${obj.appid}`, //appid
+						path: `${obj.path}`, //path
+						extraData: { //参数
+							foo: 'bar'
+						},
+						// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+						success(res) {
+							let page = _this.getPageUrl()
+							console.log('成功', page)
+							_this.$api.my.userMemberAdd({
+								user_id: 0,
+								page,
+							}).then(res => {
+								console.log(res.data);
+							})
+							// 打开成功
+						},
+						fail(e) {
+							console.log(e, '失败')
+						}
+					})
+				} else if (id == 3) {
+					uni.redirectTo({
+						url: urls,
+						fail: (err) => {
+							uni.reLaunch({
+								url: urls
+							})
+						}
+					})
+				}
+			},
+
 			//关闭遮罩层
 			closeMask() {
 				this.modal.show = false
@@ -121,27 +192,33 @@
 				this.modal.show = true
 			},
 			// 微信获取头像
-			handleChooseAvatar({detail}) {
+			handleChooseAvatar({
+				detail
+			}) {
 				let _this = this
 				uni.getFileSystemManager().readFile({
-				  filePath:detail.avatarUrl, // 选择图片返回的相对路径
-				  encoding: 'base64', // 编码格式
-				  success: res => { // 成功的回调
-				    uni.uploadFile({
-				      url: _this.$setting.BASE_URL + '/v1/user/uploadFile',
-				      // filePath: 'data:image/png;base64,' + res.data,
-				      filePath: detail.avatarUrl,
-				      name: 'file',
-				      success({ data }) {
-				        const res = JSON.parse(data)
-				        const { url } = res.data
-				        _this.modal.avatar = url
-				        console.log('-->data', _this.modal.avatar)
-				      }
-				    })
-				    // this.modal.avatar = detail.avatarUrl
-				    // console.log('data:image/png;base64,' + res.data)
-				  }
+					filePath: detail.avatarUrl, // 选择图片返回的相对路径
+					encoding: 'base64', // 编码格式
+					success: res => { // 成功的回调
+						uni.uploadFile({
+							url: _this.$setting.BASE_URL + '/v1/user/uploadFile',
+							// filePath: 'data:image/png;base64,' + res.data,
+							filePath: detail.avatarUrl,
+							name: 'file',
+							success({
+								data
+							}) {
+								const res = JSON.parse(data)
+								const {
+									url
+								} = res.data
+								_this.modal.avatar = url
+								console.log('-->data', _this.modal.avatar)
+							}
+						})
+						// this.modal.avatar = detail.avatarUrl
+						// console.log('data:image/png;base64,' + res.data)
+					}
 				})
 			},
 			handleChangeNickname(res) {
@@ -152,50 +229,23 @@
 			//获取当前页面路径
 			getPageUrl() {
 				const pages = getCurrentPages();
-				console.log(pages,'--------->pages')
-				if(pages.length==1){
+				console.log(pages, '--------->pages')
+				if (pages.length == 1) {
 					const currentPage = pages[0];
 					let pageUrl = `/${currentPage.route}`;
 					return pageUrl
 					console.log('当前页面url：', pageUrl);
-				}else{
+				} else {
 					const currentPage = pages[pages.length - 1];
 					let pageUrl = `/${currentPage.route}`;
 					return pageUrl
 					console.log('当前页面url：', pageUrl);
 				}
-				
-				// pageUrl = this.pageUrl + '?id=' + this.detailID;
-				
-			},
 
+				// pageUrl = this.pageUrl + '?id=' + this.detailID;
 
-			// 跳转其他小程序
-			goOther() {
-				let _this = this
-				wx.navigateToMiniProgram({
-					appId: 'wx255b58f0992b3c53', //appid
-					path: 'newUIMain/enrollment/enrollment', //path
-					extraData: { //参数
-						foo: 'bar'
-					},
-					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
-					success(res) {
-						let page = _this.getPageUrl()
-						console.log('成功', page)
-						_this.$api.my.userMemberAdd({
-							user_id: 0,
-							page,
-						}).then(res => {
-							console.log(res.data);
-						})
-						// 打开成功
-					},
-					fail(e) {
-						console.log(e, '失败')
-					}
-				})
 			},
+
 			//登录
 			getCode() {
 				return new Promise((resolve, reject) => {

pages/map/map.vue

@@ -199,6 +199,11 @@
 		},
 		data() {
 			return {
+				//跳转h5,小程序,其他页面
+				jump_type: '',
+				jump_config: {},
+				//加入会员广告配置
+				advise: '',
 				scrolls:{scrollX: 0},
 				hotelList:[],
 				hotelListBase:[],
@@ -273,6 +278,18 @@
 			console.log(hotel_id,category_ids)
 			//获取经纬度
 			this.getHotelCategory()
+			
+			//vip跳转
+			this.advise = this.$store.getters.allset.add_member
+			this.jump_type = this.advise.value.map_jump_type
+			if (this.jump_type == 1) {
+				this.jump_config = this.advise.value.map_h5_url
+			} else if (this.jump_type == 2) {
+				this.jump_config.appid = this.advise.value.map_appid
+				this.jump_config.path = this.advise.value.map_path
+			} else if (this.jump_type == 3) {
+				this.jump_config = this.advise.value.map_other_path
+			}
 		},
 		methods: {
 			syncSearchInput(e){
@@ -557,38 +574,71 @@
 					return pageUrl
 				}
 			},
+			
 			// 跳转其他小程序
-			goJoin() {
-				let _this = this
-				wx.navigateToMiniProgram({
-					appId: 'wx255b58f0992b3c53', //appid
-					path: 'newUIMain/enrollment/enrollment', //path
-					extraData: { //参数
-						foo: 'bar'
-					},
-					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
-					success(res) {
-						let page = _this.getPageUrl()
-						let user_id = ''
-						if (_this.admin != null) {
-							user_id = _this.admin.id
-						} else {
-							user_id = 0
+			jumpHAppID(id, urls) {
+				if (id == 1) {
+					const url = urls; // 跳转的外链
+					const navtitle = 'H5'; // 这个标题是你自己可以设置的
+					uni.navigateTo({
+						// 跳转到webview页面
+						url: `/pages/webview/webview?url=${url}&nav=${navtitle}`,
+						success: () => {
+							console.log('成功')
+						},
+						fail: (e) => {
+							console.log(e, "失败")
+						}
+					});
+				} else if (id == 2) {
+					let _this = this
+					let obj = urls;
+					console.log(obj, '----->obj');
+					wx.navigateToMiniProgram({
+						appId: `${obj.appid}`, //appid
+						path: `${obj.path}`, //path
+						extraData: { //参数
+							foo: 'bar'
+						},
+						// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+						success(res) {
+							let page = _this.getPageUrl()
+							let user_id = ''
+							if (_this.admin != null) {
+								user_id = _this.admin.id
+							} else {
+								user_id = 0
+							}
+							_this.$api.my.userMemberAdd({
+								user_id,
+								page,
+							}).then(res => {
+								console.log(res.data);
+							})
+							// 打开成功
+						},
+						fail(e) {
+							console.log(e, '失败')
+						}
+					})
+				} else if (id == 3) {
+					uni.redirectTo({
+						url: urls,
+						fail: (err) => {
+							uni.reLaunch({
+								url: urls
+							})
 						}
-						_this.$api.my.userMemberAdd({
-							user_id,
-							page,
-						}).then(res => {
-							console.log(res.data);
-						})
+					})
+				}
+			},
 			
-						// 打开成功
-					},
-					fail(e) {
-						console.log(e, '失败')
-					}
-				})
+			// 跳转其他小程序
+			goJoin() {
+				let _this = this
+				this.jumpHAppID(this.jump_type, this.jump_config)
 			},
+			
 		},
 	}
 </script>

pages/my/Kudos/Kudos.vue

@@ -85,10 +85,10 @@
 				this.$api.active.kudos({
 					activity_id:id
 				}).then(res=>{
-					console.log(res,'点赞')
 					if(res.code==0){
 						if(beforeLike==1){
 							this.List[index].is_like=0
+							this.getList()
 						}else{
 							this.List[index].is_like=1
 						}

pages/my/integral/integralOrder.vue

@@ -71,7 +71,7 @@
 				</image>
 				<view style="margin-left: 24rpx;">
 					<text class="name">{{productDetail.name}}</text>
-					<!-- <text class="tag">礼盒装 </text> -->
+					<text class="tag" v-if="attrArry[0]">{{attrArry[0].attr_group_name == '包装'?attrArry[1].attr_group_name.slice(0,2)+'装':'' }} {{integral}}积分</text>
 				</view>
 			</view>
 			<view class="shopNumber">
@@ -108,9 +108,8 @@
 							style="font-size: 32rpx; color: #FF6200;line-height: 34rpx">确定</text></view>
 				</view>
 				<view class="chooselag">
-					<view @click="companyed(item.name,index)" class="language" 
-					v-for="(item,index) in typeSelect " :key="index"
-					:class="[activeIndex === index?'sgActive': ''] ">
+					<view @click="companyed(item.name,index)" class="language" v-for="(item,index) in typeSelect "
+						:key="index" :class="[activeIndex === index?'sgActive': ''] ">
 						<text>{{item.name}}</text>
 					</view>
 				</view>
@@ -130,14 +129,14 @@
 							style="font-size: 32rpx; color: #FF6200;line-height: 34rpx">确定</text></view>
 				</view>
 				<view class="chooselag">
-					<view@click="companyedShop(item.name,item.id,item.distanceToMe,index)" 
-					class="language" v-for="(item,index) in hotelList" :key="index"
+					<view@click="companyedShop(item.name,item.id,item.distanceToMe,index)" class="language"
+						v-for="(item,index) in hotelList" :key="index"
 						:class="[activeIndex2 === index?'sgActive': ''] ">
 						<text>{{item.name}}</text>
-					</view>
 				</view>
 			</view>
-		</uni-popup>
+	</view>
+	</uni-popup>
 
 
 	</view>
@@ -151,8 +150,12 @@
 		},
 		data() {
 			return {
+				//产品规格数组
+				attrArry:[],
+				//产品规格
+				attrName:'',
 				//积分
-				integral:'',
+				integral: '',
 				//选中激活样式
 				activeIndex: '',
 				activeIndex2: '',
@@ -190,7 +193,7 @@
 					// 产品ID
 					product_id: '',
 					// 产品规格ID
-					attr:'',
+					attr: '',
 				},
 				// 配送方式
 				typeSelect: [{
@@ -207,8 +210,15 @@
 		onLoad(op) {
 			console.log(op, "产品id")
 			this.Data.product_id = op.product_id
-			this.Data.attr= op.attr
+			this.Data.attr = op.attr
 			this.integral = op.integral
+			this.attrName= op.attrName
+			this.attrArry= this.attrName.split("-").map(item=>{
+				return {
+					attr_group_name: item
+				}
+			})
+			console.log(this.attrArry[1].attr_group_name.split(','),1111111111111)
 			this.getProductDetail(op.product_id)
 		},
 		methods: {
@@ -219,7 +229,7 @@
 				var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
 				var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
 					Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
-			 s = s * 6378.137;
+				s = s * 6378.137;
 				s = Math.round(s * 10000) / 10000;
 				return s // 单位千米
 			},
@@ -230,7 +240,7 @@
 					type: 2,
 					latitude: this.latitude,
 					longitude: this.longitude,
-					product_id:id
+					product_id: id
 				}).then(res => {
 					this.hotelList = res.data.data
 					this.hotelList.map(item => {
@@ -239,6 +249,12 @@
 						return item;
 					})
 					console.log(this.hotelList, '-------->this.hotelList');
+					//最近的酒店
+					this.formData.shop = this.hotelList[0].name
+					this.formData.distanceToMe = this.hotelList[0].distanceToMe
+					this.Data.hotel_id = this.hotelList[0].id
+
+
 				})
 			},
 			//获取定位
@@ -282,7 +298,7 @@
 					}
 				})
 			},
-			
+
 			//订单兑换
 			goExchange() {
 				if (this.formData.type == '' && this.is_virtual == 0) {
@@ -327,14 +343,14 @@
 					})
 					return
 				}
-				if(this.is_virtual == 0){
+				if (this.is_virtual == 0) {
 					let _this = this
 					uni.showModal({
 						title: '提示',
 						content: '确认使用积分兑换',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
-								if(_this.Data.express_type == 1){
+								if (_this.Data.express_type == 1) {
 									_this.$api.product.integralExchange({
 										..._this.Data
 									}).then(res => {
@@ -349,8 +365,8 @@
 											})
 										}
 									})
-								}else{
-									let obj ={}
+								} else {
+									let obj = {}
 									obj.express_type = _this.Data.express_type
 									obj.product_id = _this.Data.product_id
 									obj.receiver = _this.Data.receiver
@@ -377,14 +393,14 @@
 							}
 						}
 					});
-				}else{
+				} else {
 					let _this = this
 					uni.showModal({
 						title: '提示',
 						content: '确认使用积分兑换',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
-								let obj ={}
+								let obj = {}
 								obj.express_type = _this.Data.express_type
 								obj.product_id = _this.Data.product_id
 								obj.receiver = _this.Data.receiver
@@ -412,7 +428,7 @@
 					});
 				}
 			},
-			
+
 			change(ret) {
 				this.formData.region = ret.data.join('-')
 				this.Data.area_id = ret.code[2]
@@ -421,10 +437,10 @@
 			openShop() {
 				this.$refs.shopSelected.open('bottom')
 			},
-			companyedShop(i, id, distance,index) {
+			companyedShop(i, id, distance, index) {
 				this.typestatus2 = i
 				this.distanceToMe1 = distance
-				this.activeIndex2= index
+				this.activeIndex2 = index
 				this.Data.hotel_id = id
 			},
 			//确定按钮
@@ -497,6 +513,7 @@
 		height: 100%;
 		// background: #f9f9f9;
 	}
+
 	.distance {
 		position: absolute;
 		right: 60rpx;
@@ -565,8 +582,8 @@
 				padding-top: 40rpx;
 				padding-bottom: 40rpx;
 			}
-			
-			.sgActive{
+
+			.sgActive {
 				color: #FF6200 !important;
 				font-weight: bold !important;
 			}

pages/my/my.vue

@@ -122,6 +122,11 @@
 		},
 		data() {
 			return {
+				//跳转h5,小程序,其他页面
+				jump_type: '',
+				jump_config: {},
+				//加入会员广告配置
+				advise: '',
 				modal: {
 					show: false,
 					title: '用户信息获取',
@@ -151,6 +156,21 @@
 			this.admin = this.$store.getters.userInfo
 		},
 
+
+		onLoad() {
+			this.advise = this.$store.getters.allset.add_member
+			this.jump_type = this.advise.value.me_jump_type
+			if (this.jump_type == 1) {
+				this.jump_config = this.advise.value.me_h5_url
+			} else if (this.jump_type == 2) {
+				this.jump_config.appid = this.advise.value.me_appid
+				this.jump_config.path = this.advise.value.me_path
+			} else if (this.jump_type == 3) {
+				this.jump_config = this.advise.value.me_other_path
+			}
+		},
+
+
 		methods: {
 			//关闭遮罩层
 			closeMask() {
@@ -185,32 +205,38 @@
 				})
 			},
 			// 微信获取头像
-			handleChooseAvatar({detail}) {
+			handleChooseAvatar({
+				detail
+			}) {
 				// console.log(e.detail);
 				// this.modal.avatar = e.detail.avatarUrl
 				let _this = this
 				uni.getFileSystemManager().readFile({
-				  filePath:detail.avatarUrl, // 选择图片返回的相对路径
-				  encoding: 'base64', // 编码格式
-				  success: res => { // 成功的回调
-				    uni.uploadFile({
-				      url: _this.$setting.BASE_URL + '/v1/user/uploadFile',
-				      // filePath: 'data:image/png;base64,' + res.data,
-				      filePath: detail.avatarUrl,
-				      name: 'file',
-				      success({ data }) {
-				        const res = JSON.parse(data)
-				        const { url } = res.data
-				        _this.modal.avatar = url
-				        console.log('-->data', _this.modal.avatar)
-				      }
-				    })
-				    // this.modal.avatar = detail.avatarUrl
-				    // console.log('data:image/png;base64,' + res.data)
-				  }
+					filePath: detail.avatarUrl, // 选择图片返回的相对路径
+					encoding: 'base64', // 编码格式
+					success: res => { // 成功的回调
+						uni.uploadFile({
+							url: _this.$setting.BASE_URL + '/v1/user/uploadFile',
+							// filePath: 'data:image/png;base64,' + res.data,
+							filePath: detail.avatarUrl,
+							name: 'file',
+							success({
+								data
+							}) {
+								const res = JSON.parse(data)
+								const {
+									url
+								} = res.data
+								_this.modal.avatar = url
+								console.log('-->data', _this.modal.avatar)
+							}
+						})
+						// this.modal.avatar = detail.avatarUrl
+						// console.log('data:image/png;base64,' + res.data)
+					}
 				})
-				
-				
+
+
 			},
 			handleChangeNickname(res) {
 				this.modal.nickname = res.detail.value
@@ -302,51 +328,82 @@
 			//获取当前页面路径
 			getPageUrl() {
 				const pages = getCurrentPages();
-				console.log(pages,'--------->pages')
-				if(pages.length==1){
+				console.log(pages, '--------->pages')
+				if (pages.length == 1) {
 					const currentPage = pages[0];
 					let pageUrl = `/${currentPage.route}`;
 					return pageUrl
 					console.log('当前页面url：', pageUrl);
-				}else{
+				} else {
 					const currentPage = pages[pages.length - 1];
 					let pageUrl = `/${currentPage.route}`;
 					return pageUrl
 					console.log('当前页面url：', pageUrl);
 				}
 			},
+
 			// 跳转其他小程序
-			goJoin() {
-				let _this = this
-				wx.navigateToMiniProgram({
-					appId: 'wx255b58f0992b3c53', //appid
-					path: 'newUIMain/enrollment/enrollment', //path
-					extraData: { //参数
-						foo: 'bar'
-					},
-					// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
-					success(res) {
-						let page = _this.getPageUrl()
-						let user_id = ''
-						if (_this.admin != null) {
-							user_id = _this.admin.id
-						} else {
-							user_id = 0
+			jumpHAppID(id, urls) {
+				if (id == 1) {
+					const url = urls; // 跳转的外链
+					const navtitle = 'H5'; // 这个标题是你自己可以设置的
+					uni.navigateTo({
+						// 跳转到webview页面
+						url: `/pages/webview/webview?url=${url}&nav=${navtitle}`,
+						success: () => {
+							console.log('成功')
+						},
+						fail: (e) => {
+							console.log(e, "失败")
 						}
-						console.log('成功', page)
-						_this.$api.my.userMemberAdd({
-							user_id,
-							page,
-						}).then(res => {
-							console.log(res.data);
-						})
+					});
+				} else if (id == 2) {
+					let _this = this
+					let obj = urls;
+					console.log(obj, '----->obj');
+					wx.navigateToMiniProgram({
+						appId: `${obj.appid}`, //appid
+						path: `${obj.path}`, //path
+						extraData: { //参数
+							foo: 'bar'
+						},
+						// envVersion: 'develop', //开发版develop 开发版 trial   体验版 release 正式版 
+						success(res) {
+							let page = _this.getPageUrl()
+							let user_id = ''
+							if (_this.admin != null) {
+								user_id = _this.admin.id
+							} else {
+								user_id = 0
+							}
+							_this.$api.my.userMemberAdd({
+								user_id,
+								page,
+							}).then(res => {
+								console.log(res.data);
+							})
+							// 打开成功
+						},
+						fail(e) {
+							console.log(e, '失败')
+						}
+					})
+				} else if (id == 3) {
+					uni.redirectTo({
+						url: urls,
+						fail: (err) => {
+							uni.reLaunch({
+								url: urls
+							})
+						}
+					})
+				}
+			},
 
-						// 打开成功
-					},
-					fail(e) {
-						console.log(e, '失败')
-					}
-				})
+			// 跳转其他小程序
+			goJoin() {
+				let _this = this
+				this.jumpHAppID(this.jump_type, this.jump_config)
 			},
 			// 上传头像
 			uploadAvatar() {

pages/my/myorders/orderDetail.vue

@@ -126,7 +126,8 @@
 				<image v-if="goodsDet.product_type != 3 " style="border-radius: 12rpx;" :src="productImg[0]"></image>
 				<view style="margin-left: 24rpx;">
 					<text class="name">{{goodsDet.product_name}}</text>
-					<text class="tag" v-if="source_type == 3">{{goodsDet.integral}}积分</text>
+					<!-- <text class="tag" v-if="source_type == 3">{{goodsDet.integral}}积分</text> -->
+					<text class="tag" v-if="source_type == 3">{{JSON.parse(goodsDet.attrs)[0].attr_group_name == '包装'?JSON.parse(goodsDet.attrs)[0].attr_name+'装' : '' }} {{goodsDet.integral}}积分</text>
 				</view>
 			</view>
 			<view class="shopNumber">

pages/my/myorders/orders.vue

@@ -52,7 +52,10 @@
 
 					<view style="margin-left: 24rpx;">
 						<text class="name">{{item.product_name}}</text>
-						<text class="tag" v-if="item.source_type == 3">{{item.integral}}积分</text>
+						<text class="tag" v-if="item.source_type == 3">{{JSON.parse(item.attrs)[0].attr_group_name == '包装'?JSON.parse(item.attrs)[0].attr_name+'装' : '' }} {{item.integral}}积分</text>
+						<!-- <text class="tag" v-if="item.source_type == 3" >礼盒装 2000积分</text> -->
+						
+						
 					</view>
 				</view>
 				<view class="points">
@@ -178,6 +181,7 @@
 				}).then(res => {
 					if (res.code == 0) {
 						this.orderList = res.data.data
+						console.log(JSON.parse(this.orderList[0].attrs));
 					}
 				})
 			},

pages/my/verification/verification.vue

@@ -48,7 +48,8 @@
 					
 					<view style="margin-left: 24rpx;">
 						<text class="name">{{item.product_name}}</text>
-						<text class="tag" v-if="item.source_type == 3" >{{item.integral}}积分</text>
+						<!-- <text class="tag" v-if="item.source_type == 3" >{{item.integral}}积分</text> -->
+						<text class="tag" v-if="item.source_type == 3">{{JSON.parse(item.attrs)[0].attr_group_name == '包装'?JSON.parse(item.attrs)[0].attr_name+'装' : '' }} {{item.integral}}积分</text>
 					</view>
 				</view>
 				<view class="points" v-if="item.source_type == 3" >

setting.js

@@ -3,8 +3,8 @@
  */
 const IS_DEV = process.env.NODE_ENV === 'development'
 
-const URL = 'https://t9.9026.com'
-// const URL = 'https://ihg.9026.com'
+// const URL = 'https://t9.9026.com'
+const URL = 'https://ihg.9026.com'
 
 	
 module.exports = {