Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
孙龙
/
note-library
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
5b47dfc1
authored
Aug 24, 2023
by
孙龙
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'feature/sl/20230823-打印客户标签优化' into 'master'
标签系统优化 See merge request
!7
parents
e53182f5
855697e4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
public/js/web/design.js
resources/views/web/design.blade.php
public/js/web/design.js
View file @
5b47dfc1
...
@@ -132,9 +132,11 @@ var tag={
...
@@ -132,9 +132,11 @@ var tag={
$
(
".tools.act .tccj"
).
val
(
ele
.
attr
(
"tccj"
));
//图层层级
$
(
".tools.act .tccj"
).
val
(
ele
.
attr
(
"tccj"
));
//图层层级
$
(
".tools.act .fx"
).
val
(
ele
.
attr
(
"fx"
));
//方向
$
(
".tools.act .fx"
).
val
(
ele
.
attr
(
"fx"
));
//方向
$
(
".tools.act .zt"
).
val
(
ele
.
attr
(
"zt"
));
//字体
$
(
".tools.act .zt"
).
val
(
ele
.
attr
(
"zt"
));
//字体
ele
.
css
({
fontFamily
:
ele
.
attr
(
"zt"
)})
$
(
".tools.act .zh"
).
val
(
ele
.
attr
(
"zh"
));
//字号
$
(
".tools.act .zh"
).
val
(
ele
.
attr
(
"zh"
));
//字号
$
(
".tools.act .wenben"
).
val
(
ele
.
attr
(
"wenben"
));
//文本类容
$
(
".tools.act .wenben"
).
val
(
ele
.
attr
(
"wenben"
));
//文本类容
$
(
".tools.act .zsnd"
).
val
(
ele
.
attr
(
"zsnd"
));
//字色浓度
$
(
".tools.act .zsnd"
).
val
(
ele
.
attr
(
"zsnd"
));
//字色浓度
ele
.
css
({
fontWeight
:
ele
.
attr
(
"zsnd"
)})
$
(
".tools.act .zjj"
).
val
(
ele
.
attr
(
"zjj"
));
//字间距
$
(
".tools.act .zjj"
).
val
(
ele
.
attr
(
"zjj"
));
//字间距
$
(
".tools.act .ztys"
).
val
(
ele
.
attr
(
"ztys"
));
//字体颜色
$
(
".tools.act .ztys"
).
val
(
ele
.
attr
(
"ztys"
));
//字体颜色
$
(
".tools.act .zhg"
).
val
(
ele
.
attr
(
"zhg"
));
//字行高
$
(
".tools.act .zhg"
).
val
(
ele
.
attr
(
"zhg"
));
//字行高
...
...
resources/views/web/design.blade.php
View file @
5b47dfc1
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<div
class=
"tips"
>
请拖动此处标签制作工具到下方编辑区域编辑!
</div>
<div
class=
"tips"
>
请拖动此处标签制作工具到下方编辑区域编辑!
</div>
<div
class=
"items yuan"
name=
"round"
><div
class=
"round zctem"
type=
"1"
w=
"45"
h=
"45"
name=
"round"
xtys=
"#333"
></div><span>
圆形
</span></div>
<div
class=
"items yuan"
name=
"round"
><div
class=
"round zctem"
type=
"1"
w=
"45"
h=
"45"
name=
"round"
xtys=
"#333"
></div><span>
圆形
</span></div>
<div
class=
"items fang"
name=
"rectangle"
><div
class=
"rectangle zctem"
type=
"2"
w=
"70"
h=
"45"
name=
"rectangle"
xtys=
"#333"
></div><span>
矩形
</span></div>
<div
class=
"items fang"
name=
"rectangle"
><div
class=
"rectangle zctem"
type=
"2"
w=
"70"
h=
"45"
name=
"rectangle"
xtys=
"#333"
></div><span>
矩形
</span></div>
<div
class=
"items text"
name=
"textarea"
><textarea
class=
"textarea zctem"
zhg=
"26"
zh=
"14"
wenben=
"测试文本"
zt=
"黑体"
type=
"3"
w=
"200"
h=
"26"
ztys=
"#000000"
name=
"textarea"
placeholder=
"请输入文案"
>
测试文本
</textarea>
A
<span>
文本
</span></div>
<div
class=
"items text"
name=
"textarea"
><textarea
class=
"textarea zctem"
zhg=
"26"
zh=
"14"
zsnd=
"900"
wenben=
"测试文本"
zt=
"黑体"
type=
"3"
w=
"200"
h=
"26"
ztys=
"#000000"
name=
"textarea"
placeholder=
"请输入文案"
>
测试文本
</textarea>
A
<span>
文本
</span></div>
<div
class=
"items line"
name=
"lineit"
><div
class=
"lineit zctem"
type=
"4"
w=
"70"
h=
"1"
name=
"lineit"
xtys=
"#333"
></div><span>
线
</span></div>
<div
class=
"items line"
name=
"lineit"
><div
class=
"lineit zctem"
type=
"4"
w=
"70"
h=
"1"
name=
"lineit"
xtys=
"#333"
></div><span>
线
</span></div>
<div
class=
"items erweima"
name=
"erweimait"
style=
"background: url(http://img.ichunt.com/images/cms/201905/05/0998e54c5120aec61e6868943a67916e.png) no-repeat;background-size: 100% 100%;"
><div
class=
"zctem erweimait"
type=
"5"
w=
"45"
h=
"45"
name=
"erweimait"
style=
"background: url(http://img.ichunt.com/images/cms/201905/05/0998e54c5120aec61e6868943a67916e.png) no-repeat;background-size: 100% 100%;"
></div><span>
二维码
</span></div>
<div
class=
"items erweima"
name=
"erweimait"
style=
"background: url(http://img.ichunt.com/images/cms/201905/05/0998e54c5120aec61e6868943a67916e.png) no-repeat;background-size: 100% 100%;"
><div
class=
"zctem erweimait"
type=
"5"
w=
"45"
h=
"45"
name=
"erweimait"
style=
"background: url(http://img.ichunt.com/images/cms/201905/05/0998e54c5120aec61e6868943a67916e.png) no-repeat;background-size: 100% 100%;"
></div><span>
二维码
</span></div>
<div
class=
"items yiweima"
name=
"yiweimait"
style=
"background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/yiweima.png) no-repeat;background-size: 100% 100%;"
><div
class=
"zctem yiweimait"
type=
"5"
w=
"87"
h=
"35"
name=
"yiweimait"
style=
"background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/yiweima.png) no-repeat;background-size: 100% 100%;"
></div><span>
一维码
</span></div>
<div
class=
"items yiweima"
name=
"yiweimait"
style=
"background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/yiweima.png) no-repeat;background-size: 100% 100%;"
><div
class=
"zctem yiweimait"
type=
"5"
w=
"87"
h=
"35"
name=
"yiweimait"
style=
"background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/yiweima.png) no-repeat;background-size: 100% 100%;"
></div><span>
一维码
</span></div>
...
@@ -149,6 +149,7 @@
...
@@ -149,6 +149,7 @@
<div
class=
"group-value clr"
>
<div
class=
"group-value clr"
>
<span
class=
"fl"
>
字色浓度
</span>
<span
class=
"fl"
>
字色浓度
</span>
<select
class=
"zsnd fl"
>
<select
class=
"zsnd fl"
>
<option
value=
"900"
>
9
</option>
<option
value=
"100"
>
1
</option>
<option
value=
"100"
>
1
</option>
<option
value=
"200"
>
2
</option>
<option
value=
"200"
>
2
</option>
<option
value=
"300"
>
3
</option>
<option
value=
"300"
>
3
</option>
...
@@ -157,7 +158,7 @@
...
@@ -157,7 +158,7 @@
<option
value=
"600"
>
6
</option>
<option
value=
"600"
>
6
</option>
<option
value=
"700"
>
7
</option>
<option
value=
"700"
>
7
</option>
<option
value=
"800"
>
8
</option>
<option
value=
"800"
>
8
</option>
<option
value=
"900"
>
9
</option>
</select>
</select>
<span
class=
"fl"
>
字间距
</span><input
type=
"number"
class=
"zjj fl"
placeholder=
"输入数值"
/>
<span
class=
"fl"
>
字间距
</span><input
type=
"number"
class=
"zjj fl"
placeholder=
"输入数值"
/>
...
...
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