|
@@ -345,6 +345,7 @@
|
|
|
dimension: null,
|
|
dimension: null,
|
|
|
longitude: null,
|
|
longitude: null,
|
|
|
address: null,
|
|
address: null,
|
|
|
|
|
+ province: null,
|
|
|
detailedAddress: null,
|
|
detailedAddress: null,
|
|
|
label: [],
|
|
label: [],
|
|
|
brandName: [],
|
|
brandName: [],
|
|
@@ -360,6 +361,7 @@
|
|
|
dimension: null,
|
|
dimension: null,
|
|
|
longitude: null,
|
|
longitude: null,
|
|
|
address: null,
|
|
address: null,
|
|
|
|
|
+ province: null,
|
|
|
detailedAddress: null,
|
|
detailedAddress: null,
|
|
|
label: [],
|
|
label: [],
|
|
|
brandName: [],
|
|
brandName: [],
|
|
@@ -401,6 +403,7 @@
|
|
|
uni.$on('commitCheck', (data) => {
|
|
uni.$on('commitCheck', (data) => {
|
|
|
this.form.address = (data.province ? data.province : '') + (data.city ? "," + data.city :
|
|
this.form.address = (data.province ? data.province : '') + (data.city ? "," + data.city :
|
|
|
'') + (data.district ? "," + data.district : '')
|
|
'') + (data.district ? "," + data.district : '')
|
|
|
|
|
+ this.form.province = data.province || null
|
|
|
this.form.detailedAddress = data.name
|
|
this.form.detailedAddress = data.name
|
|
|
this.form.longitude = data.location ? data.location.split(',')[0] : null
|
|
this.form.longitude = data.location ? data.location.split(',')[0] : null
|
|
|
this.form.dimension = data.location ? data.location.split(',')[1] : null
|
|
this.form.dimension = data.location ? data.location.split(',')[1] : null
|
|
@@ -455,13 +458,13 @@
|
|
|
});
|
|
});
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
- if (this.form.corpsFilesList.filter(item => item.isDeleted == 0).length == 0) {
|
|
|
|
|
|
|
+/* if (this.form.corpsFilesList.filter(item => item.isDeleted == 0).length == 0) {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
|
title: '请上传店面照片',
|
|
title: '请上传店面照片',
|
|
|
icon: 'none'
|
|
icon: 'none'
|
|
|
});
|
|
});
|
|
|
return
|
|
return
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
|
|
if (!this.form.contacts) {
|
|
if (!this.form.contacts) {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
@@ -505,13 +508,13 @@
|
|
|
});
|
|
});
|
|
|
return
|
|
return
|
|
|
}*/
|
|
}*/
|
|
|
- if (!this.form.address) {
|
|
|
|
|
|
|
+/* if (!this.form.address) {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
|
title: '请选择所属区域',
|
|
title: '请选择所属区域',
|
|
|
icon: 'none'
|
|
icon: 'none'
|
|
|
});
|
|
});
|
|
|
return
|
|
return
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
if (!this.form.detailedAddress) {
|
|
if (!this.form.detailedAddress) {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
|
title: '请输入详细地址',
|
|
title: '请输入详细地址',
|
|
@@ -792,13 +795,13 @@
|
|
|
});
|
|
});
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
- if (this.form.corpsFilesList.filter(item => item.isDeleted == 0).length == 0) {
|
|
|
|
|
|
|
+/* if (this.form.corpsFilesList.filter(item => item.isDeleted == 0).length == 0) {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
|
title: '请上传店面照片',
|
|
title: '请上传店面照片',
|
|
|
icon: 'none'
|
|
icon: 'none'
|
|
|
});
|
|
});
|
|
|
return
|
|
return
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
|
|
if (!this.form.contacts) {
|
|
if (!this.form.contacts) {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
@@ -842,13 +845,13 @@
|
|
|
});
|
|
});
|
|
|
return
|
|
return
|
|
|
}*/
|
|
}*/
|
|
|
- if (!this.form.address) {
|
|
|
|
|
|
|
+/* if (!this.form.address) {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
|
title: '请选择所属区域',
|
|
title: '请选择所属区域',
|
|
|
icon: 'none'
|
|
icon: 'none'
|
|
|
});
|
|
});
|
|
|
return
|
|
return
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
if (!this.form.detailedAddress) {
|
|
if (!this.form.detailedAddress) {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
|
title: '请输入详细地址',
|
|
title: '请输入详细地址',
|
|
@@ -957,7 +960,7 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
obj.label = obj.label ? obj.label.join(",") : null
|
|
obj.label = obj.label ? obj.label.join(",") : null
|
|
|
- obj.brandName = obj.brandName ? obj.brandName.join(",") : null
|
|
|
|
|
|
|
+ // obj.brandName = obj.brandName ? obj.brandName.join(",") : null
|
|
|
if (obj.signingPeriodEnd) {
|
|
if (obj.signingPeriodEnd) {
|
|
|
obj.signingPeriodEnd = obj.signingPeriodEnd.slice(0, 10) + ' 00:00:00'
|
|
obj.signingPeriodEnd = obj.signingPeriodEnd.slice(0, 10) + ' 00:00:00'
|
|
|
}
|
|
}
|