Merge branch 'fix/goods' into 'master'

Fix/goods

See merge request !37

config/env.config.js

@@ -21,7 +21,8 @@ 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',
+  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',
 };

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,12 +46,14 @@ class PicturesWall extends React.Component {
   };
 
   customRequest = ({ file, onError, onSuccess }) => {
-    const lastFile = file.name.split('.');
-    const index = lastFile.length - 1;
-    const types = ['pdf', 'doc', 'docx', 'zip', 'rar', 'png', 'jpeg'];
-    if (!types.includes(lastFile[index])) {
-      message.error('文件格式错误！');
-      return;
+    if (file.name) {
+      const lastFile = file.name.split('.');
+      const index = lastFile.length - 1;
+      const types = ['pdf', 'doc', 'docx', 'zip', 'rar', 'png', 'jpeg'];
+      if (!types.includes(lastFile[index])) {
+        message.error('文件格式错误！');
+        return;
+      }
     }
     const vm = this;
     const name = file.name + file.uid;

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/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;
 }