diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 4c83187..f9d13b0 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,6 +17,7 @@ let baseURL = ''
if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
// baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
baseURL = 'http://192.168.2.225:9003';
+ // baseURL = 'http://192.168.2.36:9003';
} else {
console.error('---------------------')
console.error(hostall)
diff --git a/admin-web-master/src/views/activity/activityBz.vue b/admin-web-master/src/views/activity/activityBz.vue
index 13a093e..7cee96a 100644
--- a/admin-web-master/src/views/activity/activityBz.vue
+++ b/admin-web-master/src/views/activity/activityBz.vue
@@ -119,8 +119,9 @@
-
-
+
+ changimg(e,'coverPoster')">
+
@@ -280,13 +281,14 @@
@@ -382,6 +384,7 @@
} from '@/utils/request'
import html2canvas from 'html2canvas'
import jsPDF from 'jspdf'
+ import upfile from "@/components/fujianUpload/fujianList"
export default {
props: {
showAdd: {
@@ -398,7 +401,8 @@
name: 'activityBz',
components: {
wangEditor,
- upimg
+ upimg,
+ upfile
},
data() {
@@ -509,6 +513,10 @@ lishiList:'',
this.lishi()
},
methods: {
+ changimg(e,type) {
+ this.ruleForm[type] = e
+ console.log(e)
+ },
//获取当前时间
updateCurrentTime() {
const now = new Date();
@@ -543,6 +551,7 @@ lishiList:'',
this.$refs.upload.submit();
},
handleUploadSuccess(response, file, fileList) {
+ console.log(response, file, fileList)
this.dataList.push(file)
},
handleRemove(file, fileList) {
diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue
index 1ce3075..b772294 100644
--- a/admin-web-master/src/views/activity/index.vue
+++ b/admin-web-master/src/views/activity/index.vue
@@ -140,7 +140,7 @@
-
![]()
+
@@ -961,9 +961,7 @@
-
-
{{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
@@ -971,14 +969,12 @@
-
-
使用
- 删除
+ 删除
@@ -1378,6 +1374,39 @@
})
}
},
+ handleDel(val){
+
+
+ const h = this.$createElement;
+ this.$msgbox({
+ title: '消息',
+ message: h('p', null, [
+ h('span', null, '是否删除 '),
+ ]),
+ showCancelButton: true,
+ showClose: false,
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ customClass: 'oe-dialog-btn',
+ beforeClose: (action, instance, done) => {
+ if (action === 'confirm') {
+ deleteById({
+ id:val.id
+ }).then(res => {
+ this.$message({
+ message: '删除成功',
+ type: 'success'
+ })
+ this.getAll()
+ done();
+ })
+ } else {
+ done();
+ }
+ }
+ })
+
+ },
//查询
async onSubmit() {
if (this.planName != '' && this.eventTheme == '') {