Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
marketing
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
marketing-web
marketing
Commits
e943eda1
Commit
e943eda1
authored
Sep 28, 2022
by
caoyanzhi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix/新建卡券-门店选择器bug' into dev
parents
e4e06dc5
0f78386d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
2 deletions
+1
-2
form.js
src/views/card/form.js
+0
-1
form.vue
src/views/card/form.vue
+1
-1
No files found.
src/views/card/form.js
View file @
e943eda1
...
...
@@ -688,7 +688,6 @@ export default {
initForm
.
useCardCodePrefix
=
this
.
form
.
useCardCodePrefix
;
initForm
.
cardCodePrefix
=
this
.
form
.
cardCodePrefix
;
this
.
uuid
=
''
;
this
.
storeUuid
=
''
;
this
.
originStoreList
=
[];
this
.
storeMode
=
0
;
...
...
src/views/card/form.vue
View file @
e943eda1
...
...
@@ -447,7 +447,7 @@
<
/div
>
<
div
class
=
"fz12 gray "
v
-
else
>*
仅支持选择账号管辖门店范围内的门店;
<
/div
>
<!--
:
readonly
=
"isEdit"
-->
<
vue
-
gic
-
store
-
card
class
=
"pt10"
:
readonly
=
"isInfo"
v
-
bind
=
"storeParams"
v
-
show
=
"storeMode"
ref
=
"storeCard"
:
uuid
.
sync
=
"uuid"
@
save
=
"flag => (submitLoading = flag)"
><
/vue-gic-store-card
>
<
vue
-
gic
-
store
-
card
class
=
"pt10"
:
readonly
=
"isInfo"
v
-
bind
=
"storeParams"
v
-
show
=
"storeMode"
ref
=
"storeCard"
:
uuid
.
sync
=
"uuid"
><
/vue-gic-store-card
>
<!--
<
dm
-
store
-
selector
v
-
if
=
"isAdd ? storeMode : storeMode && !isAdd && uuid"
:
readonly
=
"isInfo"
v
-
bind
=
"storeParams"
ref
=
"storeCard"
:
uuid
.
sync
=
"uuid"
><
/dm-store-selector> --
>
<
el
-
alert
v
-
show
=
"storeMode && form.cardApplyChannel.indexOf('WMmicroMall') !== -1"
title
=
"选择的门店必须保持与微盟侧门店一致,请确认选择无误"
type
=
"warning"
show
-
icon
:
closable
=
"false"
class
=
"mt20 width80"
><
/el-alert
>
<
/el-form-item
>
...
...
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