Administrator il y a 4 ans
Parent
commit
8ca306b061

+ 2 - 2
common/config/config.js

@@ -1,10 +1,10 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-	// URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

+ 41 - 24
components/cm-module/creatOrder/sellerInvoice.vue

@@ -2,12 +2,15 @@
 	<view class="invoice-template">
 		 <!-- 发票信息 -->
 		<view class="invoice-title" @tap.stop="hanldOperationConfim">
-			<text class="text">发票信息:</text>
-			<text class="iconfont icon-xiayibu"></text>
+			<text class="text">发票信息</text>
+			<view class="invoice-right">
+				<text class="text-l">{{invoiceText}}</text>
+				<text class="iconfont icon-xiayibu"></text>
+			</view>
 		</view>
-		<view class="invoice-text">
+		<!-- <view class="invoice-text">
 			<text>{{invoiceText}}</text>
-		</view>
+		</view> -->
 		<!--底部选择模态层弹窗组件 -->
 		<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="choiceaInvoiceConfim">
 			<!-- 遮罩层 -->
@@ -26,23 +29,23 @@
 					<view class="invoice-main from" v-if="invoiceType == '2'">
 						<view class="invoice-from">
 							<view class="label">单位名称:</view>
-							<input class="form-input" type="text" v-model="invoiceData.invoiceTitle" placeholder="请填写单位信息(必填)" maxlength="20">
+							<input class="form-input" type="text" v-model="invoiceData.invoiceTitle" placeholder="请填写单位信息(必填)" placeholder-class="placeholder" maxlength="20">
 						</view>
 						<view class="invoice-from">
 							<view class="label">纳税人识别号:</view>
-							<input class="form-input" type="text" v-model="invoiceData.corporationTaxNum" placeholder="请填写纳税人识别号(必填)" maxlength="20">
+							<input class="form-input" type="text" v-model="invoiceData.corporationTaxNum" placeholder="请填写纳税人识别号(必填)" placeholder-class="placeholder" maxlength="20">
 						</view>
 						<view class="invoice-from">
 							<view class="label">注册地址:</view>
-							<input class="form-input" type="text" v-model="invoiceData.registeredAddress" placeholder="请填写单位注册地址(必填)" maxlength="30">
+							<input class="form-input" type="text" v-model="invoiceData.registeredAddress" placeholder="请填写单位注册地址(必填)" placeholder-class="placeholder" maxlength="30">
 						</view>
 						<view class="invoice-from">
 							<view class="label">注册电话:</view>
-							<input class="form-input" type="text" v-model="invoiceData.registeredPhone" placeholder="请填写注册电话(必填)" maxlength="15">
+							<input class="form-input" type="text" v-model="invoiceData.registeredPhone" placeholder="请填写注册电话(必填)" placeholder-class="placeholder" maxlength="15">
 						</view>
 						<view class="invoice-from">
 							<view class="label">开户银行:</view>
-							<input class="form-input" type="text" v-model="invoiceData.openBank"   placeholder="请填写开户银行(必填)" maxlength="10">
+							<input class="form-input" type="text" v-model="invoiceData.openBank"   placeholder="请填写开户银行(必填)" placeholder-class="placeholder" maxlength="10">
 						</view>
 						<view class="invoice-from">
 							<view class="label">银行账号:</view>
@@ -50,7 +53,8 @@
 								   type="text" 
 								   v-model="invoiceData.bankAccountNo" 
 								   placeholder="请填写银行账号(必填)" 
-								   maxlength="19">
+								   maxlength="19"
+								   placeholder-class="placeholder">
 						</view>
 					</view>
 					<view class="invoice-main" v-if="invoiceType == '3'">
@@ -72,13 +76,13 @@
 						</view>
 						<view class="invoice-group from">
 							<view class="group-from" v-if="peopleInvoiceData.invoiceTitleType == '0'">
-								<input class="form-input" type="text" v-model="peopleInvoiceData.invoiceTitle"   placeholder="请填写个人抬头" maxlength="20">
+								<input class="form-input" type="text" v-model="peopleInvoiceData.invoiceTitle"   placeholder="请填写个人抬头" placeholder-class="placeholder" maxlength="20">
 							</view>
 							<view class="group-from" v-if="peopleInvoiceData.invoiceTitleType == '1'">
-								<input class="form-input" type="text" v-model="peopleInvoiceData.invoiceTitle"   placeholder="请填写公司抬头" maxlength="20">
+								<input class="form-input" type="text" v-model="peopleInvoiceData.invoiceTitle"   placeholder="请填写公司抬头" placeholder-class="placeholder" maxlength="20">
 							</view>
 							<view class="group-from" v-if="peopleInvoiceData.invoiceTitleType == '1'">
-								<input class="form-input" type="text" v-model="peopleInvoiceData.corporationTaxNum"   placeholder="请填写纳税人识别号" maxlength="20">
+								<input class="form-input" type="text" v-model="peopleInvoiceData.corporationTaxNum"   placeholder="请填写纳税人识别号" placeholder-class="placeholder" maxlength="20">
 							</view>
 						</view>
 					</view>
@@ -304,21 +308,30 @@
 			height: 88rpx;
 			line-height: 88rpx;
 			position: relative;
+			font-size: $font-size-28;
+			font-weight: bold;
 			border-bottom: 1px solid #EBEBEB;
 			.text{
 				font-size: $font-size-28;
 				color: $text-color;
 				font-weight: bold;
 			}
-			.iconfont{
-				width: 50rpx;
-				height: 88rpx;
-				line-height: 88rpx;
-				color: #999999;
-				display: block;
-				position: absolute;
-				right: 0;
-				top: 0;
+			.invoice-right{
+				float: right;
+				color: #2A81FF;
+				.text-l{
+					margin-right: 40rpx;
+				}
+				.iconfont{
+					width: 50rpx;
+					height: 88rpx;
+					line-height: 88rpx;
+					color: #999999;
+					display: block;
+					position: absolute;
+					right: 0;
+					top: 0;
+				}
 			}
 		}
 		.invoice-text{
@@ -381,9 +394,10 @@
 				align-items: flex-start;
 				font-size: $font-size-28;
 				color: $text-color;
-				background: #F7F7F7;
-				border-radius: 14rpx;
+				// background: #F7F7F7;
+				// border-radius: 14rpx;
 				margin-bottom: 20rpx;
+				border-bottom: 2rpx solid #e1e1e1;
 				.label{
 					height: 40rpx;
 					line-height: 40rpx;
@@ -676,4 +690,7 @@
 			}
 		}
 	}	
