|
@@ -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}`;
|
|
|
}
|
|
|
}
|
|
|
}
|