diff --git a/src/api/base/store/category.js b/src/api/base/store/category.js index 9a8f969..e6d74ca 100644 --- a/src/api/base/store/category.js +++ b/src/api/base/store/category.js @@ -32,3 +32,11 @@ export function GetStoreClassify(data) { data, }) } + +export function GetCategoryList(data) { + return request({ + url: URL.shop.base.store.category.categoryList, + method: 'post', + data, + }) +} diff --git a/src/config/net.config.js b/src/config/net.config.js index 6fe9e00..c47399f 100644 --- a/src/config/net.config.js +++ b/src/config/net.config.js @@ -710,6 +710,7 @@ let url = { doEdit: api_url + '/admin/shop/shop-base-store-category/edit', GetStoreClassify: api_url + '/admin/shop/shop-base-store-category/getStoreClassify', + categoryList: api_url + '/mobile/shop/shop-base-store-category/list', }, }, market: { diff --git a/src/views/settings/config/appVersion.vue b/src/views/settings/config/appVersion.vue index fc82487..c62a4e5 100644 --- a/src/views/settings/config/appVersion.vue +++ b/src/views/settings/config/appVersion.vue @@ -332,7 +332,7 @@ export default { pageNum: 1, pageSize: 20, }, - selectId: 1, + selectId: 100, appName: null, options: [ { diff --git a/src/views/store/shopAudit/formConfig.js b/src/views/store/shopAudit/formConfig.js index 4f0b9f9..b076961 100644 --- a/src/views/store/shopAudit/formConfig.js +++ b/src/views/store/shopAudit/formConfig.js @@ -57,10 +57,10 @@ const certificate = [ key: 'license_image', label: '许可证图片', }, - { - key: 'legal_person_mobile', - label: '法人手机号', - }, + // { + // key: 'legal_person_mobile', + // label: '法人手机号', + // }, { key: 'legalPersonOCR', label: '法人身份证OCR识别', @@ -169,6 +169,10 @@ const enterpriseCheckBoxList = [ key: 'legal_person_mobile', label: '法人手机号', }, + { + key: 'biz_license_content', + label: '经营范围', + }, { key: 'legal_person_id_number', label: '法人身份证号码', diff --git a/src/views/store/shopAudit/shopAudit.vue b/src/views/store/shopAudit/shopAudit.vue index 9c7c5fb..89c8ad6 100644 --- a/src/views/store/shopAudit/shopAudit.vue +++ b/src/views/store/shopAudit/shopAudit.vue @@ -187,12 +187,12 @@ export default { }, { prop: 'has_apply_split', - label: '是否分账', + label: '是否创建分账', + }, + { + prop: 'has_ec_signed', + label: '合同签署状态', }, - // { - // prop: 'signed_status', - // label: '合同签署状态', - // }, ], tableData: [ { @@ -226,12 +226,8 @@ export default { item.has_apply_split = item.has_apply_split == 1 ? '是' : '否' } - if (item.signed_status != null) { - this.signedStatus.forEach((group) => { - if (group.index == item.signed_status) { - item.signed_status = group.value - } - }) + if (item.has_ec_signed) {; + item.has_ec_signed = item.has_ec_signed == 1 ? '是' : '否' } if (item.entity_type) { item.entity_type = this.entityType[item.entity_type - 1] @@ -282,6 +278,14 @@ export default { if (row.has_apply_split == '否' && columnIndex == 12) { return 'status-not-pass' } + + if (row.has_ec_signed == '是' && columnIndex == 13) { + return 'status-pass' + } + if (row.has_ec_signed == '否' && columnIndex == 13) { + return 'status-not-pass' + } + } }, closeDialog() { diff --git a/src/views/store/shopAudit/shopAuditDetails.vue b/src/views/store/shopAudit/shopAuditDetails.vue index c400d90..31decf7 100644 --- a/src/views/store/shopAudit/shopAuditDetails.vue +++ b/src/views/store/shopAudit/shopAuditDetails.vue @@ -36,7 +36,7 @@