Skip to content

H
haoban-4
Commit d2e93403 by 无尘
Options

fix: 修改授权日志和回显

parent 4c0beaac
Showing with 115 additions and 17 deletions
public/index.html
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-07-16 16:37:05 * @Date: 2020-07-16 16:37:05
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-16 18:12:33 * @LastEditTime: 2020-07-29 18:13:39
--> -->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="cn"> <html lang="cn">
<head> <head>
...@@ -27,5 +27,6 @@ ...@@ -27,5 +27,6 @@
<script src="//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js"></script> <script src="//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js"></script> <script src="//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/layout.1.2.41.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/layout.1.2.41.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script>
</body> </body>
</html> </html>
src/api/merchantAuth.js
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-07-24 12:19:48 * @Date: 2020-07-24 12:19:48
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-28 16:49:16 * @LastEditTime: 2020-07-29 17:30:55
*/ */
import getFetch from './getFetch.js'; import getFetch from './getFetch.js';
...@@ -12,7 +12,7 @@ let api = { ...@@ -12,7 +12,7 @@ let api = {
getAuthEnterprise: '/auth-enterprise-list', // 获取授权商户列表 getAuthEnterprise: '/auth-enterprise-list', // 获取授权商户列表
getGroupList: '/department-list', // 获取 gic 分组列表 getGroupList: '/department-list', // 获取 gic 分组列表
getStoreList: '/store-list', // 获取 gic 门店 getStoreList: '/store-list', // 获取 gic 门店
getAuthDetail: '/audit-detail', // 获取授权详情（编辑时获取信息） getAuthDetail: '/enterprise-auth-detail', // 获取授权详情（编辑时获取信息）
getAuditLog: '/enterprise-auth-audit-list', // 获取审核日志 getAuditLog: '/enterprise-auth-audit-list', // 获取审核日志
cancelAudit: '/enterprise-auth-audit', // 取消审核 cancelAudit: '/enterprise-auth-audit', // 取消审核
getAuditLogDetail: '/enterprise-auth-audit-range-detail', // 获取审核日志变更详情 getAuditLogDetail: '/enterprise-auth-audit-range-detail', // 获取审核日志变更详情
......
src/components/company/store-auth-detail.vue
...@@ -103,7 +103,31 @@ export default { ...@@ -103,7 +103,31 @@ export default {
}; };
getAuditLogDetail(para) getAuditLogDetail(para)
.then(res => { .then(res => {
if (!!res.result.bindRange) {
res.result.bindRange = JSON.parse(res.result.bindRange);
}else {
res.result.bindRange = [];
}
if (!!res.result.shareRange) {
res.result.shareRange = JSON.parse(res.result.shareRange);
}else {
res.result.shareRange = [];
}
if (!!res.result.auditBindRange) {
res.result.auditBindRange = JSON.parse(res.result.auditBindRange);
}else {
res.result.auditBindRange = [];
}
if (!!res.result.auditShareRange) {
res.result.auditShareRange = JSON.parse(res.result.auditShareRange);
}else {
res.result.auditShareRange = [];
}
that.detailData = res.result || []; that.detailData = res.result || [];
that.showData = {
range: that.activeName == 'first' ? that.detailData.bindRange : that.detailData.shareRange,
auditRange: that.activeName == 'first' ? that.detailData.auditBindRange : that.detailData.auditShareRange,
}
}) })
.catch(function(error) { .catch(function(error) {
......
src/styles/font/demo_index.html
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe60e;</span>
<div class="name">失败</div>
<div class="code-name">&amp;#xe60e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe687;</span> <span class="icon iconfont">&#xe687;</span>
<div class="name">授权验证</div> <div class="name">授权验证</div>
<div class="code-name">&amp;#xe687;</div> <div class="code-name">&amp;#xe687;</div>
...@@ -165,6 +171,15 @@ ...@@ -165,6 +171,15 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont iconshibai"></span>
<div class="name">
失败
</div>
<div class="code-name">.iconshibai
</div>
</li>
<li class="dib">
<span class="icon iconfont iconshouquanyanzheng"></span> <span class="icon iconfont iconshouquanyanzheng"></span>
<div class="name"> <div class="name">
授权验证 授权验证
...@@ -321,6 +336,14 @@ ...@@ -321,6 +336,14 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconshibai"></use>
</svg>
<div class="name">失败</div>
<div class="code-name">#iconshibai</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconshouquanyanzheng"></use> <use xlink:href="#iconshouquanyanzheng"></use>
</svg> </svg>
<div class="name">授权验证</div> <div class="name">授权验证</div>
......
src/styles/font/iconfont.json
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "10600646",
"name": "失败",
"font_class": "shibai",
"unicode": "e60e",
"unicode_decimal": 58894
},
{
"icon_id": "2957800", "icon_id": "2957800",
"name": "授权验证", "name": "授权验证",
"font_class": "shouquanyanzheng", "font_class": "shouquanyanzheng",
......
src/styles/font/iconfont.svg
...@@ -20,6 +20,9 @@ Created by iconfont ...@@ -20,6 +20,9 @@ Created by iconfont
/> />
<missing-glyph /> <missing-glyph />
<glyph glyph-name="shibai" unicode="&#58894;" d="M512 879.483871C238.344258 879.483871 16.516129 657.655742 16.516129 384c0-273.655742 221.828129-495.483871 495.483871-495.483871 273.655742 0 495.483871 221.828129 495.483871 495.483871A495.483871 495.483871 0 0 1 512 879.483871z m0-929.032258C272.565677-49.548387 78.451613 144.565677 78.451613 384S272.565677 817.548387 512 817.548387 945.548387 623.434323 945.548387 384 751.434323-49.548387 512-49.548387zM687.269161 559.285677a30.967742 30.967742 0 0 1-43.965935 0L512 427.652129l-131.303226 131.633548a31.099871 31.099871 0 1 1-43.982451-43.982451l131.633548-131.303226-131.633548-131.303226a31.099871 31.099871 0 0 1 43.982451-43.965935L512 340.331355l131.303226-131.600516a31.099871 31.099871 0 0 1 43.965935 43.965935L555.668645 384l131.600516 131.303226a30.967742 30.967742 0 0 1 0 43.982451z" horiz-adv-x="1024" />
<glyph glyph-name="shouquanyanzheng" unicode="&#59015;" d="M768 128v42.667c0 23.563-19.101 42.666-42.659 42.666H298.66c-23.558 0-42.659-19.102-42.659-42.666V128h512z m-554.667 42.667c0 47.128 38.204 85.333 85.326 85.333H725.34c47.124 0 85.326-38.208 85.326-85.333v-85.334H213.333v85.334zM575.372 296.014c-6.842 19.572-10.618 38.655-10.766 55.49-0.087 9.918 1.062 19.247 3.766 27.907 3.746 12.002 10.4 22.593 20.734 30.407C620.956 433.903 640 471.33 640 512c0 70.692-57.308 128-128 128-70.692 0-128-57.308-128-128 0-40.689 19.061-78.132 50.938-102.215 10.32-7.797 17-18.37 20.772-30.358 2.734-8.686 3.9-18.042 3.82-27.985-0.137-16.86-3.925-35.956-10.797-55.543-4.728-13.477-10.771-26.881-18.012-39.899h162.661c-7.242 13.052-13.284 26.494-18.01 40.014z m107.295-82.68H341.333c67.885 56.888 88.525 146.814 67.885 162.408-41.236 31.154-67.885 80.594-67.885 136.258 0 94.257 76.41 170.667 170.667 170.667S682.667 606.257 682.667 512c0-55.638-26.624-105.058-67.827-136.214-20.453-15.466 0-105.564 67.827-162.453z" horiz-adv-x="1024" /> <glyph glyph-name="shouquanyanzheng" unicode="&#59015;" d="M768 128v42.667c0 23.563-19.101 42.666-42.659 42.666H298.66c-23.558 0-42.659-19.102-42.659-42.666V128h512z m-554.667 42.667c0 47.128 38.204 85.333 85.326 85.333H725.34c47.124 0 85.326-38.208 85.326-85.333v-85.334H213.333v85.334zM575.372 296.014c-6.842 19.572-10.618 38.655-10.766 55.49-0.087 9.918 1.062 19.247 3.766 27.907 3.746 12.002 10.4 22.593 20.734 30.407C620.956 433.903 640 471.33 640 512c0 70.692-57.308 128-128 128-70.692 0-128-57.308-128-128 0-40.689 19.061-78.132 50.938-102.215 10.32-7.797 17-18.37 20.772-30.358 2.734-8.686 3.9-18.042 3.82-27.985-0.137-16.86-3.925-35.956-10.797-55.543-4.728-13.477-10.771-26.881-18.012-39.899h162.661c-7.242 13.052-13.284 26.494-18.01 40.014z m107.295-82.68H341.333c67.885 56.888 88.525 146.814 67.885 162.408-41.236 31.154-67.885 80.594-67.885 136.258 0 94.257 76.41 170.667 170.667 170.667S682.667 606.257 682.667 512c0-55.638-26.624-105.058-67.827-136.214-20.453-15.466 0-105.564 67.827-162.453z" horiz-adv-x="1024" />
......
src/views/business/audit-log.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-29 14:56:28 * @LastEditTime: 2020-07-29 18:21:03
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -39,11 +39,13 @@ ...@@ -39,11 +39,13 @@
</el-table-column> </el-table-column>
<el-table-column prop="" label="门店绑定" show-overflow-tooltip> <el-table-column prop="" label="门店绑定" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.bindRange || '--' }} {{ scope.row.bindRange.map(ele => ele.storeGroupName).join(',') || scope.row.bindRange.map(ele => ele.storeInfoName).join(',') || '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="门店共享" show-overflow-tooltip> <el-table-column prop="" label="门店共享" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.shareRange || '--' }}</template> <template slot-scope="scope">
{{ scope.row.shareRange.map(ele => ele.storeGroupName).join(',') || scope.row.shareRange.map(ele => ele.storeInfoName).join(',') || '--' }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="提交人" show-overflow-tooltip> <el-table-column prop="" label="提交人" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -230,6 +232,20 @@ export default { ...@@ -230,6 +232,20 @@ export default {
}; };
getAuditLog(para) getAuditLog(para)
.then(res => { .then(res => {
if (!!res.result.result && !!res.result.result.length) {
res.result.result.forEach(ele => {
if (!!ele.bindRange) {
ele.bindRange = JSON.parse(ele.bindRange);
}else {
ele.bindRange = [];
}
if (!!ele.shareRange) {
ele.shareRange = JSON.parse(ele.shareRange);
}else {
ele.shareRange = [];
}
})
}
that.tableData = res.result.result || []; that.tableData = res.result.result || [];
that.total = res.result.totalCount; that.total = res.result.totalCount;
}) })
......
src/views/business/auth-merchant.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-29 14:02:19 * @LastEditTime: 2020-07-29 18:10:26
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-tooltip> </el-tooltip>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.bindStoreMode || '--' }} {{ scope.row.bindRange || '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="共享门店" show-overflow-tooltip> <el-table-column prop="" label="共享门店" show-overflow-tooltip>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</el-tooltip> </el-tooltip>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.shareStoreMode || '--' }} {{ scope.row.shareRange || '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="提交人" show-overflow-tooltip> <el-table-column prop="" label="提交人" show-overflow-tooltip>
......
src/views/business/new-auth-merchant.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-29 15:01:43 * @LastEditTime: 2020-07-29 18:06:03
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -321,6 +321,16 @@ export default { ...@@ -321,6 +321,16 @@ export default {
}; };
getAuthDetail(para) getAuthDetail(para)
.then(res => { .then(res => {
if (!!res.result.bindRange) {
res.result.bindRange = JSON.parse(res.result.bindRange);
}else {
res.result.bindRange = [];
}
if (!!res.result.shareRange) {
res.result.shareRange = JSON.parse(res.result.shareRange);
}else {
res.result.shareRange = [];
}
that.authForm = res.result || {}; that.authForm = res.result || {};
// 获取审核员数据 // 获取审核员数据
that.getAdminList(res.result.enterpriseId); that.getAdminList(res.result.enterpriseId);
......
src/views/enterprise/enterprise-set.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-28 17:43:37 * @LastEditTime: 2020-07-29 17:52:12
--> -->
<template> <template>
<div class="daily-set-wrap "> <div class="daily-set-wrap ">
...@@ -38,24 +38,24 @@ ...@@ -38,24 +38,24 @@
<div class="company-title m-b-20 m-t-30"><span class="color-303133 font-14 font-w-600">客户密钥维护</span></div> <div class="company-title m-b-20 m-t-30"><span class="color-303133 font-14 font-w-600">客户密钥维护</span></div>
<div class="company-info-body secret-body"> <div class="company-info-body secret-body">
<div class="m-b-20 secret-cell flex"> <div class="m-b-20 secret-cell flex">
<div> <div class=" secret-cell-title">
<el-tooltip class="item" effect="dark" content="用于获取登录小程序用户的手机号/姓名/部门信息。必填项" placement="top-start"> <span class="font-14 color-606266 common-bottom-border">自建应用：</span></el-tooltip> <el-tooltip class="item" effect="dark" content="用于获取登录小程序用户的手机号/姓名/部门信息。必填项" placement="top-start"> <span class="font-14 color-606266 common-bottom-border">自建应用：</span></el-tooltip>
</div> </div>
<div> <div>
<div class="self-app-info" v-for="(item, index) in tableData" :key="index+'app'"> <div class="self-app-info" v-for="(item, index) in tableData" :key="index+'app'">
<div class="self-app-item secret-name flex flex-space-between"> <div class="self-app-item secret-name flex flex-space-between">
<div><span class="font-14 color-303133">{{ item.secretName || '--'}}</span><span class="font-12 color-606266 p-l-15">{{ item.supdateTime | formatTimeStamp}}</span></div> <div><span class="font-14 color-303133">{{ item.secretName || '--'}}</span><span class="font-12 color-606266 p-l-15">编辑时间：{{ item.supdateTime | formatTimeStamp}}</span></div>
<div> <div>
<el-button type="text">编辑</el-button><el-button type="text">删除</el-button> <el-button type="text">编辑</el-button><el-button type="text">删除</el-button>
</div> </div>
</div> </div>
<div class="self-app-item"><span>Agentld：</span><span>{{item.agentId}}</span></div> <div class="self-app-item"><span class="font-14 color-606266 app-item-title">Agentld：</span><span class="font-14 color-303133">{{item.agentId}}</span></div>
<div class="self-app-item"> <div class="self-app-item">
<span>Secret：</span><span>{{item.secretVal}}</span><span class="p-l-15 font-14 color-303133" <span class="font-14 color-606266 app-item-title">Secret：</span><span class="font-14 color-303133">{{item.secretVal}}</span><span class="p-l-15 font-14 color-303133"
><span :class="['iconfont', item.checkFlag ? 'color-49c958 iconchenggong' : 'color-f83431 iconshibai']"></span><span class="p-l-10">{{ item.checkFlag ? '校验成功' : '校验失败' }}</span></span ><span :class="['iconfont', item.checkFlag ? 'color-49c958 iconchenggong' : 'color-f83431 iconshibai']"></span><span class="p-l-10">{{ item.checkFlag ? '校验成功' : '校验失败' }}</span></span
> >
</div> </div>
<div class="self-app-item"><span>应用可见范围：</span><span>{{item.displayRange.map(el=>el.name).join(';')}}</span></div> <div class="self-app-item"><span class="font-14 color-606266 app-item-title">应用可见范围：</span><span class="font-14 color-303133">{{item.displayRange.map(el=>el.name).join(';')}}</span></div>
</div> </div>
<div v-if="!tableData.length" class="add-self-app font-14 color-606266 cursor-pointer" @click="addSecret"><span class="iconfont icontianjiajiahaowubiankuang font-12"></span><span class="p-l-10">添加</span></div> <div v-if="!tableData.length" class="add-self-app font-14 color-606266 cursor-pointer" @click="addSecret"><span class="iconfont icontianjiajiahaowubiankuang font-12"></span><span class="p-l-10">添加</span></div>
</div> </div>
...@@ -295,6 +295,10 @@ export default { ...@@ -295,6 +295,10 @@ export default {
} }
.secret-cell { .secret-cell {
position: relative; position: relative;
.secret-cell-title {
height: 32px;
line-height: 32px;
}
.common-bottom-border { .common-bottom-border {
cursor: pointer; cursor: pointer;
padding-bottom: 2px; padding-bottom: 2px;
...@@ -302,12 +306,22 @@ export default { ...@@ -302,12 +306,22 @@ export default {
} }
.self-app-info { .self-app-info {
width: 545px; width: 545px;
margin-left: 12px;
.self-app-item { .self-app-item {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
&:nth-child(2) {
margin-top: 14px;
}
&.secret-name { &.secret-name {
border-bottom: 1px solid #e4e7ed; border-bottom: 1px solid #e4e7ed;
} }
.app-item-title {
display: inline-block;
width: 100px;
text-align: right;
margin-right: 10px;
}
} }
} }
.add-self-app { .add-self-app {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment