diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development index a0c4498..39d3f80 100644 --- a/epmet-oper-web/.env.development +++ b/epmet-oper-web/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development VUE_APP_API_SERVER = http://192.168.1.130:8080/api -# VUE_APP_API_SERVER = http://10.10.10.17:8080/api +# VUE_APP_API_SERVER = http://192.168.51.36:8080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api -VUE_APP_NODE_ENV=dev \ No newline at end of file +VUE_APP_NODE_ENV=dev \ No newline at end of file diff --git a/epmet-oper-web/src/js/columns/code/draft.js b/epmet-oper-web/src/js/columns/code/draft.js new file mode 100644 index 0000000..6ec15fe --- /dev/null +++ b/epmet-oper-web/src/js/columns/code/draft.js @@ -0,0 +1,36 @@ +export default{ + list:[ + { + key: 'draftId', + title: '草稿 id', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 60 + }, + { + key: 'userVersion', + title: '版本号', + type: 'input', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 60 + }, + { + key: 'userDesc', + title: '版本描述', + display: ['formA', 'formU', 'table', 'model'], + block: true, + width: 200 + }, + { + key: 'createTime', + title: '上传时间', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 80 + } + ] +} diff --git a/epmet-oper-web/src/js/columns/code/temp.js b/epmet-oper-web/src/js/columns/code/temp.js index 6154f12..a0beec5 100644 --- a/epmet-oper-web/src/js/columns/code/temp.js +++ b/epmet-oper-web/src/js/columns/code/temp.js @@ -29,11 +29,11 @@ export default [ }, { key: 'userDesc', - title: '代码描述', + title: '版本描述', type: 'textarea', rule: [{ required: true, - message: '请输入代码描述', + message: '请输入版本描述', trigger: 'blur' }], display: ['formA', 'formU', 'table', 'model'], diff --git a/epmet-oper-web/src/js/columns/columns.js b/epmet-oper-web/src/js/columns/columns.js index 0803124..e504f30 100644 --- a/epmet-oper-web/src/js/columns/columns.js +++ b/epmet-oper-web/src/js/columns/columns.js @@ -7,6 +7,7 @@ import Temp from './code/temp' import CommitCode from './code/commitCode' import OperHistory from './code/operHistory' import Category from './code/category' +import Draft from './code/draft' // 产品配置 import CustomizedFunction from './miniPro/customizedFunction' @@ -23,6 +24,7 @@ export default { MiniProList: miniProManage, // 客户管理——代小程序管理——客户小程序列表 Temp: Temp, // 客户管理——代小程序管理——版本管理——模板list + DraftList: Draft['list'], // 客户管理——代小程序管理——模板管理——草稿list CommitCodeList: CommitCode['list'], // 客户管理——代小程序管理——版本管理——代码上传——已上传的代码列表 CommitCodeForm: CommitCode['form'], // 客户管理——代小程序管理——版本管理——代码上传——代码form OperHistory: OperHistory, // 客户管理——代小程序管理——版本管理——操作历史 diff --git a/epmet-oper-web/src/js/columns/customer/manage/customer.js b/epmet-oper-web/src/js/columns/customer/manage/customer.js index 38fb175..bc66c80 100644 --- a/epmet-oper-web/src/js/columns/customer/manage/customer.js +++ b/epmet-oper-web/src/js/columns/customer/manage/customer.js @@ -168,6 +168,9 @@ export default { trigger: 'blur' } ], + option:{ + max:1000 + }, fixed: false, block: true, width: 100 diff --git a/epmet-oper-web/src/views/components/CTableNoPage.vue b/epmet-oper-web/src/views/components/CTableNoPage.vue index 63df8d4..425327e 100644 --- a/epmet-oper-web/src/views/components/CTableNoPage.vue +++ b/epmet-oper-web/src/views/components/CTableNoPage.vue @@ -103,7 +103,7 @@ 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 fe447bb..249955d 100644 --- a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue @@ -299,14 +299,16 @@ export default { }) }, mounted () { - this.tableParams.source = this.env + this.tableParams.source = this.env + console.log("客户初始化列表------本地环境-----------------") + console.log(this.env) if (this.env === 'test') {//测试 - this.workAppid = config.appId.devWorkAppid - this.resiAppid = config.appId.devResiAppid - } else if (this.env === 'prod') {//生产 this.workAppid = config.appId.testWorkAppid this.resiAppid = config.appId.testResiAppid + } else if (this.env === 'prod') {//生产 + this.workAppid = config.appId.prodWorkAppid + this.resiAppid = config.appId.prodResiAppid } else {//开发 this.workAppid = config.appId.devWorkAppid this.resiAppid = config.appId.devResiAppid @@ -423,7 +425,7 @@ export default { this.dataListLoading = true this.selCustomerId = customerId // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcustomerlist', - const url = '/third/subscribe/getcustomerlist' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getcustomerlist' let params = { customerId: customerId, workAppId: this.workAppid, @@ -473,7 +475,7 @@ export default { this.startLoading() // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/init' - const url = '/third/subscribe/init' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/init' let params = { customerId: this.selCustomerId, diff --git a/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue index 05cc220..0c4ef74 100644 --- a/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue +++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue @@ -144,6 +144,7 @@ export default { // } // } ], + // 版本管理相关 showVersion: false, @@ -204,6 +205,16 @@ export default { }) }, + // 显示模板管理 + okTemp () { + this.showTemo = false + this.refresh() + }, + // 显示模板管理取消返回 + cancelTemp () { + this.showTemo = false + }, + // 显示版本管理 versionManage (row) { this.showVersion = true @@ -212,8 +223,8 @@ export default { // 显示版本确定 okVersion () { - this.showVersion = false - this.refresh() + // this.showVersion = false + // this.refresh() }, // 显示版本取消返回 cancelVersion () { diff --git a/epmet-oper-web/src/views/modules/productConfig/MiniDraft.vue b/epmet-oper-web/src/views/modules/productConfig/MiniDraft.vue new file mode 100644 index 0000000..7569918 --- /dev/null +++ b/epmet-oper-web/src/views/modules/productConfig/MiniDraft.vue @@ -0,0 +1,216 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue b/epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue index 41e1c05..e77675b 100644 --- a/epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue +++ b/epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue @@ -100,7 +100,7 @@ export default { async loadData () { this.dataListLoading = true // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/gettemplate' - const url = '/third/subscribe/gettemplate' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/gettemplate' const params = { appId: this.appId } @@ -142,7 +142,7 @@ export default { async del (row) { this.startLoading() // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/deltemplate' - const url = '/third/subscribe/deltemplate' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/deltemplate' const params = { appId: this.appId, priTmplId: row.priTmplId diff --git a/epmet-oper-web/src/views/modules/productConfig/subscribe/TempEdit.vue b/epmet-oper-web/src/views/modules/productConfig/subscribe/TempEdit.vue index a2df4b8..7fa2e73 100644 --- a/epmet-oper-web/src/views/modules/productConfig/subscribe/TempEdit.vue +++ b/epmet-oper-web/src/views/modules/productConfig/subscribe/TempEdit.vue @@ -109,7 +109,7 @@ @@ -167,7 +167,7 @@ export default { async getkeywords () { this.startLoading() // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getkeywords' - const url = '/third/subscribe/getkeywords' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getkeywords' let _data = { appId: this.resiAppid, titleId: this.dataForm.tid @@ -219,7 +219,7 @@ export default { return false } // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/addtemplate' - const url = '/third/subscribe/addtemplate' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/addtemplate' this.dataForm.kidList = this.kidSelIdList this.dataForm.nameList = this.kidSelNameList console.log(this.dataForm) diff --git a/epmet-oper-web/src/views/modules/productConfig/subscribe/TempList.vue b/epmet-oper-web/src/views/modules/productConfig/subscribe/TempList.vue index 16bdd34..962ba7d 100644 --- a/epmet-oper-web/src/views/modules/productConfig/subscribe/TempList.vue +++ b/epmet-oper-web/src/views/modules/productConfig/subscribe/TempList.vue @@ -150,13 +150,14 @@ export default { mounted () { this.activeName = 'mine' - + console.log("模板列表------本地环境-----------------") + console.log(this.env) if (this.env === 'test') {//测试 - this.workAppid = config.appId.devWorkAppid - this.resiAppid = config.appId.devResiAppid - } else if (this.env === 'prod') {//生产 this.workAppid = config.appId.testWorkAppid this.resiAppid = config.appId.testResiAppid + } else if (this.env === 'prod') {//生产 + this.workAppid = config.appId.prodWorkAppid + this.resiAppid = config.appId.prodResiAppid } else {//开发 this.workAppid = config.appId.devWorkAppid this.resiAppid = config.appId.devResiAppid @@ -187,7 +188,7 @@ export default { async renderSelData () { // 渲染下拉框/单选框/复选框等数据 // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcategory' - const url = '/third/subscribe/getcategory' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getcategory' let params = { appId: this.resiAppid } @@ -204,7 +205,7 @@ export default { async loadData () { this.dataListLoading = true // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getpubtemplatetitles' - const url = '/third/subscribe/getpubtemplatetitles' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getpubtemplatetitles' this.tableParams.appId = this.resiAppid @@ -268,8 +269,8 @@ export default { //同步本地和微信的公共模板库 async syncSub () { this.startLoading() - const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/syncpubtemplatetitles' - // const url = '/third/subscribe/syncpubtemplatetitles' + // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/syncpubtemplatetitles' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/syncpubtemplatetitles' let params = { customerId: this.selCustomerId, diff --git a/epmet-oper-web/src/views/modules/productConfig/topicConfig/TopicConfig.vue b/epmet-oper-web/src/views/modules/productConfig/topicConfig/TopicConfig.vue index 4f0643c..21cccac 100644 --- a/epmet-oper-web/src/views/modules/productConfig/topicConfig/TopicConfig.vue +++ b/epmet-oper-web/src/views/modules/productConfig/topicConfig/TopicConfig.vue @@ -1,11 +1,11 @@