lisenzhou 2 年前
父节点
当前提交
70158c588c

+ 1
- 1
src/pages/index/components/Menu/index.jsx 查看文件

@@ -155,7 +155,7 @@ export default function Menu() {
155 155
     }  else {
156 156
       setList(list);
157 157
     }
158
-  }, [city.curCity.shortname]);
158
+  }, [city.curCity.shortname,person]);
159 159
 
160 160
   const MenuList = useMemo(() => {
161 161
     let Arr = [];

+ 1
- 1
src/subpackages/pages/broker/invitationlist/index.jsx 查看文件

@@ -120,7 +120,7 @@ export default withLayout(() => {
120 120
                     {item.customerNum || 0}
121 121
                   </Text>
122 122
                   <Text className="invitationlist-text">
123
-                    {item.brokerNum || 0}
123
+                    {item.signedNum || 0}
124 124
                   </Text>
125 125
 
126 126
                 </View>

+ 34
- 17
src/subpackages/pages/broker/myWallet/index.jsx 查看文件

@@ -13,13 +13,13 @@ import WalletList from "./list";
13 13
 import "@/assets/css/iconfont.css";
14 14
 import "./index.scss";
15 15
 
16
-export default withLayout((props) => {
16
+export default withLayout(props => {
17 17
   const { person } = props;
18 18
   const [activeKey, setActiveKey] = useState(1);
19 19
   const [mineInfo, setMineInfo] = useState({});
20 20
 
21 21
   useEffect(() => {
22
-    queryBrokerRankMine().then((res) => {
22
+    queryBrokerRankMine().then(res => {
23 23
       setMineInfo(res);
24 24
     });
25 25
   }, []);
@@ -29,33 +29,33 @@ export default withLayout((props) => {
29 29
       Taro.showModal({
30 30
         title: "完善信息",
31 31
         content: "请提供您的身份证信息",
32
-        success: (res) => {
32
+        success: res => {
33 33
           if (res.confirm) {
34 34
             Taro.navigateTo({
35
-              url: "/subpackages/pages/broker/toBeBroker/index",
35
+              url: "/subpackages/pages/broker/toBeBroker/index"
36 36
             });
37 37
           } else if (res.cancel) {
38 38
             Taro.navigateBack({ delta: 1 });
39 39
           }
40
-        },
40
+        }
41 41
       });
42 42
 
43 43
       return;
44 44
     }
45
-    querybkBankCard().then((res) => {
45
+    querybkBankCard().then(res => {
46 46
       if (res.total === 0) {
47 47
         Taro.showModal({
48 48
           title: "完善信息",
49 49
           content: "请提供您的银行卡信息",
50
-          success: (res) => {
50
+          success: res => {
51 51
             if (res.confirm) {
52 52
               Taro.navigateTo({
53
-                url: "/subpackages/pages/broker/toBeBroker/index",
53
+                url: "/subpackages/pages/broker/toBeBroker/index"
54 54
               });
55 55
             } else if (res.cancel) {
56 56
               Taro.navigateBack({ delta: 1 });
57 57
             }
58
-          },
58
+          }
59 59
         });
60 60
       }
61 61
     });
@@ -80,14 +80,31 @@ export default withLayout((props) => {
80 80
         </view>
81 81
       </view>
82 82
       <view className="middle">
83
-        <text className="text1">总资产(元)</text>
84
-        <text className="text2">
85
-          {Number(
86
-            (activeKey === 1
87
-              ? mineInfo.totalCommission || 0
88
-              : mineInfo.referralFee || 0) / 100
89
-          ).toFixed(2)}
90
-        </text>
83
+        <view>
84
+          <view className="text1">总资产(元)</view>
85
+          <view className="text2">
86
+            {Number(
87
+              (activeKey === 1
88
+                ? mineInfo.totalCommission || 0
89
+                : mineInfo.referralFee || 0) / 100
90
+            ).toFixed(2)}
91
+          </view>
92
+        </view>
93
+
94
+        {activeKey === 1 && (
95
+          <view className="detail">
96
+            <view className="text">
97
+              已结:{((mineInfo.settledCommission || 0) / 100).toFixed(2)}
98
+            </view>
99
+            <view className="text">
100
+              待结:
101
+              {(
102
+                (mineInfo.totalCommission - mineInfo.settledCommission || 0) /
103
+                100
104
+              ).toFixed(2)}
105
+            </view>
106
+          </view>
107
+        )}
91 108
       </view>
92 109
       <view className="bottom">
93 110
         <WalletList show={activeKey === 1} type={"commission"}></WalletList>

+ 44
- 14
src/subpackages/pages/broker/myWallet/index.scss 查看文件

@@ -48,27 +48,57 @@
48 48
     background: #ffffff;
49 49
     box-shadow: 0px 4px 28px 0px rgba(27, 62, 132, 0.18);
50 50
     border-radius: 20px;
51
-    display: inline-flex;
51
+
52 52
     padding: 0 30px;
53
-    justify-content: space-between;
54
-    align-items: center;
53
+
55 54
     z-index: 99;
56
-    .text1 {
57
-      font-size: 28px;
58
-      font-family: DengXian;
59
-      font-weight: 400;
60
-      color: #121212;
55
+
56
+    display: flex;
57
+    flex-direction: column;
58
+    justify-content: center;
59
+    align-items: center;
60
+    > view {
61
+      width: 630px;
62
+      display: flex;
63
+      justify-content: space-between;
64
+      align-items: center;
65
+      .text1 {
66
+        font-size: 28px;
67
+        font-family: DengXian;
68
+        font-weight: 400;
69
+        color: #121212;
70
+      }
71
+      .text2 {
72
+        font-size: 48px;
73
+        font-family: DengXian;
74
+        font-weight: bold;
75
+        color: #121212;
76
+        text-align: right;
77
+      }
78
+      .text3 {
79
+        font-size: 24px;
80
+        font-family: DengXian;
81
+        font-weight: 400;
82
+        color: #666666;
83
+      }
61 84
     }
62
-    .text2 {
63
-      font-size: 48px;
85
+
86
+    .detail {
87
+      // position: absolute;
88
+      // bottom: 20px;
89
+      margin-top: 20px;
90
+      font-size: 24px;
91
+      display: flex;
92
+      // width: 630px;
93
+      justify-content: space-between;
94
+
64 95
       font-family: DengXian;
65
-      font-weight: bold;
66
-      color: #121212;
96
+      font-weight: 400;
97
+      color: #666666;
67 98
     }
68 99
   }
69 100
 
70
-  .bottom{
101
+  .bottom {
71 102
     padding-top: 102px;
72 103
   }
73
-  
74 104
 }

+ 2
- 2
src/subpackages/pages/broker/myWallet/list/Item/index.jsx 查看文件

@@ -13,14 +13,14 @@ export default (props) => {
13 13
   return (
14 14
     <view className="components myWalletItem">
15 15
       <view className="item-top">
16
-        <view className="top-text1">邀请好友</view>
16
+        <view className="top-text1">获得佣金</view>
17 17
         <view className="top-text2">
18 18
           {item.moneyType === -1 ? "-" : "+"}
19 19
           {Number((item.money || 0) / 100).toFixed(2)}
20 20
         </view>
21 21
       </view>
22 22
       <view className="item-bottom">
23
-        <view className="bottom-text1">成功邀请{item.name}</view>
23
+        <view className="bottom-text1">推荐客户{item.name}</view>
24 24
         <view className="bottom-text2">
25 25
           {formatDate(item.time, "yyyy.MM.dd")}
26 26
         </view>