Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

components/cm-module/productDetails/secondRecommend.vue

@@ -71,7 +71,6 @@
 
 <style lang="scss">	
 .recommend{
-	background: #FFFFFF;
 	width: 100%;
 	.recommend-empty{
 		width: 702rpx;

second/pages/form/introduce.vue

@@ -303,7 +303,7 @@ page{
 	display: none !important;
 }
 .top_title view:nth-child(1){
-	margin-right: 20rpx;
+	// margin-right: 20rpx;
 	width: 104rpx;
 	height: 92rpx;
 }

seller/pages/order/order-list.vue

@@ -93,7 +93,6 @@
 											  :status="order.status" 
 											  :orderID="order.orderID" 
 											  :userID = "order.userID"
-											  :serviceProviderId = "serviceProviderId"
 											  :secondHandOrderFlag = "order.secondHandOrderFlag"
 											  @buttonConfirm="handButtonConfirm">
 								</order-button>

supplier/pages/user/information.vue

@@ -66,20 +66,20 @@
 				<view class="row-input ShopTyperadio">
 				 <radio-group @change="radioChange">
 					 <label class="radio" v-for="(item, index) in typename" :key="item.value">
-						 <radio :value="item.value" :checked="item.value === params.firstShopType" color='#E15616'/>{{item.name}}
+						 <radio :value="item.value" :checked="item.value == params.firstShopType" color='#E15616'/>{{item.name}}
 					 </label>
 				 </radio-group>
 				 </view>
 			</view>
-			<view class="secondTyperadio"  v-if="isfirstShow" >
+			<view class="secondTyperadio"  v-if="params.firstShopType==1" >
 				 <view class="radio" v-for="(item,index) in secondtype" :key="index" @click="secondypeRidio(item)" :class="item.value==params.secondShopType?'active':''">
 				 	<view class="secondRadio" >{{item.name}}</view>
 				 </view>
 			</view>
-			<view class="zizhi" v-if="issecondshow">
+			<view class="zizhi" v-if="params.secondShopType==3">
 				<view class="info2-title zizhi-title">资质</view>
 				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.medicalPracticeLicenseImg1!=''">
+					 <view class="form-upload-image"  v-if="params.medicalPracticeLicenseImg1!=''&&params.medicalPracticeLicenseImg1!=null">
 						   <image class="upload-img" :src="params.medicalPracticeLicenseImg1" alt="" ></image>
 						   <view class="iconfont icon-shanchu1" @click="deleteMedicalImage()"></view>
 					 </view>
@@ -143,7 +143,7 @@
 			<view class="zizhi">
 				<view class="info2-title zizhi-title">营业执照图片</view>
 				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.businessLicenseImage!=''">
+					 <view class="form-upload-image"  v-if="params.businessLicenseImage!=''&&params.businessLicenseImage!=null">
 						   <image class="upload-img" :src="params.businessLicenseImage" @click="showViewerImageFn()" ></image>
 						   <view class="iconfont icon-shanchu1" @click="deleteBusinessImage()"></view>
 					 </view>
@@ -155,7 +155,7 @@
 			<view class="zizhi">
 				<view class="info2-title zizhi-title">公司LOGO</view>
 				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.logo!=''">
+					 <view class="form-upload-image"  v-if="params.logo!=''&&params.logo!=null">
 						   <image class="upload-img" :src="params.logo" alt="" @click="showViewerImageFn1()"></image>
 						   <view class="iconfont icon-shanchu1"  @click="deletelogoImage()"></view>
 					 </view>
@@ -167,7 +167,7 @@
 			<view class="zizhi">
 				<view class="info2-title zizhi-title">生产许可证</view>
 				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.productionLicence!=''">
+					 <view class="form-upload-image"  v-if="params.productionLicence!=''&&params.productionLicence!=null">
 						   <image class="upload-img" :src="params.productionLicence" alt="" @click="showViewerImageFn2()"></image>
 						   <view class="iconfont icon-shanchu1" @click="deleteproducImage()"></view>
 					 </view>
@@ -179,7 +179,7 @@
 			<view class="zizhi">
 				<view class="info2-title zizhi-title">卫生许可证</view>
 				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.hygienicLicense!=''">
+					 <view class="form-upload-image"  v-if="params.hygienicLicense!=''&&params.hygienicLicense!=null">
 						   <image class="upload-img" :src="params.hygienicLicense" alt="" @click="showViewerImageFn3()"></image>
 						   <view class="iconfont icon-shanchu1" @click="deletehygienicImage()"></view>
 					 </view>
@@ -191,7 +191,7 @@
 			<view class="zizhi">
 				<view class="info2-title zizhi-title">税务许可证</view>
 				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.taxLicense!=''">
+					 <view class="form-upload-image"  v-if="params.taxLicense!=''&&params.taxLicense!=null">
 						   <image class="upload-img" :src="params.taxLicense" alt="" @click="showViewerImageFn4()"></image>
 						   <view class="iconfont icon-shanchu1" @click="deletaxImage()"></view>
 					 </view>
@@ -410,13 +410,12 @@
 						this.params.productionLicence = shop.productionLicence;
 						this.params.hygienicLicense = shop.hygienicLicense;
 						this.params.taxLicense = shop.taxLicense;
-						this.params.certificateHonor = shop.hygienicLicense;
 						this.HonorImagesList = response.data.certificateHonor;
 						this.productImagesList = response.data.productCertification;
-						if( response.data.certificateHonor!=''|| response.data.certificateHonor!=null){
+						if( response.data.certificateHonor!=''&& response.data.certificateHonor!=null){
 							this.params.certificateHonor =this.HonorImagesList.toString()+',';
 						}
-						if( response.data.productCertification!=''|| response.data.productCertification!=null){
+						if( response.data.productCertification!=''&& response.data.productCertification!=null){
 							this.params.productCertification =this.productImagesList.toString()+',';
 						}
 						if(shop.mainpro == "" || shop.mainpro == null){
@@ -437,72 +436,70 @@
 			 },
 			shopSubmit(){//提交修改
 				console.log(this.params);
-				if(this.params.name==''){
+				if(this.params.name==''||this.params.name==null){
 					this.$util.msg('请输入公司名称',2000);
 					return
-				}else if(this.params.townID==''){
+				}else if(this.params.townID==''||this.params.townID==null){
 					this.$util.msg('请选择联系地址',2000);
 					return
-				}else if(this.params.address==''){
+				}else if(this.params.address==''||this.params.address==null){
 					this.$util.msg('请输入正确的联系地址',2000);
 					return
-				}else if(this.params.linkMan==''){
+				}else if(this.params.linkMan==''||this.params.linkMan==null){
 					this.$util.msg('请输入正确的联系人姓名',2000);
 					return
-				}else if(this.params.legalPerson==''){
+				}else if(this.params.legalPerson==''||this.params.legalPerson==null){
 					this.$util.msg('请输入法人代表姓名',2000);
 					return
-				}else if(this.params.registeredCapital==''){
+				}else if(this.params.registeredCapital==''||this.params.registeredCapital==null){
 					this.$util.msg('请输入注册资本',2000);
 					return
-				}else if(this.params.nature==''){
+				}else if(this.params.nature==''||this.params.nature==null){
 					this.$util.msg('请输入公司性质',2000);
 					return
-				}else if(this.params.turnover==''){
+				}else if(this.params.turnover==''||this.params.turnover==null){
 					this.$util.msg('请输入年营业额',2000);
 					return
-				}else if(this.params.firstShopType==''){
+				}else if(this.params.firstShopType==''||this.params.firstShopType==null){
 					this.$util.msg('请选择公司类型',2000);
 					return
-				}else if(this.params.firstShopType==1){
-					if(this.params.secondShopType==""){
-						this.$util.msg('请选择公司类型',2000);
-						return
-					}
-				}else if(this.params.mainpro==''){
+				}else if(this.params.firstShopType==1 && this.params.secondShopType==""){
+					this.$util.msg('请选择公司类型',2000);
+					return
+				}else if(this.params.mainpro==''||this.params.mainpro==null){
 					this.$util.msg('请选择主营内容',2000);
 					return
-				}else if(this.params.businessScope==''){
+				}else if(this.params.businessScope==''||this.params.businessScope==null){
 					this.$util.msg('请选择经营内容',2000);
 					return
-				}else if(this.params.info==''){
+				}else if(this.params.info==''||this.params.info==null){
 					this.$util.msg('请填写公司介绍',2000);
 					return
-				}else if(this.params.productDesc==''){
+				}else if(this.params.productDesc==''||this.params.productDesc==null){
 					this.$util.msg('请填系列商品说明',2000);
 					return
-				}else if(this.params.socialCreditCode==''){
+				}else if(this.params.socialCreditCode==''||this.params.socialCreditCode==null){
 					this.$util.msg('请输入正确的统一社会信用代码',2000);
 					return
-				}else if(this.params.businessLicenseImage==''){
+				}else if(this.params.businessLicenseImage==''||this.params.businessLicenseImage==null){
 					this.$util.msg('请上传营业执照图片',2000);
 					return
-				}else if(this.params.logo==''){
+				}else if(this.params.logo==''||this.params.logo==null){
 					this.$util.msg('请上传公司logo',2000);
 					return
-				}else if(this.params.productionLicence==''){
+				}else if(this.params.productionLicence==''||this.params.productionLicence==null){
 					this.$util.msg('请上传生产许可证',2000);
 					return
-				}else if(this.params.hygienicLicense==''){
+				}else if(this.params.hygienicLicense==''||this.params.hygienicLicense==null){
 					this.$util.msg('请上传卫生许可证',2000);
 					return
-				}else if(this.params.taxLicense==''){
+				}else if(this.params.taxLicense==''||this.params.taxLicense==null){
 					this.$util.msg('请上传税务许可证',2000);
 					return
-				}else if(this.params.certificateHonor==''){
+				}else if(this.params.certificateHonor==''||this.params.certificateHonor==null){
 					this.$util.msg('请上传荣誉证书',2000);
 					return
-				}else if(this.params.productCertification==''){
+				}else if(this.params.productCertification==''||this.params.productCertification==null){
 					this.$util.msg('请上传产品证书',2000);
 					return
 				}else{
@@ -551,11 +548,11 @@
 			        },
 			radioChange(e){
 				this.params.firstShopType = e.target.value;
-				if (e.target.value==1){
-					this.isfirstShow = true;
-				}else {
-					this.isfirstShow = false;
-				}
+				// if (e.target.value==1){
+				// 	this.isfirstShow = true;
+				// }else {
+				// 	this.isfirstShow = false;
+				// }
 				console.log(e.target.value)
 			},
 			showViewerImageFn6(e) {//预览产品
@@ -665,11 +662,11 @@
 			 },
 			secondypeRidio(item){
 				this.params.secondShopType = item.value;
-				if (item.value==3){
-				this.issecondshow = true;
-				}else {
-				 this.issecondshow = false;
-				}
+				// if (item.value==3){
+				// this.issecondshow = true;
+				// }else {
+				//  this.issecondshow = false;
+				// }
 			},
 			showMulLinkageThreePicker() {//三级地址联动
 				this.isShowInput = true
@@ -810,13 +807,14 @@
 				 display: flex;
 				 overflow-x: auto;
 				 flex-shrink: 0;
-				 padding-top: 20rpx;
+				 padding-top: 15rpx;
+				 
 				 max-width: 702rpx;
 				 .formLine-file{
 					 float: left;
 					 display: flex;
 					 flex-shrink: 0;
-					 margin-right: 15rpx;
+					 margin:15rpx 15rpx 15rpx 0rpx;
 				 }
 				 .form-upload-image{
 					  float: left;
@@ -824,7 +822,7 @@
 					  flex-shrink: 0;
 					  position: relative;
 					  display: inline-block;
-					  margin-right:15rpx;
+					  margin:15rpx 15rpx 15rpx 0rpx;
 					  display: flex;
 					  align-items: center;
 				 }
@@ -853,38 +851,38 @@
 					background: url('http://static-b.caimei365.com/app/img/upload/club-yiliao.png') no-repeat;
 					width:100%;
 					height:100%;
-					background-size: 100%;
+					background-size: 100% 100%;
 				 }
 				 .iconImage{
 					width: 100%;
 					height:100%; 
 					&.file-biss{
 						background: url('http://static-b.caimei365.com/app/img/upload/club-zizhi.png') no-repeat;
-						background-size: 100%;
+						background-size: 100% 100%;
 						}
 					&.file-logo{
 						background: url('http://static-b.caimei365.com/app/img/upload/icon-logo.png') no-repeat;
-						background-size: 100%;
+						background-size: 100% 100%;
 						}
 					&.file-produce{
 						background: url('http://static-b.caimei365.com/app/img/upload/icon-produce.png') no-repeat;
-						background-size: 100%;
+						background-size: 100% 100%;
 						}
 					&.file-health{
 						background: url('http://static-b.caimei365.com/app/img/upload/icon-health.png') no-repeat;
-						background-size: 100%;
+						background-size: 100% 100%;
 						}
 					&.file-tax{
 						background: url('http://static-b.caimei365.com/app/img/upload/icon-tax.png') no-repeat;
-						background-size: 100%;
+						background-size: 100% 100%;
 						}
 					&.file-honor{
 						background: url('http://static-b.caimei365.com/app/img/upload/icon-honor.png') no-repeat;
-						background-size: 100%;
+						background-size: 100% 100%;
 						}
 					&.file-product{
 						background: url('http://static-b.caimei365.com/app/img/upload/icon-product.png') no-repeat;
-						background-size: 100%;
+						background-size: 100% 100%;
 						}
 						
 				 }