Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
Project
Project
Details
Activity
Releases
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
黄媛媛
ElectricitySheep
Commits
6bef4dc6
Commit
6bef4dc6
authored
May 22, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
dadec8da
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
13 deletions
+40
-13
ShufflingFigure.vue
src/components/StoreDesign/ShufflingFigure.vue
+8
-3
customPoster.vue
src/components/StoreDesign/customPoster.vue
+21
-3
navigationIcon.vue
src/components/StoreDesign/navigationIcon.vue
+1
-1
storesManage.vue
src/components/StoreDesign/storesManage.vue
+9
-5
videoManage.vue
src/components/StoreDesign/videoManage.vue
+1
-1
No files found.
src/components/StoreDesign/ShufflingFigure.vue
View file @
6bef4dc6
...
@@ -39,11 +39,11 @@
...
@@ -39,11 +39,11 @@
<!-- 选择图片文件 -->
<!-- 选择图片文件 -->
<el-dialog
:title=
"commonTitle"
:visible
.
sync=
"isShowLunbo"
width=
"960px"
>
<el-dialog
:title=
"commonTitle"
:visible
.
sync=
"isShowLunbo"
width=
"960px"
>
<el-form
label-width=
"100px"
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
>
<el-form
label-width=
"100px"
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
>
<el-form-item
label=
"标题"
>
<el-form-item
label=
"标题"
prop=
"NavName"
>
<el-input
type=
"text"
v-model=
"addMsg.NavName"
size=
"small"
maxlength=
"
10
0"
></el-input>
<el-input
type=
"text"
v-model=
"addMsg.NavName"
size=
"small"
maxlength=
"
5
0"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"跳转链接"
>
<el-form-item
label=
"跳转链接"
>
<el-input
type=
"text"
v-model=
"addMsg.NavLink"
size=
"small"
maxlength=
"200"
>
<el-input
type=
"text"
v-model=
"addMsg.NavLink"
size=
"small"
:disabled=
"true"
maxlength=
"200"
>
<el-button
slot=
"append"
@
click=
"isShowLink=true"
>
选择链接
</el-button>
<el-button
slot=
"append"
@
click=
"isShowLink=true"
>
选择链接
</el-button>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
...
@@ -98,6 +98,11 @@
...
@@ -98,6 +98,11 @@
NavImg
:
''
//图片链接
NavImg
:
''
//图片链接
},
},
rules
:
{
rules
:
{
NavName
:[{
required
:
true
,
message
:
"标题不能为空"
,
trigger
:
"change"
}],
NavImg
:
[{
NavImg
:
[{
required
:
true
,
required
:
true
,
message
:
"图片不能为空"
,
message
:
"图片不能为空"
,
...
...
src/components/StoreDesign/customPoster.vue
View file @
6bef4dc6
...
@@ -418,8 +418,12 @@
...
@@ -418,8 +418,12 @@
<div
class=
"custom_formBody"
>
<div
class=
"custom_formBody"
>
<div
style=
"margin-bottom:15px;"
>
<div
style=
"margin-bottom:15px;"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"建议尺寸:750 * 1334"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"建议尺寸:750 * 1334"
placement=
"top"
>
<el-button
size=
"mini"
>
更换背景图
</el-button>
<el-button
size=
"mini"
@
click=
"choicImg=true"
>
更换背景图
</el-button>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"恢复默认图"
placement=
"top"
>
<el-button
size=
"mini"
@
click=
"ShareMsg.PosterBgImg=sharePosterDefaultImg"
>
恢复默认背景
</el-button>
</el-tooltip>
</div>
</div>
<div
flex=
"wrap:wrap"
>
<div
flex=
"wrap:wrap"
>
<div
class=
"custom_component"
v-for=
"(item,index) in ShareTabs"
:key=
"index"
<div
class=
"custom_component"
v-for=
"(item,index) in ShareTabs"
:key=
"index"
...
@@ -679,14 +683,21 @@
...
@@ -679,14 +683,21 @@
<
template
v-else
>
<
template
v-else
>
<thematicPosters></thematicPosters>
<thematicPosters></thematicPosters>
</
template
>
</
template
>
<!-- 选择图片文件 -->
<el-dialog
title=
"选择文件"
:visible
.
sync=
"choicImg"
width=
"1240px"
>
<ChooseImg
@
SelectId=
"SelectId"
></ChooseImg>
</el-dialog>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
PictureCheck
from
"../common/PictureCheck.vue"
import
PictureCheck
from
"../common/PictureCheck.vue"
import
thematicPosters
from
"../StoreDesign/thematicPosters.vue"
import
thematicPosters
from
"../StoreDesign/thematicPosters.vue"
import
ChooseImg
from
"@/components/global/ChooseImg.vue"
;
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
//选择背景图
choicImg
:
false
,
activeName
:
'1'
,
activeName
:
'1'
,
checkIndex
:
1
,
checkIndex
:
1
,
//二维码最大上边距
//二维码最大上边距
...
@@ -750,7 +761,8 @@
...
@@ -750,7 +761,8 @@
created
()
{},
created
()
{},
components
:
{
components
:
{
PictureCheck
,
PictureCheck
,
thematicPosters
thematicPosters
,
ChooseImg
},
},
methods
:
{
methods
:
{
//切换
//切换
...
@@ -898,7 +910,13 @@
...
@@ -898,7 +910,13 @@
this
.
Info
(
res
.
data
.
message
);
this
.
Info
(
res
.
data
.
message
);
}
}
})
})
}
},
//选择图片
SelectId
(
msg
)
{
this
.
ShareMsg
.
PosterBgImg
=
this
.
getIconLink
(
msg
.
url
);
this
.
choicImg
=
false
;
},
},
},
mounted
()
{
mounted
()
{
this
.
maxTwocodeTop
=
1334
-
this
.
ShareMsg
.
QrCodeSize
;
this
.
maxTwocodeTop
=
1334
-
this
.
ShareMsg
.
QrCodeSize
;
...
...
src/components/StoreDesign/navigationIcon.vue
View file @
6bef4dc6
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
<el-input
v-model=
"addMsg.NavIconName"
class=
"w400"
size=
"small"
placeholder=
"请输入名称"
maxlength=
"20"
/>
<el-input
v-model=
"addMsg.NavIconName"
class=
"w400"
size=
"small"
placeholder=
"请输入名称"
maxlength=
"20"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"排序"
prop=
"NavIconSort"
>
<el-form-item
label=
"排序"
prop=
"NavIconSort"
>
<el-input
type=
"text"
v-model=
"addMsg.NavIconSort"
size=
"small"
class=
"w400"
placeholder=
"请输入排序"
<el-input
type=
"text"
v-model=
"addMsg.NavIconSort"
@
keyup
.
native=
"checkInteger(addMsg,'NavIconSort')"
size=
"small"
class=
"w400"
placeholder=
"请输入排序"
maxlength=
"4"
/>
maxlength=
"4"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"导航图标"
prop=
"NavIconImg"
>
<el-form-item
label=
"导航图标"
prop=
"NavIconImg"
>
...
...
src/components/StoreDesign/storesManage.vue
View file @
6bef4dc6
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<template
v-if=
"storesIsShowAdd"
>
<template
v-if=
"storesIsShowAdd"
>
<div
class=
"head-title"
>
<div
class=
"head-title"
>
门店管理
门店管理
<el-button
@
click=
"storesIsShowAdd=false"
style=
"float:right;margin-top: -5px;"
size=
"small"
type=
"primary"
>
<el-button
@
click=
"storesIsShowAdd=false
,clearMsg()
"
style=
"float:right;margin-top: -5px;"
size=
"small"
type=
"primary"
>
添加门店
添加门店
</el-button>
</el-button>
</div>
</div>
...
@@ -58,10 +58,10 @@
...
@@ -58,10 +58,10 @@
<div
class=
"el-row"
>
<div
class=
"el-row"
>
<div
class=
"el-col el-col-12"
>
<div
class=
"el-col el-col-12"
>
<el-form-item
label=
"门店名称"
prop=
"Name"
>
<el-form-item
label=
"门店名称"
prop=
"Name"
>
<el-input
type=
"text"
placeholder=
"请输入门店名称"
v-model=
"addMsg.Name"
size=
"small"
></el-input>
<el-input
type=
"text"
placeholder=
"请输入门店名称"
v-model=
"addMsg.Name"
maxlength=
"50"
size=
"small"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"联系电话"
prop=
"Tel"
>
<el-form-item
label=
"联系电话"
prop=
"Tel"
>
<el-input
type=
"text"
placeholder=
"请输入门店联系电话"
v-model=
"addMsg.Tel"
size=
"small"
></el-input>
<el-input
type=
"text"
placeholder=
"请输入门店联系电话"
v-model=
"addMsg.Tel"
maxlength=
"20"
size=
"small"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"门店地址"
prop=
"Address"
>
<el-form-item
label=
"门店地址"
prop=
"Address"
>
<el-input
type=
"text"
placeholder=
"请输入门店地址"
v-model=
"addMsg.Address"
size=
"small"
></el-input>
<el-input
type=
"text"
placeholder=
"请输入门店地址"
v-model=
"addMsg.Address"
size=
"small"
></el-input>
...
@@ -116,13 +116,13 @@
...
@@ -116,13 +116,13 @@
</div>
</div>
</el-form-item>
</el-form-item>
<el-form-item
label=
"营业时间"
>
<el-form-item
label=
"营业时间"
>
<el-time-select
placeholder=
"起始时间"
v-model=
"addMsg.StartTime"
size=
"small"
:picker-options=
"
{
<el-time-select
placeholder=
"起始时间"
v-model=
"addMsg.StartTime"
:disabled=
"checked"
size=
"small"
:picker-options=
"
{
start: '00:00',
start: '00:00',
step: '00:15',
step: '00:15',
end: '23:45'
end: '23:45'
}">
}">
</el-time-select>
</el-time-select>
<el-time-select
placeholder=
"结束时间"
v-model=
"addMsg.EndTime"
size=
"small"
:picker-options=
"
{
<el-time-select
placeholder=
"结束时间"
v-model=
"addMsg.EndTime"
:disabled=
"checked"
size=
"small"
:picker-options=
"
{
start: '00:00',
start: '00:00',
step: '00:15',
step: '00:15',
end: '23:45',
end: '23:45',
...
@@ -292,6 +292,7 @@
...
@@ -292,6 +292,7 @@
this
.
addMsg
.
StartTime
=
''
;
this
.
addMsg
.
StartTime
=
''
;
this
.
addMsg
.
EndTime
=
''
;
this
.
addMsg
.
EndTime
=
''
;
this
.
addMsg
.
IsAllDay
=
0
;
this
.
addMsg
.
IsAllDay
=
0
;
this
.
checked
=
false
;
},
},
//修改
//修改
EditstoreManage
(
item
)
{
EditstoreManage
(
item
)
{
...
@@ -313,6 +314,9 @@
...
@@ -313,6 +314,9 @@
this
.
addMsg
.
StartTime
=
jsonData
.
StartTime
;
this
.
addMsg
.
StartTime
=
jsonData
.
StartTime
;
this
.
addMsg
.
EndTime
=
jsonData
.
EndTime
;
this
.
addMsg
.
EndTime
=
jsonData
.
EndTime
;
this
.
addMsg
.
IsAllDay
=
jsonData
.
IsAllDay
;
this
.
addMsg
.
IsAllDay
=
jsonData
.
IsAllDay
;
if
(
this
.
addMsg
.
IsAllDay
==
1
){
this
.
checked
=
true
;
}
}
else
{
}
else
{
this
.
Info
(
res
.
data
.
message
);
this
.
Info
(
res
.
data
.
message
);
}
}
...
...
src/components/StoreDesign/videoManage.vue
View file @
6bef4dc6
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
</div>
</div>
</el-form-item>
</el-form-item>
<el-form-item
label=
"排序"
>
<el-form-item
label=
"排序"
>
<el-input
v-model=
"addMsg.SortNum"
size=
"small"
maxlength=
"50
"
/>
<el-input
v-model=
"addMsg.SortNum"
@
keyup
.
native=
"checkInteger(addMsg,'SortNum')"
size=
"small"
maxlength=
"4
"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"详情介绍"
>
<el-form-item
label=
"详情介绍"
>
<el-input
type=
"textarea"
v-model=
"addMsg.VedioIntro"
:rows=
"4"
maxlength=
"200"
/>
<el-input
type=
"textarea"
v-model=
"addMsg.VedioIntro"
:rows=
"4"
maxlength=
"200"
/>
...
...
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