Merge remote-tracking branch 'origin/development' into development

src/api/modules/homeEntry.ts

@@ -50,6 +50,14 @@ export const updateMerchantUserInfo = params => {
 export const getAccountBalance = params => {
   return http.post(PORT_NONE + `/incomeManage/getAccountBalance`, params);
 };
+//已到账金额/未到账金额
+export const getPaymentCycle = params => {
+  return http.get<StoreUser.ResStoreUserList>(PORT_NONE + `/incomeManage/getPaymentCycle`, params);
+};
+//是否有支付密码
+export const checkPayPassword = params => {
+  return http.get<StoreUser.ResStoreUserList>(PORT_NONE + `/merchantUser/checkPayPassword`, params);
+};
 export const getUserByPhone = params => {
   return http.get(PORT_NONE + `/merchantUser/getMerchantByPhone`, params);
 };

src/assets/json/authMenuList.json

@@ -475,13 +475,68 @@
           }
         },
         {
-          "path": "/financialManagementDetail",
-          "name": "financialManagementDetail",
-          "component": "/financialManagement/detail",
+          "path": "/financialManagement/realName",
+          "name": "realName",
+          "component": "/financialManagement/realName",
           "meta": {
-            "icon": "Menu",
-            "title": "财务管理详情",
-            "activeMenu": "/financialManagement",
+            "icon": "CreditCard",
+            "title": "实名认证",
+            "isLink": "",
+            "isHide": true,
+            "isFull": false,
+            "isAffix": false,
+            "isKeepAlive": false
+          }
+        },
+        {
+          "path": "/financialManagement/cashApply",
+          "name": "cashApply",
+          "component": "/financialManagement/cashApply",
+          "meta": {
+            "icon": "CreditCard",
+            "title": "提现申请",
+            "isLink": "",
+            "isHide": true,
+            "isFull": false,
+            "isAffix": false,
+            "isKeepAlive": false
+          }
+        },
+        {
+          "path": "/financialManagement/todayIncomeList",
+          "name": "todayIncomeList",
+          "component": "/financialManagement/todayIncomeList",
+          "meta": {
+            "icon": "CreditCard",
+            "title": "今日收益",
+            "isLink": "",
+            "isHide": true,
+            "isFull": false,
+            "isAffix": false,
+            "isKeepAlive": false
+          }
+        },
+        {
+          "path": "/financialManagement/reconciled",
+          "name": "reconciled",
+          "component": "/financialManagement/reconciled",
+          "meta": {
+            "icon": "CreditCard",
+            "title": "已到账期金额",
+            "isLink": "",
+            "isHide": true,
+            "isFull": false,
+            "isAffix": false,
+            "isKeepAlive": false
+          }
+        },
+        {
+          "path": "/financialManagement/unposted",
+          "name": "unposted",
+          "component": "/financialManagement/unposted",
+          "meta": {
+            "icon": "CreditCard",
+            "title": "未到账期金额",
             "isLink": "",
             "isHide": true,
             "isFull": false,