From 7ee4b810ff68da49c1648f0486b87712cefb4512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <7682361+meliuxy_456@user.noreply.gitee.com>
Date: Thu, 9 Dec 2021 15:59:22 +0800
Subject: [PATCH] up

---
 .../packageBuy/pages/buyMember/buyMember.vue  |  17 +-
 packages/packageBuy/pages/detail/detail.vue   | 821 ++++++++++++++----
 .../packageBuy/pages/packageInfo/index.vue    | 154 +++-
 .../pages/shopDetail/shopDetail.vue           |  56 +-
 .../packageOrder/pages/myOrder/myOrder.vue    |   4 +-
 .../pages/applyReg/applyReg.vue               |   3 +-
 pages/member/member.vue                       |  25 +-
 utils/weixin.js                               |  43 +-
 8 files changed, 892 insertions(+), 231 deletions(-)

diff --git a/packages/packageBuy/pages/buyMember/buyMember.vue b/packages/packageBuy/pages/buyMember/buyMember.vue
index 30d45ad..c2b338c 100644
--- a/packages/packageBuy/pages/buyMember/buyMember.vue
+++ b/packages/packageBuy/pages/buyMember/buyMember.vue
@@ -33,7 +33,7 @@
 				</view>
 			</view>
 			<view class="formCol">
-				<view>建卡医院<text style="color:red">*</text></view>
+				<view>建卡医院</view>
 				<view class="formRight">
 					<picker :value="hindex" @change="bindHospitalChange" :range="arrHospital">
 						<view class="uni-input">{{arrHospital[hindex]}}</view>
@@ -57,6 +57,8 @@
 				</view>
 			</view>			 -->
 		</view>
+
+		
 		<view class="payBtn" @click="pay">立即支付</view>
 	</view>
 </template>
@@ -137,18 +139,12 @@
 					this.alert('请输入具体街道/地址')
 					return
 				}
