zhengjinyi 3 роки тому
батько
коміт
a7ec6a324d

+ 56 - 36
pages/login/apply.vue

@@ -132,9 +132,13 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix">
-				<view class="register-from picker noneborder">
+			<view class="register-row none clearfix">
+				<view class="register-from noneborder">
 					<view class="label">机构类型</view>
+				</view>
+			</view>
+			<view class="register-row none clearfix">
+				<view class="register-from picker noneborder">
 					<view class="row-input picker">
 						<radio-group @change="bindPickerChange">
 							<label class="label-radio" v-for="(item, index) in typename" :key="item.value">
@@ -149,7 +153,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row none clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from noneborder second">
 					<view
 						class="secondTyperadio"
@@ -162,7 +166,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
+			<view class="register-row none clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from noneborder second">
 					<view
 						class="secondTyperadio"
@@ -175,7 +179,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row none clearfix" v-if="isOrganizationType == 1">
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
@@ -194,18 +198,22 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 1 && isDepartment">
 				<view class="register-from" style="height: auto;border: 0;">
 					<view class="kes-title">科室</view>
-					<textarea
+					<input
 						class="keshi"
 						placeholder="请填写经营的科室,至少三个,用逗号隔开"
 						placeholder-style="placeholder"
 						v-model="department"
 						maxlength="16"
-					></textarea>
+					></input>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 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-from group" style="height: auto;border: 0;">
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLike">
 							<label
@@ -237,6 +245,10 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 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-from group" style="height: auto;border: 0;">
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLikes">
 							<label
@@ -357,7 +369,13 @@ export default {
 				provinceId: '', //省ID
 				addressDetail: '' //地址详情
 			},
