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
shenshaokai
jinfa-platform
Commits
b05baa6d
Commit
b05baa6d
authored
Nov 18, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev
parents
839a4a15
96884935
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
16 deletions
+19
-16
index.tsx
...ingsPanel/propsSettings/components/BrandSetting/index.tsx
+4
-4
index.tsx
...ingsPanel/propsSettings/components/GoodsSetting/index.tsx
+6
-5
index.tsx
...tingsPanel/propsSettings/components/ShopSetting/index.tsx
+4
-4
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+2
-2
index.less
src/pages/lxMall/layouts/index.less
+2
-0
index.tsx
src/pages/lxMall/purchaseOrder/index.tsx
+1
-1
No files found.
src/pages/editor/settingsPanel/propsSettings/components/BrandSetting/index.tsx
View file @
b05baa6d
...
...
@@ -108,10 +108,10 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
if
(
JSON
.
stringify
(
brandList
)
===
JSON
.
stringify
(
selectBrandList
))
{
return
}
if
(
selectBrandList
.
length
<=
0
)
{
message
.
error
(
"请选择要推荐的品牌"
)
return
}
//
if (selectBrandList.length <= 0) {
//
message.error("请选择要推荐的品牌")
//
return
//
}
setConfirmLoading
(
true
)
saveBrand
().
then
(()
=>
{
changeProps
({
...
...
src/pages/editor/settingsPanel/propsSettings/components/GoodsSetting/index.tsx
View file @
b05baa6d
...
...
@@ -190,11 +190,12 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
if
(
JSON
.
stringify
(
goodsList
)
===
JSON
.
stringify
(
selectGoodsList
))
{
return
}
console
.
log
(
'handleConfirmSave2'
)
if
(
selectGoodsList
.
length
<=
0
)
{
message
.
error
(
"请选择要推荐的商品"
)
return
}
else
if
(
selectGoodsList
.
length
>
10
)
{
// console.log('handleConfirmSave2')
// if (selectGoodsList.length <= 0) {
// message.error("请选择要推荐的商品")
// return
// } else
if
(
selectGoodsList
.
length
>
10
)
{
message
.
error
(
"最多只能推荐10件商品"
)
return
}
...
...
src/pages/editor/settingsPanel/propsSettings/components/ShopSetting/index.tsx
View file @
b05baa6d
...
...
@@ -110,10 +110,10 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
return
}
if
(
selectShopsList
.
length
<=
0
)
{
message
.
error
(
"请选择要推荐的店铺"
)
return
}
//
if (selectShopsList.length <= 0) {
//
message.error("请选择要推荐的店铺")
//
return
//
}
setConfirmLoading
(
true
)
saveShop
().
then
(()
=>
{
changeProps
({
...
...
src/pages/lxMall/commodityDetail/index.tsx
View file @
b05baa6d
...
...
@@ -460,9 +460,9 @@ const CommodityDetail = (props) => {
return
}
if
(
stock
Count
<
commodityDetail
.
minOrder
)
{
if
(
buy
Count
<
commodityDetail
.
minOrder
)
{
message
.
destroy
()
message
.
info
(
"
库存不足
"
)
message
.
info
(
"
购买数量不能低于最小购买量
"
)
return
}
...
...
src/pages/lxMall/layouts/index.less
View file @
b05baa6d
...
...
@@ -3,5 +3,6 @@
.content {
position: relative;
min-height: 600px;
}
}
\ No newline at end of file
src/pages/lxMall/purchaseOrder/index.tsx
View file @
b05baa6d
...
...
@@ -734,7 +734,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
}
</
div
>
<
div
className=
{
cx
(
styles
.
order_list_item_item
,
styles
.
count
)
}
>
<
InputNumber
disabled=
{
true
}
max=
{
childItem
.
stockCount
||
0
}
min=
{
childItem
.
commodityUnitPrice
.
commodity
.
minOrder
||
1
}
value=
{
childItem
.
count
}
onChange=
{
(
value
)
=>
handleCountChange
(
value
,
childItem
.
id
)
}
/>
<
InputNumber
max=
{
childItem
.
stockCount
||
0
}
min=
{
childItem
.
commodityUnitPrice
.
commodity
.
minOrder
||
1
}
value=
{
childItem
.
count
}
onChange=
{
(
value
)
=>
handleCountChange
(
value
,
childItem
.
id
)
}
/>
<
div
className=
{
styles
.
stock
}
>
<
span
>
(库存
{
numFormat
(
childItem
.
stockCount
)
}{
childItem
.
commodityUnitPrice
.
commodity
.
unitName
}
)
</
span
>
</
div
>
...
...
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