diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index 1030908..852af77 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -149,7 +149,7 @@
*
-
+
{
+ // 是否缺少参数区分文玩和特产?
+ getShopInfo().then((res) => {
+ const {data} = res
+ // console.log(res, 'initInfo--------');
+ // console.log(data, 'data--------');
if (data.partnerId != null) {
this.partnerId = data.partnerId
}
@@ -902,20 +906,23 @@ export default {
this.indexType = this.columnsType.findIndex(item => item.id === this.form.type)
this.form.typeText = this.columnsType[this.indexType].name
this.form.position = this.$forceToDecimal(this.form.longitude, 6) + ',' + this.$forceToDecimal(this.form.latitude, 6)
- this.form.area = `${this.form.provinceName} ${this.form.cityName} ${this.form.areaName}`
+ this.form.area = `${this.form.provinceName || ''} ${this.form.cityName || ''} ${this.form.areaName || ''}`
+ console.log(this.form, 'form--------');
if (data.hotelInfo.coverType === 2) {
this.form.coverVideo = data.hotelInfo.cover
this.form.cover = ''
}
}
+ // console.log(data.supplierInfo, 'supplierInfo--------');
if (data.supplierInfo) {
if (this.infoTitle === "特产" && data.applyType !== 1) return
if (this.infoTitle === "文玩" && data.applyType !== 3) return
this.formSupplier = data.supplierInfo
- this.indexSupplierType = this.columnsSupplierType.findIndex(item => item.key === this.formSupplier.subType)
this.formSupplier.typeText = this.columnsSupplierType[this.indexSupplierType].value
this.formSupplier.position = this.$forceToDecimal(this.formSupplier.longitude, 6) + ',' + this.$forceToDecimal(this.formSupplier.latitude, 6)
- this.formSupplier.area = `${this.formSupplier.provinceName} ${this.formSupplier.cityName} ${this.formSupplier.areaName}`
+ this.formSupplier.area = `${this.formSupplier.provinceName || ''} ${this.formSupplier.cityName || ''} ${this.formSupplier.areaName || ''}`
+ this.indexSupplierType = this.columnsSupplierType.findIndex(item => item.key === this.formSupplier.subType)
+ // console.log(this.formSupplier);
}
})
},
@@ -1016,7 +1023,7 @@ export default {
cityId: values.city.id,
areaId: values.district.id
}
- this.formSupplier.area = `${address.province} ${address.city} ${address.district}`
+ this.formSupplier.area = `${address.province || ''} ${address.city || ''} ${address.district || ''}`
this.formSupplier.provinceId = values.province.id
this.formSupplier.cityId = values.city.id
this.formSupplier.areaId = values.district.id
@@ -1031,7 +1038,7 @@ export default {
cityId: values.city.id,
areaId: values.district.id
}
- this.form.area = `${address.province} ${address.city} ${address.district}`
+ this.form.area = `${address.province || ''} ${address.city || ''} ${address.district || ''}`
this.form.provinceId = values.province.id
this.form.cityId = values.city.id
this.form.areaId = values.district.id