From 599abed702db9fa5dec90b5660ff039acb6eace7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 24 Nov 2025 18:33:29 +0800
Subject: [PATCH] 1、完成升级赠送价值400元（共40张）平台消费券，每张10元，每次消费只能用一张，消费金额满200元抵一张10元消费券 1、修复分享名片第一次进入是空白 3、修复分红订单不生成问题
---
mobile/pages/branch/activity/detail/popup/reg.vue | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/mobile/pages/branch/activity/detail/popup/reg.vue b/mobile/pages/branch/activity/detail/popup/reg.vue
index 608f7a9..a27868b 100644
--- a/mobile/pages/branch/activity/detail/popup/reg.vue
+++ b/mobile/pages/branch/activity/detail/popup/reg.vue
@@ -14,18 +14,27 @@
<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=
+ <input type="text" maxlength="30" class="flex-1 f28" placeholder="请输入真实姓名" v-model="formData.real_name" placeholder-class=
"placeholder" />
</view>
<view class="item d-s-c">
<view class="item-name">手机号码</view>
- <input type="text" maxlength="30" class="flex-1" placeholder="请输入常用的手机号码" v-model="formData.mobile" placeholder-class=
+ <input type="text" maxlength="30" class="flex-1 f28" placeholder="请输入常用的手机号码" v-model="formData.mobile" placeholder-class=
"placeholder" />
</view>
<view class="item d-s-c">
<view class="item-name">单位/公司名称</view>
- <input type="text" maxlength="30" class="flex-1" placeholder="请输入单位/公司名称" v-model="formData.company" placeholder-class=
+ <input type="text" maxlength="30" class="flex-1 f28" placeholder="请输入单位/公司名称" v-model="formData.company" placeholder-class=
"placeholder" />
+ </view>
+ <!-- 加入哪个分会 -->
+ <view class="item d-s-c">
+ <view class="item-name">所在分会</view>
+ <view class="flex-1 d-s-c f28" @click="openBranch">
+ <text class="flex-1" v-if="formData.branch_id">{{branch_name}}</text>
+ <text class="gray6 flex-1" v-else>去选择</text>
+ <text class='iconfont icon-jiantou'></text>
+ </view>
</view>
</view>
<view class="reg-section pay-box p30 radius24 bg-white" v-if="activityData.fee > 0">
@@ -103,15 +112,19 @@
</view>
<!-- 积分弹窗 -->
<PointsForm :isOpenPoints="isOpenPoints" :activityData="activityData" :max_price="onlinePrice+formData.points_money" @close="closePointsFunc"></PointsForm>
+ <!-- 分会弹窗 -->
+ <Branch :isOpenBranch="isOpenBranch" @close="closeBranchFunc"></Branch>
</view>
</template>
<script>
import { pay } from '@/common/pay.js';
import PointsForm from './points'; // 积分选择弹窗
+ import Branch from './branch'; // 分会选择弹窗
export default {
components: {
- PointsForm
+ PointsForm,
+ Branch
},
data() {
return {
@@ -134,6 +147,7 @@
is_use_balance: 0, // 是否使用余额支付
is_combined_pay: 0, // 是否需要组合支付
pay_type: 20, // 支付方式，默认微信支付
+ branch_id: '', // 所在分会
},
/*尺寸比例*/
ratio: 1,
@@ -145,6 +159,8 @@
validate: false,
payData: [], // 半屏小程序相关
isFirst: false,
+ branch_name: '',
+ isOpenBranch: false,
};
},
props: ['isOpenReg', 'in_radius', 'is_friend'],
@@ -363,6 +379,19 @@
}
this.isOpenPoints = false;
},
+
+ openBranch() {
+ this.isOpenBranch = true;
+ },
+
+ /*关闭分会弹窗*/
+ closeBranchFunc(e) {
+ if (e !== null) {
+ this.formData.branch_id = e.branch_id;
+ this.branch_name = e.name;
+ }
+ this.isOpenBranch = false;
+ },
}
};
</script>
--
Gitblit v1.9.2