From 6b4c52c645838e62776d77eef3c96dd461a20bc0 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 28 May 2024 11:22:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=AD=89=E6=AF=94=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Administrator/TestClickData.vue | 14 ++++++++
 src/component/Administrator/allUser.vue       | 35 ++++++++++++-------
 src/component/Administrator/trialApproval.vue |  7 ++++
 src/component/Detail/DesignDetail.vue         |  6 ++--
 src/lang/cn.ts                                |  1 +
 src/lang/en.ts                                |  1 +
 src/views/HomeView/HomeView.vue               | 28 ++++++++++-----
 7 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/src/component/Administrator/TestClickData.vue b/src/component/Administrator/TestClickData.vue
index b856ded0..5be5d2b3 100644
--- a/src/component/Administrator/TestClickData.vue
+++ b/src/component/Administrator/TestClickData.vue
@@ -34,6 +34,7 @@
 
 		<div class="admin_table_content" ref="historyTable">
 			<a-table
+				@resizeColumn="handleResizeColumn"
 				:columns="columns"
 				:data-source="dataList"
 				:scroll="{ y: historyTableHeight }"
@@ -146,6 +147,10 @@ export default defineComponent({
                     title: 'Create Time',
                     align: "center",
                     ellipsis: true,
+					// width: 150,
+					// minWidth: 100,
+        			// maxWidth: 200,
+					// resizable: true,
                     dataIndex: "createTime",
                     key: "createTime",
                 },
@@ -153,6 +158,10 @@ export default defineComponent({
                     title: 'Occupation',
                     align: "center",
                     ellipsis: true,
+					// width: 150,
+					// minWidth: 100,
+        			// maxWidth: 200,
+					// resizable: true,
                     dataIndex: "occupation",
                     key: "occupation",
                 },
@@ -160,6 +169,8 @@ export default defineComponent({
                     title: 'Trial Order Id',
                     align: "center",
                     ellipsis: true,
+					// width: 150,
+					// resizable: true,
                     dataIndex: "trialOrderId",
                     key: "trialOrderId",
                 },
@@ -202,6 +213,9 @@ export default defineComponent({
             pageSize: 10,
             total: 0,
             historyTableHeight: 0,
+			handleResizeColumn: (w:any, col:any) => {
+				col.width = w;
+			},
         };
     },
     mounted() {
diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue
index 2e3def18..2f2ae3a6 100644
--- a/src/component/Administrator/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -9,6 +9,7 @@
 				:data-source="dataList"
 				:scroll="{ y: historyTableHeight}"
 				@change="changePage"
+				@resizeColumn="handleResizeColumn"
 				:pagination="{
 					showSizeChanger: true,
 					current: currentPage,
@@ -30,27 +31,28 @@
 <script lang="ts">
 import { defineComponent, ref, createVNode, computed } from "vue";
 import { Https } from "@/tool/https";
+import type { TableColumnsType } from 'ant-design-vue';
 import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
 export default defineComponent({
     components: {
     },
     setup() {
         let renameData: any = ref({}); //修改名字选中的数据
-        const columns: any = computed(() => {
-            return [
+        const columns: any = ref<TableColumnsType>([
                 {
                     title: 'Email',
                     align: "center",
                     ellipsis: true,
-                    width: 30,
+                    width: 50,
+					
                     dataIndex: "email",
                     key: "email",
-					fixed: 'left',
                 },
 				{
                     title: 'User Id',
                     align: "center",
-                    width: 30,
+                    width: 50,
+					
                     dataIndex: "id",
                     key: "id",
                 },
@@ -58,7 +60,8 @@ export default defineComponent({
                     title: 'User Name',
                     align: "center",
                     ellipsis: true,
-                    width: 30,
+                    width: 50,
+					
                     dataIndex: "userName",
                     key: "userName",
                 },
@@ -66,14 +69,16 @@ export default defineComponent({
                     title: 'Given Name',
                     align: "center",
                     ellipsis: true,
-                    width: 30,
+                    width: 50,
+					
                     dataIndex: "givenName",
                     key: "givenName",
                 },
                 {
                     title: 'Create Time',
                     align: "center",
-                    width: 30,
+                    width: 50,
+					
                     dataIndex: "createTime",
                     key: "createTime",
                 },
@@ -81,7 +86,8 @@ export default defineComponent({
                     title: 'Title',
                     align: "center",
                     ellipsis: true,
-                    width: 30,
+                    width: 50,
+					// 
                     dataIndex: "title",
                     key: "title",
                 },
@@ -89,14 +95,12 @@ export default defineComponent({
                     title: 'Country',
                     align: "center",
                     ellipsis: true,
-                    width: 30,
                     dataIndex: "country",
                     key: "country",
-					fixed: 'right',
                 },
 			
-            ];
-        });
+            ]
+        );
         let dataList: any = ref([]);
         let userInfo: any = {};
         return {
@@ -104,6 +108,11 @@ export default defineComponent({
             dataList,
             renameData,
             userInfo,
+			handleResizeColumn: (w:any, col:any) => {
+				console.log(col,w);
+				
+				col.width = w;
+			},
         };
     },
     data() {
diff --git a/src/component/Administrator/trialApproval.vue b/src/component/Administrator/trialApproval.vue
index 0ea1d398..d063a272 100644
--- a/src/component/Administrator/trialApproval.vue
+++ b/src/component/Administrator/trialApproval.vue
@@ -81,6 +81,7 @@ export default defineComponent({
                     title: 'Email',
                     align: "center",
                     ellipsis: true,
+					
                     width: 100,
                     dataIndex: "email",
                     key: "email",
@@ -90,6 +91,7 @@ export default defineComponent({
                     align: "center",
                     width: 70,
                     dataIndex: "updateTime",
+					
                     key: "updateTime",
                     // customRender: (record: any) => {
                     //     let time = formatTime(
@@ -103,6 +105,7 @@ export default defineComponent({
                     title: 'State',
                     align: "center",
                     ellipsis: true,
+					
                     width: 70,
                     dataIndex: "status",
                     key: "status",
@@ -122,6 +125,7 @@ export default defineComponent({
                     title: 'Address',
                     align: "center",
                     ellipsis: true,
+					
                     width: 70,
                     dataIndex: "country",
                     key: "country",
@@ -130,6 +134,7 @@ export default defineComponent({
                     title: 'Surname',
                     align: "center",
                     ellipsis: true,
+					
                     width: 70,
                     dataIndex: "surname",
                     key: "surname",
@@ -138,6 +143,7 @@ export default defineComponent({
                     title: 'Name',
                     align: "center",
                     ellipsis: true,
+					
                     width: 70,
                     dataIndex: "userName",
                     key: "userName",
@@ -150,6 +156,7 @@ export default defineComponent({
                     width: 70,
                     // slots:{customRender:'action'}
                     Operations: true,
+					
                 },
             ];
         });
diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 140a2d4b..d0252ac1 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -278,6 +278,7 @@ export default defineComponent({
 	watch:{
 		designItemDetail:{
 			handler: async function(newVal,oldVal) {
+				
 				let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
 				this.ifSubmit = designItemDetail.ifSubmit?designItemDetail.ifSubmit:false
 				if(newVal.clothes.length == 0){
@@ -866,10 +867,11 @@ export default defineComponent({
 						// if(this.designItemDetail.clothes[this.designItemDetail.clothes.legnth-1] && !this.designItemDetail.clothes[this.designItemDetail.clothes.legnth-1].id){
 						// 	this.designItemDetail.clothes.split(this.designItemDetail.clothes.legnth-1,1)
 						// }
-						if(data.clothes[data.clothes.legnth-1] && !data.clothes[data.clothes.legnth-1].id){
-							data.clothes.split(data.clothes.legnth-1,1)
+						if(data.designSingleItemDTOList[data.designSingleItemDTOList.legnth-1] && !data.designSingleItemDTOList[data.designSingleItemDTOList.legnth-1].id){
+							data.designSingleItemDTOList.split(data.designSingleItemDTOList.legnth-1,1)
 						}
 						this.store.commit("setDesignItemDetail", designItemDetail);
+						console.log(123);
 						this.store.commit("setDesignPreviewData", data);
 						this.setRevocation(designItemDetail,data)
 						this.deleteItemShow = false
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 1b1502d5..6d4791c1 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -131,6 +131,7 @@ export default {
 		jsContent7:"友情提示",
 		jsContent5:"我们很高兴让您体验AiDA 3.0。请注意，部分服务在试用期间可能会受到限制。如果您已经准备好全身心投入并享受完整的体验，我们诚挚地邀请您订阅。只需访问",
 		jsContent6:" 就可以开始订阅。感谢您试用我们的服务！",
+		jsContent9:"是否清除当前收集?",
 	},
 	LibraryPage:{
 		Organize:'整理',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 14b887c3..955f4b3d 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -132,6 +132,7 @@ export default {
 		jsContent7:"Friendly Reminder",
 		jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
 		jsContent6:" to get started. Thank you for trying our services!",
+		jsContent9:"Whether to clear the current collection?",
 	},
 	LibraryPage:{
 		Organize:'Organize',
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index f5242c5a..7144f81c 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -27,9 +27,9 @@
 							<!-- 有图状态 start-->
 							<div class="home_left_info" v-show="isHaveReviewCollection">
 								<div class="left_info_top">
-									<div class="button_second" @click="startNewCollection()">
+									<!-- <div class="button_second" @click="startNewCollection()">
 										{{ $t('HomeView.Start') }}
-									</div>
+									</div> -->
 									<div class="button_first button_margin" @click="recollection()">
 										{{ $t('HomeView.Edit') }}
 									</div>
@@ -237,7 +237,7 @@ import { useStore } from "vuex";
 import { Https } from "@/tool/https";
 import { rgbToHsv, dataURLtoBlob } from "@/tool/util";
 import { openGuide,driverObj__ } from "@/tool/guide";
-import { LoadingOutlined } from "@ant-design/icons-vue";
+import { LoadingOutlined ,ExclamationCircleOutlined} from "@ant-design/icons-vue";
 import draggable from 'vuedraggable'
 // import JSZip, { forEach } from "jszip";
 import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
@@ -560,12 +560,22 @@ export default defineComponent({
 		},
 
 		resetCollection(){
-			this.store.commit("clearAllData");
-			this.store.commit("clearAllCollection");
-			this.store.commit("setAllBoardDataChoose",{});
-			this.store.commit("clearShowSketchboard",{});
-			this.isHaveReviewCollection = false
-			
+			let _this = this
+			Modal.confirm({
+				title: this.t('HomeView.jsContent9'),
+				icon: createVNode(ExclamationCircleOutlined),
+				okText: 'Yes',
+				cancelText: 'No',
+				mask:false,
+				centered:true,
+				onOk() {
+					_this.store.commit("clearAllData");
+					_this.store.commit("clearAllCollection");
+					_this.store.commit("setAllBoardDataChoose",{});
+					_this.store.commit("clearShowSketchboard",{});
+					_this.isHaveReviewCollection = false
+				}
+			});
 		},
 		//完成设计
 		finishCollection() {