From ffa1da742f88f6ca88cc85ba4e67de42f298fc3c Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 6 Aug 2024 10:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=9C=E8=89=B2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   2 +-
 src/assets/style/style.css                    |  23 ++-
 src/assets/style/style.less                   |  24 ++-
 src/component/Administrator/allUser.vue       |  26 +--
 .../Administrator/allUserPoerations.vue       |  29 ++--
 .../Administrator/recentActiveUser.vue        |  20 ++-
 src/component/Administrator/recentNewUser.vue | 160 ++++++++++--------
 src/component/Detail/DesignDetailAlter.vue    |   3 +-
 src/component/HomePage/ColorboardUpload.vue   |   3 +-
 src/views/Administrator.vue                   |   2 +-
 src/views/HomeMain.vue                        |   1 +
 11 files changed, 185 insertions(+), 108 deletions(-)

diff --git a/.env.dev b/.env.dev
index 7cb5aaab..c8f7d099 100644
--- a/.env.dev
+++ b/.env.dev
@@ -6,6 +6,6 @@ NODE_ENV = 'development'
 VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 # 佩佩
-# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
+VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
 # 海波
 # VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index 889c3a88..9fa92746 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -1096,7 +1096,7 @@ li {
   margin-right: 15px;
   flex-shrink: 0;
   display: block;
