commit -m 超级会员&增加联系人身份

pages/login/apply.vue

@@ -18,6 +18,24 @@
 			</view>
 		</view>
 		<view class="register-main detailed clearfix">
+			<view class="register-row clearfix">
+				<view class="register-from">
+					<view class="label">联系人身份</view>
+					<view class="row-input">
+						<picker @change="bindPickerUserName($event)" :value="index" :range="stateActions" range-key="name">
+							<input
+								class="row-input"
+								type="text"
+								disabled="false"
+								v-model="linkManIdentityText"
+								value=""
+								placeholder="请选择"
+							/>
+						</picker>
+					</view>
+					<text class="iconfont icon-xiayibu"></text>
+				</view>
+			</view>
 			<view class="register-row none clearfix">
 				<view class="register-from">
 					<view class="label">邮箱</view>
@@ -141,7 +159,7 @@
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 			</view>
-			<view class="register-row none clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row none clearfix" v-if="firstClubType == 1">
 				<view class="register-from noneborder second">
 					<view
 						class="secondTyperadio"
@@ -154,7 +172,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row none clearfix" v-if="isOrganizationType == 2">
+			<view class="register-row none clearfix" v-if="firstClubType == 2">
 				<view class="register-from noneborder second">
 					<view
 						class="secondTyperadio"
@@ -167,7 +185,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row none clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row none clearfix" v-if="firstClubType == 1">
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
@@ -183,7 +201,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1 && isDepartment">
+			<view class="register-row clearfix" v-if="firstClubType == 1 && isDepartment">
 				<view class="register-from" style="height: auto;border: 0;">
 					<view class="kes-title">科室</view>
 					<input
@@ -195,12 +213,12 @@
 					></input>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row clearfix" v-if="firstClubType == 1">
 				<view class="register-from group" style="height: auto;border: 0;">
 					<view class="label">主营内容</view>
 				</view>	
 			</view>		
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row clearfix" v-if="firstClubType == 1">
 				<view class="register-from group" style="height: auto;border: 0;">
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLike">
@@ -230,12 +248,12 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
+			<view class="register-row clearfix" v-if="firstClubType == 2">
 				<view class="register-from group" style="height: auto;border: 0;">
 					<view class="label">主营内容</view>
 				</view>	
 			</view>		
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
+			<view class="register-row clearfix" v-if="firstClubType == 2">
 				<view class="register-from group" style="height: auto;border: 0;">
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLikes">
@@ -334,7 +352,8 @@ export default {
 			secondClubType: '', 					//机构类型二级分类
 			mainProduct: '', 						//主营内容
 			firstClubType: 1, 						//机构类型
-			isOrganizationType: 1,
+			linkManIdentity:0,						//联系人身份
+			linkManIdentityText:'请选择联系人身份',					//联系人身份
 			firstClubTypeCurrent:0,
 			organizationTypeText: '请选择机构类型',
 			beautyList: beautyList, 				//医美分类
@@ -357,12 +376,11 @@ export default {
 				provinceId: '', //省ID
 				addressDetail: '' //地址详情
 			},
-			typename: [
-				{ name: '医美', value: 1 }, 
-				{ name: '生美', value: 2 },
-				{ name: '项目公司', value: 3 },
-				{ name: '个人', value: 4 },
-				{ name: '其他', value: 5 },
+			stateActions: [
+				{ name: '老板', value: 1 },
+				{ name: '采购', value: 2 },
+				{ name: '运营', value: 3 },
+				{ name: '其他', value: 4 },
 			]
 		}
 	},
@@ -389,6 +407,8 @@ export default {
 							this.errorList = organizationUser.auditNoteList
 						}
 						this.contractEmail = organizationClub.contractEmail