-			typename: [{ name: '医美', value: 1 }, { name: '生美', value: 2 }]
+			typename: [
+				{ name: '医美', value: 1 }, 
+				{ name: '生美', value: 2 },
+				{ name: '项目公司', value: 3 },
+				{ name: '个人', value: 4 },
+				{ name: '其他', value: 5 },
+			]
 		}
 	},
 	onLoad(option) {
@@ -419,7 +437,7 @@ export default {
 						this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
 						this.department = this.$reg.checkData(organizationClub.department)
 						//机构类型&&主营项目
-						switch (this.firstClubType) {
+						switch(this.firstClubType){
 							case 1:
 								this.organizationTypeText = '医美'
 								this.isOrganizationType = 1
@@ -428,11 +446,23 @@ export default {
 								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 = 1
+								this.isOrganizationType = 0
 								break
-						}
+						}	
 						if (organizationClub.mainProduct == '' || organizationClub.mainProduct == null) {
 							this.mentuzCampList = this.mentuzCampNullList
 							this.medicaCampList = this.medicaCampNullList
@@ -867,7 +897,7 @@ export default {
 					border: none;
 				}
 				&.second {
-					padding-left: 160rpx;
+					padding-left: 0;
 				}
 				.label {
 					text-align: left;
@@ -901,12 +931,14 @@ export default {
 					}
 				}
 				.keshi {
-					width: 678rpx;
-					border: 2rpx solid #b2b2b2;
+					width: 100%;
+					border: 2rpx solid #E1E1E1;
 					border-radius: 6rpx;
-					height: 160rpx;
+					height: 80rpx;
+					line-height: 80rpx;
 					font-size: $font-size-28;
-					padding: 10rpx;
+					padding:0 10rpx;
+					box-sizing: border-box;
 				}
 				&.code {
 					width: 410rpx;
@@ -932,7 +964,7 @@ export default {
 						text-align: center;
 						border-radius: 14rpx;
 						&.other {
-							width: 350rpx;
+							width: 430rpx;
 							background: #fff;
 							margin-right: 20rpx;
 							border: 2rpx solid #b2b2b2;
@@ -961,17 +993,16 @@ export default {
 						line-height: 88rpx;
 					}
 					.label-radio {
-						margin-right: 70rpx;
+						margin-right: 10rpx;
 					}
 					.row-radio {
 						transform: scale(0.8);
 					}
 					.row-input {
-						width: 500rpx;
+						width: 100%;
 						height: 88rpx;
 						line-height: 88rpx;
-						padding-left: 40rpx;
-						float: left;
+						padding-left: 30rpx;
 					}
 				}
 				&.radio {
@@ -997,7 +1028,7 @@ export default {
 					width: 702rpx;
 					height: auto;
 					background: #ffffff;
-					margin-top: 30rpx;
+					border: 0;
 					.label {
 						line-height: 76rpx;
 					}
@@ -1027,7 +1058,6 @@ export default {
 					align-items: center;
 					&.btn {
 						margin: 0 auto;
-						margin-left: 116rpx;
 					}
 					.row-input {
 						display: flex;
@@ -1042,35 +1072,25 @@ export default {
 					.confirm-btn {
 						width: 160rpx;
 						height: 64rpx;
+						border-radius: 10rpx;
 						border-radius: 45rpx;
 						line-height: 64rpx;
 						text-align: center;
 						background: #ffe6dc;
 						color: $color-system;
+						margin: 0;
 						&.other {
 							width: 213rpx;
 						}
-						// &.none{
-						// 	color: #FFFFFF;
-						// }
-						// &.disabled{
-						// 	color: #999999;
-						// }
 					}
 					.item {
-						// width: 190rpx;
 						height: 60rpx;
 						font-size: $font-size-28;
 						line-height: 60rpx;
 						border-radius: 10rpx;
-						margin-left: 20rpx;
-						margin-bottom: 10rpx;
+						margin: 5rpx;
 						box-sizing: border-box;
-						// border: 1rpx solid #EFEFEF;
 						float: left;
-						//  checkbox {
-						// display: none;
-						//  }
 					}
 					.item-checkbox {
 						display: none;

+ 46 - 38
pages/login/information.vue

@@ -145,9 +145,13 @@
 					</view>
 				</view>
 			</view>
+			<view class="register-row none clearfix">
+				<view class="register-from bordernone">
+					<view class="label">机构类型</view>
+				</view>
+			</view>
 			<view class="register-row clearfix">
 				<view class="register-from picker bordernone">
-					<view class="label">机构类型</view>
 					<view class="row-input">
 						<radio-group @change="bindPickerChange">
 							<label class="label-radio" v-for="(item, index) in typename" :key="item.value">
@@ -220,9 +224,13 @@
 					></textarea>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="firstClubType == 1">
+			<view class="register-row none clearfix" v-if="firstClubType == 1">
 				<view class="register-from group bordernone">
 					<view class="label">主营内容</view>
+				</view>
+			</view>	
+			<view class="register-row clearfix" v-if="firstClubType == 1">
+				<view class="register-from group bordernone">
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLike">
 							<label
@@ -237,14 +245,6 @@
 						</checkbox-group>
 					</view>
 				</view>
-				<!-- <view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				  v-show="isShowAustomItem"-->
 				<view class="register-from group btn">
 					<view class="content-class btn">
 						<input
@@ -259,9 +259,13 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="firstClubType == 2">
+			<view class="register-row none clearfix" v-if="firstClubType == 2">
 				<view class="register-from group">
 					<view class="label">主营内容</view>
+				</view>	
+			</view>		
+			<view class="register-row clearfix" v-if="firstClubType == 2">
+				<view class="register-from group">
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLikes">
 							<label
@@ -276,14 +280,6 @@
 						</checkbox-group>
 					</view>
 				</view>
-				<!-- <view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				 v-show="isShowAustomItem"-->
 				<view class="register-from group btn">
 					<view class="content-class btn">
 						<input
@@ -424,7 +420,13 @@ export default {
 				provinceId: '', // 省ID
 				addressDetail: '' // 地址详情
 			},
-			typename: [{ name: '医美', value: 1 }, { name: '生美', value: 2 }]
+			typename: [
+				{ name: '医美', value: 1 }, 
+				{ name: '生美', value: 2 },
+				{ name: '项目公司', value: 3 },
+				{ name: '个人', value: 4 },
+				{ name: '其他', value: 5 },
+			]
 		}
 	},
 	onLoad(option) {
@@ -494,20 +496,26 @@ export default {
 						this.clubFax = this.$reg.checkData(organizationClub.fax)
 						this.profile = this.$reg.checkData(organizationClub.profile)
 						//机构类型&&主营项目
-						switch (this.firstClubType) {
+						switch(this.firstClubType){
 							case 1:
 								this.organizationTypeText = '医美'
-								this.firstClubType = 1
 								break
 							case 2:
 								this.organizationTypeText = '生美'
-								this.firstClubType = 2
+								break
+							case 3:
+								this.organizationTypeText = '项目公司'
+								break
+							case 4:
+								this.organizationTypeText = '个人'
+								break
+							case 5:
+								this.organizationTypeText = '其他'
 								break
 							case null:
 								this.organizationTypeText = '请选择机构类型'
-								this.firstClubType = 0
 								break
-						}
+						}	
 						if (organizationClub.mainProduct == '' || organizationClub.mainProduct == null) {
 							this.mentuzCampList = this.mentuzCampNullList
 							this.medicaCampList = this.medicaCampNullList
@@ -935,19 +943,21 @@ export default {
 				border-bottom: 2rpx solid #e1e1e1;
 				box-sizing: border-box;
 				.keshi {
-					width: 678rpx;
-					border: 2rpx solid #b2b2b2;
+					width: 100%;
+					border: 2rpx solid #E1E1E1;
 					border-radius: 6rpx;
-					height: 160rpx;
+					height: 80rpx;
+					line-height: 80rpx;
 					font-size: $font-size-28;
-					padding: 10rpx;
+					padding:0 10rpx;
+					box-sizing: border-box;
 				}
 				&.bordernone {
 					border: none;
 					height: auto;
 				}
 				&.second {
-					padding-left: 160rpx;
+					padding-left: 0;
 				}
 				.label {
 					text-align: left;
@@ -1001,7 +1011,7 @@ export default {
 						text-align: center;
 						border-radius: 14rpx;
 						&.other {
-							width: 300rpx;
+							width: 430rpx;
 							background: #fff;
 							margin-right: 20rpx;
 							border: 2rpx solid #b2b2b2;
@@ -1023,20 +1033,20 @@ export default {
 					}
 				}
 				&.picker {
-					width: 654rpx;
+					width: 100%;
 					height: 88rpx;
 					line-height: 88rpx;
 					.label {
 						line-height: 88rpx;
 					}
 					.label-radio {
-						margin-right: 70rpx;
+						margin-right: 10rpx;
 					}
 					.row-radio {
 						transform: scale(0.8);
 					}
 					.row-input {
-						width: 500rpx;
+						width: 100%;
 						height: 88rpx;
 						line-height: 88rpx;
 						padding-left: 30rpx;
@@ -1063,11 +1073,9 @@ export default {
 					}
 				}
 				&.group {
-					padding: 0 24rpx;
 					width: 702rpx;
 					height: auto;
 					background: #ffffff;
-					margin-top: 30rpx;
 					border: 0;
 					.label {
 						line-height: 76rpx;
@@ -1098,7 +1106,6 @@ export default {
 					align-items: center;
 					&.btn {
 						margin: 0 auto;
-						margin-left: 116rpx;
 					}
 					.row-input {
 						display: flex;
@@ -1119,6 +1126,7 @@ export default {
 						text-align: center;
 						background: #ffe6dc;
 						color: $color-system;
+						margin: 0;
 						&.other {
 							width: 213rpx;
 						}
@@ -1128,7 +1136,7 @@ export default {
 						font-size: $font-size-28;
 						line-height: 60rpx;
 						border-radius: 10rpx;
-						margin-left: 40rpx;
+						margin: 5rpx;
 						box-sizing: border-box;
 						float: left;
 					}

+ 29 - 9
pages/seller/login/apply.vue

@@ -210,7 +210,7 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from radio">
 					<radio-group @change="radioChange">
-						<label class="row-input" v-for="(item, index) in beautyList" :key="item.value">
+						<label class="row-label-input" v-for="(item, index) in beautyList" :key="item.value">
 							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616" />
 							<view class="row-text">{{ item.name }}</view>
 						</label>
@@ -220,7 +220,7 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from radio">
 					<radio-group @change="radioChange">
-						<label class="row-input" v-for="(item, index) in beautyLists" :key="item.value">
+						<label class="row-label-input" v-for="(item, index) in beautyLists" :key="item.value">
 							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616" />
 							<view class="row-text">{{ item.name }}</view>
 						</label>
@@ -488,7 +488,7 @@ export default {
 					this.clubFax = this.$reg.checkData(organizationClub.fax)
 					this.companyPprofile = this.$reg.checkData(organizationClub.profile)
 					//机构类型&&主营项目
-					switch (this.firstClubType) {
+					switch(this.firstClubType){
 						case 1:
 							this.organizationTypeText = '医美'
 							this.isOrganizationType = 1
@@ -497,11 +497,23 @@ export default {
 							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
@@ -729,7 +741,7 @@ export default {
 			let self = this
 			uni.showActionSheet({
 				title: '标题',
-				itemList: ['医美', '生美'],
+				itemList: ['医美', '生美','项目公司','个人','其他'],
 				success: e => {
 					self.isOrganizationType = e.tapIndex + 1
 					switch (e.tapIndex) {
@@ -739,6 +751,15 @@ export default {
 						case 1:
 							this.organizationTypeText = '生美'
 							break
+						case 2:
+							this.organizationTypeText = '项目公司'
+							break
+						case 3:
+							this.organizationTypeText = '个人'
+							break
+						case 4:
+							this.organizationTypeText = '其他'
+							break
 					}
 				}
 			})
@@ -1030,21 +1051,20 @@ export default {
 					padding: 0 14rpx;
 					width: 674rpx;
 					height: 90rpx;
-					.row-input {
-						width: 168rpx;
+					.row-label-input{
 						height: 88rpx;
 						line-height: 88rpx;
 						padding-left: 0;
-						font-size: 26rpx;
 					}
 					.row-radio {
 						float: left;
-						transform: scale(0.8);
+						transform: scale(0.7);
 					}
 					.row-text {
 						width: 100rpx;
 						text-align: left;
 						float: left;
+						font-size: $font-size-26;
 					}
 				}
 				&.group {

+ 29 - 7
pages/seller/login/information.vue

@@ -148,7 +148,7 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from radio">
 					<radio-group @change="radioChange">
-						<label class="row-input" v-for="(item, index) in beautyList" :key="item.value">
+						<label class="row-label-input" v-for="(item, index) in beautyList" :key="item.value">
 							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
 							<view class="row-text">{{item.name}}</view>
 						</label>
@@ -158,7 +158,7 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from radio">
 					<radio-group @change="radioChange">
-						<label class="row-input" v-for="(item, index) in beautyLists" :key="item.value">
+						<label class="row-label-input" v-for="(item, index) in beautyLists" :key="item.value">
 							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
 							<view class="row-text">{{item.name}}</view>
 						</label>
@@ -390,6 +390,18 @@
 							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
@@ -543,7 +555,7 @@
 				let self = this
 				uni.showActionSheet({
 					title:'标题',
-					itemList: ['医美', '生美'],
+					itemList: ['医美', '生美','项目公司','个人','其他'],
 					success: (e) => {
 						self.isOrganizationType = e.tapIndex+1
 						switch(e.tapIndex){
@@ -553,6 +565,15 @@
 							case 1:
 								this.organizationTypeText = '生美'
 								break
+							case 2:
+								this.organizationTypeText = '项目公司'
+								break
+							case 3:
+								this.organizationTypeText = '个人'
+								break
+							case 4:
+								this.organizationTypeText = '其他'
+								break
 						}
 					}
 				})
@@ -790,21 +811,22 @@
 					&.radio{
 						padding: 0 24rpx;
 						width: 654rpx;
-						height: 288rpx;
-						.row-input{
-							width: 100%;
+						height: 88rpx;
+						.row-label-input{
 							height: 88rpx;
 							line-height: 88rpx;
 							padding-left: 0;
 						}
 						.row-radio{
 							float: left;
-							transform: scale(0.8);
+							transform: scale(0.7);
 						}
 						.row-text{
 							width: 100rpx;
 							text-align: center;
 							float: left;
+							font-size: $font-size-26;
+							color: #999999;
 						}
 					}
 					&.group{

+ 11 - 3
pages/seller/login/register-member.vue

@@ -123,6 +123,8 @@
 			</view>
 			<view class="main-form-item picker">
 				<view class="form-label">机构类型</view>
+			</view>	
+			<view class="main-form-item picker">
 				<radio-group @change="bindPickerChange">
 					<label class="label-radio" v-for="(item, index) in radioGroup1" :key="item.value">
 						<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616" />
@@ -418,7 +420,13 @@ export default {
 				bindMobile: '',
 				userId: 0
 			},
-			radioGroup1: [{ name: '医美', value: 1 }, { name: '生美', value: 2 }],
+			radioGroup1: [
+				{ name: '医美', value: 1 }, 
+				{ name: '生美', value: 2 },
+				{ name: '项目公司', value: 3 },
+				{ name: '个人', value: 4 },
+				{ name: '其他', value: 5 },
+			],
 			current: 0,
 			bindId: 0,
 			customItemValue: '', //自定义项目
@@ -877,7 +885,7 @@ page {
 			&.picker {
 				border-bottom: none;
 				.label-radio {
-					margin-left: 30rpx;
+					margin:0 5rpx;
 					font-size: $font-size-28;
 					float: left;
 				}
@@ -889,10 +897,10 @@ page {
 					text-align: center;
 					float: left;
 					font-size: $font-size-28;
+					color: #999999;
 				}
 				.picker-radio {
 					box-sizing: border-box;
-					padding-left: 170rpx;
 					.secondTyperadio {
 						border: 2rpx solid #e1e1e1;
 						display: inline-block;