From 14725b430e3483e0cabd4140fe781a45aa7565b0 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 11 Sep 2025 14:56:08 +0800
Subject: [PATCH] fix

---
 src/component/Account/message/newFollow.vue | 2 +-
 src/component/Administrator/allUser.vue     | 2 ++
 src/component/Detail/canvas/index.vue       | 5 +++--
 src/component/HomePage/Generate.vue         | 4 ++--
 src/component/HomePage/createSlogan.vue     | 5 ++++-
 src/component/LoginPage/googleLogin.vue     | 6 +++++-
 src/lang/cn.ts                              | 2 +-
 src/lang/en.ts                              | 2 +-
 src/views/HomeMain.vue                      | 8 ++++----
 src/views/HomeView/library.vue              | 4 ++--
 10 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/component/Account/message/newFollow.vue b/src/component/Account/message/newFollow.vue
index be30cc98..38460e92 100644
--- a/src/component/Account/message/newFollow.vue
+++ b/src/component/Account/message/newFollow.vue
@@ -17,7 +17,7 @@
 					</div>
 				</div>
 				<div class="account_generalMessage_item_left">
-					<div v-if="item?.isFollow == 0" @click.stop="setFollow(item)" >{{$t('newScaleImage.Follow')}}</div>
+					<div v-if="item?.isFollow == 0" @click.stop="setFollow(item)" >{{$t('newScaleImage.FollowEachOther')}}</div>
 					<div v-else @click.stop="setFollow(item)" >{{$t('newScaleImage.Unfollow')}}</div>
 				</div>
 			</div>
diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue
index f745f978..eb4535a1 100644
--- a/src/component/Administrator/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -364,6 +364,8 @@ export default defineComponent({
                             str = "trial";
                         } else if (record.value == 4) {
                             str = "userInEvent";
+                        } else if (record.value == 7) {
+                            str = "Edu Admin";
                         }
                         return str;
                     },
diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index 863b5c68..eab821f9 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -4,7 +4,6 @@
 		<!-- :class="[driver__.driver?'hideEvents':'']" -->
 		 <div class="canvasContent" ref="canvasContent">
 			<div class="content-bottom" ref="canvasContent">
