From fd69caff946104af011853ccd11f6e17f5edefa5 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 23 Dec 2024 11:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88=E5=92=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Account/frontPage/cancelRenewal.vue       | 50 ++++------
 src/component/HomePage/ExportModel.vue        | 96 ++++++++++++++++++-
 src/component/mainPage/signUp/index.vue       |  6 +-
 src/component/modules/liquefaction.vue        | 24 +++++
 src/lang/cn.ts                                | 11 +++
 src/lang/en.ts                                | 11 +++
 src/views/HomeMain.vue                        |  3 +-
 src/views/affiliate/affiliateRegister.vue     |  2 +-
 8 files changed, 164 insertions(+), 39 deletions(-)

diff --git a/src/component/Account/frontPage/cancelRenewal.vue b/src/component/Account/frontPage/cancelRenewal.vue
index 82b26f92..6838a7ac 100644
--- a/src/component/Account/frontPage/cancelRenewal.vue
+++ b/src/component/Account/frontPage/cancelRenewal.vue
@@ -3,15 +3,9 @@
 		<div v-if="userDetail.status != 'canceled'">
 			<div class="cancel_box_item">
 				<div class="modal_title_text">
-					<div>Sorry to see you go</div>
-					<div class="modal_title_text_assistant">What is your reason for cancelling AiDA?</div>
+					<div>What is your reason for cancelling AiDA?</div>
 				</div>
-				<a-select class="gallerySelect" v-model:value="currentState.value" size="large" optionFilterProp="label" :options="state" placeholder="Select a reason" allowClear show-search></a-select>
 				<textarea v-model="textareaValue" placeholder="Share your feedback here..."></textarea>
-				<div class="button_box">
-					<div class="gallery_btn white gallery_btn_radius" @click="subscribe">stay subscribed</div>
-					<div class="gallery_btn gallery_btn_radius" @click="cancelSubscription">Yes, cancel it</div>
-				</div>
 			</div>
 			<div class="cancel_box_item cancel_box_item2">
 				<div class="modal_title_text">
@@ -31,8 +25,8 @@
 						safe.</div>
 				</div>
 				<div class="button_box">
-					<div class="gallery_btn white gallery_btn_radius" @click="subscribe">stay subscribed</div>
-					<div class="gallery_btn gallery_btn_radius" @click="cancelSubscription">Yes, cancel it</div>
+					<div class="gallery_btn white" @click="subscribe">Continue to renew</div>
+					<div class="gallery_btn" @click="cancelSubscription">Yes，cancel it</div>
 				</div>
 			</div>
 		</div>
@@ -62,20 +56,9 @@ export default defineComponent({
 			return store.state.UserHabit.userDetail
 		})
 		let accountHomeData:any = reactive({
-            currentState:{value:'income'}, //裁剪的原始文件数据
 			textareaValue:'',
 			isShowMark:false,
 		})