-				if (weixin.isNull(this.info.hospital) || this.hindex == 0) {
-					this.alert('请输入具体建卡医院')
-					return
-				}
 
 				weixin.request({
 					api: '/api/member/order-add',
 					method: 'POST',
 					data: this.info,
-					utilSuccess: r => {
-						console.log(r.data.total)
-						console.log(r.data.total)
+					utilSuccess: r => {
 						if (parseFloat(r.data.total) == 0) {
 							uni.navigateTo({
 								url: '../buyMemberSuccess/buyMemberSuccess?id=' +
@@ -187,6 +183,7 @@
 						}
 					},
 					utilFail: r => {
+						weixin.alert(r)
 						console.log(r);
 					}
 
@@ -221,6 +218,10 @@
 	}
 </style>
 <style lang="scss" scoped>
+	button::after {
+		border: none
+	}
+
 	.content {
 		display: flex;
 		flex-direction: column;
diff --git a/packages/packageBuy/pages/detail/detail.vue b/packages/packageBuy/pages/detail/detail.vue
index 386cc56..8a5afea 100644
--- a/packages/packageBuy/pages/detail/detail.vue
+++ b/packages/packageBuy/pages/detail/detail.vue
@@ -25,13 +25,15 @@
 					<text class="big">免费</text>
 				</view>
 				<view class="r_info">
-					<view class="shareMoney" v-if="price.shared_price > 0"><text>分享金</text> {{price.shared_price}}元</view>
+					<view class="shareMoney" v-if="price.shared_price > 0"><text>分享金</text> {{price.shared_price}}元
+					</view>
 					<view class="leaveNum">剩余 50</view>
 				</view>
 			</view>
 			<view class="shareIntro" v-if="price.shared_price > 0">
 				<view class="title">分享金</view>
-				<view class="detail">其他用户通过您分享的页面购买并服务完成后， 您可获得<text class="font_red">￥{{price.shared_price}}</text>分享金</view>
+				<view class="detail">其他用户通过您分享的页面购买并服务完成后， 您可获得<text class="font_red">￥{{price.shared_price}}</text>分享金
+				</view>
 			</view>
 			<view class="tags">
 				<text class="txt" v-for="(item, idx) in info.label" :key="idx">{{item}}</text>
@@ -158,114 +160,522 @@
 					<view class="price"><text class="font_red">免费</text></view>
 				</view> -->
 			</view>
-		</view>		
-	<!--底部导航-->
-	<view class="footer">
-		<view class="menuLink">
-			<navigator url="../active/active" open-type="switchTab">
-			<view class="menuCol">
-				<text class="iconfont icon-home"></text>
-				<text>首页</text>
-			</view>
-			</navigator>
-			<view class="menuCol">
-				<text class="iconfont icon-Share"></text>
-				<text>分享</text>
-			</view>
-			<view class="menuCol">
-				<text class="iconfont icon-Icon_customerservice"></text>
-				<text>客服</text>
+		</view>
+		<!--底部导航-->
+		<view class="footer">
+			<view class="menuLink">
+				<navigator url="../active/active" open-type="switchTab">
+					<view class="menuCol">
+						<text class="iconfont icon-home"></text>
+						<text>首页</text>
+					</view>
+				</navigator>
+				<view class="menuCol">
+					<text class="iconfont icon-Share"></text>
+					<text>分享</text>
+				</view>
+				<view class="menuCol">
+					<text class="iconfont icon-Icon_customerservice"></text>
+					<text>客服</text>
+				</view>
 			</view>
+			<view class="buyBtn">立即购买</view>
 		</view>
-		<view class="buyBtn">立即购买</view>
-	</view>
 	</view>
 </template>
 <script>
+	let sysInfo = uni.getSystemInfoSync();
+	let SCREEN_WIDTH = sysInfo.screenWidth
+	let SCREEN_HEIGHT = sysInfo.screenHeight;
+	let WindowHeight = sysInfo.windowHeight;
+
+	let windowWidth = sysInfo.windowWidth;
+	import {
+		weixin
+	} from '../../../../utils/weixin.js';
 	export default {
 		data() {
+			const currentDate = this.getDate({
+				format: true
+			})
 			return {
-				type: 1,
+				id: "",
 				info: {},
-				price: {},
-				recommends: [],
+				dataList: [],
+				form: {
+					product_type: "product",
+					product_id: "",
+					due_date: "",
+					phone: '',
+					member_name: ""
+				},
+				openid: "",
+				showPop: false,
+
+				cardActive: 0,
+				img: '',
+				user_info: {
+					promotion: ''
+				},
+				shareBtnDisplay: 'none',
+				// 动态的宽高
+				cropperW: SCREEN_WIDTH,
+				cropperH: SCREEN_HEIGHT,
+				packages: [],
+				sharePath: "",
+				scare: 1,
+				shareHeight: 500,
+				imgAvatar: "",
+				poster: ""
+			}
+		},
+		onShareAppMessage() {
+			return {
+				title: this.info.name,
+				path: "packages/packageBuy/pages/shopDetail/shopDetail?id=" + this.info.id + "promotion_id=" + this
+					.user_info.id,
+				imageUrl: this.img
 			}
 		},
-		onLoad(options) {options = {id: 2, type: 2}
-			this.type = options.type
-			this.getDetail(options.id)
-			this.getRecommends()
+		onLoad(options) {
+			var that = this;
+			this.id = options.id;
+			weixin.getOpenidInfo(info => {
+				that.user_info = info
+			}, false)
+			this.openid = that.user_info.openid;
+			this.form.member_name = that.user_info.name;
+			this.form.phone = that.user_info.phone;
+			this.loadInfo();
+			this.loadPage();
+			this.form.product_id = options.id;
+
+			if (options.promotion_id) {
+				uni.setStorageSync("base_promotion_id", options.promotion_id)
+			}
 		},
 		methods: {
-			getDetail(id) {
-				const url = this.type == 1 ? '/api/wechat/activity-detail' : '/api/wechat/service-detail'
+			getPoster: function() {
+				var that = this;
+				uni.getImageInfo({
+					src: that.info.poster_url, // 头像
+					success: res => {
+						that.poster = res.path;
+						that.getAvatar();
+					}
+				});
+			},
+			getAvatar: function() {
+				let userProfile = uni.getStorageSync('user_profile');
+
+				if (!weixin.isNull(userProfile)) {
+					console.log(userProfile.avatarUrl)
+					console.log(this.imgAvatar)
+					uni.getImageInfo({
+						src: userProfile.avatarUrl, // 头像
+						success: rlogo => {
+							this.imgAvatar = rlogo.path;
+							console.log(this.imgAvatar)
+							this.draw();
+						}
+					});
+				} else {
+					this.imgAvatar = "../../static/avatar.jpg";
+					console.log(this.imgAvatar)
+					this.draw();
+				}
+			},
+			shareOpen() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				var that = this;
+				this.$refs.shareCode.open();
+				this.getPoster();
+			},
+			draw: function() {
+				var that = this;
 				uni.request({
-					url: this.baseUrl + url,
-					method: 'POST',
-					data: {id: id},
+					url: this.baseUrl + '/api/member/get-wxa-qrcode',
+					method: 'GET',
+					data: {
+						path: 'packages/packageBuy/pages/shopDetail/shopDetail',
+						scene: 'id=' + this.info.id + '&promotion_id=' + this.user_info.id
+					},
 					success: r => {
-						if (r.data.code == 0) {
-							this.info = r.data.data
-							this.price = this.info.prices[0]
+						if (r.data.status === 1) {
+							uni.getImageInfo({
+								src: this.baseUrl + r.data.data, // 二维码
+								success: res => {
+									var ctx = uni.createCanvasContext('firstCanvas')
+
+
+									var w = SCREEN_WIDTH * 0.8;
+									var h = this.shareHeight * this.scare;
+									// ctx.fillStyle = '#fff';
+									// ctx.fillRect(0, 0, 214, 342);
+									console.log(1)
+									ctx.drawImage('../../static/bg_haibao@2x.jpg', 0, 0,
+										w, h
+									); //(SCREEN_HEIGHT - 50 - SCREEN_WIDTH * 0.8 * 1.65) /2, SCREEN_WIDTH * 0.8, SCREEN_WIDTH * 0.8 * 1.5);
+
+									ctx.drawImage('../../static/bg_haibao1.png', 20, 30 + 40,
+										w -
+										40, h - 100);
+									/* SCREEN_WIDTH *
+									0.15, (SCREEN_HEIGHT - SCREEN_WIDTH * 0.6 * 1.65) /
+									2, SCREEN_WIDTH * 0.695, SCREEN_WIDTH * 0.6 * 1.5); */
+
+									ctx.drawImage(this.poster, 20, 30 + 40,
+										w -
+										40, (h - 60 - 60) * 0.5);
+									/* SCREEN_WIDTH * 0.15, (SCREEN_HEIGHT - SCREEN_WIDTH *
+										0.6 * 1.65) /
+									2, SCREEN_WIDTH * 0.695, SCREEN_WIDTH * 0.695 / 1.6); */
+
+									ctx.font = "22rpx bold";
+									// 设置颜色
+									ctx.fillStyle = "#fff";
+									// 绘制文字（参数：要写的字，x坐标，y坐标）
+									ctx.fillText("优孕课堂福利专享", 20, 50);
+
+									ctx.font = "16rpx bold";
+									// 设置颜色
+									ctx.fillStyle = "#000";
+									// 绘制文字（参数：要写的字，x坐标，y坐标）
+									ctx.fillText("专享福利", 40, (h + 50) * 0.5 + 20);
+
+									ctx.font = "14rpx bold";
+									// 设置颜色
+									ctx.fillStyle = "#3377b7";
+									// 绘制文字（参数：要写的字，x坐标，y坐标）
+
+									let packagesFirst = this.info
+									ctx.fillText("¥" + packagesFirst.price + "" + packagesFirst
+										.name, 40, (h + 50) * 0.5 + 20 + 30);
+
+
+									let user_info = uni.getStorageSync("user_info_yunyubang");
+
+									let userProfile = uni.getStorageSync('user_profile');
+
+									var img = this.imgAvatar;
+									uni.getImageInfo({
+										src: userProfile.avatarUrl, // 头像
+										success: rlogo => {
+											img = rlogo.path;
+
+										}
+									});
+									that.circleImg(ctx,
+										img,
+										40, h - 60 - w * 0.15,
+										w * 0.15 / 2);
+
+									ctx.font = "12rpx normal";
+									// 设置颜色
+									ctx.fillStyle = "#000";
+									// 绘制文字（参数：要写的字，x坐标，y坐标）
+									if (!weixin.isNull(user_info.name))
+										ctx.fillText(user_info.name,
+											40, h - 40);
+									else
+										ctx.fillText("",
+											40, h - 40);
+
+
+									this.circleImg(ctx, res.path, w - 40 - w * 0.2, h - 40 -
+										w *
+										0.2, w * 0.2 / 2);
+
+									console.log(2)
+									ctx.draw(),
+										// r: 半径
+										setTimeout(() => {
+											uni.canvasToTempFilePath({
+												canvasId: 'firstCanvas',
+												fileType: 'jpg',
+												success: (res) => {
+
+													console.log(3)
+													this.shareBtnDisplay =
+														'flex'
+													uni.hideLoading();
+													this.img = this.info
+														.poster;
+													this.sharePath = res
+														.tempFilePath;
+												},
+											})
+										}, 100)
+								}
+							})
+						} else {
+							uni.hideLoading()
+							this.$refs.shareCode.close()
+							this.alert(r.data.msg)
 						}
 					}
 				})
+
 			},
-			getRecommends() {
-				const url = this.type == 1 ? '/api/wechat/activity-index' : '/api/wechat/service-index'
-				uni.request({
-					url: this.baseUrl + url,
+			circleImg: function(ctx, img, x, y, r) {
+				ctx.save()
+				var d = 2 * r;
+				var cx = x + r;
+				var cy = y + r;
+				ctx.arc(cx, cy, r, 0, 2 * Math.PI);
+
+				ctx.clip();
+				ctx.drawImage(img, x, y, d, d);
+				ctx.restore();
+			},
+			shareClose() {
+				this.$refs.shareCode.close()
+			},
+			open() {
+				this.$refs.popup.open('top')
+
+			},
+			close() {
+				this.$refs.popup.close()
+			},
+			//保存图片时，h5端不能直接保存，只能通过预览长按保存
+			save() {
+
+				let _this = this;
+				// #ifdef H5
+				uni.previewImage({
+					urls: [_this.sharePath]
+				})
+				// #endif
+				// #ifdef APP-PLUS||MP-WEIXIN
+				uni.saveImageToPhotosAlbum({
+					filePath: _this.sharePath,
+					success: function() {
+						_this.$refs.shareCode.close()
+						_this.alert('保存成功')
+					}
+				});
+				// #endif
+			},
+
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			},
+			bindDateChange: function(e) {
+				this.form.due_date = e.target.value
+			},
+			toBuy() {
+				let user_info = weixin.getUserInfoCache();
+				if (weixin.isNull(this.form.member_name) || weixin.isNull(this.form.due_date) || weixin.isNull(this.form
+						.phone)) {
+					this.showPop = true;
+
+
+					if (weixin.isNull(this.form.member_name)) {
+						this.alert('请输入宝妈姓名')
+						return
+					}
+					if (weixin.isNull(this.form.due_date)) {
+						this.alert('请选择预产日期')
+						return
+					}
+
+					if (weixin.isNull(this.form.phone)) {
+						this.alert('请填写手机号')
+						return
+					}
+
+					return false;
+				}
+
+
+
+				this.toDoBuy();
+
+			},
+			toDoBuy: function() {
+				var that = this;
+				weixin.request({
+					api: '/api/member/order-add',
 					method: 'POST',
-					data: {page_size: 2},
-					success: r => {
-						if (r.data.code == 0) {
-							this.recommends = r.data.data.list
+					data: this.form,
+					utilSuccess: r => {
+						if (parseFloat(r.data.total) == 0) {
+							uni.navigateTo({
+								url: '../buyMemberSuccess/buyMemberSuccess?id=' +
+									this.form.product_id
+							})
+
+						} else {
+							weixin.request({
+								api: '/api/member/order-payment',
+								method: 'GET',
+								data: {
+									order_id: r.data.id,
+									openid: this.openid
+								},
+								utilSuccess: res => {
+
+									weixin.getOpenidInfo(() => {}, true);
+									setTimeout(function() {
+										uni.hideLoading();
+										that.showPop = false;
+									}, 100);
+									try {
+										let payParams = JSON.parse(res.jsApiParameters)
+										payParams.provider = 'wxpay'
+										payParams.success = result => {
+											uni.navigateTo({
+												url: '../buyMemberSuccess/buyMemberSuccess?id=' +
+													this.form.product_id
+											})
+										}
+										payParams.fail = result => {
+											console.log(result);
+										}
+										wx.requestPayment(payParams);
+
+									} catch (err) {
+										console.log(err)
+									} finally {
+										// finallyCode - 无论 try / catch 结果如何都会执行的代码块
+									}
+								},
+								utilFail: res => {
+									uni.showToast({
+										title: res
+									})
+									console.log(res);
+								}
+							})
 						}
+					},
+					utilFail: r => {
+						uni.showToast({
+							title: r
+						})
+						console.log(r);
+					}
+
+				})
+
+
+			},
+
+			gotoDetail: function(e) {
+				var id = e.currentTarget.dataset.id
+				uni.navigateTo({
+					url: "../shopDetail/shopDetail?id=" + id
+				})
+			},
+			loadInfo: function() {
+				weixin.request({
+					api: '/api/member/get-product/' + this.id,
+					method: 'GET',
+					utilSuccess: r => {
+						//r.data.poster = this.baseUrl + r.data.poster;
+						this.info = r.data;
+						this.info.poster = (weixin.isNull(this.info.poster) ? "../../static/750x500.jpg" :
+							this.info.poster_url)
+					},
+					utilFail: r => {
+						console.log(r);
 					}
 				})
 			},
+			loadPage: function() {
+				var that = this;
+				weixin.request({
+					bindThis: that,
+					api: '/api/member/get-products',
+					customLoading: false,
+					data: {
+						page: 1,
+						page_size: 3
+					},
+					utilSuccess: function(r) {
+						var res = r.data.data;
+
+						for (var m of res) {
+							m.created_at = m.created_at.split("T")[0] + " " + m.created_at.split("T")[1]
+								.split(".")[0]
+						}
+
+						that.dataList = res;
+					},
+					utilFail: function(res) {
+						util.alert(res);
+					}
+				});
+			}
+
 		}
 	}
 </script>
 <style lang="scss" scoped>
-	.footer{
-		width:100%;
+	.footer {
+		width: 100%;
 		height: 112rpx;
 		background: #FFFFFF;
 		box-shadow: 0px -1rpx 0px 0px #DEDEDE;
-		padding:0 30rpx;
+		padding: 0 30rpx;
 		box-sizing: border-box;
-		display:flex;
+		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		position: fixed;
-		bottom:0;
-		left:0;
-		.menuLink{
-			display:flex;
+		bottom: 0;
+		left: 0;
+
+		.menuLink {
+			display: flex;
 			justify-content: flex-start;
 			align-items: center;
-			color:#333;
-			.menuCol{
-				margin:0 30rpx;
-				font-size:20rpx;
-				text{display: block;}
-				.iconfont{font-size:36rpx;margin-bottom:6rpx;}
+			color: #333;
+
+			.menuCol {
+				margin: 0 30rpx;
+				font-size: 20rpx;
+
+				text {
+					display: block;
+				}
+
+				.iconfont {
+					font-size: 36rpx;
+					margin-bottom: 6rpx;
+				}
 			}
 		}
-		.buyBtn{
+
+		.buyBtn {
 			width: 220rpx;
 			height: 72rpx;
 			background: linear-gradient(90deg, #FF7E95 0%, #FF447B 100%);
 			border-radius: 36rpx;
 			font-size: 28rpx;
-			font-weight: 500;	
+			font-weight: 500;
 			text-align: center;
-			line-height:72rpx;
-			color:#fff;
+			line-height: 72rpx;
+			color: #fff;
 		}
-		
+
 	}
+
 	.content {
 		display: flex;
 		flex-direction: column;
@@ -274,15 +684,23 @@
 		background: #F6F6F6;
 		padding-bottom: 132rpx;
 	}
-	.detailTop{
+
+	.detailTop {
 		width: 750rpx;
-		.banner{display: block;width:100%;height:500rpx;}
+
+		.banner {
+			display: block;
+			width: 100%;
+			height: 500rpx;
+		}
 	}
-	.infoTop{
+
+	.infoTop {
 		position: relative;
 		width: 100%;
 		height: 88rpx;
 		background: #FF97AA;
+
 		.price {
 			position: absolute;
 			left: 0;
@@ -291,7 +709,17 @@
 			height: 124rpx;
 			border-radius: 0 40rpx 0 0;
 			color: #fff;
-			.priceBg{display: block;width:100%;height:124rpx;position: absolute;top:0;left:0;z-index: 9;}
+
+			.priceBg {
+				display: block;
+				width: 100%;
+				height: 124rpx;
+				position: absolute;
+				top: 0;
+				left: 0;
+				z-index: 9;
+			}
+
 			.two-price {
 				display: inline-block;
 				margin-top: 22rpx;
@@ -299,30 +727,34 @@
 				font-size: 24rpx;
 				line-height: 56rpx;
 				position: relative;
-				z-index:10;
+				z-index: 10;
+
 				.large {
 					font-size: 56rpx;
 				}
+
 				.del {
 					display: inline-block;
 					margin-left: 10rpx;
 					text-decoration: line-through;
 				}
 			}
+
 			.surplus {
 				display: inline-block;
 				width: 102rpx;
 				height: 32rpx;
 				line-height: 32rpx;
-				background: rgba(51,51,51,0.2);
+				background: rgba(51, 51, 51, 0.2);
 				border-radius: 16rpx;
 				font-size: 24rpx;
 				text-align: center;
 				margin-left: 20rpx;
 				position: relative;
-				z-index:10;				
+				z-index: 10;
 			}
 		}
+
 		.times {
 			position: absolute;
 			top: 13rpx;
@@ -331,9 +763,11 @@
 			align-items: center;
 			color: #fff;
 			font-size: 24rpx;
+
 			.djs {
 				padding-right: 10rpx;
 			}
+
 			.num {
 				display: inline-block;
 				margin-left: 8rpx;
@@ -344,29 +778,40 @@
 			}
 		}
 	}
+
 	.toptitle {
-		width:100%;
+		width: 100%;
 		background: #fff;
 		border-radius: 24rpx 24rpx 0;
 		margin-top: -20rpx;
-		padding:30rpx;
+		padding: 30rpx;
 		box-sizing: border-box;
 		position: relative;
-		z-index:20;
+		z-index: 20;
+
 		.h3 {
 			display: inline-block;
 			font-size: 36rpx;
 			font-weight: 500;
 			color: #333333;
 		}
+
 		.dataGroup {
 			position: absolute;
 			top: 30rpx;
 			right: 30rpx;
+
 			.dataCol {
 				display: inline-block;
-				margin-left:20rpx;
-				image{display: block;width:34rpx;height:34rpx;margin:0 auto;}
+				margin-left: 20rpx;
+
+				image {
+					display: block;
+					width: 34rpx;
+					height: 34rpx;
+					margin: 0 auto;
+				}
+
 				.bot {
 					display: block;
 					font-size: 20rpx;
@@ -375,10 +820,11 @@
 				}
 			}
 		}
+
 		.tags {
 			.txt {
 				padding: 8rpx;
-				background: rgba(255,177,62,0.1);
+				background: rgba(255, 177, 62, 0.1);
 				border-radius: 4rpx;
 				font-size: 20rpx;
 				color: #FF7E4C;
@@ -386,65 +832,95 @@
 				margin-right: 10rpx;
 			}
 		}
-		.normalPrice{
+
+		.normalPrice {
 			display: flex;
 			justify-content: space-between;
 			align-items: flex-end;
 			align-content: flex-end;
-			font-size:24rpx;color:#999;
-			.price{
-				flex:1;
+			font-size: 24rpx;
+			color: #999;
+
+			.price {
+				flex: 1;
 				color: #FF578A;
-				.big{font-size: 56rpx;font-weight: 500;margin-right:10rpx;}
-				.small{color:#999;text-decoration: line-through;}
+
+				.big {
+					font-size: 56rpx;
+					font-weight: 500;
+					margin-right: 10rpx;
+				}
+
+				.small {
+					color: #999;
+					text-decoration: line-through;
+				}
 			}
-			.r_info{flex:1;display: flex;justify-content: flex-end;align-items: center;
-				.leaveNum{margin-left:24rpx;}
-				.shareMoney{
-					max-width:136rpx;
+
+			.r_info {
+				flex: 1;
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+
+				.leaveNum {
+					margin-left: 24rpx;
+				}
+
+				.shareMoney {
+					max-width: 136rpx;
 					height: 28rpx;
-					border:2rpx solid #FF578A;
+					border: 2rpx solid #FF578A;
 					border-radius: 4rpx;
-					line-height:28rpx;
-					font-size:20rpx;
-					margin-right:10rpx;
-					padding-right:10rpx;
-					color:#FF578A;
+					line-height: 28rpx;
+					font-size: 20rpx;
+					margin-right: 10rpx;
+					padding-right: 10rpx;
+					color: #FF578A;
 					display: flex;
 					flex-direction: flex-start;
-					text{background: #FF578A;color:#fff;padding: 0 10rpx;}
-				}			
+
+					text {
+						background: #FF578A;
+						color: #fff;
+						padding: 0 10rpx;
+					}
+				}
 			}
-			
+
 		}
-		.shareIntro{
+
+		.shareIntro {
 			display: flex;
-			border-top:1rpx solid #DEE4E7;
+			border-top: 1rpx solid #DEE4E7;
 			justify-content: space-between;
 			align-items: center;
 			align-content: center;
-			font-size:28rpx;
-			color:#666;
-			padding:25rpx 0;
-			margin-top:25rpx;
-			.title{
+			font-size: 28rpx;
+			color: #666;
+			padding: 25rpx 0;
+			margin-top: 25rpx;
+
+			.title {
 				width: 90rpx;
-				padding:0 8rpx;
+				padding: 0 8rpx;
 				height: 32rpx;
-				line-height:32rpx;
+				line-height: 32rpx;
 				background: #FF578A;
 				border-radius: 6rpx;
 				font-size: 20rpx;
-				color:#fff;
-				margin-right:32rpx;
+				color: #fff;
+				margin-right: 32rpx;
 			}
 		}
 	}
+
 	.summary {
 		width: 100%;
 		margin-top: 15rpx;
 		background: #fff;
 		padding-bottom: 40rpx;
+
 		.tit {
 			line-height: 32rpx;
 			font-size: 32rpx;
@@ -453,25 +929,30 @@
 			margin-top: 35rpx;
 			margin-left: 30rpx;
 		}
+
 		.wrap {
 			margin-top: 40rpx;
 			width: 100%;
 			display: flex;
 			align-items: center;
 			justify-content: space-around;
+
 			.item {
 				width: 270rpx;
+
 				.iconfont {
 					text-align: center;
 					font-size: 34rpx;
 					color: #FF578A;
 				}
+
 				.grey-txt {
 					text-align: center;
 					font-size: 24rpx;
 					color: #999999;
 					margin: 10rpx auto;
 				}
+
 				.black-txt {
 					text-align: center;
 					font-size: 24rpx;
@@ -480,36 +961,43 @@
 			}
 		}
 	}
+
 	.shops {
 		background: #fff;
 		margin-top: 10rpx;
 		padding: 15rpx 30rpx;
 		box-sizing: border-box;
+
 		.shop {
 			box-sizing: border-box;
 			padding: 25rpx 0;
 			border-bottom: 1rpx solid #EAEAEA;
+
 			.pic {
 				width: 120rpx;
 				height: 120rpx;
 				display: inline-block;
 			}
+
 			.infos {
 				position: relative;
 				width: 540rpx;
 				margin-left: 24rpx;
 				display: inline-block;
 				vertical-align: top;
+
 				.name {
 					font-size: 32rpx;
 					font-weight: 500;
 					color: #333333;
 					line-height: 32rpx;
 				}
+
 				.starts {
 					margin: 20rpx 0;
 					height: 20rpx;
 					line-height: 20rpx;
+
 					.iconfont {
 						color: #FF578A;
 						font-size: 20rpx;
@@ -519,11 +1007,13 @@
 						line-height: 20rpx;
 					}
 				}
+
 				.txt {
 					font-size: 24rpx;
 					color: #666666;
 					line-height: 24rpx;
 				}
+
 				.reply {
 					position: absolute;
 					top: 45rpx;
@@ -531,12 +1021,14 @@
 					font-size: 24rpx;
 					color: #666666;
 					line-height: 24rpx;
+
 					.iconfont {
 						padding-left: 7rpx;
 						font-size: 24rpx;
-						color:#999;
+						color: #999;
 					}
 				}
+
 				.date-txt {
 					font-size: 24rpx;
 					color: #666666;
@@ -545,16 +1037,19 @@
 				}
 			}
 		}
+
 		.shop:last-child {
 			border-bottom: 0;
 		}
 	}
+
 	.details {
 		margin-top: 10rpx;
 		padding: 0 30rpx 30rpx 30rpx;
 		background: #fff;
 		width: 100%;
 		box-sizing: border-box;
+
 		.tit {
 			font-size: 32rpx;
 			font-weight: 500;
@@ -562,9 +1057,11 @@
 			line-height: 32rpx;
 			margin-top: 30rpx;
 		}
+
 		.txts {
 			margin-top: 33rpx;
 			font-size: 28rpx;
+
 			.txt {
 				display: block;
 				font-size: 28rpx;
@@ -572,76 +1069,90 @@
 				line-height: 45rpx;
 			}
 		}
-		image{width:100%;margin-top:30rpx;}
+
+		image {
+			width: 100%;
+			margin-top: 30rpx;
+		}
 	}
-	.introBox{
-		width:710rpx;
-		margin:20rpx auto 0 auto;
+
+	.introBox {
+		width: 710rpx;
+		margin: 20rpx auto 0 auto;
 		border-radius: 16rpx;
 		background: #fff;
-		padding:0 35rpx;
+		padding: 0 35rpx;
 		box-sizing: border-box;
 	}
-	.intro_row{
+
+	.intro_row {
 		display: flex;
 		justify-content: space-between;
-		width:100%;
+		width: 100%;
 	}
-	.row_col{
-		width:310rpx;
+
+	.row_col {
+		width: 310rpx;
 		border-radius: 8rpx;
-		padding-bottom:20rpx;
-		.imgOuter{
-			width:310rpx;
-			height:230rpx;
+		padding-bottom: 20rpx;
+
+		.imgOuter {
+			width: 310rpx;
+			height: 230rpx;
 			position: relative;
-			image{
-				width:310rpx;
-				height:230rpx;
-				border-radius:8rpx 8rpx 0 0;
-			}	
-			.date{
-				background-color: rgba(0,0,0,0.3);
-				font-size:20rpx;
-				color:#fff;
-				line-height:32rrpx;
-				padding:0 8rpx;
+
+			image {
+				width: 310rpx;
+				height: 230rpx;
+				border-radius: 8rpx 8rpx 0 0;
+			}
+
+			.date {
+				background-color: rgba(0, 0, 0, 0.3);
+				font-size: 20rpx;
+				color: #fff;
+				line-height: 32rrpx;
+				padding: 0 8rpx;
 				border-radius: 5rpx;
 				position: absolute;
 				left: 20rpx;
-				bottom:20rpx;
-				font-weight:500;
+				bottom: 20rpx;
+				font-weight: 500;
 			}
 		}
-		.title{
-			width:100%;
-			font-size:28rpx;
-			color:#333;
-			font-weight:500;
+
+		.title {
+			width: 100%;
+			font-size: 28rpx;
+			color: #333;
+			font-weight: 500;
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;
-			padding-top:20rpx;
+			padding-top: 20rpx;
 		}
-		.subTit{
-			width:100%;
-			font-size:22rpx;
-			color:#333;
-			font-weight:400;
+
+		.subTit {
+			width: 100%;
+			font-size: 22rpx;
+			color: #333;
+			font-weight: 400;
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;
-			padding-top:10rpx;
-		}	
-		.price{
-			margin-top:20rpx;
-			font-size:22rpx;
-			color:#999;
-			text{
-				font-size:32rpx;
-				font-weight:400;
-				padding-right:15rpx;
+			padding-top: 10rpx;
+		}
+
+		.price {
+			margin-top: 20rpx;
+			font-size: 22rpx;
+			color: #999;
+
+			text {
+				font-size: 32rpx;
+				font-weight: 400;
+				padding-right: 15rpx;
 			}
 		}
 	}
-</style>
+</style>
diff --git a/packages/packageBuy/pages/packageInfo/index.vue b/packages/packageBuy/pages/packageInfo/index.vue
index 739e285..17055b7 100644
--- a/packages/packageBuy/pages/packageInfo/index.vue
+++ b/packages/packageBuy/pages/packageInfo/index.vue
@@ -6,12 +6,15 @@
 		<view class="memberCon">
 			<view class="topTit">
 				<text class="titInner">
-					<text class="titCon"><text class="f_blue">￥<text
-								class="f_big">{{packages.price}}</text></text>{{packages.name}}</text>
+					<text class="titCon"><text class="f_blue">
+
+							<block v-if="packages.price>0">￥<text class="f_big">{{packages.price}}</text></block>
+							<block v-else><text class="f_big">免费</text></block>
+						</text>{{packages.name}}</text>
 					<text class="line"></text>
 				</text>
 			</view>
-			<view class="title flex_center">
+			<view class="title flex_center" style="display: none;">
 				<view class="i_left">
 					<image src="../../../../static/i_left.png"></image>
 				</view>
@@ -20,12 +23,14 @@
 					<image src="../../../../static/i_right.png"></image>
 				</view>
 			</view>
-			<view class="mealCol flex_start flex_wrap">
+			<view class="mealCol flex_start flex_wrap" style="display: none;">
 
 				<block v-for="(mod, i) in packages.items">
 					<view class="colInfo">
-						<view class="flex_between"><text class="colInfoText">{{mod.product_type.name}}</text><text
-								class="f_black">{{((mod.num!=""&&mod.num!=undefined)? mod.num:"1")}} {{((mod.unit!=""&&mod.unit!=undefined)? mod.unit:"次")}}</text></view>
+						<view class="flex_between" style="align-items: unset;"><text
+								class="colInfoText">{{mod.product_type.name}}</text><text
+								class="f_black">{{((mod.num!=""&&mod.num!=undefined)? mod.num:"1")}}{{((mod.unit!=""&&mod.unit!=undefined)? mod.unit:"次")}}</text>
+						</view>
 					</view>
 				</block>
 			</view>
@@ -34,18 +39,40 @@
 				<view class="cardOuter">
 					<view :class="cardActive" @click="cardActive">
 
-						<view class="note">{{packages.content}}</view>
+						<view class="note">
+							<u-parse :domain="domain" :html="packages.content"></u-parse>
+						</view>
 					</view>
 				</view>
-				<button class="buyNow" @click="goBuy">立即购买</button>
 			</view>
 
 		</view>
-		<view class="shareIcon" @click="shareOpen" v-if="user_info.promotion == 1">
-			<image src="../../../../static/share.png"></image>
+		<view class="footer">
+			<view class="menuLink">
+				<navigator url="../../../../pages/home/home" open-type="switchTab">
+					<view class="menuCol">
+						<text class="iconfont icon-home"></text>
+						<text>首页</text>
+					</view>
+				</navigator>
+				<view class="menuCol" @click="shareOpen" v-if="user_info.promotion == 1"> 
+					<text class="iconfont icon-Share"></text>
+					<text>分享</text>
+				</view>
+				<button open-type="contact" class="menuCol" style="display: flex;
+    flex-direction: column;
+    line-height: inherit;
+    background: none;
+    padding: unset;">
+					<text class="iconfont icon-Icon_customerservice"></text>
+					<text>客服</text>
+				</button>
+			</view>
+			<view class="buyBtn" @click="goBuy">立即购买</view>
 		</view>
 
 
+
 		<uni-popup ref="shareCode" :mask-click="true" type="bottom" class="shareBox">
 			<view class="codeOuter">
 				<view class="shareCon" @click="shareClose">
@@ -92,7 +119,9 @@
 				sharePath: "",
 				scare: 1,
 				shareHeight: 500,
-				id: ""
+				domain: "",
+				id: "",
+				promotion_id: ""
 			}
 		},
 		onLoad(option) {
@@ -103,11 +132,21 @@
 				this.id = option.id;
 				this.getPackages();
 			}
+			const scene = decodeURIComponent(option.scene);
+			if (!weixin.isNull(scene)) {
+				console.log(scene)
+				this.id = weixin.getParam(scene, "id");
+				this.promotion_id = weixin.getParam(scene, "promotion_id");
+				uni.setStorageSync("base_promotion_id", this.promotion_id);
+				this.getPackages();
+			}
 			weixin.getOpenidInfo(info => {
 				this.user_info = info
 			}, false)
 
 			this.scare = windowWidth / 375;
+			console.log(weixin.getBaseUrl())
+			this.domain = weixin.getBaseUrl();
 		},
 		onShow() {
 			if (this.checkLogin()) {
@@ -117,11 +156,12 @@
 		onShareAppMessage() {
 			return {
 				title: this.packages.name,
-				path: 'packages/packageBuy/pages/packageInfo/index?id='+this.id+'&promotion_id=' + this.user_info.id,
+				path: 'packages/packageBuy/pages/packageInfo/index?id=' + this.id + '&promotion_id=' + this.user_info.id,
 				imageUrl: this.img
 			}
 		},
 		methods: {
+
 			shareOpen() {
 				uni.showLoading({
 					title: '加载中'
@@ -138,19 +178,18 @@
 				});
 			},
 			getAvatar: function() {
-				let userProfile = uni.getStorageSync('user_profile');
-				if(!weixin.isNull(userProfile)){
-					uni.getImageInfo({
-						src: userProfile.avatarUrl, // 头像
-						success: rlogo => {
-							this.imgAvatar = rlogo.path;
-							this.draw();
-						}
-					});
-				}
-				else{
-					this.imgAvatar="../../../../static/avatar.jpg";
-					this.draw();
+				let userProfile = uni.getStorageSync('user_profile');
+				if (!weixin.isNull(userProfile)) {
+					uni.getImageInfo({
+						src: userProfile.avatarUrl, // 头像
+						success: rlogo => {
+							this.imgAvatar = rlogo.path;
+							this.draw();
+						}
+					});
+				} else {
+					this.imgAvatar = "../../../../static/avatar.jpg";
+					this.draw();
 				}
 			},
 			draw: function() {
@@ -161,7 +200,7 @@
 					method: 'GET',
 					data: {
 						path: 'packages/packageBuy/pages/packageInfo/index',
-						scene: 'id='+this.id+'&promotion_id=' + this.user_info.id
+						scene: 'id=' + this.id + '&promotion_id=' + this.user_info.id
 					},
 					success: r => {
 						if (r.data.status === 1) {
@@ -290,8 +329,8 @@
 				if (this.checkLogin()) {
 					let package_id = this.id;
 
-					uni.navigateTo({
-						url:"../buyMember/buyMember?package_id=" + package_id
+					uni.navigateTo({
+						url: "../buyMember/buyMember?package_id=" + package_id
 					});
 				}
 			},
@@ -340,7 +379,62 @@
 		padding-bottom: 160rpx;
 	}
 </style>
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+	button::after {
+	  border: none
+	}
+	
+	
+	.footer {
+		width: 100%;
+		height: 112rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -1rpx 0px 0px #DEDEDE;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+	
+		.menuLink {
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			color: #333;
+	
+			.menuCol {
+				margin: 0 30rpx;
+				font-size: 20rpx;
+	
+				text {
+					display: block;
+				}
+	
+				.iconfont {
+					font-size: 36rpx;
+					margin-bottom: 6rpx;
+				}
+			}
+		}
+	
+		.buyBtn {
+			width: 220rpx;
+			height: 72rpx;
+			background: linear-gradient(90deg, #FF7E95 0%, #FF447B 100%);
+			border-radius: 36rpx;
+			font-size: 28rpx;
+			font-weight: 500;
+			text-align: center;
+			line-height: 72rpx;
+			color: #fff;
+		}
+	
+	}
+	
+	
 	.content {
 		display: flex;
 		flex-direction: column;
@@ -605,7 +699,7 @@
 			}
 		}
 
-		.mealCol {
+	.mealCol {
 			padding: 0 20rpx;
 
 			.width_453 {
diff --git a/packages/packageBuy/pages/shopDetail/shopDetail.vue b/packages/packageBuy/pages/shopDetail/shopDetail.vue
index b49c2b3..33894a4 100644
--- a/packages/packageBuy/pages/shopDetail/shopDetail.vue
+++ b/packages/packageBuy/pages/shopDetail/shopDetail.vue
@@ -29,11 +29,11 @@
 			<view class="shopInfo">
 				<view class="tit">
 					<image mode="heightFix" src="../../static/icon_dizhi.png"></image>
-					<text>苏州市姑苏区十全街999号</text>
+					<text>{{info.merchant.address}}</text>
 				</view>
 				<view class="add_detail">
-					<view class="add_l">距地铁1号线临顿路站4号口入口步行 500米</view>
-					<view class="add_r">
+					<view class="add_l">暂无</view>
+					<view class="add_r" @click="">
 						<text class="iconfont icon-dianhua"></text>
 						<text>电话</text>
 					</view>
@@ -50,6 +50,15 @@
 				</view>
 			</view>
 		</view>
+		<view class="details">
+			<view class="detail">
+				<view class="tit">商品详情</view>
+				<view class="txts">
+					<u-parse :html="info.content"></u-parse>
+				</view>
+			</view>
+		</view>
+
 		<!--为您推荐-->
 		<view class="introBox hasMenu">
 			<view class="normal_tit padding_20">附近商家</view>
@@ -94,10 +103,13 @@
 					<text class="iconfont icon-Share"></text>
 					<text>分享</text>
 				</view>
-				<view class="menuCol">
+				<button open-type="contact" class="menuCol" style="display: flex;
+				flex-direction: column;
+				line-height: inherit;
+				background: none; padding: unset;">
 					<text class="iconfont icon-Icon_customerservice"></text>
 					<text>客服</text>
-				</view>
+				</button>
 			</view>
 			<view class="buyBtn" @click="toBuy">立即购买</view>
 		</view>
@@ -150,7 +162,6 @@
 	let SCREEN_WIDTH = sysInfo.screenWidth
 	let SCREEN_HEIGHT = sysInfo.screenHeight;
 	let WindowHeight = sysInfo.windowHeight;
-
 	let windowWidth = sysInfo.windowWidth;
 	import {
 		weixin
@@ -187,7 +198,8 @@
 				sharePath: "",
 				scare: 1,
 				shareHeight: 500,
-				imgAvatar: ""
+				imgAvatar: "",
+				poster: ""
 			}
 		},
 		onShareAppMessage() {
@@ -207,6 +219,14 @@
 			this.openid = that.user_info.openid;
 			this.form.member_name = that.user_info.name;
 			this.form.phone = that.user_info.phone;
+			const scene = decodeURIComponent(options.scene);
+			if (!weixin.isNull(scene)) {
+				this.form.product_id = weixin.getParam(scene, "id");
+				this.id == weixin.getParam(scene, "id");
+				this.promotion_id = weixin.getParam(scene, "promotion_id");
+				uni.setStorageSync("base_promotion_id", this.promotion_id);
+			}
+
 			this.loadInfo();
 			this.loadPage();
 			this.form.product_id = options.id;
@@ -214,8 +234,20 @@
 			if (options.promotion_id) {
 				uni.setStorageSync("base_promotion_id", options.promotion_id)
 			}
+
+
 		},
 		methods: {
+			getPoster: function() {
+				var that = this;
+				uni.getImageInfo({
+					src: that.info.poster_url, // 头像
+					success: res => {
+						that.poster = res.path;
+						that.getAvatar();
+					}
+				});
+			},
 			getAvatar: function() {
 				let userProfile = uni.getStorageSync('user_profile');
 
@@ -242,7 +274,7 @@
 				});
 				var that = this;
 				this.$refs.shareCode.open();
-				this.getAvatar();
+				this.getPoster();
 			},
 			draw: function() {
 				var that = this;
@@ -277,7 +309,7 @@
 									0.15, (SCREEN_HEIGHT - SCREEN_WIDTH * 0.6 * 1.65) /
 									2, SCREEN_WIDTH * 0.695, SCREEN_WIDTH * 0.6 * 1.5); */
 
-									ctx.drawImage(this.info.poster, 20, 30 + 40,
+									ctx.drawImage(this.poster, 20, 30 + 40,
 										w -
 										40, (h - 60 - 60) * 0.5);
 									/* SCREEN_WIDTH * 0.15, (SCREEN_HEIGHT - SCREEN_WIDTH *
@@ -288,7 +320,7 @@
 									// 设置颜色
 									ctx.fillStyle = "#fff";
 									// 绘制文字（参数：要写的字，x坐标，y坐标）
-									ctx.fillText("福利专享", 20, 50);
+									ctx.fillText("优孕课堂福利专享", 20, 50);
 
 									ctx.font = "16rpx bold";
 									// 设置颜色
@@ -578,6 +610,10 @@
 	}
 </script>
 <style lang="scss" scoped>
+	button::after {
+		border: none
+	}
+
 	.payBtn {
 		width: 90%;
 		height: 100rpx;
diff --git a/packages/packageOrder/pages/myOrder/myOrder.vue b/packages/packageOrder/pages/myOrder/myOrder.vue
index e9b04cd..a6542f5 100644
--- a/packages/packageOrder/pages/myOrder/myOrder.vue
+++ b/packages/packageOrder/pages/myOrder/myOrder.vue
@@ -25,8 +25,8 @@
 					<view class="infoList">
 						<view class="infoCol">
 							<view class="date">
-								<image mode="heightFix" src="../../static/icon_shijian@2x.png"></image>
-								{{item.created_at}}
+								<image mode="heightFix" src="../../static/icon_shijian@2x.png"></image>
+								{{$u.timeFormat(item.created_at, 'yyyy年mm月dd日')}}
 							</view>
 							<view class="price"><text>¥</text>{{item.total}}</view>
 						</view>
diff --git a/packages/packagePromotion/pages/applyReg/applyReg.vue b/packages/packagePromotion/pages/applyReg/applyReg.vue
index f17e063..7a88b55 100644
--- a/packages/packagePromotion/pages/applyReg/applyReg.vue
+++ b/packages/packagePromotion/pages/applyReg/applyReg.vue
@@ -61,7 +61,8 @@
 				}
 				
 				this.sendReq('/api/member/registered-promotion', this.info, (r) => {
-					if (r.data.status === 1) {
+					if (r.data.status === 1) {
+						weixin.getOpenidInfo(function(){},true);
 						uni.navigateTo({
 							url: '../regSuccess/regSuccess'
 						})
diff --git a/pages/member/member.vue b/pages/member/member.vue
index d231d7d..e4d04e8 100644
--- a/pages/member/member.vue
+++ b/pages/member/member.vue
@@ -7,8 +7,13 @@
 			<view class="memberCon" :data-id="item.id" @click="toDetail">
 				<view class="topTit">
 					<text class="titInner">
-						<text class="titCon"><text class="f_blue">￥<text
-									class="f_big">{{item.price}}</text></text>{{item.name}}</text>
+						<text class="titCon">
+							<text class="f_blue">
+								<block v-if="item.price>0">￥<text class="f_big">{{item.price}}</text></block>
+								<block v-else><text class="f_big">免费</text></block>
+							</text>
+							{{item.name}}
+						</text>
 						<text class="line"></text>
 					</text>
 				</view>
@@ -22,12 +27,13 @@
 					</view>
 				</view>
 				<view class="mealCol flex_start flex_wrap">
-
 					<block v-for="(mod, i) in item.items">
 						<view class="colInfo">
-							<view class="flex_between"><text class="colInfoText">{{mod.product_type.name}}</text><text
-									class="f_black">{{((mod.num!=""&&mod.num!=undefined)? mod.num:"1")}}
-									{{((mod.unit!=""&&mod.unit!=undefined)? mod.unit:"次")}}</text></view>
+							<view class="flex_between" style="align-items: unset;">
+								<text class="colInfoText">{{mod.product_type.name}}</text>
+								<text class="f_black">
+									{{((mod.num!=""&&mod.num!=undefined)? mod.num:"1")}}{{((mod.unit!=""&&mod.unit!=undefined)? mod.unit:"次")}}</text>
+							</view>
 						</view>
 					</block>
 				</view>
@@ -48,7 +54,7 @@
 							<view>{{i.name}}</view>
 							<view class="cardTit">{{i.price}}元</view>
 						</view>
-						<view class="note">{{i.content}}</view>
+						<view class="note">{{i.name}}</view>
 					</view>
 					<!-- <view :class="{cur: cardActive == 1, cardCol: true}" @click="cardActive = 1">
 						<view>福利卡</view>
@@ -110,6 +116,11 @@
 		onLoad(option) {
 			if (option.promotion_id) {
 				uni.setStorageSync("base_promotion_id", option.promotion_id)
+			}
+			const scene = decodeURIComponent(option.scene);
+			if (!weixin.isNull(scene)) {
+				var promotion_id=weixin.getParam(scene,"promotion_id");
+				uni.setStorageSync("base_promotion_id", promotion_id);
 			}
 			weixin.getOpenidInfo(info => {
 				this.user_info = info
diff --git a/utils/weixin.js b/utils/weixin.js
index a58da43..902dd9f 100644
--- a/utils/weixin.js
+++ b/utils/weixin.js
@@ -5,7 +5,17 @@ import {
 const openid_info_key = appConfig.openidInfoKey
 const user_info_key = 'user_info_yunyubang'
 
-export const weixin = {
+export const weixin = {
+	getParam: function(query, variable) {
+		var vars = query.split("&");
+		for (var i = 0; i < vars.length; i++) {
+			var pair = vars[i].split("=");
+			if (pair[0] == variable) {
+				return pair[1];
+			}
+		}
+		return (false);
+	},
 	request: options => {
 		if (!options.customLoading) {
 			uni.showLoading({
@@ -132,24 +142,21 @@ export const weixin = {
 		return uni.getStorageSync(user_info_key)
 	},
 	isNull: p => {
-		return p == '' || p == undefined || p == null || p == 'undefined' || p == 'null';
-	} // 正则
+			return p == '' || p == undefined || p == null || p == 'undefined' || p == 'null';
+		} // 正则
+		,
+	getBaseUrl: () => {
+		return appConfig.baseUrl
+	},
+	alert: (msg) => {
+		uni.showModal({
+			content: msg,
+			showCancel: false
+
+		})
+	}
 }
 
 export function login() {
-	// uni.login({
-	//   provider: 'weixin',
-	//   success: res => {
-	//     uni.request({
-	//       url: appConfig.baseUrl + '/api/wechat/user-login',
-	//       method: 'POST',
-	//       data: {
-	// 		  code: res.code,
-	// 		  iv: '',
-	// 	  },
-	//       success: result => {
-	//       }
-	//     })
-	//    }
-	// });
+
 }