commit-m 4月小需求

pages/login/apply-supplier.vue

@@ -382,6 +382,12 @@
 					this.$util.msg('请选择主营内容',2000);
 					return
 				}
+				if(this.shopInfo.website){
+					if(!this.$reg.isWebsite(this.shopInfo.website)){
+						this.$util.msg('请输入正确的网站地址',2000);
+						return
+					}
+				}
 				if(this.shopInfo.isAgreed == 0){
 					this.$util.msg('请勾选同意协议',2000);
 					return
@@ -934,14 +940,21 @@
 					background: #FFFFFF;
 					.textarea{
 						width: 100%;
-						height: 180rpx;
-						padding: 24rpx;
+						min-height: 280rpx;
+						padding: 24rpx 0;
 						box-sizing: border-box;
 						font-size: $font-size-28;
 						color: $text-color;
 						z-index: 1;
 						border-bottom: 1px solid #e1e1e1;
 					}
+					.label{
+						text-align: left;
+						font-size: $font-size-28;
+						color:#666666;
+						line-height: 48rpx;
+						float: left;
+					}
 					.textarea.hide{
 						opacity: 0;
 					}

pages/login/login.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container login" v-if="isWxAuthorize">
+	<view class="container login">
 		<view class="login-main">
 			<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
 		</view>

pages/login/register-supplier.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}" v-if="isWxAuthorize">
+	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
 		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="register-step">
 			<view class="step-item" :class="stepIndex == 0 ? 'active' : ''">
@@ -68,7 +68,6 @@
 				<view class="register-btn" @click.stop="SupplierRegisteredFirst">下一步</view>
 			</view>
 		</view>	
-		
 		<view class="register-main clearfix" v-if="stepIndex === 1">
 			<view class="register-row clearfix">
 				<view class="register-from">
@@ -505,10 +504,10 @@
 					this.$util.msg('请填写统一社会信用代码',2000);
 					return
 				}
-				// if( !this.threeParmas.businessLicense){
-				// 	this.$util.msg('请上传您的营业执照',2000);
-				// 	return
-				// }
+				if( !this.threeParmas.businessLicense){
+					this.$util.msg('请上传您的营业执照',2000);
+					return
+				}
 				if(this.threeParmas.firstShopType == 0){
 					this.$util.msg('请选择公司类型',2000);
 					return
@@ -517,6 +516,12 @@
 					this.$util.msg('请选择主营内容',2000);
 					return
 				}
