Skip to content

C
cloud-platform-ui
Commit 24782dec authored by guoyou's avatar guoyou
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

parents 6a9c0de8 5a84e47e
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 128 deletions
src/views/appManagement/selectedActivities/index.vue
View file @ 24782dec
<template> <template>
<div class="app-container calendar-list-container" v-loading.body="showLoadingBody"> <div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="描述"> <el-form-item label="描述">
<el-input v-model.number="listQuery.activitiesName" placeholder="请输入描述"></el-input> <el-input v-model.number="listQuery.activitiesName" placeholder="请输入描述"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" style="float: right;" @click="handleCreate">+ 添加弹窗</el-button> <el-button class="filter-item" type="primary" style="float: right;" @click="handleCreate">+ 添加弹窗</el-button>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%"> style="width: 100%">
...@@ -24,11 +24,21 @@ ...@@ -24,11 +24,21 @@
<span>{{scope.row.name}}</span> <span>{{scope.row.name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="300" align="center" label="跳转链接"> <el-table-column width="300" align="center" label="安卓跳转链接">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.url}}</span> <span>{{scope.row.url}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="300" align="center" label="苹果跳转链接">
<template scope="scope">
<span>{{scope.row.iosUrl}}</span>
</template>
</el-table-column>
<el-table-column width="300" align="center" label="小程序跳转链接">
<template scope="scope">
<span>{{scope.row.purl}}</span>
</template>
</el-table-column>
<el-table-column width="300" align="center" label="banner图片"> <el-table-column width="300" align="center" label="banner图片">
<template scope="scope"> <template scope="scope">
<img :src="scope.row.picture" style="width:100%;max-height:100px;"> <img :src="scope.row.picture" style="width:100%;max-height:100px;">
...@@ -45,17 +55,25 @@ ...@@ -45,17 +55,25 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="状态"> <el-table-column align="center" label="状态">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.status==1">上架</span> <span v-if="scope.row.status==1">上架</span>
<span v-if="scope.row.status==2">下架</span> <span v-if="scope.row.status==2">下架</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="150" label="操作" fixed="right"> <el-table-column align="center" width="150" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleDown(scope.row)" v-show="scope.row.status==1">下架</el-button> 编辑
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUp(scope.row)" v-show="scope.row.status==2">上架</el-button> </el-button>
<el-button class="el-button el-button--text el-button--small" size="small" @click="deleteHandler(scope.row)" style="color:red;" v-show="scope.row.status==2">删除</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleDown(scope.row)"
v-show="scope.row.status==1">下架
</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUp(scope.row)"
v-show="scope.row.status==2">上架
</el-button>
<el-button class="el-button el-button--text el-button--small" size="small" @click="deleteHandler(scope.row)"
style="color:red;" v-show="scope.row.status==2">删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -70,19 +88,23 @@ ...@@ -70,19 +88,23 @@
<el-form-item label="描述" prop="name"> <el-form-item label="描述" prop="name">
<el-input v-model="form.name" placeholder="请输入描述"></el-input> <el-input v-model="form.name" placeholder="请输入描述"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上架时间" > <el-form-item label="上架时间">
<el-radio-group v-model="form.up_name" size="medium"> <el-radio-group v-model="form.up_name" size="medium">
<el-radio-button label="不限"></el-radio-button> <el-radio-button label="不限"></el-radio-button>
<el-radio-button label="自定义"></el-radio-button> <el-radio-button label="自定义"></el-radio-button>
</el-radio-group> </el-radio-group>
<div style="display:inline-block" v-show="form.up_name=='自定义'"> <div style="display:inline-block" v-show="form.up_name=='自定义'">
<el-date-picker v-model="form.starTimeStr" type = "datetime" placeholder = "开始时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="pickerOptionsStart"></el-date-picker> <el-date-picker v-model="form.starTimeStr" type="datetime" placeholder="开始时间"
<span> - </span> value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
<el-date-picker v-model="form.endTimeStr" type = "datetime" placeholder = "结束时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="pickerOptionsEnd"></el-date-picker> :picker-options="pickerOptionsStart"></el-date-picker>
</div> <span> - </span>
<el-date-picker v-model="form.endTimeStr" type="datetime" placeholder="结束时间"
value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
:picker-options="pickerOptionsEnd"></el-date-picker>
</div>
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序"></el-input> <el-input v-model="form.sort" placeholder="请输入排序"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="图片" prop="picture" :style="{display:'block'}"> <el-form-item label="图片" prop="picture" :style="{display:'block'}">
<el-upload <el-upload
...@@ -91,13 +113,21 @@ ...@@ -91,13 +113,21 @@
:show-file-list="false" :show-file-list="false"
:headers="getHeaderWithToken" :headers="getHeaderWithToken"
:on-success="handleAvatarSuccess"> :on-success="handleAvatarSuccess">
<img v-if="$utils.isString(form.picture) && !$utils.isEmpty(form.picture)" :src="form.picture" style="width:200px;max-height:200px;"> <img v-if="$utils.isString(form.picture) && !$utils.isEmpty(form.picture)" :src="form.picture"
<i v-else class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:100px;height: 100px;vertical-align: middle;"></i> style="width:200px;max-height:200px;">
<i v-else class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:100px;height: 100px;vertical-align: middle;"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="跳转链接" prop="url"> <el-form-item label="安卓跳转链接" prop="url">
<el-input v-model="form.url" placeholder="请输入跳转链接"></el-input> <el-input v-model="form.url" placeholder="请输入跳转链接"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="苹果跳转链接" prop="url">
<el-input v-model="form.iosUrl" placeholder="请输入跳转链接"></el-input>
</el-form-item>
<el-form-item label="小程序跳转链接" prop="url">
<el-input v-model="form.purl" placeholder="请输入跳转链接"></el-input>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancelHandel">取 消</el-button> <el-button @click="cancelHandel">取 消</el-button>
...@@ -152,19 +182,21 @@ ...@@ -152,19 +182,21 @@
}, },
data() { data() {
return { return {
tableKey:0, tableKey: 0,
modalTitle: "创建", modalTitle: "创建",
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
bannerDialogVisible: false,//添加、编辑弹框 bannerDialogVisible: false,//添加、编辑弹框
showLoadingBody: false, showLoadingBody: false,
form: { form: {
name: "", name: "",
up_name:'自定义', up_name: '自定义',
starTimeStr:'', starTimeStr: '',
endTimeStr:'', endTimeStr: '',
sort:'', sort: '',
picture:'', picture: '',
url:'', url: '',
iosUrl: '',
purl:'',
}, },
listQuery: { listQuery: {
page: 1, page: 1,
...@@ -174,10 +206,10 @@ ...@@ -174,10 +206,10 @@
}, },
rules: { rules: {
name: { name: {
type: 'string', type: 'string',
required: true, required: true,
message: '请输入弹窗描述', message: '请输入弹窗描述',
trigger: 'blur' trigger: 'blur'
}, },
picture: { picture: {
type: 'string', type: 'string',
...@@ -190,7 +222,7 @@ ...@@ -190,7 +222,7 @@
message: '请输入链接', message: '请输入链接',
trigger: 'blur' trigger: 'blur'
}, },
sort:{ sort: {
required: true, required: true,
message: '请输入排序' message: '请输入排序'
} }
...@@ -201,12 +233,12 @@ ...@@ -201,12 +233,12 @@
} }
}, },
pickerOptionsEnd: { pickerOptionsEnd: {
disabledDate: time => { disabledDate: time => {
const beginDateVal = new Date(this.form.starTimeStr).getTime() const beginDateVal = new Date(this.form.starTimeStr).getTime()
if (beginDateVal) { if (beginDateVal) {
return time.getTime() < beginDateVal - 8.64e7 return time.getTime() < beginDateVal - 8.64e7
}
} }
}
}, },
list: null, list: null,
total: null, total: null,
...@@ -261,15 +293,15 @@ ...@@ -261,15 +293,15 @@
this.cleanForm(); this.cleanForm();
getObj(row.id).then(response => { getObj(row.id).then(response => {
var item = response.data; var item = response.data;
item.up_name = item.timeType==0?'不限':item.timeType==1?'自定义':''; item.up_name = item.timeType == 0 ? '不限' : item.timeType == 1 ? '自定义' : '';
if(item.startTime>0&&item.timeType==1){ if (item.startTime > 0 && item.timeType == 1) {
item.starTimeStr = getYMD_hm(item.startTime); item.starTimeStr = getYMD_hm(item.startTime);
}else{ } else {
item.starTimeStr = ''; item.starTimeStr = '';
} }
if(item.endTime>0&&item.timeType==1){ if (item.endTime > 0 && item.timeType == 1) {
item.endTimeStr = getYMD_hm(item.endTime); item.endTimeStr = getYMD_hm(item.endTime);
}else{ } else {
item.endTimeStr = ''; item.endTimeStr = '';
} }
this.form = item; this.form = item;
...@@ -280,23 +312,23 @@ ...@@ -280,23 +312,23 @@
/** /**
* 弹框-取消 * 弹框-取消
* */ * */
cancelHandel(){ cancelHandel() {
this.cleanForm(); this.cleanForm();
this.bannerDialogVisible = false; this.bannerDialogVisible = false;
}, },
/** /**
* 清空表单 * 清空表单
* */ * */
cleanForm() { cleanForm() {
this.form = { this.form = {
name: "", name: "",
up_name:'自定义', up_name: '自定义',
starTimeStr:'', starTimeStr: '',
endTimeStr:'', endTimeStr: '',
sort:'', sort: '',
picture:'', picture: '',
url:'', url: '',
sort:0, sort: 0,
} }
}, },
/** /**
...@@ -309,7 +341,7 @@ ...@@ -309,7 +341,7 @@
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) { if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
listRs = response.data.list; listRs = response.data.list;
response.data.list.map(function(item){ response.data.list.map(function (item) {
item.crtTimeStr = timestamp2Date(item.crtTime); item.crtTimeStr = timestamp2Date(item.crtTime);
item.visible2 = false; item.visible2 = false;
}); });
...@@ -328,42 +360,42 @@ ...@@ -328,42 +360,42 @@
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
if(that.form.up_name=='自定义'){ if (that.form.up_name == '自定义') {
that.form.timeType=1; that.form.timeType = 1;
that.form.startTime = new Date(this.form.starTimeStr).getTime(); that.form.startTime = new Date(this.form.starTimeStr).getTime();
that.form.endTime = new Date(this.form.endTimeStr).getTime(); that.form.endTime = new Date(this.form.endTimeStr).getTime();
if(new Date(this.form.endTimeStr).getTime()<new Date(this.form.starTimeStr).getTime()){ if (new Date(this.form.endTimeStr).getTime() < new Date(this.form.starTimeStr).getTime()) {
this.$notify({ this.$notify({
title: '警告', title: '警告',
message: '结束时间不能小于起始时间', message: '结束时间不能小于起始时间',
type: 'warning', type: 'warning',
duration: 2000 duration: 2000
}); });
return false; return false;
}
} else {
that.form.timeType = 0;
} }
}else{ that.form.status = 2;
that.form.timeType=0;
}
that.form.status = 2;
addObj(this.form).then(response => { addObj(this.form).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.bannerDialogVisible = false; this.bannerDialogVisible = false;
this.$notify({ this.$notify({
title: '成功', title: '成功',
message: '创建成功', message: '创建成功',
type: 'success', type: 'success',
duration: 2000 duration: 2000
}); });
this.getList(); this.getList();
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！', message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}); });
} }
}); });
} else { } else {
return false; return false;
} }
...@@ -376,12 +408,13 @@ ...@@ -376,12 +408,13 @@
let that = this; let that = this;
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
debugger
if (valid) { if (valid) {
if(that.form.up_name=='自定义'){ if (that.form.up_name == '自定义') {
that.form.timeType=1; that.form.timeType = 1;
that.form.startTime = new Date(this.form.starTimeStr).getTime(); that.form.startTime = new Date(this.form.starTimeStr).getTime();
that.form.endTime = new Date(this.form.endTimeStr).getTime(); that.form.endTime = new Date(this.form.endTimeStr).getTime();
if(new Date(this.form.endTimeStr).getTime()<new Date(this.form.starTimeStr).getTime()){ if (new Date(this.form.endTimeStr).getTime() < new Date(this.form.starTimeStr).getTime()) {
this.$notify({ this.$notify({
title: '警告', title: '警告',
message: '结束时间不能小于起始时间', message: '结束时间不能小于起始时间',
...@@ -390,9 +423,10 @@ ...@@ -390,9 +423,10 @@
}); });
return false; return false;
} }
}else{ } else {
that.form.timeType=0; that.form.timeType = 0;
} }
debugger
editObj(this.form).then(response => { editObj(this.form).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.bannerDialogVisible = false; this.bannerDialogVisible = false;
...@@ -417,10 +451,10 @@ ...@@ -417,10 +451,10 @@
} }
}); });
}, },
/** /**
* 上架 * 上架
* */ * */
handleUp(row){ handleUp(row) {
this.form = {}; this.form = {};
this.form.id = row.id; this.form.id = row.id;
this.form.status = 1; this.form.status = 1;
...@@ -434,20 +468,20 @@ ...@@ -434,20 +468,20 @@
type: 'success', type: 'success',
duration: 2000 duration: 2000
}); });
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！', message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}); });
} }
}); });
}, },
/** /**
* 下架 * 下架
* */ * */
handleDown(row){ handleDown(row) {
this.form = {}; this.form = {};
this.form.id = row.id; this.form.id = row.id;
this.form.status = 2; this.form.status = 2;
...@@ -461,14 +495,14 @@ ...@@ -461,14 +495,14 @@
type: 'success', type: 'success',
duration: 2000 duration: 2000
}); });
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！', message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}); });
} }
}); });
}, },
/** /**
...@@ -493,11 +527,11 @@ ...@@ -493,11 +527,11 @@
this.form.picture = res.data; this.form.picture = res.data;
this.showLoadingBody = false; this.showLoadingBody = false;
}, },
/** /**
* 操作-删除 * 操作-删除
* */ * */
deleteHandler(row) { deleteHandler(row) {
this.$confirm('确定删除吗?', '提示', { this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
......
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