Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
陈智峰
jinfa-platform
Commits
3492bc3c
Commit
3492bc3c
authored
Dec 14, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改下单时自提商品和无配送方式支付方式问题;修改店铺和渠道模板接口
parent
1b8e8777
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
24 deletions
+34
-24
index.tsx
src/pages/channel/channelTemplate/index.tsx
+3
-3
index.tsx
src/pages/channel/templateDetail/index.tsx
+7
-6
index.tsx
src/pages/lxMall/order/index.tsx
+1
-1
index.tsx
src/pages/lxMall/order/payway/index.tsx
+11
-4
index.tsx
src/pages/shop/shopTemplate/index.tsx
+3
-3
index.tsx
src/pages/shop/templateDetail/index.tsx
+8
-6
index.ts
src/store/site/index.ts
+1
-1
No files found.
src/pages/channel/channelTemplate/index.tsx
View file @
3492bc3c
...
...
@@ -4,19 +4,19 @@ import { history } from 'umi'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
TemplateItem
from
'../components/templateItem'
import
{
PublicApi
}
from
'@/services/api'
import
{
GetTemplate
ShopFindAllShelfShopTemplateResponse
}
from
'@/services
'
import
{
GetTemplate
WebPageTemplateWebFindAllShelfChannelTemplateResponse
}
from
'@/services/TemplateApi
'
import
styles
from
'./index.less'
const
ShopTemplate
:
React
.
FC
=
()
=>
{
const
[
templateList
,
setTemplateList
]
=
useState
<
GetTemplate
ShopFindAllShelfShop
TemplateResponse
>
([])
const
[
templateList
,
setTemplateList
]
=
useState
<
GetTemplate
WebPageTemplateWebFindAllShelfChannel
TemplateResponse
>
([])
useEffect
(()
=>
{
fetchAllShelfShopTemplate
()
},
[])
const
fetchAllShelfShopTemplate
=
()
=>
{
PublicApi
.
getTemplate
Channel
FindAllShelfChannelTemplate
().
then
(
res
=>
{
PublicApi
.
getTemplate
WebPageTemplateWeb
FindAllShelfChannelTemplate
().
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setTemplateList
(
res
.
data
)
}
else
if
(
res
.
code
===
47001
)
{
...
...
src/pages/channel/templateDetail/index.tsx
View file @
3492bc3c
...
...
@@ -6,7 +6,7 @@ import DetailPage from '@/components/DetailPage'
import
UseModal
from
'../components/useModal'
import
{
PublicApi
}
from
'@/services/api'
import
{
Environment_Status
}
from
'@/constants'
import
{
GetTemplate
ShopFindShopTemplateDetailsResponse
}
from
'@/services
'
import
{
GetTemplate
WebPageTemplateWebFindChannelTemplateDetailsResponse
}
from
'@/services/TemplateApi
'
import
default_img
from
'@/assets/imgs/template_default_img.png'
import
styles
from
'./index.less'
...
...
@@ -21,7 +21,7 @@ interface TemplateDetailPropsType {
const
TemplateDetail
:
React
.
FC
<
TemplateDetailPropsType
>
=
(
props
)
=>
{
const
{
query
:
{
type
,
id
}
}
=
props
.
location
const
[
detailInfo
,
setDetailInfo
]
=
useState
<
GetTemplate
ShopFindShop
TemplateDetailsResponse
>
()
const
[
detailInfo
,
setDetailInfo
]
=
useState
<
GetTemplate
WebPageTemplateWebFindChannel
TemplateDetailsResponse
>
()
const
[
useModalVisible
,
setUseModalVisible
]
=
useState
<
boolean
>
(
false
)
const
[
confirmLoading
,
setConfirmLoading
]
=
useState
(
false
)
...
...
@@ -30,8 +30,10 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
},
[])
const
fetchDetail
=
()
=>
{
//@ts-ignore
PublicApi
.
getTemplateChannelFindChannelTemplateDetails
({
id
}).
then
(
res
=>
{
const
param
:
any
=
{
id
}
PublicApi
.
getTemplateWebPageTemplateWebFindChannelTemplateDetails
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setDetailInfo
(
res
.
data
)
}
...
...
@@ -43,8 +45,7 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
*/
const
handleConfirmUse
=
()
=>
{
setConfirmLoading
(
true
)
//@ts-ignore
PublicApi
.
postTemplateChannelUseChannelTemplate
({
id
}).
then
(
res
=>
{
PublicApi
.
postTemplateWebPageTemplateWebUseChannelTemplate
({
id
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setUseModalVisible
(
false
)
fetchDetail
()
...
...
src/pages/lxMall/order/index.tsx
View file @
3492bc3c
...
...
@@ -486,7 +486,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
}
}
/>
)
}
<
PayWay
supplyMembersId=
{
orderInfo
.
supplyMembersId
}
supplyMembersRoleId=
{
orderInfo
.
supplyMembersRoleId
}
selectItem=
{
selectPayWay
}
payWayList=
{
orderInfo
.
payWayList
}
onChange=
{
(
val
)
=>
setSelectPayWay
(
val
)
}
/>
<
PayWay
supplyMembersId=
{
orderInfo
.
supplyMembersId
}
deliveryType=
{
orderInfo
.
logistics
.
deliveryType
}
supplyMembersRoleId=
{
orderInfo
.
supplyMembersRoleId
}
selectItem=
{
selectPayWay
}
payWayList=
{
orderInfo
.
payWayList
}
onChange=
{
(
val
)
=>
setSelectPayWay
(
val
)
}
/>
{
/* <Delivery /> */
}
{
orderInfo
.
isInvoice
&&
<
Invoice
state=
{
needTheInvoice
}
onChange=
{
(
val
)
=>
setNeedTheInvoice
(
val
)
}
onSelect=
{
(
val
)
=>
setSelectInvoiceInfo
(
val
)
}
/>
...
...
src/pages/lxMall/order/payway/index.tsx
View file @
3492bc3c
...
...
@@ -14,15 +14,16 @@ interface PayWayProps {
selectItem
:
any
;
supplyMembersId
:
number
;
supplyMembersRoleId
:
number
;
deliveryType
?:
number
;
}
const
PayWay
:
React
.
FC
<
PayWayProps
>
=
(
props
)
=>
{
const
{
payWayList
=
[],
onChange
,
selectItem
=
{},
supplyMembersId
,
supplyMembersRoleId
}
=
props
const
{
payWayList
=
[],
onChange
,
selectItem
=
{},
supplyMembersId
,
deliveryType
=
1
,
supplyMembersRoleId
}
=
props
const
[
expand
,
setExpand
]
=
useState
<
boolean
>
(
false
)
const
[
creditInfo
,
setCreditInfo
]
=
useState
<
GetPayCreditGetCreditResponse
>
()
const
handleSelectWay
=
(
item
)
=>
{
if
(
item
.
payType
===
3
)
{
if
(
item
.
payType
===
3
||
item
.
payType
===
4
)
{
if
(
!
getCreditState
(
item
))
{
return
}
...
...
@@ -41,11 +42,11 @@ const PayWay: React.FC<PayWayProps> = (props) => {
},
[
payWayList
])
const
fetchCreditInfo
=
()
=>
{
let
param
=
{
const
param
:
any
=
{
parentMemberId
:
supplyMembersId
,
parentMemberRoleId
:
supplyMembersRoleId
}
//@ts-ignore
PublicApi
.
getPayCreditGetCredit
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setCreditInfo
(
res
.
data
)
...
...
@@ -62,6 +63,12 @@ const PayWay: React.FC<PayWayProps> = (props) => {
}
else
if
(
creditInfo
.
isUsable
===
0
)
{
result
=
false
}
}
else
if
(
info
.
payType
===
4
)
{
if
(
deliveryType
!==
1
)
{
result
=
false
}
else
{
result
=
true
}
}
return
result
}
...
...
src/pages/shop/shopTemplate/index.tsx
View file @
3492bc3c
...
...
@@ -4,19 +4,19 @@ import { history } from 'umi'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
TemplateItem
from
'../components/templateItem'
import
{
PublicApi
}
from
'@/services/api'
import
{
GetTemplate
ShopFindAllShelfShopTemplateResponse
}
from
'@/services
'
import
{
GetTemplate
WebPageTemplateWebFindAllShelfShopTemplateResponse
}
from
'@/services/TemplateApi
'
import
styles
from
'./index.less'
const
ShopTemplate
:
React
.
FC
=
()
=>
{
const
[
templateList
,
setTemplateList
]
=
useState
<
GetTemplate
Shop
FindAllShelfShopTemplateResponse
>
([])
const
[
templateList
,
setTemplateList
]
=
useState
<
GetTemplate
WebPageTemplateWeb
FindAllShelfShopTemplateResponse
>
([])
useEffect
(()
=>
{
fetchAllShelfShopTemplate
()
},
[])
const
fetchAllShelfShopTemplate
=
()
=>
{
PublicApi
.
getTemplate
Shop
FindAllShelfShopTemplate
().
then
(
res
=>
{
PublicApi
.
getTemplate
WebPageTemplateWeb
FindAllShelfShopTemplate
().
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setTemplateList
(
res
.
data
)
}
else
if
(
res
.
code
===
47001
)
{
...
...
src/pages/shop/templateDetail/index.tsx
View file @
3492bc3c
...
...
@@ -5,7 +5,7 @@ import DetailPage from '@/components/DetailPage'
import
UseModal
from
'../components/useModal'
import
{
PublicApi
}
from
'@/services/api'
import
{
Environment_Status
}
from
'@/constants'
import
{
GetTemplate
ShopFindShopTemplateDetailsResponse
}
from
'@/services
'
import
{
GetTemplate
WebPageTemplateWebFindShopTemplateDetailsResponse
}
from
'@/services/TemplateApi
'
import
default_img
from
'@/assets/imgs/template_default_img.png'
import
styles
from
'./index.less'
...
...
@@ -20,7 +20,7 @@ interface TemplateDetailPropsType {
const
TemplateDetail
:
React
.
FC
<
TemplateDetailPropsType
>
=
(
props
)
=>
{
const
{
query
:
{
type
,
id
}
}
=
props
.
location
const
[
detailInfo
,
setDetailInfo
]
=
useState
<
GetTemplate
Shop
FindShopTemplateDetailsResponse
>
()
const
[
detailInfo
,
setDetailInfo
]
=
useState
<
GetTemplate
WebPageTemplateWeb
FindShopTemplateDetailsResponse
>
()
const
[
useModalVisible
,
setUseModalVisible
]
=
useState
<
boolean
>
(
false
)
const
[
confirmLoading
,
setConfirmLoading
]
=
useState
(
false
)
...
...
@@ -30,8 +30,10 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
},
[])
const
fetchDetail
=
()
=>
{
//@ts-ignore
PublicApi
.
getTemplateShopFindShopTemplateDetails
({
id
}).
then
(
res
=>
{
const
param
:
any
=
{
id
}
PublicApi
.
getTemplateWebPageTemplateWebFindShopTemplateDetails
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setDetailInfo
(
res
.
data
)
}
...
...
@@ -43,8 +45,8 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
*/
const
handleConfirmUse
=
()
=>
{
setConfirmLoading
(
true
)
//@ts-ignore
PublicApi
.
postTemplate
Shop
UseShopTemplate
({
id
}).
then
(
res
=>
{
PublicApi
.
postTemplate
WebPageTemplateWeb
UseShopTemplate
({
id
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setUseModalVisible
(
false
)
fetchDetail
()
...
...
src/store/site/index.ts
View file @
3492bc3c
...
...
@@ -49,7 +49,7 @@ class SiteStore implements ISiteModule {
const
param
:
any
=
{
siteId
:
this
.
siteId
}
const
res
=
await
PublicApi
.
getTemplate
GoodsFindUseGoods
Template
(
param
)
const
res
=
await
PublicApi
.
getTemplate
WebPageTemplateWebFindGoodsDescribe
Template
(
param
)
runInAction
(()
=>
{
if
(
res
.
code
===
1000
)
{
this
.
commodityTemplateInfo
=
res
.
data
...
...
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