-		let state:any = ref([
-			{
-				label:useI18n().t('allOrder.Income'),
-				value:'income',
-			},
-			{
-				label:useI18n().t('allOrder.Expend'),
-				value:'expend',
-			},
-		])
 		let renew = ref()
 		const subscribe = ()=>{
 			renew.value.init()
@@ -102,7 +85,6 @@ export default defineComponent({
         return{
            ...toRefs(accountHomeData),
 		   userDetail,
-		   state,
 		   renew,
 		   subscribe,
 		   cancelSubscription,
@@ -120,9 +102,7 @@ export default defineComponent({
 	
 	>div{
 		display: flex;
-		justify-content: center;
-		align-items: flex-start;
-		height: 45rem;
+		flex-direction: column;
 		align-items: center;
 		&.no_renewal{
 			font-size: 2rem;
@@ -130,18 +110,16 @@ export default defineComponent({
 		}
 	}
 	.cancel_box_item{
-		border: 2px solid #000;
-		border-radius: 2rem;
-		padding: 3rem;
-		margin-right: 3rem;
-		width: 48rem;
-		height: 45rem;
+		margin-bottom: 3rem;
+		width: 100%;
 		>.modal_title_text{
+			margin: 0;
 			>div{
 				font-weight: 600;
 			}
 			.modal_title_text_assistant{
 				margin-top: 1rem;
+				font-weight: 600;
 			}
 		}
 		>.gallerySelect{
@@ -165,10 +143,11 @@ export default defineComponent({
 		}
 		>.button_box{
 			display: flex;
-		    justify-content: space-between;
 			margin-top: 2.5rem;
-			>div{
-				width: calc((100% - 1rem) / 2);
+			justify-content: flex-end;
+			>div:nth-child(1){
+				margin-right: 1rem;
+				// width: calc((100% - 1rem) / 2);
 			}
 		}
 	}
@@ -178,7 +157,7 @@ export default defineComponent({
 	.cancel_box_item2{
 		.modal_title_text{
 			>div:nth-child(1){
-			margin-bottom: 3.4rem;
+				margin-bottom: 2rem;
 			}
 			>div:nth-child(2){
 				margin-bottom: 1.5rem;
@@ -194,6 +173,9 @@ export default defineComponent({
 					display: flex;
 				}
 			}
+			>div:nth-child(3){
+				margin-bottom: 2rem;
+			}
 		}
 		.tips{
 			padding: 1.5rem 1rem;
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index 99a32e82..6e003e46 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -160,6 +160,23 @@
 						<input type="number" @input="setPencilColor" v-model="canvasPencilColor">
 					</div> -->
 				</div>
+				<div class="shortcutKeys_box">
+					<div class="gallery_btn white" @click.stop="setCloseNav('shortcut')">
+						{{ $t('exportModel.ShortcutKeys') }}
+						<i class="icon iconfont icon-xiala" :class="closeNav.shortcut?'icon-rotate-tool':''" ></i>
+					</div>
+					<div class="shortcutKeys_list">
+						<div class="shortcutKeys_list_item" v-for="item in keysList" :key="item.name">
+							<div class="name">{{ item.name }}</div>
+							<div class="key">
+								<div>{{ item.winDowKey }}</div>
+								<span style="margin: 0 1rem">/</span>
+								<div>{{ item.macKey }}</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				
 				<!-- <div class="exportCanvasBox_title" @click.stop="setCloseNav('move')">
 					{{ $t('exportModel.More') }}
 				</div>
@@ -971,7 +988,7 @@ export default defineComponent({
 		let closeNav = ref({
 			nav:false,
 			tool:false,
-			move:false,
+			shortcut:false,
 		})
 		let setCloseNav = (key)=>{
 			closeNav.value[key] = !closeNav.value[key]
@@ -1198,6 +1215,49 @@ export default defineComponent({
 		// let brushwork = ref('')
 		// 监听键盘的 keydown 和 keyup 事件
 		let keyDown = []
+		const keysList = [
+			{
+				name:useI18.t('exportModel.PaintingEraser'),
+				winDowKey:'~',
+				macKey:'~',
+			},{
+				name:useI18.t('exportModel.Uncheck'),
+				winDowKey:'Ctrl + D',
+				macKey:'Command + D',
+			},{
+				name:useI18.t('exportModel.Revoke'),
+				winDowKey:'Ctrl + Z',
+				macKey:'Command + Z',
+			},{
+				name:useI18.t('exportModel.Retreat'),
+				winDowKey:'Ctrl + Shift + Z',
+				macKey:'Command + Ctrl + Z',
+			},{
+				name:useI18.t('exportModel.ReduceBrushSize'),
+				winDowKey:'[',
+				macKey:'[',
+			},{
+				name:useI18.t('exportModel.IncreaseBrushSize'),
+				winDowKey:']',
+				macKey:']',
+			},{
+				name:useI18.t('exportModel.DrinkingStraw'),
+				winDowKey:'I',
+				macKey:'I',
+			},{
+				name:useI18.t('exportModel.Copy'),
+				winDowKey:'Ctrl + C',
+				macKey:'Command + C',
+			},{
+				name:useI18.t('exportModel.Paste'),
+				winDowKey:'Ctrl + V',
+				macKey:'Command + V',
+			},{
+				name:useI18.t('exportModel.UploadOpenimage'),
+				winDowKey:'Ctrl + O',
+				macKey:'Command + O',
+			},
+		]
 		let oldOperation = ''
 		let canvasKeyDown = (event) => {
 			let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','Backquote']
@@ -2159,6 +2219,7 @@ export default defineComponent({
 			setPencilWidth,//切换宽度执行函数 给当前矩形或者笔触设置宽度
 			setHDExport,//高清导出选择的图片
 			brushworkChange,//切换笔触的回调
+			keysList,
 			textureValueChange,//切换材质信息
 			brushworkValue,//当前笔触
 			textureValue,//当前材质
@@ -2352,6 +2413,39 @@ export default defineComponent({
 			.exportCanvasBox_left_tool{
 				margin: 0;
 			}
+			.shortcutKeys_box{
+				position: relative;
+				.shortcutKeys_list{
+					display: none;
+					position: absolute;
+					z-index: 2;
+					width: 45rem;
+					max-height: 45rem;
+					background: #f7f8fa;
+					border-radius: 2rem;
+					right: 0;
+					overflow-y: auto;
+					padding: 2rem;
+					.shortcutKeys_list_item{
+						display: flex;
+						font-size: 1.8rem;
+						justify-content: space-between;
+						margin-bottom: 2rem;
+						>.key{
+							display: flex;
+						}
+					}	
+					.shortcutKeys_list_item:last-child{
+					    margin-bottom: 0;
+					}
+				}
+				&:hover{
+					.shortcutKeys_list{
+						display: block;
+					}
+				}
+			}
+			
 			.label_item,label {
                 display: flex;
 				align-items: center;
diff --git a/src/component/mainPage/signUp/index.vue b/src/component/mainPage/signUp/index.vue
index 261f2401..604e2f7e 100644
--- a/src/component/mainPage/signUp/index.vue
+++ b/src/component/mainPage/signUp/index.vue
@@ -10,10 +10,12 @@
 				<div class="gallery_item" v-for="item in productList" :key="item">
 					<div class="product_signUp_box">
 						<div class="title">{{ item.title }}</div>
-						<div class="info">{{ item.info }}</div>
+						<div class="info" v-if="item.title != '------------------'">{{ item.info }}</div>
+						<div class="info" v-else>-----</div>
 						<div class="detail">{{ item.detail }}</div>
 						<div class="highlight" v-if="item.highlight">{{ item.highlight }}</div>
-						<div class="gallery_btn gallery_btn_radius" :class="{active:item.title == '------------------'}" @click="createAccount">Create account</div>
+						<div class="gallery_btn gallery_btn_radius" v-if="item.title != '------------------'" :class="{active:item.title == '------------------'}" @click="createAccount">Create account</div>
+						<div class="gallery_btn gallery_btn_radius" v-else :class="{active:item.title == '------------------'}" @click="createAccount">Contact us</div>
 					</div>
 					<ul class="product_detail">
 						<li v-for="detailItem in item.detailList">{{ detailItem }}</li>
diff --git a/src/component/modules/liquefaction.vue b/src/component/modules/liquefaction.vue
index 978664f9..b83d773b 100644
--- a/src/component/modules/liquefaction.vue
+++ b/src/component/modules/liquefaction.vue
@@ -47,6 +47,10 @@
 						<input type="range" v-model="density" @change="routesChange('density')">
 					</div>
 				</div>
+				<div class="liquefaction_parameter_item icon">
+					<i class="icon iconfont icon-chehui" @click="historyState('')"></i>
+					<i class="icon iconfont icon-fanchehui" @click="historyState('reverse')"></i>
+				</div>
 				<div class="liquefaction_parameter_item">
 					<div class="generage_btn started_btn" @click="cancelDsign">{{ $t('Cropper.Cancel')}}</div>
 					<div class="generage_btn started_btn" @click="submit">{{ $t('Cropper.Finish')}}</div>
@@ -383,6 +387,7 @@ export default defineComponent({
 			...toRefs(liqufeactionData),
 			arrows,
 			init,
+			historyState,
 			cancelDsign,
 			routesChange,
 			submit,
@@ -439,6 +444,25 @@ export default defineComponent({
 						width: 100%;
 					}
 				}
+				&.icon{
+					flex-direction: row;
+					i{
+						width: 4rem;
+						height: 4rem;
+						display: flex;
+						border-radius: .5rem;
+						font-size: 2rem;
+						cursor: pointer;
+						border: 2px solid #000;
+						margin-right: 1rem;
+						align-items: center;
+						justify-content: center;
+						font-weight: 600;
+					}
+					i::last-nth{
+						margin: 0;
+					}
+				}
 			}
 			.liquefaction_parameter_item:last-child{
 				margin-top: 20px;
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index c4de382d..8ab8b671 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -71,6 +71,17 @@ export default {
 		Cancel:'取消',
 		size:'区域',
 		density:'强度',
+		ShortcutKeys:'快捷键',
+		PaintingEraser:'绘图/橡皮',
+		Uncheck:'取消选择',
+		Revoke:'撤回',
+		Retreat:'反撤回',
+		ReduceBrushSize:'减小笔触大小',
+		IncreaseBrushSize:'增大笔触大小',
+		DrinkingStraw:'吸色',
+		Copy:'复制',
+		Paste:'粘贴',
+		UploadOpenimage:'Upload/Open image',
 		jsContent1:"您是否已经保存画布内容？如果没有，请再关闭前点击'保存'。",
 		jsContent2:'我们只支持对印花进行超分',
 		jsContent3:'您的积分小于一次超分',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index ef7ec7ef..7b520b52 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -71,6 +71,17 @@ export default {
 		Cancel:'Cancel',
 		size:'Size',
 		density:'Density',
+		ShortcutKeys:'Shortcut keys',
+		PaintingEraser:'Painting/Eraser',
+		Uncheck:'Uncheck',
+		Revoke:'Revoke',
+		Retreat:'Retreat',
+		ReduceBrushSize:'Reduce brush size',
+		IncreaseBrushSize:'Increase brush size',
+		DrinkingStraw:'Drinking straw',
+		Copy:'Copy',
+		Paste:'Paste',
+		UploadOpenimage:'Upload/Open image',
 		jsContent1:"Have you saved your canvas content? If not, please click 'Save' before closing.",
 		jsContent2:'We only provide super-resolution capabilities for printboard images.',
 		jsContent3:'Your points are less than one SR',
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 661057b3..39562e2a 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -92,7 +92,8 @@
 					<!-- <i @click="Assignment" class="fi fi-rr-gift" title="Assignment"></i> -->
 					<i @click="UpgradePlan" title="Purchase" class="fi fi-rr-shop"></i>
                 </div>
-				<div class="gallery_btn" style="margin-left: 3rem;" @click="subscribe">Subscribe now</div>
+				<div v-if="userDetail.systemUser == 0 || userDetail.systemUser == 3" class="gallery_btn" style="margin-left: 3rem;" @click="subscribe">Subscribe now</div>
+				<div v-else style="width: 30rem;"></div>
             </div>
 			<navRouter :routerList="navRouterList"></navRouter>
 			<div class="homeMain_right">
diff --git a/src/views/affiliate/affiliateRegister.vue b/src/views/affiliate/affiliateRegister.vue
index d58b1802..40275c50 100644
--- a/src/views/affiliate/affiliateRegister.vue
+++ b/src/views/affiliate/affiliateRegister.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="affiliateRegister">
 		<div class="title">AiDA 3.0 Questionnaire</div>
-		<div class="info">Have questions or suggestions? We'd love to hear from you. Send us a message and we'll respond as soon as possible.</div>
+		<div class="info">Why do you want to become an affiliate user?</div>
 		<div class="textarea_box">
 			<div class="text"></div>
 			<textarea :value="textarea"></textarea>