From b940b7f96e03accaba6299704e6a0b924b8bb365 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 03 八月 2024 20:32:12 +0800
Subject: [PATCH] update 花店注册流程变化(2步化为一步)

---
 pages/login/supplier-reg.vue |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index 90d84a1..5b5be15 100644
--- a/pages/login/supplier-reg.vue
+++ b/pages/login/supplier-reg.vue
@@ -40,7 +40,11 @@
 							<!-- #endif -->
 						</view>
 
-
+						<!-- #ifdef PUB_CUSTOMER -->
+						<view class="t-a form-input">
+							<u-input placeholder="请输入店铺名称" :border="false" v-model="regCustomerName"></u-input>
+						</view>
+						<!-- #endif -->
 						<view class="t-a form-input" v-if="loginType=='code'">
 							<u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
 								<template slot="suffix">
@@ -49,19 +53,11 @@
 									</view>
 								</template>
 							</u-input>
-
-							<!-- <u-input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber"
-              style="position: relative;z-index: 1;" /> -->
-
-
 						</view>
 
 
-						<view class="t-a form-input" v-if="loginType=='code'">
-							<!-- 		<input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode"
-              style="position: relative;z-index: 1;" /> -->
+						<view class="t-a form-input">
 							<u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>
-
 						</view>
 						<view class="t-a form-input" v-if="loginType=='code'">
 
@@ -82,7 +78,8 @@
 							<view class="topic-font m-l-0 m-r-a" @click="backInfoPage" v-if="source==='step'">返回上一步
 							</view>
 							<!-- #ifdef PUB_CUSTOMER -->
-							<view class="topic-font m-l-a m-r-a" @click="scanPartnerCode" v-if="source==='step'">扫码绑定合伙人
+							 <!-- v-if="source==='step'" -->
+							<view class="topic-font m-l-0 m-r-a" @click="scanPartnerCode">扫码绑定合伙人
 							</view>
 							<!-- #endif -->
 							<view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view>
@@ -127,6 +124,7 @@
 				getCodeisWaiting: false,
 				Timer: undefined,
 				protocal: false,
+				regCustomerName: '',
 				source: '',
 				// #ifdef PUB_SUPPLIER
 				apitype: 'supplier',
@@ -149,6 +147,12 @@
 				if (dto.partnerUserId) {
 					this.partnerId = dto.partnerUserId || ''
 					this.partnerName = dto.partnerUserName || '佚名'
+				}
+			}
+			if (options.partnerUserId) {
+				this.partnerId = options.partnerUserId || ''
+				if (options.partnerUserName) {
+					this.partnerName = options.partnerUserName || '佚名'
 				}
 			}
 			// #endif
@@ -349,6 +353,12 @@
 					});
 					return;
 				}
+				// #ifdef PUB_CUSTOMER
+				if (!that.regCustomerName) {
+					this.$message.showToast('店铺名称未填写')
+					return
+				}
+				// #endif
 				// if (this.pcfvalue == undefined) {
 				// 	util.showMyToast('必须勾选《用户服务协议》及《隐私政策》');
 				// 	return;
@@ -377,7 +387,16 @@
 					// dto.partnerId = this.partnerId || undefined
 					dto.partnerUserId = this.partnerId || undefined
 					post.dto = dto
+				} else {
+					// #ifdef PUB_CUSTOMER
+					var dto = {}
+					dto.partnerUserId = this.partnerId || undefined
+					dto.name = this.regCustomerName || ''
+					post.dto = dto
+					// #endif
 				}
+
+
 				post.wxcode = wxcode
 
 				// const {

--
Gitblit v1.9.3