提交

src/assets/style/CommonBigScreenHome.css

@@ -240,7 +240,7 @@
 }
 
 .btn {
-  right: 0;
+  right: 10px;
   top: 0;
   z-index: 1;
   position: absolute;

src/pages/CommonBigScreen/components/Activity.jsx

@@ -34,7 +34,7 @@ function ListeningRate(prop) {
                                     {item.activity}
                                 </dev>
                             </Show>
-                            <div class='td'>{utils.formatNumber(item.readCount)}</div>
+                            <div class='td'>{utils.formatNum(item.readCount)}</div>
                         </div>}</For>
                     </div>
                 </div>
@@ -59,7 +59,7 @@ function ListeningRate(prop) {
                                     {item.activity}
                                 </dev>
                             </Show>
-                            <div class='td'>{utils.formatNumber(item.readCount)}</div>
+                            <div class='td'>{utils.formatNum(item.readCount)}</div>
                         </div>}</For>
                     </div>
                 </div>

src/pages/CommonBigScreen/components/NewMedia.jsx

@@ -1,6 +1,6 @@
 import { onMount, createSignal, createEffect, For } from "solid-js";
 import utils from "../../../utils/index"
-import "../../../assets/style/CommonBigScreenHome.css"
+import "../../../assets/style/BigScreenHome.css"
 
 import wx from "../../../assets/img/微信.png";
 import wxo from "../../../assets/img/微信-o.png";
@@ -23,8 +23,9 @@ let timeout = undefined;
 function NewMedia(prop) {
     function getlist() {
         const setli = [];
-        for (let i = 0; i < Math.floor((prop.height - 42) / 40); i++) {
-            const v = ((prop.list[act()] || {}).data || [])[i];
+        const li = prop.list[act()] ? prop.list[act()].data || [] : [];
+        for (let i = 0; i < li.length; i++) {
+            const v = li[i];
             if (!v) break
             setli.push({
                 userName: v.userName,
@@ -87,7 +88,7 @@ function NewMedia(prop) {
                 </div>
                 <div style={{
                     height: `${prop.height - 82}px`,
-                    overflow: 'hidden'
+                    "overflow-y": 'auto'
                 }}>
                     <For each={TableList()}>{(item, i) => <div class="tr trColor">
                         <div class='td'>{i() + 1}</div>

src/pages/bigScreen/components/Activity.jsx

@@ -34,7 +34,7 @@ function ListeningRate(prop) {
                                     {item.activity}
                                 </dev>
                             </Show>
-                            <div class='td'>{utils.formatNumber(item.readCount)}</div>
+                            <div class='td'>{utils.formatNum(item.readCount)}</div>
                         </div>}</For>
                     </div>
                 </div>
@@ -59,7 +59,7 @@ function ListeningRate(prop) {
                                     {item.activity}
                                 </dev>
                             </Show>
-                            <div class='td'>{utils.formatNumber(item.readCount)}</div>
+                            <div class='td'>{utils.formatNum(item.readCount)}</div>
                         </div>}</For>
                     </div>
                 </div>

src/pages/bigScreen/components/NewMedia.jsx

@@ -23,8 +23,9 @@ let timeout = undefined;
 function NewMedia(prop) {
     function getlist() {
         const setli = [];
-        for (let i = 0; i < Math.floor((prop.height - 42) / 40); i++) {
-            const v = ((prop.list[act()] || {}).data || [])[i];
+        const li = prop.list[act()] ? prop.list[act()].data || [] : [];
+        for (let i = 0; i < li.length; i++) {
+            const v = li[i];
             if (!v) break
             setli.push({
                 userName: v.userName,
@@ -87,7 +88,7 @@ function NewMedia(prop) {
                 </div>
                 <div style={{
                     height: `${prop.height - 82}px`,
-                    overflow: 'hidden'
+                    "overflow-y": 'auto'
                 }}>
                     <For each={TableList()}>{(item, i) => <div class="tr trColor">
                         <div class='td'>{i() + 1}</div>

src/pages/bigScreen/components/Usertrend.jsx

@@ -28,7 +28,7 @@ function Usertrend(prop) {
             height: height - 20,
             width,
             padding: [
-                10,
+                20,
                 60,
                 30,
                 70,
@@ -89,7 +89,7 @@ function Usertrend(prop) {
 
         chart.line().shape('smooth').color('#3ae8ef').position('Data*sales').label('sales', val => {
             return {
-                content: utils.formatNum(val, 0) + '次',
+                content: utils.formatNum(val, 0),
                 offsetX: 20,
                 style: {
                     fill: "#ffffff",