+	.placeholder{
+		color: #b2b2b2;
+	}
 </style>

+ 7 - 3
components/cm-module/creatOrder/sellerRegulations.vue

@@ -18,8 +18,8 @@
 					<view class="freight-radio">
 						<radio-group class="row-group" @change="radioChange">
 							<label class="row-input" v-for="(item, index) in regulaDatas" :key="index">
-								<view class="row-text" @click.stop="gotoConten(item.id)">{{item.name.length>10?item.name.substr(0,10)+'...':item.name}}</view>
-								<radio class="row-radio" :value="item.id" :checked="index === current" color="#E15616"/>
+								<view class="row-text" @click.stop="gotoConten(item.id)">{{item.name.length>10?item.name.substring(0,10)+'...':item.name}}</view>
+								<radio class="row-radio" :value="item.id" color="#E15616"/>
 							</label>
 						</radio-group>
 					</view>
@@ -57,7 +57,11 @@
 				this.clauseId = e.target.value;
 				this.regulaDatas.forEach((item,index)=>{
 					if(item.id==this.clauseId){
-						this.regulaText = item.name;
+						if(item.name.length>10){
+							this.regulaText = item.name.substr(0,10)+'...'
+						}else{
+							this.regulaText = item.name;
+						}
 					}
 				})
 			},

+ 237 - 129
pages/login/apply.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
 		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="register-main clearfix">
+		<view class="register-main title clearfix">
 			<view class="register-row none clearfix">
-				<view class="register-title first"><text>补充以下详细信息即可升级为会员机构,</text></view>
-				<view class="register-title"><text>享受更多更好的服务。</text></view>
+				<view class="register-title first"><text>补充以下详细信息即可升级为会员机构,享受更多更好的服务。</text></view>
+				<view class="register-title"><text></text></view>
 			</view>	
 		</view>	
 		<view class="register-main clearfix" v-if="clubStatus == 92">
@@ -20,26 +20,26 @@
 		<view class="register-main detailed clearfix">
 			<view class="register-row none clearfix">
 				<view class="register-from">
-					<view class="label">邮箱:</view>
-					<input class="row-input" type="text" name="input" v-model="registerEmail" placeholder="请输入您的常用邮箱" maxlength="30"/>
+					<view class="label">邮箱</view>
+					<input class="row-input" type="text" name="input" v-model="registerEmail" placeholder="请输入您的常用邮箱"placeholder-class="placeholder" maxlength="30"/>
 				</view>
 				<view class="register-tip"><text>提示:邮箱可用作登录账号,请使用公司邮箱或法人邮箱</text></view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">机构名称:</view>
-					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" maxlength="30"/>
+					<view class="label">机构名称</view>
+					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" placeholder-class="placeholder" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">机构简称:</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" maxlength="10"/>
+					<view class="label">机构简称</view>
+					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" placeholder-class="placeholder" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from"  @click="showMulLinkageThreePicker">
-					<view class="label">机构地址:</view>
+					<view class="label">机构地址</view>
 					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
 						{{addressData.address }}
 					</text>		
@@ -47,7 +47,7 @@
 				</view>
 			</view>
 			<view class="register-row text-textarea clearfix">
-				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{addressData.addressDetail ? addressData.addressDetail :'详细地址:如道路、门牌号、小区等'}}</view>
+				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus" >{{addressData.addressDetail ? addressData.addressDetail :'详细地址:如道路、门牌号、小区等'}}</view>
 				<textarea 	v-else
 							class="textarea" 
 							type="text" 
@@ -63,15 +63,17 @@
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
+					<view class="label">营业执照编号</view>
+					<input class="row-input code" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-picture">
-					<view class="label">营业执照:</view>
+					<view class="label">营业执照</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="uploadBusinessImage === ''"  @click="chooseBusinessImage">
+							<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/club-zizhi.png"></image>
+						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
 							<view class="upload-del" @click="delBusinessImage">
@@ -80,10 +82,14 @@
 						</view>
 					</view>
 				</view>
+			</view>
+			<view class="register-row clearfix">
 				<view class="register-picture">
-					<view class="label">门头照:</view>
+					<view class="label">门头照</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage === ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="uploadMentuzImage === ''" @click="chooseMentuzImage">
+							<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/club-zizhi.png"></image>
+						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
 							<view class="upload-del" @click="delMentuzImage">
@@ -94,33 +100,39 @@
 				</view>
 			</view>
 			<view class="register-row clearfix">
-				<view class="register-from picker">
-					<view class="label">机构类型:</view>
-					<view class="row-input picker" @click="bindPickerChange">{{ organizationTypeText }}</view>
-					<text class="iconfont icon-xiayibu"></text>
+				<view class="register-from picker noneborder">
+					<view class="label">机构类型</view>
+					<view class="row-input picker">
+						<radio-group @change="bindPickerChange">
+							 <label class="label-radio" v-for="(item, index) in typename" :key="item.value">
+								 <radio class="row-radio" :value="item.value" :checked="item.value === isOrganizationType" color='#E15616'/>{{item.name }}
+							 </label>
+						</radio-group>
+					</view>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from radio">
-					<radio-group @change="radioChange">
+				<view class="register-from noneborder">
+					<view class="secondTyperadio" v-for="(item,index) in beautyList" :key="item.value" @click="radioChange(item)" :class="item.value==secondClubType?'active':''">
+						<view class="secondRadio" >{{item.name}}</view>
+					</view>
+				</view>
+				<!-- <view class="register-from radio"> -->
+					<!-- <radio-group @change="radioChange">
 						<label class="row-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>
-					</radio-group>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-show="isDepartment">
-				<view class="register-from">
-					<view class="label">科室:</view>
-					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室,至少三个,用逗号隔开" maxlength="16"/>
-				</view>
+					</radio-group> -->
+				<!-- </view> -->
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-picture zz">
-					<view class="label zz">医疗执业许可证:</view>
+					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage === ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="uploadMedicalImage === ''" @click="chooseMedicalImage">
+							<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/club-zizhi.png"></image>
+							</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
 							<view class="upload-del" @click="delMedicalImage">
