Skip to content

C
cloud-platform-ui
Commit 967f4ad0 authored by guoyou's avatar guoyou
Browse files
Options

峰会,公众号分公司

parent de3398b3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 799 additions and 695 deletions
config/dev.env.js
View file @ 967f4ad0
module.exports = {
NODE_ENV: '"development"',
BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
BASE_API:'"https://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
APP_ORIGIN: '"https://wallstreetcn.com"'
}
src/api/summit/activityShow.js
View file @ 967f4ad0
......@@ -2,7 +2,7 @@ import fetch from 'utils/fetch';
export function one(activityId) {
return fetch({
url: '/api/summit/activityShow/one/'+activityId,
url: '/api/summit/activityShow/app/unauth/one/'+activityId,
method: 'get'
})
}
......
src/views/baseInfo/companyInfo/index.vue
View file @ 967f4ad0
......@@ -461,6 +461,7 @@
this.page = 1;
this.list = [];
this.nomore = false;
this.loading = false;
this.loadMore();
},
/**
......@@ -510,6 +511,7 @@
if(res.data.length< this.listQuery.limit && this.list.length>0){
//已加载全部
this.nomore = true;
this.loading = false;
}
}
this.list = [...this.list, ...allList];
......
src/views/summit/index.vue
View file @ 967f4ad0
......@@ -78,14 +78,13 @@
<el-button
size="small"
class="el-button el-button--text el-button--small"
v-if
@click="enrollData(scope.row)"
>报名信息</el-button>
<el-button
<!-- <el-button
size="small"
class="el-button el-button--text el-button--small"
@click="applyPage(scope.row)"
>报名页面</el-button>
>报名页面</el-button> -->
<el-button
class="el-button el-button--text el-button--small"
size="small"
......@@ -94,7 +93,6 @@
<el-button
size="small"
class="el-button el-button--text el-button--small"
v-if
@click="review(scope.row)"
>回顾页面</el-button>
<el-button
......@@ -136,7 +134,7 @@
v-on:reviewDialogEvent="reviewDialogEvent"
/>
<applyPage :applyInfo='applyInfo'></applyPage>
<!-- <applyPage :applyInfo='applyInfo'></applyPage> -->
</div>
</template>
<script>
......@@ -146,7 +144,7 @@ import { page, update } from "src/api/summit/activity";
import summitPopup from "src/views/summit/model/summitPopup";
import enrollDataPopup from "src/views/summit/model/enrollDataPopup";
import reviewPopup from "src/views/summit/model/reviewPopup";
import applyPage from "src/views/summit/model/applyPage";
// import applyPage from "src/views/summit/model/applyPage";
import { getToken } from "src/utils/auth";
......@@ -156,7 +154,7 @@ export default {
summitPopup,
enrollDataPopup,
reviewPopup,
applyPage
// applyPage
},
data() {
return {
......@@ -210,9 +208,9 @@ export default {
},
methods: {
//报名页面
applyPage(){
this.applyInfo.dialogVisible = true;
},
// applyPage(){
// this.applyInfo.dialogVisible = true;
// },
getList() {
this.listLoading = true;
page(this.query).then(res => {
......
src/views/summit/model/reviewPopup.vue
View file @ 967f4ad0
......@@ -37,11 +37,12 @@
<el-col>
<el-form-item label="峰会图片:">
<el-upload
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:action="BASE_API+'/api/universal/file/app/unauth/pictureZip'"
list-type="picture-card"
:file-list="list"
:on-success="handlePictureCardPreview"
:on-remove="handleRemove"
:before-upload="beforeAvatarUpload"
>
<i class="el-icon-plus"></i>
</el-upload>
......@@ -53,11 +54,13 @@
<el-col>
<el-form-item label="峰会视频:">
<el-upload
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:action="BASE_API+'/api/universal/file/app/unauth/uploadVideo'"
list-type="picture-card"
:headers="getHeaderWithToken"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-upload="videoUpload"
:on-success="vidioSuccess"
>
<i class="el-icon-plus"></i>
</el-upload>
......@@ -76,7 +79,7 @@
<el-col>
<el-form-item>
<el-button class="button" @click="cancelHandel">取 消</el-button>
<el-button class="button" type="primary" @click="cre">确 定</el-button>
<!-- <el-button class="button" type="primary" @click="cre">确 定</el-button> -->
</el-form-item>
</el-col>
</el-row>
......@@ -88,17 +91,17 @@
</template>
<script>
import ElRow from "element-ui/packages/row/src/row";
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
import ElCol from "element-ui/packages/col/src/col";
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
import { getToken } from "src/utils/auth";
import { mapGetters } from "vuex";
import { one, save } from "src/api/summit/activityShow";
import ElRow from 'element-ui/packages/row/src/row'
import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
import ElCol from 'element-ui/packages/col/src/col'
import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
import { getToken } from 'src/utils/auth'
import { mapGetters } from 'vuex'
import { one, save } from 'src/api/summit/activityShow'
export default {
props: ["reviewRow"],
name: "reviewPopup",
props: ['reviewRow'],
name: 'reviewPopup',
components: {
ElFormItem,
ElCol,
......@@ -123,102 +126,135 @@ export default {
videoPath: undefined,
picturePath: undefined
}
};
}
},
watch: {
dialogVisible(newValue, oldValue) {
if (!newValue) {
this.$emit("reviewDialogEvent", this.result);
this.$emit('reviewDialogEvent', this.result)
}
}
},
computed: {
...mapGetters(["elements"]),
...mapGetters(['elements']),
getHeaderWithToken() {
return { Authorization: getToken() };
return { Authorization: getToken() }
}
},
watch: {
dialogVisible(newValue, oldValue) {
if (!newValue) {
this.$emit("summitDialogEvent", this.result);
this.$emit('summitDialogEvent', this.result)
}
}
},
mounted() {
this.getOrderInfo();
this.getOrderInfo()
},
methods: {
vidioSuccess(res) {
console.log(res)
this.$notify({
title: '成功',
message: res.message,
type: 'success',
duration: 2000
})
},
beforeAvatarUpload(file) {
const zip = file.type === 'application/zip'
if (!zip) {
this.$message.error('上传头像图片只能是 zip 格式!')
}
return zip
},
videoUpload(file) {
console.log(file.type)
const isJPG = file.type === 'video/mp4'
if (!isJPG) {
this.$message.error('上传头像图片只能是 mp4 格式!')
}
return isJPG
},
getOrderInfo() {
console.log(this.reviewRow.id)
one(this.reviewRow.id).then(res => {
this.form = res.data;
this.dialogVisible = true;
this.imgDialogVisible = true;
});
this.form = res.data
this.dialogVisible = true
this.imgDialogVisible = true
})
},
cre() {
console.log(this.form.picturePath);
console.log(this.form.picturePath)
save(this.form).then(res => {
this.responseResult(res);
});
this.responseResult(res)
})
},
responseResult(res) {
if (res.status === 200) {
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
title: '成功',
message: '操作成功',
type: 'success',
duration: 2000
});
})
this.setSummitDialogEvent(true);
this.setSummitDialogEvent(true)
} else {
this.$notify({
title: "失败",
message: "操作失败！",
type: "error",
title: '失败',
message: '操作失败！',
type: 'error',
duration: 2000
});
})
}
},
/**
* 弹框-取消
* */
cancelHandel() {
this.setSummitDialogEvent(false);
this.setSummitDialogEvent(false)
},
setSummitDialogEvent(e) {
this.cleanForm();
this.result = e;
this.dialogVisible = false;
this.cleanForm()
this.result = e
this.dialogVisible = false
},
/**
* 封面图上传
* **/
handleAvatarSuccess(res, file) {
this.percent = 0;
this.imgFlag = false;
this.form.banner = res.data;
this.percent = 0
this.imgFlag = false
this.form.banner = res.data
},
/**
* 封面图上传进度
* */
uploadProcess(event, file, fileList) {
this.imgFlag = true;
this.percent = Math.floor(event.percent);
this.imgFlag = true
this.percent = Math.floor(event.percent)
},
handlePreview(file) {
this.form.videoPath = file.data;
this.imgDialogVisible = true;
this.form.videoPath = file.data
this.imgDialogVisible = true
},
handleRemove(file, fileList) {
// console.log(file)
console.log(file, fileList);
console.log(file, fileList)
},
handlePictureCardPreview(res, file) {
this.list.push({ url: res.data });
this.$notify({
title: '成功',
message: res.message,
type: 'success',
duration: 2000
})
this.list.push({ url: res.data })
// this.imgDialogVisible = true;
},
cleanForm() {
......@@ -229,10 +265,10 @@ export default {
banner: undefined,
videoPath: undefined,
picturePath: undefined
};
}
}
};
}
}
</script>
<style>
.label-text {
......
src/views/summit/model/summitPopup.vue
View file @ 967f4ad0
This diff is collapsed.
src/views/xxOfficialWebsite/modal/popup.vue
View file @ 967f4ad0
......@@ -48,7 +48,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="发布人" prop="publisher">
<el-input v-model="form.publisher" type="text" placeholder="请输入发布人"></el-input>
<el-input v-model="form.publisher" type="text"placeholder="请输入发布人"></el-input>
</el-form-item>
</el-col>
</el-row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment