From 6c1ef9746c7b7b3cc8c2a2e26cf558df6e9aa9ec Mon Sep 17 00:00:00 2001
From: cclu
Date: Thu, 5 May 2022 19:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 2 +-
.../components/SelectShopList.vue | 45 +-
.../components/merchartInfoView.vue | 461 ++++++++++++++++++
.../components/shopApproval.vue | 23 +-
.../components/shopChangeState.vue | 6 +-
pages/authorityApproval/detail.vue | 85 ++--
pages/authorityApproval/index.vue | 152 +++++-
pages/index/components/menus.js | 17 +-
8 files changed, 709 insertions(+), 82 deletions(-)
create mode 100644 pages/authorityApproval/components/merchartInfoView.vue
diff --git a/manifest.json b/manifest.json
index 42bde29..aa7a2b4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -73,7 +73,7 @@
}
},
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"mp-alipay" : {
diff --git a/pages/authorityApproval/components/SelectShopList.vue b/pages/authorityApproval/components/SelectShopList.vue
index f19cb32..3040a6b 100644
--- a/pages/authorityApproval/components/SelectShopList.vue
+++ b/pages/authorityApproval/components/SelectShopList.vue
@@ -1,11 +1,22 @@
-
-
-
- {{item.label}}
+
+
+
+ {{item.node.label}}
+
+
+ {{child.label}}
+
+
+
+
+
+
+ {{item.label}}
+
+
-
@@ -43,23 +54,23 @@
box-sizing border-box !important
width auto !important
}
- .card {
+ .select-card {
background-color #FFFFFF
border-radius: 12rpx;
padding 24rpx 24rpx
max-height 900rpx
overflow auto
- }
- .row {
- display flex;
- align-items center
- border-bottom 1px solid #F0F0F0
- line-height 2
- padding 24rpx 0
- justify-content space-between
- }
- .row:last-child {
- border none
+ .select-row {
+ display flex;
+ align-items center
+ border-bottom 1px solid #F0F0F0
+ line-height 2
+ padding 24rpx 0
+ justify-content space-between
+ }
+ .select-row:last-child {
+ border none
+ }
}
.confirm-btn {
margin: 40rpx auto;
diff --git a/pages/authorityApproval/components/merchartInfoView.vue b/pages/authorityApproval/components/merchartInfoView.vue
new file mode 100644
index 0000000..16b1b29
--- /dev/null
+++ b/pages/authorityApproval/components/merchartInfoView.vue
@@ -0,0 +1,461 @@
+
+
+
+ 商户资料申请
+
+ 日期:{{data.OPERATE_DATE}}
+ {{stateEmun[data.PERMISSIONAPPLY_STATE]}}
+
+
+
+
+
+ 商户门店开通
+
+
+
+
+
+
+
+ {{data.SERVERPART_NAME ||'-'}}
+
+
+
+
+
+
+
+ {{data.APPLYSHOP_NAME||'-'}}
+
+
+
+
+
+
+
+ 商户资料详情
+
+
+
+
+ 身份证号
+
+
+ {{data.USER_IDCARD||'-'}}
+
+
+
+
+ 身份证照
+
+
+
+
+
+
+
+
+ 经营商户
+
+
+ {{data.BUSINESSMAN_NAME||'-'}}
+
+
+
+
+ 营业执照
+
+
+
+
+
+
+
+
+
+
+ 审批意见
+
+
+
+
+
+ {{data.APPOVED_INFO||''}}
+
+
+
+
+ 否决
+ 授权门店
+
+
+
+
+
+
+
+ 开通门店
+
+
+
+ {{item.label}}
+
+ {{shop.label}}
+
+
+
+
+
+
+
+
+
+ 商户门店开通
+
+
+
+
+
+
+
+ {{data.SERVERPART_NAME ||'-'}}
+
+
+
+
+
+
+
+ {{data.APPLYSHOP_NAME||'-'}}
+
+
+
+
+
+ 门店授权
+
+
+ 已选
+ {{selectShopids.length}}
+ 家门店
+
+
+
+
+
+
+ 返回
+ 确认授权
+
+
+
+
+
+
+
+
diff --git a/pages/authorityApproval/components/shopApproval.vue b/pages/authorityApproval/components/shopApproval.vue
index 830128e..7ed35e4 100644
--- a/pages/authorityApproval/components/shopApproval.vue
+++ b/pages/authorityApproval/components/shopApproval.vue
@@ -15,16 +15,13 @@
-
-
+
{{data.SERVERPART_NAME ||'-'}}
-
-
-
-
+
+
{{data.APPLYSHOP_NAME||'-'}}
@@ -44,12 +41,12 @@
{{data.USER_IDCARD||'-'}}
-
+
身份证照
-
-
+
+
@@ -66,7 +63,7 @@
营业执照
-
+
@@ -103,7 +100,7 @@
已授权门店
-
+
{{item.label}}
@@ -390,10 +387,10 @@
}
.select-item {
background: #f6f9fe;
- border none;
border-radius: 12rpx;
- padding 24rpx
+ padding 24rpx
margin-top 24rpx
+ line-height 2
}
}
.back-btn {
diff --git a/pages/authorityApproval/components/shopChangeState.vue b/pages/authorityApproval/components/shopChangeState.vue
index 12930a2..58387cb 100644
--- a/pages/authorityApproval/components/shopChangeState.vue
+++ b/pages/authorityApproval/components/shopChangeState.vue
@@ -7,7 +7,7 @@
{{stateEmun[data.PERMISSIONAPPLY_STATE]}}
-
+
变更情况
@@ -18,7 +18,7 @@
{{shopDetail.SHOPNAME}}
-
+
{{data.SERVERPART_NAME}}
@@ -46,7 +46,7 @@
:value="approvalReason"
placeholder="请输入"
placeholder-style="color:#969EA4;line-height:2;padding-top:10rpx;"
- auto-height
+ auto-height
@blur="changeReason"
v-if="data.PERMISSIONAPPLY_STATE===2000"
auto-focus
diff --git a/pages/authorityApproval/detail.vue b/pages/authorityApproval/detail.vue
index 6044c09..460bd72 100644
--- a/pages/authorityApproval/detail.vue
+++ b/pages/authorityApproval/detail.vue
@@ -1,71 +1,90 @@
-
+
-
+
-
+
-
-
-
+
+
+
+
+
diff --git a/pages/index/components/menus.js b/pages/index/components/menus.js
index 1818fb6..f239c10 100644
--- a/pages/index/components/menus.js
+++ b/pages/index/components/menus.js
@@ -57,14 +57,15 @@ const yewu = [{
"imagePath": "/static/images/index/aqwd.png",
"noImagePath": "/static/images/index/aqwd-no.png",
"homeUrl": "/pages/webview/webview?name=questionnaire"
- },{
- "name": "考勤打卡",
- "id": "ff04b551-c382-4638-a947-f95c42387ada",
- "modelName": "positionPunching",
- "imagePath": "/static/images/index/kqdk.png",
- "noImagePath": "/static/images/index/kqdk-no.png",
- "homeUrl": "/pages/additionalFeatures/positionPunching"
- }
+ },
+ // {
+ // "name": "考勤打卡",
+ // "id": "ff04b551-c382-4638-a947-f95c42387ada",
+ // "modelName": "positionPunching",
+ // "imagePath": "/static/images/index/kqdk.png",
+ // "noImagePath": "/static/images/index/kqdk-no.png",
+ // "homeUrl": "/pages/additionalFeatures/positionPunching"
+ // }
];
const scene = [{
"name": "扫一扫",