✨ show '1.11' as '+1.11'

shawjia · Oct 28, 2018 · b1f00e1 · b1f00e1
1 parent e3c590c
commit b1f00e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/src/app/pages/add/add.js b/src/app/pages/add/add.js
@@ -20,17 +20,6 @@ Page({
     hasTextErr: false,
   },
 
-  onLoad() {
-    wx.cloud.callFunction({ name: 'funds' })
-      .then((res) => {
-        app.globalData.funds = res.result.funds || [];
-      })
-      .catch((err) => {
-        console.error(err);
-        throw (err);
-      });
-  },
-
   onChange(e) {
     const name = e.target.id;
     const input = e.detail.trim();

diff --git a/src/app/pages/index/index.js b/src/app/pages/index/index.js
@@ -1,7 +1,10 @@
 // https://developers.weixin.qq.com/miniprogram/dev/framework/app-service/page.html
 
+import { formatPrice } from '../../utils/util';
+
 const api = require('../../api');
 
+
 const app = getApp();
 let prices = {};
 
@@ -90,8 +93,9 @@ Page({
       return item;
     });
 
-    latestProfit = latestProfit.toFixed(2);
-    allProfit = allProfit.toFixed(2);
+    latestProfit = formatPrice(latestProfit.toFixed(2));
+    allProfit = formatPrice(allProfit.toFixed(2));
+
     const latestProfitColor = latestProfit.includes('-') ? 'lose' : 'win';
     const allProfitColor = allProfit.includes('-') ? 'lose' : 'win';
 
@@ -126,9 +130,9 @@ Page({
       oriProfit = current - yesterday;
       oriTotalProfit = current - start;
 
-      profit = oriProfit.toFixed(2);
-      totalProfit = oriTotalProfit.toFixed(2);
-      current = current.toFixed(2);
+      profit = formatPrice(oriProfit.toFixed(2));
+      totalProfit = formatPrice(oriTotalProfit.toFixed(2));
+      current = formatPrice(current.toFixed(2));
     }
 
     return {

diff --git a/src/app/utils/util.js b/src/app/utils/util.js
@@ -19,8 +19,10 @@ const request = (url, data = {}, opts = {}) => new Promise((resolve, reject) =>
 });
 
 const isNumber = n => !Number.isNaN(+n);
+const formatPrice = str => (str.includes('-') ? str : `+${str}`);
 
 module.exports = {
   request,
   isNumber,
+  formatPrice,
 };