Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

页面跳转添加loading，添加全局loading
chore: i18n资源
2025-12-12 10:34:12 +08:00 · 2025-12-12 10:34:10 +08:00 · 2025-12-12 10:05:00 +08:00 · 2025-12-12 10:04:28 +08:00 · 2025-12-10 15:53:40 +08:00 · 2025-12-10 15:33:05 +08:00
22 changed files with 1124 additions and 1291 deletions
--- a/.gitea/workflows/develop_build.yaml
+++ b/.gitea/workflows/develop_build.yaml
@@ -1,56 +0,0 @@
-name: AiDA WEB-Node.js Develop 分支构建部署123
-on:
-  workflow_dispatch:
-
-  push:
-    branches:
-      - dev_vite
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    if: "contains(github.event.head_commit.message, '[run build]')"
-
-    strategy:
-      matrix:
-        node-version: [ 18.18.0 ]
-
-    env:
-      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-aida-web-front
-
-    steps:
-      - name: 1.检出代码
-        uses: actions/checkout@v4
-
-      - name: 2.设置 Node.js 环境
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: npm install
-      - run: npm run build:dev
-      - run: ls -l
-
-      - name: 3.同步文件到远程服务器
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          source: "./dist/*"
-          target: ${{ env.REMOTE_DEPLOY_PATH }}
-          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-          strip_components: 0
-
-      - name: 4. 远程重载 Nginx 配置
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          # 核心：执行 Nginx 重载命令
-          script: |
-            echo "尝试重载 Nginx 服务..."
-            # 💡 注意：执行此命令需要服务器用户具有 sudo 权限，并且配置了 NOPASSWD。
-            # 否则工作流可能会因为权限不足而失败。
-            sudo systemctl reload nginx
-            echo "Nginx 重载命令已发送。"
--- a/.gitea/workflows/develop_build_manual.yaml
+++ b/.gitea/workflows/develop_build_manual.yaml
@@ -1,50 +0,0 @@
-name: 手动触发 AiDA WEB-Node.js Develop 分支构建部署
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [ 18.18.0 ]
-    env:
-      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-aida-web-front
-
-    steps:
-      - name: 1.检出代码
-        uses: actions/checkout@v4
-
-      - name: 2.设置 Node.js 环境
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: npm install
-      - run: npm run build:dev
-      - run: ls -l
-
-      - name: 3.同步文件到远程服务器
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          source: "./dist/*"
-          target: ${{ env.REMOTE_DEPLOY_PATH }}
-          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-          strip_components: 0
-
-      - name: 4. 远程重载 Nginx 配置
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          # 核心：执行 Nginx 重载命令
-          script: |
-            echo "尝试重载 Nginx 服务..."
-            # 💡 注意：执行此命令需要服务器用户具有 sudo 权限，并且配置了 NOPASSWD。
-            # 否则工作流可能会因为权限不足而失败。
-            sudo systemctl reload nginx
-            echo "Nginx 重载命令已发送。"
--- a/.gitea/workflows/prod_build_manual.yaml
+++ b/.gitea/workflows/prod_build_manual.yaml
@@ -1,53 +0,0 @@
-name: AiDA WEB-Node.js StableVersion 分支构建部署
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [ 18.18.0 ]
-
-    steps:
-      - name: 1.检出代码
-        uses: actions/checkout@v4
-        with:
-          ref: StableVersion
-
-      - name: 2.打印当前分支信息
-        run: |
-          echo "Current branch being deployed is: $(git rev-parse --abbrev-ref HEAD)"
-          echo "The code is from the 'main' branch, as specified in 'actions/checkout'."
-
-      - name: 3.设置 Node.js 环境 ${{ matrix.node-version }}
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: npm install
-      - run: npm run build
-      - run: ls -l
-
-      - name: 3.5. 手动安装 AWS CLI v2 # 新增步骤：确保 aws 命令可用
-        run: |
-          echo "安装 AWS CLI V2..."
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-          unzip awscliv2.zip
-          sudo ./aws/install --update
-          aws --version
-          echo "AWS CLI V2 安装完成。"
-
-      - name: 4.配置 AWS 凭证
-        uses: aws-actions/configure-aws-credentials@main
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: 'ap-east-1'
-
-      - name: 5.同步 dist 目录到 S3
-        run: |
-          aws s3 sync dist/* s3://${{ secrets.S3_BUCKET_NAME }}/ --acl public-read
-
-      - name: 6.部署完成
-        run: echo "构建和部署到 S3 任务完成。"
--- a/.gitea/workflows/prod_build_schedule.yaml
+++ b/.gitea/workflows/prod_build_schedule.yaml
@@ -1,56 +0,0 @@
-name: AiDA WEB-Node.js StableVersion 分支构建部署
-on:
-  schedule:
-    #       cron为UTC时区，构建时间=部署时间-8小时 {*分 (-8)时 *日 *月  *周}  ---
-    #      示例： 1月1日22点22分触发构建 cron写作 - '22 14 1 1 *'
-    - cron: '22 14 1 1 *'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [ 18.18.0 ]
-
-    steps:
-      - name: 1.检出代码
-        uses: actions/checkout@v4
-        with:
-          ref: StableVersion
-
-      - name: 2.打印当前分支信息
-        run: |
-          echo "Current branch being deployed is: $(git rev-parse --abbrev-ref HEAD)"
-          echo "The code is from the 'main' branch, as specified in 'actions/checkout'."
-
-      - name: 3.设置 Node.js 环境 ${{ matrix.node-version }}
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: npm install
-      - run: npm run build
-      - run: ls -l
-
-      - name: 3.5. 手动安装 AWS CLI v2 # 新增步骤：确保 aws 命令可用
-        run: |
-          echo "安装 AWS CLI V2..."
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-          unzip awscliv2.zip
-          sudo ./aws/install --update
-          aws --version
-          echo "AWS CLI V2 安装完成。"
-
-      - name: 4.配置 AWS 凭证
-        uses: aws-actions/configure-aws-credentials@main
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: 'ap-east-1'
-
-      - name: 5.同步 dist 目录到 S3
-        run: |
-          aws s3 sync dist/* s3://${{ secrets.S3_BUCKET_NAME }}/ --acl public-read
-
-      - name: 6.部署完成
-        run: echo "构建和部署到 S3 任务完成。"
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,16 @@
 <template>
  <router-view/>
+  <div class="loading" v-show="loading"><a-spin delay="0.5" /></div>
 </template>

+<script setup>
+	import { computed } from 'vue';
+	import { useStore } from 'vuex';
+	const store = useStore();
+	const loading = computed(() => store.state.loading || store.state.view_loading);
+
+</script>
+
 <style lang="less">
 #app {
  font-family: Avenir, Helvetica, Arial, sans-serif;
@@ -9,7 +18,19 @@
  -moz-osx-font-smoothing: grayscale;
  height: 100%;
 }
-
+.loading{
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0,0,0,0.4);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 999999999999;
+	color: #fff;
+}
 .ipad{
 	*{
 		-webkit-touch-callout:none;
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -1250,10 +1250,14 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
  background: #000 !important;
  border-color: #000 !important;
 }
+.ant-spin .ant-spin-dot {
+  width: 1.5em;
+  height: 1.5em;
+}
 .ant-spin-dot-item {
  background-color: #000000 !important;
-  width: 9px !important;
-  height: 9px !important;
+  width: 0.9em !important;
+  height: 0.9em !important;
 }
 .ant-spin {
  color: #000;
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -1378,10 +1378,14 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 	}
 }
 //loding样式
+.ant-spin .ant-spin-dot{
+	width: 1.5em;
+	height: 1.5em;
+}
 .ant-spin-dot-item{
    background-color: #000000 !important;
-	width: 9px !important;
-    height: 9px !important;
+	width: .9em !important;
+    height: .9em !important;
 }
 .ant-spin{
 	color: #000;
--- a/src/component/HomePage/layout.vue
+++ b/src/component/HomePage/layout.vue
@@ -34,8 +34,8 @@
 					</div>
 				</div>
 				<div class="layout_centent" :class="{active:flex_direction}" id="layoutCentent">
-					<div v-for="item,index in layoutList" :key="item" :class="moodbClassName[index]" class="modal_imgItem" v-layout="item" @mousedown="setpitch(item,index)"  @touchstart="setpitch(item,index)" ref="content" >
-						<img crossOrigin="anonymous" :src="item.imgUrl" :style="{'transform':`translate(-50%, -50%) scale(${item.zoom?item.zoom:1}) rotateZ(${item.angle?item.angle:0}deg)`}"  draggable="false" :class="moodbClassName[index]" v-modelImg> 
+					<div v-for="item,index in layoutList" :key="item" :class="moodbClassName[index]" class="modal_imgItem" v-layout="item" @mousedown="setpitch(item,index)"  @touchstart="setpitch(item,index)" ref="content"  :style="{'background-image':`url(${item.imgUrl})`,'transform':`scale(${item.zoom?item.zoom:1}) rotateZ(${item.angle?item.angle:0}deg)`}">
+						<!-- <img crossOrigin="anonymous" :src="item.imgUrl" :style="{'transform':`translate(-50%, -50%) scale(${item.zoom?item.zoom:1}) rotateZ(${item.angle?item.angle:0}deg)`}"  draggable="false" :class="moodbClassName[index]" v-modelImg>  -->
 						<ul v-show="item.setPitch" class="layout_btn" >
 							<li class="layout_btn_top" v-compile.stop="'top'"></li>
 							<li class="layout_btn_bottom" v-compile.stop="'bottom'"></li>
@@ -736,6 +736,7 @@ export default defineComponent({
 		setmoodb(item:any){
 			this.moodbClassName = item
 			this.$emit('setmoodbClass',this.moodbClassName)
+			this.styleObj.class = this.moodbClassName
 			if(this.content){
 				for (item of (this.content as any)) {
 					item.classList.remove('active')
@@ -772,7 +773,7 @@ export default defineComponent({
 		initDomStyle(){
 			nextTick(()=>{
 				this.content.forEach((item:any,index:any) => {
-					if(this.styleObj.domStyle[index]){
+					if(this.styleObj.domStyle[index]?.left){
 						item.classList.add('active')
 						this.initStyle(item,this.styleObj.domStyle[index])
 					}
@@ -794,7 +795,7 @@ export default defineComponent({
 			})
 		},
 		initStyle(dom:any,style:any){
-			if(!style)return
+			if(!style || !dom)return
 			for (const [property, value] of Object.entries(style)) {
 				
 				dom.style.setProperty(property, value);
@@ -806,7 +807,7 @@ export default defineComponent({
 				this.styleObj.domStyle.push(this.setStyle(item.style))
 				this.domObj.dom.forEach((domName:any,index:any) => {
 					let style = this.domObj.domStyle[index]
-					let dom = item.querySelector(domName)
+					let dom = item.querySelector(domName) || item
 					this.styleObj[style].push(this.setStyle(dom.style))
 				})
 			});
@@ -840,7 +841,6 @@ export default defineComponent({
 					let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*'  }}
 					Https.axiosPost(Https.httpUrls.elementUpload,param,config)
 					.then((rv: any) => {
-							// console.log(rv);
 							rv.imgUrl = rv.url
 							this.layout = false
 							this.loadingShow = false
@@ -1062,27 +1062,12 @@ export default defineComponent({
 				// 	height: 100%;
 				// }
 				overflow: hidden;
+				background-repeat: no-repeat;
+				background-position: center;
+				background-size: cover;
 				&.active{
 					position: absolute;
 				}
-				img{
-					// object-fit: cover;
-					// width: 100%;
-					// height: 100%;
-					pointer-events: none;
-					float: left;
-					user-select:none;
-					-webkit-user-drag: none;
-					position: absolute;
-					top: 50%;
-					left: 50%;
-					transform: translate(-50%,-50%) scale(1);
-				}
-				::selection {
-						// background: rgba(0,0,0,0);
-						// background: yellow;
-					}
-			
 			}
 		}
 		.wh1{
--- a/src/component/HomePage/renew.vue
+++ b/src/component/HomePage/renew.vue
--- a/src/component/LoginPage/login/personal.vue
+++ b/src/component/LoginPage/login/personal.vue
@@ -553,13 +553,14 @@ export default defineComponent({
 				loginType: "EMAIL",
 				userId: this.userId,
 			};
-			this.$emit('update:isMask',true)
+			this.store.commit('set_loading', true)
 			Https.axiosPost(Https.httpUrls.accountLogin, data)
 				.then((rv: any) => {
-				this.setSuccessLogin(rv);
+					this.setSuccessLogin(rv);
+					this.store.commit('set_loading', false)
 				})
 				.catch((res) => {
-					this.$emit('update:isMask',false)
+					this.store.commit('set_loading', false)
 				});
 		},1000)
    },
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -458,6 +458,7 @@ export default defineComponent({
 					message.info(t('newScaleImage.jsContent2'))
 					return
 				}
+				store.state.Workspace.cachedRoutes = [];
 				let id = await getWorks(imgData.scaleImageData.id)
 				await router.push(`/home/history/${id}`)
 				store.commit('setChooseIsDesign',false)
--- a/src/component/home/design/collection/MoodboardUpload.vue
+++ b/src/component/home/design/collection/MoodboardUpload.vue
@@ -132,8 +132,8 @@
 				</div>
 				<div class="modal_img_max">
 					<div v-if="!modalImg[0]?.id" class="modal_img" id="modal_img" :class="{active:flex_direction}">
-						<div v-for="item,index in layoutList" :class="[moodb_className[index]]"  class="modal_imgItem">
-							<img :src="item.imgUrl" v-modelImg>
+					<!-- <div class="modal_img" id="modal_img" :class="{active:flex_direction}"> -->
+						<div v-for="item,index in layoutList" :class="[moodb_className[index]]" :style="{'background-image':`url(${item.imgUrl})`}" class="modal_imgItem">
 						</div>
 					</div>
 					<div v-else class="modal_img">
@@ -244,30 +244,6 @@ export default defineComponent({
        this.token = getCookie("token") || "";
        this.uploadUrl = getUploadUrl();
    },
-	directives:{
-		modelImg:{
-			mounted(el) {
-				let parentNode = el.parentNode
-				if(parentNode.offsetHeight >= parentNode.offsetWidth){
-					el.style.height = 100+'%'
-					el.style.width = 'auto'
-				}else{
-					el.style.width = 100+'%'
-					el.style.height = 'auto'
-				}
-			},
-			updated (el) {
-				let parentNode = el.parentNode
-				if(parentNode.offsetHeight >= parentNode.offsetWidth){
-					el.style.height = 100+'%'
-					el.style.width = 'auto'
-				}else{
-					el.style.width = 100+'%'
-					el.style.height = 'auto'
-				}
-			}
-		}
-	},
    methods: {
        open(num: Number) {
            this.openClick = num;
@@ -445,7 +421,7 @@ export default defineComponent({
 					}
 				}
 				this.edieShow = true
-				if(this.moodb_[arr.length-1].length == 2){
+				if(this.moodb_[arr.length-1].length == 1){
 					this.moodb_className = this.moodb_[arr.length-1][0]
 				}else{
 					this.moodb_className = this.moodb_[arr.length-1][random]
@@ -628,6 +604,7 @@ export default defineComponent({
 				height: calc(5rem*1.2);
 				overflow-x: hidden;
 				display: flex;
+				
 				&.modal_img::-webkit-scrollbar {
 					display: none;
 				}
@@ -706,15 +683,9 @@ export default defineComponent({
 					position: relative;
 					overflow: hidden;
 					text-align: center;
-					img{
-						position: absolute;
-						top: 50%;
-						left: 50%;
-						transform: translate(-50%,-50%);
-						// float: left;
-						// user-select:none;
-						// -webkit-user-drag: none;
-					}
+					background-repeat: no-repeat;
+					background-position: center;
+					background-size: cover;
 				}
 				.wh1{
 					width: 23%;
--- a/src/component/home/design/editDesignType/index.vue
+++ b/src/component/home/design/editDesignType/index.vue
@@ -242,7 +242,16 @@
              </div>
            </div>
            <div class="prompt-input-container" v-show="!showMotion">
-              <div class="title">{{ $t('ProductImg.Prompt') }}</div>
+              <div class="title">
+				<span>{{ $t('ProductImg.Prompt') }}</span>
+				<SvgIcon
+					class="cursor-icon"
+					@click="handleNavigateHelp"
+					name="CHelpFlip"
+					size="18"
+					color="#000"
+				/>
+			  </div>
              <promptInput :content="prompt" ref="promptInputRef" />
            </div>
            <div class="transferPose" v-show="showMotion">
@@ -380,7 +389,7 @@
      <a-spin size="large" />
    </div>
    <template>
-      <Prompt v-if="scaleImageList[scaleImageIndex]?.resultType === 'ToProductImage'" v-model:showModal="showPromptAssist" isDesignPage />
+      <Prompt v-if="scaleImageList[scaleImageIndex]?.resultType === 'ToProductImage'" v-model:showModal="showPromptAssist" />
      <PromptEditProduct v-if="scaleImageList[scaleImageIndex]?.resultType === 'Relight'" v-model:showModal="showPromptAssist" />
    </template>
    <Product
@@ -450,7 +459,7 @@ export default defineComponent({
    let userDetail: any = computed(() => {
      return store.state.UserHabit.userDetail
    })
-    let { t } = useI18n()
+    let { t, locale } = useI18n()
    const textareaRef = useTemplateRef<HTMLTextAreaElement>('textareaRef')
    const videoType = ref(2)
    const showMotion = computed(() => videoType.value === 1)
@@ -599,13 +608,13 @@ export default defineComponent({
    })
    const showPromptAssist = ref(false)
    const handleClickAssistBtn = () => {
-      const { httpType } = store.state.Workspace.probjects
-      const isSingleDesign = httpType === 'SINGLE_DESIGN'
-      if (!isSingleDesign) {
-        const promptText = t('ProductImg.Series')
-        productimg.productimgSearchName = promptText
-        return
-      }
+    //   const { httpType } = store.state.Workspace.probjects
+    //   const isSingleDesign = httpType === 'SINGLE_DESIGN'
+    //   if (!isSingleDesign) {
+    //     const promptText = t('ProductImg.Series')
+    //     productimg.productimgSearchName = promptText
+    //     return
+    //   }
      showPromptAssist.value = true
    }

@@ -1310,7 +1319,13 @@ export default defineComponent({
        return videoType.value === 3 ? false : true
      }
    })
-
+	const handleNavigateHelp = () => {
+      const url =
+        locale === 'CHINESE_SIMPLIFIED'
+          ? 'https://aida-user-manual-chinese.super.site/2b08f755cedd80a985cffdf2af80c538'
+          : 'https://aida-user-manual.super.site/advanced-tool/animated-product-image/to-product-video-prompt-assist '
+      window.open(url,'_blank')
+    }
    onBeforeUnmount(() => {
      clearInterval(prductimgTime)
      clearInterval(remPrductimgTime)
@@ -1374,7 +1389,8 @@ export default defineComponent({
      handlePlayNewVideo,
      isNewVideoPlaying,
      showDropdown,
-      inputPlaceholder
+      inputPlaceholder,
+	  handleNavigateHelp
    }
  },
  data() {
@@ -1786,12 +1802,16 @@ export default defineComponent({
          :deep(.promptInput) {
            box-sizing: border-box;
          }
-          .title {
-            font-weight: 500;
-            color: #000;
-            font-size: 1.7rem;
-            margin-bottom: 1.4rem;
-          }
+		  .title {
+			display: flex;
+			align-items: center;
+			column-gap: 1rem;
+			.cursor-icon {
+				display: flex;
+				width: auto;
+				cursor: pointer;
+			}
+		  }
        }
        .prompt-container {
          margin-top: 4rem;
--- a/src/component/home/index.vue
+++ b/src/component/home/index.vue
@@ -55,13 +55,16 @@ export default defineComponent({
 		const data = reactive({
 			openType:'', 
 			componentKey:null,
-			isShowMark:false,
+			isShowMark:true,
 			routeQuery:{} as any,
 			selectObject:computed(()=>store.state.Workspace.probjects) as any,//选择的项目
 			chatData:null as any,
 			dataLoad:true as any,
 			cachedRoutes:computed(()=>store.state.Workspace.cachedRoutes),//
 		})
+		onMounted(()=>{
+			data.isShowMark = false
+		})
 		let settingGetHistory:any = inject('settingGetHistory')
 		const setIsShowMark = (boolean:boolean)=>{
 			data.isShowMark = boolean
--- a/src/component/home/tools/toProduct/Prompt.vue
+++ b/src/component/home/tools/toProduct/Prompt.vue
@@ -121,7 +121,7 @@ const promptList = computed(() => {
    return [t('ProductImg.UploadWithoutModel'), t('ProductImg.UploadWithModel')]
  } else {
    // 如果是从design来的
-    if (isSingleDesign) {
+    if (props.isDesignPage) {
      // SINGLE_DESIGN: 两个提示词
      // 根据年龄和性别选择对应的提示词
      let firstPrompt: string // 不带模特的提示词
@@ -255,8 +255,8 @@ const exampleList = computed(() => {
    }
  } else {
    const { ageGroup, httpType, sex } = store.state.Workspace.probjects
-    const isSingleDesign = httpType === 'SINGLE_DESIGN'
-    if (!isSingleDesign) return {}
+    // const isSingleDesign = httpType === 'SINGLE_DESIGN'
+    // if (!isSingleDesign) return {}
    const isAdult = ageGroup === 'Adult'
    const isFemale = sex === 'Female'
    if (isAdult) {
--- a/src/component/home/tools/toProduct/index.vue
+++ b/src/component/home/tools/toProduct/index.vue
@@ -1101,13 +1101,13 @@ export default defineComponent({

    const showPromptAssist = ref(false)
    const handleClickAssistBtn = () => {
-      const { httpType } = store.state.Workspace.probjects
-      const isSingleDesign = httpType === 'SINGLE_DESIGN'
-      if (props.isDesignPage && !isSingleDesign) {
-        const promptText = t('ProductImg.Series')
-        productImgData.searchName[props.productimgMenu.value] = promptText
-        return
-      }
+    //   const { httpType } = store.state.Workspace.probjects
+    //   const isSingleDesign = httpType === 'SINGLE_DESIGN'
+    //   if (props.isDesignPage && !isSingleDesign) {
+    //     const promptText = t('ProductImg.Series')
+    //     productImgData.searchName[props.productimgMenu.value] = promptText
+    //     return
+    //   }
      showPromptAssist.value = true
    }

--- a/src/component/mainPage/signUp/index.vue
+++ b/src/component/mainPage/signUp/index.vue
@@ -51,7 +51,7 @@
            <ul
              class="product_detail"
              :class="[
-                { academic: item.type == 'academic' && !isSelectSuccessively },
+                { academic: item.type == 'academic' },
                { chinese: isSelectSuccessively }
              ]"
            >
@@ -106,12 +106,12 @@ export default defineComponent({
        Yearly: '年度',
        monthly: [
          {
-            title: '免费版',
+            title: '使用版',
            img: CChargeIcon,
            type: 'personal',
            info: '您的AI时尚设计助手',
            price: 'HK$0',
-            detail: '5天·50积分',
+            detail: '自注册之日起 5 天内 · 50 个积分',
            highlight: '',
            discounts: '9折优惠',
            detailList: [
@@ -185,12 +185,12 @@ export default defineComponent({
        ],
        yearl: [
          {
-            title: '免费版',
+            title: '试用版',
            img: CChargeIcon,
            type: 'personal',
            info: '您的AI时尚设计助手',
            price: 'HK$0',
-            detail: '5天·50积分',
+            detail: '自注册之日起 5 天内 · 50 个积分',
            highlight: '',
            discounts: '9折优惠',
            detailList: [
@@ -250,12 +250,12 @@ export default defineComponent({
        Yearly: 'Yearly',
        monthly: [
          {
-            title: 'Free',
+            title: 'Trial',
            img: CChargeIcon,
            type: 'personal',
            info: 'Your AI Fashion Design Assistant',
            price: 'HK$0',
-            detail: '5 days · 50 credits',
+            detail: '5 days from sign-up · 50 credits',
            highlight: '',
            discounts: '10% off',
            detailList: [
@@ -329,12 +329,12 @@ export default defineComponent({
        ],
        yearl: [
          {
-            title: 'Free',
+            title: 'Trial',
            img: CChargeIcon,
-            type: 'free',
+            type: 'personal',
            info: 'Your AI Fashion Design Assistant',
            price: 'HK$0',
-            detail: '5 days · 50 credits',
+            detail: '5 days from sign-up · 50 credits',
            highlight: '',
            discounts: '10% off',
            detailList: [
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -959,7 +959,7 @@ export default {
    MOSTPOPULAR: 'MOST POPULAR',
    Monthly: 'Monthly',
    Yearly: 'Yearly',
-    promotionCode: 'Coupon',
+    promotionCode: 'Coupon Code',
    use: 'Apply',
    PromoCodeError:
      'Please check if the promo code is correct or if the date has expired',
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -498,6 +498,7 @@ function isTimeRangePassed(timeRange) {
 }

 router.beforeEach((to: any, from, next) => {
+	store.commit("set_view_loading", true);
  //系统维护时间
 	const time = '2025-11-21T23:00:00 - 2025-11-22T00:00:00';
 	if (isTimeRangePassed(time) == 'in_progress') {
@@ -540,5 +541,7 @@ router.beforeEach((to: any, from, next) => {
  
  // if(systemUser == 0){//游客用户只能进入这两个页面
 });
-
+router.afterEach((to, from) => {
+	store.commit("set_view_loading", false);
+});
 export default router;
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -13,10 +13,18 @@ export interface RootState{

 export default createStore<RootState>({
  state: {
+	loading: false,
+	view_loading: false,
  },
  getters: {
  },
  mutations: {
+	set_loading(state, v){
+		state.loading = v;
+	},
+	set_view_loading(state, v){
+		state.view_loading = v;
+	},
  },
  actions: {
  },
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -427,7 +427,7 @@
          <div class="userSystem" v-show="pastDuePage">
            {{ $t('Header.pastDue') }}
          </div>
-          <div class="router" v-if="!getLangIsShowMark">
+          <div class="router" v-if="!loading">
            <home
              ref="home"
              @setNewProject="() => (leftShow = true)"
@@ -442,10 +442,10 @@
    <UpgradePlan ref="UpgradePlan"></UpgradePlan>
    <TaskPage ref="TaskPage"></TaskPage>

-    <div class="mark_loading" v-show="getLangIsShowMark">
+    <!-- <div class="mark_loading" v-show="loading">
      <a-spin size="large" />
-    </div>
-    <!-- <RobotAssist v-if="!getLangIsShowMark"></RobotAssist> -->
+    </div> -->
+    <!-- <RobotAssist v-if="!loading"></RobotAssist> -->
    <scaleVideo ref="scaleVideo"></scaleVideo>
    <!-- 进行续订 -->
    <renew ref="renew"></renew>
@@ -656,7 +656,7 @@ export default defineComponent({
    })

    let activeCredits = ref(false)
-    let getLangIsShowMark = ref(true)
+    let loading = computed(() => (store.state.loading))
    let messageNum = computed(() => {
      return store.state.UserHabit.messageSystem.messageNum
    })
@@ -1070,7 +1070,7 @@ export default defineComponent({
      isMurmur,
      credits,
      activeCredits,
-      getLangIsShowMark,
+      loading,
      messageNum,
      messageType,
      ...toRefs(stateList),
@@ -1128,11 +1128,11 @@ export default defineComponent({
      this.store
        .dispatch('getLangType')
        .then(() => {
-          this.getLangIsShowMark = false
+          this.store.commit('set_loading', false)
          resolve()
        })
        .catch(() => {
-          this.getLangIsShowMark = false
+          this.store.commit('set_loading', false)
          reject()
        })
    })
@@ -1334,7 +1334,7 @@ export default defineComponent({
      })
    },
    setLang(v) {
-      this.getLangIsShowMark = true
+      store.commit('set_loading', true)
      Https.axiosGet(Https.httpUrls.changeUserLanguage, { params: { language: v } })
        .then(rv => {
          if (rv) {
@@ -1351,11 +1351,11 @@ export default defineComponent({
              window.location.reload()
              // window.location.href = '/home';
            }
-            this.getLangIsShowMark = false
+            store.commit('set_loading', false)
          }
        })
        .catch(() => {
-          this.getLangIsShowMark = false
+          store.commit('set_loading', false)
        })
    },

--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -43,15 +43,12 @@
            <span>{{ t('Login.LogonToAiDA') }}</span>
          </div>
 		  <div class="info" v-show="!loginType">{{ t('Login.Infomation') }}</div>
-          <personal ref="personal" v-if="loginType == 'personal'" v-model:isMask="isMask"></personal>
+          <personal ref="personal" v-if="loginType == 'personal'"></personal>
          <school ref="school" v-if="loginType == 'school'"></school>
          <enterprise ref="enterprise" v-if="loginType == 'enterprise'"></enterprise>

        </div>
      </div>
-	  	<div class="mark_loading" v-show="isMask">
-			<a-spin size="large" />
-		</div>
    </div>
  </div>
 </template>
@@ -103,7 +100,6 @@ export default defineComponent({
    
    const loginData = reactive({
      loginType: "",
-      isMask: false,
    });
    const dataDom = reactive({
 		personal: null as any,
Author	SHA1	Message	Date
李志鹏	84175e94d1	Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite	2025-12-12 10:34:12 +08:00
李志鹏	ed83044f81	页面跳转添加loading，添加全局loading	2025-12-12 10:34:10 +08:00
zhangyahui	9cb6be3098	chore: i18n资源	2025-12-12 10:05:00 +08:00
zhangyahui	4ab4578081	style: 订阅弹窗样式	2025-12-12 10:04:28 +08:00
李志鹏	652d89d3be	fix:转产品提示词	2025-12-10 15:53:40 +08:00
李志鹏	17edeef461	fix	2025-12-10 15:33:05 +08:00
X1627315083	aad6919ec3	转视频页面增加帮助icon，高级工具在任何地方都有弹窗提示词	2025-12-09 11:25:25 +08:00
X1627315083	baf161e695	调整订阅页面部分文案	2025-12-04 09:39:22 +08:00
X1627315083	51751f6b5e	Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite	2025-12-01 15:29:22 +08:00
X1627315083	c1b051a185	调整情绪版layout出现拉伸的问题	2025-12-01 15:29:20 +08:00
admin	1a5e285f09	删除 .gitea/workflows/prod_build_schedule.yaml	2025-12-01 10:15:55 +08:00
admin	911d1d8477	删除 .gitea/workflows/prod_build_manual.yaml	2025-12-01 10:15:51 +08:00
admin	e0261d4a37	删除 .gitea/workflows/develop_build_manual.yaml	2025-12-01 10:15:48 +08:00
admin	50cb33ac43	删除 .gitea/workflows/develop_build_commit.yaml	2025-12-01 10:15:45 +08:00
admin	261064bd23	更新 .gitea/workflows/develop_build_commit.yaml All checks were successful git commit 控制 AiDA WEB-Node.js Develop 分支构建部署123 / build (18.18.0) (push) Has been skipped Details	2025-11-28 16:07:54 +08:00
admin	a1e8f3295e	Merge pull request 'main' (#1 ) from main into dev_vite All checks were successful AiDA WEB-Node.js Develop 分支构建部署123 / build (18.18.0) (push) Has been skipped Details Reviewed-on: #1	2025-11-28 14:08:50 +08:00