From 4269957cf25b96f2b135157b41302efa474d8334 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 19 Aug 2024 16:32:31 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/productImg.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue
index 560a1e9e..0a33ed0f 100644
--- a/src/component/HomePage/productImg.vue
+++ b/src/component/HomePage/productImg.vue
@@ -26,7 +26,7 @@
 					<div class="Guide_1_32">
 						<div class="productImg_content_item_title productImg_content_item_title_menu">
 							<span>{{$t('ProductImg.MagicTools')}}</span>
-							<generalMenu class="productImg_content_item_title_menubtn hideEvents" :dataList="productimgMenuList" @setprintModel="setproduct" :item="productimgMenu"></generalMenu>
+							<generalMenu class="productImg_content_item_title_menubtn" :class="{hideEvents:driver__.driver}" :dataList="productimgMenuList" @setprintModel="setproduct" :item="productimgMenu"></generalMenu>
 						</div>
 						<div class="input_border productImg_content_item_generate">
 							<div class="input_box">
@@ -159,7 +159,7 @@
 									</div>
 								</div>
 								<div class="productImg_right_item_iconLeft" >
-									<div class="productImg_right_item_scale hideEvents" :style="[(driver__.index == 46 || driver__.index == 47 || driver__.index == 48)?'display: flex;':'']" @click.stop="setScaleImage(generateList,index,true)">
+									<div class="productImg_right_item_scale" :class="{hideEvents:driver__.driver}" :style="[(driver__.index == 46 || driver__.index == 47 || driver__.index == 48)?'display: flex;':'']" @click.stop="setScaleImage(generateList,index,true)">
 										<i class="fi fi-bs-expand-arrows-alt"></i>
 									</div>
 									<div v-show="item.resultType != 'Relight'" class="productImg_right_item_menu Guide_1_34" :style="[(driver__.index == 46 || driver__.index == 47 || driver__.index == 48)?'display: flex;':'']" @click.stop="setMenuShow(item)">

From b4f3ae68c512ef13ec87555de270e329448e0095 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 22 Aug 2024 14:49:46 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Administrator/allUser.vue       | 10 ++++----
 .../Administrator/recentActiveChart.vue       | 20 ++++------------
 src/component/Administrator/trialAllUser.vue  | 10 ++++----
 src/component/Detail/DesignElementsMobile.vue |  6 ++---
 src/store/adminPage/adminPage.ts              | 23 +++++++++++++++++++
 src/store/index.ts                            |  2 ++
 src/views/Administrator.vue                   |  6 +++--
 7 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 src/store/adminPage/adminPage.ts

diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue
index 9367efc9..4c7c520c 100644
--- a/src/component/Administrator/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -155,15 +155,19 @@ import {
     onMounted,
 } from "vue";
 import { formatTime } from "@/tool/util";
