Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ui
merchant-manage-ui
Commits
efc602fe
Commit
efc602fe
authored
Jun 06, 2022
by
张子雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix/goods
parent
1aba6367
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
14 deletions
+18
-14
env.config.js
config/env.config.js
+2
-1
index.jsx
src/pages/GoodsManage/createModal/index.jsx
+1
-3
upload.jsx
src/pages/PaymentMange/ToExamine/upload.jsx
+8
-6
service.js
src/pages/PaymentMange/service.js
+5
-2
qiniu.js
src/services/qiniu.js
+2
-2
No files found.
config/env.config.js
View file @
efc602fe
...
@@ -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
'
,
};
};
...
...
src/pages/GoodsManage/createModal/index.jsx
View file @
efc602fe
...
@@ -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
)
{
...
...
src/pages/PaymentMange/ToExamine/upload.jsx
View file @
efc602fe
...
@@ -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
;
...
...
src/pages/PaymentMange/service.js
View file @
efc602fe
...
@@ -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
?.
up
token
;
return
data
?.
data
?.
token
;
}
}
// 付款单导出
// 付款单导出
export
async
function
selfPaymentExport
(
params
)
{
export
async
function
selfPaymentExport
(
params
)
{
...
...
src/services/qiniu.js
View file @
efc602fe
...
@@ -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/getT
oken
'
,
{
const
data
=
await
request
.
get
(
'
/
api/kdsp/common/upload/t
oken
'
,
{
prefix
:
config
.
opapiHost
,
prefix
:
config
.
opapiHost
,
});
});
return
data
?.
up
token
;
return
data
?.
data
?.
token
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment