Skip to content

孙龙 / note-library

Go to a project
Commit a75a369f by 肖康
Options

x

parent f2c38249
Inline Side-by-side
Showing with 46 additions and 26 deletions
public/css/style.css
...@@ -8441,13 +8441,14 @@ body.md-skin { ...@@ -8441,13 +8441,14 @@ body.md-skin {
margin-top: 20px margin-top: 20px
} }
.edit-box .edit-con { .edit-con {
clear: both; clear: both;
position: relative; position: relative;
border: 1px solid #ccc box-sizing: initial;
} }
.edit-con.init-border{border:1px solid #ccc;}
.edit-box .edit-con div.gezi { .edit-con div.gezi {
width: 20px; width: 20px;
height: 20px; height: 20px;
box-sizing: border-box; box-sizing: border-box;
...@@ -8456,20 +8457,20 @@ body.md-skin { ...@@ -8456,20 +8457,20 @@ body.md-skin {
border-right: 1px solid #ccc border-right: 1px solid #ccc
} }
.edit-box .edit-con div.gezi.right0 { .edit-con div.gezi.right0 {
border-right: 0px border-right: 0px
} }
.edit-box .edit-con div.gezi.bottom0 { .edit-con div.gezi.bottom0 {
border-bottom: 0px border-bottom: 0px
} }
.edit-box .edit-con div.gezi.border0 { .edit-con div.gezi.border0 {
border: 0px border: 0px
} }
.tag-content .tag-edit .edit-value { .tag-content .tag-edit .edit-value {
margin-top: 20px; margin-top: -250px;
position: fixed; position: fixed;
width: 410px; width: 410px;
min-height: 300px; min-height: 300px;
...@@ -8529,7 +8530,7 @@ textarea { ...@@ -8529,7 +8530,7 @@ textarea {
background: rgba(225, 225, 225, 0) background: rgba(225, 225, 225, 0)
} }
textarea:focus { textarea.act{
background: #f2f2f2 background: #f2f2f2
} }
...@@ -8545,3 +8546,4 @@ textarea:focus { ...@@ -8545,3 +8546,4 @@ textarea:focus {
transform: rotate(90deg); transform: rotate(90deg);
transform-origin: left top transform-origin: left top
} }
.sjglbox input.zdynr{width:180px;}
public/js/web/design.js
...@@ -37,14 +37,15 @@ var tag={ ...@@ -37,14 +37,15 @@ var tag={
$(".edit-con .gezi").remove(); $(".edit-con .gezi").remove();
$(".edit-con").append(html); $(".edit-con").append(html);
$(".edit-con").css({"backgroundColor":$(".tag-bgm").val()}) $(".edit-con").css({"backgroundColor":$(".tag-bgm").val()})
if($(".tag-fz").val()&&$(".tag-border").val()=="1px solid #ccc"){ if($(".tag-border").val()){
$(".edit-con").css({"border":0})
}else{
$(".edit-con").css({"border":$(".tag-border").val()}) $(".edit-con").css({"border":$(".tag-border").val()})
}else{
$(".edit-con").addClass("init-border");
} }
}, },
itemedit:function(){ itemedit:function(){
var ele=$(".huabuitem.act"); var ele=$(".huabuitem.act");
...@@ -287,8 +288,15 @@ var tag={ ...@@ -287,8 +288,15 @@ var tag={
lableBg:$(".tag-bgm").val(), lableBg:$(".tag-bgm").val(),
lableBorder:$(".tag-border").val() lableBorder:$(".tag-border").val()
} }
$(".edit-box .edit-con .gezi").remove(); $(".edit-con .gezi").remove();
$(".edit-con .huabuitem").removeClass("act");
$(".edit-con").removeClass("init-border");
obj.html=$(".edit-box").html(); obj.html=$(".edit-box").html();
obj.designName=$(".designName").val()
if(!$(".designName").val()){
layer.alert('请输入模板名称')
return;
}
console.log(obj) console.log(obj)
}) })
......
resources/views/web/design.blade.php
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div class="seclect-group fl"> <div class="seclect-group fl">
<span>边框：</span> <span>边框：</span>
<select class="tag-border"> <select class="tag-border">
<option value="1px solid #ccc">无</option> <option value="">无</option>
<option value="1px solid #333">边框一</option> <option value="1px solid #333">边框一</option>
<option value="2px solid #333">边框二</option> <option value="2px solid #333">边框二</option>
</select> </select>
...@@ -47,11 +47,15 @@ ...@@ -47,11 +47,15 @@
<option value="1">关</option> <option value="1">关</option>
</select> </select>
</div> </div>
<div class="seclect-group fl">
<span>模板名称：</span>
<input type="text" placeholder="输入模板名称" style="width:120px;" class="designName"/>
</div>
</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-box fl">
<div class="edit-con" ></div> <div class="edit-con init-border" ></div>
</div> </div>
<div class="edit-value fr" > <div class="edit-value fr" >
<div class="tools tool1" > <div class="tools tool1" >
...@@ -160,18 +164,24 @@ ...@@ -160,18 +164,24 @@
</div> </div>
<div class="group-value clr"> <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">
<span class="fl">数据关联</span> <span class="fl">数据关联</span>
<select class="sjgl sjgl1 fl"> <div class="sjglbox fl">
<option value="">自定义</option> <select class="sjgl1 fl">
<option value="sku_code">SKU编码</option> <option value="">自定义</option>
<option value="goods_type">型号名称</option> <option value="sku_code">SKU编码</option>
<option value="goods_brand">型号品牌</option> <option value="goods_type">型号名称</option>
<option value="goods_number">型号数量</option> <option value="goods_brand">型号品牌</option>
<option value="sale_order_sn">销售单号</option> <option value="goods_number">型号数量</option>
<option value="customer_code">客户编码</option> <option value="sale_order_sn">销售单号</option>
<option value="customer_type">客户型号</option> <option value="customer_code">客户编码</option>
<option value="customer_com">客户公司</option> <option value="customer_type">客户型号</option>
</select> <option value="customer_com">客户公司</option>
</select>
<input type="text" class="zdynr" placeholder="输入自定义内容" />
</div>
</div> </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