萨达

second/pages/form/form.vue

@@ -8,7 +8,7 @@
 	             </view>
 				 <form>
 					 <view class="row fenlei"> 
-						 <view class="label"><label class="red">*</label>分类</view>
+						 <view class="label">分类</view>
 						 <view class="secondradio">
 							  <view v-for="(item,index) in fenlei" :key="index" v-model="secondParams.secondHandType"  @click="secondHandRidio(item)"
 								  :class="currentId==item.value?'active':''">
@@ -27,7 +27,7 @@
 						  </view>
 					 </view>
 					 <view class="row">
-						<view class="label"><label class="red">*</label>商品品牌</view>
+						<view class="label">商品品牌</view>
 						 <view class="select spacing" @click="showBrand">
 							 <view class="placeholder" >{{brandname}}</view>
 							<!-- <ul v-show="selectBrand">
@@ -37,7 +37,7 @@
 						 </view>
 					 </view>
 					 <view class="row">
-						 <view class="label"><label class="red">*</label>商品名称</view>
+						 <view class="label">商品名称</view>
 						 <view class="spacing">
 							 <input type="text" maxlength="40"  v-model="secondParams.name" placeholder="请输入商品名称，不超过40个汉字">
 						 </view>
@@ -49,7 +49,7 @@
 						 </view>
 					 </view>
 					 <view class="row"  v-show="secondParams.secondHandType==2">
-						 <view class="label"><label class="red">*</label>产品到期日</view>
+						 <view class="label">产品到期日</view>
 						 <view class="spacing">
 							<input type="text"  v-model="secondParams.maturityYears" maxlength="10" placeholder="请输入产品到期日，如：2020年12月">
 						 </view>
@@ -61,7 +61,7 @@
 						 </view>
 					 </view>
 					 <view class="row">
-						 <view class="label"><label class="red">*</label>交易价</view>
+						 <view class="label">交易价</view>
 						 <view class="spacing">
 							 <input type="text" maxlength="20" v-model="secondParams.price1"  placeholder="请输入交易价">
 						 </view>
@@ -74,37 +74,37 @@
 						 <label class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</label>
 					 </view>
 					 <view class="row" v-show="secondParams.secondHandType==2">
-						 <view class="label"><label class="red">*</label>市场价</view>
+						 <view class="label">市场价</view>
 						 <view class="spacing">
 							  <input type="text"  v-model="secondParams.normalPrice" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')"   placeholder="请输入市场价">
 						 </view>
 					 </view>
 					 <view class="row"  v-show="secondParams.secondHandType==2">
-						 <view class="label"><label class="red">*</label>采购价/原价</view>
+						 <view class="label">采购价/原价</view>
 						 <view class="spacing">
 							  <input type="text"  v-model="secondParams.originalPrice" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')" placeholder="请输入采购价/原价"/>
 						 </view>
 					 </view>
 					 <view class="row" v-show="secondParams.secondHandType==2">
-						 <view class="label"><label class="red">*</label>数量</view>
+						 <view class="label">数量</view>
 						 <view class="spacing">
 							  <input type="text"   v-model="secondParams.stock" maxlength="30"  placeholder="请输入数量">
 						 </view>
 					 </view>
 					 <view class="row">
-						 <view class="label"><label class="red">*</label>商品成色</view>
+						 <view class="label">商品成色</view>
 						 <view class="spacing">
 						     <input type="text" maxlength="10"  v-model="secondParams.productQuality"  placeholder="请输入商品成色，如“9成新”">
 					    </view> 
 					 </view>
 					 <view class="row">
-						 <view class="label"><label class="red">*</label>联系人</view>
+						 <view class="label">联系人</view>
 						 <view class="spacing">
 							  <input type="text" maxlength="6" v-model="secondParams.contactName"   placeholder="请输入联系人姓名">
 					    </view> 
 					 </view>
 					 <view class="row">
-						 <view class="label"><label class="red">*</label>联系方式</view>
+						 <view class="label">联系方式</view>
 						 <view class="spacing">
 							 <input type="text"  v-model="secondParams.contactMobile"    maxlength="11" placeholder="请输入联系人手机号 / 固话">
 					    </view> 
@@ -118,7 +118,7 @@
 						 </view>
 					 </view>
 					<view class="row" >
