From 22bd59a7c2f5e7da3f57204d88f84fd4461a57e8 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 8 Jan 2024 13:59:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E7=9F=AD=E5=BC=B9=E7=AA=97=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA,=E5=A6=82=E6=9E=9C=E6=98=AF=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=BC=B9=E7=AA=97=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/RobotAssist.vue | 22 ++++---
 src/component/HomePage/affiche.vue     | 15 +++--
 src/lang/cn.ts                         |  6 ++
 src/lang/en.ts                         |  6 ++
 src/lang/fr.ts                         |  6 ++
 src/lang/it.ts                         |  6 ++
 src/lang/ja.ts                         |  6 ++
 src/lang/kr.ts                         |  6 ++
 src/lang/ru.ts                         |  6 ++
 src/lang/th.ts                         |  6 ++
 src/lang/vn.ts                         |  6 ++
 src/tool/guide.js                      | 40 +++++------
 src/views/HomeView.vue                 | 91 ++++++++++----------------
 src/views/LoginPage.vue                |  3 +
 14 files changed, 133 insertions(+), 92 deletions(-)

diff --git a/src/component/HomePage/RobotAssist.vue b/src/component/HomePage/RobotAssist.vue
index 14024b78..ff77c3a3 100644
--- a/src/component/HomePage/RobotAssist.vue
+++ b/src/component/HomePage/RobotAssist.vue
@@ -59,7 +59,7 @@
 	</div>
 </template>
 <script lang="ts">
-import { defineComponent, createVNode,computed, ref,Ref} from "vue";
+import { defineComponent, createVNode,computed, ref,Ref, nextTick} from "vue";
 import { UserOutlined, DownOutlined } from "@ant-design/icons-vue";
 import { Https } from "@/tool/https";
 import { getCookie,setCookie } from "@/tool/cookie";