@@ -130,9 +142,15 @@
 					</view>
 				</view>
 			</view>
+			<view class="register-row clearfix" v-show="isDepartment">
+				<view class="register-from" style="height: auto;border: 0;">
+					<view class="kes-title" >科室</view>
+					<textarea class="keshi"  placeholder="请填写经营的科室,至少三个,用逗号隔开" placeholder-style="placeholder" v-model="department" maxlength="16"></textarea>
+				</view>
+			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
+				<view class="register-from group"style="height: auto;border: 0;">
+					<view class="label">主营内容</view>
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLike" >
 							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
@@ -142,28 +160,27 @@
 						</checkbox-group>
 					</view>	
 				</view>	
-				<view class="register-from group btn">
+				<!-- <view class="register-from group btn">
 					<view class="content-class btn">
 						<view class="item" @click="showAustomItem">
 							<text class="item-text">其他</text>
 						</view>
 					</view>
 				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
+				 v-show="isShowAustomItem"-->
+				<view class="register-from group btn" style="height: auto;border: 0;">
 					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
+						<input class="row-input other" type="text" v-model="customItemValue"  placeholder-style="placeholder" placeholder="请输入自定义项目" maxlength="5"/>
 						<button type="default" 
 								class="confirm-btn" 
-								:class="[isDisabled === true ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
 								@click.stop="addCustomItem"
 						>确认添加</button>
 					</view>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
+				<view class="register-from group" style="height: auto;border: 0;">
+					<view class="label">主营内容</view>
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLikes">
 							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
@@ -173,20 +190,19 @@
 						</checkbox-group>
 					</view>	
 				</view>	
-				<view class="register-from group btn">
+				<!-- <view class="register-from group btn" style="height: auto;border: 0;">
 					<view class="content-class btn">
 						<view class="item" @click="showAustomItem">
 							<text class="item-text">其他</text>
 						</view>
 					</view>
-				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
+				</view> 
+				v-show="isShowAustomItem"-->
+				<view class="register-from group btn" style="height: auto;border: 0;">
 					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
+						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  placeholder-style="placeholder" maxlength="5"/>
 						<button type="default" 
 								class="confirm-btn" 
-								:class="[isDisabled === true ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
 								@click.stop="addCustomItem"
 						>确认添加</button>
 					</view>
@@ -269,12 +285,16 @@
 					provinceID:'',		//省ID
 					addressDetail: '',	//地址详情
 				},
+				typename:[
+					{name:'医美',value:'1'},
+					{name:'生美',value:'2'}
+				],
 			}	
 		},
 		onLoad(option) {
 			this.clubStatus = option.clubStatus
 			console.log(this.clubStatus)
-			this.organizationInfo()
+			// this.organizationInfo()
 		},
 		methods:{
 			hanldNavigateBack(){
@@ -502,30 +522,31 @@
 					this.uploadMedicalImage = ''
 				})
 			},
