张延森 3 年前
父节点
当前提交
39b9421a60
共有 2 个文件被更改,包括 8 次插入0 次删除
  1. 4
    0
      src/pages/mine/mortgageCalc/components/Result.jsx
  2. 4
    0
      src/pages/mine/mortgageCalc/index.jsx

+ 4
- 0
src/pages/mine/mortgageCalc/components/Result.jsx 查看文件

50
     if (!dataSource[0] && !dataSource[1]) return;
50
     if (!dataSource[0] && !dataSource[1]) return;
51
 
51
 
52
     if (isMixed) {
52
     if (isMixed) {
53
+      // console.log('------dataSource[0]------>', dataSource[0])
54
+      // console.log('------dataSource[1]------>', dataSource[1])
53
       //
55
       //
54
       const bj = {
56
       const bj = {
55
         summary: {
57
         summary: {
56
           money: dataSource[0].bj.summary.money + dataSource[1].bj.summary.money,
58
           money: dataSource[0].bj.summary.money + dataSource[1].bj.summary.money,
59
+          moneyOfFirstMonth: dataSource[0].bj.summary.moneyOfFirstMonth + dataSource[1].bj.summary.moneyOfFirstMonth,
57
           totalRate: dataSource[0].bj.summary.totalRate + dataSource[1].bj.summary.totalRate,
60
           totalRate: dataSource[0].bj.summary.totalRate + dataSource[1].bj.summary.totalRate,
58
           totalMoney: dataSource[0].bj.summary.totalMoney + dataSource[1].bj.summary.totalMoney,
61
           totalMoney: dataSource[0].bj.summary.totalMoney + dataSource[1].bj.summary.totalMoney,
59
         },
62
         },
62
       const bx = {
65
       const bx = {
63
         summary: {
66
         summary: {
64
           money: dataSource[0].bx.summary.money + dataSource[1].bx.summary.money,
67
           money: dataSource[0].bx.summary.money + dataSource[1].bx.summary.money,
68
+          moneyOfFirstMonth: dataSource[0].bx.summary.moneyOfFirstMonth + dataSource[1].bx.summary.moneyOfFirstMonth,
65
           totalRate: dataSource[0].bx.summary.totalRate + dataSource[1].bx.summary.totalRate,
69
           totalRate: dataSource[0].bx.summary.totalRate + dataSource[1].bx.summary.totalRate,
66
           totalMoney: dataSource[0].bx.summary.totalMoney + dataSource[1].bx.summary.totalMoney,
70
           totalMoney: dataSource[0].bx.summary.totalMoney + dataSource[1].bx.summary.totalMoney,
67
         },
71
         },

+ 4
- 0
src/pages/mine/mortgageCalc/index.jsx 查看文件

48
       }
48
       }
49
     }
49
     }
50
 
50
 
51
+    Taro.showLoading()
52
+
51
     setLoading(true)
53
     setLoading(true)
52
     const syResult = {}
54
     const syResult = {}
53
     const gjjResult = {}
55
     const gjjResult = {}
62
     }
64
     }
63
     setLoading(false)
65
     setLoading(false)
64
 
66
 
67
+    Taro.hideLoading()
68
+
65
     const res = [undefined, undefined]
69
     const res = [undefined, undefined]
66
     if (current !== 2) {
70
     if (current !== 2) {
67
       res[0] = syResult
71
       res[0] = syResult