Skip to content

孙龙 / note-library

Go to a project
Commit d3f87f53 by 孙龙
Options

Merge branch 'master' of http://119.23.72.7/sunlong_v5/note-library

parents f1bc9ba7 2053e8ab
Inline Side-by-side
Showing with 9 additions and 9 deletions
public/css/style.css
...@@ -8791,7 +8791,7 @@ textarea{ ...@@ -8791,7 +8791,7 @@ textarea{
resize: none; resize: none;
border: 0px; border: 0px;
overflow: hidden; overflow: hidden;
line-height: 22px; line-height: 26px;
color:#333; color:#333;
background: rgba(225, 225, 225, 0) background: rgba(225, 225, 225, 0)
} }
......
public/js/web/design.js
...@@ -75,6 +75,7 @@ var tag={ ...@@ -75,6 +75,7 @@ var tag={
$('#colorpicker').colorpicker(); $('#colorpicker').colorpicker();
//编辑画布渲染样式 //编辑画布渲染样式
var gezilist=$(".tag-size").val().split("*"); var gezilist=$(".tag-size").val().split("*");
var gnum=(Number(gezilist[0])/20)*(Number(gezilist[1])/20); var gnum=(Number(gezilist[0])/20)*(Number(gezilist[1])/20);
var html=""; var html="";
...@@ -104,7 +105,7 @@ var tag={ ...@@ -104,7 +105,7 @@ var tag={
if($(".tag-border").val()){ if($(".tag-border").val()){
$(".edit-con").css({"border":$(".tag-border").val()}) $(".edit-con").css({"border":$(".tag-border").val()})
}else{ }else{
$(".edit-con").addClass("init-border"); $(".edit-con").css({"border":"1px solid #ccc"})
} }
......
resources/views/web/design.blade.php
...@@ -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="22" wenben="测试文本" zt="Microsoft YaHei" type="3" w="250" h="24" ztys="#000000" name="textarea" placeholder="请输入文案">测试文本</textarea>A<span>文本</span></div> <div class="items text" name="textarea"><textarea class="textarea zctem" zhg="26" zh="14" wenben="测试文本" zt="Microsoft YaHei" type="3" w="250" 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>
...@@ -22,9 +22,7 @@ ...@@ -22,9 +22,7 @@
<div class="seclect-group fl"> <div class="seclect-group fl">
<span>标签大小：</span> <span>标签大小：</span>
<select class="tag-size"> <select class="tag-size">
<option value="500*320">500*320</option> <option value="440*300">90*60</option>
<option value="260*160">260*160</option>
<option value="1000*640">1000*640</option>
</select> </select>
</div> </div>
<div class="seclect-group fl"> <div class="seclect-group fl">
...@@ -53,7 +51,7 @@ ...@@ -53,7 +51,7 @@
</div> </div>
</div> </div>
<div class="fztip">每个辅助格子20px*20px,从左上角开始,横向为X轴,纵向为Y轴,标尺每个刻度10px,标尺实际像素需要刻度值*10</div> <div class="fztip">格子区域为画图区域,每个辅助格子20px*20px,从左上角开始,横向为X轴,纵向为Y轴,标尺每个刻度10px,标尺实际像素需要刻度值*10</div>
<div class="fztip" style="color:red;">双击删除编辑区域内标签工具！！！！！！</div> <div class="fztip" style="color:red;">双击删除编辑区域内标签工具！！！！！！</div>
<div class="fztip" ><span style="color:red;">颜色选择器,复制此处颜色可用 </span><input type="text" id="colorpicker" /></div> <div class="fztip" ><span style="color:red;">颜色选择器,复制此处颜色可用 </span><input type="text" id="colorpicker" /></div>
...@@ -130,8 +128,8 @@ ...@@ -130,8 +128,8 @@
<div class="group-value clr"> <div class="group-value clr">
<span class="fl">字体</span> <span class="fl">字体</span>
<select class="zt fl"> <select class="zt fl">
<option value="SimSun">宋体</option>
<option value="Microsoft YaHei">微软雅黑</option> <option value="Microsoft YaHei">微软雅黑</option>
<option value="SimSun">宋体</option>
<option value="KaiTi">楷体</option> <option value="KaiTi">楷体</option>
<option value="LiSu">隶书</option> <option value="LiSu">隶书</option>
</select> </select>
......
resources/views/web/prints.blade.php
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<style> <style>
body{background:#fff;} body{background:#fff;margin:0px;}
.edit-con{margin:10px;}
.layui-btn{ .layui-btn{
display: inline-block; display: inline-block;
height: 38px; height: 38px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment