Commit efc602fe authored by 张子雨's avatar 张子雨

Fix/goods

parent 1aba6367
...@@ -21,7 +21,8 @@ const prodApi = { ...@@ -21,7 +21,8 @@ const prodApi = {
// goodsApi: 'https://sc-op-api.q-gp.com', // 测试环境打包域名, // goodsApi: 'https://sc-op-api.q-gp.com', // 测试环境打包域名,
goodsApi: 'https://sc-merchant-api.q-gp.com', // 线上环境打包域名 goodsApi: 'https://sc-merchant-api.q-gp.com', // 线上环境打包域名
qiniuHost: 'https://appsync.lkbang.net', 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-settlement-api.q-gp.com',
querysApi: 'https://sc-merchant-api.q-gp.com/admin/merchant/sc-settlement', querysApi: 'https://sc-merchant-api.q-gp.com/admin/merchant/sc-settlement',
}; };
......
...@@ -349,9 +349,7 @@ class goodsManage extends Component { ...@@ -349,9 +349,7 @@ class goodsManage extends Component {
if (validateSpuInfo(values, initData, editData, productType)) return; if (validateSpuInfo(values, initData, editData, productType)) return;
editData.forEach(item => { editData.forEach(item => {
item.productStockWarning = item.productStockWarning < 0 ? 0 : item.productStockWarning; item.productStockWarning = item.productStockWarning < 0 ? 0 : item.productStockWarning;
if (values?.imageList) { if (!item.imageList && !item.imageList.length) {
item.imageList = values?.imageList[item.firstSpecValue] || values.commonImageList;
} else {
item.imageList = values.commonImageList || []; item.imageList = values.commonImageList || [];
} }
if (!item.imageList || !item.imageList.length) { if (!item.imageList || !item.imageList.length) {
......
...@@ -46,12 +46,14 @@ class PicturesWall extends React.Component { ...@@ -46,12 +46,14 @@ class PicturesWall extends React.Component {
}; };
customRequest = ({ file, onError, onSuccess }) => { customRequest = ({ file, onError, onSuccess }) => {
const lastFile = file.name.split('.'); if (file.name) {
const index = lastFile.length - 1; const lastFile = file.name.split('.');
const types = ['pdf', 'doc', 'docx', 'zip', 'rar', 'png', 'jpeg']; const index = lastFile.length - 1;
if (!types.includes(lastFile[index])) { const types = ['pdf', 'doc', 'docx', 'zip', 'rar', 'png', 'jpeg'];
message.error('文件格式错误!'); if (!types.includes(lastFile[index])) {
return; message.error('文件格式错误!');
return;
}
} }
const vm = this; const vm = this;
const name = file.name + file.uid; const name = file.name + file.uid;
......
...@@ -29,10 +29,13 @@ export async function query(params) { ...@@ -29,10 +29,13 @@ export async function query(params) {
} }
export async function qiniuToken() { 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, prefix: config.opapiHost,
}); });
return data?.uptoken; return data?.data?.token;
} }
// 付款单导出 // 付款单导出
export async function selfPaymentExport(params) { export async function selfPaymentExport(params) {
......
...@@ -2,8 +2,8 @@ import request from '@/utils/request'; ...@@ -2,8 +2,8 @@ import request from '@/utils/request';
import config from '../../config/env.config'; import config from '../../config/env.config';
export async function qiniuToken() { export async function qiniuToken() {
const data = await request.get('/upload/getToken', { const data = await request.get('/api/kdsp/common/upload/token', {
prefix: config.opapiHost, prefix: config.opapiHost,
}); });
return data?.uptoken; return data?.data?.token;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment