月嫂

packages/packageBuy/pages/shopDetail/shopDetail.vue

@@ -1067,8 +1067,9 @@
 
 		.banner {
 			display: block;
-			width: 100%;
-			height: 500rpx;
+			width: 100%;
+			height: 535rpx;
+			// height: 500rpx;
 		}
 	}
 
@@ -1199,7 +1200,8 @@
 			display: inline-block;
 			font-size: 36rpx;
 			font-weight: 500;
-			color: #333333;
+			color: #333333;
+			width:90%;
 		}
 
 		.dataGroup {

packages/packageCarecenter/pages/careCenter/strategyDetail.vue

@@ -21,6 +21,13 @@
 				detail: {}
 			}
 		},
+		onShareAppMessage() {
+			return {
+				title: this.detail.name,
+				path: "packages/packageCarecenter/pages/careCenter/strategyDetail?id=" + this.detail.id,
+				imageUrl: this.img
+			}
+		},
 		methods: {
 			getDetail(id) {
 				weixin.request({

packages/packageCarecenter/pages/commonService/productDetail.vue

@@ -103,7 +103,7 @@
 				</view>
 			</view>
 
-			<view class="facility u-skeleton-rect">
+			<!-- <view class="facility u-skeleton-rect">
 				<view class="facility-title">
 					设备详情
 				</view>
@@ -113,7 +113,7 @@
 						<view class="facility-content-item-name">{{item.value}}</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 
 			<view style="width: 100%;background: #fff;padding: 20rpx 28rpx;">
 				<u-parse :html="detail.content"></u-parse>
@@ -150,7 +150,7 @@
 			toService(id) {
 				this.$u.throttle(() => {
 					uni.navigateTo({
-						url: `/packages/packageCarecenter/pages/careCenter/serviceDetail?id=${id}`
+						url: `/packages/packageCarecenter/pages/commonService/serviceDetail?id=${id}`
 					})
 				})
 			},

pages/active/active.vue

@@ -51,7 +51,8 @@
 										</image>
 									</view>
 								</view>
-								<view class="subInfo">{{item.address}}</view>
+								<view class="subInfo">{{item.address}}</view>
+								<view class="subInfo">已报名数:{{item.start_member_sum+item.total}}</view>
 								<view class="menu">{{$u.timeFormat(item.start_date+' 00:00:00', 'yyyy年mm月dd日')}}至{{$u.timeFormat(item.end_date+' 00:00:00', 'yyyy年mm月dd日')}}</view>
 							</view>
 						</view>

pages/active/detail.vue

@@ -112,6 +112,15 @@
 					<u-col span="8" v-if="info.member_sum">
 						{{info.member_sum}}
 					</u-col>
+					<u-col span="4">
+						<view>
+							<image mode="heightFix" src="../../static/icon_xingming@2x.png"></image>
+							已报名数:
+						</view>
+					</u-col>
+					<u-col span="8" v-if="info.member_sum">
+						{{info.start_member_sum+info.total}}
+					</u-col>
 					<u-col span="12">
 						<view>
 							报名信息:
@@ -392,7 +401,7 @@
 		onShareAppMessage() {
 			return {
 				title: this.info.name,
-				path: "pages/active/detail/?id=" + this.info.id + "&promotion_id=" + this
+				path: "pages/active/detail?id=" + this.info.id + "&promotion_id=" + this
 					.user_info.id,
 				imageUrl: this.img
 			}
@@ -424,17 +433,17 @@
 		onLoad(options) {
 			var that = this;
 			this.id = options.id;
-
+			console.log("this.id",this.id)
 			const scene = decodeURIComponent(options.scene);
 			console.log(scene)
 			if (!weixin.isNull(scene)) {
-				this.form.product_id = weixin.getParam(scene, "id");
+				this.form.active_id = weixin.getParam(scene, "id");
 				this.id = weixin.getParam(scene, "id");
 				this.form.promotion = this.promotion_id = weixin.getParam(scene, "promotion_id");
 				uni.setStorageSync("base_promotion_id", this.promotion_id);
 			}
 			if (!weixin.isNull(options.id))
-				this.form.product_id = options.id;
+				this.form.active_id = options.id;
 
 			if (!weixin.isNull(options.promotion_id)) {
 				this.form.promotion = options.promotion_id;
@@ -593,7 +602,7 @@
 					url: this.baseUrl + '/api/member/get-wxa-qrcode',
 					method: 'GET',
 					data: {
-						path: 'packages/packageBuy/pages/shopDetail/shopDetail',
+						path: 'pages/active/detail',
 						scene: 'id=' + this.info.id + '&promotion_id=' + this.user_info.id
 					},
 					success: r => {
@@ -645,9 +654,9 @@
 									// 绘制文字（参数：要写的字，x坐标，y坐标）
 
 									let packagesFirst = this.info
-									ctx.fillText("¥" + this.info.money + "" + this.info.active_name, 40, (h + 50) * 0.5 + 20 + 30);
-
-
+									ctx.fillText("" + this.info.active_name, 40, (h + 50) * 0.5 + 20 + 30);
+									ctx.fillText("报名时间:" + this.info.apply_start, 40, (h + 50) * 0.5 + 50 + 50);
+									ctx.fillText("报名截止:" + this.info.apply_end, 40, (h + 50) * 0.5 + 60 + 60);
 									let user_info = uni.getStorageSync("user_info_yunyubang");
 
 									let userProfile = uni.getStorageSync('user_profile');
@@ -662,7 +671,7 @@
 									});
 									that.circleImg(ctx,
 										img,
-										40, h - 60 - w * 0.15,
+										40, h - 50 - w * 0.15,
 										w * 0.15 / 2);
 
 									ctx.font = "12rpx normal";
@@ -843,6 +852,8 @@
 				this.form.merchant_id = this.info.shop_id
 				this.form.active_id = this.info.id
 				this.form.active_name = this.info.active_name
+				console.log(this.form)
+				return
 				weixin.request({
 					method: 'POST',
 					api: "/api/member/active-apply",