Merge remote-tracking branch 'origin/dev_vite' into research

style: 文案修改
Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite
2026-04-08 09:25:56 +08:00 · 2026-03-25 10:12:45 +08:00 · 2026-03-25 09:48:39 +08:00 · 2026-03-25 09:48:36 +08:00 · 2026-03-23 17:22:57 +08:00 · 2026-03-23 14:08:42 +08:00
15 changed files with 61 additions and 56 deletions
--- a/src/component/Administrator/Transaction/TransactionTable.vue
+++ b/src/component/Administrator/Transaction/TransactionTable.vue
@@ -148,6 +148,7 @@
                    total: total,
                    showQuickJumper: true,
                    bordered: false,
+                    showTotal: (total) => `Total Transaction: ${total}`
                }"
            >
 				<template #bodyCell="{ column, text, record, index }">
@@ -465,13 +466,16 @@ export default defineComponent({
                (rv: any) => {
                    if (rv) {
                        // this.dataList = rv
+                        // console.log('rv----',rv);
+                        
                        filter.dataList = rv.content;
                        filterData.total = rv.total;
                        filter.tableLoading = false;
-                        filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
-                            const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
-                            return total + (isNaN(value) ? 0 : value);
-                        }, 0);
+                        filterData.totalPayer = rv.totalAmount;
+                        // filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
+                        //     const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
+                        //     return total + (isNaN(value) ? 0 : value);
+                        // }, 0);

                        // this.workspaceItem.position = this.singleTypeList[0].label
                    }
--- a/src/component/Canvas/index.vue
+++ b/src/component/Canvas/index.vue
@@ -7,7 +7,7 @@
        :enabledRedGreenMode="false"
      />
    </div>
-	<div class="btn">123
+	<div class="btn">
 		<div class="gallery_btn" @click="exportElement">Export</div>
 	</div>
  </div>
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -853,9 +853,7 @@ export default defineComponent({
          level2Type = this.sketchboardList?.[0]?.categoryValue
            ? this.sketchboardList[0].categoryValue
            : ''
-          if (this.workspace.styleName) {
-            sloganText = `${this.workspace.styleName},${sloganText}`
-          }
+            sloganText = `${this.workspace.styleName || 'all'},${sloganText}`
        } else if (this.upload.level1Type == 'Printboard') {
          level2Type = this.scene?.value
          if (level2Type == 'Slogan' && this.searchPictureName == '') {
--- a/src/component/HomePage/UpgradePlan.vue
+++ b/src/component/HomePage/UpgradePlan.vue
@@ -7,6 +7,7 @@
 			:get-container="() => $refs.upgradePlan"
            width="35%"
 			height="auto"
+			zIndex="9999999"
            :maskClosable="false"
            :centered="true"
 			:closable="false"
--- a/src/component/home/design/tools.vue
+++ b/src/component/home/design/tools.vue
@@ -271,7 +271,7 @@ export default defineComponent({
 			allCollectionStr.forEach((itemStr:any)=>{
 				let list = [] as any
 				allCollection[itemStr.value].forEach((imgItem)=>{
-					list.push({url:imgItem.url || imgItem.imgUrl})
+					list.push({url:imgItem?.url || imgItem?.imgUrl})
 				})
 				let obj = {
 					value:itemStr.value,
--- a/src/component/home/index.vue
+++ b/src/component/home/index.vue
@@ -196,9 +196,9 @@ export default defineComponent({
 				type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
 				httpType:rv.process,//项目类型
 				ageGroup:rv.workspaceVO?.ageGroup,
-				style:rv.workspaceVO?.style,
-				styleId:rv.workspaceVO?.styleId,
-				styleName:rv.workspaceVO?.styleName,
+				style:rv.workspaceVO?.style || '',
+				styleId:rv.workspaceVO?.styleId || null,
+				styleName:rv.workspaceVO?.styleName || '',
 				sex:rv.workspaceVO?.sex,
 				userBrandDnaImg:rv.workspaceVO?.userBrandDnaImg,
 				userBrandDnaName:rv.workspaceVO?.userBrandDnaName,
--- a/src/component/home/newProject/setting.vue
+++ b/src/component/home/newProject/setting.vue
@@ -94,9 +94,9 @@ export default defineComponent({
 				type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
 				httpType:rv.process,//项目类型
 				ageGroup:rv.workspaceVO.ageGroup,
-				style:rv.workspaceVO.style,
-				styleId:rv.workspaceVO.styleId,
-				styleName:rv.workspaceVO.styleName,
+				style:rv.workspaceVO.style || '',
+				styleId:rv.workspaceVO.styleId || null,
+				styleName:rv.workspaceVO.styleName || '',
 				sex:rv.workspaceVO.sex,
 				userBrandDnaImg:rv.workspaceVO.userBrandDnaImg,
 				userBrandDnaName:rv.workspaceVO.userBrandDnaName,
--- a/src/component/home/newProject/workspace.vue
+++ b/src/component/home/newProject/workspace.vue
@@ -179,9 +179,9 @@ export default defineComponent({
 			dataDom.brandDNA.init(data.selectObject);
 		}
 		const setWorkspaceStyle = (value:any)=>{
-			data.selectObject.styleName = value.name
-			data.selectObject.style = value.value
-			data.selectObject.styleId = value.id
+			data.selectObject.styleName = value.name || ''
+			data.selectObject.style = value.value || ''
+			data.selectObject.styleId = value.id || null
 			// store.commit('setProbject',data)
 		}
 		const setWorkspaceBrandDNA = (value:any)=>{
@@ -238,9 +238,9 @@ export default defineComponent({
 						// type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
 						// httpType:rv.process,//项目类型
 						ageGroup:rv.workspaceVO?.ageGroup,
-						style:rv.workspaceVO?.style,
-						styleId:rv.workspaceVO?.styleId,
-						styleName:rv.workspaceVO?.styleName,
+						style:rv.workspaceVO?.style || '',
+						styleId:rv.workspaceVO?.styleId || null,
+						styleName:rv.workspaceVO?.styleName || '',
 						sex:rv.workspaceVO?.sex,
 						userBrandDnaImg:rv.workspaceVO?.userBrandDnaImg,
 						userBrandDnaName:rv.workspaceVO?.userBrandDnaName,
--- a/src/component/home/tools/poseTransfer/index.vue
+++ b/src/component/home/tools/poseTransfer/index.vue
@@ -352,7 +352,8 @@ export default defineComponent({
  props: {
    isDesignPage: {
      type: Boolean,
-      default: false
+      default: false,
+      required:false
    },
    source: {
      type: String,
@@ -773,7 +774,7 @@ export default defineComponent({
          data.lastSelectImg = res.data
        }
      }
-      // 同步尾帧文件列表到全局 store
+      // 同步尾帧文件列表到全局 store（使用专门的 lastFrameList）
      store.commit('setPoseTransferLastFrameList', {
        str: 'set',
        list: [file]
@@ -989,6 +990,7 @@ export default defineComponent({
          if (data.lastSelectImg?.id === item.id) {
            data.lastSelectImg = {}
          }
+          // 使用专门的 lastFrameList mutation 清空列表
          store.commit('setPoseTransferLastFrameList')
        } else {
          // 如果删除的是当前选中的首帧，清空选中状态
@@ -1176,10 +1178,10 @@ export default defineComponent({
        firstFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
          item => item.frameType === 'first'
        )
-
-        lastFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
-          item => item.frameType === 'last'
-        )
+        // 注意：尾帧通过专门的 watch (lastFrameList) 监听，不需要从这里过滤
+        // lastFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
+        //   item => item.frameType === 'last'
+        // )
        // 更新 showFirstFrameList 中项的选中状态
        showFirstFrameList.value.forEach((listItem: any) => {
          if (listItem.id == data.selectImg.id) {
--- a/src/component/modules/habitSetStyle.vue
+++ b/src/component/modules/habitSetStyle.vue
@@ -102,9 +102,9 @@ setup(props,{emit}) {
 		// if(habitSetStyleData.styleList.length == 0){
 		// 	getStyleList()
 		// }
-		oldDataId = data.styleId
-		habitSetStyleData.selectStyle.id = data.styleId 
-		habitSetStyleData.selectStyle.name = data.styleName 
+		oldDataId = data.styleId || null
+		habitSetStyleData.selectStyle.id = data.styleId || null
+		habitSetStyleData.selectStyle.name = data.styleName  || ''
 		// habitSetStyleData.selectStyleId = 'feng2'
 	}
 	let setCover = (item:any)=>{
--- a/src/store/homeStore/homeStore.ts
+++ b/src/store/homeStore/homeStore.ts
@@ -74,7 +74,7 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
        },
 		setPoseTransferLastFrameList(state,data){
 			// 支持两种方式：set 替换整个列表；add/删除与 uploadElement 一致
-			if(data.str === 'set'){
+			if(data?.str === 'set'){
 				state.lastFrameList = data.list || []
 				return
 			}else{
--- a/src/store/userHabit/userHabit.ts
+++ b/src/store/userHabit/userHabit.ts
@@ -77,7 +77,7 @@ const userHabit : Module<UserHabit,RootState> = {
 			followeeCount: '-',
 			followerCount: '-',
 			accountExtendList:null,
-			systemList:[],
+			systemList:[1],
 			expireTime:null,
 			language:'',
 			organizationId: null,
@@ -194,7 +194,7 @@ const userHabit : Module<UserHabit,RootState> = {
 				followeeCount: '-',
 				followerCount: '-',
 				accountExtendList:null,
-				systemList:[],
+				systemList:[1],
 				expireTime:null,
 				language:'',
 				organizationId: null,
@@ -407,7 +407,7 @@ const userHabit : Module<UserHabit,RootState> = {
 								item.name = name
 							});
 							// const {t} = useI18n()
-							rv.unshift({name:t('Model.all'),value:'',id:''})
+							rv.unshift({name:t('Model.all'),value:'',id:null})
 							store.commit('setMannequinStyle',rv)
 							resolve('')
 						}
--- a/src/store/workspace/workspace.ts
+++ b/src/store/workspace/workspace.ts
@@ -74,7 +74,8 @@ const Workspace: Module<DesignDetail, RootState> = {
    },
    setProbject(state, data) {
      for (const key in data) {
-        if (data[key] == undefined) continue
+		let list = ['styleName','styleId','style']
+        if (data[key] == undefined && !list.includes(key)) continue
        state.probjects[key] = data[key]
      }
    },
--- a/src/tool/listData.js
+++ b/src/tool/listData.js
@@ -272,12 +272,12 @@ const navTypeList = (t)=>{
 				// },


-				// {
-				// 	icon:'fi fi-rr-puzzle-alt',
-				// 	value:'deReconstruction',
-				// 	label:t('Header.toolsDeReconstruction'),
-				// 	router:'tools=deReconstruction'
-				// },
+				{
+					icon:'fi fi-rr-puzzle-alt',
+					value:'deReconstruction',
+					label:t('Header.toolsDeReconstruction'),
+					router:'tools=deReconstruction'
+				},
 				{
 					icon:'fi fi-ss-box-open',
 					value:'toProduct',
@@ -294,18 +294,18 @@ const navTypeList = (t)=>{
 					label:t('Header.toolsToTransferPose'),
 					router:'tools=poseTransfer'
 				},
-				// {
-				// 	icon:'fi fi-rr-cubes',
-				// 	value:'patternMaking3D',
-				// 	label:t('Header.toolsPatternMaking'),
-				// 	router:'tools=patternMaking3D'
-				// },
-				// {
-				// 	icon:'fi fi-rr-pen-swirl',
-				// 	value:'canvasUpload',
-				// 	label:t('Header.toolsCanvas'),
-				// 	router:'tools=canvasUpload'
-				// },
+				{
+					icon:'fi fi-rr-cubes',
+					value:'patternMaking3D',
+					label:t('Header.toolsPatternMaking'),
+					router:'tools=patternMaking3D'
+				},
+				{
+					icon:'fi fi-rr-pen-swirl',
+					value:'canvasUpload',
+					label:t('Header.toolsCanvas'),
+					router:'tools=canvasUpload'
+				},
 			]
 		},
 		library:{
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -1721,9 +1721,8 @@ export default defineComponent({
 				sloganText = this.captionGeneration
 				if(this.selectCode == "Sketchboard"){
 					level2Type = this.selectGenerateList?.[0]?.categoryValue?this.selectGenerateList[0].categoryValue:''
-					if(this.workspace.styleName){
-						sloganText = `${this.workspace.styleName},${sloganText}`
-					}
+					// sloganText = `${this.workspace.styleName || 'all'},${sloganText}`
+					sloganText = `'all',${sloganText}`
 				}else if(this.selectCode == "Printboard"){
 					level2Type = this.scene?.value
 					if(level2Type == 'Slogan' && this.captionGeneration == ''){
Author	SHA1	Message	Date
X1627315083@163.com	ae1d7245f4	Merge remote-tracking branch 'origin/dev_vite' into research	2026-04-08 09:25:56 +08:00
zhangyahui	bb021ae9ac	style: 文案修改	2026-03-25 10:12:45 +08:00
zhangyahui	bfb4e128f5	Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite	2026-03-25 09:48:39 +08:00
zhangyahui	2f9b33e4ca	feat: transaction分页器显示总数据数量	2026-03-25 09:48:36 +08:00
X1627315083@163.com	48c37e0810	风格字段全部处理空情况	2026-03-23 17:22:57 +08:00
zhangyahui	b869a82fae	Merge branch 'StableVersion' of ssh://18.167.251.121:10002/aidlab/aida_front into StableVersion	2026-03-23 14:08:42 +08:00
zhangyahui	e61a8e372d	feat: Transaction Record页面totalamount改为所有数据总数	2026-03-23 13:59:17 +08:00
X1627315083@163.com	f5a74991c9	fix	2026-03-23 11:57:10 +08:00
X1627315083@163.com	e58e8540c9	fix	2026-03-23 10:41:16 +08:00
zhangyahui	e75ed7684e	Merge branch 'StableVersion' into dev_vite	2026-03-13 14:05:39 +08:00
zhangyahui	918d71072b	bugfix: 首尾帧模式上传图片转视频	2026-03-13 14:01:44 +08:00
X1627315083@163.com	242bc7a01d	fix	2026-03-06 18:44:48 +08:00
X1627315083@163.com	02ad8a340a	用户身份默认值改为1	2026-03-05 17:33:50 +08:00
X1627315083@163.com	b8f38db351	overall印花scale为字符串时候使用toFixed会报错	2026-02-24 11:27:43 +08:00
X1627315083@163.com	7fb7ffaced	fix	2026-02-06 16:47:45 +08:00