liyongli 2 tahun lalu
induk
melakukan
786a7e5ce8

+ 1 - 0
src/assets/style/CommonBigScreenHome.css

@@ -245,6 +245,7 @@
   border-radius: 5px;
   padding: 8px 15px;
   cursor: pointer;
+  font-size: 24px;
   font-weight: 500;
 }
 

+ 4 - 4
src/pages/CommonBigScreen/components/Activity.jsx

@@ -24,12 +24,12 @@ function ListeningRate(prop) {
                     }}>
                         <For each={prop.list}>{(item, i) => <div class="tr trColor" style={{ display: i() + 1 > 6 ? 'none' : 'flex' }}>
                             <div class='td'>{i() + 1}</div>
-                            <Show when={item.activity.length > 9}>
+                            <Show when={item.activity.length > 11}>
                                 <marquee class='td' style={{ "flex": "2", "min-width": "0" }}>
                                     {item.activity}
                                 </marquee>
                             </Show>
-                            <Show when={item.activity.length <= 9}>
+                            <Show when={item.activity.length <= 11}>
                                 <dev class='td' style={{ "flex": "2", "min-width": "0" }}>
                                     {item.activity}
                                 </dev>
@@ -49,12 +49,12 @@ function ListeningRate(prop) {
                     }}>
                         <For each={prop.list}>{(item, i) => <div class="tr trColor" style={{ display: i() + 1 <= 6 ? 'none' : 'flex' }}>
                             <div class='td'>{i() + 1}</div>
-                            <Show when={item.activity.length > 9}>
+                            <Show when={item.activity.length > 11}>
                                 <marquee class='td' style={{ "flex": "2", "min-width": "0" }}>
                                     {item.activity}
                                 </marquee>
                             </Show>
-                            <Show when={item.activity.length <= 9}>
+                            <Show when={item.activity.length <= 11}>
                                 <dev class='td' style={{ "flex": "2", "min-width": "0" }}>
                                     {item.activity}
                                 </dev>

+ 4 - 1
src/pages/CommonBigScreen/components/Column_g2.jsx

@@ -119,7 +119,10 @@ function Column(prop) {
                 formatter: n => {
                     const nl = n.split(""), len = nl.length > 6 ? 5 : nl.length, out = [];
                     for (let i = 0; i < len; i++) {
-                        if (i % 2 !== 1 || i === len - 1) {
+                        if (len === 4 && i % 2 !== 1) {
+                            out.push(nl[i]);
+                            continue
+                        }else if (len !== 4 && i % 3 !== 2 || i === len - 1) {
                             out.push(nl[i]);
                             continue
                         }

+ 1 - 1
src/pages/CommonBigScreen/components/SelfPlatform.jsx

@@ -93,7 +93,7 @@ function Usertrend(prop) {
         chart.tooltip(false);
         chart.line().shape('smooth').color('#3ae8ef').position('Data*sales').label('sales', val => {
             return {
-                content: utils.formatNumber(val, 2) + '次',
+                content: utils.formatNum(val, 0) + '次',
                 offsetX: 20,
                 style: {
                     fill: "#ffffff",

+ 4 - 4
src/pages/bigScreen/components/Activity.jsx

@@ -24,12 +24,12 @@ function ListeningRate(prop) {
                     }}>
                         <For each={prop.list}>{(item, i) => <div class="tr trColor" style={{ display: i() + 1 > 6 ? 'none' : 'flex' }}>
                             <div class='td'>{i() + 1}</div>
-                            <Show when={item.activity.length > 9}>
+                            <Show when={item.activity.length > 11}>
                                 <marquee class='td' style={{ "flex": "2", "min-width": "0" }}>
                                     {item.activity}
                                 </marquee>
                             </Show>
-                            <Show when={item.activity.length <= 9}>
+                            <Show when={item.activity.length <= 11}>
                                 <dev class='td' style={{ "flex": "2", "min-width": "0" }}>
                                     {item.activity}
                                 </dev>
@@ -49,12 +49,12 @@ function ListeningRate(prop) {
                     }}>
                         <For each={prop.list}>{(item, i) => <div class="tr trColor" style={{ display: i() + 1 <= 6 ? 'none' : 'flex' }}>
                             <div class='td'>{i() + 1}</div>
-                            <Show when={item.activity.length > 9}>
+                            <Show when={item.activity.length > 11}>
                                 <marquee class='td' style={{ "flex": "2", "min-width": "0" }}>
                                     {item.activity}
                                 </marquee>
                             </Show>
-                            <Show when={item.activity.length <= 9}>
+                            <Show when={item.activity.length <= 11}>
                                 <dev class='td' style={{ "flex": "2", "min-width": "0" }}>
                                     {item.activity}
                                 </dev>

+ 5 - 1
src/pages/bigScreen/components/Column_g2.jsx

@@ -119,7 +119,11 @@ function Column(prop) {
                 formatter: n => {
                     const nl = n.split(""), len = nl.length > 6 ? 5 : nl.length, out = [];
                     for (let i = 0; i < len; i++) {
-                        if (i % 2 !== 1 || i === len - 1) {
+                        console.log(len)
+                        if (len === 4 && i % 2 !== 1) {
+                            out.push(nl[i]);
+                            continue
+                        }else if (len !== 4 && i % 3 !== 2 || i === len - 1) {
                             out.push(nl[i]);
                             continue
                         }