From 6e0b38b0ea6669d532e9d2279a81ca3963e0f3ad Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 13 Nov 2025 00:14:05 +0800
Subject: [PATCH] 1、小程序端列出所有报名人员名单(含姓名); 2、优化活动促销商品; 3、优化小程序端活动详情页; 4、优化后台连盟活动修改页面,并展示促销商品; 5、参与活动人员积分设置改到职务里添加。

---
 mobile/pages/branch/activity/detail/popup/reg.vue |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/mobile/pages/branch/activity/detail/popup/reg.vue b/mobile/pages/branch/activity/detail/popup/reg.vue
index 7bbce7d..608f7a9 100644
--- a/mobile/pages/branch/activity/detail/popup/reg.vue
+++ b/mobile/pages/branch/activity/detail/popup/reg.vue
@@ -9,8 +9,9 @@
 			<scroll-view scroll-y="true" class="scroll-Y" :style="'height:' + scrollviewHigh + 'px;'">
 				<view class="pb30">
 					<!-- 如果不是连盟汇会员,需要填写个人信息,报名后会自动加入活动发起的分会 -->
-					<view class="reg-section join-box p30 radius24 bg-white" v-if="!activityData.is_member">
-						<view class="tips f28 p20 radius12"><text class="iconfont icon-gantanhao mr10"></text> 您还不是{{activityData.store_name}}的会员,请完善以下信息,提交报名后即可成为会员。</view>
+					<view class="reg-section join-box p30 radius24 bg-white" v-if="!activityData.is_member || is_friend">
+						<view class="tips f28 p20 radius12" v-if="!activityData.is_member && !is_friend"><text class="iconfont icon-gantanhao mr10"></text> 您还不是{{activityData.store_name}}的会员,请完善以下信息,提交报名后即可成为会员。</view>
+						<view class="tips f28 p20 radius12 friend" v-if="is_friend"><text class="iconfont icon-gantanhao mr10"></text>您正在帮朋友报名,以下信息请填写您朋友的信息</view>
 						<view class="item d-s-c">
 							<view class="item-name">真实姓名</view>
 							<input type="text" maxlength="30" class="flex-1" placeholder="请输入真实姓名" v-model="formData.real_name" placeholder-class=
@@ -146,11 +147,12 @@
 				isFirst: false,
 			};
 		},
-		props: ['isOpenReg', 'in_radius'],
+		props: ['isOpenReg', 'in_radius', 'is_friend'],
 
 		onLoad() {},
 		onShow() {
 			let self = this;
+			console.log('pay-res')
 			let options = wx.getEnterOptionsSync();
 			// 从半屏小程序返回时执行
 			if (options.scene == '1038' && self.isFirst == true) {
@@ -211,6 +213,7 @@
 			
 			// 半屏小程序返回
 			onPayResult(e) {
+				console.log(e)
 				let self = this;
 				self.loading = false;
 				uni.hideLoading();
@@ -278,7 +281,8 @@
 								activity_id: self.activityData.activity_id,
 								is_member: self.activityData.is_member,
 								pay_source: self.getPlatform(),
-								in_radius: self.in_radius ? 1 : 0 // 如果为1,报名成功后直接签到
+								in_radius: self.in_radius ? 1 : 0, // 如果为1,报名成功后直接签到
+								is_friend: self.is_friend ? 1 : 0, // 是否是帮朋友报名
 							})
 						)
 					}, function(res) {
@@ -314,12 +318,12 @@
 			// 验证数据
 			validateForm() {
 				let self = this;
-				if (!self.activityData.is_member) {
+				if (!self.activityData.is_member || self.is_friend) {
 					if (!self.formData.real_name) {
-						return self.showTips('请输入您的真实姓名');
+						return self.showTips('请输入真实姓名');
 					}
 					if (!self.formData.mobile) {
-						return self.showTips('请输入您的手机号码');
+						return self.showTips('请输入手机号码');
 					}
 					if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(self.formData.mobile)) {
 						return self.showTips('请输入正确的手机号码');
@@ -430,6 +434,15 @@
 		.tips {
 			background-color: #f7f7f7;
 			color: #333;
+			
+			&.friend {
+				background-color: #FCF8ED;
+				color: #CEAD60;
+				
+				.iconfont{
+					color: #CEAD60;
+				}
+			}
 		}
 	}
 	.pay-box {

--
Gitblit v1.9.2