Skip to content

C
cloud-platform-ui
Commit e2056546 authored by denghr's avatar denghr
Browse files
Options

后台

parent 59764b4c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 625 additions and 152 deletions
src/api/activityManagement.js
View file @ e2056546
......@@ -11,3 +11,14 @@ export function activityList(query) {
params: query
});
}
/**
* 获取弹窗管理列表某一条数据
* @param query
*/
export function getObj(id) {
return fetch({
url: '/api/activity/activityPopupManage/manage/getOne/'+id,
method: 'Get'
})
}
\ No newline at end of file
src/api/appManagement/modalManagement.js
View file @ e2056546
......@@ -11,3 +11,51 @@ export function getModalList(query) {
data:query
});
}
/**
* 弹窗管理--添加
* @param query
*/
export function addObj(obj) {
return fetch({
url: '/api/activity/activityPopupManage',
method: 'post',
data: obj
});
}
/**
* 获取弹窗管理列表某一条数据
* @param query
*/
export function getObj(id) {
return fetch({
url: '/api/activity/activityPopupManage/manage/getOne/'+id,
method: 'Get'
})
}
/**
* 编辑某一条数据,上下架
* @param query
*/
export function editObj(data) {
return fetch({
url: '/api/activity/activityPopupManage/'+data.id,
method: 'put',
data: data
})
}
/**
* 删除数据
* @param query
*/
export function delObj(id) {
return fetch({
url: '/api/activity/activityPopupManage/' + id,
method: 'delete',
})
}
src/api/appManagement/selectedActivities.js 0 → 100644
View file @ e2056546
import fetch from 'utils/fetch';
/**
* 获取列表
* @param query
*/
export function getActivityList(query) {
return fetch({
url: '/api/activity/activityPopupManage/manage/findAllByQuery',
method: 'POST',
data:query
});
}
/**
* 获取弹窗管理列表某一条数据
* @param query
*/
export function getObj(id) {
return fetch({
url: '/api/activity/homeActivities/manage/activity/getOne/'+id,
method: 'Get'
})
}
/**
* 弹窗管理--添加
* @param query
*/
export function addObj(obj) {
return fetch({
url: '/api/activity/homeActivities',
method: 'post',
data: obj
});
}
/**
* 编辑某一条数据,上下架
* @param query
*/
export function editObj(data) {
return fetch({
url: '/api/activity/homeActivities/'+data.id,
method: 'put',
data: data
})
}
/**
* 删除数据
* @param query
*/
export function delObj(id) {
return fetch({
url: '/api/activity/homeActivities/manage/activity/deleteOne/' + id,
method: 'delete',
})
}
src/utils/dateUtils.js
View file @ e2056546
......@@ -75,6 +75,14 @@ export function getCurrentMonth() {
return formatDate(today, 'MM');
}
/**
* 返回yyyy-MM-dd
* */
export function getYMD_hm(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm');
}
/**
* 返回yyyy-MM-dd
* */
......
src/views/activityManagement/activityList.vue
View file @ e2056546
......@@ -63,7 +63,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="参与人数" label-width="70px">
<el-form-item label="参与人数" label-width="70px" prop="numLimit">
<el-input v-model="formdata.numLimit" placeholder="请输入参与人数"></el-input>
</el-form-item>
</el-col>
......@@ -77,7 +77,102 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="add('form')">确认添加</el-button>
<el-button type="primary" @click="add('form')">确认</el-button>
</div>
</el-dialog>
<!-- 新人活动 -->
<el-dialog title="活动数据" :visible.sync="newPeopelDataVisible">
<el-form :model="newPeopelDataQuery" >
<el-row>
<el-date-picker v-model="newPeopelDataQuery.starTimeStr" type = "datetime" placeholder = "开始时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="pickerOptionsStart"></el-date-picker>
<span> - </span>
<el-date-picker v-model="newPeopelDataQuery.endTimeStr" type = "datetime" placeholder = "结束时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="pickerOptionsEnd"></el-date-picker>
</el-row>
</el-form>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%;">
<el-table-column type="index" align="center" label="数据描述" width="200">
<template scope="scope">
<span>{{scope.row.id}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(总)">
<template scope="scope">
<span>{{scope.row.name}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(日均)">
<template scope="scope">
<div v-if="scope.row.title">永久</div>
<div v-else><span>{{scope.row.startTimeStr}}</span> ~ <span>{{scope.row.endTimeStr}}</span></div>
</template>
</el-table-column>
<el-table-column align="center" label="uv(总)">
<template scope="scope">
<span>{{scope.row.numLimit}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(日均)">
<template scope="scope">
<span>{{scope.row.hasJoinNum}}</span>
</template>
</el-table-column>
</el-table>
<div class="pagination-container">
<el-pagination @size-change="newPeopelDataSizeChange" @current-change="newPeopelDataCurrentChange"
:current-page.sync="newPeopelDataQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="newPeopelDataQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div>
</el-dialog>
<!-- 邀请有礼活动 -->
<el-dialog title="活动数据" :visible.sync="shareDataVisible">
<el-form :model="shareDataQuery">
<el-row>
<el-date-picker v-model="shareDataQuery.starTimeStr" type = "datetime" placeholder = "开始时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="pickerOptionsStart"></el-date-picker>
<span> - </span>
<el-date-picker v-model="shareDataQuery.endTimeStr" type = "datetime" placeholder = "结束时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="pickerOptionsEnd"></el-date-picker>
</el-row>
</el-form>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%;">
<el-table-column type="index" align="center" label="数据描述" width="200">
<template scope="scope">
<span>{{scope.row.id}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(总)">
<template scope="scope">
<span>{{scope.row.name}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(日均)">
<template scope="scope">
<div v-if="scope.row.title">永久</div>
<div v-else><span>{{scope.row.startTimeStr}}</span> ~ <span>{{scope.row.endTimeStr}}</span></div>
</template>
</el-table-column>
<el-table-column align="center" label="uv(总)">
<template scope="scope">
<span>{{scope.row.numLimit}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(日均)">
<template scope="scope">
<span>{{scope.row.hasJoinNum}}</span>
</template>
</el-table-column>
</el-table>
<div class="pagination-container">
<el-pagination @size-change="shareDataSizeChange" @current-change="shareDataCurrentChange"
:current-page.sync="shareDataQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="shareDataQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div>
</el-dialog>
</div>
......@@ -93,7 +188,8 @@
deepCopyDate,
newEast8Date,
convertDate2Str,
timestamp2Date
timestamp2Date,
getYMD_hm
} from 'utils/dateUtils';
import rsCode from '../../utils/rsCode';
......@@ -103,7 +199,8 @@
getToken
} from 'utils/auth';
import {
activityList
activityList,
getObj
} from 'api/activityManagement';
import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row";
......@@ -119,20 +216,16 @@
data() {
return {
rules:{
phone: {
type: 'string',
required: true,
message: '请输入手机号',
trigger: 'blur'
},
num: {
numLimit: {
type: 'string',
required: true,
message: '请输入添加张数',
message: '请输入参与人数',
trigger: 'blur'
}
},
newPeopelVisible:false,
newPeopelDataVisible:false,
shareDataVisible:false,
BASE_API: process.env.BASE_API,
showLoadingBody: false,
list: null,
......@@ -142,13 +235,21 @@
page: 1,
limit: 20,
},
newPeopelDataQuery:{
page: 1,
limit: 20,
starTimeStr:'',
endTimeStr:''
},
shareDataQuery:{
page: 1,
limit: 20,
starTimeStr:'',
endTimeStr:''
},
inline: true,
tableKey: 0,
formdata:{
phone:'',
num:'',
type:''
},
formdata:{},
pickerOptionsStart: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
......@@ -187,8 +288,6 @@
listRs.map(function(item){
item.startTimeeStr = timestamp2Date(item.startTime);
item.endTimeStr = timestamp2Date(item.endTime);
item.visible1 = false;
item.visible2 = false;
});
}
this.listLoading = false;
......@@ -205,13 +304,47 @@
this.listQuery.page = val;
this.getList();
},
giveCunpon(){
this.giveDialogVisible =true;
newPeopelDataSizeChange(val) {
this.newPeopelDataQuery.limit = val;
},
newPeopelDataCurrentChange(val) {
this.newPeopelDataQuery.page = val;
},
shareDataSizeChange(val) {
this.shareDataQuery.limit = val;
},
shareDataCurrentChange(val) {
this.shareDataQuery.page = val;
},
handleUpdate(item){
var that = this;
that.formdata = item;
getObj(row.id).then(response => {
var item = response.data;
item.status_name = item.status==1?"上架":item.type==2?"下架":'';
if(item.startTime>0){
item.starTimeStr = getYMD_hm(item.startTime);
}else{
item.starTimeStr = '';
}
if(item.endTime>0){
item.endTimeStr = getYMD_hm(item.endTime);
}else{
item.endTimeStr = '';
}
this.formdata = item;
console.log(this.form)
that.newPeopelVisible = true;
})
},
handleActivityData(row){
// 1--新人尊享; 2--推广活动表
if(row.type==1){
this.newPeopelDataVisible = true;
}
if(row.type==2){
this.shareDataVisible = true;
}
}
}
}
......
src/views/cunponManagements/cunponManagement.vue
View file @ e2056546
......@@ -6,12 +6,13 @@
<el-row>
<el-col :span="5">
<el-form-item label="标题">
<el-input v-model.number="listQuery.title" placeholder="请输入姓名"></el-input>
<el-input v-model.number="listQuery.title" placeholder="请输入标题"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item>
<el-select class="filter-item" v-model="listQuery.channel" placeholder="类型">
<el-option key="" label="全部" value=""> </el-option>
<el-option v-for="(item,index) in channelType" :key="index" :label="item.val" :value="item.id"> </el-option>
</el-select>
</el-form-item>
......@@ -349,7 +350,7 @@
page: 1,
limit: 20,
title: '',//标题
channel:0,//状态
channel:'',//状态
},
inline: true,
tableKey: 0,
......
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