Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
traceSourceMb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yanyanhong
traceSourceMb
Commits
554a79c4
Commit
554a79c4
authored
Aug 03, 2020
by
yyh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式调整
parent
1d072e9e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
14 deletions
+36
-14
AddBaseinfo.vue
src/views/proof/components/AddBaseinfo.vue
+4
-5
Add.vue
src/views/template/Add.vue
+2
-1
AddOption.vue
src/views/template/components/AddOption.vue
+11
-1
BaseInfo.vue
src/views/template/components/BaseInfo.vue
+19
-7
No files found.
src/views/proof/components/AddBaseinfo.vue
View file @
554a79c4
...
@@ -38,11 +38,10 @@ import { Route } from 'vue-router';
...
@@ -38,11 +38,10 @@ import { Route } from 'vue-router';
export
default
class
AddBaseinfo
extends
Vue
{
export
default
class
AddBaseinfo
extends
Vue
{
private
show
:
boolean
=
true
;
private
show
:
boolean
=
true
;
@
Prop
({
}
)
private
templateInfo
!
:
any
;
@
Prop
({
}
)
private
templateInfo
!
:
any
;
@
Model
(
'input'
,{
}
)
@
Model
(
'input'
,
{
}
)
proofName
!
:
string
;
private
proofName
!
:
string
;
@
Emit
(
'input'
)
@
Emit
(
'input'
)
change
(
value
:
string
)
{
private
change
(
value
:
string
)
{
return
value
;
return
value
;
}
}
private
cancle
()
{
private
cancle
()
{
...
@@ -68,7 +67,7 @@ export default class AddBaseinfo extends Vue {
...
@@ -68,7 +67,7 @@ export default class AddBaseinfo extends Vue {
this
.
$toast
(
'请填写模板名称'
);
this
.
$toast
(
'请填写模板名称'
);
return
;
return
;
}
}
this
.
$emit
(
'next'
)
this
.
$emit
(
'next'
)
;
}
}
}
}
<
/script
>
<
/script
>
...
...
src/views/template/Add.vue
View file @
554a79c4
...
@@ -416,7 +416,6 @@ export default class Add extends Vue {
...
@@ -416,7 +416,6 @@ export default class Add extends Vue {
text-align
:
left
;
text-align
:
left
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
padding
:
10px
;
font-size
:
10px
;
font-size
:
10px
;
line-height
:
1
.5
;
line-height
:
1
.5
;
color
:
#818181
;
color
:
#818181
;
...
@@ -456,6 +455,7 @@ export default class Add extends Vue {
...
@@ -456,6 +455,7 @@ export default class Add extends Vue {
box-shadow
:
0px
2px
4px
0px
rgba
(
241
,
243
,
251
,
1
);
box-shadow
:
0px
2px
4px
0px
rgba
(
241
,
243
,
251
,
1
);
background
:
#FFFFFF
;
background
:
#FFFFFF
;
.preview
{
.preview
{
align-self
:
center
;
color
:
#353535
;
color
:
#353535
;
background
:
#F0F1F5
;
background
:
#F0F1F5
;
border-radius
:
4px
;
border-radius
:
4px
;
...
@@ -465,6 +465,7 @@ export default class Add extends Vue {
...
@@ -465,6 +465,7 @@ export default class Add extends Vue {
}
}
.confirm
{
.confirm
{
flex
:
auto
;
flex
:
auto
;
align-self
:
center
;
width
:
228px
;
width
:
228px
;
padding
:
9px
;
padding
:
9px
;
color
:
#FFFFFF
;
color
:
#FFFFFF
;
...
...
src/views/template/components/AddOption.vue
View file @
554a79c4
...
@@ -23,7 +23,8 @@
...
@@ -23,7 +23,8 @@
<div
@
click=
"addOption"
style=
"color:#3F79FE;padding:17px;"
><common-svg
name=
"tianjia"
style=
"margin-right:10px;"
></common-svg>
添加选项
</div>
<div
@
click=
"addOption"
style=
"color:#3F79FE;padding:17px;"
><common-svg
name=
"tianjia"
style=
"margin-right:10px;"
></common-svg>
添加选项
</div>
</div>
</div>
</div>
</div>
<van-button
block
color=
"#5D7BF6"
type=
"primary"
@
click=
"confirmWordType"
>
确定
</van-button>
<div
class=
"btn-group"
><van-button
block
color=
"#5D7BF6"
type=
"primary"
@
click=
"confirmWordType"
>
确定
</van-button></div>
</div>
</div>
</template>
</template>
<
script
lang=
"ts"
>
<
script
lang=
"ts"
>
...
@@ -124,11 +125,20 @@ export default class AddOption extends Vue {
...
@@ -124,11 +125,20 @@ export default class AddOption extends Vue {
grid-template-columns
:
auto
27px
;
grid-template-columns
:
auto
27px
;
grid-template-rows
:
repeat
(
2
,
30px
);
grid-template-rows
:
repeat
(
2
,
30px
);
grid-auto-flow
:
column
dense
;
grid-auto-flow
:
column
dense
;
place-items
:
center
start
;
.active
{
.active
{
grid-column
:
2
/
span
1
;
grid-column
:
2
/
span
1
;
grid-row
:
1
/
span
2
;
grid-row
:
1
/
span
2
;
place-self
:
center
;
place-self
:
center
;
}
}
.title
{
color
:
#353535
;
font-size
:
15px
;
}
.desc
{
color
:
#737582
;
font-size
:
10px
;
}
}
}
}
}
}
}
...
...
src/views/template/components/BaseInfo.vue
View file @
554a79c4
...
@@ -2,20 +2,24 @@
...
@@ -2,20 +2,24 @@
<van-popup
<van-popup
v-model=
"show"
v-model=
"show"
position=
"bottom"
position=
"bottom"
round
:close-on-click-overlay=
"false"
:close-on-click-overlay=
"false"
:style=
"
{height: '80%'}"
:style=
"
{height: '80%'}"
class="base-info">
class="base-info">
<div
style=
"position:relative;margin-bottom:26px;"
>
<div
style=
"position:relative;margin-bottom:26px;
font-size:18px;
"
>
<common-svg
<common-svg
@
click
.
native=
"cancel"
@
click
.
native=
"cancel"
name=
"shanchu"
name=
"shanchu
5
"
style=
"position:absolute;left:17px;"
></common-svg>
style=
"position:absolute;left:17px;"
></common-svg>
<span>
创建模板
</span>
<span>
创建模板
</span>
</div>
</div>
<van-field
v-model=
"templateName"
placeholder=
"填写模板名称"
></van-field>
<van-field
v-model=
"templateName"
placeholder=
"填写模板名称"
></van-field>
<input
type=
"file"
id=
"thumb"
style=
"display:none"
@
change=
"handleFileChange"
>
<input
type=
"file"
id=
"thumb"
style=
"display:none"
@
change=
"handleFileChange"
>
<label
for=
"thumb"
class=
"file-input"
>
<label
for=
"thumb"
class=
"file-input"
>
<common-svg
name=
"tianjia"
style=
"margin-right:10px;"
></common-svg><span>
添加模板封面
</span><common-svg
name=
"jinru"
></common-svg>
<common-svg
name=
"tianjia"
style=
"margin-right:10px;"
></common-svg>
<span>
{{
imgUrl
?
'已上传'
:
'添加模板封面'
}}
</span>
<van-image
:src=
"imgUrl"
v-if=
"imgUrl"
height=
"24px"
width=
"33px"
fit=
"contain"
></van-image>
<common-svg
name=
"jinru"
></common-svg>
</label>
</label>
<div
class=
"btn-group"
>
<div
class=
"btn-group"
>
<div>
所在文件夹:
<span
class=
"classify"
@
click=
"show2 = true;"
>
{{
folder
.
name
}}
</span></div>
<div>
所在文件夹:
<span
class=
"classify"
@
click=
"show2 = true;"
>
{{
folder
.
name
}}
</span></div>
...
@@ -37,7 +41,7 @@
...
@@ -37,7 +41,7 @@
</
template
>
</
template
>
<
script
lang=
"ts"
>
<
script
lang=
"ts"
>
import
{
Component
,
Prop
,
Vue
,
Emit
}
from
'vue-property-decorator'
;
import
{
Component
,
Prop
,
Vue
,
Emit
}
from
'vue-property-decorator'
;
import
{
Collapse
,
CollapseItem
,
Field
,
Button
,
NavBar
,
SwipeCell
,
Popup
,
Uploader
,
Picker
}
from
'vant'
;
import
{
Collapse
,
CollapseItem
,
Field
,
Button
,
NavBar
,
SwipeCell
,
Popup
,
Uploader
,
Picker
,
Image
}
from
'vant'
;
import
{
TEMPLATETYPE
}
from
'@/const/enum'
;
import
{
TEMPLATETYPE
}
from
'@/const/enum'
;
@
Component
({
@
Component
({
components
:
{
components
:
{
...
@@ -50,6 +54,7 @@ import { TEMPLATETYPE } from '@/const/enum';
...
@@ -50,6 +54,7 @@ import { TEMPLATETYPE } from '@/const/enum';
[
Popup
.
name
]:
Popup
,
[
Popup
.
name
]:
Popup
,
[
Uploader
.
name
]:
Uploader
,
[
Uploader
.
name
]:
Uploader
,
[
Picker
.
name
]:
Picker
,
[
Picker
.
name
]:
Picker
,
[
Image
.
name
]:
Image
,
},
},
})
})
export
default
class
BaseInfo
extends
Vue
{
export
default
class
BaseInfo
extends
Vue
{
...
@@ -107,16 +112,23 @@ export default class BaseInfo extends Vue {
...
@@ -107,16 +112,23 @@ export default class BaseInfo extends Vue {
<
style
scoped
lang=
"scss"
>
<
style
scoped
lang=
"scss"
>
.base-info
{
.base-info
{
padding
:
17px
0
0
;
padding
:
17px
0
0
;
::v-deep
.van-field__control
{
color
:
#353535
;
font-size
:
22px
;
}
::-webkit-input-placeholder
{
color
:
#CDCDCD
}
.file-input
{
.file-input
{
display
:
grid
;
display
:
grid
;
grid-template-columns
:
20px
auto
10px
;
grid-template-columns
:
20px
auto
40px
10px
;
place-items
:
center
;
place-items
:
center
;
padding
:
7px
17px
;
padding
:
0
17px
;
background
:
#F9F9FB
;
background
:
#F9F9FB
;
color
:
#444444
;
color
:
#444444
;
font-size
:
14px
;
font-size
:
14px
;
span
{
span
{
place-self
:
start
;
place-self
:
center
start
;
}
}
}
}
.btn-group
{
.btn-group
{
...
...
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