From 27a69986e267e3a7e77c9f5e2f724e70b7974697 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 7 Sep 2020 11:09:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=8E=B7?= =?UTF-8?q?=E5=8F=96token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modules/customer/init/RegisterList.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue index f60ad49..f330d24 100644 --- a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue @@ -139,11 +139,11 @@ export default { plain: false, methodName: 'showToken', // 回调方法名称 isShow: (row) => { - if (this.env !== 'prod') { - return true - } else { - return false - } + // if (this.env !== 'prod') { + return true + // } else { + // return false + // } } } ], From bbad221885fc4be056349ea95b6f3b43ed56d84b Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 7 Sep 2020 15:25:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=BA=94=E7=94=A8-?= =?UTF-8?q?=E5=86=85=E9=83=A8=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/public/index.html | 124 +++++++++--------- epmet-oper-web/src/js/ajax.js | 9 +- .../src/js/columns/miniPro/partnerApp.js | 70 +++++----- .../src/views/modules/partner/app/edit.vue | 120 ++++++++++------- 4 files changed, 182 insertions(+), 141 deletions(-) diff --git a/epmet-oper-web/public/index.html b/epmet-oper-web/public/index.html index a1ebda1..ec49444 100644 --- a/epmet-oper-web/public/index.html +++ b/epmet-oper-web/public/index.html @@ -1,69 +1,71 @@ - - - - - - - - + + + + + + - - <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> - - + + + + <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> + + - - - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> - - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> - - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> - - <% } %> - + + <% } %> + + <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> + + <% } %> + + <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> + + <% } %> + + <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> + + <% } %> + + + +
+ - -
- - + \ No newline at end of file diff --git a/epmet-oper-web/src/js/ajax.js b/epmet-oper-web/src/js/ajax.js index a6d28f3..367d22e 100644 --- a/epmet-oper-web/src/js/ajax.js +++ b/epmet-oper-web/src/js/ajax.js @@ -179,15 +179,16 @@ export default { .then((res) => { if (res) { if (res.status === 200) { + var data = res.data - if (data.sysresultcode === 'success') { + if (data.code == 0) { //业务成功 if (typeof cb_su === 'function') { - cb_su(data.data, data.rspMsg) + cb_su(data.data, data.msg + "：" + data.internalMsg) } - } else if (data.sysresultcode === 'fail') { + } else { //业务失败 - if (typeof cb_err === 'function') cb_err(data.rspMsg, data.data) + if (typeof cb_err === 'function') cb_err(data.msg + "：" + data.internalMsg, data.data) } } else { if (typeof cb_err === 'function') cb_err(res) diff --git a/epmet-oper-web/src/js/columns/miniPro/partnerApp.js b/epmet-oper-web/src/js/columns/miniPro/partnerApp.js index 2fa713c..4cc2859 100644 --- a/epmet-oper-web/src/js/columns/miniPro/partnerApp.js +++ b/epmet-oper-web/src/js/columns/miniPro/partnerApp.js @@ -1,33 +1,41 @@ export default [{ - key: 'appId', - title: '应用id', - display: ['formA', 'formU', 'table', 'model'], - fixed: false, - block: true, - width: 100 - }, - { - key: 'appName', - title: '应用名称', - display: ['formA', 'formU', 'table', 'model'], - fixed: false, - block: true, - width: 100 - }, - { - key: 'customerName', - title: '所属客户', - display: ['formA', 'formU', 'table', 'model'], - fixed: false, - block: true, - width: 100 - }, - { - key: 'secret', - title: '秘钥', - display: ['formA', 'formU', 'table', 'model'], - fixed: false, - block: true, - width: 200 - }, + key: 'appId', + title: '应用id', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 100 +}, +{ + key: 'appName', + title: '应用名称', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 100 +}, +{ + key: 'customerName', + title: '所属客户', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 100 +}, +{ + key: 'customerTypeName', + title: '客户类型', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 100 +}, +{ + key: 'secret', + title: '秘钥', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 200 +}, ] \ No newline at end of file diff --git a/epmet-oper-web/src/views/modules/partner/app/edit.vue b/epmet-oper-web/src/views/modules/partner/app/edit.vue index 49daf8b..8f5b5c6 100644 --- a/epmet-oper-web/src/views/modules/partner/app/edit.vue +++ b/epmet-oper-web/src/views/modules/partner/app/edit.vue @@ -1,46 +1,46 @@