-			bindPickerChange() {
-				let self = this
-				uni.showActionSheet({
-					title:'标题',
-					itemList: ['医美', '生美'],
-					success: (e) => {
-						self.isOrganizationType = e.tapIndex+1
-						switch(e.tapIndex){
-							case 0:
-								this.organizationTypeText = '医美'
-								break;
-							case 1:
-								this.organizationTypeText = '生美'
-								break;
-						}
-					}
-				})
+			bindPickerChange(e) {
+				this.isOrganizationType = e.target.value;
+				// let self = this
+				// uni.showActionSheet({
+				// 	title:'标题',
+				// 	itemList: ['医美', '生美'],
+				// 	success: (e) => {
+				// 		self.isOrganizationType = e.tapIndex+1
+				// 		switch(e.tapIndex){
+				// 			case 0:
+				// 				this.organizationTypeText = '医美'
+				// 				break;
+				// 			case 1:
+				// 				this.organizationTypeText = '生美'
+				// 				break;
+				// 		}
+				// 	}
+				// })
 			},
 			bindPickerChange2(e) {
 				this.typtIndex = e.target.value
 				this.isOrganizationType = e.target.value
 			},
-			radioChange(e) {
-				this.secondClubType = e.target.value;
+			radioChange(item) {
+				this.secondClubType = item.value;
 				if( this.secondClubType == '2' || this.secondClubType == '3'){
 					this.isDepartment = true
 				}else{
@@ -559,13 +580,13 @@
 				})
 				return arr.join('/')
 			},
-			onBlurInput(e){//
-				if(e.detail.value ===''){
-					this.isDisabled = true
-				}else{
-					this.isDisabled = false
-				}
-			},
+			// onBlurInput(e){//
+			// 	if(e.detail.value ===''){
+			// 		this.isDisabled = true
+			// 	}else{
+			// 		this.isDisabled = false
+			// 	}
+			// },
 			showAustomItem() {
 				this.isShowAustomItem = !this.isShowAustomItem
 			},
@@ -578,14 +599,36 @@
 				return _ARRAY
 			},
 			addCustomItem(){
-				if(this.isOrganizationType == 1){
-					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
-					this.mentuzCampList.push(item)
+				if(this.customItemValue==''){
+					this.$util.msg('请输入自定义项目',2000);
 				}else{
-					let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
-					this.medicaCampList.push(item)
+					if(this.isOrganizationType == 1){
+						let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
+						if(this.checkedArray(this.customItemValue,this.mentuzCampList)){
+							this.$util.msg('主营内容已存在!',2000)
+						}else{
+							this.mentuzCampList.push(item)
+						}
+					}else{
+						let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
+						if(this.checkedArray(this.customItemValue,this.medicaCampList)){
+							this.$util.msg('主营内容已存在!',2000)
+						}else{
+							this.medicaCampList.push(item)
+						}
+						
+					}
 				}
 			},
+			checkedArray(content,arr){//判断主营内容是否已存在
+			console.log(content,arr)
+					 for(var i in arr){
+							if(arr[i].name == content){
+								return true;
+							}
+						}
+			           return false;
+			       },
 		},
 		onShow() {
 			if(this.isPreviewImage){
@@ -597,17 +640,19 @@
 </script>
 
 <style lang="scss">
+	.placeholder{color:#b2b2b2 ;}
 	.register{
 		width: 100%;
 		height: auto;
 		border-top: 1px solid #F7F7F7;
-		background: #EFEFEF;
 		.register-main{
 			width: 100%;
 			height: auto;
 			background: #FFFFFF;
 			padding: 20rpx 0;
-			margin-bottom: 20rpx;
+			&.title{
+				background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);
+			}
 			&.detailed{
 				padding-bottom: 300rpx;
 			}
@@ -631,6 +676,21 @@
 				height: auto;
 				padding: 0 24rpx;
 				margin-bottom: 20rpx;
+				.secondTyperadio{
+					border: 2rpx solid #e1e1e1;
+					display: inline-block;
+					font-size: 26rpx;
+					color: #999999;
+					padding: 0 24rpx;
+					border-radius: 21rpx;
+					line-height: 42rpx;
+					margin-right: 56rpx;
+					float: right;
+					&.active{
+						border: 2rpx solid #ffe6dc;
+						color: $color-system;
+					}
+				}				
 				&.none{
 					margin-bottom: 0;
 				}
@@ -658,13 +718,13 @@
 				.register-tip{
 					line-height: 64rpx;
 					font-size: $font-size-24;
-					color: #CECECE;
+					color: #fea785;
 					text-align: left;
 				}
 				.register-title{
 					line-height: 44rpx;
 					font-size: $font-size-24;
-					color: $text-color;
+					color: $color-system;
 					text-align: left;
 				}
 				.row-btn{
@@ -682,6 +742,7 @@
 					background: #FFFFFF;
 					position: relative;
 					border-bottom: 1px solid #e1e1e1;
+					&.noneborder{border: none;}
 					.label{
 						text-align: left;
 						font-size: $font-size-28;
@@ -689,14 +750,20 @@
 						line-height: 88rpx;
 						float: left;
 					}
+					.kes-title{
+						font-size: $font-size-28;
+						color: #666666;
+						line-height: 88rpx;
+					}
 					.row-input{
-						width: 440rpx;
+						width: 520rpx;
 						padding-left:10rpx;
 						font-size: $font-size-28;
 						color: $text-color;
 						line-height: 88rpx;
-						float: left;
+						float: right;
 						height: 88rpx;
+						&.code{width: 500rpx;}
 						&.none{
 							color: #999999;
 						}
@@ -704,10 +771,15 @@
 							text-align: left;
 							color: #333333;
 						}
-						&.keshi{
-							width: 550rpx;
-						}
 					}
+					.keshi{
+							width: 678rpx;
+							border: 2rpx solid #b2b2b2;
+							border-radius: 6rpx;
+							height: 160rpx;
+							font-size: $font-size-28;
+							padding: 10rpx;
+						}
 					&.code{
 						width: 410rpx;
 						float: left;
@@ -732,9 +804,14 @@
 							text-align: center;
 							border-radius: 14rpx;
 							&.other{
-								width: 224rpx;
-								background: #F7F7F7;
+								width: 350rpx;
+								background: #FFF;
 								margin-right: 20rpx;
+								border: 2rpx solid #b2b2b2;
+								border-radius: 44rpx;
+								padding: 0 24rpx;
+								height: 64rpx;
+								line-height: 64rpx;
 							}
 							&.none{
 								background: #F7F7F7;
@@ -755,8 +832,12 @@
 						.label{
 							line-height: 88rpx;
 						}
+						.label-radio{margin-right: 70rpx;}
+						.row-radio{
+							transform: scale(.8);
+						}
 						.row-input{
-							width: 470rpx;
+							width: 500rpx;
 							height: 88rpx;
 							line-height: 88rpx;
 							padding-left: 30rpx;
@@ -782,7 +863,7 @@
 						}
 					}
 					&.group{
-						width: 654rpx;
+						width: 702rpx;
 						height: auto;
 						background: #FFFFFF;
 						margin-top: 30rpx;
@@ -828,36 +909,36 @@
 							color: $text-color;
 						}
 						.confirm-btn{
-							width: 200rpx;
-							height: 88rpx;
-							border-radius: 10rpx;
-							line-height: 88rpx;
+							width: 160rpx;
+							height: 64rpx;
+							border-radius: 45rpx;
+							line-height: 64rpx;
 							text-align: center;
+							background:#ffe6dc;
+							color: $color-system;
 							&.other{
 								width: 213rpx;
 							}
-							&.none{
-								color: #FFFFFF;
-								background: $btn-confirm;
-							}
-							&.disabled{
-								color: #999999;
-							}
+							// &.none{
+							// 	color: #FFFFFF;
+							// }
+							// &.disabled{
+							// 	color: #999999;
+							// }
 						}
 						.item {
-						  width: 155rpx;
+						  // width: 190rpx;
 						  height: 60rpx;
 						  font-size:$font-size-28;
 						  line-height: 60rpx;
 						  border-radius:10rpx;
-						  margin: 10rpx;
-						  text-align: center;
+						  margin-left: 40rpx;
 						  box-sizing: border-box;
-						  border: 1rpx solid #EFEFEF;
+						  // border: 1rpx solid #EFEFEF;
 						  float: left;
-						  checkbox {
-							display: none;
-						  }
+						 //  checkbox {
+							// display: none;
+						 //  }
 						}
 						.on {
 						  border-color: $color-system;
@@ -873,6 +954,7 @@
 					top: 0;
 					line-height: 88rpx;
 					text-align: center;
+					color: #b2b2b2;
 				}
 				&.text-textarea{
 					background: #FFFFFF;
@@ -895,49 +977,54 @@
 				}
 			}
 			.register-picture{
-				height: 102rpx;
+				// height: 102rpx;
 				margin: 30rpx 0;
-				width: 42%;
-				float: left;
+				// width: 42%;
+				// float: left;
 				&.zz{
 					width: 100%;
 				}
 				.label{
-					float: left;
+					// float: left;
 					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 102rpx;
-					width: 150rpx;
-					text-align: left;
+					// width: 150rpx;
+					// text-align: left;
 					&.zz{
 						width: 230rpx;
 					}
 				}
 				.upload-picture{
-					float: left;
-					height: 100rpx;
+					// float: left;
+					width: 200rpx;
+					height: 180rpx;
 					.upload-none{
-						width: 100rpx;
-						height: 100rpx;
+						width: 200rpx;
+						height: 180rpx;
 						text-align: center;
 						line-height: 100rpx;
 						color: #999999;
-						border: 1px solid #999999;
+						// border: 1px solid #999999;
 						border-radius: 10rpx;
-						margin: 0 20rpx;
-						.iconfont{
-							font-size: $font-size-28;
+						// margin: 0 20rpx;
+						// .iconfont{
+						// 	font-size: $font-size-28;
+						// }
+						image{
+							width: 100%;
+							height: 100%;
 						}
 					}
 					.upload-image{
-						width: 100rpx;
-						height: 100rpx;
+						width:200rpx;
+						height: 180rpx;
 						border-radius: 10rpx;
 						margin: 0 20rpx;
 						position: relative;
 						image{
-							width: 100rpx;
-							height: 100rpx;
+							width:100%;
+							height: 100%;
 							border-radius: 10rpx;
 						}
 						.upload-del{
@@ -1029,4 +1116,25 @@
 			}
 		}
 	}
+	checkbox .wx-checkbox-input{
+	  border-radius: 50%;
+	  width: 36rpx; 
+	  height: 36rpx;
+	}
+	/* 选中后的 背景样式 */
+	checkbox .wx-checkbox-input.wx-checkbox-input-checked{
+	  background: #E15616;
+	  border: 2rpx solid #e15616;
+	}
+	checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
+	  border-radius: 50%;
+	  width: 36rpx;
+	  height: 36rpx;
+	  line-height: 36rpx;
+	  text-align: center;
+	  font-size:20rpx; 
+	  color:#fff;
+	  transform:scale(.8);
+	  -webkit-transform:translate(-50%, -50%) scale(1);
+	}
 </style>

+ 181 - 84
pages/login/information.vue

@@ -8,7 +8,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">联系人</view>
-					<input class="row-input" type="text" v-model="clubContact" placeholder="请输入联系姓名" maxlength="6"/>
+					<input class="row-input" type="text" v-model="clubContact" placeholder="请输入联系姓名" placeholder-class="placeholder" maxlength="6"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -26,19 +26,19 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">邮箱</view>
-					<input class="row-input" type="text" name="input" v-model="email" placeholder="请输入邮箱地址" maxlength="30"/>
+					<input class="row-input" type="text" name="input" v-model="email" placeholder="请输入邮箱地址"placeholder-class="placeholder" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构名称</view>
-					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" maxlength="30"/>
+					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" placeholder-class="placeholder" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构简称</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" maxlength="10"/>
+					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" placeholder-class="placeholder" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -68,7 +68,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">营业执照编号</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
+					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码"placeholder-class="placeholder" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -104,33 +104,39 @@
 				</view>
 			</view>
 			<view class="register-row clearfix">
-				<view class="register-from picker">
+				<view class="register-from picker bordernone">
 					<view class="label">机构类型</view>
-					<view class="row-input picker" @click="bindPickerChange">{{ organizationTypeText }}</view>
-					<text class="iconfont icon-xiayibu"></text>
+					<view class="row-input">
+						<radio-group @change="bindPickerChange">
+							 <label class="label-radio" v-for="(item, index) in typename" :key="item.value">
+								 <radio class="row-radio" :value="item.value" :checked="item.value === isOrganizationType" color='#E15616'/>{{item.name }}
+							 </label>
+						</radio-group>
+					</view>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from radio">
+				<view class="register-from bordernone" >
+					<view class="secondTyperadio" v-for="(item,index) in beautyList" :key="item.value" @click="radioChange(item)" :class="item.value==secondClubType?'active':''">
+						<view class="secondRadio" >{{item.name}}</view>
+					</view>
+				</view>
+				<!-- <view class="register-from radio">
 					<radio-group @change="radioChange">
 						<label class="row-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>
 					</radio-group>
-				</view> 
-			</view>
-			<view class="register-row clearfix" v-show="isDepartment">
-				<view class="register-from">
-					<view class="label">科室</view>
-					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室,至少三个,用逗号隔开" maxlength="16"/>
-				</view>
+				</view> -->
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage == ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="uploadMedicalImage == ''||uploadMedicalImage == null" @click="chooseMedicalImage">
+							<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/club-zizhi.png"></image>
+						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
 							<view class="upload-del" @click="delMedicalImage">
@@ -140,8 +146,14 @@
 					</view>
 				</view>
 			</view>
+			<view class="register-row clearfix" v-show="isDepartment">
+				<view class="register-from bordernone" >
+					<view class="kes-title" >科室</view>
+					<textarea class="keshi"  placeholder="请填写经营的科室,至少三个,用逗号隔开" placeholder-style="placeholder" v-model="department" maxlength="16"></textarea>
+				</view>
+			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from group">
+				<view class="register-from group bordernone">
 					<view class="label">主营内容</view>
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLike" >
@@ -152,20 +164,19 @@
 						</checkbox-group>
 					</view>
 				</view>	
-				<view class="register-from group btn">
+				<!-- <view class="register-from group btn">
 					<view class="content-class btn">
 						<view class="item" @click="showAustomItem">
 							<text class="item-text">其他</text>
 						</view>
 					</view>
 				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
+				  v-show="isShowAustomItem"-->
+				<view class="register-from group btn">
 					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
+						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目" placeholder-class="placeholder" maxlength="5"/>
 						<button type="default" 
 								class="confirm-btn" 
-								:class="[isDisabled ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
 								@click.stop="addCustomItem"
 						>确认添加</button>
 					</view>
@@ -183,20 +194,19 @@
 						</checkbox-group>
 					</view>
 				</view>	
-				<view class="register-from group btn">
+				<!-- <view class="register-from group btn">
 					<view class="content-class btn">
 						<view class="item" @click="showAustomItem">
 							<text class="item-text">其他</text>
 						</view>
 					</view>
 				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
+				 v-show="isShowAustomItem"-->
+				<view class="register-from group btn" >
 					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
+						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目" placeholder-class="placeholder" maxlength="5"/>
 						<button type="default" 
 								class="confirm-btn" 
-								:class="[isDisabled ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
 								@click.stop="addCustomItem"
 						>确认添加</button>
 					</view>
@@ -216,13 +226,13 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">固定电话</view>
-					<input class="row-input" type="text" v-model="clubTelePhone" placeholder="请填写机构的固定电话" maxlength="15"/>
+					<input class="row-input" type="text" v-model="clubTelePhone" placeholder="请填写机构的固定电话" placeholder-class="placeholder" maxlength="15"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">传真</view>
-					<input class="row-input" type="text" v-model="clubFax" placeholder="请填写机构的传真" maxlength="15"/>
+					<input class="row-input" type="text" v-model="clubFax" placeholder="请填写机构的传真" placeholder-class="placeholder" maxlength="15"/>
 				</view>
 			</view>
 			<view class="register-row text-textarea clearfix">
@@ -312,6 +322,10 @@
 					provinceID:'',		//省ID
 					addressDetail: '',	//地址详情
 				},
+				typename:[
+					{name:'医美',value:'1'},
+					{name:'生美',value:'2'}
+				],
 			}	
 		},
 		onLoad(option) {
@@ -534,31 +548,32 @@
 					this.uploadMedicalImage = ''
 				})
 			},
-			bindPickerChange() {
-				let self = this
-				uni.showActionSheet({
-					title:'标题',
-					itemList: ['医美', '生美'],
-					success: (e) => {
-						self.isOrganizationType = e.tapIndex+1
-						switch(e.tapIndex){
-							case 0:
-								this.organizationTypeText = '医美'
-								break;
-							case 1:
-								this.organizationTypeText = '生美'
-								break;
-						}
-					}
-				})
+			bindPickerChange(e) {
+				this.isOrganizationType = e.target.value;
+				// let self = this
+				// uni.showActionSheet({
+				// 	title:'标题',
+				// 	itemList: ['医美', '生美'],
+				// 	success: (e) => {
+				// 		self.isOrganizationType = e.tapIndex+1
+				// 		switch(e.tapIndex){
+				// 			case 0:
+				// 				this.organizationTypeText = '医美'
+				// 				break;
+				// 			case 1:
+				// 				this.organizationTypeText = '生美'
+				// 				break;
+				// 		}
+				// 	}
+				// })
 			
 			},
 			bindPickerChange2(e) {
 				this.typtIndex = e.target.value
 				this.isOrganizationType = e.target.value
 			},
-			radioChange(e) {
-				this.secondClubType = e.target.value;
+			radioChange(item) {
+				this.secondClubType =item.value;
 				if( this.secondClubType == '2' || this.secondClubType == '3'){
 					this.isDepartment = true
 				}else{
@@ -611,14 +626,35 @@
 				return _ARRAY
 			},
 			addCustomItem(){
-				if(this.isOrganizationType == 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)
-				}
+				if(this.customItemValue==''){
+					this.$util.msg('请输入自定义项目',2000);
+					}else{
+						if(this.isOrganizationType == 1){
+							let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
+							if(this.checkedArray(this.customItemValue,this.mentuzCampList)){
+								this.$util.msg('主营内容已存在!',2000)
+							}else{
+								this.mentuzCampList.push(item)
+							}
+						}else{
+							let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
+							if(this.checkedArray(this.customItemValue,this.medicaCampList)){
+								this.$util.msg('主营内容已存在!',2000)
+							}else{
+								this.medicaCampList.push(item)
+							}
+						}
+					}
 			},
+			checkedArray(content,arr){//判断主营内容是否已存在
+			console.log(content,arr)
+					 for(var i in arr){
+							if(arr[i].name == content){
+								return true;
+							}
+						}
+			           return false;
+			       },
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
@@ -633,6 +669,7 @@
 </script>
 
 <style lang="scss">
+	.placeholder{color:#b2b2b2 ;}
 	.register{
 		width: 100%;
 		height: auto;
@@ -669,6 +706,21 @@
 				height: auto;
 				// padding: 0 24rpx;
 				margin-bottom: 20rpx;
+				.secondTyperadio{
+					border: 2rpx solid #e1e1e1;
+					display: inline-block;
+					font-size: 26rpx;
+					color: #999999;
+					padding: 0 24rpx;
+					border-radius: 21rpx;
+					line-height: 42rpx;
+					margin-right: 56rpx;
+					float: right;
+					&.active{
+						border: 2rpx solid #ffe6dc;
+						color: $color-system;
+					}
+				}	
 				.register-title{
 					line-height: 80rpx;
 					font-size: $font-size-30;
@@ -699,8 +751,17 @@
 					// border-radius: 14rpx;
 					position: relative;
 					border-bottom: 2rpx solid #e1e1e1;
+					.keshi{
+						width: 678rpx;
+						border: 2rpx solid #b2b2b2;
+						border-radius: 6rpx;
+						height: 160rpx;
+						font-size: $font-size-28;
+						padding: 10rpx;
+					}
 					&.bordernone{
 						border: none;
+						height: auto;
 					}
 					.label{
 						text-align: left;
@@ -709,6 +770,11 @@
 						line-height: 88rpx;
 						float: left;
 					}
+					.kes-title{
+						font-size: $font-size-28;
+						color: #666666;
+						line-height: 88rpx;
+					}
 					.row-input{
 						width: 520rpx;
 						padding-left:10rpx;
@@ -724,9 +790,7 @@
 							text-align: left;
 							color: #333333;
 						}
-						&.keshi{
-							width: 550rpx;
-						}
+						
 					}
 					&.code{
 						width: 410rpx;
@@ -752,9 +816,14 @@
 							text-align: center;
 							border-radius: 14rpx;
 							&.other{
-								width: 224rpx;
-								background: #F7F7F7;
+								width: 300rpx;
+								background: #FFF;
 								margin-right: 20rpx;
+								border: 2rpx solid #b2b2b2;
+								border-radius: 44rpx;
+								padding: 0 24rpx;
+								height: 64rpx;
+								line-height: 64rpx;
 							}
 							&.none{
 								background: #F7F7F7;
@@ -776,8 +845,12 @@
 						.label{
 							line-height: 88rpx;
 						}
+						.label-radio{margin-right: 70rpx;}
+						.row-radio{
+							transform: scale(.8);
+						}
 						.row-input{
-							width: 470rpx;
+							width: 500rpx;
 							height: 88rpx;
 							line-height: 88rpx;
 							padding-left: 30rpx;
@@ -805,10 +878,11 @@
 					}
 					&.group{
 						padding: 0 24rpx;
-						width: 654rpx;
+						width: 702rpx;
 						height: auto;
 						background: #FFFFFF;
 						margin-top: 30rpx;
+						border: 0;
 						.label{
 							line-height: 76rpx;
 						}
@@ -851,36 +925,38 @@
 							color: $text-color;
 						}
 						.confirm-btn{
-							width: 200rpx;
-							height: 88rpx;
+							width: 160rpx;
+							height: 64rpx;
 							border-radius: 10rpx;
-							line-height: 88rpx;
+							border-radius: 45rpx;
+							line-height: 64rpx;
 							text-align: center;
+							background: #ffe6dc;
+							color: $color-system;
 							&.other{
 								width: 213rpx;
 							}
-							&.none{
-								color: #FFFFFF;
-								background: $btn-confirm;
-							}
-							&.disabled{
-								color: #999999;
-							}
+							// &.none{
+							// 	color: #FFFFFF;
+							// 	background: $btn-confirm;
+							// }
+							// &.disabled{
+							// 	color: #999999;
+							// }
 						}
 						.item {
-						  width: 155rpx;
+						  // width: 155rpx;
 						  height: 60rpx;
 						  font-size:$font-size-28;
 						  line-height: 60rpx;
 						  border-radius:10rpx;
-						  margin: 10rpx;
-						  text-align: center;
+						  margin-left: 40rpx;
 						  box-sizing: border-box;
-						  border: 1rpx solid #EFEFEF;
+						  // border: 1rpx solid #EFEFEF;
 						  float: left;
-						  checkbox {
-							display: none;
-						  }
+						 //  checkbox {
+							// display: none;
+						 //  }
 						}
 						.on {
 						  border-color: $color-system;
@@ -974,14 +1050,14 @@
 						}
 					}
 					.upload-image{
-						width: 100rpx;
-						height: 100rpx;
+						width: 200rpx;
+						height: 180rpx;
 						border-radius: 10rpx;
 						margin: 0 20rpx;
 						position: relative;
 						image{
-							width: 100rpx;
-							height: 100rpx;
+							width: 100%;
+							height: 100%;
 							border-radius: 10rpx;
 						}
 						.upload-del{
@@ -1073,4 +1149,25 @@
 			}
 		}
 	}
+	checkbox .wx-checkbox-input{
+	  border-radius: 50%;
+	  width: 36rpx; 
+	  height: 36rpx;
+	}
+	/* 选中后的 背景样式 */
+	checkbox .wx-checkbox-input.wx-checkbox-input-checked{
+	  background: #E15616;
+	  border: 2rpx solid #e15616;
+	}
+	checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
+	  border-radius: 50%;
+	  width: 36rpx;
+	  height: 36rpx;
+	  line-height: 36rpx;
+	  text-align: center;
+	  font-size:20rpx; 
+	  color:#fff;
+	  transform:scale(.8);
+	  -webkit-transform:translate(-50%, -50%) scale(1);
+	}
 </style>

+ 1 - 1
seller/pages/order/order-details.vue

@@ -25,7 +25,7 @@
 			<!-- 退款记录 -->
 			<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
 			<view class="clause" @click="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
-				售后条款:<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
+				售后条款:<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name.length>10?clauseData.name.substr(0,10)+'...':clauseData.name}}</label>
 			</view>
 			<!-- 底部button -->
 			<order-button ref="orderButton" 

+ 2 - 2
services/ajax.env.js

@@ -1,10 +1,10 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

+ 41 - 30
supplier/pages/user/information.vue

@@ -6,11 +6,11 @@
 			</view>
 			<view class="info-from">
 				<view class="label">公司名称</view>
-				<input class="row-input" type="text"  v-model="params.name" placeholder="请与营业执照的注册名称保持一致" maxlength="30"/>
+				<input class="row-input" type="text"  v-model="params.name" placeholder="请与营业执照的注册名称保持一致" placeholder-class="placeholder" maxlength="30"/>
 			</view>
 			<view class="info-from">
 				<view class="label">公司简称</view>
-				<input class="row-input" type="text" v-model="params.sname" placeholder="请输入公司简称" maxlength="10"/>
+				<input class="row-input" type="text" v-model="params.sname" placeholder="请输入公司简称" placeholder-class="placeholder" maxlength="10"/>
 			</view>
 			<view class="info-from">
 				<view class="label">公司地址</view>
@@ -21,39 +21,39 @@
 					 <text class="iconfont icon-xiayibu"></text>
 				</view> 
 			</view>
-			<textarea value="" v-model="params.address"  placeholder="请填写详细地址,如街道/小区/门牌等" maxlength="50" class="address-details"/>
+			<textarea value="" v-model="params.address"  placeholder="请填写详细地址,如街道/小区/门牌等" maxlength="50" placeholder-class="placeholder" class="address-details"/>
 			<view class="info-from">
 				<view class="label">联系人</view>
-				<input class="row-input"  v-model="params.linkMan" type="text" placeholder="请输入联系人姓名" maxlength="6"/>
+				<input class="row-input"  v-model="params.linkMan" type="text" placeholder="请输入联系人姓名" placeholder-class="placeholder" maxlength="6"/>
 			</view>
 			<view class="info-from">
 				<view class="label">邮箱</view>
-				<input class="row-input" v-model="params.email" type="text" placeholder="请输入邮箱地址 " maxlength="6"/>
+				<input class="row-input" v-model="params.email" type="text" placeholder="请输入邮箱地址" placeholder-class="placeholder" maxlength="6"/>
 			</view>
 			 <text class="info-email">邮箱可用作登录账号,请使用公司邮箱或法人邮箱</text>
 			<view class="info-from">
 				<view class="label">固定电话</view>
-				<input class="row-input" v-model="params.contractPhone" type="text" placeholder="请在号码前加区 " maxlength="11"/>
+				<input class="row-input" v-model="params.contractPhone" type="text" placeholder="请在号码前加区" placeholder-class="placeholder" maxlength="11"/>
 			</view>
 			<view class="info-from">
 				<view class="label">传真</view>
-				<input class="row-input" v-model="params.fax" type="text" placeholder="请输入公司传真号 " />
+				<input class="row-input" v-model="params.fax" type="text" placeholder="请输入公司传真号" placeholder-class="placeholder"/>
 			</view>
 			<view class="info-from">
 				<view class="label">法人代表</view>
-				<input class="row-input" v-model="params.legalPerson" type="text" placeholder="请输入公司法人代表姓名 " maxlength="6"/>
+				<input class="row-input" v-model="params.legalPerson" type="text" placeholder="请输入公司法人代表姓名" placeholder-class="placeholder" maxlength="6"/>
 			</view>
 			<view class="info-from">
 				<view class="label">注册资本</view>
-				<input class="row-input"  v-model="params.registeredCapital" type="text" placeholder="请填写公司注册资本 " />
+				<input class="row-input"  v-model="params.registeredCapital" type="text" placeholder="请填写公司注册资本 " placeholder-class="placeholder" />
 			</view>
 			<view class="info-from">
 				<view class="label">公司性质</view>
-				<input class="row-input" v-model="params.nature" type="text" placeholder="请填写公司性质 " />
+				<input class="row-input" v-model="params.nature" type="text" placeholder="请填写公司性质" placeholder-class="placeholder"/>
 			</view>
 			<view class="info-from">
 				<view class="label">年营业额</view>
-				<input class="row-input" v-model="params.turnover" type="text" placeholder="请输入公司年营业额  " />
+				<input class="row-input" v-model="params.turnover" type="text" placeholder="请输入公司年营业额" placeholder-class="placeholder"/>
 			</view>
 		</view>
 		
@@ -102,7 +102,7 @@
 								</label>
 					 </checkbox-group>
 					 <view class="addbusiness">
-					 	<input class="row-input other" type="text" placeholder="请输入自定义项目"  v-model="mainProEdit" maxlength="5"/>
+					 	<input class="row-input other" type="text" placeholder="请输入自定义项目"  v-model="mainProEdit"placeholder-class="placeholder" maxlength="5"/>
 					 	<button type="default" class="button" @click.stop="mainProAdd">确认添加</button>
 					 </view>
 				</view>
@@ -117,18 +117,18 @@
 							</label>
 					   </checkbox-group>
 					 <view class="addbusiness">
-					 	<input class="row-input other" type="text" placeholder="请输入自定义经营范围" v-model="shopScopeEdit" maxlength="5"/>
+					 	<input class="row-input other" type="text" placeholder="请输入自定义经营范围" v-model="shopScopeEdit" placeholder-class="placeholder" maxlength="5"/>
 					 	<button type="default" class="button" @click.stop="shopScopeAdd">确认添加</button>
 					 </view>
 				</view>
 			</view>
 			<view class="info">
 				<view class="info2-title">公司介绍</view>
-				 <textarea  v-model="params.info"  maxlength="2000" placeholder="公司简介会在公司介绍页面展示,有助于机构更好的了解您, 建议从个人规模、代理产品、机构服务、荣誉资质这4方面进行介绍" name="textarea"/>
+				 <textarea  v-model="params.info"  maxlength="2000" placeholder="公司简介会在公司介绍页面展示,有助于机构更好的了解您, 建议从个人规模、代理产品、机构服务、荣誉资质这4方面进行介绍" placeholder-class="placeholder" name="textarea"/>
 			</view>
 			<view class="info">
 				<view class="info2-title">主打系列商品说明</view>
-				 <textarea placeholder="请输入主打系列商品说明" v-model="params.productDesc" maxlength="500" name="textarea"/>
+				 <textarea placeholder="请输入主打系列商品说明" v-model="params.productDesc" maxlength="500" placeholder-class="placeholder" name="textarea"/>
 			</view>
 		</view>
 		
@@ -138,7 +138,7 @@
 			</view>
 			<view class="info-from">
 				<view class="label Code">营业执照编号</view>
-				<input class="row-input Code" v-model.trim="params.socialCreditCode" type="text" placeholder="请输入公司营业执照编号" maxlength="18"/>
+				<input class="row-input Code" v-model.trim="params.socialCreditCode" type="text" placeholder="请输入公司营业执照编号" placeholder-class="placeholder" maxlength="18"/>
 			</view>
 			<view class="zizhi">
 				<view class="info2-title zizhi-title">营业执照图片</view>
@@ -704,6 +704,9 @@
 			font-weight: bold;
 		}
 	}
