From c90b1f57df6475da88500b45f01cd55398d76851 Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Thu, 11 Apr 2024 17:50:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E6=88=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B6=85=E5=B8=82=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/modules/merchant.js | 18 + .../application/supermarket_apply.vue | 375 +++++++++++++++ .../merchant/list/handle/merEditForm.vue | 2 + src/views/merchant/list/handle/merInfo.vue | 2 + src/views/merchant/list/supermarket.vue | 434 ++++++++++++++++++ 5 files changed, 831 insertions(+) create mode 100644 src/views/merchant/application/supermarket_apply.vue create mode 100644 src/views/merchant/list/supermarket.vue diff --git a/src/router/modules/merchant.js b/src/router/modules/merchant.js index d44d446..684c516 100644 --- a/src/router/modules/merchant.js +++ b/src/router/modules/merchant.js @@ -75,6 +75,24 @@ const merchantRouter = }, component: () => import('@/views/merchant/application/smoke_apply') }, + { + path: 'supermarket', + name: 'supermarketShopList', + meta: { + title: '超市', + noCache: true + }, + component: () => import('@/views/merchant/list/supermarket') + }, + { + path: 'supermarket_apply', + name: 'supermarketApplyList', + meta: { + title: '入驻申请审核', + noCache: true + }, + component: () => import('@/views/merchant/application/supermarket_apply') + }, { path: 'list/reconciliation/:id/:type?', name: 'MerchantRecord', diff --git a/src/views/merchant/application/supermarket_apply.vue b/src/views/merchant/application/supermarket_apply.vue new file mode 100644 index 0000000..990b50a --- /dev/null +++ b/src/views/merchant/application/supermarket_apply.vue @@ -0,0 +1,375 @@ + + + + + diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue index fc3c586..635ff80 100644 --- a/src/views/merchant/list/handle/merEditForm.vue +++ b/src/views/merchant/list/handle/merEditForm.vue @@ -338,6 +338,7 @@ + @@ -440,6 +441,7 @@ export default { if(this.defaultMerchantType == 1) this.mar_type_name = '酒道馆'; else if(this.defaultMerchantType == 2) this.mar_type_name = '供应商'; else if(this.defaultMerchantType == 3) this.mar_type_name = '烟酒店'; + else if(this.defaultMerchantType == 4) this.mar_type_name = '超市'; else this.mar_type_name = '商户'; diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue index 4f1698c..642b9d2 100644 --- a/src/views/merchant/list/handle/merInfo.vue +++ b/src/views/merchant/list/handle/merInfo.vue @@ -194,6 +194,7 @@
酒道馆
供应商
烟酒店
+
超市
  • 关联商户:
    @@ -249,6 +250,7 @@ export default { if(this.defaultMerchantType == 1) this.mar_type_name = '酒道馆'; else if(this.defaultMerchantType == 2) this.mar_type_name = '供应商'; else if(this.defaultMerchantType == 3) this.mar_type_name = '烟酒店'; + else if(this.defaultMerchantType == 4) this.mar_type_name = '超市'; else this.mar_type_name = '商户'; }, deep: true diff --git a/src/views/merchant/list/supermarket.vue b/src/views/merchant/list/supermarket.vue new file mode 100644 index 0000000..8201415 --- /dev/null +++ b/src/views/merchant/list/supermarket.vue @@ -0,0 +1,434 @@ + + + +