+				if(this.threeParmas.website){
+					if(!this.$reg.isWebsite(this.twoParmas.website)){
+						this.$util.msg('请输入正确的网站地址',2000);
+						return
+					}
+				}
 				if(this.threeParmas.isAgreed == 0){
 					this.$util.msg('请勾选同意协议',2000);
 					return
@@ -1070,14 +1075,21 @@
 					background: #FFFFFF;
 					.textarea{
 						width: 100%;
-						height: 180rpx;
-						padding: 24rpx;
+						min-height: 280rpx;
+						padding: 24rpx 0;
 						box-sizing: border-box;
 						font-size: $font-size-28;
 						color: $text-color;
 						z-index: 1;
 						border-bottom: 1px solid #e1e1e1;
 					}
+					.label{
+						text-align: left;
+						font-size: $font-size-28;
+						color:#666666;
+						line-height: 48rpx;
+						float: left;
+					}
 					.textarea.hide{
 						opacity: 0;
 					}

seller/pages/order/order-details.vue

@@ -11,7 +11,7 @@
 					
 			</view>
 			<!-- 地址选择 -->
-			<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
+			<order-address ref="orderAddress" v-if="isRequest && !rechargeGoods" :addressData="addressData"></order-address>
 			<!-- 商品 -->
 			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" :information="information" @popupClick="hanldePopupFn"></goods-list>
 			<!-- 订单信息 -->

supplier/pages/user/information.vue

@@ -122,6 +122,18 @@
 					 </view>
 				</view>
 			</view>
+			<view class="info input">
+				<view class="label">网站地址:</view>
+				<input class="row-input" v-model="params.website" type="text" placeholder="请输入公司网站地址" placeholder-class="placeholder" maxlength="100"/>
+			</view>
+			<view class="info input">
+				<view class="label">微信公众号:</view>
+				<input class="row-input" v-model="params.wxOfficialAccount" type="text" placeholder="请输入公司微信公众号" placeholder-class="placeholder" maxlength="20"/>
+			</view>
+			<view class="info input">
+				<view class="label">微信小程序:</view>
+				<input class="row-input" v-model="params.wxApplets" type="text" placeholder="请输入公司微信小程序名称" placeholder-class="placeholder" maxlength="20"/>
+			</view>
 			<view class="info">
 				<view class="info2-title">公司介绍</view>
 				 <textarea  v-model="params.shopDesc"  maxlength="2000" placeholder="公司简介会在公司介绍页面展示，有助于机构更好的了解您， 建议从个人规模、代理产品、机构服务、荣誉资质这4方面进行介绍" placeholder-class="placeholder" name="textarea"/>
@@ -312,6 +324,9 @@
 					medicalPracticeLicense:'',//资质
 					mainProduct:'',//主营产品
 					businessScope:'',//经营内容
+					website:'',//网站地址
+					wxOfficialAccount:'',//微信公众号
+					wxApplets:'',//微信小程序
 					shopDesc:'',//公司介绍
 					mainProductDesc:'',//主打说明
 					medicalPracticeLicense:'',//三级器械/医疗执照
@@ -391,6 +406,9 @@
 						this.params.email = user.email;
 						this.addressData.address =  shop.provincialAddress;
 						this.params.address = shop.address;
+						this.params.website = shop.website
+						this.params.wxOfficialAccount = shop.wxOfficialAccount
+						this.params.wxApplets = shop.wxApplets
 						this.params.provinceId = shop.provinceId;
 						this.params.cityId = shop.cityId;
 						this.params.townId = shop.townId;
@@ -443,82 +461,109 @@
 				if(this.params.name==''||this.params.name==null){
 					this.$util.msg('请输入公司名称',2000);
 					return
-				}else if(this.params.townId==''||this.params.townId==null){
+				}
+				if(this.params.townId==''||this.params.townId==null){
 					this.$util.msg('请选择联系地址',2000);
 					return
-				}else if(this.params.address==''||this.params.address==null){
+				}
+				if(this.params.address==''||this.params.address==null){
 					this.$util.msg('请输入正确的联系地址',2000);
 					return
-				}else if(this.params.linkMan==''||this.params.linkMan==null){
+				}
+				if(this.params.linkMan==''||this.params.linkMan==null){
 					this.$util.msg('请输入正确的联系人姓名',2000);
 					return
-				}else if(this.params.legalPerson==''||this.params.legalPerson==null){
+				} 
+				if(this.params.legalPerson==''||this.params.legalPerson==null){
 					this.$util.msg('请输入法人代表姓名',2000);
 					return
-				}else if(this.params.registeredCapital==''||this.params.registeredCapital==null){
+				} 
+				if(this.params.registeredCapital==''||this.params.registeredCapital==null){
 					this.$util.msg('请输入注册资本',2000);
 					return
-				}else if(this.params.companyNature==''||this.params.companyNature==null){
+				} 
+				if(this.params.companyNature==''||this.params.companyNature==null){
 					this.$util.msg('请输入公司性质',2000);
 					return
-				}else if(this.params.turnover==''||this.params.turnover==null){
+				} 
+				if(this.params.turnover==''||this.params.turnover==null){
 					this.$util.msg('请输入年营业额',2000);
 					return
-				}else if(this.params.firstShopType==''||this.params.firstShopType==null){
+				} 
+				if(this.params.firstShopType==''||this.params.firstShopType==null){
 					this.$util.msg('请选择公司类型',2000);
 					return
-				}else if(this.params.firstShopType==1 && this.params.secondShopType==""){
+				}
+				if(this.params.firstShopType==1 && this.params.secondShopType==""){
 					this.$util.msg('请选择公司类型',2000);
 					return
-				}else if(this.params.mainProduct==''||this.params.mainProduct==null){
+				}
+				if(this.params.mainProduct==''||this.params.mainProduct==null){
 					this.$util.msg('请选择主营内容',2000);
 					return
-				}else if(this.params.businessScope==''||this.params.businessScope==null){
+				}
+				if(this.params.businessScope==''||this.params.businessScope==null){
 					this.$util.msg('请选择经营内容',2000);
 					return
-				}else if(this.params.shopDesc==''||this.params.shopDesc==null){
+				} 
+				if(this.params.website){
+					if(!this.$reg.isWebsite(this.params.website)){
+						this.$util.msg('请输入正确的网站地址',2000);
+						return
+					}
+				}
+				if(this.params.shopDesc==''||this.params.shopDesc==null){
 					this.$util.msg('请填写公司介绍',2000);
 					return
-				}else if(this.params.mainProductDesc==''||this.params.mainProductDesc==null){
+				}
+				if(this.params.mainProductDesc==''||this.params.mainProductDesc==null){
 					this.$util.msg('请填系列商品说明',2000);
 					return
-				}else if(this.params.socialCreditCode==''||this.params.socialCreditCode==null){
+				}
+				
+				if(this.params.socialCreditCode==''||this.params.socialCreditCode==null){
 					this.$util.msg('请输入正确的统一社会信用代码',2000);
 					return
-				}else if(this.params.businessLicense==''||this.params.businessLicense==null){
+				}
+				if(this.params.businessLicense==''||this.params.businessLicense==null){
 					this.$util.msg('请上传营业执照图片',2000);
 					return
-				}else if(this.params.logo==''||this.params.logo==null){
+				}
+				if(this.params.logo==''||this.params.logo==null){
 					this.$util.msg('请上传公司logo',2000);
 					return
-				}else if(this.params.operationLicence==''||this.params.operationLicence==null){
+				}
+				if(this.params.operationLicence==''||this.params.operationLicence==null){
 					this.$util.msg('请上传生产许可证',2000);
 					return
-				}else if(this.params.hygienicLicense==''||this.params.hygienicLicense==null){
+				}
+				if(this.params.hygienicLicense==''||this.params.hygienicLicense==null){
 					this.$util.msg('请上传卫生许可证',2000);
 					return
-				}else if(this.params.taxLicense==''||this.params.taxLicense==null){
+				}
+				if(this.params.taxLicense==''||this.params.taxLicense==null){
 					this.$util.msg('请上传税务许可证',2000);
 					return
-				}else if(this.params.honorCertification==''||this.params.honorCertification==null){
+				}
+				if(this.params.honorCertification==''||this.params.honorCertification==null){
 					this.$util.msg('请上传荣誉证书',2000);
 					return
-				}else if(this.params.productCertification==''||this.params.productCertification==null){
+				}
+				if(this.params.productCertification==''||this.params.productCertification==null){
 					this.$util.msg('请上传产品证书',2000);
 					return
-				}else{
-					this.UserService.SupplierModifiedData(this.params).then(res=>{
-						if(res.code === 0){
-							  this.$util.msg('保存成功',2000,true,'success')
-							  setTimeout(()=>{
-								uni.navigateBack();
-							  },2000)
-						} else {
-							this.$util.msg(res.msg,2000);
-							this.loginLoading = false;
-						}
-					})
 				}
+				this.UserService.SupplierModifiedData(this.params).then(res=>{
+					if(res.code === 0){
+						  this.$util.msg('保存成功',2000,true,'success')
+						  setTimeout(()=>{
+							uni.navigateBack();
+						  },2000)
+					} else {
+						this.$util.msg(res.msg,2000);
+						this.loginLoading = false;
+					}
+				})
 			},
 			 mainProAdd(){//添加主营内容
 					if (this.mainProEdit.length>0) {
@@ -1030,6 +1075,32 @@
 	 }
 	 .info{
 		 margin: 20rpx 0;
+		&.input{
+			width: 702rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			border-bottom: 2rpx solid #e1e1e1;
+			margin: auto;
+			position: relative;
+			.label{
+				width: 150rpx;
+				text-align: left;
+				font-size: $font-size-28;
+				color: #666666;
+				line-height: 90rpx;
+				float: left;
+			}
+			.row-input{
+				width: 490rpx;
+				padding-left:10rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				line-height: 90rpx;
+				float: left;
+				height: 90rpx;
+				margin-left: 50rpx;
+			}
+		}
 		 textarea{
 			width: 680rpx;
 			height: 200rpx;