@@ -78,8 +78,8 @@ export default defineComponent({
 		const robotDom = ref<HTMLElement | null>(null);
 		const robotChildDom = ref<HTMLElement | null>(null);
 		let chatCentent = ref<string>('');
-		const robotTop = ref(false)
-		const robotInput = ref(false)
+		let robotTop = ref(false)
+		let robotInput = ref(false)
         let timeTop:any =  0;
         let timeInput:any =  0;
 		let record:any = ref([
@@ -127,14 +127,14 @@ export default defineComponent({
 					driverObj__.refresh();
 					this.record.push({
 						state:1,
-						str:"Welcome to AiDA. I am your friendly fashion design assistant. If you have any questions or need assistance, please don't hesitate to ask. ",
+						str:this.t('RobotAssist.jsContent2'),
 						driver:false,
 					})
 					this.textScroll()
 					setTimeout(() => {
 						this.record.push({
 							state:1,
-							str:"I see you might be new here, and I'd love to guide you through a tutorial to help you get acquainted with our new and improved AiDA system. Would you like to start the tutorial now?",
+							str:this.t('RobotAssist.jsContent3'),
 							driver:true,
 						})
 						this.textScroll()
@@ -150,15 +150,17 @@ export default defineComponent({
 				}else{
 					clearTimeout(this.driver__Time)
 				}
-				if(!newval.driver && this.driver__.index != 0){
+				if(!newval.driver && this.driver__.index+1 == this.driver__.stepsLenth){
+					this.textScroll()
 					this.record.push({
 						state:1,
-						str:"You can start the tutorial at any time by simply telling me that you want to. ",
+						str:this.t('RobotAssist.jsContent4'),
 						driver:false,
 					})
 					clearTimeout(this.driver__Time)
 				}
-			}
+			},
+			
 		}
 	},
     mounted() {
@@ -307,7 +309,7 @@ export default defineComponent({
 						if(rv.isTutorial){
 							this.record.push({
 								state:1,
-								str:"We need to refresh the page before starting the tutorial. Would you like to start the tutorial now?",
+								str:this.t('RobotAssist.jsContent5'),
 								driver:true,
 							})
 						}else{
@@ -339,6 +341,8 @@ export default defineComponent({
 			this.chatCentent = ""
 		},
 		setDriver(index:number){
+			let isBeginner = JSON.parse((getCookie('isBeginner') as any))
+			
 			if(this.driver__.driver){
 				driverObj__.moveNext();
 				this.robotTop = false
diff --git a/src/component/HomePage/affiche.vue b/src/component/HomePage/affiche.vue
index 1617d2e2..df2f97ea 100644
--- a/src/component/HomePage/affiche.vue
+++ b/src/component/HomePage/affiche.vue
@@ -10,6 +10,7 @@
             :mask="afficheMask"
 			:keyboard="false"
 			:destroyOnClose="true"
+			:zIndex="10004"
         >
 		<div class="affiche_bg"></div>
 		<div class="affiche_btn">
@@ -28,7 +29,9 @@
 <script lang="ts">
 import { defineComponent, h, ref ,computed,reactive, nextTick} from "vue";
 // import { Https } from "@/tool/https";
+import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
 // import { getCookie } from "@/tool/cookie";
+import { openGuide,driverObj__ } from "@/tool/guide";
 // import domTurnImg from '@/tool/domTurnImg'
 
 export default defineComponent({
@@ -55,13 +58,10 @@ export default defineComponent({
     methods: {
 		init(text:any){
 			this.affiche = true
-
-			this.afficheTitle = text.title
-			console.log(text.str);
+			let title = 'System Reminder'
+			this.afficheTitle = text.title||title
 			nextTick().then(()=>{
 				let afficheStr:any = document.getElementById('afficheStr')
-				console.log(afficheStr);
-			
 				afficheStr.innerHTML = text.str
 			})
 			
@@ -69,6 +69,8 @@ export default defineComponent({
 		},
 		cancelDsign(){
 			this.affiche = false
+			sessionStorage.setItem('isTimeOne', JSON.stringify(true));
+			openGuide()
 		},
     },
 });
@@ -90,7 +92,8 @@ export default defineComponent({
 		background: none;
 	}
 	.affiche_bg{
-		backdrop-filter: blur(3rem);
+		// backdrop-filter: blur(3rem);
+		background: #fff;
 		position: absolute;
 		top: 0;
 		left: 0;
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 94de5b91..7ffea705 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -35,6 +35,10 @@ export default {
 	RobotAssist:{
 		inputContent1:"问我什么都行~",
 		jsContent1:"请输入生成内容~",
+		jsContent2:"欢迎来到AiDA。我是您友好的时尚设计助手。如果您有任何问题或需要帮助，请随时问我。",
+		jsContent3:"看来您可能是新用户，我很乐意为您介绍我们全新升级的AiDA系统。您现在要开始教程吗？",
+		jsContent4:"您可以随时告诉我要开始教程。",
+		jsContent5:"在开始教程之前，我们需要刷新页面。您现在要开始教程吗？",
 	},
 	HomeView:{
 		GetStarted:'开始设计',
@@ -54,6 +58,8 @@ export default {
 		jsContent1:'您必须选择一种或多种颜色进行下一步。',
 		jsContent2:'您必须选择一种或多种颜色进行下一步。',
 		jsContent3:'导出文件失败。',
+		jsContent4:'您的订阅还剩余{days}天，{hours}小时，{minutes}分钟。如需续订，请点击 ->  ',
+		jsContent5:'由于您是试用用户，某些功能可能会受到限制。如果您需要订阅，请点击 ->  ',
 	},
 	LibraryPage:{
 		Organize:'我的',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index e1130528..84aeae17 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -35,6 +35,10 @@ export default {
 	RobotAssist:{
 		inputContent1:"write a message~",
 		jsContent1:"Please enter content",
+		jsContent2:"Welcome to AiDA. I am your friendly fashion design assistant. If you have any questions or need assistance, please don't hesitate to ask",
+		jsContent3:"I see you might be new here, and I'd love to guide you through a tutorial to help you get acquainted with our new and improved AiDA system. Would you like to start the tutorial now?",
+		jsContent4:"You can start the tutorial at any time by simply telling me that you want to.",
+		jsContent5:"We need to refresh the page before starting the tutorial. Would you like to start the tutorial now?",
 	},
 	HomeView:{
 		GetStarted:'Get Started',
@@ -54,6 +58,8 @@ export default {
 		jsContent1:'You must choose one or more colors for further process.',
 		jsContent2:'You must choose one or more colors for further process.',
 		jsContent3:'Failed to export the file',
+		jsContent4:'Your subscription has {days} days, {hours} hours, {minutes} minutes, remaining. To renew your subscription, please click ->  ',
+		jsContent5:'Because you are a trial user, some features may be limited,if you need to subscribe, please click ->  ',
 	},
 	LibraryPage:{
 		Organize:'Organize',
diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index c16fcd85..d7b5cb17 100644
--- a/src/lang/fr.ts
+++ b/src/lang/fr.ts
@@ -35,6 +35,10 @@ export default {
 	RobotAssist:{
 		inputContent1:"écrire un message~",
 		jsContent1:"Veuillez saisir le contenu",
+		jsContent2:"Bienvenue sur AiDA. Je suis votre assistant de design de mode amical. Si vous avez des questions ou besoin d'aide, n'hésitez pas à demander.",
+		jsContent3:"Je vois que vous êtes peut-être nouveau ici et j'aimerais vous guider à travers un didacticiel pour vous aider à vous familiariser avec notre nouveau et amélioré système AiDA. Voulez-vous commencer le tutoriel maintenant ?",
+		jsContent4:"Vous pouvez commencer le tutoriel à tout moment en me disant que vous voulez le faire.",
+		jsContent5:"Nous devons rafraîchir la page avant de commencer le tutoriel. Voulez-vous commencer le tutoriel maintenant ?",
 	},
 
 	HomeView:{
@@ -55,6 +59,8 @@ export default {
 		jsContent1:'Vous devez choisir une ou plusieurs couleurs pour un processus ultérieur.',
 		jsContent2:'Vous devez choisir une ou plusieurs couleurs pour un processus ultérieur.',
 		jsContent3:"Échec de l'exportation du fichier",
+		jsContent4:'Votre abonnement a {days} jours, {hours} heures, {minutes} minutes restantes. Pour renouveler votre abonnement, veuillez cliquer ici ->  ',
+		jsContent5:"Comme vous êtes un utilisateur d'essai, certaines fonctionnalités peuvent être limitées. Si vous avez besoin de vous abonner, veuillez cliquer ici ->  ",
 	},
 	LibraryPage:{
 		Organize:'Organiser',
diff --git a/src/lang/it.ts b/src/lang/it.ts
index 92ee7192..2e774e63 100644
--- a/src/lang/it.ts
+++ b/src/lang/it.ts
@@ -35,6 +35,10 @@ export default {
 	RobotAssist:{
 		inputContent1:"Scrivi un messaggio~",
 		jsContent1:"Inserisci il contenuto",
+		jsContent2:"Benvenuto su AiDA. Sono il tuo assistente di design di moda amichevole. Se hai domande o hai bisogno di assistenza, non esitare a chiedere.",
+		jsContent3:"Vedo che potresti essere nuovo qui e mi piacerebbe guidarti attraverso un tutorial per aiutarti a familiarizzare con il nostro nuovo e migliorato sistema AiDA. Vuoi iniziare il tutorial adesso?",
+		jsContent4:"Puoi avviare il tutorial in qualsiasi momento semplicemente dicendomi che vuoi farlo.",
+		jsContent5:"Dobbiamo aggiornare la pagina prima di iniziare il tutorial. Vuoi iniziare il tutorial adesso?",
 	},
 	HomeView:{
 		GetStarted:'Iniziare',
@@ -54,6 +58,8 @@ export default {
 		jsContent1:"È necessario scegliere uno o più colori per l'ulteriore elaborazione.",
 		jsContent2:"È necessario scegliere uno o più colori per l'ulteriore elaborazione.",
 		jsContent3:'Impossibile esportare il file',
+		jsContent4:'Il tuo abbonamento ha {days} giorni, {hours} ore, {minutes} minuti rimanenti. Per rinnovare il tuo abbonamento, fai clic qui ->  ',
+		jsContent5:'Poiché sei un utente di prova, alcune funzionalità potrebbero essere limitate. Se desideri sottoscrivere un abbonamento, fai clic qui ->  ',
 	},
 	LibraryPage:{
 		Organize:'Organizzare',
diff --git a/src/lang/ja.ts b/src/lang/ja.ts
index b3198687..0442bc6f 100644
--- a/src/lang/ja.ts
+++ b/src/lang/ja.ts
@@ -35,6 +35,10 @@ export default {
 	RobotAssist:{
 		inputContent1:"メッセージを書いてください~",
 		jsContent1:"内容を入力してください",
+		jsContent2:"AiDAへようこそ。私はあなたのフレンドリーなファッションデザインアシスタントです。質問やサポートが必要な場合は、お気軽にお問い合わせください。",
+		jsContent3:"ここが初めての方の場合、新しく改良されたAiDAシステムに慣れるためのチュートリアルを案内させていただきます。今すぐチュートリアルを開始しますか？",
+		jsContent4:"いつでもチュートリアルを開始することができます。",
+		jsContent5:"チュートリアルを開始する前に、ページをリフレッシュする必要があります。今すぐチュートリアルを開始しますか？",
 	},
 	HomeView:{
 		GetStarted:'始めましょう',
@@ -54,6 +58,8 @@ export default {
 		jsContent1:'以降の処理には 1 つ以上の色を選択する必要があります。',
 		jsContent2:'以降の処理には 1 つ以上の色を選択する必要があります。',
 		jsContent3:'ファイルのエクスポートに失敗しました',
+		jsContent4:'購読期間は残り{days}日、{hours}時間、{minutes}分です。購読を更新するには、ここをクリックしてください  ',
+		jsContent5:'試用ユーザーのため、一部の機能が制限されている場合があります。購読する必要がある場合は、ここをクリックしてください ->  ',
 	},
 	LibraryPage:{
 		Organize:'編成',
diff --git a/src/lang/kr.ts b/src/lang/kr.ts
index 68d01e69..14f0dd96 100644
--- a/src/lang/kr.ts
+++ b/src/lang/kr.ts
@@ -35,6 +35,10 @@ export default {
 	RobotAssist:{
 		inputContent1:"메시지를 쓰다~",
 		jsContent1:"내용을 입력해주세요",
+		jsContent2:"AiDA에 오신 것을 환영합니다. 저는 친근한 패션 디자인 어시스턴트입니다. 궁금한 점이나 도움이 필요하시면 언제든지 말씀해주세요.",
+		jsContent3:"새로 오신 분이신 것 같아서, 우리의 새로운 개선된 AiDA 시스템에 익숙해질 수 있도록 튜토리얼을 안내해 드릴게요. 지금 튜토리얼을 시작하시겠어요?",
+		jsContent4:"언제든지 튜토리얼을 시작할 수 있습니다. ",
+		jsContent5:"튜토리얼을 시작하기 전에 페이지를 새로고침해야 합니다. 지금 튜토리얼을 시작하시겠어요?",
 	},
 	HomeView:{
 		GetStarted:'시작하다',
@@ -54,6 +58,8 @@ export default {
 		jsContent1:'추가 처리를 위해 하나 이상의 색상을 선택해야 합니다.',
 		jsContent2:'추가 처리를 위해 하나 이상의 색상을 선택해야 합니다.',
 		jsContent3:'파일을 내보내지 못했습니다.',
+		jsContent4:'귀하의 구독은 {days}일, {hours}시간, {minutes}분 남았습니다. 구독을 갱신하려면 여기를 클릭하세요 ->  ',
+		jsContent5:'시험 사용자이므로 일부 기능이 제한될 수 있습니다. 구독하려면 여기를 클릭하십시오 ->  ',
 	},
 	LibraryPage:{
 		Organize:'구성',
diff --git a/src/lang/ru.ts b/src/lang/ru.ts
index 9aece6ac..a21f4bf8 100644
--- a/src/lang/ru.ts
+++ b/src/lang/ru.ts
@@ -35,6 +35,10 @@ export default {
 	RobotAssist:{
 		inputContent1:"Напиши сообщение~",
 		jsContent1:"Пожалуйста, введите содержание",
+		jsContent2:"Добро пожаловать на AiDA. Я ваш дружелюбный помощник по дизайну моды. Если у вас есть какие-либо вопросы или нужна помощь, пожалуйста, не стесняйтесь спрашивать.",
+		jsContent3:"Я вижу, что вы, возможно, новый здесь, и я бы хотел провести вас через обучающий курс, чтобы помочь вам ознакомиться с нашей новой и улучшенной системой AiDA. Хотите начать учебник сейчас?",
+		jsContent4:"Вы можете начать учебник в любое время, просто сказав мне об этом. ",
+		jsContent5:"Мы должны обновить страницу, прежде чем начать учебник. Хотите начать учебник сейчас?",
 	},
 	HomeView:{
 		GetStarted:'Начать',
@@ -54,6 +58,8 @@ export default {
 		jsContent1:'Вы должны выбрать один или несколько цветов для дальнейшей обработки..',
 		jsContent2:'Вы должны выбрать один или несколько цветов для дальнейшей обработки..',
 		jsContent3:'Не удалось экспортировать файл',
+		jsContent4:'Ваша подписка истекает через {days} дней, {hours} часов, {minutes} минут. Чтобы продлить подписку, пожалуйста, нажмите здесь ->  ',
+		jsContent5:'Поскольку вы являетесь пробным пользователем, некоторые функции могут быть ограничены. Если вам нужна подписка, пожалуйста, нажмите здесь ->  ',
 	},
 	LibraryPage:{
 		Organize:'Организовать',
diff --git a/src/lang/th.ts b/src/lang/th.ts
index 19a6c9f4..aeba8156 100644
--- a/src/lang/th.ts
+++ b/src/lang/th.ts
@@ -35,6 +35,10 @@ export default {
 	RobotAssist:{
 		inputContent1:"เขียนข้อความ~",
 		jsContent1:"กรุณากรอกเนื้อหา",
+		jsContent2:"ยินดีต้อนรับสู่ AiDA ฉันเป็นผู้ช่วยออกแบบแฟชั่นที่เป็นมิตรของคุณ หากคุณมีคำถามหรือต้องการความช่วยเหลือโปรดอย่าลังเลที่จะถามฉัน",
+		jsContent3:"ฉันเห็นว่าคุณอาจเป็นผู้ใช้ใหม่ที่นี่และฉันขอแนะนำคุณผ่านบทเรียนเพื่อช่วยคุณเข้าใจระบบ AiDA ของเราที่ปรับปรุงแล้ว เริ่มบทเรียนตอนนี้หรือไม่?",
+		jsContent4:"คุณสามารถเริ่มบทเรียนได้ทุกเมื่อเพียงแค่บอกฉันว่าคุณต้องการ.",
+		jsContent5:"ก่อนเริ่มบทเรียนเราจำเป็นต้องรีเฟรชหน้าเพจ คุณต้องการเริ่มบทเรียนตอนนี้หรือไม่?",
 	},
 	HomeView:{
 		GetStarted:'เริ่มต้น',
@@ -54,6 +58,8 @@ export default {
 		jsContent1:'คุณต้องเลือกหนึ่งสีขึ้นไปเพื่อดำเนินการต่อไป.',
 		jsContent2:'คุณต้องเลือกหนึ่งสีขึ้นไปเพื่อดำเนินการต่อไป.',
 		jsContent3:'ล้มเหลวในการส่งออกไฟล์',
+		jsContent4:'การสมัครสมาชิกของคุณเหลือเวลาอีก {days} วัน {hours} ชั่วโมง {minutes} นาที หากต้องการต่ออายุการสมัครสมาชิกโปรดคลิกที่นี่ ->  ',
+		jsContent5:'เนื่องจากคุณเป็นผู้ใช้ทดลองใช้บางคุณสมบัติอาจจะถูก จำกัด หากคุณต้องการสมัครสมาชิกโปรดคลิกที่นี่ ->  ',
 	},
 	LibraryPage:{
 		Organize:'จัดระเบียบ',
diff --git a/src/lang/vn.ts b/src/lang/vn.ts
index 9a035430..3b627cd2 100644
--- a/src/lang/vn.ts
+++ b/src/lang/vn.ts
@@ -35,6 +35,10 @@ export default {
 	RobotAssist:{
 		inputContent1:"viết tin nhắn~",
 		jsContent1:"Vui lòng nhập nội dung",
+		jsContent2:"Chào mừng bạn đến với AiDA. Tôi là trợ lý thiết kế thời trang của bạn. Nếu bạn có bất kỳ câu hỏi hoặc cần hỗ trợ, xin đừng ngần ngại hỏi tôi.",
+		jsContent3:"Tôi thấy bạn có thể là người mới ở đây và tôi muốn hướng dẫn bạn qua một bài hướng dẫn để giúp bạn làm quen với hệ thống AiDA mới và được cải tiến của chúng tôi. Bạn có muốn bắt đầu bài hướng dẫn ngay bây giờ không?",
+		jsContent4:"Bạn có thể bắt đầu bài hướng dẫn bất cứ lúc nào chỉ cần nói với tôi rằng bạn muốn làm điều đó.",
+		jsContent5:"Chúng ta cần làm mới trang trước khi bắt đầu bài hướng dẫn. Bạn có muốn bắt đầu bài hướng dẫn ngay bây giờ không?",
 	},
 	HomeView:{
 		GetStarted:'Bắt đầu',
@@ -54,6 +58,8 @@ export default {
 		jsContent1:'Bạn phải chọn một hoặc nhiều màu để xử lý tiếp.',
 		jsContent2:'Bạn phải chọn một hoặc nhiều màu để xử lý tiếp.',
 		jsContent3:'Không xuất được tệp',
+		jsContent4:'Thời gian đăng ký của bạn còn lại {days} ngày, {hours} giờ, {minutes} phút. Để gia hạn đăng ký, vui lòng nhấp vào đây ->  ',
+		jsContent5:'Vì bạn là người dùng thử nghiệm, một số tính năng có thể bị giới hạn. Nếu bạn cần đăng ký, vui lòng nhấp vào đây ->  ',
 	},
 	LibraryPage:{
 		Organize:'Tổ chức',
diff --git a/src/tool/guide.js b/src/tool/guide.js
index 8e630212..6f8caa42 100644
--- a/src/tool/guide.js
+++ b/src/tool/guide.js
@@ -2,15 +2,18 @@ import { nextTick} from "vue";
 import { driver } from "driver.js";
 import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
 import "driver.js/dist/driver.css";
-import { useStore } from "vuex";
+// import { useStore } from "vuex";
+import store  from "../store/index";
 import { Https } from "@/tool/https";
 //版本一
 let driverIndex__ = 0
-let store
+// let store = store
 let element
+let stepsLenth = 99
 let data = {
 	index:driverIndex__,
 	driver:true,
+	stepsLenth:stepsLenth
 }
 const driverObj__ = driver({
 	steps: [
@@ -94,12 +97,14 @@ const driverObj__ = driver({
 		// console.log(popover,options,element);	
 		// popover.closeButton.style.display = 'block'
 		// popover.closeButton.style.pointerEvents ='auto'
+		stepsLenth = options.config.steps.length
 		addClose()
 		popover.previousButton.style.display = 'none'
 		driverIndex__ = driverObj__.getState().activeIndex
 		data = {
 			index : driverIndex__,
 			driver : true,
+			stepsLenth:stepsLenth,
 		}
 		store?.commit("setGuide", data);
 		if(options.state.activeIndex ==  0 ||
@@ -146,9 +151,9 @@ const driverObj__ = driver({
 	},
 	//销毁前
 	onDestroyStarted:()=>{
-		if (!driverObj__.hasNextStep() || confirm("Are you sure about turning off user guidance?")) {
+		// if (!driverObj__.hasNextStep() || confirm("Are you sure about turning off user guidance?")) {
+		//   }
 			setDestroy()
-		  }
 		  
 	},
 	//销毁前
@@ -214,7 +219,6 @@ const openGuide = () =>{
 	let isBeginner = JSON.parse(getCookie('isBeginner'))
 	// console.log(isBeginner);
 	let isBeginnerNum = JSON.parse(getCookie('isBeginnerNum')?getCookie('isBeginnerNum'):'0')
-	let data
 	// console.log(isBeginner);
 	if(isBeginner && !isTest){
 		if(isBeginnerNum){
@@ -222,27 +226,18 @@ const openGuide = () =>{
 		}else{
 			driverObj__.drive(0);
 		}
-		data = {
-			index:driverIndex__,
-			driver:true,
-		}
 	}else{
 		driverObj__.destroy();
-		data = {
-			index:driverIndex__,
-			driver:false,
-		}
+		return
 	}
-	// driverObj__.destroy();
-	// driverObj__.drive();
-
-	// data = {
-	// 	index:driverIndex__,
-	// 	driver:true,
+	data = {
+		index:driverIndex__,
+		driver:true,
+		stepsLenth:stepsLenth
+	}
+	// if(!store){
+	// 	store = useStore()
 	// }
-	if(!store){
-		store = useStore()
-	}
 	// driverObj__.moveTo(18);
 	store?.commit("setGuide", data);
 	// driverObj__.moveNext();
@@ -252,6 +247,7 @@ function setDestroy(){
 	data = {
 		index : driverIndex__,
 		driver : false,
+		stepsLenth:stepsLenth,
 	}
 	removeClose()
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index d98997b8..4f8e5688 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -371,7 +371,6 @@ export default defineComponent({
 	},
 	async mounted() {
 		// if(JSON.parse( getCookie('isFirst') as any)){
-			openGuide()
 		// }
 		let test:any = getCookie('isTest')
         let isTest =JSON.parse(test)
@@ -379,62 +378,44 @@ export default defineComponent({
         this.userInfo = JSON.parse(userInfo);
 		this.store.dispatch('get_clothingType')
 		//判断账号剩余时间是否太短
-		let isModalOne = JSON.parse(sessionStorage.getItem("oppositeRevocation") as any)
+		let isModalOne = JSON.parse(sessionStorage.getItem("isTimeOne") as any)
 		// let text = {
-		// 	title:'Test',
-		// 	str:'<a href="#">#</a>123123123123123123123',
-		// }
-		// this.affiche(text)
-			
-		// if(!isTest && !isModalOne?.afficheOne){//判断是否是试用用户
-		// 	await new Promise(async (resolve) => {
-		// 		await Https.axiosPost(Https.httpUrls.getExpiredTime,{}).then((rv: any) => {
-		// 				console.log(1);
-		// 			if (rv) {
-		// 				let dateNow = Date.now()
-		// 				let date:any =  new Date(dateNow)
-		// 				let rvDate:any = new Date(rv);
-		// 				let diffInMilliseconds = Math.abs(date - rvDate); // 获取时间差的毫秒数
-		// 				let days = Math.floor(diffInMilliseconds / (24 * 60 * 60 * 1000)); // 计算天数
-		// 				let hours = Math.floor((diffInMilliseconds % (24 * 60 * 60 * 1000)) / (60 * 60 * 1000)); // 计算小时数
-		// 				let minutes = Math.floor((diffInMilliseconds % (60 * 60 * 1000)) / (60 * 1000)); // 计算分钟数
-		// 				// console.log(`${days}天 ${hours}时 ${minutes}分`);
-		// 				// this.affiche('')
-		// 				if(30>Number(days)){
-		// 					let _this = this
-		// 					Modal.confirm({
-		// 						title: this.t('DesignPrintOperation.jsContent1'),
-		// 						icon: createVNode(ExclamationCircleOutlined),
-		// 						okText: 'Yes',
-		// 						cancelText: 'No',
-		// 						mask:false,
-		// 						centered:true,
-		// 						onOk() {
-		// 							openGuide()
-		// 						},
-		// 						onCancel(){
-		// 							openGuide()
-		// 						}
-		// 					});
-		// 					isModalOne = {
-		// 						afficheOne:true,
-		// 						testOne:false,
-		// 					}
-		// 					sessionStorage.setItem('isTimeOne', JSON.stringify(isModalOne));
-		// 				}
-		// 			}else{
-		// 				openGuide()
-		// 			}
-		// 			resolve('')
-		// 		})
-		// 	})
-		// }else if(!isModalOne?.testOne && isTest){
-		// 	isModalOne = {
-		// 		afficheOne:false,
-		// 		testOne:true,
+		// 		str:'Because you are a trial user, some features may be limited,if you need to subscribe, please click -> <a href="https://code-create.com.hk/aida/" target="_blank"><i class="fi fi-br-link-alt"></i></a>',
 		// 	}
-		// 	sessionStorage.setItem('isTimeOne', JSON.stringify(isModalOne));
-		// }
+		let text = {
+
+		}
+		if(!isTest && !isModalOne){//判断是否是试用用户
+			await new Promise(async (resolve) => {
+				await Https.axiosPost(Https.httpUrls.getExpiredTime,{}).then((rv: any) => {
+					if (rv) {
+						let dateNow = Date.now()
+						let date:any =  new Date(dateNow)
+						let rvDate:any = new Date(rv);
+						let diffInMilliseconds = Math.abs(date - rvDate); // 获取时间差的毫秒数
+						let days = Math.floor(diffInMilliseconds / (24 * 60 * 60 * 1000)); // 计算天数
+						let hours = Math.floor((diffInMilliseconds % (24 * 60 * 60 * 1000)) / (60 * 60 * 1000)); // 计算小时数
+						let minutes = Math.floor((diffInMilliseconds % (60 * 60 * 1000)) / (60 * 1000)); // 计算分钟数
+						if(days < 30){
+							let text = {
+								str:`${this.t('HomeView.jsContent4',{days:days,hours:hours,minutes:minutes})}<a href="https://code-create.com.hk/aida/" target="_blank"><i class="fi fi-br-link-alt"></i></a>`,
+							}
+							this.affiche(text)
+						}
+					}else{
+						openGuide()
+					}
+					resolve('')
+				})
+			})
+		}else if(!isModalOne && isTest){
+			text = {
+				str:`${this.t('HomeView.jsContent5')}<a href="https://code-create.com.hk/aida/" target="_blank"><i class="fi fi-br-link-alt"></i></a>`,
+			}
+			this.affiche(text)
+		}else{
+
+		}
 		// console.log(this.store.state.UserHabit);
 		
 		let noRefresh = this.$route.params.noRefresh; //判断是否主动刷新还是路由跳转过来的 true 路由跳转过来的
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index 7e809b8e..d4fc976e 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -473,6 +473,9 @@ export default defineComponent({
                         setCookie("isBeginnerNum", 0);//从第一步开始，机器人开始的话就是从第二部开始
                         setCookie("userInfo", JSON.stringify(rv));
                         this.turnToHomePage();
+						sessionStorage.setItem('isTimeOne', JSON.stringify(false));//是否需要公告 提示 弹窗
+						let randomNum:any = Math.floor(Math.random() * 9000000000000000) + 1000000000000000;
+						sessionStorage.setItem('sessionId', randomNum);  
                     }
                 }
 			).catch(res=>{