瀏覽代碼

:lipstick: 样式美化

Ritchie 1 年之前
父節點
當前提交
4a0c2a3a0d
共有 38 個文件被更改,包括 130 次插入649 次删除
  1. 3 2
      src/App.vue
  2. 二進制
      src/assets/font/OPPOSans-Bold.ttf
  3. 二進制
      src/assets/font/OPPOSans-Medium.ttf
  4. 二進制
      src/assets/font/OPPOSans-Regular.ttf
  5. 13 0
      src/assets/font/font.css
  6. 二進制
      src/assets/home/marketData.png
  7. 二進制
      src/assets/home/positionIcon.png
  8. 二進制
      src/assets/home/rankingList.png
  9. 二進制
      src/assets/home/tradingIcon.png
  10. 二進制
      src/assets/trading/pendingOrder.png
  11. 1 1
      src/common/style/common.less
  12. 1 1
      src/common/style/mixin.less
  13. 3 2
      src/main.js
  14. 1 1
      src/styles/accountPer/index.less
  15. 1 1
      src/styles/advertManage/index.less
  16. 1 1
      src/styles/alarmHistory/index.less
  17. 1 1
      src/styles/buyConfList/index.less
  18. 1 1
      src/styles/discountCode/index.less
  19. 3 3
      src/styles/home/homeRank5.less
  20. 42 17
      src/styles/home/index.less
  21. 6 6
      src/styles/merchantManage/index.less
  22. 14 14
      src/styles/orderCenter/index.less
  23. 4 4
      src/styles/orderExport/index.less
  24. 1 1
      src/styles/pendingOrderList/index.less
  25. 5 4
      src/styles/position/index.less
  26. 0 549
      src/styles/position/index1.less
  27. 1 1
      src/styles/role/index.less
  28. 1 1
      src/styles/sellConfList/index.less
  29. 1 1
      src/styles/taskAccountList/index.less
  30. 1 1
      src/styles/taskMessage/index.less
  31. 10 8
      src/styles/trading/index.less
  32. 1 1
      src/styles/transactionList/index.less
  33. 2 1
      src/views/home/HomeIndex.vue
  34. 1 1
      src/views/position/PositionIndex.vue
  35. 1 1
      src/views/taskMessage/index.less
  36. 3 13
      src/views/test/Child.vue
  37. 4 8
      src/views/test/Father.vue
  38. 3 3
      src/views/trading/TradingIndex.vue

+ 3 - 2
src/App.vue

