From eaadab762a6bf1688ae0644966cc745822921f68 Mon Sep 17 00:00:00 2001 From: yangxin <2509699647@qq.com> Date: Fri, 28 Feb 2025 18:25:31 +0800 Subject: [PATCH] '最新' --- admin-web-master/src/utils/request.js | 4 ++-- admin-web-master/src/views/activity/activitySp.vue | 38 +++++++++++++++++++++++++------------- admin-web-master/src/views/activity/index.vue | 24 ++++++++++++++++++------ admin-web-master/src/views/atmosphere/atmosphereGl.vue | 10 ++++++++++ admin-web-master/src/views/atmosphere/atmosphereSp.vue | 35 ++++++++++++++++++++--------------- admin-web-master/src/views/media/mediaMana.vue | 10 ++++++++++ admin-web-master/src/views/promotion/account.vue | 10 ++++++++++ admin-web-master/src/views/promotion/audit.vue | 2 +- lvdao-miniapp/main.js | 8 ++++---- lvdao-miniapp/manifest.json | 2 +- 10 files changed, 101 insertions(+), 42 deletions(-) diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 3460ae7..9e2d43b 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -16,8 +16,8 @@ let hostall = window.location.href; let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - // baseURL = 'http://128.10.249.21:9003'; + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; + baseURL = 'http://128.10.249.34:9003'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; // baseURL = 'http://192.168.2.225:9003'; diff --git a/admin-web-master/src/views/activity/activitySp.vue b/admin-web-master/src/views/activity/activitySp.vue index 6d26c95..ee487e8 100644 --- a/admin-web-master/src/views/activity/activitySp.vue +++ b/admin-web-master/src/views/activity/activitySp.vue @@ -1018,14 +1018,30 @@ -
+ +
+ +
+ + + + 通过 + 不通过 + + + + + + +
+
取消 @@ -1033,6 +1049,7 @@
+ @@ -1434,7 +1451,8 @@ if (this.liuYe == 1) { xiangedit({ id: this.secondData.id, - state: '5' + state: '5', + auditOpinion:this.secondData.auditOpinion }).then(res => { this.$message({ message: '保存成功', @@ -1445,7 +1463,8 @@ } else { xiangedit({ id: this.secondData.id, - state: '6' + state: '6', + auditOpinion:this.secondData.auditOpinion }).then(res => { this.$message({ message: '保存成功', @@ -1713,9 +1732,7 @@ height: 50px; } - /deep/ .el-form--label-top .el-form-item__label { - padding: 0; - } + .pagination { text-align: right; @@ -1829,11 +1846,6 @@ border-color: #3F9B6A } - ::v-deep .el-form-item__label { - font-weight: normal; - font-size: 12px; - } - .fenlan { diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue index 7665b08..9a61e62 100644 --- a/admin-web-master/src/views/activity/index.vue +++ b/admin-web-master/src/views/activity/index.vue @@ -2066,12 +2066,14 @@ } this.xinlei = true }, - xinFenlei(node,data){ - if(data){ - this.xinADD.parentId = data.id - } - this.xinlei = true - }, + editFenlei(node, data) { + this.editFen = 1 + if (data) { + this.xinADD.parentId = data.id + this.xinADD.classificationName = data.classificationName + } + this.xinlei = true + }, sevLei() { this.$refs.fenFrom.validate((valid) => { if (valid) { @@ -2086,6 +2088,11 @@ parentId: '', classificationType: '0' } + this.$message({ + message: '保存成功', + type: 'success', + offset: 100 + }) this.getAll() }) } else { @@ -2100,6 +2107,11 @@ parentId: '', classificationType: '0' } + this.$message({ + message: '保存成功', + type: 'success', + offset: 100 + }) this.getAll() }) } diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue index d6bf293..5a0d6e9 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue @@ -2024,6 +2024,11 @@ parentId: '', classificationType: '1' } + this.$message({ + message: '保存成功', + type: 'success', + offset: 100 + }) this.getAll() }) } else { @@ -2038,6 +2043,11 @@ parentId: '', classificationType: '1' } + this.$message({ + message: '保存成功', + type: 'success', + offset: 100 + }) this.getAll() }) } diff --git a/admin-web-master/src/views/atmosphere/atmosphereSp.vue b/admin-web-master/src/views/atmosphere/atmosphereSp.vue index 5e53654..08f05e4 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereSp.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereSp.vue @@ -1123,12 +1123,24 @@
- - - 通过 - 不通过 - -
+ +
+ + + + 通过 + 不通过 + + + + + + +
+ + +
取消 @@ -1508,7 +1520,7 @@ }, OAshen(){ if(this.liuYe == 1){ - xiangedit({id:this.secondData.id,state:'5'}).then(res=>{ + xiangedit({id:this.secondData.id,state:'5',auditOpinion:this.secondData.auditOpinion}).then(res=>{ this.$message({ message: '保存成功', type: 'success' @@ -1516,7 +1528,7 @@ this.getAll() }) }else{ - xiangedit({id:this.secondData.id,state:'6'}).then(res=>{ + xiangedit({id:this.secondData.id,state:'6',auditOpinion:this.secondData.auditOpinion}).then(res=>{ this.$message({ message: '保存成功', type: 'success' @@ -1766,9 +1778,6 @@ height: 50px; } - /deep/ .el-form--label-top .el-form-item__label { - padding: 0; - } .pagination { text-align: right; @@ -1877,10 +1886,6 @@ border-color: #3F9B6A } - ::v-deep .el-form-item__label { - font-weight: normal; - font-size: 12px; - } diff --git a/admin-web-master/src/views/media/mediaMana.vue b/admin-web-master/src/views/media/mediaMana.vue index 5f2791e..bcf5807 100644 --- a/admin-web-master/src/views/media/mediaMana.vue +++ b/admin-web-master/src/views/media/mediaMana.vue @@ -968,6 +968,11 @@ this.$refs.mulTable.clearSelection(); // 清除所有选项 parentId: '', classificationType: '3' } + this.$message({ + message: '保存成功', + type: 'success', + offset: 100 + }) this.getAll() }) } else { @@ -982,6 +987,11 @@ this.$refs.mulTable.clearSelection(); // 清除所有选项 parentId: '', classificationType: '3' } + this.$message({ + message: '保存成功', + type: 'success', + offset: 100 + }) this.getAll() }) } diff --git a/admin-web-master/src/views/promotion/account.vue b/admin-web-master/src/views/promotion/account.vue index cbf5b39..b962d38 100644 --- a/admin-web-master/src/views/promotion/account.vue +++ b/admin-web-master/src/views/promotion/account.vue @@ -613,6 +613,11 @@ this.currentPage = val parentId: '', classificationType: '2' } + this.$message({ + message: '保存成功', + type: 'success', + offset: 100 + }) this.getAll() }) } else { @@ -627,6 +632,11 @@ this.currentPage = val parentId: '', classificationType: '2' } + this.$message({ + message: '保存成功', + type: 'success', + offset: 100 + }) this.getAll() }) } diff --git a/admin-web-master/src/views/promotion/audit.vue b/admin-web-master/src/views/promotion/audit.vue index 766781b..4eccaa9 100644 --- a/admin-web-master/src/views/promotion/audit.vue +++ b/admin-web-master/src/views/promotion/audit.vue @@ -105,7 +105,7 @@
- +
{{secondData.auditOpinion}}
 diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js index 8455df8..a563597 100644 --- a/lvdao-miniapp/main.js +++ b/lvdao-miniapp/main.js @@ -8,13 +8,13 @@ import uView from "uview-ui"; import DialogBox from './components/DialogBox/DialogBox'; // let hostall = window.location.href; // let c1 = hostall.split('cdwlMall')[0]; -// let c1 = 'https://jy.scjysm.asia:18086/' -let c1 = 'https://zhgw-uat.028wlkj.com/' +let c1 = 'https://jy.scjysm.asia:18086/' +// let c1 = 'https://zhgw-uat.028wlkj.com/' Vue.config.productionTip = false Vue.prototype.$http = http Vue.prototype.$imgUrl = (url) => { - // return (c1 + "cdwlMall/questionnaire/file/static" + url); - return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url); + return (c1 + "cdwlMall/questionnaire/file/static" + url); + // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url); } Vue.prototype.$img = c1+ 'cdwlMall' // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload" diff --git a/lvdao-miniapp/manifest.json b/lvdao-miniapp/manifest.json index c759f17..ac3b56a 100644 --- a/lvdao-miniapp/manifest.json +++ b/lvdao-miniapp/manifest.json @@ -1,6 +1,6 @@ { "name" : "绿道", - "appid" : "__UNI__189D96A", + "appid" : "__UNI__F034047", "description" : "", "versionName" : "1.0.2", "versionCode" : "100", -- libgit2 0.21.4