Merge remote-tracking branch 'remotes/origin/mutou' into dev_yijun

src/views/HaveJoinedGame.vue

@@ -8,7 +8,7 @@
     ></Title>
     <div class="game-bonus-container">
       <div class="bonus-title">本期累计奖励金（元）</div>
-      <div class="bonus-amount">{{bet_bonus}}</div>
+      <div class="bonus-amount">{{bet_bonus|moneyFormatter}}</div>
     </div>
     <div class="game-title">{{target_steps}}步三日耐力赛</div>
     <div class="game-time">开赛时间：{{period_start}} — {{period_end}}</div>
@@ -29,7 +29,7 @@
             >{{item.status===0?'未开始':item.status===1?'比赛中':item.status===2?'已结束':'已淘汰'}}</div>
           </div>
           <div class="item-income" :style="item.status===1?'':'visibility: hidden;'">
-            <div class="item-amount">{{item.money}}</div>
+            <div class="item-amount">{{item.money|moneyFormatter}}</div>
             <div class="item-text">(元) 预计收益</div>
           </div>
           <div class="item-progress-num">
@@ -219,6 +219,15 @@ export default {
         // console.log('gagagag',this.format_tsp)
       }, 1000);
     }
+  },
+  filters: {
+    moneyFormatter(val) {
+      if (val && !isNaN(val)) {
+        return Number(val).toFixed(2);
+      } else {
+        return "0.00";
+      }
+    }
   }
 };
 </script>

src/views/PartakeChallenge.vue

@@ -4,7 +4,7 @@
                v-if="currentPage()==='PartakeChallenge'"></Title>
         <div class="game-title">{{daka_info.target_step}}步三日耐力赛</div>
         <div class="game-time">开赛时间：{{daka_info.start_format}}-{{daka_info.end_format}}</div>
-        <div class="game-cost">本期运动契约金：<span>{{daka_info.money}}元/人</span></div>
+        <div class="game-cost">本期运动契约金：<span>{{daka_info.money|moneyFormatter}}元/人</span></div>
         <div class="game-introduce-container">
             <div class="game-introduce-title">
                 <img src="../images/PartakeChallenge/ic_3.png">
@@ -205,6 +205,15 @@
                     this.daka_faq  = res.data.daka_faq
                 })
             }
+        },
+        filters: {
+            moneyFormatter(val) {
+                if (val && !isNaN(val)) {
+                    return Number(val).toFixed(2);
+                } else {
+                    return "0.00";
+                }
+            }
         }
     }
 </script>