From 7da913090d104956e2a1339d9fe99e9a414874f3 Mon Sep 17 00:00:00 2001
From: zzy <1837289056@qq.com>
Date: Mon, 17 Apr 2023 14:33:48 +0800
Subject: [PATCH] 1

---
 src/locales/en.ts               |  2 +-
 src/views/IpoCalendar/index.vue | 20 +++++++++++++------
 src/views/dashBoard/index.vue   |  2 +-
 src/views/login/index.vue       | 34 ++++++++++++++++++++-------------
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/locales/en.ts b/src/locales/en.ts
index 6ac5b28..6b72f52 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -42,7 +42,7 @@ export default {
         Institutional:'Institutional',
         TotalOfferShares:'Total Offer Shares',
         FinalAllocation:'Final Allocation',
-        Listingdate:'Listing date',
+        Listingdate:'Listing Date',
         QuantityMillion:'Quantity (Million)',
         Ratio:'Ratio'
     },
diff --git a/src/views/IpoCalendar/index.vue b/src/views/IpoCalendar/index.vue
index 2dc7581..6ce82e7 100644
--- a/src/views/IpoCalendar/index.vue
+++ b/src/views/IpoCalendar/index.vue
@@ -13,7 +13,6 @@
                     <el-button size="small" @click="selectDate('prev-month')">
                         <img src="@/assets/1x/source11.png">
                     </el-button>
-
                     <!-- <span class="month">{{ date.split(' ').slice(-1).join() }}</span> -->
                     <span class="month">{{ showMounth(date) }}</span>
 
@@ -96,7 +95,7 @@ const backRouter = () => {
         background-color: #1f4055;
         z-index: 1;
         border: #1f4055 1px solid;
-
+        
         .right-top {
             display: flex;
             // margin-left: 40px;
@@ -144,7 +143,7 @@ const backRouter = () => {
             width: 90vw;
             background-color: #ffffff;
             height: 40vh;
-            margin-top: 150px;
+            margin-top: 12vh;
             // margin-left: 20px;
             // text-align: center;
             // line-height: 500px;
@@ -196,9 +195,17 @@ const backRouter = () => {
 
     :deep(.el-calendar__body) {
         background-color: #e8ebee;
-
+        height: 40vh;
     }
-
+:deep(.el-calendar-table thead th){
+    padding:2px 0;
+    font-weight: 550;
+}
+:deep(.el-calendar-table){
+    margin-top: 20rem;
+    width: 375rem;
+    transform: translateX(-19rem);
+}
     :deep(.el-calendar) {
         width: 100vw;
         font-family: "Calibri";
@@ -217,7 +224,7 @@ const backRouter = () => {
         background-color: rgb(255, 255, 255);
         height: 33px;
         border: none;
-        margin-top: 30px;
+        margin-top: 25px;
         display: flex;
         justify-content: center;
         align-items: center;
@@ -256,5 +263,6 @@ const backRouter = () => {
     :deep(.is-selected) {
         color: red;
     }
+    
 }
 </style>
\ No newline at end of file
diff --git a/src/views/dashBoard/index.vue b/src/views/dashBoard/index.vue
index 25398ea..f33273b 100644
--- a/src/views/dashBoard/index.vue
+++ b/src/views/dashBoard/index.vue
@@ -1131,7 +1131,7 @@ const showMounth = (date: any) => {
 
 :deep(.el-calendar-table) {
   width: 450px;
-  background-color: red !important;
+  // background-color: red !important;
   padding-left: 10px 75px 27px !important;
   cursor: default;
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index fe33d7e..4b4606f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -200,10 +200,10 @@ const getHomeIpoList = async () => {
             // const res = await getDataFromId('home');
             // const data = (res as any).map((item: any) => {
             const data = (res as any).data.map((item: any) => {
-                let { stkCode, dateTime, status, ipoID, companyEngShort, companyChiShort, priceFinal, logoLink, priceMin, priceMax, listingDate, pricingDate } = item;
+                let { stkCode, dateTime, status, ipoID, companyEngFull, companyChiFull, priceFinal, logoLink, priceMin, priceMax, listingDate, pricingDate } = item;
                 return {
                     logolinks: logoLink,
-                    title: companyEngShort + ";" + companyChiShort,
+                    title: companyEngFull + ";" + companyChiFull,
                     status: status,
                     number: stkCode,
                     HKD: priceFinal ? priceFinal : priceMinMax(),
@@ -214,9 +214,9 @@ const getHomeIpoList = async () => {
                 }
                 function priceMinMax() {
                     if (priceMin && priceMax) {
-                        return `${priceMin}-${priceMax}`
+                        return `${priceMin} - ${priceMax}`
                     } else if (priceMin) {
-                        return `${priceMin}-`
+                        return `${priceMin} - `
                     } else if (priceMax) {
                         return ` -${priceMax}`
                     } else {
@@ -256,13 +256,13 @@ const getSearchIpoList = async (keyword: string) => {
                     throw ("222")
                 }
                 const data = (res as any).data.map((item: any) => {
-                    let { stkCode, dateTime, status, ipoID, companyEngShort, companyChiShort, priceFinal, logoLink, priceMin, priceMax, listingDate, pricingDate } = item;
+                    let { stkCode, dateTime, status, ipoID, companyEngFull, companyChiFull, priceFinal, logoLink, priceMin, priceMax, listingDate, pricingDate } = item;
                     return {
                         logolinks: logoLink,
-                        title: companyEngShort + ";" + companyChiShort,
+                        title: companyEngFull + ";" + companyChiFull,
                         status: status,
                         number: stkCode,
-                        HKD: priceFinal ? priceFinal : priceMinMax(),
+                        HKD: priceFinal ? priceFinal.toFixed(3) : priceMinMax(),
                         time: listingDate ? listingDate : pricingDate,
                         ipoID: ipoID,
                         price: priceFinal,
@@ -270,11 +270,11 @@ const getSearchIpoList = async (keyword: string) => {
                     }
                     function priceMinMax() {
                         if (priceMin && priceMax) {
-                            return `${priceMin}-${priceMax}`
+                            return `${priceMin.toFixed(3)} - ${priceMax.toFixed(3)}`
                         } else if (priceMin) {
-                            return `${priceMin}-`
+                            return `${priceMin.toFixed(3)} - `
                         } else if (priceMax) {
-                            return ` -${priceMax}`
+                            return ` -${priceMax.toFixed(3)}`
                         } else {
                             return " - "
                         }
@@ -753,14 +753,18 @@ const showMounth = (date: any) => {
     }
 
 }
-
+:deep(.el-calendar-table){
+    width: 420px;
+    transform: translateX(-20px);
+    margin-top: 20px;
+}
 :deep(.el-button--small) {
     border: none
 }
 
 :deep(.el-calendar__body) {
     background-color: #e8ebee;
-
+    height: 385px;
 }
 
 :deep(.el-calendar) {
@@ -795,8 +799,12 @@ const showMounth = (date: any) => {
 :deep(.el-calendar-table td) {
     border: none;
     text-align: center;
+    font-weight: 800;
+}
+:deep(.el-calendar-table thead th ){
+    padding:2px;
+    font-weight: 550px;
 }
-
 :deep(.el-calendar .el-calendar-table .el-calendar-day) {
     padding: 0px;
     text-align: center;