-						 <view class="label"><label class="red">*</label>联系地址</view>
+						 <view class="label">联系地址</view>
 						 <view class="spacing"  @click="showMulLinkageThreePicker">
 							 <text class="row-input" :class="addressData.address === '请选择所在地区' ? 'none' : ''">
 							 	{{addressData.address}}
@@ -130,12 +130,12 @@
 						placeholder="请填写详细地址，如街道/小区/门牌等" /></textarea>
 					<view class="release-main-container">
 						<view class="release-from">
-							<view class="label"><label class="red">*</label>商品图片</view>
+							<view class="label">商品图片</view>
 								<view class="release-input upload image uploadGoodsImages" >
 									<view class="upload-file" v-show="GoodsImagesList.length<5">
 										<i class="iconfont icon-shangchuantupian"></i>
 										<p class="add-text">营业执照</p>
-										<input ref="goodsImages" type="file" name="file" value="" class="input-file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadGoodsImagesFn">
+										<view ref="goodsImages" class="input-file"  @click="uploadGoodsImagesFn"></view>
 									</view>
 									<view class="upload-file"  v-for="(item, index) in GoodsImagesList" :key="index">
 										<img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" >
@@ -156,7 +156,7 @@
 							 </div>
 						</view>
 						<view class="productinfo">
-							 <view class="label unlogin-label" style="width: 100%;"><span class="red">*</span>免责声明</view>
+							 <view class="label unlogin-label" style="width: 100%;">免责声明</view>
 							 <textarea class="smText">
 								 鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，
 								 由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！