-  width: 100px;
+  width: 10rem;
   text-align: right;
 }
 .admin_page .admin_state_item > input {
@@ -1144,13 +1144,13 @@ li {
 .admin_page .admin_table_search .admin_state_list .admin_state_list_item {
   cursor: pointer;
   width: auto;
-  border-radius: 1rem;
-  padding: 1rem 2rem;
+  border-radius: 10px;
+  padding: 5px 10px;
   border: 1px solid #b6b6b6;
   background: #39215b;
   color: #fff;
-  margin: 0 2rem 2rem 0;
-  font-size: 1.8rem;
+  margin: 0 10px 10px 0;
+  font-size: 1.4rem;
   font-weight: 600;
 }
 .admin_page .admin_table_search .admin_state_list .admin_state_list_item:last-child {
@@ -1209,6 +1209,19 @@ li {
 .admin_page .admin_table_content .ant-table-body::-webkit-scrollbar {
   width: 0 !important;
 }
+.admin_page .admin_table_content .ant-table-body::-webkit-scrollbar-horizontal {
+  height: 2px !important;
+  width: 2px !important;
+}
+.admin_page .admin_table_content .ant-table-body::-webkit-scrollbar-thumb:horizontal {
+  background-color: #8a8a8a;
+  /* 水平滚动条手柄颜色 */
+  border-radius: 5px;
+}
+.admin_page .admin_table_content .ant-table-body::-webkit-scrollbar-track:horizontal {
+  background-color: #f1f1f1;
+  /* 水平滚动条轨道颜色 */
+}
 .admin_page .admin_table_content .ant-table-thead > tr > th {
   background: #ffffff;
   border-bottom: none;
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 12b60c28..6cb95d9c 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -1224,7 +1224,8 @@ input:focus{
 			flex-shrink: 0;
 			display: block;
 			// min-width: 20%;
-			width: 100px;
+			// width: 100px;
+			width: 10rem;
 			text-align: right;
 		}
 		>input{
@@ -1273,13 +1274,13 @@ input:focus{
 			.admin_state_list_item{
 				cursor: pointer;
 				width: auto;
-				border-radius: 1rem;
-				padding: 1rem 2rem;
+				border-radius: 10px;
+				padding: 5px 10px;
 				border: 1px solid #b6b6b6;
 				background: #39215b;
 				color: #fff;
-				margin: 0 2rem 2rem 0;
-				font-size: 1.8rem;
+				margin: 0 10px 10px 0;
+				font-size: 1.4rem;
 				font-weight: 600;
 			}
 			.admin_state_list_item:last-child{
@@ -1339,10 +1340,21 @@ input:focus{
 			overflow-y: auto !important;
 			-ms-overflow-style: none;
 			overflow: -moz-scrollbars-none;
-
 			&::-webkit-scrollbar {
 				width: 0 !important;
 			}
+			&::-webkit-scrollbar-horizontal {
+				height: 2px !important;
+				width: 2px !important;
+			}
+			&::-webkit-scrollbar-thumb:horizontal {
+				background-color: #8a8a8a; /* 水平滚动条手柄颜色 */
+				border-radius: 5px;
+			  }
+			  
+			  &::-webkit-scrollbar-track:horizontal {
+				background-color: #f1f1f1; /* 水平滚动条轨道颜色 */
+			  }
 		}
 		.ant-table-thead > tr > th {
 			background: #ffffff;
diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue
index ea8e96b6..0433e8ab 100644
--- a/src/component/Administrator/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -187,17 +187,21 @@ export default defineComponent({
                 value: "",
             },
             {
-                label: "visitor",
-                value: "1",
-            },
-            {
-                label: "trial",
-                value: "2",
-            },
-            {
-                label: "official",
-                value: "3",
-            },
+				label:'visitor',
+				value:'0',
+			},
+			{
+				label:'yearly',
+				value:'1',
+			},
+			{
+				label:'monthly',
+				value:'2',
+			},
+			{
+				label:'trial',
+				value:'3',
+			},
             {
                 label: "userInEvent",
                 value: "4",
diff --git a/src/component/Administrator/allUserPoerations.vue b/src/component/Administrator/allUserPoerations.vue
index 1f49e3e6..c610b4c4 100644
--- a/src/component/Administrator/allUserPoerations.vue
+++ b/src/component/Administrator/allUserPoerations.vue
@@ -21,7 +21,7 @@
 		</div>
 		<div class="allUserPoeration_center admin_page">
 			<div class="admin_state_item">
-				<span style="width: 100px;">User Name:</span>
+				<span>User Name:</span>
 				<input
 					:readonly="title != 'Add'"
 					:class="{active:title != 'Add'}"
@@ -32,7 +32,7 @@
 				/>
 			</div>
 			<div class="admin_state_item">
-				<span style="width: 100px;">User Email:</span>
+				<span>User Email:</span>
 				<input
 					:readonly="title != 'Add'"
 					:class="{active:title != 'Add'}"
@@ -43,7 +43,7 @@
 				/>
 			</div>
 			<div class="admin_state_item">
-				<span style="width: 100px;">Create Time:</span>
+				<span>Create Time:</span>
 				<a-date-picker :disabled="title != 'Add'" style="width: 250px" valueFormat="YYYY-MM-DDTHH:mm:ss" class="range_picker" show-time placeholder="Create Time" v-model:value="validStartTime">
 					<template #suffixIcon>
 						<span
@@ -53,7 +53,7 @@
 				</a-date-picker>
 			</div>
 			<div class="admin_state_item">
-				<span style="width: 100px;">End Time:</span>
+				<span>End Time:</span>
 				<a-date-picker style="width: 250px" valueFormat="YYYY-MM-DDTHH:mm:ss" class="range_picker" show-time placeholder="End Time" v-model:value="validEndTime">
 					<template #suffixIcon>
 						<span
@@ -63,7 +63,7 @@
 				</a-date-picker>
 			</div>
 			<div class="admin_state_item">
-				<span style="width: 100px;">User Type:</span>
+				<span>User Type:</span>
 				<a-select
 					v-model:value="systemUser"
 					size="large"
@@ -76,7 +76,7 @@
 				></a-select>
 			</div>
 			<div class="admin_state_item">
-				<span style="width: 100px;">Credits:</span>
+				<span>Credits:</span>
 				<input
 					v-model="credits"
 					placeholder="Please enter credits"
@@ -86,7 +86,7 @@
 			</div>
 			
 			<div class="admin_state_item">
-				<span style="width: 100px;">Country:</span>
+				<span>Country:</span>
 				<input
 					:readonly="title != 'Add'"
 					:class="{active:title != 'Add'}"
@@ -190,9 +190,14 @@ export default defineComponent({
 
 		}
 		let setTime = (time) =>{
-			const date = new Date(time);
-			const timestamp = date.getTime(); // 转换为秒数
-			return timestamp
+			if(time){
+				const date = new Date(time);
+				const timestamp = date.getTime(); // 转换为秒数
+				return timestamp
+			}else{
+				return ''
+			}
+			
 		}
 		let setAddData = ()=>{
 			setTime(operationsData.validStartTime)
@@ -296,7 +301,9 @@ export default defineComponent({
 	}
 	.allUserPoeration_center{
 		height: 85%;
-		overflow-y: auto
+		overflow-y: auto;
+		flex-direction: row;
+		flex-wrap: wrap;
 	}
 }
 </style>
\ No newline at end of file
diff --git a/src/component/Administrator/recentActiveUser.vue b/src/component/Administrator/recentActiveUser.vue
index 6675da2a..33ffc5b3 100644
--- a/src/component/Administrator/recentActiveUser.vue
+++ b/src/component/Administrator/recentActiveUser.vue
@@ -73,6 +73,8 @@ export default defineComponent({
 			currentPage: 1,
             pageSize: 10,
             total: 0,
+			order: "", //'Ascending  升序 Descending 降序'
+			orderBy:'',
 		})
         let renameData: any = ref({}); //修改名字选中的数据
         const columns: any = computed(() => {
@@ -215,10 +217,20 @@ export default defineComponent({
             ];
         });
 		//改变页码
-		let changePage = (e: any) => {
+        let changePage = (e: any, filters:any, sorter:any) => {
             filterData.currentPage = e.current;
             filterData.pageSize = e.pageSize;
-            // gettrialList();
+			if(sorter.order){
+				if(sorter.columnKey == 'id'){
+					filterData.orderBy = 'id'
+				}else if(sorter.columnKey == "createDate"){
+					filterData.orderBy = 'time'
+				}else if(sorter.columnKey == "credits"){
+					filterData.orderBy = 'credits'
+				}
+			}
+			filterData.order = sorter.order == "descend" ? "Descending" : "Ascending";
+            gettrialList();
         }
 
         //查询列表
@@ -241,8 +253,10 @@ export default defineComponent({
 				startTime:startDate,
 				size:filterData.pageSize,
 				page:filterData.currentPage,
+				order: filterData.order,
+                orderBy: filterData.orderBy,
 			}
-			Https.axiosGet(Https.httpUrls.recentActiveUser,{params:data}).then((rv: any) => {
+			Https.axiosPost(Https.httpUrls.recentActiveUser,data).then((rv: any) => {
 				if (rv) {
 					// this.dataList = rv
 					filter.dataList = rv.records
diff --git a/src/component/Administrator/recentNewUser.vue b/src/component/Administrator/recentNewUser.vue
index 164ad429..b5a4c145 100644
--- a/src/component/Administrator/recentNewUser.vue
+++ b/src/component/Administrator/recentNewUser.vue
@@ -25,7 +25,7 @@
 				</div>
 				<div class="admin_state_item">
 					<span>Type:</span>
-					<a-select v-model:value="userType" size="large" style="width:280px" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select>
+					<a-select v-model:value="systemUser" size="large" style="width:280px" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select>
 				</div>
 			</div>
 			<div class="admin_search">
@@ -46,6 +46,7 @@
 				:data-source="dataList"
 				:scroll="{ y: historyTableHeight }"
 				@change="changePage"
+				:showSorterTooltip='false'
 				:pagination="{
 					showSizeChanger: true,
 					current: currentPage,
@@ -76,7 +77,9 @@ export default defineComponent({
 			currentPage: 1,
             pageSize: 10,
             total: 0,
-			userType:'',
+			systemUser:'',
+			order: "", //'Ascending  升序 Descending 降序'
+			orderBy:'',
 		})
 		let state:any = ref([
 			{
@@ -103,27 +106,30 @@ export default defineComponent({
         let renameData: any = ref({}); //修改名字选中的数据
         const columns: any = computed(() => {
             return [
-				{
-                    title: 'User Id',
+			{
+                    title: "User Id",
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "id",
                     key: "id",
-					fixed: 'left' 
+					width:100,
+                    fixed: "left",
+					sorter: true,
                 },
                 {
-                    title: 'Email',
+                    title: "Email",
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "userEmail",
                     key: "userEmail",
+					width:200,
+					ellipsis:true
                 },
-				{
-                    title: 'User Name',
+                {
+                    title: "User Name",
                     align: "center",
-                    ellipsis: 200,
                     dataIndex: "userName",
                     key: "userName",
+					width:150,
+					ellipsis:true
                     // customRender: (record: any) => {
                     //     let time = formatTime(
                     //         record.text / 1000,
@@ -132,109 +138,125 @@ export default defineComponent({
                     //     return time;
                     // },
                 },
-				{
-                    title: 'language',
+                {
+                    title: "language",
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "language",
                     key: "language",
+					width:100,
+					ellipsis:true,
                 },
                 {
-                    title: 'Valid Start Time',
+                    title: "Valid Start Time",
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "validstartTime",
                     key: "validstartTime",
+					width:200,
+					ellipsis:true
                 },
-				{
-                    title: 'Valid End Time',
+                {
+                    title: "Valid End Time",
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "validendTime",
                     key: "validendTime",
+					width:200,
+					ellipsis:true
                 },
-				{
-                    title: 'Country',
+                {
+                    title: "Country",
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "country",
                     key: "country",
+					width:100,
                 },
-				{
-                    title: 'Create Date',
+                {
+                    title: "Create Date",
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "createDate",
                     key: "createDate",
+					width:200,
+					sorter: true,
                 },
-				{
-                    title: 'Is Beginner',
+                {
+                    title: "Is Beginner",
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "isBeginner",
                     key: "isBeginner",
-					customRender: (record: any) => {
-                        let str
-						if(record.value == 1){
-							str ='Yes'
-						}else{
-							str ='No'
-						}
+					width:80,
+					ellipsis:true,
+                    customRender: (record: any) => {
+                        let str;
+                        if (record.value == 1) {
+                            str = "Yes";
+                        } else {
+                            str = "No";
+                        }
                         return str;
                     },
                 },
-				{
+                {
                     title: 'Machine Room Ip',
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "browserIdentifiers",
                     key: "browserIdentifiers",
+					width:200,
+					sorter: true,
                 },
-				{
-                    title: 'Credits',
+                {
+                    title: "Credits",
                     align: "center",
-                    ellipsis: true,
-					// width: 150,
-					// minWidth: 100,
-        			// maxWidth: 200,
-					// resizable: true,
+                    // width: 150,
+                    // minWidth: 100,
+                    // maxWidth: 200,
+                    // resizable: true,
                     dataIndex: "credits",
                     key: "credits",
+					width:100,
+					sorter: true,
                 },
-				{
+                {
                     title: 'User Type',
                     align: "center",
-                    ellipsis: true,
-					// width: 150,
-					// minWidth: 100,
-        			// maxWidth: 200,
-					// resizable: true,
+                    // width: 150,
+                    // minWidth: 100,
+                    // maxWidth: 200,
+                    // resizable: true,
                     dataIndex: "systemUser",
                     key: "systemUser",
-					customRender: (record: any) => {
-                        let str
-						if(record.value == 0){
-							str ='visitor'
-						}else if(record.value == 1){
-							str ='yearly'
-						}else if(record.value == 2){
-							str ='monthly'
-						}else if(record.value == 3){
-							str ='trial'
-						}else if(record.value == 4){
-							str ='userInEvent'
-						}
+					width:100,
+                    customRender: (record: any) => {
+                        let str;
+                        if (record.value == 0) {
+                            str = "visitor";
+                        } else if (record.value == 1) {
+                            str = "yearly";
+                        } else if (record.value == 2) {
+                            str = "monthly";
+                        } else if (record.value == 3) {
+                            str = "trial";
+                        } else if (record.value == 4) {
+                            str = "userInEvent";
+                        }
                         return str;
                     },
                 },
-				
             ];
         });
 		//改变页码
-		let changePage = (e: any) => {
+        let changePage = (e: any, filters:any, sorter:any) => {
             filterData.currentPage = e.current;
             filterData.pageSize = e.pageSize;
-            // gettrialList();
+			if(sorter.order){
+				if(sorter.columnKey == 'id'){
+					filterData.orderBy = 'id'
+				}else if(sorter.columnKey == "createDate"){
+					filterData.orderBy = 'time'
+				}else if(sorter.columnKey == "credits"){
+					filterData.orderBy = 'credits'
+				}
+			}
+			filterData.order = sorter.order == "descend" ? "Descending" : "Ascending";
+            gettrialList();
         }
 
         //查询列表
@@ -257,9 +279,11 @@ export default defineComponent({
 				startTime:startDate,
 				size:filterData.pageSize,
 				page:filterData.currentPage,
-				userType:filterData.userType,
+				systemUser:filterData.systemUser,
+				order: filterData.order,
+                orderBy: filterData.orderBy,
 			}
-			Https.axiosGet(Https.httpUrls.recentNewUser,{params:data}).then((rv: any) => {
+			Https.axiosPost(Https.httpUrls.recentNewUser,data).then((rv: any) => {
 				if (rv) {
 					// this.dataList = rv
 					filter.dataList = rv.records
diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue
index bcccda81..340b2224 100644
--- a/src/component/Detail/DesignDetailAlter.vue
+++ b/src/component/Detail/DesignDetailAlter.vue
@@ -468,6 +468,7 @@ export default defineComponent({
 			// return this.setGradientAngle(gradient)
 			return (gradient)=>{
 				let gradientStr = ''
+				if(!gradient.gradientList)return
 				gradient.gradientList.sort((a, b) => {
 					let aArr = a.left.split('%')[0]
 					let bArr = b.left.split('%')[0]
@@ -917,7 +918,7 @@ export default defineComponent({
 				this.colorList[this.selectIndex].gradient = JSON.parse(JSON.stringify(this.gradient))
 			}else{
 				this.selectColor = {rgba:this.colorList[this.selectIndex].gradient.gradientList[0].rgba}
-				this.colorList[this.selectIndex].gradient = {}
+				this.colorList[this.selectIndex].gradient = null
 			}
 			let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
 		},
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index f64d6ebb..f68d847a 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -281,6 +281,7 @@ export default defineComponent({
 			// return this.setGradientAngle(gradient)
 			return (gradient)=>{
 				let gradientStr = ''
+				if(!gradient.gradientList)return
 				gradient.gradientList.sort((a, b) => {
 					let aArr = a.left.split('%')[0]
 					let bArr = b.left.split('%')[0]
@@ -771,7 +772,7 @@ export default defineComponent({
 				this.colorList[this.selectIndex].gradient = JSON.parse(JSON.stringify(this.gradient))
 			}else{
 				this.selectColor = {rgba:this.colorList[this.selectIndex].gradient.gradientList[0].rgba}
-				this.colorList[this.selectIndex].gradient = {}
+				this.colorList[this.selectIndex].gradient = null
 			}
 			let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
 			this.setColorboardList(colorList)
diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue
index 5fa08fa7..e10ae515 100644
--- a/src/views/Administrator.vue
+++ b/src/views/Administrator.vue
@@ -131,7 +131,7 @@ export default defineComponent({
 			isShow:true,
 			children:[
 				{
-					name:'Trial All User',
+					name:'All Trial User',
 					route:'/administrator/trialAllUser',
 					icon:'usetime',
 					key:'sub3-1',
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 89d0cfac..e79c447e 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -330,6 +330,7 @@ export default defineComponent({
 			this.store.commit('clearSystemUser')
 
 			// WriteCookie("token");
+			clonAllCookie()
 			// window.location.reload()
             
         },