Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB

application/admin/view/widget/icon.php

@@ -24,7 +24,7 @@
         }
         .form-control{
             display: inline-block;
-            width: 75%;
+            width: 85%;
         }
     </style>
 </head>
@@ -33,7 +33,7 @@
     <div class="form-group">
         <input type="email" class="form-control" id="search" placeholder="输入关键词搜索：注意全是英文">
         <button id="qingkong" class="btn btn-default">清空选择</button>
-        <button id="close" class="btn btn-default">关闭</button>
+<!--        <button id="close" class="btn btn-default">关闭</button>-->
     </div>
     <div>
         <h5> v4.3.0新增图标 </h5>
@@ -794,11 +794,11 @@
                 parent.$f.closeModal();
 
             });
-            //close
-            $('#close').on('click', function () {
-                parent.$f.closeModal();
-
-            });
+//            //close
+//            $('#close').on('click', function () {
+//                parent.$f.closeModal();
+//
+//            });
 
             //搜索图标
             $("#search").on('input',function () {

application/admin/view/widget/images.php

@@ -62,7 +62,7 @@
                      <li ><a href="{:Url('index',array('pid'=>$vo.id,'fodder'=>$Request.param.fodder))}">{$vo.name}</a></li>
                 {/if}
                 {volist name="$vo.child" id="voo" key="kk"}
-                       <li class="child {if condition="$voo.id eq $pid"} active{/if}"><a href="{:Url('index',array('pid'=>$voo.id,'fodder'=>$Request.param.fodder))}">┣{$voo.name}</a></li>
+                       <li class="child {if condition="$voo.id eq $pid"} active{/if}"><a href="{:Url('index',array('pid'=>$voo.id,'fodder'=>$Request.param.fodder))}">-{$voo.name}</a></li>
                     {/volist}
                 {/volist}
             </ul>
@@ -84,7 +84,7 @@
         <div class="foot-tool">
             <button class="layui-btn layui-btn-sm"  id="upload">上传图片</button>
             <button class="layui-btn layui-btn-normal layui-btn-sm" id="ConfirmChoices">使用选中的图片</button>
-            <button class="layui-btn layui-btn-danger layui-btn-sm" id="close" >关闭</button>
+<!--            <button class="layui-btn layui-btn-danger layui-btn-sm" id="close" >关闭</button>-->
             <div class="page">{$page}</div>
         </div>
     </div>

application/wap/controller/Wechat.php

@@ -18,6 +18,7 @@ class Wechat
      */
     public function serve()
     {
+        ob_clean();
         WechatService::serve();
     }
 

vendor/xaboy/form-builder/src/Form.php

@@ -87,7 +87,7 @@ class Form
         'iview-css' => '<link href="https://cdn.jsdelivr.net/npm/iview@2.14.3/dist/styles/iview.css" rel="stylesheet">',
         'iview' => '<script src="https://cdn.jsdelivr.net/npm/iview@2.14.3/dist/iview.min.js"></script>',
         //form-create 版本 1.3.1
-        'form-create' => '<script src="https://cdn.jsdelivr.net/npm/form-create@1.3.3/dist/form-create.min.js"></script>',
+        'form-create' => '<script src="https://cdn.jsdelivr.net/npm/form-create@1.4.2/dist/form-create.min.js"></script>',
         'city-data' => '<script src="https://cdn.jsdelivr.net/npm/form-create/district/province_city.js"></script>',
         'city-area-data' => '<script src="https://cdn.jsdelivr.net/npm/form-create/district/province_city_area.js"></script>'
     ];