From 5b1b1f1c69c780b5161f76af2c4c880a5c3effff Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 24 Jul 2024 22:13:08 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E5=85=A5=E9=A9=BB/=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E6=89=B9=E5=8F=91=E5=95=86):[#1982]=E6=92=A4=E9=94=80=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4=E7=9A=84=E7=94=B3=E8=AF=B7=E5=90=8E=EF=BC=8C=E5=B0=86?=
=?UTF-8?q?=E6=97=A0=E6=B3=95=E5=AF=B9=E9=99=A4=E4=BA=86=E7=9C=81=E5=B8=82?=
=?UTF-8?q?=E5=8C=BA=E4=BB=A5=E5=A4=96=E7=9A=84=E5=86=85=E5=AE=B9=E8=BF=9B?=
=?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E5=86=8D=E6=AC=A1=E6=8F=90=E4=BA=A4=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_join/views/shop.vue | 30 +++++++++++----------
pkg_join/views/supplier.vue | 30 +++++++++++----------
pkg_join/views/wholesaler.vue | 50 ++++++++++++++++++++++-------------
3 files changed, 63 insertions(+), 47 deletions(-)
diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index 835da90..24d785e 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -585,20 +585,22 @@ export default {
}
this.isDraft = data.isDraft
this.reviewStatus = data.reviewStatus
- switch (data.reviewStatus) {
- case 0:
- this.stateTitle = '审核中'
- this.stateType = 'primary'
- this.reviewing = true
- break
- case 1:
- this.reviewing = false
- break
- case 2:
- this.stateTitle = '审核驳回：' + data.reviewMsg
- this.stateType = 'error'
- this.reviewing = false
- break
+ if (data.isDraft !== 1) {
+ switch (data.reviewStatus) {
+ case 0:
+ this.stateTitle = '审核中'
+ this.stateType = 'primary'
+ this.reviewing = true
+ break
+ case 1:
+ this.reviewing = false
+ break
+ case 2:
+ this.stateTitle = '审核驳回：' + data.reviewMsg
+ this.stateType = 'error'
+ this.reviewing = false
+ break
+ }
}
if (data.hotelInfo) {
// 店铺图片
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index 9798c0d..1a9c462 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -766,20 +766,22 @@ export default {
}
this.isDraft = data.isDraft
this.reviewStatus = data.reviewStatus
- switch (data.reviewStatus) {
- case 0:
- this.stateTitle = '审核中'
- this.stateType = 'primary'
- this.reviewing = true
- break
- case 1:
- this.reviewing = false
- break
- case 2:
- this.stateTitle = '审核驳回：' + data.reviewMsg
- this.stateType = 'error'
- this.reviewing = false
- break
+ if (data.isDraft !== 1) {
+ switch (data.reviewStatus) {
+ case 0:
+ this.stateTitle = '审核中'
+ this.stateType = 'primary'
+ this.reviewing = true
+ break
+ case 1:
+ this.reviewing = false
+ break
+ case 2:
+ this.stateTitle = '审核驳回：' + data.reviewMsg
+ this.stateType = 'error'
+ this.reviewing = false
+ break
+ }
}
if (data.hotelInfo) {
// 店铺图片
diff --git a/pkg_join/views/wholesaler.vue b/pkg_join/views/wholesaler.vue
index a5f49aa..21c37ac 100644
--- a/pkg_join/views/wholesaler.vue
+++ b/pkg_join/views/wholesaler.vue
@@ -137,11 +137,16 @@
v-if="!form.qualification"
class="btn-upload"
>上传图片
-
+
+
+
+
+
@@ -299,6 +304,7 @@ export default {
},
district: [],
address: {},
+ qualificationArr: [],
isAgree: false,
show: false,
notice: '',
@@ -373,23 +379,28 @@ export default {
this.isDraft = data.isDraft
this.reviewStatus = data.reviewStatus
}
- switch (data.reviewStatus) {
- case 0:
- this.stateTitle = '审核中'
- this.stateType = 'primary'
- this.reviewing = true
- break;
- case 1:
- this.reviewing = false
- break;
- case 2:
- this.stateTitle = '审核驳回：' + data.reviewMsg
- this.stateType = 'error'
- this.reviewing = false
- break;
+ if (data.isDraft !== 1) {
+ switch (data.reviewStatus) {
+ case 0:
+ this.stateTitle = '审核中'
+ this.stateType = 'primary'
+ this.reviewing = true
+ break;
+ case 1:
+ this.reviewing = false
+ break;
+ case 2:
+ this.stateTitle = '审核驳回：' + data.reviewMsg
+ this.stateType = 'error'
+ this.reviewing = false
+ break;
+ }
}
if (data.wholesalerInfo) {
this.form = data.wholesalerInfo
+ if (this.form.qualification) {
+ this.qualificationArr = this.form.qualification.split(',')
+ }
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}`
}
@@ -404,6 +415,7 @@ export default {
break
case 'licence':
this.form.qualification = img
+ this.qualificationArr = [img]
break
}
})