feats

src/pages/mine/mortgageCalc/components/Result.jsx

@@ -50,10 +50,13 @@ export default (props) => {
     if (!dataSource[0] && !dataSource[1]) return;
 
     if (isMixed) {
+      // console.log('------dataSource[0]------>', dataSource[0])
+      // console.log('------dataSource[1]------>', dataSource[1])
       //
       const bj = {
         summary: {
           money: dataSource[0].bj.summary.money + dataSource[1].bj.summary.money,
+          moneyOfFirstMonth: dataSource[0].bj.summary.moneyOfFirstMonth + dataSource[1].bj.summary.moneyOfFirstMonth,
           totalRate: dataSource[0].bj.summary.totalRate + dataSource[1].bj.summary.totalRate,
           totalMoney: dataSource[0].bj.summary.totalMoney + dataSource[1].bj.summary.totalMoney,
         },
@@ -62,6 +65,7 @@ export default (props) => {
       const bx = {
         summary: {
           money: dataSource[0].bx.summary.money + dataSource[1].bx.summary.money,
+          moneyOfFirstMonth: dataSource[0].bx.summary.moneyOfFirstMonth + dataSource[1].bx.summary.moneyOfFirstMonth,
           totalRate: dataSource[0].bx.summary.totalRate + dataSource[1].bx.summary.totalRate,
           totalMoney: dataSource[0].bx.summary.totalMoney + dataSource[1].bx.summary.totalMoney,
         },

src/pages/mine/mortgageCalc/index.jsx

@@ -48,6 +48,8 @@ export default withLayout(() => {
       }
     }
 
+    Taro.showLoading()
+
     setLoading(true)
     const syResult = {}
     const gjjResult = {}
@@ -62,6 +64,8 @@ export default withLayout(() => {
     }
     setLoading(false)
 
+    Taro.hideLoading()
+
     const res = [undefined, undefined]
     if (current !== 2) {
       res[0] = syResult