-			
 				<div class="contet">
 					<div class="canvas" v-if="currentView === 'canvasEditor'" @click.stop>
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
@@ -271,7 +270,8 @@ export default defineComponent({
 		})
 		onMounted(()=>{
 			nextTick(async ()=>{
-				detailData.currentView = 'canvasEditor'
+				setTimeout(()=>{
+				})
 				if(detailData.selectDetail.canvasId){
 					detailData.isShowMark = true
 					await new Promise((resolve, reject) => {
@@ -282,6 +282,7 @@ export default defineComponent({
 						Https.axiosPost(Https.httpUrls.exportSearch, value)
 						.then((rv) => {
 							detailData.canvasJSON = rv
+							detailData.currentView = 'canvasEditor'
 							resolve('')
 						})
 						.catch((rv) => {
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index e3a38b41..0455d50c 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -139,10 +139,10 @@
 								v-show="(type_.type2 == 'Moodboard' && item?.value != 'flux') || 
 								(type_.type2 == 'Sketchboard' && item?.value != 'flux' && item?.value != 'wx') || 
 								(type_.type2 == 'Printboard' && item?.value != 'wx')" 
-								:key="item.value" :class="{active:item.value == speedData.value}" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
+								:key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
 						</div>
 						<div class="content"  v-show="speedState && scene?.value == 'extract'">
-							<div v-for="item in extractList" :key="item.value" :class="{active:item.value == speedData.value}" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
+							<div v-for="item in extractList" :key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
 						</div>
 					</div>
 					<div class="generage_btn started_btn" v-show="isGenerate && !remGenerate">
diff --git a/src/component/HomePage/createSlogan.vue b/src/component/HomePage/createSlogan.vue
index 95ff14e8..1bfa1659 100644
--- a/src/component/HomePage/createSlogan.vue
+++ b/src/component/HomePage/createSlogan.vue
@@ -23,7 +23,7 @@
 			</div>
 		</div>
 		
-		<div class="clearSlogan_center">
+		<div class="clearSlogan_center" v-if="showPayOrder">
 			<div class="modal_title_text">
 				<div>{{ $t('createSlogan.title') }}</div>
 				<div class="modal_title_text_intro"></div>
@@ -135,6 +135,9 @@ export default defineComponent({
 			overline: false,
 			linethrough: false,
 			underline: false,
+		})
+		onBeforeUnmount(()=>{
+			
 		})
 		onMounted(()=>{
 			let arr = [
diff --git a/src/component/LoginPage/googleLogin.vue b/src/component/LoginPage/googleLogin.vue
index 88dd45d6..74b17e88 100644
--- a/src/component/LoginPage/googleLogin.vue
+++ b/src/component/LoginPage/googleLogin.vue
@@ -11,6 +11,8 @@
 </template>
 <script>
 	import { defineComponent, ref, reactive, watch, onMounted, onBeforeUnmount, toRefs } from "vue";
+	import { Modal,message } from 'ant-design-vue';
+	import { useI18n } from 'vue-i18n'
 
     export default defineComponent({
         name: "login",
@@ -22,6 +24,7 @@
 			}
 		},
 		setup(props, { emit }) {
+			const {t} = useI18n()
 			const  handleCredentialResponse = async (response) => {
                 // 获取回调响应的凭证数据 然后拿这个凭证给后台，后台jwt进行解析获取登录信息
                 let code = response.credential
@@ -76,6 +79,7 @@
 				}
 			}
 			const toGmailLogin = ()=>{
+				console.log(12312)
 				message.info(t('account.canNotUtilize'))
 			}
 			onBeforeUnmount(()=>{
@@ -131,7 +135,7 @@
 		box-sizing: border-box;
 		position: relative;
 		background: transparent;
-		pointer-events: none;
+		// pointer-events: none;
 		background-color: #f5f5f5;
 		@media (max-width: 768px) {
 			border-radius: 2.5rem;
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 3201a5c3..3eafaeee 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -702,7 +702,7 @@ export default {
   newScaleImage: {
     Collection: "系列",
     SecondaryCreation: "二次创作",
-    Follow: "关注",
+    FollowEachOther: "互关",
     Unfollow: "取关",
     CreationTime: "创建时间",
     UpdateTime: "更新时间",
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 5ac04840..cb83b076 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -704,7 +704,7 @@ export default {
   newScaleImage: {
     Collection: "Collection",
     SecondaryCreation: "Secondary Creation",
-    Follow: "Following",
+    FollowEachOther: "Follow Each Other",
     Unfollow: "Unfollow",
     CreationTime: "CreationTime",
     UpdateTime: "UpdateTime",
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index e0618e59..d5c3aa97 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -290,12 +290,12 @@ import MyWs from "@/tool/webSocket";
 import MyEvent from "@/tool/myEvents";
 import { useRouter,useRoute } from 'vue-router'
 import {openTypeList} from "@/tool/listData.js";
-// import home from "@/component/home/index.vue";
+import home from "@/component/home/index.vue";
 import projectSetting from '@/component/home/newProject/setting.vue'
 import bindEmail from "@/component/HomePage/bindEmail.vue";
-const home = defineAsyncComponent(() =>
-  import('@/component/home/index.vue')
-)
+// const home = defineAsyncComponent(() =>
+//   import('@/component/home/index.vue')
+// )
 export default defineComponent({
     components: {
 		renew,
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index 86a1260d..9983151d 100644
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -1539,8 +1539,8 @@ export default defineComponent({
 			},500)
 		},
 		setSlogan(){
-			let createSlogan:any = this.$refs.createSlogan
-			createSlogan.init()
+			// let createSlogan:any = this.$refs.createSlogan
+			// createSlogan.init()
 		},
 		setSloganData(data:any){
 			this.selectGenerateList = data