Commit f43ef464 authored by 刘殿昕's avatar 刘殿昕

fixed .

parent c7b519d6
......@@ -1175,7 +1175,7 @@ export default {
this.formOld.appDuration >= 1 ? this.formOld.appDuration : 0
}个月`;
}
console.log(sumCM, sumDisk)
// console.log(sumCM, sumDisk)
this.amounts_payable = Number((Number(sumCM) + Number(sumDisk)).toFixed(2));
// this.total_money = sumCM + sumDisk - a_deductions;
return this.amounts_payable;
......@@ -1688,8 +1688,8 @@ export default {
},
disks: [
{
disk_num: this.formNew.dataDisk ? this.formNew.dataDisk + "" : "0",
disk_cap: this.formNew.perDataDisk ? this.formNew.perDataDisk + "" : "0",
disk_num: this.formNew.dataDisk ? this.formNew.dataDisk : 0,
disk_cap: this.formNew.perDataDisk ? this.formNew.perDataDisk : 0,
store_type: "nfs-client",
},
],
......@@ -1734,8 +1734,8 @@ export default {
},
disks: [
{
disk_num: this.formOld.dataDisk ? this.formOld.dataDisk + "" : "0",
disk_cap: this.formOld.perDataDisk ? this.formOld.perDataDisk + "" : "0",
disk_num: this.formOld.dataDisk ? this.formOld.dataDisk : 0,
disk_cap: this.formOld.perDataDisk ? this.formOld.perDataDisk : 0,
store_type: "nfs-client",
},
],
......
......@@ -24,10 +24,7 @@
<div class="card_word">
<p class="card_name">账户余额</p>
<p>
{{ helper.numberFormat(user_info.account_balance)
}}<span v-if="user_info.account_balance > 10000" class="card_wan">
</span>
{{ user_info.account_balance }}
</p>
</div>
</div>
......@@ -45,7 +42,7 @@
</div>
</div>
</BlockRadius>
<BlockRadius class="block_down info_block">
<BlockRadius ref="tableIn" class="block_down info_block">
<div class="czjl">
<div class="czjl_p">
充值记录
......@@ -70,19 +67,20 @@
@change="getCoinList"
></el-date-picker>
</div>
<apass-table
class="apa_table"
ref="outtreetable"
:data="tableData"
:header="table_header"
></apass-table>
<div class="apa_table">
<apass-table
ref="outtreetable"
:data="tableData"
:header="table_header"
></apass-table>
</div>
<list-pagination
:total="total_list"
:page-sizes="[50, 20, 10]"
:page-size="currentlimit"
:current-page="currentPage"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@size-change="changePageSize"
@current-change="changeCurrentPage"
></list-pagination>
</BlockRadius>
</div>
......@@ -117,13 +115,15 @@ export default {
}),
watch: {},
methods: {
handleSizeChange(val) {
this.pagination.rowsPerPage = val;
this.refreshData();
changePageSize(val) {
this.currentlimit = val;
this.currentPage = 1;
this.getCoinList();
},
handleCurrentChange(val) {
this.pagination.page += val;
this.refreshData();
changeCurrentPage(val) {
console.log(val);
this.currentPage = val;
this.getCoinList();
},
getUserCoins() {
this.$api.user.getUserCoins().then((response) => {
......@@ -151,7 +151,6 @@ export default {
this.tableData = [];
this.currentPage = 1;
}
this.total_list = response.data.total;
}
});
......@@ -382,4 +381,14 @@ export default {
.czjl .el-date-editor .el-range__icon {
margin-right: 8px;
}
.apa_table .apass_table {
height: 100%;
}
.apa_table .apass_table .el-table {
height: 100%;
}
.apa_table .apass_table .el-table .el-table__body-wrapper {
max-height: calc(100% - 49px);
overflow: auto;
}
</style>
\ No newline at end of file
......@@ -134,9 +134,13 @@ export default {
reason: [
{
required: true,
message: "请填写删除理由",
trigger: "blur",
},
{
max: 20,
min: 5,
message: "填写活动形式",
message: "输入5至20个字符",
trigger: "blur",
},
],
......
......@@ -79,7 +79,13 @@
{{ item.title }}
</p>
<p class="cell_cont">
{{ item.content.replace(/<[^<>]+>/g, "") }}
{{
item.question_content && item.question_content != ""
? item.question_content.replace(/<[^<>]+>/g, "")
: item.content && item.content != ""
? item.content.replace(/<[^<>]+>/g, "")
: ""
}}
</p>
<p v-if="activeName == 2" class="cell_other">
<span>
......
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