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

public/js/web/design.js

@@ -66,7 +66,7 @@ var tag={
     },
     editUi:function(){
           //图片logo转base64  
-          tag.base64("http://img.ichunt.com/images/ichunt/label/logo1.png",function(base64){
+          tag.base64("http://img.ichunt.com/images/ichunt/label/new_logo.png",function(base64){
             $(".logobase64").css({"background":"url("+base64+") 0% 0% / 100% 100% no-repeat"})
               
           })   

resources/views/web/design.blade.php

@@ -11,9 +11,9 @@
             <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 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"  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 logobase64"  type="7" w="91" h="45"  name="logo1it" 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 logobase64"  type="7" w="64" h="25"  name="logo2it"  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 logobase64"  type="7" w="88" h="34"  name="logo3it"  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 logo1" name="logo1it"  style="background: url(http://img.ichunt.com/images/ichunt/label/new_logo.png) no-repeat;background-size: 100% 100%;"><div class="zctem logo1it logobase64"  type="7" w="91" h="45"  name="logo1it" style="background: url(http://img.ichunt.com/images/ichunt/label/new_logo.png) no-repeat;background-size: 100% 100%;"></div><span>logo1</span></div>
+            <div class="items logo2" name="logo2it"  style="background: url(http://img.ichunt.com/images/ichunt/label/new_logo.png) no-repeat;background-size: 100% 100%;"><div class="zctem logo2it logobase64"  type="7" w="64" h="25"  name="logo2it"  style="background: url(http://img.ichunt.com/images/ichunt/label/new_logo.png) no-repeat;background-size: 100% 100%;"></div><span>logo1</span></div>
+            <div class="items logo3"  name="logo3it" style="background: url(http://img.ichunt.com/images/ichunt/label/new_logo.png) no-repeat;background-size: 100% 100%;"><div class="zctem logo3it logobase64"  type="7" w="88" h="34"  name="logo3it"  style="background: url(http://img.ichunt.com/images/ichunt/label/new_logo.png) no-repeat;background-size: 100% 100%;"></div><span>logo1</span></div>
             
         </div>
         <div class="tag-edit clr">

resources/views/web/prints.blade.php

 <link href="/css/style.css" rel="stylesheet">
+
+ 
+<style>
+    body{background:#fff;}
+    .layui-btn{
+        display: inline-block;
+    height: 38px;
+    line-height: 38px;
+    padding: 0 18px;
+    background-color: #009688;
+    color: #fff;
+    white-space: nowrap;
+    text-align: center;
+    font-size: 14px;
+    border: none;
+    border-radius: 2px;
+    cursor: pointer;
+    }
+</style>
 <div class="dybox">
 @foreach($html as $item)
 {!! $item  !!}
 @endforeach
 </div>
+<script src="../../../../js/jquery-2.2.1.js"></script>
+<script type="text/javascript">
+    $(function(){
+        $(".huabuitem[type='6'],.huabuitem[type='7']").each(function(){
+            var urlo_=$(this).css("backgroundImage").replace('url(','').replace(')','');
+            $(this).css({"background":""})
+            $(this).html("<img src='"+urlo_.substring(1,urlo_.length-1)+"' />");
+            $(this).find("img").css({width:"100%",height:"100%"})
+        })
+        // setTimeout(function(){
+        //     window.print();
+        // }, 100);
+            
+      
+    })   
+
+
+</script>
+
+