Skip to content

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

提现规则，活动设置，弹窗

parent abce113e
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 64 deletions
src/api/activityManagement.js
View file @ 6185dd1f
......@@ -7,8 +7,8 @@ import fetch from 'utils/fetch';
export function activityList(query) {
return fetch({
url: '/api/activity/management/activity/findAll',
method: 'get',
params: query
method: 'post',
data: query
});
}
......@@ -18,7 +18,7 @@ export function activityList(query) {
*/
export function getObj(id) {
return fetch({
url: '/api/activity/activityPopupManage/manage/getOne/'+id,
url: '/api/activity/management/getOne/'+id,
method: 'Get'
})
}
\ No newline at end of file
src/api/appManagement/selectedActivities.js
View file @ 6185dd1f
......@@ -6,7 +6,7 @@ import fetch from 'utils/fetch';
*/
export function getActivityList(query) {
return fetch({
url: '/api/activity/activityPopupManage/manage/findAllByQuery',
url: '/api/activity/homeActivities/manage/activity/findAll',
method: 'POST',
data:query
});
......
src/views/activityManagement/activityList.vue
View file @ 6185dd1f
......@@ -3,7 +3,7 @@
<div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%;">
<el-table-column type="index" align="center" label="活动ID" width="200">
<el-table-column type="index" align="center" label="活动ID" width="100">
<template scope="scope">
<span>{{scope.row.id}}</span>
</template>
......@@ -15,7 +15,7 @@
</template>
</el-table-column>
<el-table-column align="center" label="活动时间">
<el-table-column align="center" label="活动时间" width="400">
<template scope="scope">
<div v-if="scope.row.title">永久</div>
<div v-else><span>{{scope.row.startTimeStr}}</span> ~ <span>{{scope.row.endTimeStr}}</span></div>
......@@ -31,13 +31,13 @@
<span>{{scope.row.hasJoinNum}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="状态">
<el-table-column align="center" label="状态" width="100">
<template scope="scope">
<span v-if="scope.row.status==1">上架</span>
<span v-if="scope.row.status==2">下架</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作">
<el-table-column align="center" label="操作" width="200">
<template scope="scope">
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button size="small" type="success" @click="handleActivityData(scope.row)" style="margin-left:0px">活动数据</el-button>
......@@ -52,7 +52,7 @@
</div>
<el-dialog title="编辑" :visible.sync="newPeopelVisible">
<el-form :model="formdata" :rules="rules" ref="form" >
<div style="font-weight: bold;">基础设置</div>
<div style="font-weight: bold;margin-bottom:20px">基础设置</div>
<el-row>
<el-col :span="5">
<el-form-item label="活动状态" label-width="70px">
......@@ -62,9 +62,9 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="参与人数" label-width="70px" prop="numLimit">
<el-input v-model="formdata.numLimit" placeholder="请输入参与人数"></el-input>
<el-col :span="5">
<el-form-item label="参与人数" label-width="80px" prop="numLimit">
<el-input v-model="formdata.numLimit" placeholder="参与人数"></el-input>
</el-form-item>
</el-col>
<el-col :span="14">
......@@ -83,11 +83,12 @@
<!-- 新人活动 -->
<el-dialog title="活动数据" :visible.sync="newPeopelDataVisible">
<el-form :model="newPeopelDataQuery" >
<el-form :model="newPeopelDataQuery" style="margin-bottom:20px">
<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>
<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="newPeopelpickerOptionsStart"></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-date-picker v-model="newPeopelDataQuery.endTimeStr" type = "datetime" placeholder = "结束时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="newPeopelpickerOptionsEnd"></el-date-picker>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-row>
</el-form>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
......@@ -131,11 +132,12 @@
<!-- 邀请有礼活动 -->
<el-dialog title="活动数据" :visible.sync="shareDataVisible">
<el-form :model="shareDataQuery">
<el-form :model="shareDataQuery" style="margin-bottom:20px">
<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>
<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="shareDatapickerOptionsStart"></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-date-picker v-model="shareDataQuery.endTimeStr" type = "datetime" placeholder = "结束时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="shareDatapickerOptionsEnd"></el-date-picker>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-row>
</el-form>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
......@@ -259,7 +261,33 @@
disabledDate: time => {
const beginDateVal = new Date(this.formdata.starTimeStr).getTime()
if (beginDateVal) {
return time.getTime() < beginDateVal - 0
return time.getTime() < beginDateVal - 8.64e7
}
}
},
shareDatapickerOptionsStart:{
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
shareDatapickerOptionsEnd: {
disabledDate: time => {
const beginDateVal = new Date(this.shareDataQuery.starTimeStr).getTime()
if (beginDateVal) {
return time.getTime() < beginDateVal - 8.64e7
}
}
},
newPeopelpickerOptionsStart:{
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
newPeopelpickerOptionsEnd: {
disabledDate: time => {
const beginDateVal = new Date(this.newPeopelDataQuery.starTimeStr).getTime()
if (beginDateVal) {
return time.getTime() < beginDateVal - 8.64e7
}
}
},
......@@ -282,13 +310,13 @@
activityList(this.listQuery).then(response => {
let totalCountRs = undefined;
let listRs = undefined;
// if (!this.$utils.isEmpty(response.data) && this.$utils.isInteger(response.data.totalCount)) {
if (!this.$utils.isEmpty(response.data)) {
listRs = response.data;
listRs.map(function(item){
item.startTimeeStr = timestamp2Date(item.startTime);
if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
listRs = response.data.list;
response.data.list.map(function(item){
item.startTimeStr = timestamp2Date(item.startTime);
item.endTimeStr = timestamp2Date(item.endTime);
});
totalCountRs = response.data.total;
}
this.listLoading = false;
this.list = listRs;
......@@ -316,15 +344,15 @@
shareDataCurrentChange(val) {
this.shareDataQuery.page = val;
},
handleUpdate(item){
handleUpdate(row){
var that = this;
getObj(row.id).then(response => {
var item = response.data;
item.status_name = item.status==1?"上架":item.type==2?"下架":'';
item.status_name = item.status==1?"上架":item.status==2?"下架":'';
if(item.startTime>0){
item.starTimeStr = getYMD_hm(item.startTime);
}else{
item.starTimeStr = '';
item.startTimeStr = '';
}
if(item.endTime>0){
item.endTimeStr = getYMD_hm(item.endTime);
......@@ -332,7 +360,7 @@
item.endTimeStr = '';
}
this.formdata = item;
console.log(this.form)
console.log(this.formdata)
that.newPeopelVisible = true;
})
......
src/views/appManagement/modalManagement/index.vue
View file @ 6185dd1f
......@@ -53,8 +53,8 @@
<el-table-column align="center" width="200" label="操作">
<template scope="scope">
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button size="small" type="success" @click="handleDown(scope.row)" style="margin-left:0px" v-if="scope.row.status==1">下架</el-button>
<el-button size="small" type="success" @click="handleUp(scope.row)" style="margin-left:0px" v-if="scope.row.status==2">上架</el-button>
<el-button size="small" type="success" @click="handleDown(scope.row)" style="margin-left:0px" v-show="scope.row.status==1">下架</el-button>
<el-button size="small" type="success" @click="handleUp(scope.row)" style="margin-left:0px" v-show="scope.row.status==2">上架</el-button>
<el-popover
ref="popover5"
placement="top"
......@@ -66,7 +66,7 @@
<el-button type="primary" size="mini" @click="deleteHandler(scope.row)">确定</el-button>
</div>
</el-popover>
<el-button type="danger" size="small" v-popover:popover5 v-if="scope.row.status==2">删除</el-button>
<el-button type="danger" size="small" v-popover:popover5 v-show="scope.row.status==2">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -218,10 +218,8 @@
trigger: 'blur'
},
sort:{
type: 'string',
required: true,
message: '请输入排序',
trigger: 'blur'
message: '请输入排序'
},
},
pickerOptionsStart: {
......@@ -233,7 +231,7 @@
disabledDate: time => {
const beginDateVal = new Date(this.form.starTimeStr).getTime()
if (beginDateVal) {
return time.getTime() < beginDateVal - 0
return time.getTime() < beginDateVal - 8.64e7
}
}
},
......@@ -368,6 +366,15 @@
that.form.timeType=1;
that.form.startTime = new Date(this.form.starTimeStr).getTime();
that.form.endTime = new Date(this.form.endTimeStr).getTime();
if(new Date(this.form.endTimeStr).getTime()<new Date(this.form.starTimeStr).getTime()){
this.$notify({
title: '警告',
message: '结束时间不能小于起始时间',
type: 'warning',
duration: 2000
});
return false;
}
}else{
that.form.timeType=0;
}
......@@ -411,6 +418,15 @@
that.form.timeType=1;
that.form.startTime = new Date(this.form.starTimeStr).getTime();
that.form.endTime = new Date(this.form.endTimeStr).getTime();
if(new Date(this.form.endTimeStr).getTime()<new Date(this.form.starTimeStr).getTime()){
this.$notify({
title: '警告',
message: '结束时间不能小于起始时间',
type: 'warning',
duration: 2000
});
return false;
}
}else{
that.form.timeType=0;
}
......
src/views/appManagement/selectedActivities/index.vue
View file @ 6185dd1f
......@@ -31,7 +31,7 @@
</el-table-column>
<el-table-column width="300" align="center" label="banner图片">
<template scope="scope">
<img :src="scope.row.background" style="width:100%;max-height:100px;">
<img :src="scope.row.picture" style="width:100%;max-height:100px;">
</template>
</el-table-column>
<el-table-column width="300" align="center" label="排序">
......@@ -53,8 +53,8 @@
<el-table-column align="center" width="200" label="操作">
<template scope="scope">
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button size="small" type="success" @click="handleDown(scope.row)" style="margin-left:0px" v-if="scope.row.status==1">下架</el-button>
<el-button size="small" type="success" @click="handleUp(scope.row)" style="margin-left:0px" v-if="scope.row.status==2">上架</el-button>
<el-button size="small" type="success" @click="handleDown(scope.row)" style="margin-left:0px" v-show="scope.row.status==1">下架</el-button>
<el-button size="small" type="success" @click="handleUp(scope.row)" style="margin-left:0px" v-show="scope.row.status==2">上架</el-button>
<el-popover
ref="popover5"
placement="top"
......@@ -66,7 +66,7 @@
<el-button type="primary" size="mini" @click="deleteHandler(scope.row)">确定</el-button>
</div>
</el-popover>
<el-button type="danger" size="small" v-popover:popover5 v-if="scope.row.status==2">删除</el-button>
<el-button type="danger" size="small" v-popover:popover5 v-show="scope.row.status==2">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -79,7 +79,7 @@
<el-dialog :title="modalTitle" :visible.sync="bannerDialogVisible">
<el-form :model="form" :rules="rules" ref="form" label-width="90px">
<el-form-item label="描述" prop="name">
<el-input v-model="form.title" placeholder="请输入描述"></el-input>
<el-input v-model="form.name" placeholder="请输入描述"></el-input>
</el-form-item>
<el-form-item label="上架时间" >
<el-radio-group v-model="form.up_name" size="medium">
......@@ -102,7 +102,7 @@
:show-file-list="false"
:headers="getHeaderWithToken"
:on-success="handleAvatarSuccess">
<img v-if="$utils.isString(form.banner) && !$utils.isEmpty(form.banner)" :src="form.banner" style="width:200px;max-height:200px;">
<img v-if="$utils.isString(form.picture) && !$utils.isEmpty(form.picture)" :src="form.picture" style="width:200px;max-height:200px;">
<i v-else class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:100px;height: 100px;"></i>
</el-upload>
</el-form-item>
......@@ -131,7 +131,8 @@
deepCopyDate,
newEast8Date,
convertDate2Str,
timestamp2Date
timestamp2Date,
getYMD_hm
} from 'utils/dateUtils';
import {
......@@ -201,10 +202,8 @@
trigger: 'blur'
},
sort:{
type: 'string',
required: true,
message: '请输入排序',
trigger: 'blur'
message: '请输入排序'
}
},
pickerOptionsStart: {
......@@ -216,7 +215,7 @@
disabledDate: time => {
const beginDateVal = new Date(this.form.starTimeStr).getTime()
if (beginDateVal) {
return time.getTime() < beginDateVal - 0
return time.getTime() < beginDateVal - 8.64e7
}
}
},
......@@ -308,6 +307,7 @@
sort:'',
picture:'',
url:'',
sort:0,
}
},
/**
......@@ -338,15 +338,24 @@
let that = this;
const set = this.$refs;
set[formName].validate(valid => {
if(that.form.up_name=='自定义'){
if (valid) {
if(that.form.up_name=='自定义'){
that.form.timeType=1;
that.form.startTime = new Date(this.form.starTimeStr).getTime();
that.form.endTime = new Date(this.form.endTimeStr).getTime();
if(new Date(this.form.endTimeStr).getTime()<new Date(this.form.starTimeStr).getTime()){
this.$notify({
title: '警告',
message: '结束时间不能小于起始时间',
type: 'warning',
duration: 2000
});
return false;
}
}else{
that.form.timeType=0;
}
that.form.status = 2;
if (valid) {
addObj(this.form).then(response => {
if (response.status === 200) {
this.bannerDialogVisible = false;
......@@ -383,6 +392,15 @@
that.form.timeType=1;
that.form.startTime = new Date(this.form.starTimeStr).getTime();
that.form.endTime = new Date(this.form.endTimeStr).getTime();
if(new Date(this.form.endTimeStr).getTime()<new Date(this.form.starTimeStr).getTime()){
this.$notify({
title: '警告',
message: '结束时间不能小于起始时间',
type: 'warning',
duration: 2000
});
return false;
}
}else{
that.form.timeType=0;
}
......@@ -490,7 +508,7 @@
* 操作-删除
* */
deleteHandler(row) {
delBanner(row.id).then(response => {
delObj(row.id).then(response => {
if (response.status === 200) {
this.$notify({
title: '成功',
......
src/views/baseInfo/generalSetting.vue
View file @ 6185dd1f
......@@ -50,7 +50,7 @@
</div>
<!-- banner modal弹窗 -->
<el-dialog :title="modalTitle" :visible.sync="dialogVisible" :before-close="handleDialogClose">
<el-form :model="dialogFrom" :rules="rules" ref="dialogFrom" label-width="90px">
<el-form :model="dialogFrom" :rules="rules" ref="dialogFrom" label-width="130px">
<el-form-item label="标题" prop="title">
<el-input v-model="dialogFrom.title" placeholder="请输入标题"></el-input>
</el-form-item>
......@@ -59,8 +59,8 @@
</el-form-item>
<el-row v-if="dialogFrom.type==88">
<el-col :span="12">
<el-form-item label="提现金额" prop="amount">
<el-input v-model="dialogFrom.amount" placeholder="请输入提现金额" ></el-input>
<el-form-item label="最低提现金额" prop="minAmount">
<el-input v-model="dialogFrom.minAmount" placeholder="请输入最低提现金额" ></el-input>
<span style="color:#bfcbd9;">钱包余额，最低提现额度，达到此金额后才能提现</span>
</el-form-item>
</el-col>
......@@ -73,6 +73,42 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dialogFrom.type==88" >
<el-col :span="12">
<el-form-item label="月额度" prop="amountOfMonth">
<el-input v-model="dialogFrom.amountOfMonth" placeholder="请输入月额度" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dialogFrom.type==88" >
<el-col :span="12">
<el-form-item label="日额度" prop="amountOfDay">
<el-input v-model="dialogFrom.amountOfDay" placeholder="请输入日额度" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dialogFrom.type==88" >
<el-col :span="12">
<el-form-item label="最多提现次数(月)" prop="maxNumberOfMonth">
<el-input v-model="dialogFrom.maxNumberOfMonth" placeholder="请输入最多提现次数（月）" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dialogFrom.type==88" >
<el-col :span="12">
<el-form-item label="最多提现次数(日)" prop="maxNumberOfDay">
<el-input v-model="dialogFrom.maxNumberOfDay" placeholder="请输入最多提现次数（日）" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dialogFrom.type==88" >
<el-col :span="12">
<el-form-item label="提现方式" prop="withdrawWay">
<el-radio v-model="dialogFrom.withdrawWay" label="1">线上</el-radio>
<el-radio v-model="dialogFrom.withdrawWay" label="2">线下</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-tabs v-model="activeName2" type="card">
<el-tab-pane label="详情" name="first">
......@@ -178,8 +214,13 @@
title: "",
type: undefined,
value:"",
amount: 100,
proceduReates:0.001
minAmount: 100,
proceduReates:0.001,
amountOfMonth:'',
amountOfDay:'',
maxNumberOfMonth:'',
maxNumberOfDay:'',
withdrawWay:1
},
rules: {
title: {
......@@ -196,9 +237,29 @@
required: true,
message: '请输入提现手续费',
},
amount: {
minAmount: {
required: true,
message: '请输入最低提现金额',
},
amountOfMonth: {
required: true,
message: '请输入月额度',
},
amountOfDay: {
required: true,
message: '请输入日额度',
},
maxNumberOfMonth: {
required: true,
message: '请输入最多提现次数（月）',
},
maxNumberOfDay: {
required: true,
message: '请输入最多提现次数（日）',
},
withdrawWay: {
required: true,
message: '请选择提现方式',
}
},
list: null,
......@@ -283,8 +344,13 @@
title: "",
type: undefined,
value:"",
amount: 100,
proceduReates:0.001
minAmount: 100,
proceduReates:0.001,
amountOfMonth:'',
amountOfDay:'',
maxNumberOfMonth:'',
maxNumberOfDay:'',
withdrawWay:1
};
this.activeName2 = "";
},
......@@ -310,14 +376,19 @@
if(item.type == 88){
//提现规则
item.params = JSON.parse(item.params);
item.amount = item.params.amount;
item.minAmount = item.params.minAmount;
item.proceduReates = item.params.proceduReates;
item.amountOfMonth = item.params.amountOfMonth;
item.amountOfDay = item.params.amountOfDay;
item.maxNumberOfMonth = item.params.maxNumberOfMonth;
item.maxNumberOfDay = item.params.maxNumberOfDay;
item.withdrawWay = item.params.withdrawWay;
}
});
listRs = response.data.rows;
totalCountRs = response.data.total;
}debugger
// "{"amount":"11","proceduReates":"0.02"}"
}
// "{"minAmount":"11","proceduReates":"0.02"}"
this.listLoading = false;
this.list = listRs;
this.total = totalCountRs;
......@@ -338,8 +409,13 @@
if(this.dialogFrom.type == 88){
//提现规则
let p = {
amount: this.dialogFrom.amount,
proceduReates:this.dialogFrom.proceduReates
minAmount: this.dialogFrom.minAmount,
proceduReates:this.dialogFrom.proceduReates,
amountOfMonth:this.dialogFrom.amountOfMonth,
amountOfDay:this.dialogFrom.amountOfDay,
maxNumberOfMonth:this.dialogFrom.maxNumberOfMonth,
maxNumberOfDay:this.dialogFrom.maxNumberOfDay,
withdrawWay:this.dialogFrom.withdrawWay
};
params.params = JSON.stringify(p);
}
......@@ -383,8 +459,13 @@
if(this.dialogFrom.type == 88){
//提现规则
let p = {
amount: this.dialogFrom.amount,
proceduReates:this.dialogFrom.proceduReates
minAmount: this.dialogFrom.minAmount,
proceduReates:this.dialogFrom.proceduReates,
amountOfMonth:this.dialogFrom.amountOfMonth,
amountOfDay:this.dialogFrom.amountOfDay,
maxNumberOfMonth:this.dialogFrom.maxNumberOfMonth,
maxNumberOfDay:this.dialogFrom.maxNumberOfDay,
withdrawWay:this.dialogFrom.withdrawWay
};
params.params = JSON.stringify(p);
}
......
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