管理员页面调整

.env.dev

@@ -3,6 +3,6 @@ NODE_ENV = 'development'
 # VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 
 # VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
-VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
+# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VUE_APP_BASE_URL = 'http://192.168.1.9:17088'
-# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
+VUE_APP_BASE_URL = 'http://192.168.1.7:5567'

src/assets/style/style.css

@@ -858,6 +858,8 @@ li {
   height: 100%;
   overflow: hidden;
   position: relative;
+  display: flex;
+  flex-direction: column;
 }
 .admin_page .admin_table_search {
   margin-top: 2rem;

src/assets/style/style.less

@@ -987,7 +987,8 @@ input:focus{
     overflow: hidden;
     // min-width: 1440px;
     position: relative;
-	
+	display: flex;
+    flex-direction: column;
 	.admin_table_search {
 		display: flex;
 		margin-top: 2rem;

src/component/Administrator/TestClickData.vue

@@ -111,8 +111,57 @@ export default defineComponent({
                     title: 'Frequency',
                     align: "center",
                     ellipsis: true,
-                    dataIndex: "useDesignTimes",
+                    dataIndex: "designTimes",
-                    key: "useDesignTimes",
+                    key: "designTimes",
+                },
+				{
+                    title: 'Country',
+                    align: "center",
+                    ellipsis: true,
+                    dataIndex: "country",
+                    key: "country",
+                },
+				{
+                    title: 'Title',
+                    align: "center",
+                    ellipsis: true,
+                    dataIndex: "title",
+                    key: "title",
+                },
+				{
+                    title: 'Surname',
+                    align: "center",
+                    ellipsis: true,
+                    dataIndex: "surname",
+                    key: "surname",
+                },
+				{
+                    title: 'Given Name',
+                    align: "center",
+                    ellipsis: true,
+                    dataIndex: "givenName",
+                    key: "givenName",
+                },
+				{
+                    title: 'Create Time',
+                    align: "center",
+                    ellipsis: true,
+                    dataIndex: "createTime",
+                    key: "createTime",
+                },
+				{
+                    title: 'Occupation',
+                    align: "center",
+                    ellipsis: true,
+                    dataIndex: "occupation",
+                    key: "occupation",
+                },
+				{
+                    title: 'Trial Order Id',
+                    align: "center",
+                    ellipsis: true,
+                    dataIndex: "trialOrderId",
+                    key: "trialOrderId",
                 },
             ];
         });
@@ -157,7 +206,7 @@ export default defineComponent({
     },
     mounted() {
         let historyTable: any = this.$refs.historyTable;
-        this.historyTableHeight = historyTable.clientHeight - 130;
+        this.historyTableHeight = historyTable.clientHeight - 200;
         this.gettrialList();
     },
     methods: {

src/component/Administrator/allUser.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="allUser_page">
+    <div class="admin_page">
-		<div class="allUser_table_search">
+		<div class="admin_table_search">
 		</div>
 
 		<div class="allUser_table_content" ref="historyTable">
@@ -120,7 +120,7 @@ export default defineComponent({
     },
     mounted() {
         let historyTable: any = this.$refs.historyTable;
-        this.historyTableHeight = historyTable.clientHeight - 130;
+        this.historyTableHeight = historyTable.clientHeight - 200;
         this.gettrialList();
 		let userInfo:any = getCookie("userInfo")
         this.userInfo = JSON.parse(userInfo);
@@ -151,85 +151,13 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
-.allUser_page {
+.admin_page {
     width: 100%;
     height: 100%;
     overflow: hidden;
     // min-width: 1440px;
     position: relative;
 	
-	.allUser_table_search {
-		display: flex;
-		margin-top: 2rem;
-		padding: 2rem 3.5rem 5rem 2.8rem;
-		background: #fff;
-		display: flex;
-		justify-content: space-between;
-		.allUser_search{
-			width: 40%;
-			.allUser_search_item{
-				background: #343579;
-				border-color: #343579;
-				height: 4rem;
-				padding: .64rem 1.5rem;
-				font-size: 1.6rem;
-				border-radius: 2px;
-				display: inline-block;
-				color: #fff;
-				cursor: pointer;
-			}
-		}
-		.allUser_state {
-			position: relative;
-			cursor: pointer;
-			width: 60%;
-			.allUser_state_item{
-				margin-right: 2rem;
-				margin-bottom: 2rem;
-				display: flex;
-				align-items: center;
-				>span{
-					font-size: 1.6rem;
-					font-weight: 400;
-					color: #030303;
-					margin-right: 15px;
-					flex-shrink: 0;
-					display: block;
-					min-width: 13rem;
-					text-align: right;
-				}
-			}
-			.allUser_current{
-				background: #fff;
-				width: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-			}
-			.header_user_content {
-				position: absolute;
-				border: 2px solid;
-				border-radius: 1rem;
-				overflow: hidden;
-				top: 0;
-				transform: translateY(6rem);
-				z-index: 2;
-				display: none;
-				margin-left: -2rem;
-				.username{
-					padding: 0 2rem;
-					color: #000;
-				}
-				.username:hover{
-					background: #e1e1e1;
-				}
-				&.active{
-					display: block;
-				}
-			}
-		}
-	}
-
 	.allUser_table_content {
 		margin-top: 2.6rem;
 		width: 100%;

src/component/Administrator/trialApproval.vue

@@ -16,7 +16,7 @@
 			</div>
 		</div>
 
-		<div class="admin_table_content" ref="historyTable">
+		<div class="allUser_table_content" ref="historyTable">
 			<a-table
 				:columns="columns"
 				:data-source="collectionList"
@@ -81,7 +81,7 @@ export default defineComponent({
                     title: 'Email',
                     align: "center",
                     ellipsis: true,
-                    width: 70,
+                    width: 100,
                     dataIndex: "email",
                     key: "email",
                 },
@@ -205,7 +205,7 @@ export default defineComponent({
     },
     mounted() {
         let historyTable: any = this.$refs.historyTable;
-        this.historyTableHeight = historyTable.clientHeight - 130;
+        this.historyTableHeight = historyTable.clientHeight - 200;
         this.gettrialList();
 		let userInfo:any = getCookie("userInfo")
         this.userInfo = JSON.parse(userInfo);