@@ -479,8 +479,8 @@
 		.linqi_text { width: 100%; height: 68rpx;background-color: #1890f9;box-shadow: 0rpx 4rpx 6rpx 0rpx rgba(24, 144, 249, 0.17);text-align: center;
 		    line-height: 68rpx;color: #ffffff;margin: auto;font-size:24rpx;position: relative;}
 		.jiaobiao {width: 0;height: 0;border-left: 20rpx solid transparent;border-right: 20rpx solid transparent;top: -30%;
-		    right: 38%;border-bottom: 20rpx solid #1890f9;position: absolute;}
-		.label{color: #666666;display: inline-block;}
+		    right: 48%;border-bottom: 20rpx solid #1890f9;position: absolute;}
+		.label{color: #666666;display: inline-block;idth: 120rpx;}
 		.row{border-bottom: 2rpx solid #e1e1e1;line-height: 90rpx;height: 90rpx;}
 		.row.fenlei{height: auto;}
 		.select {position: relative;color: #9aa5b5;text-align: left;user-select: none;}

supplier/pages/user/information.vue

@@ -66,14 +66,14 @@
 				<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" 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="radio" v-for="(item,index) in secondtype" :key="index" @click="secondypeRidio(item)" :class="secontype==item.value?'active':''">
-				 	<view class="secondRadio">{{item.name}}</view>
+				 <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">
@@ -95,14 +95,14 @@
 			<view class="business">
 				<view class="info2-title business-title">主营内容</view>
 				<view class="business-info">
-					 <checkbox-group class="row-group">
-								<label class="diyBox second" v-for="(item, index) in mentuzCampNullList" :key="item.value">
-									<checkbox :value="item.value"  :class="{on: item.checked}" v-model="shopMainPros" ></checkbox>
+					 <checkbox-group class="row-group" @change="chooseMaleLike">
+								<label class="diyBox" v-for="(item, index) in mentuzCampList" :key="item.value" >
+									<checkbox :value="item.value" :checked="item.checked"></checkbox>
 									<view class="row-text">{{item.name}}</view>
 								</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" maxlength="5"/>
 					 	<button type="default" class="button" @click.stop="mainProAdd">确认添加</button>
 					 </view>
 				</view>
@@ -110,9 +110,9 @@
 			<view class="business">
 				<view class="info2-title business-title">经营范围</view>
 				<view class="business-info">
-					   <checkbox-group class="row-group">
-							<label class="row-input" v-for="(item, index) in Scopelist" :key="item.value">
-								<checkbox :value="item.value"  :class="{on: item.checked}"  v-model="shopScope"></checkbox>
+					   <checkbox-group class="row-group" @change="chooseMaleLikes">
+							<label class="row-input" v-for="(item, index) in medicaCampList" :key="item.value" >
+								<checkbox :value="item.value" :checked="item.checked" ></checkbox>
 								<view class="row-text">{{item.name}}</view>
 							</label>
 					   </checkbox-group>
@@ -204,7 +204,7 @@
 				<view class="info2-title zizhi-title hoor">荣誉证书</view>
 				<view class="uploadImage list-image">
 					<view class="formLine-file" @click="uploadHonorImageFn" v-if="HonorImagesList.length<5" >
-							<view class="file-tax iconImage"></view>
+							<view class="file-honor iconImage"></view>
 					 </view>
 					 <view class="form-upload-image" v-for="(item, index) in HonorImagesList" :key="index">
 						   <image class="upload-img" :src="item" alt="" @click="showViewerImageFn5()"></image>
@@ -216,7 +216,7 @@
 				<view class="info2-title zizhi-title hoor">产品证书</view>
 				<view class="uploadImage list-image">
 					<view class="formLine-file" @click="uploadproductImageFn" v-if="productImagesList.length<5" >
-							<view class="file-tax iconImage"></view>
+							<view class="file-product iconImage"></view>
 					 </view>
 					 <view class="form-upload-image" v-for="(item, index) in productImagesList" :key="index">
 						   <image class="upload-img" :src="item" alt="" @click="showViewerImageFn6()"></image>
@@ -275,7 +275,7 @@
 					{value:'2',name:'仪器'},
 					{value:'3',name:'服务'}
 				],
-				Scopelist:[
+				medicaCampNullList:[
 					{value:'1',name:'仪器护理类'},
 					{value:'2',name:'护肤品类'},
 					{value:'3',name:'纹绣类'},
@@ -324,6 +324,8 @@
 					certificateHonor:'',//荣誉
 					productCertification:'',//产品
 				},
+				mentuzCampList:[],
+				medicaCampList:[],
 				shopMainPros:[],
 				shopScope:[],
 				mainProEdit: '',
@@ -331,117 +333,207 @@
 				HonorImagesList:[],
 				productImagesList:[],
 				isPreviewImage:false,   	//预览图片开关
+				isMainproCheck:false,
 			}
 		},
-		onLoad(option) {
+		onLoad() {
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.params.userID = resolve.userID;
+				this.params.shopID = resolve.shopID;
+			})
 			this.shopInfo();
 		},
 		methods:{
+			chooseMaleLike(e){
+				this.isMainproCheck = true
+				this.params.mainpro = this.checkLikes(e,this.mentuzCampList)
+			},
+			chooseMaleLikes(e){
+				this.isMainproCheck = true
+				this.params.businessScope = this.checkLikes(e,this.medicaCampList)
+			},
+			checkLikes(e,list){
+				let	values = e.detail.value;
+				console.log(values)
+				let arr = []
+				list.forEach(item => {
+					if(values.includes(item.value)){
+						this.$set(item,'checked',true)
+						arr.push(item.name)
+					}else{
+						this.$set(item,'checked',false)
+					}
+				})
+				return arr.join('/')
+			},
+			setNewMainpro(arr){//回显处理主营内容
+				let _ARRAY = [];
+				arr.split('/').forEach((item,index) =>{
+					if(item != ""){
+						let _OBJ = {value:(index+1).toString(),name:item,checked:true}
+						_ARRAY.push(_OBJ)
+					}
+				})
+				return _ARRAY
+			},
 		  shopInfo(){
-			  this.$api.getStorage().then((resolve) =>{
-				  this.params.userID = resolve.userID;
-				  this.SupplierApi.shopInfo({userID:this.params.userID}).then(response =>{
-					if(res.code==0){
+			  // this.$api.getStorage().then((resolve) =>{
+				  this.ShopService.shopInfo({userId:10450}).then(response =>{
+					if(response.code==0){
 						console.log(response)
 						let shop = response.data.shop;
 						let user = response.data.user;
-						_this.params.name = shop.name;
-						_this.params.sname = shop.sname;
-						_this.params.linkMan = shop.linkMan;
-						_this.params.email = user.email;
-						_this.params.address = shop.provincialAddress;
-						_this.params.provinceID = shop.provinceID;
-						_this.params.cityID = shop.cityID;
-						_this.params.townID = shop.townID;
-						_this.params.contractPhone = shop.contractPhone;
-						_this.params.fax = shop.fax;
-						_this.params.legalPerson = shop.legalPerson;
-						_this.params.registeredCapital = shop.registeredCapital;
-						_this.params.nature = shop.nature;
-						_this.params.turnover = shop.turnover;
-						_this.shopMainPros = _this.setNewMainpro(shop.mainpro);
-						_this.shopScope = _this.setNewScope(shop.businessScope);
-						_this.params.firstShopType = shop.firstShopType;
-						_this.params.secondShopType = shop.secondShopType;
-						_this.params.medicalPracticeLicenseImg1 = shop.medicalPracticeLicenseImg1;
-						_this.params.info = shop.info;
-						_this.params.productDesc = shop.productDesc;
-						_this.params.socialCreditCode = shop.socialCreditCode;
-						_this.params.businessLicenseImage = shop.businessLicenseImage;
-						_this.params.logo = shop.logo;
-						_this.params.productionLicence = shop.productionLicence;
-						_this.params.hygienicLicense = shop.hygienicLicense;
-						_this.params.taxLicense = shop.taxLicense;
-						_this.params.certificateHonor = shop.hygienicLicense;
-						_this.HonorImagesList = res.data.certificateHonor;
-						_this.productImagesList = res.data.productCertification;
+						this.params.name = shop.name;
+						this.params.sname = shop.sname;
+						this.params.linkMan = shop.linkMan;
+						this.params.email = user.email;
+						this.addressData.addressDetail = shop.provincialAddress;
+						this.addressData.provinceID = shop.provinceID;
+						this.addressData.cityID = shop.cityID;
+						this.addressData.townID = shop.townID;
+						this.params.contractPhone = shop.contractPhone;
+						this.params.fax = shop.fax;
+						this.params.legalPerson = shop.legalPerson;
+						this.params.registeredCapital = shop.registeredCapital;
+						this.params.nature = shop.nature;
+						this.params.turnover = shop.turnover;
+						this.params.firstShopType = shop.firstShopType;
+						this.params.secondShopType = shop.secondShopType;
+						this.params.medicalPracticeLicenseImg1 = shop.medicalPracticeLicenseImg1;
+						this.params.info = shop.info;
+						this.params.productDesc = shop.productDesc;
+						this.params.socialCreditCode = shop.socialCreditCode;
+						this.params.businessLicenseImage = shop.businessLicenseImage;
+						this.params.logo = shop.logo;
+						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(shop.mainpro == "" || shop.mainpro == null){
+							this.mentuzCampList = this.mentuzCampNullList
+						}else{
+							this.mentuzCampList = this.setNewMainpro(shop.mainpro)
+						}
+						if(shop.businessScope == "" || shop.businessScope == null){
+								this.medicaCampList = this.medicaCampNullList
+						}else{
+							this.medicaCampList = this.setNewMainpro(shop.businessScope)
+						}
 					}
 				 })
-				 })
+				 // })
 			 },
 			shopSubmit(){//提交修改
 				console.log(this.params);
-				 this.ShopService.modifiedData(params).then(res=>{
+				if(this.params.name==''){
+					this.$util.msg('请输入公司名称',2000);
+					return
+				}else if(this.params.townID==''){
+					this.$util.msg('请选择联系地址',2000);
+					return
+				}else if(this.params.address==''){
+					this.$util.msg('请输入正确的联系地址',2000);
+					return
+				}else if(this.params.linkMan==''){
+					this.$util.msg('请输入正确的联系人姓名',2000);
+					return
+				}else if(this.params.legalPerson==''){
+					this.$util.msg('请输入法人代表姓名',2000);
+					return
+				}else if(this.params.registeredCapital==''){
+					this.$util.msg('请输入注册资本',2000);
+					return
+				}else if(this.params.nature==''){
+					this.$util.msg('请输入公司性质',2000);
+					return
+				}else if(this.params.turnover==''){
+					this.$util.msg('请输入年营业额',2000);
+					return
+				}else if(this.params.firstShopType==''){
+					this.$util.msg('请选择公司类型',2000);
+					return
+				}else if(this.params.firstShopType==1){
+					if(this.params.secondShopType==""){
+						this.$util.msg('请选择公司类型',2000);
+						return
+					}
+				}else if(this.params.info==''){
+					this.$util.msg('请填写公司介绍',2000);
+					return
+				}else if(this.params.productDesc==''){
+					this.$util.msg('请填系列商品说明',2000);
+					return
+				}else if(this.params.socialCreditCode==''){
+					this.$util.msg('请输入正确的统一社会信用代码',2000);
+					return
+				}else if(this.params.businessLicenseImage==''){
+					this.$util.msg('请上传营业执照图片',2000);
+					return
+				}else if(this.params.logo==''){
+					this.$util.msg('请上传公司logo',2000);
+					return
+				}else if(this.params.productionLicence==''){
+					this.$util.msg('请上传生产许可证',2000);
+					return
+				}else if(this.params.hygienicLicense==''){
+					this.$util.msg('请上传卫生许可证',2000);
+					return
+				}else if(this.params.taxLicense==''){
+					this.$util.msg('请上传税务许可证',2000);
+					return
+				}else if(this.params.certificateHonor==''){
+					this.$util.msg('请上传荣誉证书',2000);
+					return
+				}else if(this.params.productCertification==''){
+					this.$util.msg('请上传产品证书',2000);
+					return
+				}else{
+					this.ShopService.modifiedData(this.params).then(res=>{
 						 console.log(res)
 						  if(res.code === 0){
 							  this.$util.msg('修改成功',2000,true,'success')
 							  setTimeout(()=>{
-							  	uni.navigateBack();
+								uni.navigateBack();
 							  },2000)
 						} else {
 							this.$util.msg(res.msg,2000);
 							this.loginLoading = false;
 						}
 					})
+				}
 			},
 			 mainProAdd(){//添加主营内容
 					if (this.mainProEdit.length>0) {
-						var obj = {name:this.mainProEdit};
-						if(this.checkedArray(this.mainProEdit,this.mentuzCampNullList)){
+						let obj = {name:this.mainProEdit,value:`${this.mentuzCampList.length+1}`};
+						if(this.checkedArray(this.mainProEdit,this.mentuzCampList)){
 							this.$util.msg('主营内容已存在!',2000)
 						}else {
-							this.mentuzCampNullList.push(obj);
+							this.mentuzCampList.push(obj);
 						}
 					}
 				},
 			shopScopeAdd(){ //经营内容
 				if (this.shopScopeEdit.length>0) {
-					var obj = {name:this.shopScopeEdit};
-					if(this.checkedArray(this.shopScopeEdit,this.Scopelist)){
+					let obj = {name:this.shopScopeEdit,value:`${this.medicaCampList.length+1}`};
+					if(this.checkedArray(this.shopScopeEdit,this.medicaCampList)){
 						this.$util.msg('主营内容已存在!',2000)
 					}else {
-						this.Scopelist.push(obj);
+						this.medicaCampList.push(obj);
+						
 					}
 				}
 			},
 			 checkedArray(content,arr){//判断主营内容是否已存在
-			            for(var i in arr){
-			                if(arr[i].name == content){
-			                    return true;
-			                }
-			            }
+			 console.log(content,arr)
+						 for(var i in arr){
+								if(arr[i].name == content){
+									return true;
+								}
+							}
 			            return false;
 			        },
-				setNewMainpro(arr){//回显处理主营内容
-							var newArr = [];
-							console.log(arr)
-							arr.split('/').forEach(function(item){
-								newArr.push(item);
-							});
-							return newArr
-						},
-				setNewScope(arr) {//回显处理主营内容
-					  var newArr = [];
-					  console.log(arr)
-					  if(arr!=null){
-						 arr.split('/').forEach(function(item){
-							newArr.push(item);
-						});
-						 return newArr
-					  }else {
-						return newArr
-					  }
-				},
 			radioChange(e){
 				this.params.firstShopType = e.target.value;
 				if (e.target.value==1){
@@ -564,7 +656,6 @@
 				 this.issecondshow = false;
 				}
 			},
-			
 			showMulLinkageThreePicker() {//三级地址联动
 				this.isShowInput = true
 				this.$refs.mpvueCityPicker.show()
@@ -578,12 +669,12 @@
 				this.params.townID = this.addressData.townID;
 				this.params.provinceID = this.addressData.provinceID;
 				this.params.cityID = this.addressData.cityID;
-				this.secondParams.address = this.addressData.address;
+				this.params.address = this.addressData.address;
 			},
 			onConfirmbrand(e){
 				this.brandname = e.name;
 			},
-		}
+		},
 	}
 </script>
 
@@ -860,7 +951,8 @@
 		 }
 		 .diyBox{
 			margin-bottom: 5px;
-			width: 33%;
+			// width: 33%;
+			margin-right: 70rpx;
 			display: inline-block;
 		 }