Commit 7a56d589 by 肖康

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

# Conflicts:
#	app/Http/Controllers/WebController.php
#	resources/views/web/design.blade.php
parents 4e6fd9b1 d668c01b
Showing with 123 additions and 123 deletions
<div class="tag-content">
<div class="tag-tools">
<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 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="90" h="24" ztys="#333" 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 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 tupian" name="imageit" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/charutupian.png) no-repeat;background-size: 100% 100%;"> <div class="zctem imageit" type="6" w="60" h="45" name="imageit" imagesurl="http://sz.ichunt.com/v3/dist/res/home/images/about/charutupian.png" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/charutupian.png) no-repeat;background-size: 100% 100%;"></div><span>插入图片</span></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 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="90" h="24" ztys="#333" 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 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 tupian" name="imageit" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/charutupian.png) no-repeat;background-size: 100% 100%;"> <div class="zctem imageit" type="6" w="60" h="45" name="imageit" imagesurl="http://sz.ichunt.com/v3/dist/res/home/images/about/charutupian.png" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/charutupian.png) no-repeat;background-size: 100% 100%;"></div><span>插入图片</span></div>
<div class="items logo1" name="logo1it" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/logo1.png) no-repeat;background-size: 100% 100%;"><div class="zctem logo1it" type="6" w="91" h="45" name="logo1it" imagesurl="http://sz.ichunt.com/v3/dist/res/home/images/about/logo1.png" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/logo1.png) no-repeat;background-size: 100% 100%;"></div><span>logo1</span></div>
<div class="items logo2" name="logo2it" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/logo1.png) no-repeat;background-size: 100% 100%;"><div class="zctem logo2it" type="6" w="64" h="25" name="logo2it" imagesurl="http://sz.ichunt.com/v3/dist/res/home/images/about/logo1.png" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/logo1.png) no-repeat;background-size: 100% 100%;"></div><span>logo1</span></div>
<div class="items logo3" name="logo3it" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/logo1.png) no-repeat;background-size: 100% 100%;"><div class="zctem logo3it" type="6" w="88" h="34" name="logo3it" imagesurl="http://sz.ichunt.com/v3/dist/res/home/images/about/logo1.png" style="background: url(http://sz.ichunt.com/v3/dist/res/home/images/about/logo1.png) no-repeat;background-size: 100% 100%;"></div><span>logo1</span></div>
</div>
<div class="tag-edit">
<h3>标签编辑区域</h3>
<h3>标签编辑区域</h3>
<div class="edit-seclect clr">
<div class="seclect-group fl">
<span>标签大小:</span>
<span>标签大小:</span>
<select class="tag-size">
<option value="500*320">500*320</option>
<option value="260*160">260*160</option>
......@@ -24,109 +24,109 @@
</select>
</div>
<div class="seclect-group fl">
<span>标签底色:</span>
<span>标签底色:</span>
<select class="tag-bgm">
<option value=""></option>
<option value="#f2f2f2">灰色</option>
<option value=""></option>
<option value="#f2f2f2">灰色</option>
</select>
</div>
<div class="seclect-group fl">
<span>边框:</span>
<span>边框:</span>
<select class="tag-border">
<option value="1px solid #ccc"></option>
<option value="1px solid #333">边框一</option>
<option value="2px solid #333">边框二</option>
<option value="1px solid #ccc"></option>
<option value="1px solid #333">边框一</option>
<option value="2px solid #333">边框二</option>
</select>
</div>
<div class="seclect-group fl">
<span>辅助线:</span>
<span>辅助线:</span>
<select class="tag-fz">
<option value=""></option>
<option value="1"></option>
<option value=""></option>
<option value="1"></option>
</select>
</div>
</div>
<div class="fztip">每个辅助格子20px*20px,从左上角开始,横向为X轴,纵向为Y轴</div>
<div class="fztip">每个辅助格子20px*20px,从左上角开始,横向为X轴,纵向为Y轴</div>
<div class="edit-box fl">
<div class="edit-con" ></div>
</div>
<div class="edit-value fr" >
<div class="tools tool1" >
<div class="group-value clr">
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
</div>
<div class="group-value clr">
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
</div>
<div class="group-value clr">
<span class="fl">线色浓度</span><input type="number" class="xsnd fl" placeholder="输入数值"/>
<span class="fl">线样式</span>
<span class="fl">线色浓度</span><input type="number" class="xsnd fl" placeholder="输入数值"/>
<span class="fl">线样式</span>
<select class="xys">
<option value="solid">实线</option>
<option value="dashed">虚线</option>
<option value="solid">实线</option>
<option value="dashed">虚线</option>
</select>
</div>
<div class="group-value clr">
<span class="fl">填充颜色</span><input type="text" class="tcys fl" />
<span class="fl">线条颜色</span><input type="text" class="xtys fl" />
<span class="fl">填充颜色</span><input type="text" class="tcys fl" />
<span class="fl">线条颜色</span><input type="text" class="xtys fl" />
</div>
<div class="group-value clr">
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
</div>
</div>
<div class="tools tool2" >
<div class="group-value clr">
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
</div>
<div class="group-value clr">
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
</div>
<div class="group-value clr">
<span class="fl">线色浓度</span><input type="number" class="xsnd fl" placeholder="输入数值"/>
<span class="fl">线样式</span>
<span class="fl">线色浓度</span><input type="number" class="xsnd fl" placeholder="输入数值"/>
<span class="fl">线样式</span>
<select class="xys">
<option value="solid">实线</option>
<option value="dashed">虚线</option>
<option value="solid">实线</option>
<option value="dashed">虚线</option>
</select>
</div>
<div class="group-value clr">
<span class="fl">填充颜色</span><input type="text" class="tcys fl" />
<span class="fl">线条颜色</span><input type="text" class="xtys fl" />
<span class="fl">填充颜色</span><input type="text" class="tcys fl" />
<span class="fl">线条颜色</span><input type="text" class="xtys fl" />
</div>
<div class="group-value clr">
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
</div>
</div>
<div class="tools tool3" >
<div class="group-value clr">
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
</div>
<div class="group-value clr">
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
</div>
<div class="group-value clr">
<span class="fl">文本类容</span><input type="text" class="wenben fl" style="width:350px;margin-top: 10px;"/>
<span class="fl">文本类容</span><input type="text" class="wenben fl" style="width:350px;margin-top: 10px;"/>
</div>
<div class="group-value clr">
<span class="fl">字体</span>
<span class="fl">字体</span>
<select class="zt fl">
<option value="SimSun">宋体</option>
<option value="Microsoft YaHei">微软雅黑</option>
<option value="KaiTi">楷体</option>
<option value="LiSu">隶书</option>
<option value="SimSun">宋体</option>
<option value="Microsoft YaHei">微软雅黑</option>
<option value="KaiTi">楷体</option>
<option value="LiSu">隶书</option>
</select>
<span class="fl">字号</span>
<span class="fl">字号</span>
<select class="zh fl">
<option value="12">12</option>
<option value="14">14</option>
......@@ -137,7 +137,7 @@
</select>
</div>
<div class="group-value clr">
<span class="fl">字色浓度</span>
<span class="fl">字色浓度</span>
<select class="zsnd fl">
<option value="100">1</option>
<option value="200">2</option>
......@@ -149,119 +149,119 @@
<option value="800">8</option>
<option value="900">9</option>
</select>
<span class="fl">字间距</span><input type="number" class="zjj fl" placeholder="输入数值"/>
<span class="fl">字间距</span><input type="number" class="zjj fl" placeholder="输入数值"/>
</div>
<div class="group-value clr">
<span class="fl">字体颜色</span><input type="text" class="ztys fl" placeholder=""/>
<span class="fl">字行高</span><input type="number" class="zhg fl" placeholder="输入数值"/>
<span class="fl">字体颜色</span><input type="text" class="ztys fl" placeholder=""/>
<span class="fl">字行高</span><input type="number" class="zhg fl" placeholder="输入数值"/>
</div>
<div class="group-value clr">
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
<span class="fl">数据关联</span>
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
<span class="fl">数据关联</span>
<select class="sjgl sjgl1 fl">
<option value="">自定义</option>
<option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option>
<option value="goods_number">型号数量</option>
<option value="sale_order_sn">销售单号</option>
<option value="customer_code">客户编码</option>
<option value="customer_type">客户型号</option>
<option value="customer_com">客户公司</option>
<option value="">自定义</option>
<option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option>
<option value="goods_number">型号数量</option>
<option value="sale_order_sn">销售单号</option>
<option value="customer_code">客户编码</option>
<option value="customer_type">客户型号</option>
<option value="customer_com">客户公司</option>
</select>
</div>
</div>
<div class="tools tool4" >
<div class="group-value clr">
<span class="fl">方向</span>
<span class="fl">方向</span>
<select class="fx fl">
<option value="">横向</option>
<option value="1">纵向</option>
<option value="">横向</option>
<option value="1">纵向</option>
</select>
</div>
<div class="group-value clr">
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
</div>
<div class="group-value clr">
<span class="fl">长度W</span><input type="number" class="kdw fl" />
<span class="fl">线色浓度</span><input type="number" class="xsnd fl" placeholder="输入数值"/>
<span class="fl">长度W</span><input type="number" class="kdw fl" />
<span class="fl">线色浓度</span><input type="number" class="xsnd fl" placeholder="输入数值"/>
</div>
<div class="group-value clr">
<span class="fl">线样式</span>
<span class="fl">线样式</span>
<select class="xys fl">
<option value="solid">实线</option>
<option value="dashed">虚线</option>
<option value="solid">实线</option>
<option value="dashed">虚线</option>
</select>
<span class="fl">线条颜色</span><input type="text" class="xtys fl" />
<span class="fl">线条颜色</span><input type="text" class="xtys fl" />
</div>
<div class="group-value clr">
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
</div>
</div>
<div class="tools tool5" >
<div class="group-value clr">
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
</div>
<div class="group-value clr">
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
</div>
<div class="group-value clr">
<span class="fl">图片路径</span><input type="text" class="imagesurl fl" style="width:350px;margin-top: 10px;" />
<span class="fl">图片路径</span><input type="text" class="imagesurl fl" style="width:350px;margin-top: 10px;" />
</div>
<div class="group-value clr">
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
</div>
<div class="group-value clr">
<div class="more-data-gl clr">
<span class="fl">数据关联</span>
<span class="fl">数据关联</span>
<select class="sjgl1 fl">
<option value="">自定义</option>
<option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option>
<option value="goods_number">型号数量</option>
<option value="sale_order_sn">销售单号</option>
<option value="customer_code">客户编码</option>
<option value="customer_type">客户型号</option>
<option value="customer_com">客户公司</option>
<option value="">自定义</option>
<option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option>
<option value="goods_number">型号数量</option>
<option value="sale_order_sn">销售单号</option>
<option value="customer_code">客户编码</option>
<option value="customer_type">客户型号</option>
<option value="customer_com">客户公司</option>
</select>
</div>
<div class="more-data-gl clr">
<span class="fl">数据关联</span>
<span class="fl">数据关联</span>
<select class="sjgl2 fl">
<option value="">自定义</option>
<option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option>
<option value="goods_number">型号数量</option>
<option value="sale_order_sn">销售单号</option>
<option value="customer_code">客户编码</option>
<option value="customer_type">客户型号</option>
<option value="customer_com">客户公司</option>
<option value="">自定义</option>
<option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option>
<option value="goods_number">型号数量</option>
<option value="sale_order_sn">销售单号</option>
<option value="customer_code">客户编码</option>
<option value="customer_type">客户型号</option>
<option value="customer_com">客户公司</option>
</select>
</div>
<div class="more-data-gl clr">
<span class="fl">数据关联</span>
<span class="fl">数据关联</span>
<select class="sjgl3 fl">
<option value="">自定义</option>
<option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option>
<option value="goods_number">型号数量</option>
<option value="sale_order_sn">销售单号</option>
<option value="customer_code">客户编码</option>
<option value="customer_type">客户型号</option>
<option value="customer_com">客户公司</option>
<option value="">自定义</option>
<option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option>
<option value="goods_number">型号数量</option>
<option value="sale_order_sn">销售单号</option>
<option value="customer_code">客户编码</option>
<option value="customer_type">客户型号</option>
<option value="customer_com">客户公司</option>
</select>
</div>
......@@ -270,18 +270,18 @@
</div>
<div class="tools tool6 " >
<div class="group-value clr">
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
<span class="fl">坐标X</span><input type="number" class="zbx fl" />
<span class="fl">坐标Y</span><input type="number" class="zby fl" />
</div>
<div class="group-value clr">
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
<span class="fl">宽度W</span><input type="number" class="kdw fl" />
<span class="fl">高度H</span><input type="number" class="gdh fl" />
</div>
<div class="group-value clr">
<span class="fl">图片路径</span><input type="text" class="imagesurl fl" style="width:350px;margin-top: 10px;" />
<span class="fl">图片路径</span><input type="text" class="imagesurl fl" style="width:350px;margin-top: 10px;" />
</div>
<div class="group-value clr">
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
<span class="fl">图层层级</span><input type="number" class="tccj fl" placeholder="输入数值,越大越高"/>
</div>
</div>
</div>
......
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