发布新闻名称20个字节

templates/backstageNet/info/dormPub.html

@@ -247,7 +247,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">民宿名称：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="name" required lay-verify="required" placeholder="请输入名称"
+                                <input type="text" name="name" maxlength="20" required lay-verify="required" placeholder="请输入名称"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -563,6 +563,7 @@
             map.clearOverlays();
             $('.uploadImg').addClass('uploadImgIcon');
             $('#demo1').removeAttr('src'); //图片链接（base64）
+            $('#uploader-list').html('')
             fuzhi()
             if (window.id !== '') {
                 parent.getData('', parent.$('.layui-laypage-curr em').eq(1).html(), parent.$('.permission .active').data('type'))

templates/backstageNet/info/gardenPub.html

@@ -179,7 +179,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">采摘名称：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="name" required lay-verify="required" placeholder="请输入采摘名称"
+                                <input type="text" name="name" maxlength="20" required lay-verify="required" placeholder="请输入采摘名称"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>

templates/backstageNet/info/newsPub.html

@@ -176,7 +176,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">文章标题：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="title" required lay-verify="required" placeholder="请输入标题"
+                                <input type="text" name="title" maxlength="20" required lay-verify="required" placeholder="请输入标题"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>

templates/backstageNet/info/productPub.html

@@ -173,7 +173,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">产品名称：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="title" required lay-verify="required" placeholder="请输入产品名称" autocomplete="off" class="layui-input">
+                                <input type="text" name="title" maxlength="20" required lay-verify="required" placeholder="请输入产品名称" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item layui-form-text">

templates/backstageNet/info/sightseePub.html

@@ -247,7 +247,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">景点名称：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="name" required lay-verify="required" placeholder="请输入名称"
+                                <input type="text" name="name" maxlength="20" required lay-verify="required" placeholder="请输入名称"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>

templates/backstageNet/info/videoPub.html

@@ -176,7 +176,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">视频标题：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="title" required lay-verify="required" placeholder="请输入视频标题" autocomplete="off" class="layui-input">
+                                <input type="text" name="title" maxlength="20" required lay-verify="required" placeholder="请输入视频标题" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item layui-form-text">

templates/backstageNet/jk/equipmanage_jk.html

@@ -159,7 +159,10 @@
             margin-top: 10px;
         }
 
-
+        #divMain{
+            box-sizing: border-box;
+            width: 100%;
+        }
         #divMain .a4 {
             width: 50%;
             height: 50%;
@@ -639,6 +642,7 @@
 
             var playHtml;
             var script;
+            var token = 'at.0izp4b188fna8vvk8j28o2l4a980qqex-1otrmuqf8l-1k26cbi-cletdiwkp'
              
 
             if (isIE) {
@@ -654,7 +658,7 @@
             }
             else {
 
-                playHtml = "<iframe   id='playFrame" + curIndex + "'  src='https://open.ys7.com/ezopen/h5/iframe_se?url=ezopen://open.ys7.com/" + deviceSerial + "/" + cameraNo + ".hd.live&autoplay=1&accessToken=at.d2trwvdod5bxxlr4dug8le6wb0ugbi2h-173pi8ymy3-1882umg-zrib7cj3f&templete=2'  width='100%' height='100%' allowfullscreen frameborder='0' allowtransparency=true></iframe>"
+                playHtml = "<iframe   id='playFrame" + curIndex + "'  src='https://open.ys7.com/ezopen/h5/iframe_se?url=ezopen://open.ys7.com/" + deviceSerial + "/" + cameraNo + ".hd.live&autoplay=1&accessToken="+token+"'  width='100%' height='100%' allowfullscreen frameborder='0' allowtransparency=true></iframe>"
 
                 script = document.createElement("script");
                 script.type = "text/javascript";

templates/backstageNet/production/gardenManage.html

@@ -514,6 +514,8 @@
                         $('input[name="curr_var"]').val(data[0].curr_var) //品种
                         $('textarea[name="content"]').val(data[0].farm_desc) //介绍
                         $('input[name="id"]').val(data[0].id) //id
+                        $('#img_url').val(data[0].farm_img)
+                        $('#demo1').attr('src',data[0].farm_img)
 
                     },
                     error: function (type) {

templates/backstageNet/production/gardenNew.html

@@ -4,7 +4,7 @@
         <!-- <p class="username">{{ msg.art }}</p> -->
         <p class="username">{{ msg.name }}</p>
         <div class="userMsg">
-            <img :src='http://127.0.0.1:8000/{{ msg.farm_img }}' class="fl" alt="">
+            <img src='http://127.0.0.1:8000/{{ msg.farm_img }}' class="fl" alt="">
             <div class="userInfo">
                 <p>基地面积（亩）： {{ msg.area }}</p>
                 <p>管理者： {{ msg.manage_user.name }}</p>

templates/backstageNet/systemSet/mapManage.html

@@ -374,8 +374,8 @@
                 swneLatLng = [];
                 overlays.push(e.overlay);
 
-                swneLatLng.push(e.overlay.zo[1])
-                swneLatLng.push(e.overlay.zo[3])
+                swneLatLng.push(e.overlay.Ao[1])
+                swneLatLng.push(e.overlay.Ao[3])
 
                 e.overlay.enableEditing();
             };

templates/static/css/index2.css

@@ -609,6 +609,9 @@ span.swiper-pagination-bullet-active{
     padding: 0 20px;
     font-size: 14px;
     font-weight: 700;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 .recommendHotelItem .area{
     line-height: 14px;

templates/static/css/videoList.css

@@ -26,6 +26,9 @@
     font-size: 16px;
     line-height: 34px;
     font-weight: 700;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 .videoMsg >div{
     width: 80%;