Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
integral-mall
Overview
Overview
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
integralMall
integral-mall
Commits
49aa44d0
Commit
49aa44d0
authored
Mar 03, 2022
by
crushh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: 修复
parent
2edaff9e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
25 deletions
+20
-25
relatePop.vue
src/components/relatePop.vue
+4
-2
ruleDetail.vue
src/components/ruleDetail.vue
+2
-11
product.js
src/store/vuex/product.js
+5
-0
main.vue
src/views/main.vue
+9
-0
editDeliver.vue
src/views/setting/editDeliver.vue
+0
-12
No files found.
src/components/relatePop.vue
View file @
49aa44d0
<
template
>
<el-dialog
title=
""
:key=
"updateDialog"
:visible
.
sync=
"dialogTableVisible"
:before-close=
"closePop"
width=
"1000px"
destroy-on-close
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClick"
>
<el-tab-pane
label=
"上架规则"
name=
"list"
>
...
...
@@ -135,6 +136,7 @@ export default {
},
dialogTableVisible
:
false
,
echoRuleId
:
''
,
updateDialog
:
false
,
};
},
watch
:
{
...
...
@@ -145,7 +147,6 @@ export default {
},
},
mounted
()
{
},
methods
:
{
onRowClick
(
row
)
{
...
...
@@ -185,6 +186,7 @@ export default {
pageSize
:
5
,
currentPage
:
1
,
};
this
.
updateDialog
=
!
this
.
updateDialog
;
this
.
dialogTableVisible
=
false
;
this
.
btnLoading
=
false
;
},
...
...
src/components/ruleDetail.vue
View file @
49aa44d0
...
...
@@ -28,7 +28,7 @@
/>
</el-form-item>
<el-form-item
label=
"适用人群"
prop=
"memberType"
>
<span
class=
"tips"
>
【人群筛选器】类型的上架规则最多支持20条,目前已创建
<span
style=
"color:#1890ff"
>
{{
memberTypeTotal
}}
</span>
条
</span>
<span
v-if=
"$store.state.product.ruleMemberFilterClose==0"
class=
"tips"
>
【人群筛选器】类型的上架规则最多支持20条,目前已创建
<span
style=
"color:#1890ff"
>
{{
memberTypeTotal
}}
</span>
条
</span>
<div>
<el-radio
v-model=
"ruleForm.memberType"
:label=
"1"
>
全部客户
...
...
@@ -40,7 +40,7 @@
v-model=
"ruleForm.memberType"
:label=
"3"
:disabled=
"memberTypeTotal>=20&&isAdd"
v-if=
"ruleMemberFilterClose==0"
v-if=
"
$store.state.product.
ruleMemberFilterClose==0"
>
人群筛选器
</el-radio>
...
...
@@ -121,7 +121,6 @@ export default {
btnLoading
:
false
,
uuid
:
''
,
memberTypeTotal
:
0
,
ruleMemberFilterClose
:
0
,
// 是否关闭人群筛选器
};
},
computed
:
{
...
...
@@ -141,16 +140,8 @@ export default {
copy
:
'复制上架规则'
,
};
this
.
breadcrumbTitle
=
obj
[
this
.
$route
.
meta
.
type
];
this
.
getRuleMemberFilterClose
();
},
methods
:
{
// 检测是否开启 人群筛选器
getRuleMemberFilterClose
()
{
request
.
get
(
'/api-integral-mall/get-config'
).
then
(
res
=>
{
const
result
=
res
.
data
.
result
||
{};
this
.
ruleMemberFilterClose
=
result
.
ruleMemberFilterClose
;
});
},
/** 门店筛选器 */
storeChange
(
storeId
)
{
this
.
uuid
=
storeId
;
...
...
src/store/vuex/product.js
View file @
49aa44d0
...
...
@@ -5,6 +5,7 @@ const state = {
total
:
0
,
canUseMenuUrl
:
[],
erpGoodsFlag
:
0
,
ruleMemberFilterClose
:
0
,
};
// getters
...
...
@@ -64,6 +65,10 @@ const mutations = {
mutations_erpGoodsFlag
(
state
,
val
)
{
state
.
erpGoodsFlag
=
val
;
},
// 是否关闭人群筛选器
mutations_ruleMemberFilterClose
(
state
,
val
)
{
state
.
ruleMemberFilterClose
=
val
;
},
};
export
default
{
...
...
src/views/main.vue
View file @
49aa44d0
...
...
@@ -28,6 +28,7 @@
</
template
>
<
script
>
import
bus
from
'../assets/eventBus.js'
;
import
request
from
'@/service/request.js'
;
export
default
{
components
:
{},
data
()
{
...
...
@@ -51,8 +52,16 @@ export default {
// 刷新左侧菜单
that
.
$refs
.
leftmenu
.
handleSelect
(
key
);
});
this
.
getRuleMemberFilterClose
();
},
methods
:
{
// 检测是否 关闭人群筛选器
getRuleMemberFilterClose
()
{
request
.
get
(
'/api-integral-mall/get-config'
).
then
(
res
=>
{
const
result
=
res
.
data
.
result
||
{};
this
.
$store
.
commit
(
'mutations_ruleMemberFilterClose'
,
result
.
ruleMemberFilterClose
);
});
},
// 处理路由跳转
toRouterView
(
val
)
{
const
that
=
this
;
...
...
src/views/setting/editDeliver.vue
View file @
49aa44d0
...
...
@@ -448,7 +448,6 @@ export default {
// let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
// this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
// }
this
.
getErpGoodsFlag
();
},
methods
:
{
// 添加时间段
...
...
@@ -816,17 +815,6 @@ export default {
name
:
'deliverSet'
,
});
},
// 检测是否开启 erp商品兑换接口
getErpGoodsFlag
()
{
request
.
get
(
'/api-integral-mall/get-config'
).
then
(
res
=>
{
if
(
res
.
data
.
errorCode
===
0
)
{
const
result
=
res
.
data
.
result
||
{};
this
.
$store
.
commit
(
'mutations_erpGoodsFlag'
,
result
.
goodsStockSync
||
0
);
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
});
},
},
};
</
script
>
...
...
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