Merge remote-tracking branch 'origin/StableVersion' into dev_vite
This commit is contained in:
@@ -95,6 +95,9 @@
|
||||
allowClear
|
||||
show-search
|
||||
></a-select>
|
||||
</div>
|
||||
<div class="admin_state_item">
|
||||
<span>Total Amount:</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="admin_search">
|
||||
@@ -192,7 +195,7 @@ export default defineComponent({
|
||||
countryList: computed(()=>{
|
||||
return store.state.adminPage.country
|
||||
}),
|
||||
isAwayOrUnfold:false
|
||||
isAwayOrUnfold:false,
|
||||
});
|
||||
let filterData: any = reactive({
|
||||
rangePickerValue: [],
|
||||
@@ -291,6 +294,14 @@ export default defineComponent({
|
||||
key: "platform",
|
||||
width:150,
|
||||
ellipsis:true,
|
||||
},
|
||||
{
|
||||
title: "Email",
|
||||
align: "center",
|
||||
dataIndex: "email",
|
||||
key: "email",
|
||||
width:200,
|
||||
ellipsis:true,
|
||||
},{
|
||||
title: "Payment Amount",
|
||||
align: "center",
|
||||
@@ -451,8 +462,6 @@ export default defineComponent({
|
||||
Https.axiosPost(Https.httpUrls.queryTransaction, data).then(
|
||||
(rv: any) => {
|
||||
if (rv) {
|
||||
console.log(rv);
|
||||
|
||||
// this.dataList = rv
|
||||
filter.dataList = rv.content;
|
||||
filterData.total = rv.total;
|
||||
|
||||
Reference in New Issue
Block a user