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

public/css/style.css

@@ -8750,7 +8750,7 @@ body.md-skin {
 .huabuitem {
   position: absolute;
   box-sizing: border-box;
-  cursor: pointer
+  cursor: pointer;
 }
 .lineit.huabuitem::after{
   content:" ";
@@ -8786,17 +8786,19 @@ body.md-skin {
   border: 1px solid #333
 }
 
-textarea {
+textarea{
   outline: none;
   resize: none;
   border: 0px;
   overflow: hidden;
   line-height: 22px;
+  color:#333;
   background: rgba(225, 225, 225, 0)
 }
 
 textarea.act{
-  background: #f2f2f2
+  background: #f2f2f2;
+  color:#000000;
 }
 
 .lineit {

public/js/web/design.js

@@ -14,6 +14,7 @@ var tag={
         tag.handle();
     },
     getInfo:function(){
+        
         $.ajax({
             url : '/ajax/getTemplateDetail?t_id='+$("#templateid").val(),
             type: 'get',
@@ -26,6 +27,7 @@ var tag={
                     $(".tag-size").val(abobj.lableSize);
                     $(".edit-box").html(resp.data.template_extend.html);
                     tag.editUi();
+                    
                 }
             },
             error: function(err) {
@@ -304,7 +306,7 @@ var tag={
                     ele.css({fontSize:val_+"px"})
                     break;
                 case "wenben":
-                    ele.attr("wenben",val_);
+                    ele.attr("wenben",val_).text(val_);
                     ele.val(val_)
                     break;
                 case "zsnd":
@@ -358,9 +360,8 @@ var tag={
             }
        });
        //多文本单向监听
-       $("textarea").bind('input propertychange', function() {
-            $(".wenben").val($(this).val());
-            $(this).attr("wenben",$(this).val())
+       $(document).on("input propertychange","textarea",function(){
+            $(this).attr("wenben",$(this).val()).text($(this).val())
        });
        //数据关联联动
        $(".sjglbox select").bind('input propertychange', function() {

resources/views/web/design.blade.php

@@ -6,7 +6,7 @@
             <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 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 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>