update

pages/index/index.vue

@@ -2038,13 +2038,13 @@ $iphoneHeight: env(safe-area-inset-bottom);
   }
   .header {
     width: 100%;
-    //background: linear-gradient(315deg, #FF8670 0%, #FFDCA8 100%);
+    background: linear-gradient(315deg, #FF8670 0%, #FFDCA8 100%);
     box-sizing: border-box;
     //padding: 0 16px;
     //position: relative;
     .headerTop{
       width: 100%;
-      //background: linear-gradient(315deg, #FFAF95 0%, #FFD6A6  100%);
+      background: linear-gradient(315deg, #FFAF95 0%, #FFD6A6  100%);
       position: fixed;
       top: 0;left:0;
       box-sizing: border-box;
@@ -3197,7 +3197,12 @@ $iphoneHeight: env(safe-area-inset-bottom);
       }
     }
   }
-
+  //.firstHeader{
+  //  background: linear-gradient(315deg, #FF8670 0%, #FFDCA8 100%)!important;
+  //  .headerTop{
+  //    background: linear-gradient(315deg, #FFAF95 0%, #FFD6A6  100%)!important;
+  //  }
+  //}
   .secondHeader{
     background: linear-gradient(315deg, #69BDE6 0%, #9BE2F5 100%)!important;
     .headerTop{
@@ -3621,7 +3626,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
 
             .topText{
               font-size: 32rpx;
-              //font-family: Alimama ShuHeiTi;
+              font-family: Alimama ShuHeiTi;
               font-weight: bold;
               color: #EC6C00;
               line-height: 38rpx;

pages/nationalPage/components/entryCarNumber.vue

@@ -36,8 +36,9 @@ export default {
       console.log('e',e)
       uChartsInstance[e.target.id].showToolTip(e, {
         formatter: (item, category, index, opts) => {
+          console.log('item',item)
           if (item.data){
-            return item.name + ":" + item.data + '万元';
+            return item.name + ":" + this.$util.fmoney(item.data.value,2) + '万元';
           }else{
             return item.name + ":" + 0 + '万元';
           }
@@ -85,7 +86,7 @@ export default {
         return 5
       }else{
         let sum = Number(value) + Number(value) *0.2
-        return  Number((sum / 1000).toFixed(0)) * 1000
+        return  Number((Math.ceil(sum / 1000)).toFixed(0)) * 1000
       }
     },
     drawCharts(id, data,config) {

pages/nationalPage/components/yearRevenue.vue

@@ -39,7 +39,7 @@ export default {
       uChartsInstance[e.target.id].showToolTip(e, {
         formatter: (item, category, index, opts) => {
           if (item.data){
-            return item.name + ":" + this.$util.noDecimal(item.data) + '辆';
+            return item.name + ":" + this.$util.noDecimal(item.data.value) + '辆';
           }else{
             return item.name + ":" + 0 + '辆';
           }
@@ -74,7 +74,7 @@ export default {
         return 5
       }else{
         let sum = Number(value) + Number(value) *0.2
-        return  Number((sum / 1000).toFixed(0)) * 1000
+        return  Number((Math.round(sum / 10000))*1.2) * 10000
       }
     },
     drawCharts(id, data,config) {

static/public/font2/stylesheet.css

@@ -1,6 +1,6 @@
 @font-face {
     font-family: 'Alimama ShuHeiTi';
-    src:url("/static/public/font2/EPAg3o21O7iw.woff2");
+    src:url("/static/public/font2/uj4HAtspu5eH.woff");
     font-weight: bold;
     font-style: normal;
     font-display: swap;