aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
X1627315083
2025-01-14 11:02:02 +08:00
parent d4c83ce43a
commit 4421488a7b
5 changed files with 67 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/component/Administrator/Transaction/TransactionTable.vue
View File

@@ -268,45 +268,29 @@ export default defineComponent({
width:100,
fixed: "left",
sorter: true,
},
{
title: "Country",
align: "center",
dataIndex: "country",
key: "country",
width:150,
ellipsis:true
// customRender: (record: any) => {
// let time = formatTime(
// record.text / 1000,
// "YYYY-MM-DD hh:mm:ss"
// );
// return time;
// },
},
{
title: "City",
title: "Platform",
align: "center",
dataIndex: "city",
key: "city",
width:150,
ellipsis:true
},
{
title: "Create Time",
align: "center",
dataIndex: "createTime",
key: "createTime",
dataIndex: "platform",
key: "platform",
width:150,
ellipsis:true,
},
{
},{
title: "Payer Total",
align: "center",
dataIndex: "payerTotal",
key: "payerTotal",
width:150,
ellipsis:true,
},
{
title: "Type",
align: "center",
dataIndex: "type",
key: "type",
width:150,
ellipsis:true,
},
{
title: "Payment Method",
@@ -315,28 +299,14 @@ export default defineComponent({
key: "paymentMethod",
width:150,
ellipsis:true,
},{
},
{
title: "last4",
key: "last4",
width:120,
align: "center",
dataIndex: "last4",
// slots:{customRender:'action'}
},
{
title: "Platform",
align: "center",
dataIndex: "platform",
key: "platform",
width:150,
ellipsis:true,
},{
title: "Type",
align: "center",
dataIndex: "type",
key: "type",
width:150,
ellipsis:true,
},
// {
// title: 'User Type',
@@ -360,6 +330,30 @@ export default defineComponent({
// return str;
// },
// },
{
title: "City",
align: "center",
dataIndex: "city",
key: "city",
width:150,
ellipsis:true
},
{
title: "Country",
align: "center",
dataIndex: "country",
key: "country",
width:150,
ellipsis:true
},
{
title: "Create Time",
align: "center",
dataIndex: "createTime",
key: "createTime",
width:150,
ellipsis:true,
},
{
title: "Status",
align: "center",
@@ -414,7 +408,7 @@ export default defineComponent({
? filterData.rangePickerValue[0] + " " + "00:00:00"
: "";
let endDate: any = filterData.rangePickerValue?.[1]
? filterData.rangePickerValue[1] + " " + "00:00:00"
? filterData.rangePickerValue[1] + " " + "23:59:59"
: "";
let data = {
order: filterData.order,

2
src/component/Administrator/allUser.vue
View File

@@ -415,7 +415,7 @@ export default defineComponent({
? filterData.rangePickerValue[0] + " " + "00:00:00"
: "";
let endDate: any = filterData.rangePickerValue?.[1]
? filterData.rangePickerValue[1] + " " + "00:00:00"
? filterData.rangePickerValue[1] + " " + "23:59:59"
: "";
let data = {
endTime: endDate,

49
src/component/HomePage/bindEmail.vue
View File

@@ -48,31 +48,34 @@
<div class="login_form_title marign_top30">Email</div>
<input
class="login_form_input"
:class="{active:!!email}"
:class="{active:!!email && bindType != 'Modify'}"
placeholder="Enter your email address"
v-model="email"
:disabled="!!email"
:disabled="!!email && bindType != 'Modify'"
@keydown.enter="submitPerLogin()"
/>
<div class="login_form_title marign_top30">{{$t('account.Country')}}:</div>
<div class="login_form_select">
<a-select
class="gallerySelect"
v-model:value="Country"
:disabled="!!userDetail.country"
size="large"
optionFilterProp="label"
style="width: 100%;"
:options="countryList"
placeholder="Please select"
allowClear
show-search
></a-select>
</div>
<div class="login_form_title marign_top30">{{$t('account.CompanyName')}}:</div>
<input class="login_form_input" :class="{active:!!email}" :disabled="!!CompanyName" type="text" placeholder="Please enter occupation" v-model="CompanyName">
<div v-if="bindType != 'Modify'">
<div class="login_form_title marign_top30">{{$t('account.Country')}}:</div>
<div class="login_form_select">
<a-select
class="gallerySelect"
v-model:value="Country"
:disabled="!!userDetail.country"
size="large"
optionFilterProp="label"
style="width: 100%;"
:options="countryList"
placeholder="Please select"
allowClear
show-search
></a-select>
</div>
<div class="login_form_title marign_top30">{{$t('account.CompanyName')}}:</div>
<input class="login_form_input" :class="{active:!!CompanyName}" :disabled="!!userDetail.country" type="text" placeholder="Please enter occupation" v-model="CompanyName">
</div>
<!-- 邮箱登录 start -->
<div class="login_form_email" :class="{active:emailStap===2}">
<div v-show="emailStap === 2" class="email_last_step">
@@ -267,16 +270,16 @@ export default defineComponent({
message.info("The email format is incorrect");
return;
}
if (!this.CompanyName) {
if (!this.CompanyName && this.bindType != 'Modify') {
message.info("Please enter occupation");
return;
}
if (!this.Country) {
if (!this.Country && this.bindType != 'Modify') {
message.info("Please select a country");
return;
}
let type = 'BIND_MAILBOX'
if(this.email == this.userDetail.email)type = 'UPDATE_USERINFO'
if(this.email == this.userDetail.email && this.bindType != 'Modify')type = 'UPDATE_USERINFO'
let data = {
"email": this.email,
"ip": "",

2
src/store/userHabit/userHabit.ts
View File

@@ -345,8 +345,6 @@ const userHabit : Module<UserHabit,RootState> = {
let getUserDetail = ()=>{
return new Promise((resolve,reject) => {
Https.axiosPost(Https.httpUrls.accountDetail).then((rv: any) => {
console.log(rv);
if(rv){
context.commit('setUserDetail',rv)
}

2
src/views/HomeView/HomeView.vue
View File

@@ -232,7 +232,7 @@
</div> -->
<!-- design collection的进度蒙层 end-->
<affiche ref="affiche"></affiche>
<!-- <tesst></tesst> -->
<tesst></tesst>
</div>
</template>