From acb77671021d451105f561860b2d9d86858d5e57 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 19 Sep 2025 18:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9=E5=9B=BD?=
 =?UTF-8?q?=E5=AE=B6=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Administrator/SE/allUser/index.vue        |  2 +-
 .../Transaction/TransactionTable.vue          |  2 +-
 src/component/Administrator/allUser.vue       |  2 +-
 .../Administrator/allUserPoerations.vue       |  2 +-
 src/component/Administrator/trialAllUser.vue  |  2 +-
 .../home/design/editDesignType/index.vue      | 51 ++++++++++---------
 6 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/component/Administrator/SE/allUser/index.vue b/src/component/Administrator/SE/allUser/index.vue
index 28309f70..521e80df 100644
--- a/src/component/Administrator/SE/allUser/index.vue
+++ b/src/component/Administrator/SE/allUser/index.vue
@@ -22,7 +22,7 @@
                     </a-range-picker>
                 </div>
                 <!-- <div class="admin_state_item">
-                    <span>Country:</span>
+                    <span>Country or Region:</span>
 					<a-select
                         v-model:value="country"
 						:allowClear="true"
diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue
index 5641dc59..8e153108 100644
--- a/src/component/Administrator/Transaction/TransactionTable.vue
+++ b/src/component/Administrator/Transaction/TransactionTable.vue
@@ -22,7 +22,7 @@
                     </a-range-picker>
                 </div>
                 <div class="admin_state_item">
-                    <span>Country:</span>
+                    <span>Country or Region:</span>
 					<a-select
                         v-model:value="country"
 						:allowClear="true"
diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue
index eb4535a1..e162e58d 100644
--- a/src/component/Administrator/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -26,7 +26,7 @@
 					<a-select v-model:value="userType" size="large" style="width:250px" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select>
 				</div> -->
                 <div class="admin_state_item">
-                    <span>Country:</span>
+                    <span>Country or Region:</span>
 					<a-select
                         v-model:value="country"
 						:allowClear="true"
diff --git a/src/component/Administrator/allUserPoerations.vue b/src/component/Administrator/allUserPoerations.vue
index 89a75525..4ed3b1e0 100644
--- a/src/component/Administrator/allUserPoerations.vue
+++ b/src/component/Administrator/allUserPoerations.vue
@@ -92,7 +92,7 @@
 				/>
 			</div>
 			<div class="admin_state_item">
-				<span>Country:</span>
+				<span>Country or Region:</span>
 				<input
 					:disabled="title != 'Add'"
 					:class="{active:title != 'Add'}"
diff --git a/src/component/Administrator/trialAllUser.vue b/src/component/Administrator/trialAllUser.vue
index 606887b1..696e815d 100644
--- a/src/component/Administrator/trialAllUser.vue
+++ b/src/component/Administrator/trialAllUser.vue
@@ -23,7 +23,7 @@
 					</a-range-picker>
 				</div>
 				<div class="admin_state_item">
-                    <span>Country:</span>
+                    <span>Country or Region:</span>
 					<a-select
                         v-model:value="country"
 						:allowClear="true"
diff --git a/src/component/home/design/editDesignType/index.vue b/src/component/home/design/editDesignType/index.vue
index d03464f3..51d34141 100644
--- a/src/component/home/design/editDesignType/index.vue
+++ b/src/component/home/design/editDesignType/index.vue
@@ -812,31 +812,32 @@ methods: {
 	},
 	setImageIndex(index:any){
 		if(this.isNext)return
-		let this_ = this
-		if(this.isCanvas){
-			this.isNext = true
-			new Promise((resolve,reject)=>{
-				Modal.confirm({
-					title: this.t('scaleImage.submitCanvas'),
-					icon: createVNode(ExclamationCircleOutlined),
-					okText: 'Yes',
-					cancelText: 'No',
-					mask:false,
-					centered:true,
-					onOk() {
-						this_.scaleImageIndex = index
-						this_.isNext = false
-						resolve('') 
-					},
-					onCancel(){
-						this_.isNext = false
-						resolve('') 
-					}
-				});
-			})
-		}else{
-			this.scaleImageIndex = index
-		}
+		// let this_ = this
+		// if(this.isCanvas){
+		// 	this.isNext = true
+		// 	new Promise((resolve,reject)=>{
+		// 		Modal.confirm({
+		// 			title: this.t('scaleImage.submitCanvas'),
+		// 			icon: createVNode(ExclamationCircleOutlined),
+		// 			okText: 'Yes',
+		// 			cancelText: 'No',
+		// 			mask:false,
+		// 			centered:true,
+		// 			onOk() {
+		// 				this_.scaleImageIndex = index
+		// 				this_.isNext = false
+		// 				resolve('') 
+		// 			},
+		// 			onCancel(){
+		// 				this_.isNext = false
+		// 				resolve('') 
+		// 			}
+		// 		});
+		// 	})
+		// }else{
+		// 	this.scaleImageIndex = index
+		// }
+		this.scaleImageIndex = index
 	},
 	LikeFile(item:any,str:string){
 		let parent:any = this.$parent