@@ -70,6 +70,7 @@ export default {
 // width: calc(100% - 70px);
 // width: calc(100% - 70px);
 /* 导入全局样式 */
 /* 导入全局样式 */
 @import "./common/style/global.less";
 @import "./common/style/global.less";
+@import "./assets/font/font.css";
 
 
 // 改变vant的全局样式
 // 改变vant的全局样式
 :root {
 :root {
@@ -115,7 +116,7 @@ span,
 // }
 // }
 p {
 p {
   // color: #333333;
   // color: #333333;
-  font-family: "Arial", sans-serif;
+  font-family: 'OPPOSans', "Arial", sans-serif;
 }
 }
 
 
 html {
 html {
@@ -131,7 +132,7 @@ body {
 
 
 #app {
 #app {
   height: 100%;
   height: 100%;
-  font-family: "Avenir", Helvetica, Arial, sans-serif;
+  font-family: 'OPPOSans', "Avenir", Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
   // text-align: center;
   // text-align: center;

二進制
src/assets/font/OPPOSans-Bold.ttf


二進制
src/assets/font/OPPOSans-Medium.ttf


二進制
src/assets/font/OPPOSans-Regular.ttf


+ 13 - 0
src/assets/font/font.css

@@ -0,0 +1,13 @@
+@font-face {
+    font-family: "OPPOSans";
+    src: url('OPPOSans-Regular.ttf');
+}
+@font-face {
+    /* 自定义的字体名称,调用该字体时使用 */
+    /* font-family:"Smiley_Sans_Oblique_斜体";*/
+    font-family: "OPPOSans";
+    /* 引用字体包,.ttf后缀不区分大小写,用.TTF也可以 */
+    src: url('OPPOSans-Regular.ttf'); 
+    font-weight: normal;
+    font-style: normal;
+}

二進制
src/assets/home/marketData.png


二進制
src/assets/home/positionIcon.png


二進制
src/assets/home/rankingList.png


二進制
src/assets/home/tradingIcon.png


二進制
src/assets/trading/pendingOrder.png


+ 1 - 1
src/common/style/common.less

@@ -4,7 +4,7 @@ body * {
 }
 }
 
 
 body {
 body {
-  font-family: PingFangSC-Regular, Roboto, Helvetica Neue, Helvetica, Tahoma,
+  font-family: 'OPPOSans', PingFangSC-Regular, Roboto, Helvetica Neue, Helvetica, Tahoma,
     Arial, PingFang SC-Light, Microsoft YaHei;
     Arial, PingFang SC-Light, Microsoft YaHei;
 }
 }
 
 

+ 1 - 1
src/common/style/mixin.less

@@ -92,7 +92,7 @@ body * {
   // flex-shrink: 0;
   // flex-shrink: 0;
 }
 }
 body {
 body {
-  font-family: PingFangSC-Regular, Roboto, Helvetica Neue, Helvetica, Tahoma,
+  font-family: 'OPPOSans', PingFangSC-Regular, Roboto, Helvetica Neue, Helvetica, Tahoma,
     Arial, PingFang SC-Light, Microsoft YaHei;
     Arial, PingFang SC-Light, Microsoft YaHei;
 }
 }
 button {
 button {

+ 3 - 2
src/main.js

@@ -79,8 +79,9 @@ import router from "./router";
 import "lib-flexible/flexible";
 import "lib-flexible/flexible";
 import "vant/lib/index.css"; // 全局引入样式
 import "vant/lib/index.css"; // 全局引入样式
 import "@vant/touch-emulator";
 import "@vant/touch-emulator";
-// 导入语言
-import i18n from "./utils/i18n";
+import i18n from "./utils/i18n"; // 导入语言
+import "@/assets/font/font.css"; // 引入字体
+
 
 
 const app = createApp(App); // 创建实例
 const app = createApp(App); // 创建实例
 const pinia = createPinia()
 const pinia = createPinia()

+ 1 - 1
src/styles/accountPer/index.less

@@ -31,7 +31,7 @@
                     overflow-wrap: break-word;
                     overflow-wrap: break-word;
                     color: rgba(64, 77, 116, 1);
                     color: rgba(64, 77, 116, 1);
                     font-size: 15px;
                     font-size: 15px;
-                    font-family: PingFangSC-Semibold;
+                    font-family: 'OPPOSans', PingFangSC-Semibold;
                     text-align: left;
                     text-align: left;
                     white-space: nowrap;
                     white-space: nowrap;
                     line-height: 15px;
                     line-height: 15px;

+ 1 - 1
src/styles/advertManage/index.less

@@ -29,7 +29,7 @@
                     overflow-wrap: break-word;
                     overflow-wrap: break-word;
                     color: rgba(64, 77, 116, 1);
                     color: rgba(64, 77, 116, 1);
                     font-size: 15px;
                     font-size: 15px;
-                    font-family: PingFangSC-Semibold;
+                    font-family: 'OPPOSans', PingFangSC-Semibold;
                     text-align: left;
                     text-align: left;
                     white-space: nowrap;
                     white-space: nowrap;
                     line-height: 15px;
                     line-height: 15px;

+ 1 - 1
src/styles/alarmHistory/index.less

@@ -33,7 +33,7 @@
                     overflow-wrap: break-word;
                     overflow-wrap: break-word;
                     color: rgba(64, 77, 116, 1);
                     color: rgba(64, 77, 116, 1);
                     font-size: 15px;
                     font-size: 15px;
-                    font-family: PingFangSC-Semibold;
+                    font-family: 'OPPOSans', PingFangSC-Semibold;
                     text-align: left;
                     text-align: left;
                     white-space: nowrap;
                     white-space: nowrap;
                     line-height: 15px;
                     line-height: 15px;

+ 1 - 1
src/styles/buyConfList/index.less

@@ -116,7 +116,7 @@
             overflow-wrap: break-word;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
             color: rgba(64, 77, 116, 1);
             font-size: 15px;
             font-size: 15px;
-            font-family: PingFangSC-Semibold;
+            font-family: 'OPPOSans', PingFangSC-Semibold;
             text-align: left;
             text-align: left;
             white-space: nowrap;
             white-space: nowrap;
             line-height: 15px;
             line-height: 15px;

+ 1 - 1
src/styles/discountCode/index.less

@@ -33,7 +33,7 @@
                     overflow-wrap: break-word;
                     overflow-wrap: break-word;
                     color: rgba(64, 77, 116, 1);
                     color: rgba(64, 77, 116, 1);
                     font-size: 15px;
                     font-size: 15px;
-                    font-family: PingFangSC-Semibold;
+                    font-family: 'OPPOSans', PingFangSC-Semibold;
                     text-align: left;
                     text-align: left;
                     white-space: nowrap;
                     white-space: nowrap;
                     line-height: 15px;
                     line-height: 15px;

+ 3 - 3
src/styles/home/homeRank5.less

@@ -98,7 +98,7 @@
       .van-divider {
       .van-divider {
         margin-top: 5px;
         margin-top: 5px;
         font-weight: bold;
         font-weight: bold;
-        color: rgb(255, 95, 122);
+        color: #ff5d88;
       }
       }
 
 
       .bold-row .van-col {
       .bold-row .van-col {
@@ -116,12 +116,12 @@
       max-width: 600px;
       max-width: 600px;
       text-align: center;
       text-align: center;
       box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2); /* 添加阴影效果 */
       box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2); /* 添加阴影效果 */
-      font-family: 'Roboto', sans-serif; /* 设置页面默认字体为Roboto */
+      font-family: 'OPPOSans', 'Roboto', sans-serif; /* 设置页面默认字体为 OPPOSans */
 
 
       .van-divider {
       .van-divider {
         margin-top: 5px;
         margin-top: 5px;
         font-weight: bold;
         font-weight: bold;
-        color: rgb(125, 205, 5);
+        color: #39a6fe;
       }
       }
 
 
       .bold-row .van-col {
       .bold-row .van-col {

+ 42 - 17
src/styles/home/index.less

@@ -1,3 +1,13 @@
+:root {
+  --color1: #fc4655;
+  --color2: #ffc711;
+  --color3: #33ff2f;
+  --color4: #01f8fc;
+  --color5: #4b78ff;
+  --color6: #b433ff;
+  --color7: #ff25ed;
+}
+
 .homePage {
 .homePage {
   .homeBox {
   .homeBox {
     width: 100%;
     width: 100%;
@@ -11,6 +21,17 @@
       background-color: #f5f5f5;
       background-color: #f5f5f5;
     }
     }
 
 
+    @keyframes colorCycle {
+      0% { color: var(--color1); }
+      14.28% { color: var(--color2); }
+      28.57% { color: var(--color3); }
+      42.86% { color: var(--color4); }
+      57.14% { color: var(--color5); }
+      71.43% { color: var(--color6); }
+      85.71% { color: var(--color7); }
+      100% { color: var(--color1); }
+    }
+
     .nameDeviceRow {
     .nameDeviceRow {
       width: 100%;
       width: 100%;
       height: 40px;
       height: 40px;
@@ -19,9 +40,9 @@
       background: url("../../assets/home/line.png") bottom center no-repeat;
       background: url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100% auto;
       background-size: 100% auto;
       font-size: 11px;
       font-size: 11px;
-      color: rgba(135, 135, 166, 1);
+      // color: rgba(135, 135, 166, 1);
       text-align: left;
       text-align: left;
-      font-family: PingFangSC-Medium;
+      font-family: 'OPPOSans', PingFangSC-Medium;
       justify-content: space-between;
       justify-content: space-between;
       padding: 0 15px;
       padding: 0 15px;
 
 
@@ -36,11 +57,13 @@
         // flex:1;
         // flex:1;
         height: 16px;
         height: 16px;
         overflow-wrap: break-word;
         overflow-wrap: break-word;
-        color: rgba(64, 77, 116, 1);
+        // color: rgba(64, 77, 116, 1);
         font-size: 15px;
         font-size: 15px;
         white-space: nowrap;
         white-space: nowrap;
         line-height: 16px;
         line-height: 16px;
         display: block;
         display: block;
+        animation: colorCycle 10s infinite;
+        will-change: color;
       }
       }
 
 
       .info3 {
       .info3 {
@@ -75,9 +98,9 @@
         height: 25px;
         height: 25px;
 
 
         .section5 {
         .section5 {
-          width: 14px;
-          height: 16px;
-          background: url("../../assets/home/titleIcon.png") top center no-repeat;
+          width: 17px;
+          height: 17px;
+          background: url("../../assets/home/marketData.png") top center no-repeat;
           background-size: 100%;
           background-size: 100%;
           margin-left: 15px;
           margin-left: 15px;
         }
         }
@@ -93,7 +116,8 @@
             overflow-wrap: break-word;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
             color: rgba(64, 77, 116, 1);
             font-size: 14px;
             font-size: 14px;
-            font-family: PingFangSC-Semibold;
+            font-family: 'OPPOSans', PingFangSC-Semibold;
+            font-weight: bold;
             text-align: left;
             text-align: left;
             white-space: nowrap;
             white-space: nowrap;
             line-height: 14px;
             line-height: 14px;
@@ -162,7 +186,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 14px;
               font-size: 14px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 20px;
               line-height: 20px;
@@ -175,7 +199,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 22px;
               font-size: 22px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 30px;
               line-height: 30px;
@@ -212,7 +236,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 22px;
               font-size: 22px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 30px;
               line-height: 30px;
@@ -247,7 +271,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 22px;
               font-size: 22px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 30px;
               line-height: 30px;
@@ -291,14 +315,14 @@
           width: 78px;
           width: 78px;
 
 
           .wrap2 {
           .wrap2 {
-            width: 78px;
-            height: 14px;
+            width: 50px;
+            height: 17px;
 
 
             .outer10 {
             .outer10 {
               z-index: 2;
               z-index: 2;
               position: relative;
               position: relative;
-              width: 14px;
-              height: 14px;
+              width: 19px;
+              height: 19px;
               border: 2px rgba(128, 150, 236, 1);
               border: 2px rgba(128, 150, 236, 1);
               background: url("../../assets/home/rankingList.png") center no-repeat;
               background: url("../../assets/home/rankingList.png") center no-repeat;
               background-size: 100%;
               background-size: 100%;
@@ -314,10 +338,11 @@
                 overflow-wrap: break-word;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
                 color: rgba(64, 77, 116, 1);
                 font-size: 14px;
                 font-size: 14px;
-                font-family: PingFangSC-Semibold;
+                font-family: 'OPPOSans', PingFangSC-Semibold;
+                font-weight: bold;
                 text-align: left;
                 text-align: left;
                 white-space: nowrap;
                 white-space: nowrap;
-                line-height: 14px;
+                line-height: 21px;
                 display: block;
                 display: block;
               }
               }
             }
             }

+ 6 - 6
src/styles/merchantManage/index.less

@@ -24,7 +24,7 @@
                     overflow-wrap: break-word;
                     overflow-wrap: break-word;
                     color: rgba(64, 77, 116, 1);
                     color: rgba(64, 77, 116, 1);
                     font-size: 15px;
                     font-size: 15px;
-                    font-family: PingFangSC-Semibold;
+                    font-family: 'OPPOSans', PingFangSC-Semibold;
                     text-align: left;
                     text-align: left;
                     white-space: nowrap;
                     white-space: nowrap;
                     line-height: 15px;
                     line-height: 15px;
@@ -36,7 +36,7 @@
                     overflow-wrap: break-word;
                     overflow-wrap: break-word;
                     color: #c84b2c;
                     color: #c84b2c;
                     font-size: 20px;
                     font-size: 20px;
-                    font-family: PingFangSC-Semibold;
+                    font-family: 'OPPOSans', PingFangSC-Semibold;
                     text-align: left;
                     text-align: left;
                     white-space: nowrap;
                     white-space: nowrap;
                     line-height: 20px;
                     line-height: 20px;
@@ -49,7 +49,7 @@
                     overflow-wrap: break-word;
                     overflow-wrap: break-word;
                     color: rgba(64, 77, 116, 1);
                     color: rgba(64, 77, 116, 1);
                     font-size: 15px;
                     font-size: 15px;
-                    font-family: PingFangSC-Semibold;
+                    font-family: 'OPPOSans', PingFangSC-Semibold;
                     text-align: left;
                     text-align: left;
                     white-space: nowrap;
                     white-space: nowrap;
                     line-height: 15px;
                     line-height: 15px;
@@ -98,7 +98,7 @@
                             overflow-wrap: break-word;
                             overflow-wrap: break-word;
                             color: rgba(64, 77, 116, 1);
                             color: rgba(64, 77, 116, 1);
                             font-size: 14px;
                             font-size: 14px;
-                            font-family: PingFangSC-Semibold;
+                            font-family: 'OPPOSans', PingFangSC-Semibold;
                             text-align: left;
                             text-align: left;
                             white-space: nowrap;
                             white-space: nowrap;
                             line-height: 14px;
                             line-height: 14px;
@@ -273,7 +273,7 @@
                             color: rgba(255, 52, 86, 1);
                             color: rgba(255, 52, 86, 1);
                             color: rgba(135, 135, 166, 1);
                             color: rgba(135, 135, 166, 1);
                             font-size: 14px;
                             font-size: 14px;
-                            font-family: PingFangSC-Semibold;
+                            font-family: 'OPPOSans', PingFangSC-Semibold;
                             text-align: center;
                             text-align: center;
                             white-space: nowrap;
                             white-space: nowrap;
                             line-height: 14px;
                             line-height: 14px;
@@ -343,7 +343,7 @@
                         overflow-wrap: break-word;
                         overflow-wrap: break-word;
                         color: rgba(223, 94, 76, 1);
                         color: rgba(223, 94, 76, 1);
                         font-size: 20px;
                         font-size: 20px;
-                        font-family: PingFangSC-Semibold;
+                        font-family: 'OPPOSans', PingFangSC-Semibold;
                         text-align: left;
                         text-align: left;
                         white-space: nowrap;
                         white-space: nowrap;
                         line-height: 28px;
                         line-height: 28px;

+ 14 - 14
src/styles/orderCenter/index.less

@@ -45,7 +45,7 @@
                 overflow-wrap: break-word;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
                 color: rgba(64, 77, 116, 1);
                 font-size: 15px;
                 font-size: 15px;
-                font-family: PingFangSC-Semibold;
+                font-family: 'OPPOSans', PingFangSC-Semibold;
                 text-align: left;
                 text-align: left;
                 white-space: nowrap;
                 white-space: nowrap;
                 line-height: 15px;
                 line-height: 15px;
@@ -97,7 +97,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 14px;
               font-size: 14px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 20px;
               line-height: 20px;
@@ -111,7 +111,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 22px;
               font-size: 22px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 30px;
               line-height: 30px;
@@ -148,7 +148,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 22px;
               font-size: 22px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 30px;
               line-height: 30px;
@@ -183,7 +183,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 22px;
               font-size: 22px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 30px;
               line-height: 30px;
@@ -256,7 +256,7 @@
                   overflow-wrap: break-word;
                   overflow-wrap: break-word;
                   color: rgba(64, 77, 116, 1);
                   color: rgba(64, 77, 116, 1);
                   font-size: 14px;
                   font-size: 14px;
-                  font-family: PingFangSC-Semibold;
+                  font-family: 'OPPOSans', PingFangSC-Semibold;
                   text-align: left;
                   text-align: left;
                   white-space: nowrap;
                   white-space: nowrap;
                   line-height: 12px;
                   line-height: 12px;
@@ -432,7 +432,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(77, 193, 147, 1);
               color: rgba(77, 193, 147, 1);
               font-size: 14px;
               font-size: 14px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               // line-height: 20px;
               // line-height: 20px;
@@ -446,7 +446,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(77, 193, 147, 1);
               color: rgba(77, 193, 147, 1);
               font-size: 20px;
               font-size: 20px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: left;
               text-align: left;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 30px;
               line-height: 30px;
@@ -675,7 +675,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(77, 193, 147, 1);
               color: rgba(77, 193, 147, 1);
               font-size: 14px;
               font-size: 14px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 20px;
               line-height: 20px;
@@ -689,7 +689,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(77, 193, 147, 1);
               color: rgba(77, 193, 147, 1);
               font-size: 22px;
               font-size: 22px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: left;
               text-align: left;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 30px;
               line-height: 30px;
@@ -783,7 +783,7 @@
                   overflow-wrap: break-word;
                   overflow-wrap: break-word;
                   color: rgba(223, 94, 76, 1);
                   color: rgba(223, 94, 76, 1);
                   font-size: 22px;
                   font-size: 22px;
-                  font-family: PingFangSC-Semibold;
+                  font-family: 'OPPOSans', PingFangSC-Semibold;
                   text-align: left;
                   text-align: left;
                   white-space: nowrap;
                   white-space: nowrap;
                   line-height: 30px;
                   line-height: 30px;
@@ -812,7 +812,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 14px;
               font-size: 14px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 20px;
               line-height: 20px;
@@ -984,7 +984,7 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               color: rgba(223, 94, 76, 1);
               font-size: 22px;
               font-size: 22px;
-              font-family: PingFangSC-Semibold;
+              font-family: 'OPPOSans', PingFangSC-Semibold;
               text-align: center;
               text-align: center;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 30px;
               line-height: 30px;
@@ -1226,7 +1226,7 @@
     .totalRefund {
     .totalRefund {
       color: #df5e4c;
       color: #df5e4c;
       font-size: 20px;
       font-size: 20px;
-      font-family: PingFangSC-Semibold;
+      font-family: 'OPPOSans', PingFangSC-Semibold;
     }
     }
 
 
   }
   }

+ 4 - 4
src/styles/orderExport/index.less

@@ -45,7 +45,7 @@
                                 overflow-wrap: break-word;
                                 overflow-wrap: break-word;
                                 color: rgba(64, 77, 116, 1);
                                 color: rgba(64, 77, 116, 1);
                                 font-size: 14px;
                                 font-size: 14px;
-                                font-family: PingFangSC-Semibold;
+                                font-family: 'OPPOSans', PingFangSC-Semibold;
                                 text-align: left;
                                 text-align: left;
                                 white-space: nowrap;
                                 white-space: nowrap;
                                 line-height: 14px;
                                 line-height: 14px;
@@ -103,7 +103,7 @@
                                             overflow-wrap: break-word;
                                             overflow-wrap: break-word;
                                             color: rgba(64, 77, 116, 1);
                                             color: rgba(64, 77, 116, 1);
                                             font-size: 14px;
                                             font-size: 14px;
-                                            font-family: PingFangSC-Semibold;
+                                            font-family: 'OPPOSans', PingFangSC-Semibold;
                                             text-align: left;
                                             text-align: left;
                                             white-space: nowrap;
                                             white-space: nowrap;
                                             line-height: 14px;
                                             line-height: 14px;
@@ -162,7 +162,7 @@
                         overflow-wrap: break-word;
                         overflow-wrap: break-word;
                         color: rgba(223, 94, 76, 1);
                         color: rgba(223, 94, 76, 1);
                         font-size: 14px;
                         font-size: 14px;
-                        font-family: PingFangSC-Semibold;
+                        font-family: 'OPPOSans', PingFangSC-Semibold;
                         text-align: center;
                         text-align: center;
                         white-space: nowrap;
                         white-space: nowrap;
                         line-height: 20px;
                         line-height: 20px;
@@ -176,7 +176,7 @@
                         overflow-wrap: break-word;
                         overflow-wrap: break-word;
                         color: rgba(223, 94, 76, 1);
                         color: rgba(223, 94, 76, 1);
                         font-size: 22px;
                         font-size: 22px;
-                        font-family: PingFangSC-Semibold;
+                        font-family: 'OPPOSans', PingFangSC-Semibold;
                         text-align: left;
                         text-align: left;
                         white-space: nowrap;
                         white-space: nowrap;
                         line-height: 30px;
                         line-height: 30px;

+ 1 - 1
src/styles/pendingOrderList/index.less

@@ -116,7 +116,7 @@
             overflow-wrap: break-word;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
             color: rgba(64, 77, 116, 1);
             font-size: 15px;
             font-size: 15px;
-            font-family: PingFangSC-Semibold;
+            font-family: 'OPPOSans', PingFangSC-Semibold;
             text-align: left;
             text-align: left;
             white-space: nowrap;
             white-space: nowrap;
             line-height: 15px;
             line-height: 15px;

+ 5 - 4
src/styles/position/index.less

@@ -21,7 +21,7 @@
             .outer4 {
             .outer4 {
               width: 0.4rem;
               width: 0.4rem;
               height: 0.4rem;
               height: 0.4rem;
-              background: url("../../assets/home/titleIcon.png") top center no-repeat;
+              background: url("../../assets/home/positionIcon.png") top center no-repeat;
               background-size: 100%;
               background-size: 100%;
             }
             }
 
 
@@ -38,7 +38,8 @@
               overflow-wrap: break-word;
               overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
               color: rgba(64, 77, 116, 1);
               font-size: 0.4rem;
               font-size: 0.4rem;
-              font-family: PingFangSC-Semibold;
+              font-family: 'Noto Sans SC', 'Segoe UI', -apple-system, BlinkMacSystemFont, sans-serif;
+              font-weight: bold;
               text-align: left;
               text-align: left;
               white-space: nowrap;
               white-space: nowrap;
               line-height: 0.4rem;
               line-height: 0.4rem;
@@ -85,7 +86,7 @@
                 .word5 {
                 .word5 {
                   height: 26px;
                   height: 26px;
                   overflow-wrap: break-word;
                   overflow-wrap: break-word;
-                  color: rgba(223, 94, 76, 1);
+                  color: #ff5d88;
                   font-size: 22px;
                   font-size: 22px;
                   font-family: Helvetica;
                   font-family: Helvetica;
                   text-align: center;
                   text-align: center;
@@ -97,7 +98,7 @@
                 .word6 {
                 .word6 {
                   height: 17px;
                   height: 17px;
                   overflow-wrap: break-word;
                   overflow-wrap: break-word;
-                  color: rgb(107, 107, 255);
+                  color: #39a6fe;
                   font-size: 12px;
                   font-size: 12px;
                   text-align: center;
                   text-align: center;
                   white-space: nowrap;
                   white-space: nowrap;

+ 0 - 549
src/styles/position/index1.less

@@ -1,549 +0,0 @@
-body * {
-  box-sizing: border-box;
-  flex-shrink: 0;
-}
-
-body {
-  font-family: PingFangSC-Regular, Roboto, Helvetica Neue, Helvetica, Tahoma,
-    Arial, PingFang SC-Light, Microsoft YaHei;
-}
-
-button {
-  margin: 0;
-  padding: 0;
-  border: 1px solid transparent;
-  outline: none;
-  background-color: transparent;
-}
-
-button:active {
-  opacity: 0.6;
-}
-
-.flex-col {
-  display: flex;
-  flex-direction: column;
-}
-
-.flex-row {
-  display: flex;
-  flex-direction: row;
-}
-
-.justify-start {
-  display: flex;
-  justify-content: flex-start;
-}
-
-.justify-center {
-  display: flex;
-  justify-content: center;
-}
-
-.justify-end {
-  display: flex;
-  justify-content: flex-end;
-}
-
-.justify-evenly {
-  display: flex;
-  justify-content: space-evenly;
-}
-
-.justify-around {
-  display: flex;
-  justify-content: space-around;
-}
-
-.justify-between {
-  display: flex;
-  justify-content: space-between;
-}
-
-.align-start {
-  display: flex;
-  align-items: flex-start;
-}
-
-.align-center {
-  display: flex;
-  align-items: center;
-}
-
-.align-end {
-  display: flex;
-  align-items: flex-end;
-}
-
-.group5 {
-  width: 15%;
-  height: 16px;
-  margin-right: 50px;
-
-  .icon2 {
-    width: 18px;
-    height: 18px;
-    margin-right: 5px;
-  }
-
-  .TextGroup2 {
-    height: 16px;
-    width: 22px;
-
-    .txt3 {
-      width: 22px;
-      height: 16px;
-      overflow-wrap: break-word;
-      color: rgba(64, 77, 116, 1);
-      font-size: 14px;
-      font-family: PingFangSC-Semibold;
-      text-align: center;
-      white-space: nowrap;
-      line-height: 16px;
-      display: block;
-    }
-  }
-}
-
-.position {
-  background-color: #fff;
-  width: 100%;
-  // height: calc(100vh - 100px);
-  position: relative;
-
-  .box1 {
-    width: 100%;
-    height: 100%;
-    height: calc(100% - 50px);
-    padding-bottom: 10px;
-    overflow: auto;
-    overflow-x: hidden;
-
-    .van-tabs__line {
-      background-color: #ff3456 !important;
-    }
-
-    .van-tab--active .van-tab__text--ellipsis {
-      color: #ff3456;
-    }
-
-    .box2 {
-      height: 64px;
-      background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPnged210ff8540d1e20d828b0758e650612a9ea018b41f720bede87fea0f933d8d8)
-        100% no-repeat;
-      width: 100%;
-
-      .layer1 {
-        width: 364px;
-        height: 20px;
-        margin: 1px 0 0 7px;
-
-        .group1 {
-          width: 34px;
-          height: 6px;
-          background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPnga64b2ae35561e96115c75cc6dfc235eedb108ecf95df957be1ef364417a9806e)
-            100% no-repeat;
-          margin-top: 7px;
-        }
-
-        .word1 {
-          width: 38px;
-          height: 17px;
-          overflow-wrap: break-word;
-          color: rgba(81, 84, 106, 1);
-          font-size: 12px;
-          font-family: PingFangSC-Semibold;
-          text-align: right;
-          white-space: nowrap;
-          line-height: 17px;
-          margin-left: 21px;
-          display: block;
-        }
-
-        .group2 {
-          width: 30px;
-          height: 17px;
-          overflow-wrap: break-word;
-          font-size: 0;
-          font-family: PingFangSC-Semibold;
-          text-align: right;
-          white-space: nowrap;
-          line-height: 17px;
-          margin: 3px 0 0 73px;
-
-          .info1 {
-            width: 30px;
-            height: 17px;
-            overflow-wrap: break-word;
-            color: rgba(81, 84, 106, 1);
-            font-size: 12px;
-            font-family: PingFangSC-Semibold;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 17px;
-          }
-
-          .word2 {
-            width: 30px;
-            height: 17px;
-            overflow-wrap: break-word;
-            color: rgba(81, 84, 106, 1);
-            font-size: 12px;
-            font-family: PingFangSC-Medium;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 17px;
-          }
-        }
-
-        .group3 {
-          width: 26px;
-          height: 10px;
-          background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng2e68dee6e62554db0f6ac40572f41b7be9cc24d35fc06b24c556fed2b7b18626)
-            100% no-repeat;
-          margin: 5px 0 0 142px;
-        }
-      }
-
-      .layer2 {
-        width: 218px;
-        height: 22px;
-        margin: 9px 0 12px 10px;
-
-        .label1 {
-          width: 10px;
-          height: 18px;
-          margin-top: 4px;
-        }
-
-        .txt1 {
-          width: 80px;
-          height: 22px;
-          overflow-wrap: break-word;
-          color: rgba(64, 77, 116, 1);
-          font-size: 16px;
-          font-family: PingFangSC-Medium;
-          text-align: center;
-          white-space: nowrap;
-          line-height: 22px;
-          display: block;
-        }
-      }
-    }
-
-    .box3 {
-      background-color: rgba(255, 255, 255, 1);
-      height: 100%;
-      margin-top: 1px;
-      width: 100%;
-
-      .main1 {
-        width: 100%;
-        height: 100%;
-
-        .groove {
-          height: 10px;
-          width: 100%;
-          background-color: #f5f5f5;
-        }
-
-        .mod1 {
-          .section1 {
-            margin: 15px 15px;
-
-            .ImageText1 {
-              height: 16px;
-              margin-top: 1px;
-              width: 55%;
-
-              .group4 {
-                width: 40%;
-                height: 16px;
-
-                .layer3 {
-                  width: 16px;
-                  height: 16px;
-                  margin-right: 5px;
-                  background: url("../../assets/home/titleIcon.png") top center
-                    no-repeat;
-                  background-size: 100%;
-                }
-
-                .word3 {
-                  width: auto;
-                  height: 14px;
-                  overflow-wrap: break-word;
-                  color: rgba(64, 77, 116, 1);
-                  font-size: 15px;
-                  font-family: PingFangSC-Semibold;
-                  text-align: left;
-                  white-space: nowrap;
-                  line-height: 15px;
-                  display: block;
-                }
-              }
-            }
-
-            .main5 {
-              width: auto;
-              cursor: pointer;
-
-              .label2 {
-                width: 20px;
-                height: 20px;
-                margin-right: 5px;
-              }
-            }
-          }
-        }
-
-        .robotLabelName {
-          width: 25%;
-        }
-
-        .mod3 {
-          background-color: rgba(255, 255, 255, 1);
-          z-index: 24;
-          height: 350px;
-          width: 100%;
-          position: relative;
-        }
-
-        .mod5 {
-          background-color: rgba(255, 255, 255, 1);
-          z-index: 84;
-          height: 350px;
-          width: 100%;
-          position: relative;
-        }
-
-        .mod9 {
-          background-color: rgba(255, 255, 255, 1);
-          z-index: 156;
-          height: 350px;
-          width: 100%;
-          position: relative;
-        }
-
-        .mod11 {
-          background-color: rgba(255, 255, 255, 1);
-          z-index: 217;
-          height: 350px;
-          width: 100%;
-          position: relative;
-        }
-      }
-    }
-
-    .positionBox1 {
-      .searchRow {
-        margin: 18px 15px;
-
-        .bd3 {
-          width: 87px;
-          height: 16px;
-
-          .outer4 {
-            width: 16px;
-            height: 16px;
-            background: url("../../assets/home/titleIcon.png") top center
-              no-repeat;
-            background-size: 100%;
-          }
-
-          .txt2 {
-            width: 65px;
-            height: 15px;
-            overflow-wrap: break-word;
-            color: rgba(64, 77, 116, 1);
-            font-size: 15px;
-            font-family: PingFangSC-Semibold;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 15px;
-            display: block;
-          }
-        }
-
-        .main5 {
-          width: auto;
-          cursor: pointer;
-
-          .label2 {
-            width: 20px;
-            height: 20px;
-            margin-right: 5px;
-          }
-        }
-      }
-    }
-  }
-
-  .bd1 {
-    width: 100%;
-    height: 108px;
-    // background: url(../../assets/home/outer.png) no-repeat;
-    background: #eaf5ff;
-    background-size: 100% 100%;
-
-    .box2 {
-      width: 100%;
-      height: 100%;
-
-      .TextGroup {
-        height: 57px;
-        width: 48px;
-
-        .main6 {
-          width: 48px;
-          height: 57px;
-
-          .word5 {
-            height: 26px;
-            overflow-wrap: break-word;
-            color: rgba(223, 94, 76, 1);
-            font-size: 22px;
-            font-family: Helvetica;
-            text-align: center;
-            white-space: nowrap;
-            line-height: 26px;
-            display: block;
-          }
-
-          .word6 {
-            height: 17px;
-            overflow-wrap: break-word;
-            color: rgb(107, 107, 255);
-            font-size: 12px;
-            text-align: center;
-            white-space: nowrap;
-            line-height: 17px;
-            margin-top: 14px;
-            display: block;
-          }
-        }
-      }
-    }
-  }
-
-  .baseRow {
-    width: 90%;
-    height: 20px;
-    margin-left: 15px;
-    margin-top: 5px;
-    justify-content: flex-start;
-
-    .group2 {
-      background-color: #ff3456;
-      border-radius: 2px;
-      width: 4px;
-      height: 16px;
-      margin-top: 4px;
-    }
-
-    .baseText {
-      width: 150px;
-      height: 20px;
-      margin-top: 2px;
-      overflow-wrap: break-word;
-      color: rgba(64, 77, 116, 1);
-      font-size: 14px;
-      font-family: PingFangSC-Medium;
-      text-align: left;
-      // white-space: nowrap;
-      line-height: 20px;
-      display: block;
-      margin-left: 15px;
-    }
-  }
-
-  .searchRow {
-    margin: 18px 15px;
-
-    .bd3 {
-      width: 87px;
-      height: 16px;
-
-      .outer4 {
-        width: 16px;
-        height: 16px;
-        background: url("../../assets/position/hisBillIcon.png") top center no-repeat;
-        background-size: 100%;
-      }
-
-      .txt2 {
-        width: 65px;
-        height: 15px;
-        overflow-wrap: break-word;
-        color: rgba(64, 77, 116, 1);
-        font-size: 15px;
-        font-family: PingFangSC-Semibold;
-        text-align: left;
-        white-space: nowrap;
-        line-height: 15px;
-        display: block;
-      }
-    }
-
-    .main5 {
-      width: auto;
-      cursor: pointer;
-
-      .label2 {
-        width: 23px;
-        height: 23px;
-        margin-right: 5px;
-      }
-    }
-  }
-
-  .word13 {
-    // height: 14px;
-    width: 4.375rem;
-    overflow-wrap: break-word;
-    color: rgba(64, 77, 116, 1);
-    font-size: 14px;
-    line-height: 15px;
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  
-  .van-field__label {
-    width: auto;
-  }
-
-  .van-field__control {
-    width: 70%;
-  }
-
-  .van-field__body {
-    width: 100%;
-  }
-
-  .van-calendar__day--start-end {
-    background-color: #ff3456;
-  }
-
-  .van-calendar__selected-day {
-    background-color: #ff3456;
-  }
-
-  .van-calendar__day--start {
-    background-color: #ff3456;
-  }
-
-  .van-calendar__day--middle {
-    color: #ff3456;
-  }
-
-  .van-calendar__day--end {
-    background-color: #ff3456;
-  }
-
-  .van-calendar__confirm {
-    border-color: #ff3456;
-    background-color: #ff3456;
-  }
-}

+ 1 - 1
src/styles/role/index.less

@@ -31,7 +31,7 @@
           overflow-wrap: break-word;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
           color: rgba(64, 77, 116, 1);
           font-size: 15px;
           font-size: 15px;
-          font-family: PingFangSC-Semibold;
+          font-family: 'OPPOSans', PingFangSC-Semibold;
           text-align: left;
           text-align: left;
           white-space: nowrap;
           white-space: nowrap;
           line-height: 15px;
           line-height: 15px;

+ 1 - 1
src/styles/sellConfList/index.less

@@ -116,7 +116,7 @@
             overflow-wrap: break-word;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
             color: rgba(64, 77, 116, 1);
             font-size: 15px;
             font-size: 15px;
-            font-family: PingFangSC-Semibold;
+            font-family: 'OPPOSans', PingFangSC-Semibold;
             text-align: left;
             text-align: left;
             white-space: nowrap;
             white-space: nowrap;
             line-height: 15px;
             line-height: 15px;

+ 1 - 1
src/styles/taskAccountList/index.less

@@ -116,7 +116,7 @@
           overflow-wrap: break-word;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
           color: rgba(64, 77, 116, 1);
           font-size: 15px;
           font-size: 15px;
-          font-family: PingFangSC-Semibold;
+          font-family: 'OPPOSans', PingFangSC-Semibold;
           text-align: left;
           text-align: left;
           white-space: nowrap;
           white-space: nowrap;
           line-height: 15px;
           line-height: 15px;

+ 1 - 1
src/styles/taskMessage/index.less

@@ -150,7 +150,7 @@
           overflow-wrap: break-word;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
           color: rgba(64, 77, 116, 1);
           font-size: 15px;
           font-size: 15px;
-          font-family: PingFangSC-Semibold;
+          font-family: 'OPPOSans', PingFangSC-Semibold;
           text-align: left;
           text-align: left;
           white-space: nowrap;
           white-space: nowrap;
           line-height: 15px;
           line-height: 15px;

+ 10 - 8
src/styles/trading/index.less

@@ -19,9 +19,9 @@
           height: 16px;
           height: 16px;
 
 
           .outer4 {
           .outer4 {
-            width: 16px;
-            height: 16px;
-            background: url("../../assets/home/titleIcon.png") top center no-repeat;
+            width: 18px;
+            height: 18px;
+            background: url("../../assets/home/tradingIcon.png") top center no-repeat;
             background-size: 100%;
             background-size: 100%;
           }
           }
 
 
@@ -31,10 +31,11 @@
             overflow-wrap: break-word;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
             color: rgba(64, 77, 116, 1);
             font-size: 15px;
             font-size: 15px;
-            font-family: PingFangSC-Semibold;
+            font-family: 'OPPOSans', PingFangSC-Semibold;
+            font-weight: bold;
             text-align: left;
             text-align: left;
             white-space: nowrap;
             white-space: nowrap;
-            line-height: 15px;
+            line-height: 17px;
             display: block;
             display: block;
           }
           }
         }
         }
@@ -609,7 +610,7 @@
               .block3 {
               .block3 {
                 width: 16px;
                 width: 16px;
                 height: 18px;
                 height: 18px;
-                background: url('../../assets/trading/trade.png') top center no-repeat;
+                background: url('../../assets/trading/pendingOrder.png') top center no-repeat;
                 background-size: 100%;
                 background-size: 100%;
               }
               }
 
 
@@ -624,7 +625,8 @@
                   overflow-wrap: break-word;
                   overflow-wrap: break-word;
                   color: rgba(64, 77, 116, 1);
                   color: rgba(64, 77, 116, 1);
                   font-size: 14px;
                   font-size: 14px;
-                  font-family: PingFangSC-Semibold;
+                  font-family: 'OPPOSans', PingFangSC-Semibold;
+                  font-weight: bold;
                   text-align: left;
                   text-align: left;
                   white-space: nowrap;
                   white-space: nowrap;
                   line-height: 12px;
                   line-height: 12px;
@@ -699,7 +701,7 @@
       max-width: 600px;
       max-width: 600px;
       text-align: center;
       text-align: center;
       box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2); /* 添加阴影效果 */
       box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2); /* 添加阴影效果 */
-      font-family: 'Roboto', sans-serif; /* 设置页面默认字体为Roboto */
+      font-family: 'OPPOSans', 'Roboto', sans-serif; /* 设置页面默认字体为 OPPOSans */
 
 
 
 
       .van-divider {
       .van-divider {

+ 1 - 1
src/styles/transactionList/index.less

@@ -124,7 +124,7 @@
           overflow-wrap: break-word;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
           color: rgba(64, 77, 116, 1);
           font-size: 15px;
           font-size: 15px;
-          font-family: PingFangSC-Semibold;
+          font-family: 'OPPOSans', PingFangSC-Semibold;
           text-align: left;
           text-align: left;
           white-space: nowrap;
           white-space: nowrap;
           line-height: 15px;
           line-height: 15px;

+ 2 - 1
src/views/home/HomeIndex.vue

@@ -102,6 +102,7 @@
     <van-watermark :content="watermarkVal" opacity="0.3" :gap-x="70" :gap-y="50" :height="50" rotate="2" />
     <van-watermark :content="watermarkVal" opacity="0.3" :gap-x="70" :gap-y="50" :height="50" rotate="2" />
 
 
 
 
+    <van-number-keyboard safe-area-inset-bottom />
   </div>
   </div>
 </template>
 </template>
 
 
@@ -257,7 +258,7 @@ const getListStockInfoForMonthFun = async () => {
             ...data.data.series[0],
             ...data.data.series[0],
             type: "line", // line折线图,bar柱状图
             type: "line", // line折线图,bar柱状图
             smooth: true, // 针对折线图,平滑曲线
             smooth: true, // 针对折线图,平滑曲线
-            itemStyle: { color: "#39a6fe" },
+            itemStyle: { color: "#ff5d88" },
             name: "股价¥",
             name: "股价¥",
             label: {
             label: {
               show: true,
               show: true,

+ 1 - 1
src/views/position/PositionIndex.vue

@@ -114,7 +114,7 @@
                                             <div v-else-if="item.status === '3'">挂单状态:<van-tag plain round
                                             <div v-else-if="item.status === '3'">挂单状态:<van-tag plain round
                                                     type="primary">匹配成功</van-tag></div>
                                                     type="primary">匹配成功</van-tag></div>
                                             <div v-else-if="item.status === '4'">挂单状态:<van-tag plain round
                                             <div v-else-if="item.status === '4'">挂单状态:<van-tag plain round
-                                                    color="#7232dd">部分匹配成功</van-tag></div>
+                                                    color="#6b6bff">部分匹配成功</van-tag></div>
                                             <div v-else>挂单状态:<van-tag plain round>未知状态</van-tag></div>
                                             <div v-else>挂单状态:<van-tag plain round>未知状态</van-tag></div>
                                         </template>
                                         </template>
                                         <template #price>
                                         <template #price>

+ 1 - 1
src/views/taskMessage/index.less

@@ -115,7 +115,7 @@
           overflow-wrap: break-word;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
           color: rgba(64, 77, 116, 1);
           font-size: 15px;
           font-size: 15px;
-          font-family: PingFangSC-Semibold;
+          font-family: 'OPPOSans', PingFangSC-Semibold;
           text-align: left;
           text-align: left;
           white-space: nowrap;
           white-space: nowrap;
           line-height: 15px;
           line-height: 15px;

+ 3 - 13
src/views/test/Child.vue

@@ -1,19 +1,9 @@
 <script setup>
 <script setup>
-import { defineEmits } from 'vue'
-import { ref } from 'vue'
-let dayNum = ref(7)
-
-const emit = defineEmits(['test-event'])
-
-const handleClick = (dayNum) => {
-  emit('test-event', dayNum)
-}
 </script>
 </script>
 
 
 <template>
 <template>
-  <div>
-    <button @click="handleClick(dayNum)">传递参数</button>
-  </div>
+  <div></div>
 </template>
 </template>
 
 
-<style scoped></style>
+<style scoped>
+</style>

+ 4 - 8
src/views/test/Father.vue

@@ -1,14 +1,10 @@
 <script setup>
 <script setup>
-import Child from './Child.vue'
-
-function testEvent(param) {
-	console.log('param >>> 就是 dayNum', param)
-}
-
 </script>
 </script>
 
 
 <template>
 <template>
-  <Child @test-event="testEvent" />
+  <div></div>
+  <h1 style="font-family: 'OPPOSans'">test OPPO 字体 ,.,。?!@#¥$</h1>
 </template>
 </template>
 
 
-<style scoped></style>
+<style scoped>
+</style>

+ 3 - 3
src/views/trading/TradingIndex.vue

@@ -54,7 +54,7 @@
 
 
       <!-- 卖家挂单详情 -->
       <!-- 卖家挂单详情 -->
       <div class="buy-box" style="text-align: center;">
       <div class="buy-box" style="text-align: center;">
-        <van-row justify="center" class="bold-row" style="font-weight: bold; color: #3CB371;">
+        <van-row justify="center" class="bold-row" style="font-weight: bold; color: #39a6fe;">
           <van-col span="8">用户名</van-col>
           <van-col span="8">用户名</van-col>
           <van-col span="8">交易数量</van-col>
           <van-col span="8">交易数量</van-col>
           <van-col span="8">单价¥</van-col>
           <van-col span="8">单价¥</van-col>
@@ -87,7 +87,7 @@
       <!-- 买家挂单详情 -->
       <!-- 买家挂单详情 -->
 
 
       <div class="buy-box">
       <div class="buy-box">
-        <van-row justify="center" class="bold-row" style="font-weight: bold; color: #CD5C5C;">
+        <van-row justify="center" class="bold-row" style="font-weight: bold; color: #ff5d88;">
           <van-col span="8">用户名</van-col>
           <van-col span="8">用户名</van-col>
           <van-col span="8">交易数量</van-col>
           <van-col span="8">交易数量</van-col>
           <van-col span="8">单价¥</van-col>
           <van-col span="8">单价¥</van-col>
@@ -118,7 +118,7 @@
 
 
     <div style="height: 40px;"></div>
     <div style="height: 40px;"></div>
     <!-- 分割线 -->
     <!-- 分割线 -->
-    <img class="pic1" src="../../assets/trading/line.png" />
+    <!-- <img class="pic1" src="../../assets/trading/line.png" /> -->
 
 
 
 
     <div style="height: 100px;"></div>
     <div style="height: 100px;"></div>