Feat/settlement

config/env.config.js

@@ -2,15 +2,15 @@ const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
 
 const envAPi = {
-  api: '//backstms-test4.liangkebang.net',
-  kdspOpApi: 'https://kdsp-operation-test4.liangkebang.net',
-  kdspApi: 'https://sc-op-api-test4.liangkebang.net',
-  goodsApi: 'https://sc-op-api-test4.liangkebang.net',
-  querysApi: 'https://sc-settlement-api-test4.liangkebang.net',
+  api: '//backstms-test9.liangkebang.net',
+  kdspOpApi: 'https://kdsp-operation-test9.liangkebang.net',
+  kdspApi: 'https://sc-op-api-test9.liangkebang.net',
+  goodsApi: 'https://sc-op-api-test9.liangkebang.net',
+  querysApi: 'https://sc-settlement-api-test9.liangkebang.net',
   // goodsApi: '//192.168.188.111:7000',
-  prologueDomain: 'https://mall-test4.liangkebang.net',
+  prologueDomain: 'https://mall-test9.liangkebang.net',
   qiniuHost: 'https://appsync.lkbang.net',
-  opapiHost: 'https://opapi-test4.liangkebang.net',
+  opapiHost: 'https://opapi-test9.liangkebang.net',
 };
 
 const prodApi = {
@@ -22,7 +22,8 @@ const prodApi = {
   goodsApi: 'https://sc-merchant-api.q-gp.com', // 线上环境打包域名
   qiniuHost: 'https://appsync.lkbang.net',
   opapiHost: 'https://opapi.xyqb.com',
-  querysApi: 'https://sc-settlement-api.q-gp.com',
+  // querysApi: 'https://sc-settlement-api.q-gp.com',
+  querysApi: 'https://sc-merchant-api.q-gp.com/admin/merchant/sc-settlement',
 };
 
 const preProdApi = {

src/pages/PaymentMange/data.js

@@ -141,11 +141,10 @@ export function columns(res, pages) {
     {
       title: '操作',
       dataIndex: 'option',
-      valueType: 'option',
+      // valueType: 'option',
       key: 'option',
       align: 'center',
       fixed: 'right',
-      width: 80,
       render: (_, row) => (
         <div>
           <Button

src/pages/PaymentMange/index.jsx

@@ -183,7 +183,7 @@ const PaymentMange = () => {
           }}
           bordered
           toolBarRender={onToolBarRender}
-          scroll={{ x: '1700px' }}
+          scroll={{ x: '100%', y: 500 }}
         />
 
         <ToExamineModal

src/pages/PaymentMange/style.less

 .button {
   display: block;
-  margin-bottom: 10px;
+  margin: 0 auto 10px;
 }
 
 .uploadButton {

src/pages/ReconciliationQuery/index.jsx

@@ -154,7 +154,7 @@ const ReconciliationQuery = () => {
           rowSelection={rowSelection}
           bordered
           toolBarRender={onToolBarRender}
-          scroll={{ x: '100%' }}
+          scroll={{ x: '100%', y: 400 }}
         />
       </PageHeaderWrapper>
     </Spin>

src/pages/SettlementSheet/index.jsx

@@ -157,7 +157,7 @@ const SettlementSheet = () => {
           rowSelection={rowSelection}
           bordered
           toolBarRender={onToolBarRender}
-          scroll={{ x: '100%' }}
+          scroll={{ x: '100%', y: 400 }}
         />
       </PageHeaderWrapper>
     </Spin>