+	.placeholder{
+		 color: #b2b2b2;
+	}
 	.info-from{
 		width: 702rpx;
 		height: 90rpx;
@@ -836,37 +839,45 @@
 				}
 			 }
 			 .formLine-file{
-					width: 270rpx;
-					height: 200rpx;
+					width:200rpx;
+					height: 180rpx;
 					display: inline-block;
 				 .file-zizhi{
-					background: url('https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/icon-zizhi.png') no-repeat;
-					width: 270rpx;
-					height: 200rpx;
+					background: url('http://static-b.caimei365.com/app/img/upload/club-yiliao.png') no-repeat;
+					width:100%;
+					height:100%;
+					background-size: 100%;
 				 }
 				 .iconImage{
-					width: 256rpx;
-					height:180rpx; 
+					width: 100%;
+					height:100%; 
 					&.file-biss{
-						background: url('https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/icon-business(1).png') no-repeat;
+						background: url('http://static-b.caimei365.com/app/img/upload/club-zizhi.png') no-repeat;
+						background-size: 100%;
 						}
 					&.file-logo{
-						background: url('https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/icon-logo.png') no-repeat;
+						background: url('http://static-b.caimei365.com/app/img/upload/icon-logo.png') no-repeat;
+						background-size: 100%;
 						}
 					&.file-produce{
-						background: url('https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/icon-produce.png') no-repeat;
+						background: url('http://static-b.caimei365.com/app/img/upload/icon-produce.png') no-repeat;
+						background-size: 100%;
 						}
 					&.file-health{
-						background: url('https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/icon-health.png') no-repeat;
+						background: url('http://static-b.caimei365.com/app/img/upload/icon-health.png') no-repeat;
+						background-size: 100%;
 						}
 					&.file-tax{
-						background: url('https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/icon-tax.png') no-repeat;
+						background: url('http://static-b.caimei365.com/app/img/upload/icon-tax.png') no-repeat;
+						background-size: 100%;
 						}
 					&.file-honor{
-						background: url('https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/icon-honor.png') no-repeat;
+						background: url('http://static-b.caimei365.com/app/img/upload/icon-honor.png') no-repeat;
+						background-size: 100%;
 						}
 					&.file-product{
-						background: url('https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/icon-product.png') no-repeat;
+						background: url('http://static-b.caimei365.com/app/img/upload/icon-product.png') no-repeat;
+						background-size: 100%;
 						}
 						
 				 }