Merge branch 'master' of http://git.weirui0755.com/jack/kakapay

src/views/data-view/data-view.vue

@@ -287,7 +287,7 @@ export default {
             todayRemainingAmount: f(i.todayRemainingAmount) || '0',
             todayOutNumber: i.todayOutNumber + '/' + f(i.todayOutReceived) || '0',
             remainingAmount: f(i.remainingAmount) || '0',
-            balanceWarning: i.balanceWarning,
+            balanceWarning: 0,
             channels: i.channelNames
           }
         })
@@ -302,7 +302,7 @@ export default {
             margin: f(i.margin) || '0',
             toDayTotal: f(i.toDayTotal) || '0',
             turnoverRate: (i.turnoverRate * 100).toFixed(2) + '%',
-            balanceWarning: i.balanceWarning
+            balanceWarning: i.marginWarning
           }
         })
         this.data3 = sortBy(this.data3, 'balanceWarning')