fixed bug

thenewsky · Mar 10, 2021 · 4608213 · 4608213
1 parent 5229468
commit 4608213
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/background.js b/src/background.js
@@ -233,7 +233,7 @@ var setBadge = (fundcode, Realtime, type) => {
               sum = (NAV - NAV / (1 + NAVCHGRT * 0.01)) * num
             } else {
               let gsz = isNaN(val.GSZ) ? null : val.GSZ
-              if (gsz) {
+              if (gsz && NAV) {
                 sum = (gsz - NAV) * num
               }
             }
@@ -415,14 +415,16 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
         (item) => item.code == val.FCODE
       );
       let num = slt[0].num ? slt[0].num : 0;
-      allAmount += val.NAV * num;
+      let NAV = isNaN(val.NAV) ? null : val.NAV;
+      allAmount += NAV * num;
       var sum = 0;
       if (val.PDATE != "--" && val.PDATE == val.GZTIME.substr(0, 10)) {
-        sum = (val.NAV - val.NAV / (1 + val.NAVCHGRT * 0.01)) * num
+        let NAVCHGRT = isNaN(val.NAVCHGRT) ? 0 : val.NAVCHGRT;
+        sum = (NAV - NAV / (1 + NAVCHGRT * 0.01)) * num
       } else {
         let gsz = isNaN(val.GSZ) ? null : val.GSZ;
-        if (gsz) {
-          sum = (gsz - val.NAV) * num;
+        if (gsz != null && NAV != null) {
+          sum = (gsz - NAV) * num;
         }
 
       }

diff --git a/src/popup/App.vue b/src/popup/App.vue
@@ -647,7 +647,10 @@ export default {
         allNum += parseFloat(val.amount);
       });
       allCostGains = allCostGains.toFixed(2);
-      let allCostGainsRate = ((allCostGains * 100) / allNum).toFixed(2);
+      let allCostGainsRate = (
+        (allCostGains * 100) /
+        (allNum - allCostGains)
+      ).toFixed(2);
       return [allCostGains, allCostGainsRate];
     },
     containerClass() {