+import { useStore } from "vuex";
 import { Https } from "@/tool/https";
 import allUserPoerationsVue from "./allUserPoerations.vue";
 export default defineComponent({
     components: {allUserPoerationsVue,},
     setup() {
+        const store:any = useStore()
         let filter: any = reactive({
             dataList: [],
             tableLoading: false,
-            allUserList: [],
+            allUserList: computed(()=>{
+				return store.state.adminPage.allUserList
+			}),
 			allCountry:[]
         });
         let filterData: any = reactive({
@@ -478,10 +482,6 @@ export default defineComponent({
 			allUserPoerationsVue.value.init('Edit',data)
 		}
         onMounted(() => {
-            let allUserList: any = sessionStorage.getItem("allUserList");
-            if (allUserList) {
-                filter.allUserList = JSON.parse(allUserList);
-            }
 			let allCountry: any = sessionStorage.getItem("allCountry");
             if (allCountry) {
                 filter.allCountry = JSON.parse(allCountry);
diff --git a/src/component/Administrator/recentActiveChart.vue b/src/component/Administrator/recentActiveChart.vue
index 0f984ecf..d0c866e1 100644
--- a/src/component/Administrator/recentActiveChart.vue
+++ b/src/component/Administrator/recentActiveChart.vue
@@ -60,13 +60,17 @@ import * as echarts from 'echarts/core';
 import { TooltipComponent, LegendComponent } from 'echarts/components';
 import { PieChart } from 'echarts/charts';
 import { LabelLayout } from 'echarts/features';
+import { useStore } from "vuex";
 import { CanvasRenderer } from 'echarts/renderers';
 export default defineComponent({
     components: {
     },
     setup() {
+        const store:any = useStore()
         let filter:any =  reactive({
-			dataList:[],
+			dataList:computed(()=>{
+				return store.state.adminPage.allUserList
+			}),
 		})
 		
 		let filterData:any = reactive({
@@ -77,19 +81,6 @@ export default defineComponent({
         let searchHistoryList = ()=> {
             gettrialList();
         }
-		let getUserIDName = ()=>{
-			let allUserList:any = sessionStorage.getItem('allUserList');
-			if(allUserList){
-				filter.dataList = JSON.parse(allUserList)
-			}
-			// Https.axiosGet(Https.httpUrls.getAllUserId,).then((rv: any) => {
-			// 	if (rv) {
-			// 		let username = sessionStorage.getItem('allUserList');
-			// 		sessionStorage.setItem('allUserList',rv);
-			// 		filter.dataList = rv
-			// 	}
-			// })
-		}
 		//获取列表
         let gettrialList = async () =>{
 			filter.tableLoading = true
@@ -203,7 +194,6 @@ export default defineComponent({
 		}
 		onMounted(()=>{
 			lastGeTrialList('month')
-			getUserIDName()
 		})
         return {
 			...toRefs(filter),
diff --git a/src/component/Administrator/trialAllUser.vue b/src/component/Administrator/trialAllUser.vue
index 34e15932..983b0b27 100644
--- a/src/component/Administrator/trialAllUser.vue
+++ b/src/component/Administrator/trialAllUser.vue
@@ -94,15 +94,19 @@
 <script lang="ts">
 import { defineComponent, ref, createVNode, computed, reactive, toRefs, onMounted } from "vue";
 import { formatTime } from "@/tool/util";
+import { useStore } from "vuex";
 import { Https } from "@/tool/https";
 export default defineComponent({
     components: {
     },
     setup() {
+        const store:any = useStore()
         let filter:any =  reactive({
 			dataList:[],
 			tableLoading:false,
-			allUserList: [],
+			allUserList: computed(()=>{
+				return store.state.adminPage.allUserList
+			}),
 			allCountry:[]
 		})
 		let filterData:any = reactive({
@@ -261,10 +265,6 @@ export default defineComponent({
 			gettrialList();
 		}
 		onMounted(()=>{
-			let allUserList: any = sessionStorage.getItem("allUserList");
-            if (allUserList) {
-                filter.allUserList = JSON.parse(allUserList);
-            }
 			let allCountry: any = sessionStorage.getItem("allCountry");
             if (allCountry) {
                 filter.allCountry = JSON.parse(allCountry);
diff --git a/src/component/Detail/DesignElementsMobile.vue b/src/component/Detail/DesignElementsMobile.vue
index a8190b63..5d0f41f1 100644
--- a/src/component/Detail/DesignElementsMobile.vue
+++ b/src/component/Detail/DesignElementsMobile.vue
@@ -491,7 +491,7 @@ export default defineComponent({
 			// let num = this.sketch/
 			return new Promise(async (resolve, reject) => {
 				let arr = JSON.parse(JSON.stringify(this.printStyleList))
-				let sketch = document.getElementsByClassName("designElements_sketch")[0]
+				let sketch = document.getElementsByClassName("designElementsMobile_modal")[0]?.getElementsByClassName('designElementsMobile_sketch')[0]
 				let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
 				let prints = []
 				let scale
@@ -833,8 +833,8 @@ export default defineComponent({
 					li{
 						cursor: pointer;
 						// border-radius: 50%;
-						width: calc(1rem*1.2);
-						height: calc(1rem*1.2);
+						width: calc(2.5rem*1.2);
+						height: calc(2.5rem*1.2);
 						background-color: rgb(20, 188, 255);
 						position: absolute;
 						pointer-events: none;
diff --git a/src/store/adminPage/adminPage.ts b/src/store/adminPage/adminPage.ts
new file mode 100644
index 00000000..eac5bc73
--- /dev/null
+++ b/src/store/adminPage/adminPage.ts
@@ -0,0 +1,23 @@
+import {Module} from 'vuex'
+import {RootState} from '../index'
+
+interface DesignDetail{
+    allUserList:any,
+   
+}
+
+const adminPage : Module<DesignDetail,RootState> = {
+    state:{
+        allUserList:[],
+    },
+    mutations:{
+        setAllUserList(state,files){
+            state.allUserList = files
+        },
+    },
+    actions:{
+
+    }
+}
+
+export default adminPage
\ No newline at end of file
diff --git a/src/store/index.ts b/src/store/index.ts
index 7ee7735b..f7e11bf6 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -5,6 +5,7 @@ import HomeStoreModule  from './homeStore/homeStore'
 import UserHabit  from './userHabit/userHabit'
 import Workspace  from './workspace/workspace'
 import Guide  from './guide/guide'
+import adminPage  from './adminPage/adminPage'
 export interface RootState{
 
 }
@@ -25,5 +26,6 @@ export default createStore<RootState>({
 	UserHabit,
 	Workspace,
 	Guide,
+	adminPage,
   }
 })
diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue
index b7e30a6e..dfdadfb7 100644
--- a/src/views/Administrator.vue
+++ b/src/views/Administrator.vue
@@ -81,6 +81,7 @@ import { getUploadUrl } from "@/tool/util";
 import scaleImage from "@/component/HomePage/scaleImage.vue";
 import { openGuide,driverObj__,driverIndex__ } from "@/tool/guide";
 import { useI18n } from "vue-i18n";
+import store from "@/store";
 export default defineComponent({
 	components: {
 		MailOutlined,
@@ -90,7 +91,8 @@ export default defineComponent({
     props: ["msg",'sketchCatecoryList'],
     setup() {
 		const router = useRouter()
-        const route:any = useRoute()
+        // const route:any = useRoute()
+        const store:any = useStore()
 		const state:any = reactive({
 		rootSubmenuKeys: [{
 			name:'All User',
@@ -263,7 +265,7 @@ export default defineComponent({
 			//储存所有用户id和name
 			Https.axiosGet(Https.httpUrls.getAllUserId,).then((rv: any) => {
 				if (rv) {
-					sessionStorage.setItem('allUserList',JSON.stringify(rv));
+					store.commit('setAllUserList',rv);
 				}
 			})
 			let allCountry = country

From 7f69a4659e6d58e29c59e089c1bf784758916969 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 22 Aug 2024 15:51:06 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/productImg.vue | 14 ++++++++++----
 src/component/HomePage/scaleImage.vue |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue
index 0a33ed0f..1ad03e6b 100644
--- a/src/component/HomePage/productImg.vue
+++ b/src/component/HomePage/productImg.vue
@@ -34,7 +34,7 @@
 									<input
 										class="search_input"
 										:placeholder="$t('Generate.inputContent1')"
-										v-model="searchName"
+										v-model="searchName[productimgMenu.value]"
 										@keydown.enter="getPrductimg()"
 									/>
 									<i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="()=>isTextarea = !isTextarea"></i>
@@ -44,7 +44,7 @@
 									v-show="isTextarea"
 									class="search_textarea "  
 									@keydown.enter="getPrductimg()"
-									v-model="searchName"
+									v-model="searchName[productimgMenu.value]"
 								></textarea>
 								
 							</div>
@@ -253,7 +253,10 @@ export default defineComponent({
 		let productImgData:any = reactive({
 			isShowMark:false,
 			fileList:{},
-			searchName:'',
+			searchName:{
+				ToProductImage:'',
+				Relight:'',
+			},
 			isTextarea:false,//是否展开
 			remProductimg:false,//是否出现取消按钮
 			isProductimg:false,//开始生成
@@ -484,7 +487,7 @@ export default defineComponent({
 			}
 			let imageStrength = productImgData.similarity == 100? 95 :productImgData.similarity
 			let data:any ={
-				prompt:productImgData.searchName,
+				prompt:productImgData.searchName[productimgMenu.value.value],
 				toProductImageVOList:selectArr,
 				userLikeGroupId:upload.value.userlikeGroupId,
 				direction:RelightDirection.value,
@@ -604,6 +607,9 @@ export default defineComponent({
 			// scaleImage.value.isProductimg = false
 			scaleImage.value.init(arr,index)
 			scaleImage.value.isLike = false
+			scaleImage.value.productimgSearchName = productImgData.searchName[productimgMenu.value.value]
+			scaleImage.value.productimgSimilarity = productImgData.similarity
+			scaleImage.value.productimgRelightDirection = RelightDirection.value
 			scaleImage.value.isComparison = true
 		}
 		let generalIsMenuShow:any = {}
diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue
index d8ba1eb8..fb11f52f 100644
--- a/src/component/HomePage/scaleImage.vue
+++ b/src/component/HomePage/scaleImage.vue
@@ -146,6 +146,7 @@ export default defineComponent({
 	},
     setup(props:any,{emit}) {
 		const store = useStore();
+		
 		let productimg = reactive({
 			isProductimg:false,
 			productimgSearchName:'',

From 5103acbda4bb821f8060318cdceb859b12a7f916 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 22 Aug 2024 16:20:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9details=E7=9A=84Element?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignElements.vue       | 3 ++-
 src/component/Detail/DesignElementsMobile.vue | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/component/Detail/DesignElements.vue b/src/component/Detail/DesignElements.vue
index 658e6ceb..48cf7d8e 100644
--- a/src/component/Detail/DesignElements.vue
+++ b/src/component/Detail/DesignElements.vue
@@ -49,7 +49,8 @@
 								<img crossOrigin="anonymous" :src="item?.path" :style="{transform:`rotateZ(${printStyleList[index]?.transform?.rotateZ}deg)`}" class="designElements_imgItme" draggable="false"> 
 							</div>
 						</div>
-						<img :src="current?.path" alt="" class="designElements_sketch">
+						<img :src="current?.undividedLayer?current.undividedLayer:current.path" alt="" class="designElements_sketch">
+						<!-- <img :src="current?.path" alt="" class="designElements_sketch"> -->
 						<div class="designElements_btn">
 							<ul v-for="item,index in printStyleList" :key="item" :class="{active:item?.designElementsBtn?item?.designElementsBtn:false}" class="designElements_Mousingle" :style="item.style" @mousedown.stop="itemMoveMousedown(index,$event)">
 								<li class="designElements_btn_top" @mousedown.stop="itemSizeMousedown('top',$event)"></li>
diff --git a/src/component/Detail/DesignElementsMobile.vue b/src/component/Detail/DesignElementsMobile.vue
index 5d0f41f1..2d013746 100644
--- a/src/component/Detail/DesignElementsMobile.vue
+++ b/src/component/Detail/DesignElementsMobile.vue
@@ -49,7 +49,8 @@
 								<img crossOrigin="anonymous" :src="item?.path" :style="{transform:`rotateZ(${printStyleList[index]?.transform?.rotateZ}deg)`}" class="designElementsMobile_imgItme" draggable="false"> 
 							</div>
 						</div>
-						<img :src="current?.path" alt="" class="designElementsMobile_sketch">
+						<!-- <img :src="current?.path" alt="" class="designElementsMobile_sketch"> -->
+						<img :src="current?.undividedLayer?current.undividedLayer:current.path" alt="" class="designElementsMobile_sketch">
 						<div class="designElementsMobile_btn">
 							<ul v-for="item,index in printStyleList" :key="item" :class="{active:item?.designElementsBtn?item?.designElementsBtn:false}" class="designElementsMobile_Mousingle" :style="item.style" @touchstart.stop="itemMoveMousedown(index,$event)">
 								<li class="designElementsMobile_btn_top" @touchstart.stop="itemSizeMousedown('top',$event)"></li>

From d840d3de35763cb43f0b955df8b485f0dbbacab4 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 22 Aug 2024 16:39:18 +0800
Subject: [PATCH 5/5] fix

---
 src/component/HomePage/productImg.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue
index 1ad03e6b..291efaad 100644
--- a/src/component/HomePage/productImg.vue
+++ b/src/component/HomePage/productImg.vue
@@ -848,6 +848,13 @@ export default defineComponent({
 	.productImg_left{
 		width: 25%;
 		position: relative;
+		height: 100%;
+		.Guide_1_32{
+			height: 100%;
+			overflow-y: auto;
+			&.Guide_1_32::-webkit-scrollbar{display: none;}
+		}
+
 		.upload_file_item{
 			display: flex;
 			margin-right: 1rem;