diff --git a/.env.dev b/.env.dev index d429345a..dd5ff006 100644 --- a/.env.dev +++ b/.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' diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 7bf2dac3..ed13c331 100644 --- a/src/assets/style/style.css +++ b/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; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 4a1ac6a4..5b1d3d3e 100644 --- a/src/assets/style/style.less +++ b/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; diff --git a/src/component/Administrator/TestClickData.vue b/src/component/Administrator/TestClickData.vue index 61c2762a..c49ae706 100644 --- a/src/component/Administrator/TestClickData.vue +++ b/src/component/Administrator/TestClickData.vue @@ -111,8 +111,57 @@ export default defineComponent({ title: 'Frequency', align: "center", ellipsis: true, - dataIndex: "useDesignTimes", - key: "useDesignTimes", + dataIndex: "designTimes", + 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: { diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index 009125b8..9bca8ca1 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -1,6 +1,6 @@