From d24b2ff3a3fc8c64f47f1dd1c07d1d69f5ae9e7d Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 19 Sep 2023 14:14:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E6=88=B7=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E5=AE=A1=E6=89=B9,=E5=BC=80=E9=80=9A=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/approve.js | 24 ++ components/merchantAudit/merchantAudit.vue | 53 ++- pages/oaExamine/oaExamine.vue | 81 +++- static/icons/close.png | Bin 0 -> 1770 bytes subpkg/merchantDetails/merchantDetails.vue | 458 +++++++++++++++------ 5 files changed, 470 insertions(+), 146 deletions(-) create mode 100644 api/approve.js create mode 100644 static/icons/close.png diff --git a/api/approve.js b/api/approve.js new file mode 100644 index 0000000..e05eecf --- /dev/null +++ b/api/approve.js @@ -0,0 +1,24 @@ +import oahttp from "@/utils/oahttp.js"; + +/** + * 审批类型 + */ +export const approveTypes = (data) => oahttp.get('/approve/approveType', data) + +/** + * 审批列表 + */ +export const approveLists = (data) => oahttp.get('/approve/lists', data) + +/** + * 审批详情 + */ +export const approveDetails = (data) => oahttp.post('/approve/detail', data) + +/** + * 审批 + */ +export const approveAudit = (data) => oahttp.post('/approve/audit', data) + + + diff --git a/components/merchantAudit/merchantAudit.vue b/components/merchantAudit/merchantAudit.vue index 2b2f7bb..6bbe981 100644 --- a/components/merchantAudit/merchantAudit.vue +++ b/components/merchantAudit/merchantAudit.vue @@ -3,9 +3,9 @@ - 爱读蛋糕 + {{extend.company_name}} - + 查看 @@ -13,39 +13,38 @@ - 商户姓名: - 某moods v你的伤口v技能大赛空军第三空间 + 审核类型: + {{datas.name}} - 未审核 - 已通过 - 未通过 + 审核中 + 已通过 + 未通过 商户分类: - 商超 + {{datas.category_name}} - 店铺分类: - 分类 + 店铺类型: + {{datas.type_name}} - 镇街店铺: - 店铺 + 店铺名称: + {{datas.mer_name}} 联系方式: - 1999999999 + {{extend.master_phone}} 申请时间: - 2023-09-09 + {{datas.create_time}} - - - - + + + @@ -54,11 +53,27 @@ + + .btn { + width: 694rpx; + height: 100rpx; + margin: 28rpx auto; + background-color: #0122c7; + border: 1rpx solid #0122c7; + color: #fff; + display: flex; + justify-content: center; + align-items: center; + } + + .popup { + width: 694rpx; + border-radius: 26rpx; + background-color: #fff; + overflow: hidden; + + .header { + text-align: center; + background-color: #0122c7; + color: #fff; + font-size: 32rpx; + height: 100rpx; + line-height: 100rpx; + position: relative; + + image { + width: 50rpx; + height: 50rpx; + position: absolute; + right: 28rpx; + top: 50%; + transform: translate(0, -50%); + } + } + + .textarea { + margin: 0 28rpx; + margin-top: 8rpx; + padding: 28rpx; + background-color: #f4f4f4; + font-size: 32rpx !important; + border-radius: 26rpx; + } + + .p_btn { + margin: 28rpx; + display: flex; + justify-content: space-between; + + .right_btn { + display: flex; + align-items: center; + + .cal { + width: 150rpx; + font-size: 30rpx; + height: 86rpx; + line-height: 86rpx; + border-radius: 43rpx; + font-size: 30rpx; + } + + .pri { + background-color: #0122c7; + color: #fff; + width: 238rpx; + height: 86rpx; + line-height: 86rpx; + border-radius: 43rpx; + font-size: 30rpx; + } + } + } + } + + .refuse{ + width: 694rpx; + padding: 28rpx; + margin: 0 auto; + margin-bottom: 28rpx; + border-radius: 26rpx; + // border: 1px solid #ff7c32; + background-color: rgba(#ff7c32, 0.2); + color: #ff7c32; + } + \ No newline at end of file