Merge remote-tracking branch 'origin/master'
commit
57470589d6
|
@ -12,6 +12,15 @@ export function listUser(query) {
|
|||
|
||||
|
||||
|
||||
//充值用户记录
|
||||
export function userPayinfo(query) {
|
||||
return request({
|
||||
url: '/system/user/userPayinfo',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 充值用户余额
|
||||
export function userRecharge(data) {
|
||||
return request({
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
//查询规则引擎列表
|
||||
export function list(){
|
||||
return request({
|
||||
url: "/engine/type/list",
|
||||
method: "post"
|
||||
})
|
||||
}
|
||||
|
||||
export function insert(data){
|
||||
return request({
|
||||
url: "/engine/type/add",
|
||||
method: "post",
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
export function update(data){
|
||||
return request({
|
||||
url: "/engine/type/update",
|
||||
method: "post",
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(id){
|
||||
return request({
|
||||
url: "/engine/type/delete/" + id,
|
||||
method: "post",
|
||||
data:id
|
||||
})
|
||||
}
|
||||
|
||||
export function exports(data){
|
||||
return request({
|
||||
url: "/engine/type/export",
|
||||
method: "post",
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
|
@ -4,18 +4,35 @@
|
|||
<el-form-item label="规则名称">
|
||||
<el-input v-model="engineReq.name"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="规则类型">
|
||||
<el-input v-model="engineReq.type"></el-input>
|
||||
<el-select v-model="engineReq.type" placeholder="请选择类型">
|
||||
<el-option label="字段类型" value="1"></el-option>
|
||||
<el-option label="基本类型" value="2"></el-option>
|
||||
<el-option label="引用类型" value="3"></el-option>
|
||||
<el-option label="时间类型" value="4"></el-option>
|
||||
<el-option label="转换类型" value="5"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="是否激活">
|
||||
<el-input v-model="engineReq.isActivate"></el-input>
|
||||
<el-select v-model="engineReq.isActivate" placeholder="是否激活">
|
||||
<el-option label="已激活" value="1"></el-option>
|
||||
<el-option label="未激活" value="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="规则状态">
|
||||
<el-input v-model="engineReq.status"></el-input>
|
||||
<el-select v-model="engineReq.status" placeholder="规则状态">
|
||||
<el-option label="开启" value="1"></el-option>
|
||||
<el-option label="关闭" value="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-button @click="select()">
|
||||
查询
|
||||
</el-button>
|
||||
<el-button @click="clears()">
|
||||
重置
|
||||
</el-button>
|
||||
</el-form>
|
||||
<el-button
|
||||
type="warning"
|
||||
|
@ -326,6 +343,14 @@ export default {
|
|||
path:'list',
|
||||
query:{id:row.id}
|
||||
})
|
||||
},
|
||||
clears(){
|
||||
this.engineReq = {
|
||||
name: '',
|
||||
type: '',
|
||||
isActivate: '',
|
||||
status: ''
|
||||
};
|
||||
}
|
||||
},
|
||||
//生命周期 - 创建完成(可以访问当前this实例)",
|
||||
|
|
|
@ -1,13 +1,74 @@
|
|||
<script>
|
||||
export default {
|
||||
name: "index"
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
||||
<div>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
label="日期"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<i class="el-icon-time"></i>
|
||||
<span style="margin-left: 10px">{{ scope.row.date }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="姓名"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<el-popover trigger="hover" placement="top">
|
||||
<p>姓名: {{ scope.row.name }}</p>
|
||||
<p>住址: {{ scope.row.address }}</p>
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<el-tag size="medium">{{ scope.row.name }}</el-tag>
|
||||
</div>
|
||||
</el-popover>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
@click="handleEdit(scope.$index, scope.row)">编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
</style>
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
tableData: [{
|
||||
date: '2016-05-02',
|
||||
name: '王小虎',
|
||||
address: '上海市普陀区金沙江路 1518 弄'
|
||||
}, {
|
||||
date: '2016-05-04',
|
||||
name: '王小虎',
|
||||
address: '上海市普陀区金沙江路 1517 弄'
|
||||
}, {
|
||||
date: '2016-05-01',
|
||||
name: '王小虎',
|
||||
address: '上海市普陀区金沙江路 1519 弄'
|
||||
}, {
|
||||
date: '2016-05-03',
|
||||
name: '王小虎',
|
||||
address: '上海市普陀区金沙江路 1516 弄'
|
||||
}]
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleEdit(index, row) {
|
||||
console.log(index, row);
|
||||
},
|
||||
handleDelete(index, row) {
|
||||
console.log(index, row);
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
<h1 style="margin-bottom: 15px;">充值说明</h1>
|
||||
<h4>你敢充钱,我就敢让你没钱</h4>
|
||||
<h4>子龙说你得有个小目标</h4>
|
||||
<h4>什么小目标,得一个亿</h4>
|
||||
</li>
|
||||
<li>
|
||||
<h4 style="margin-bottom: 15px;">支付金额</h4>
|
||||
|
@ -37,8 +36,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {addUserMoney, userRecharge} from "@/api/system/user";
|
||||
|
||||
import { addUserMoney, userRecharge ,createRechargeRecord} from "@/api/system/user";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
@ -46,7 +44,7 @@ export default {
|
|||
addSysUser: {},
|
||||
disabled: false,
|
||||
// 同步跳转页面地址
|
||||
returnUrl: 'http://172.13.1.1/money/money',
|
||||
returnUrl:'http://localhost/money/money',
|
||||
//充值参数
|
||||
rechargeParams: {
|
||||
"totalAmt": '', //金额
|
||||
|
@ -86,7 +84,7 @@ export default {
|
|||
// 传递同步跳转地址
|
||||
returnUrl: this.returnUrl,
|
||||
// 商品名称
|
||||
subject: '充值金额',
|
||||
subject: '支付金额',
|
||||
// 支付类型
|
||||
productCode: 'FAST_INSTANT_TRADE_PAY'
|
||||
}
|
||||
|
@ -109,6 +107,7 @@ export default {
|
|||
let userId = localStorage.getItem('userId');
|
||||
this.addSysUser.userId = userId;
|
||||
addUserMoney(this.addSysUser).then(res => {
|
||||
createRechargeRecord(praem);
|
||||
}).catch(error => {
|
||||
console.error('Error updating user balance:', error);
|
||||
});
|
||||
|
|
|
@ -12,17 +12,17 @@
|
|||
<h1>余额预警</h1>
|
||||
<el-button type="text" @click="dialogFormVisible = true">开启</el-button>
|
||||
<el-dialog title="添加预警号码" :visible.sync="dialogFormVisible">
|
||||
<el-divider style="color: #00afff">
|
||||
<el-divider style="border-color: #00afff;">
|
||||
<el-tag content-position="right" type="warning">
|
||||
账户可用余额小于该值时,每天短信通知一次(最多连续提醒5天)
|
||||
</el-tag>
|
||||
</el-divider>
|
||||
<el-form :model="form">
|
||||
<el-form-item label="预警阈值:" :label-width="formLabelWidth">
|
||||
<el-input v-model="form.name" autocomplete="off"></el-input>
|
||||
<el-input v-model="form.userBalance" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="预警号码:" :label-width="formLabelWidth">
|
||||
<el-input v-model="form.phone" autocomplete="off"></el-input>
|
||||
<el-input v-model="form.phonenumber" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
|
@ -0,0 +1,120 @@
|
|||
<template>
|
||||
<div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- 添加或修改规则引擎对话框 -->
|
||||
|
||||
|
||||
|
||||
|
||||
<el-button type="text" @click="dialogFormVisible = true">添加规则类型</el-button>
|
||||
|
||||
<el-dialog title="添加规则" :visible.sync="dialogFormVisible">
|
||||
|
||||
<el-form :model="type">
|
||||
|
||||
<el-form-item label="规则名称" :label-width="formLabelWidth">
|
||||
|
||||
<el-input v-model="form.name" autocomplete="off"></el-input>
|
||||
|
||||
</el-form-item>
|
||||
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogFormVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<el-table :data="arr" style="width: 100%">
|
||||
|
||||
<el-table-column label="类型编号" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px">{{ scope.row.id }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="类型名称" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px">{{ scope.row.name }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import {del, insert, list} from "@/api/type/type";
|
||||
|
||||
export default {
|
||||
//import引入的组件需要注入到对象中才能使用"
|
||||
components: {},
|
||||
props: {},
|
||||
data() {
|
||||
//这里存放数据"
|
||||
return {
|
||||
arr:[],
|
||||
type:{},
|
||||
rules: {
|
||||
name: [{required: true, message: '请输入规则名称', trigger: 'blur'}]
|
||||
},
|
||||
dialogFormVisible:false,
|
||||
form: {
|
||||
name: '',
|
||||
region: '',
|
||||
date1: '',
|
||||
date2: '',
|
||||
delivery: false,
|
||||
type: [],
|
||||
resource: '',
|
||||
desc: ''
|
||||
},
|
||||
formLabelWidth: '120px'
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
List(){
|
||||
list().then(res =>{
|
||||
this.arr = res;
|
||||
})
|
||||
},
|
||||
handleDelete(id){
|
||||
if (confirm("你确定删除吗?")){
|
||||
del(id).then(res =>{
|
||||
this.$message.success(res.msg || "删除成功")
|
||||
})
|
||||
}
|
||||
},
|
||||
submitForm(){
|
||||
this.type = {}
|
||||
this.dialogFormVisible=true
|
||||
insert(this.type).then(res =>{
|
||||
this.$message.success(res.msg || "添加成功")
|
||||
})
|
||||
this.dialogFormVisible = false;
|
||||
}
|
||||
},
|
||||
//生命周期 - 创建完成(可以访问当前this实例)",
|
||||
created() {
|
||||
this.List();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
</style>
|
Loading…
Reference in New Issue