Skip to content

A
apaas-ui
Commit 5e701a5b authored by 徐一鸣's avatar 徐一鸣
Browse files
Options

Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

parents 879010d6 4cccbbf6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 903 additions and 331 deletions
src/components/apass-table.vue
View file @ 5e701a5b
......@@ -301,7 +301,7 @@ export default {
default: () => 50,
},
height: {
type: Number,
type: [Number,String],
default: null,
},
rowClassName: {
......
src/components/order-list/order-list-list.vue
View file @ 5e701a5b
......@@ -2,11 +2,11 @@
<div class="order_list">
<div class="order_th_pad">
<el-row class="order_th">
<el-col :span="8">服务信息</el-col>
<el-col :span="7">服务信息</el-col>
<el-col :span="5">规格</el-col>
<el-col :span="3">购买时长</el-col>
<el-col :span="3">总价</el-col>
<el-col :span="2">申请状态</el-col>
<el-col :span="3">申请状态</el-col>
<el-col :span="3">操作</el-col>
</el-row>
</div>
......
src/components/shop-cloud/shop-cloud.vue
View file @ 5e701a5b
......@@ -66,7 +66,7 @@
<el-col :span="6">
<el-form-item prop="cpu" class="form_item input_has_right">
<div class="form_item_title">CPU：</div>
<el-select v-model="formNew.cpu" placeholder="请选择CPU使用量">
<el-select v-model="formNew.cpu" @change="changeCPU" placeholder="请选择CPU使用量">
<el-option
v-for="item in optionsCPU"
:key="item.value"
......@@ -1101,7 +1101,6 @@ export default {
},
tabClick() {},
getNewList(val) {
console.log(val);
this.formNew.apply_file_name = val[0].name;
this.formNew.apply_file = val[0].url;
},
......@@ -1111,7 +1110,6 @@ export default {
},
handleChange() {},
getForm(val) {
console.log(val);
if (val !== "") {
let paramsOld = this.workSpaceOptions[val];
this.workSpaceId = paramsOld.Id;
......@@ -1328,6 +1326,22 @@ export default {
}
}
},
changeCPU(val) {
console.log(val);
this.formOld.memory = "";
this.formNew.memory = "";
if (val == "8") {
this.optionsRAM = [
{ value: "16", label: "16" },
{ value: "32", label: "32" },
]
} else if (val == "16") {
this.optionsRAM = [
{ value: "32", label: "32" },
{ value: "64", label: "64" },
]
}
}
},
};
</script>
......
src/pages/authority/user/money.vue
View file @ 5e701a5b
<template>
<div class="users_list">
<div class="apass_breadcrumb">
<el-breadcrumb separator="/" slot="breadcrumb">
<el-breadcrumb-item to="/authority">权限管理</el-breadcrumb-item>
<el-breadcrumb-item to="/authority/users">用户管理</el-breadcrumb-item>
<el-breadcrumb-item>充值</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="out_title">
<div class="title_text">
<span></span><span>充值</span>
<el-tooltip
class="tool_item"
effect="dark"
content="充值后，金币将直接充值到普通用户账户余额中，用于在平台内进行消费。"
placement="top-start"
offset="5"
>
<img src="../../../assets/imgs/tool_ic_tips.png" alt="" />
</el-tooltip>
</div>
<div class="give_form">
<span>充值金币</span
><el-input
v-model="money_num"
placeholder="请输入充值金币数"
></el-input>
<div class="give_money" @click="give_money">充值</div>
</div>
</div>
<div class="out_title" style="margin-top:10px;margin-bottom:20px;min-height:calc(100% - 230px);display: flex;flex-direction: column;justify-content: flex-start;">
<div class="title_text">
<span></span><span>充值记录</span>
<el-date-picker
v-model="search_date"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
@change="change_date"
>
</el-date-picker>
</div>
<div class="money_table">
<apass-table
class="apa_table"
ref="outtreetable"
style="min-height:calc(100% - 50px);flex-grow: 1;"
:data="tableData"
:header="table_header"
></apass-table>
<list-pagination
:total="total_list"
:page-sizes="[50, 20, 10]"
:page-size="currentlimit"
:current-page="currentPage"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
></list-pagination>
</div>
</div>
<apass-dialog
ref="dialog"
width="570px"
title="充值确认"
@cancel="cancelAction"
@submit="submitAction"
>
<div class="log_content" slot="content">
<p>即将充值 <span>{{money_num}}</span> 金币到以下账号：</p>
<div class="give_money_content">
<p>用户账号：<span>{{user_info1.user_id}}</span> </p>
<p>业务系统：<span>{{user_info1.system_name}}</span></p>
<p>所属机构：<span>{{user_info1.department}}</span></p>
</div>
<p><span>确定进行</span> 本次充值吗？充值后金币不可退回。</p>
</div>
</apass-dialog>
</div>
</template>
<script>
import apassDialog from "@/components/apass-dialog";
import apassTable from "@/components/apass-table";
import listPagination from "@/components/comments-pagination";
import helper from "@/services/helper.js";
export default {
props: [],
components: {
apassDialog
apassDialog,
apassTable,
listPagination,
},
data() {
return {
money_num: "",
search_date: "",
tableData: [],
table_header: [],
total_list: 0,
currentPage: 1,
currentlimit: 10,
user_info1:{},
};
},
watch: {
},
computed: {
},
watch: {},
computed: {},
created() {
this.refreshData()
this.user_info()
},
mounted() {
this.table_header = [
{
prop: "serial_number",
label: "充值流水ID",
align: "center",
},
{
prop: "amount",
label: "充值金额（金币/个）",
align: "center",
},
{
prop: "user_name",
label: "操作人",
align: "center",
},
{
prop: "created",
label: "充值时间",
align: "center",
type: "html",
getHtml: (str) => {
return `<span>${helper.dateStringTransform(str.created)}</span>`;
},
},
];
},
methods: {
give_money(){
if(this.money_num){
var reg = /^\d{1,}$/
if(reg.test(this.money_num)){
this.$refs.dialog.show();
}else{
this.$message.error('请填入正整数')
}
}else{
this.$message.error('请填入充值金额')
}
},
cancelAction() {
this.$refs.dialog.hide();
},
submitAction() {
this.post_money()
},
handleSizeChange(val) {
this.currentPage = 1
this.currentlimit = val;
this.refreshData();
},
handleCurrentChange(val) {
this.currentPage = val;
this.refreshData();
},
change_date(){
this.currentPage = 1
this.refreshData();
},
post_money(){
this.$http
.post(
`/apaas/backmgt/user/recharge`,{
"user_id":this.user_info1.user_id,
     "num":parseInt(this.money_num)
}
).then((res)=>{
if(res.data.success){
this.$refs.dialog.hide();
this.$message.success('充值成功')
}else{
this.$message.error(res.data.errMsg)
}
})
},
refreshData(){
this.$http
.get(
`/apaas/backmgt/user/rechargeRecords?start=${this.search_date[0]||''}&end=${this.search_date[1]||''}&limit=${this.currentlimit}&page=${this.currentPage}`
).then((res)=>{
if(res.data.success){
console.log(res.data.data);
this.tableData = res.data.data
}
})
},
user_info(){
this.$http
.get(
`/apaas/backmgt/user/detail/${this.$route.params.id}`
).then((res)=>{
if(res.data.success){
console.log(res.data.data);
this.user_info1 = res.data.data
}
})
},
},
};
</script>
<style scoped>
.users_list{
padding: 15px 20px;
.users_list {
height: calc(100% - 20px);
padding: 0px 20px;
}
.out_title {
width: 100%;
background-color: #ffffff;
box-shadow: 0px 3px 6px 0px #f4f7fc;
border-radius: 12px;
}
.title_text {
width: 100%;
height: 63px;
border-bottom: 1px solid #edf0ff;
line-height: 63px;
font-size: 16px;
font-weight: 600;
padding: 0 20px;
box-sizing: border-box;
color: #1d1e20;
}
.title_text span {
margin-right: 10px;
}
.title_text span:nth-of-type(1) {
display: inline-block;
width: 4px;
height: 16px;
background-color: #515fe7;
border-radius: 2px;
}
.title_text span:nth-of-type(2) {
vertical-align: 2px;
}
.give_form {
height: 104px;
line-height: 104px;
padding: 0 40px;
box-sizing: border-box;
}
.give_form span {
font-size: 14px;
font-weight: 600;
color: #242c43;
margin-right: 10px;
}
.give_form .give_money {
width: 124px;
height: 44px;
line-height: 44px;
text-align: center;
display: inline-block;
background-color: #e56600;
border-radius: 8px;
font-size: 16px;
color: #fcefd6;
margin-left: 10px;
cursor: pointer;
}
.give_form .el-input {
display: inline-block;
width: 360px;
}
.title_text .el-range-editor {
float: right;
margin-top: 12px;
}
.money_table{
flex-grow: 1;
display: flex;
justify-content: flex-start;
flex-direction: column;
padding: 0 20px;
}
.log_content p{
font-size: 14px;
color: #242c43;
line-height: 40px;
text-align: left;
padding-left: 15px;
}
.log_content p span{
color: #e56600;
}
.give_money_content{
background-color: #f8f9fd;
border-radius: 8px;
padding: 10px 0;
}
.give_money_content p{
color: #8890a7;
line-height: 30px;
}
.give_money_content p span{
color: #242c43;
}
</style>
<style>
.give_form .el-input__inner {
width: 360px;
height: 44px;
line-height: 44px;
}
.title_text .el-date-editor.el-input,
.title_text .el-date-editor.el-input__inner {
width: 245px;
}
.title_text .el-date-editor .el-range-separator {
line-height: 32px;
}
</style>
src/pages/user/my-coin.vue
View file @ 5e701a5b
......@@ -24,8 +24,8 @@
<div class="card_word">
<p class="card_name">账户余额</p>
<p>
{{ helper.numberFormat(user_info.answer_num)
}}<span v-if="user_info.answer_num > 10000" class="card_wan">
{{ helper.numberFormat(user_info.account_balance)
}}<span v-if="user_info.account_balance > 10000" class="card_wan">
万
</span>
</p>
......@@ -36,8 +36,8 @@
<div class="card_word">
<p class="card_name">充值笔数</p>
<p>
{{ helper.numberFormat(user_info.view_num)
}}<span v-if="user_info.view_num > 10000" class="card_wan">
{{ helper.numberFormat(user_info.recharge_count)
}}<span v-if="user_info.recharge_count > 10000" class="card_wan">
万
</span>
</p>
......@@ -67,6 +67,7 @@
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
:clearable="false"
@change="getCoinList"
></el-date-picker>
</div>
<apass-table
......@@ -103,12 +104,11 @@ export default {
user_info: {
user_name: "",
role: "",
question_num: 0,
answer_num: 0,
view_num: 0,
account_balance: 0,
recharge_count: 0,
picture_path: "",
},
tableData: [{}, {}],
tableData: [],
table_header: [],
total_list: 0,
currentPage: 1,
......@@ -125,8 +125,8 @@ export default {
this.pagination.page += val;
this.refreshData();
},
getUserCoin() {
this.$api.user.getUserQA().then((response) => {
getUserCoins() {
this.$api.user.getUserCoins().then((response) => {
if (response.data.success == 1) {
this.user_info = response.data.data;
}
......@@ -140,39 +140,47 @@ export default {
let query = {
start: this.date.length != 0 ? this.date[0] : "",
end: this.date.length != 0 ? this.date[1] : "",
limit: this.currentlimit,
page: this.currentPage,
};
console.log(query)
this.$api.user.getUserQA().then((response) => {
this.$api.user.getCoinList(query).then((response) => {
if (response.data.success == 1) {
this.user_info = response.data.data;
if (response.data.data && response.data.data.length != 0) {
this.tableData = response.data.data
} else {
this.tableData = [];
this.currentPage = 1;
}
this.total_list = response.data.total;
}
});
},
},
mounted() {
this.getUserCoin();
this.getUserCoins();
this.getCoinList();
this.table_header = [
{
prop: "title",
prop: "serial_number",
label: "充值流水ID",
align: "center",
type: "html",
getHtml: (str) => {
return `<span style="color:#0f2683;font-weight:bold;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" title="${str.title}">123123</span>`;
return `<span style="color:#0f2683;font-weight:bold;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" title="${str.serial_number}">${str.serial_number}</span>`;
},
},
{
prop: "content",
prop: "amount",
label: "充值金额（金币/个）",
align: "center",
type: "html",
getHtml: (str) => {
return `<span style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">123123123</span>`;
return `<span style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">${str.amount}</span>`;
},
},
{
prop: "answer_num",
prop: "balance",
label: "账户余额（金币/个）",
align: "center",
},
......
src/pages/user/order/order_detail.vue
View file @ 5e701a5b
This diff is collapsed.
src/pages/workbench/fwzc_fwcs.vue
View file @ 5e701a5b
......@@ -1144,8 +1144,12 @@ export default {
bodys = JSON.stringify(request);
} else if (this.zhfwQqt == "x-www-form-urlencoded") {
let request = this.$refs.fwcs_zhfw_www.getTableData().concat();
let arr = [];
request.pop();
bodys = JSON.stringify(request);
request.forEach(item => {
arr.push({key: item.requestEncoding, val: item.requestValue, field_type: "text"})
});
bodys = JSON.stringify(arr);
}
}
}
......
src/request/api/user.js
View file @ 5e701a5b
......@@ -71,10 +71,10 @@ const user = {
// my coins
getUserCoins() {
return axios.get(``)
return axios.get(`/apaas/backmgt/user/myAccount`)
},
getCoinList() {
return axios.get(``)
getCoinList(params) {
return axios.get(`/apaas/backmgt/user/rechargeRecords?start=${params.start}&end=${params.end}&limit=${params.limit}&page=${params.page}`)
}
}
......
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