Merge branch 'master' into feat/password

* master:
  Fix/goods
  Feat/settlement

config/env.config.js

@@ -21,8 +21,10 @@ const prodApi = {
   // goodsApi: 'https://sc-op-api.q-gp.com', // 测试环境打包域名，
   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',
+  opapiHost: '//talos.xyqb.com',
+  // opapiHost: 'https://opapi.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/GoodsManage/createModal/index.jsx

@@ -349,9 +349,7 @@ class goodsManage extends Component {
         if (validateSpuInfo(values, initData, editData, productType)) return;
         editData.forEach(item => {
           item.productStockWarning = item.productStockWarning < 0 ? 0 : item.productStockWarning;
-          if (values?.imageList) {
-            item.imageList = values?.imageList[item.firstSpecValue] || values.commonImageList;
-          } else {
+          if (!item.imageList && !item.imageList.length) {
             item.imageList = values.commonImageList || [];
           }
           if (!item.imageList || !item.imageList.length) {

src/pages/PaymentMange/ToExamine/upload.jsx

@@ -46,6 +46,7 @@ class PicturesWall extends React.Component {
   };
 
   customRequest = ({ file, onError, onSuccess }) => {
+    if (file.name) {
       const lastFile = file.name.split('.');
       const index = lastFile.length - 1;
       const types = ['pdf', 'doc', 'docx', 'zip', 'rar', 'png', 'jpeg'];
@@ -53,6 +54,7 @@ class PicturesWall extends React.Component {
         message.error('文件格式错误！');
         return;
       }
+    }
     const vm = this;
     const name = file.name + file.uid;
     const observable = qiniu.upload(file, file.name, token);

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/service.js

@@ -29,10 +29,13 @@ export async function query(params) {
 }
 
 export async function qiniuToken() {
-  const data = await request.get('/upload/getToken', {
+  // const data = await request.get('/upload/getToken', {
+  //   prefix: config.opapiHost,
+  // });
+  const data = await request.get('/api/kdsp/common/upload/token', {
     prefix: config.opapiHost,
   });
-  return data?.uptoken;
+  return data?.data?.token;
 }
 // 付款单导出
 export async function selfPaymentExport(params) {

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>

src/services/qiniu.js

@@ -2,8 +2,8 @@ import request from '@/utils/request';
 import config from '../../config/env.config';
 
 export async function qiniuToken() {
-  const data = await request.get('/upload/getToken', {
+  const data = await request.get('/api/kdsp/common/upload/token', {
     prefix: config.opapiHost,
   });
-  return data?.uptoken;
+  return data?.data?.token;
 }