忆雪 1 سال پیش
والد
کامیت
bc97f96533

+ 1 - 1
src/pageMerchant/mineModule/certification/components/ImgsUpload.vue

@@ -33,7 +33,7 @@
 
 		},
 		mounted() {
-			console.log( this.imageList," this.imageList")
+			console.log( this.imageList," this.imageList子组件")
 			this.fileList = this.imageList ? this.imageList.split(','):[]
 		},
 		created() {},

+ 8 - 8
src/pageMerchant/mineModule/certification/corporateInformation.vue

@@ -156,10 +156,6 @@
 			this.$refs.uForm.setRules(this.rules);
 		},
 		onLoad() {
-			 
-		},
-		mounted(){
-			console.log(this.$store.state.data.merchantInfo)
 			if (this.$store.state.data.merchantInfo && this.$store.state.data.merchantInfo.idCardNumber) {
 				console.log("sadsadas")
 				this.legalInfo = {
@@ -170,14 +166,18 @@
 					idCardNumber: this.$store.state.data.merchantInfo.idCardNumber,
 					idCardFrontPhoto: this.$store.state.data.merchantInfo.idCardFrontPhoto,
 					idCardBackPhoto: this.$store.state.data.merchantInfo.idCardBackPhoto,
-					sexName: this.$store.state.data.merchantInfo.sexName,
+					sexName: this.$store.state.data.merchantInfo.legalRepresentativeGender == 1 ? '男' : (this.$store
+						.state
+						.data.merchantInfo.legalRepresentativeGender == 2 ? '女' : '保密'),
 				}
 			}
 		},
-		onShow() {
-			console.log("sad")
+		mounted() {
 			console.log(this.$store.state.data.merchantInfo)
-			
+
+		},
+		onShow() {
+
 
 		},
 		methods: {

+ 5 - 3
src/pageMerchant/mineModule/certification/qualificationInformation.vue

@@ -149,7 +149,7 @@
 			//如果需要兼容微信小程序,并且校验规则中含有方法等,只能通过setRules方法设置规则。
 			this.$refs.uForm.setRules(this.rules);
 		},
-		mounted() {
+		onLoad(options) {
 			if (this.$store.state.data.merchantInfo && this.$store.state.data.merchantInfo.businessPhoto) {
 				this.aptitudeInfo = {
 					businessLicenseId: this.$store.state.data.merchantInfo.idCardNumber,
@@ -159,15 +159,17 @@
 					businessLicenseNumberValid: this.$store.state.data.merchantInfo.businessLicenseNumberValid,
 					businessLicenseExpirationDateValid: formatTime(this.$store.state.data.merchantInfo
 						.businessLicenseExpirationDateValid, 'YYYY-MM-DD'),
-					businessLicensePhoto: this.$store.state.data.merchantInfo.businessLicenseExpirationDateValid,
+					businessLicensePhoto: this.$store.state.data.merchantInfo.businessLicensePhoto,
 				}
-
+			
 			}
 		},
+
 		onShow() {
 			this.legalInfo = this.$store.state.data.legalInfo;
 			this.storeInfo = this.$store.state.data.storeInfo;
 
+
 		},
 		methods: {
 			// 图片

+ 7 - 33
src/pageMerchant/mineModule/certification/storeInformation.vue

@@ -121,7 +121,7 @@
 			<view class="content-box">
 				<u-form-item prop="storeInnerImage">
 					<imgs-upload @update="fileList" :value="2"
-						:imageList="storeInfo.storeInnerImage.map(item => item.url).join(',')"></imgs-upload>
+						:imageList="storeInfo.storeInnerImage.join(',')"></imgs-upload>
 					<p class="upload-text">店内真实环境图</p>
 				</u-form-item>
 			</view>
@@ -261,8 +261,9 @@
 		created() {
 			this.request()
 		},
-		mounted() {
-			if (this.$store.state.data.merchantInfo && this.$store.state.data.merchantInfo.region) {
+		onLoad() {
+			if (this.$store.state.data.merchantInfo) {
+				console.log(this.$store.state.data.merchantInfo, "this.$store.state.data.merchantInfo")
 				this.storeInfo = {
 					region: this.$store.state.data.merchantInfo.merchant.region,
 					storeAddressDetail: this.$store.state.data.merchantInfo.storeAddressDetail,
@@ -277,43 +278,16 @@
 					opening: this.$store.state.data.merchantInfo.merchant.opening,
 
 					city: this.$store.state.data.merchantInfo.merchant.region.toString().slice(0, -2) + "00",
-					province: this.$store.state.data.merchantInfo.merchant.region.toString().slice(0, -4) + "00",
+					province: this.$store.state.data.merchantInfo.merchant.region.toString().slice(0, -4) + "0000",
 					district: this.$store.state.data.merchantInfo.merchant.region,
 					mainBusiness: this.$store.state.data.merchantInfo.merchant.mainBusiness, // 主营业务,
 					ancillaryBusiness: this.$store.state.data.merchantInfo.merchant.ancillaryBusiness, // 辅营业务
 				}
-				this.storeAddress = findAreaByCode(this.$store.state.data.merchantInfo.merchant.region)
-
+				this.storeAddress = this.findAreaByCode(this.$store.state.data.merchantInfo.merchant.region)
 			}
 		},
 		onShow() {
-			console.log("sad")
-			console.log(this.$store.state.data.merchantInfo)
 			this.initCityData();
-			// if (this.$store.state.data.merchantInfo) {
-			// 	this.storeInfo = {
-			// 		region: this.$store.state.data.merchantInfo.merchant.region,
-			// 		storeAddressDetail: this.$store.state.data.merchantInfo.storeAddressDetail,
-			// 		legalRepresentativeName: this.$store.state.data.merchantInfo.legalRepresentativeName,
-			// 		mobileNumber: this.$store.state.data.merchantInfo.mobileNumber,
-			// 		storeName: this.$store.state.data.merchantInfo.storeName,
-			// 		storeImage: this.$store.state.data.merchantInfo.storeImage,
-			// 		storeInnerImage: this.$store.state.data.merchantInfo.storeInnerImage,
-			// 		email: this.$store.state.data.merchantInfo.email,
-			// 		longitude: this.$store.state.data.merchantInfo.merchant.longitude,
-			// 		latitude: this.$store.state.data.merchantInfo.merchant.latitude,
-			// 		opening: this.$store.state.data.merchantInfo.merchant.opening,
-
-			// 		city: this.$store.state.data.merchantInfo.merchant.region.toString().slice(0, -2) + "00",
-			// 		province: this.$store.state.data.merchantInfo.merchant.region.toString().slice(0, -4) + "00",
-			// 		district: this.$store.state.data.merchantInfo.merchant.region,
-			// 		mainBusiness: this.$store.state.data.merchantInfo.merchant.mainBusiness, // 主营业务,
-			// 		ancillaryBusiness: this.$store.state.data.merchantInfo.merchant.ancillaryBusiness, // 辅营业务
-			// 	}
-			// 	console.log(this.$store.state.data.merchantInfo, "this.$store.state.data.merchantInfo")
-			// 	// console.log(this.storeInfo)
-
-			// }
 		},
 
 		methods: {
@@ -525,7 +499,7 @@
 						}
 						const county = city.counties.find(item => item.countyCode == areaCode);
 						if (county) {
-							return `${province.provinceName} - ${city.cityName} - ${county.countyName}`;
+							return `${province.provinceName}  ${city.cityName}  ${county.countyName}`;
 						}
 					}
 				}