From 4421488a7b6d67c48617d276d5bee5319ac34c3d Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 14 Jan 2025 11:02:02 +0800
Subject: [PATCH] fix

---
 .../Transaction/TransactionTable.vue          | 84 +++++++++----------
 src/component/Administrator/allUser.vue       |  2 +-
 src/component/HomePage/bindEmail.vue          | 49 ++++++-----
 src/store/userHabit/userHabit.ts              |  2 -
 src/views/HomeView/HomeView.vue               |  2 +-
 5 files changed, 67 insertions(+), 72 deletions(-)

diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue
index b681c02f..b171ad38 100644
--- a/src/component/Administrator/Transaction/TransactionTable.vue
+++ b/src/component/Administrator/Transaction/TransactionTable.vue
@@ -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,
diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue
index ba8962c7..78660a84 100644
--- a/src/component/Administrator/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -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,
diff --git a/src/component/HomePage/bindEmail.vue b/src/component/HomePage/bindEmail.vue
index b7f27d0d..e2b231b5 100644
--- a/src/component/HomePage/bindEmail.vue
+++ b/src/component/HomePage/bindEmail.vue
@@ -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": "",
diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts
index d099b22c..57977168 100644
--- a/src/store/userHabit/userHabit.ts
+++ b/src/store/userHabit/userHabit.ts
@@ -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)
 						}
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index 41a51f80..92bd04ac 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -232,7 +232,7 @@
 		</div> -->
 		<!-- design collection的进度蒙层  end-->
 		<affiche ref="affiche"></affiche>
-		<!-- <tesst></tesst> -->
+		<tesst></tesst>
 
 	</div>
 </template>