+						this.linkManIdentity = organizationClub.linkManIdentity ? organizationClub.linkManIdentity : 0
+						this.linkManIdentityText = this.linkManIdentity ? this.linkManFilters(this.linkManIdentity) : '请选择联系人身份'
 						this.clubId = organizationUser.clubId
 						if (this.contractEmail) {
 							this.isFirstAdds = false
@@ -419,38 +439,12 @@ export default {
 						this.addressData.addressDetail = this.$reg.checkData(organizationClub.address)
 						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 						this.firstClubType = organizationClub.firstClubType
+						this.organizationTypeText = organizationClub.firstClubType ? this.firstClubTypeText(this.firstClubType) : '请选择机构类型'
 						this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
 						this.businessLicense = this.$reg.checkData(organizationClub.businessLicense)
 						this.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
 						this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
 						this.department = this.$reg.checkData(organizationClub.department)
-						//机构类型&&主营项目
-						switch(this.firstClubType){
-							case 1:
-								this.organizationTypeText = '医美'
-								this.isOrganizationType = 1
-								break
-							case 2:
-								this.organizationTypeText = '生美'
-								this.isOrganizationType = 2
-								break
-							case 3:
-								this.organizationTypeText = '项目公司'
-								this.isOrganizationType = 0
-								break
-							case 4:
-								this.organizationTypeText = '个人'
-								this.isOrganizationType = 0
-								break
-							case 5:
-								this.organizationTypeText = '其他'
-								this.isOrganizationType = 0
-								break
-							case null:
-								this.organizationTypeText = '请选择机构类型'
-								this.isOrganizationType = 0
-								break
-						}	
 						if (organizationClub.mainProduct == '' || organizationClub.mainProduct == null) {
 							this.mentuzCampList = this.mentuzCampNullList
 							this.medicaCampList = this.medicaCampNullList
@@ -486,7 +480,7 @@ export default {
 			//提交审核
 			if (this.isFirstAdds) {
 				let mainproList = []
-				if (this.isOrganizationType == 1) {
+				if (this.firstClubType == 1) {
 					this.mentuzCampList.forEach(item => {
 						mainproList.push(item.name)
 					})
@@ -497,6 +491,10 @@ export default {
 				}
 				this.mainProduct = mainproList.join('/')
 			}
+			if (!this.linkManIdentity) {
+				this.$util.msg('请选择联系人身份', 2000)
+				return
+			}
 			if (this.contractEmail == '') {
 				this.$util.msg('请输入邮箱地址', 2000)
 				return
@@ -521,19 +519,19 @@ export default {
 				this.$util.msg('请上传您的营业执照', 2000)
 				return
 			}
-			if (this.isOrganizationType == 1){
+			if (this.firstClubType == 1){
 				if (this.medicalPracticeLicense == '') {
 					this.$util.msg('请上传您的资质许可证', 2000)
 					return
 				}
 			}
-			if (this.isOrganizationType == 1 || this.isOrganizationType == 2) {
+			if (this.firstClubType == 1 || this.firstClubType == 2) {
 				if(this.secondClubType == ''){
 					this.$util.msg('选择机构类型', 2000)
 					return
 				}
 			}
-			if (this.isOrganizationType == 1 || this.isOrganizationType == 2) {
+			if (this.firstClubType == 1 || this.firstClubType == 2) {
 				if (this.mainProduct == '') {
 					this.$util.msg('请选择机构主营内容', 2000)
 					return
@@ -544,6 +542,7 @@ export default {
 				clubId: this.clubId, //会所ID
 				contractEmail: this.contractEmail,
 				name: this.clubName,
+				linkManIdentity:this.linkManIdentity,
 				shortName: this.shortName,
 				provinceId: this.addressData.provinceId,
 				cityId: this.addressData.cityId,
@@ -552,7 +551,7 @@ export default {
 				socialCreditCode: this.socialCreditCode,
 				businessLicense: this.businessLicense,
 				shopPhoto: this.shopPhoto,
-				firstClubType: this.isOrganizationType, //机构类型分类 医美:1和生美:2
+				firstClubType: this.firstClubType, //机构类型分类 医美:1和生美:2
 				secondClubType: this.secondClubType, //机构类型二级分类 诊所:1,门诊:2,医院:3
 				department: this.department, //科室
 				medicalPracticeLicense: this.medicalPracticeLicense, //资质图片
@@ -662,7 +661,7 @@ export default {
 				title:'标题',
 				itemList: ['医美', '生美','项目公司','个人','其他'],
 				success: (e) => {
-					self.isOrganizationType = e.tapIndex+1
+					self.firstClubType = e.tapIndex+1
 					switch(e.tapIndex){
 						case 0:
 							this.organizationTypeText = '医美'
@@ -684,8 +683,12 @@ export default {
 			})
 		},
 		bindPickerChange2(e) {
-			this.typtIndex = e.target.value
-			this.isOrganizationType = e.target.value
+			this.typtIndex = e.target.values
+			this.firstClubType = e.target.value
+		},
+		bindPickerUserName(e){//选择联系人身份
+			this.linkManIdentityText = this.stateActions[e.target.value].name
+			this.linkManIdentity= this.stateActions[e.target.value].value
 		},
 		radioChange(item) {
 			this.secondClubType = item.value
@@ -737,7 +740,7 @@ export default {
 			if (this.customItemValue == '') {
 				this.$util.msg('请输入自定义主营内容', 2000)
 			} else {
-				if (this.isOrganizationType == 1) {
+				if (this.firstClubType == 1) {
 					let item = { value: `${this.mentuzCampList.length + 1}`, name: this.customItemValue, checked: true }
 					if (this.checkedArray(this.customItemValue, this.mentuzCampList)) {
 						this.$util.msg('主营内容已存在!', 2000)
@@ -763,7 +766,28 @@ export default {
 				}
 			}
 			return false
-		}
+		},
+		firstClubTypeText(value){
+			// 机构类型文案
+			const map = {
+				1: '医美',
+				2: '生美',
+				3: '项目公司',
+				4: '个人',
+				5: '其他'
+			}
+			return map[value]
+		},
+		linkManFilters(value) {
+			// 联系人身份
+			const map = {
+				1: '老板',
+				2: '采购',
+				3: '运营',
+				4: '其他'
+			}
+			return map[value]
+		},
 	},
 	onShow() {
 		if (this.isPreviewImage) {

pages/login/information.vue

@@ -25,6 +25,24 @@
 		</view>
 		<view class="register-main clearfix" v-if="userIdentity === 2">
 			<view class="register-row"> <view class="register-title">升级信息</view> </view>
+			<view class="register-row clearfix">
+				<view class="register-from">
+					<view class="label">联系人身份</view>
+					<view class="row-input">
+						<picker @change="bindPickerUserName($event)" :value="index" :range="stateActions" range-key="name">
+							<input
+								class="row-input"
+								type="text"
+								disabled="false"
+								v-model="linkManIdentityText"
+								value=""
+								placeholder="请选择"
+							/>
+						</picker>
+					</view>
+					<text class="iconfont icon-xiayibu"></text>
+				</view>
+			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">邮箱</view>
@@ -387,6 +405,8 @@ export default {
 			clubFax: '', // 传真
 			profile: '', // 公司简介
 			firstClubType: 0, // 机构类型
+			linkManIdentity:0,						//联系人身份
+			linkManIdentityText:'请选择联系人身份',					//联系人身份
 			organizationTypeText: '请选择机构类型',
 			beautyList: beautyList,
 			beautyLists: beautyLists,
@@ -407,12 +427,11 @@ export default {
 				provinceId: '', // 省ID
 				addressDetail: '' // 地址详情
 			},
-			typename: [
-				{ name: '医美', value: 1 }, 
-				{ name: '生美', value: 2 },
-				{ name: '项目公司', value: 3 },
-				{ name: '个人', value: 4 },
-				{ name: '其他', value: 5 },
+			stateActions: [
+				{ name: '老板', value: 1 },
+				{ name: '采购', value: 2 },
+				{ name: '运营', value: 3 },
+				{ name: '其他', value: 4 },
 			]
 		}
 	},
@@ -434,7 +453,7 @@ export default {
 					.then(response => {
 						let organizationClub = response.data.club
 						let organizationUser = response.data.user
-						if(organizationClub.contractEmail){
+						if(!organizationClub.contractEmail){
 							this.isFirstAdds = false
 						}else{
 							this.isFirstAdds = true
@@ -446,6 +465,8 @@ export default {
 						this.userIdentity = organizationUser.userIdentity
 						this.name = organizationClub.name ? organizationClub.name : ''
 						this.linkMan = organizationClub.linkMan
+						this.linkManIdentity = organizationClub.linkManIdentity ? organizationClub.linkManIdentity : 0
+						this.linkManIdentityText = this.linkManIdentity ? this.linkManFilters(this.linkManIdentity) : '请选择联系人身份'
 						this.mobile = organizationUser.bindMobile ? organizationUser.bindMobile : ''
 						this.shortName = this.$reg.checkData(organizationClub.shortName)
 						if (organizationClub.provinceId == null) {
@@ -466,6 +487,7 @@ export default {
 						this.addressData.addressDetail = organizationClub.address ? organizationClub.address : ''
 						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 						this.firstClubType = organizationClub.firstClubType
+						this.organizationTypeText = organizationClub.firstClubType ? this.firstClubTypeText(this.firstClubType) : '请选择机构类型'
 						this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
 						this.addressData.address = organizationClub.provincialAddress
 							? organizationClub.provincialAddress
@@ -477,27 +499,6 @@ export default {
 						this.clubTelePhone = this.$reg.checkData(organizationClub.contractPhone)
 						this.clubFax = this.$reg.checkData(organizationClub.fax)
 						this.profile = this.$reg.checkData(organizationClub.profile)
-						//机构类型&&主营项目
-						switch(this.firstClubType){
-							case 1:
-								this.organizationTypeText = '医美'
-								break
-							case 2:
-								this.organizationTypeText = '生美'
-								break
-							case 3:
-								this.organizationTypeText = '项目公司'
-								break
-							case 4:
-								this.organizationTypeText = '个人'
-								break
-							case 5:
-								this.organizationTypeText = '其他'
-								break
-							case null:
-								this.organizationTypeText = '请选择机构类型'
-								break
-						}	
 						if (organizationClub.mainProduct == '' || organizationClub.mainProduct == null) {
 							this.mentuzCampList = this.mentuzCampNullList
 							this.medicaCampList = this.medicaCampNullList
@@ -555,6 +556,11 @@ export default {
 						})
 					}
 					this.mainProduct = mainproList.join('/')
+					console.log('mainProduct',this.mainProduct)
+				}
+				if (!this.linkManIdentity) {
+					this.$util.msg('请选择联系人身份', 2000)
+					return
 				}
 				if (this.contractEmail == '') {
 					this.$util.msg('请输入邮箱地址', 2000)
@@ -597,6 +603,7 @@ export default {
 					clubId: this.clubId, //会所ID
 					name: this.name,
 					linkMan: this.linkMan,
+					linkManIdentity: this.linkManIdentity,
 					shortName: this.shortName,
 					contractEmail: this.contractEmail,
 					provinceId: this.addressData.provinceId,
@@ -737,6 +744,10 @@ export default {
 			this.typtIndex = e.target.value
 			this.firstClubType = e.target.value
 		},
+		bindPickerUserName(e){//选择联系人身份
+			this.linkManIdentityText = this.stateActions[e.target.value].name
+			this.linkManIdentity= this.stateActions[e.target.value].value
+		},
 		radioChange(item) {
 			this.secondClubType = item.value
 			if (this.secondClubType == 2 || this.secondClubType == 3) {
@@ -821,7 +832,28 @@ export default {
 				}
 			}
 			return false
-		}
+		},
+		firstClubTypeText(value){
+			// 机构类型文案
+			const map = {
+				1: '医美',
+				2: '生美',
+				3: '项目公司',
+				4: '个人',
+				5: '其他'
+			}
+			return map[value]
+		},
+		linkManFilters(value) {
+			// 联系人身份
+			const map = {
+				1: '老板',
+				2: '采购',
+				3: '运营',
+				4: '其他'
+			}
+			return map[value]
+		},
 	},
 	onShow() {
 		this.$api.getStorage().then(resolve => {

pages/seller/login/information.vue

@@ -64,6 +64,25 @@
 			<view class="register-row">
 				<view class="register-title">升级信息</view>
 			</view>
+			<view class="register-row clearfix">
+				<view class="register-from picker">
+					<view class="label">联系人身份:</view>
+					<view class="row-input picker">
+						<picker @change="bindPickerUserName($event)" :value="index" :range="stateActions" range-key="name">
+							<input
+								class="row-input picker"
+								:class="linkManIdentityText === '请选择联系人身份' ? 'none' : ''"
+								type="text"
+								disabled="false"
+								v-model="linkManIdentityText"
+								value=""
+								placeholder="请选择"
+							/>
+						</picker>
+					</view>
+					<text class="iconfont icon-xiayibu"></text>
+				</view>
+			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">邮箱:</view>
@@ -145,7 +164,7 @@
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row clearfix" v-if="firstClubType == 1">
 				<view class="register-from radio">
 					<radio-group @change="radioChange">
 						<label class="row-label-input" v-for="(item, index) in beautyList" :key="item.value">
@@ -155,7 +174,7 @@
 					</radio-group>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
+			<view class="register-row clearfix" v-if="firstClubType == 2">
 				<view class="register-from radio">
 					<radio-group @change="radioChange">
 						<label class="row-label-input" v-for="(item, index) in beautyLists" :key="item.value">
@@ -171,7 +190,7 @@
 					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row clearfix" v-if="firstClubType == 1">
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证:</view>
 					<view class="upload-picture">
@@ -185,7 +204,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row clearfix" v-if="firstClubType == 1">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
 					<view class="content-class">
@@ -216,7 +235,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
+			<view class="register-row clearfix" v-if="firstClubType == 2">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
 					<view class="content-class">
@@ -302,7 +321,8 @@
 				clubFax:'',				//传真
 				companyPprofile:'',		//公司简介
 				firstClubType:'',		//机构类型
-				isOrganizationType:0,
+				linkManIdentity:0,		// 联系人身份
+				linkManIdentityText:'请选择联系人身份',	//联系人身份
 				organizationTypeText:'请选择机构类型',
 				beautyList:beautyList,
 				beautyLists:beautyLists,
@@ -323,6 +343,12 @@
 					provinceId:'',		//省ID
 					addressDetail: '',	//地址详情
 				},
+				stateActions: [
+					{ name: '老板', value: 1 },
+					{ name: '采购', value: 2 },
+					{ name: '运营', value: 3 },
+					{ name: '其他', value: 4 },
+				]
 			}	
 		},
 		onLoad(option) {
@@ -346,6 +372,8 @@
 					this.userIdentity = organizationUser.userIdentity
 					this.clubContact = organizationClub.linkMan
 					this.mobile = organizationUser.bindMobile
+					this.linkManIdentity = organizationClub.linkManIdentity ? organizationClub.linkManIdentity : 0
+					this.linkManIdentityText = this.linkManIdentity ? this.linkManFilters(this.linkManIdentity) : '请选择联系人身份'
 					this.clubTelePhone = organizationClub.contractPhone ? organizationClub.contractPhone : ''
 					this.clubFax = organizationClub.fax ? organizationClub.fax : ''
 					this.companyPprofile = organizationClub.profile ? organizationClub.profile : ''
@@ -374,39 +402,13 @@
 					this.addressData.addressDetail = organizationClub.address ? organizationClub.address : ''
 					this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 					this.firstClubType = this.$reg.checkData(organizationClub.firstClubType)
+					this.organizationTypeText = organizationClub.firstClubType ? this.firstClubTypeText(this.firstClubType) : '请选择机构类型'
 					this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
 					this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
 					this.businessLicense = this.$reg.checkData(organizationClub.businessLicense)
 					this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
 					this.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
 					this.department = this.$reg.checkData(organizationClub.department)						
-					//机构类型&&主营项目
-					switch(this.firstClubType){
-						case 1:
-							this.organizationTypeText = '医美'
-							this.isOrganizationType = 1
-							break
-						case 2:
-							this.organizationTypeText = '生美'
-							this.isOrganizationType = 2
-							break
-						case 3:
-							this.organizationTypeText = '项目公司'
-							this.isOrganizationType = 2
-							break
-						case 4:
-							this.organizationTypeText = '个人'
-							this.isOrganizationType = 2
-							break
-						case 5:
-							this.organizationTypeText = '其他'
-							this.isOrganizationType = 2
-							break
-						case null:
-							this.organizationTypeText = '请选择机构类型'
-							this.isOrganizationType = 0
-							break
-					}	
 					if(organizationClub.mainProduct == '' || organizationClub.mainProduct == null){
 						this.mentuzCampList = this.mentuzCampNullList
 						this.medicaCampList = this.medicaCampNullList
@@ -443,11 +445,16 @@
 					}
 					this.mainProduct = mainproList.join('/')
 				}
+				if (!this.linkManIdentity) {
+					this.$util.msg('请选择联系人身份', 2000)
+					return
+				}
 				let params = {
 						userId:this.userId,
 						clubId:this.clubId,					//会所ID
 						name:this.clubName,
 						linkMan:this.clubContact,
+						linkManIdentity:this.linkManIdentity,
 						contractEmail:this.contractEmail,
 						shortName:this.shortName,
 						provinceId:this.addressData.provinceId,
@@ -457,7 +464,7 @@
 						socialCreditCode:this.socialCreditCode,
 						businessLicense:this.businessLicense,
 						shopPhoto:this.shopPhoto,
-						firstClubType:this.isOrganizationType, //机构类型分类 医美:0和生美:1
+						firstClubType:this.firstClubType, //机构类型分类 医美:0和生美:1
 						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
 						department:this.department,				//科室
 						medicalPracticeLicense:this.medicalPracticeLicense,//资质图片
@@ -557,7 +564,7 @@
 					title:'标题',
 					itemList: ['医美', '生美','项目公司','个人','其他'],
 					success: (e) => {
-						self.isOrganizationType = e.tapIndex+1
+						self.firstClubType = e.tapIndex+1
 						switch(e.tapIndex){
 							case 0:
 								this.organizationTypeText = '医美'
@@ -581,7 +588,7 @@
 			},
 			bindPickerChange2(e) {
 				this.typtIndex = e.target.value
-				this.isOrganizationType = e.target.value
+				this.firstClubType = e.target.value
 			},
 			radioChange(e) {
 				this.secondClubType = e.target.value
@@ -645,13 +652,34 @@
 				return _ARRAY
 			},
 			addCustomItem(){
-				if(this.isOrganizationType == 1){
+				if(this.firstClubType == 1){
 					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
 					this.mentuzCampList.push(item)
 				}else{
 					let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
 					this.medicaCampList.push(item)
 				}
+			},
+			firstClubTypeText(value){
+				// 机构类型文案
+				const map = {
+					1: '医美',
+					2: '生美',
+					3: '项目公司',
+					4: '个人',
+					5: '其他'
+				}
+				return map[value]
+			},
+			linkManFilters(value) {
+				// 联系人身份
+				const map = {
+					1: '老板',
+					2: '采购',
+					3: '运营',
+					4: '其他'
+				}
+				return map[value]
 			}
 		},
 		onShow() {
@@ -1059,7 +1087,7 @@
 			.register-btn{
 				width: 702rpx;
 				height: 88rpx;
-				border-radius: 14rpx;
+				border-radius: 44rpx;
 				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #FFFFFF;

pages/seller/login/register-member.vue

@@ -13,7 +13,7 @@
 				/>
 			</view>
 			<view class="main-form-item">
-				<view class="form-label">手机号</view>
+				<view class="form-label">手机号:</view>
 				<input
 					class="form-input phone"
 					type="text"
@@ -24,7 +24,24 @@
 				<view class="form-btn" @click.stop="CheckMobile()">检测</view>
 			</view>
 			<view class="main-form-item">
-				<view class="form-label">邮箱</view>
+				<view class="form-label">联系人身份:</view>
+				<view class="form-input">
+					<picker @change="bindPickerUserName($event)" :value="index" :range="stateActions" range-key="name">
+						<input
+							class="form-input"
+							:class="linkManIdentityText === '请选择联系人身份' ? 'none' : ''"
+							type="text"
+							disabled="false"
+							v-model="linkManIdentityText"
+							value=""
+							placeholder="请选择"
+						/>
+					</picker>
+				</view>
+				<view class="iconfont icon-xiayibu"></view>
+			</view>
+			<view class="main-form-item">
+				<view class="form-label">邮箱:</view>
 				<input
 					class="form-input"
 					type="text"
@@ -35,7 +52,7 @@
 				/>
 			</view>
 			<view class="main-form-item">
-				<view class="form-label">机构名称</view>
+				<view class="form-label">机构名称:</view>
 				<input
 					class="form-input"
 					type="text"
@@ -46,7 +63,7 @@
 				/>
 			</view>
 			<view class="main-form-item">
-				<view class="form-label">机构简称</view>
+				<view class="form-label">机构简称:</view>
 				<input
 					class="form-input"
 					type="text"
@@ -57,7 +74,7 @@
 				/>
 			</view>
 			<view class="main-form-item" @click="showMulLinkageThreePicker">
-				<view class="form-label">机构地址</view>
+				<view class="form-label">机构地址:</view>
 				<view class="form-input" :class="addressText === '请选择机构所在地区' ? 'none' : ''">
 					{{ addressText }}
 				</view>
@@ -81,7 +98,7 @@
 				/>
 			</view>
 			<view class="main-form-item">
-				<view class="form-label lang">营业执照编号</view>
+				<view class="form-label lang">营业执照编号:</view>
 				<input
 					class="form-input lang"
 					type="text"
@@ -93,7 +110,7 @@
 			</view>
 			<view class="main-form-item file">
 				<view class="main-form-upload">
-					<view class="label">营业执照</view>
+					<view class="label">营业执照:</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="params.businessLicense === ''" @click="UploadPicture(1)">
 							<text class="iconfont icon-jiahao"></text><text class="upload-text">营业执照</text>
@@ -107,7 +124,7 @@
 					</view>
 				</view>
 				<view class="main-form-upload">
-					<view class="label">门头照</view>
+					<view class="label">门头照:</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="params.shopPhoto === ''" @click="UploadPicture(2)">
 							<text class="iconfont icon-jiahao"></text><text class="upload-text">门头照</text>
@@ -122,7 +139,7 @@
 				</view>
 			</view>
 			<view class="main-form-item picker">
-				<view class="form-label">机构类型</view>
+				<view class="form-label">机构类型:</view>
 			</view>	
 			<view class="main-form-item picker">
 				<radio-group @change="bindPickerChange">
@@ -160,7 +177,7 @@
 			</view>
 			<view class="main-form-item file" v-if="params.firstClubType == 1">
 				<view class="main-form-upload">
-					<view class="label">资质</view>
+					<view class="label">资质:</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="params.medicalPracticeLicense === ''" @click="UploadPicture(3)">
 							<text class="iconfont icon-jiahao"></text><text class="upload-text">医疗执业许可证</text>
@@ -191,7 +208,7 @@
 				></textarea>
 			</view>
 			<view class="main-form-item none" v-if="params.firstClubType == 1">
-				<view class="form-label none">主营内容</view>
+				<view class="form-label none">主营内容:</view>
 				<view class="form-checkbox-group">
 					<checkbox-group @change="ChooseMaleLike">
 						<label
@@ -223,7 +240,7 @@
 				</view>
 			</view>
 			<view class="main-form-item none" v-if="params.firstClubType == 2">
-				<view class="form-label none">主营内容</view>
+				<view class="form-label none">主营内容:</view>
 				<view class="form-checkbox-group">
 					<checkbox-group @change="ChooseMaleLike">
 						<label
@@ -394,6 +411,7 @@ export default {
 			mentuzCampList: mentuzCampNullList,
 			medicaCampList: medicaCampNullList,
 			addressText: '请选择机构所在地区',
+			linkManIdentityText:'请选择联系人身份',	//联系人身份
 			params: {
 				userId: 0,
 				name: '',
@@ -413,7 +431,8 @@ export default {
 				firstClubType: 1, //1医美；2生美
 				secondClubType: 1, //1诊所；2门诊；3医院
 				department: '', //科室
-				mainProduct: ''
+				mainProduct: '',
+				linkManIdentity:0,		//联系人身份
 			},
 			clubInfo: {
 				linkMan: '',
@@ -430,7 +449,13 @@ export default {
 			current: 0,
 			bindId: 0,
 			customItemValue: '', //自定义项目
-			showMainProductList: []
+			showMainProductList: [],
+			stateActions: [
+				{ name: '老板', value: 1 },
+				{ name: '采购', value: 2 },
+				{ name: '运营', value: 3 },
+				{ name: '其他', value: 4 },
+			]
 		}
 	},
 	filters: {
@@ -506,6 +531,10 @@ export default {
 				this.$util.msg('手机格式不正确', 2000)
 				return
 			}
+			if (!this.params.linkManIdentity) {
+				this.$util.msg('请选择联系人身份', 2000)
+				return
+			}
 			if (this.params.contractEmail == '') {
 				this.$util.msg('请输入邮箱地址', 2000)
 				return
@@ -692,6 +721,10 @@ export default {
 			})
 			return _ARRAY
 		},
+		bindPickerUserName(e){//选择联系人身份
+			this.linkManIdentityText = this.stateActions[e.target.value].name
+			this.params.linkManIdentity= this.stateActions[e.target.value].value
+		},
 		bindPickerChange(e) {
 			//选择机构类型
 			this.params.firstClubType = Number(e.target.value)

utils/residence.js

@@ -86,7 +86,7 @@ const setingSysParams = async (current) => {
     } else {
 	    sysParams.pageLabel = uni.getStorageSync('pageLabel') ? uni.getStorageSync('pageLabel') : pageData.pageLabel
     }
-    console.log('记录路径:', sysParams.path, '标签:', sysParams.pageLabel)
+    console.log('记录路径:', sysParams.pagePath, '标签:', sysParams.pageLabel)
     // 统计接口调用
     await UserApi.userRecordStatistics(sysParams)
     console.log('---用户行为轨迹记录成功---')