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

resources/views/web/design.blade.php

@@ -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="测试文本" 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="22" wenben="测试文本" zt="Microsoft YaHei" type="3" w="250" h="24" 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" imagesurl="http://img.ichunt.com/images/cms/201905/05/0998e54c5120aec61e6868943a67916e.png" 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" imagesurl="http://img.ichunt.com/images/cms/201905/05/0998e54c5120aec61e6868943a67916e.png" 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" imagesurl="http://sz.ichunt.com/v3/dist/res/home/images/about/yiweima.png" 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" imagesurl="http://sz.ichunt.com/v3/dist/res/home/images/about/yiweima.png" 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>
@@ -54,7 +54,7 @@
            
            
             </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>
            
            
             <div class="edit-box fl">
             <div class="edit-box fl">