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/assets/scss/modules/wx-mini/index-set.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss index 120a804..4e15641 100644 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss +++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss @@ -86,7 +86,7 @@ } .mw-show { - padding: 40px 0 100px; + padding-top: 40px; &.z-preview { position: fixed; z-index: 100000; @@ -108,7 +108,7 @@ } .mw-phone { - margin: 50px auto; + margin: 50px auto; min-height: 540px; // box-shadow: 0 0 0 8px rgba(#000, 0.1); .d-cpt-operate { @@ -129,7 +129,8 @@ position: relative; margin: 0 auto; width: 375px; - min-height: 500px; + height: 560px; + overflow: auto; background-color: #ffffff; background-color: #f7f6f9; box-shadow: 0 5px 15px 1px rgba(0, 0, 0, 0.2); @@ -232,16 +233,16 @@ position: absolute; top: -1000px; bottom: -1000px; - right: -50px; + right: 0px; width: 50px; padding: 5px 0; height: 200px; margin: auto 0; border-radius: 0 4px 4px 0; - border-left: 1px solid #bb5; + border: 1px solid #bb5; background-color: #ffffff; text-align: center; - + z-index: 1000; &.z-small { height: 71px; } @@ -1138,3 +1139,25 @@ } } } + +.d-set-banners { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10px; + .upload-demos { + display: block; + width: 20px; + height: 20px; + color: #ccc; + text-align: center; + line-height: 18px; + border: 1px dashed #ccc; + overflow: hidden; + border-radius: 50%; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; + -ms-border-radius: 50%; + -o-border-radius: 50%; +} +} \ 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/customer/customize/MiniHome.vue b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue index 26bb2c3..6ca1920 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue @@ -179,6 +179,19 @@ {{ focusedCpt.configurationDescription }} + +
+ Banner图 + + + +
@@ -512,7 +525,8 @@ export default { lastSavedCptList: [], focusedCpt: { tempOnlyId: '' - } + }, + uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/customerlogo/upload' } }, @@ -893,6 +907,32 @@ export default { if (loading) { loading.close() } + }, + // 上传爱心互助banner图 + beforeBannerUpload (file) { + console.log('file', file.size / 1024) + let testmsg = file.name.substring(file.name.lastIndexOf('.') + 1) + const imgs = ['png', 'PNG'] + const extension = imgs.includes(testmsg) + const isLt2M = file.size / 1024 < 100 + + if (!extension) { + this.$message.error('上传图片只能是png格式!') + } + if (!isLt2M) { + this.$message.error('上传图片大小不能超过 100KB!') + } + return extension && isLt2M + }, + handleBannerSuccess (res, file) { + console.log('res', res) + console.log('files', file) + if (res.code === 0 && res.msg === 'success') { + this.focusedCpt.configuration = { + url: res.data.url + } + this.focusedCpt.configuration = JSON.stringify(this.focusedCpt.configuration) + } } } } 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 @@