From 94c3b603ae4fd3f26e23a33e3eabc781d9c08846 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 11:33:37 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/homeinfo.html | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/homeinfo.html b/gx_tieta/WebRoot/iframe/homeinfo.html
index f3a327d..4a8eeb3 100644
--- a/gx_tieta/WebRoot/iframe/homeinfo.html
+++ b/gx_tieta/WebRoot/iframe/homeinfo.html
@@ -290,7 +290,7 @@
{{# }else if(item.type == 'env'){ }}
<div class="layui-tab-item">
<div id="video" style="width: 100%;height: 100%;"></div>
- <div id="videos" class="video-list video-slideHide">
+ <div id="videos" class="video-list">
<div class="video-list-container">
<div class="video-slideToggle"><i class="fa fa-chevron-right"></i></div>
<div class="video-list-content">
@@ -309,9 +309,10 @@
<div class="layui-form mrl8">
<div class="layui-form-item">
<button type="button" class="layui-btn" id="test5"><i class="layui-icon"> </i>閫夋嫨涓婁紶瑙嗛</button>
+ <span style="color: #FF0000;">璇蜂笂浼犳湁鍏虫満鎴跨殑瑙嗛</span>
<div class="layui-input-inline">
<input type="text" name="title" autocomplete="off" placeholder="璇疯緭鍏ヨ棰戝悕绉�" class="layui-input">
- </div>
+ </div>
</div>
</div>
<div class="layui-upload">
@@ -349,6 +350,7 @@
<div class="layui-form mrl8">
<div class="layui-form-item">
<button type="button" class="layui-btn" id="addImgs"><i class="layui-icon"> </i>閫夋嫨涓婁紶鍥剧墖</button>
+ <span style="color: #FF0000;">璇蜂笂浼犳湁鍏虫満鎴跨殑鍥剧墖</span>
</div>
</div>
<div class="layui-upload">
--
Gitblit v1.9.1