From 9b6f2b9a80fbcaae09af4693a6cd76f4a760f962 Mon Sep 17 00:00:00 2001
From: admin:huo123456@qq <496960745@qq.com>
Date: 星期一, 21 一月 2019 10:02:40 +0800
Subject: [PATCH] 图片和视频上传修改内容
---
gx_tieta/WebRoot/iframe/homeinfo.html | 9 +++------
gx_tieta/WebRoot/mobil/iframe/homeinfo1.html | 34 ++++++++++++++++++++++++----------
2 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/homeinfo.html b/gx_tieta/WebRoot/iframe/homeinfo.html
index 015315b..d9abd8a 100644
--- a/gx_tieta/WebRoot/iframe/homeinfo.html
+++ b/gx_tieta/WebRoot/iframe/homeinfo.html
@@ -312,11 +312,8 @@
<br>
<div class="layui-form mrl8">
<div class="layui-form-item">
- <button type="button" class="layui-btn" id="test5"><i class="layui-icon"> </i>閫夋嫨涓婁紶瑙嗛</button>
+ <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 class="layui-upload">
@@ -353,8 +350,8 @@
<br>
<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>
+ <button type="button" class="layui-btn" id="addImgs"><i class="layui-icon"> </i>鍥剧墖閫夋嫨</button>
+ <span style="color: #FF0000;">璇蜂笂浼犵數璇濆崱銆佹満鎴垮悕绉般�佺數姹犲瀷鍙枫�佽礋杞界數娴併�乥ts璁惧鎺ョ嚎銆佺數娴佹帴绾裤�佹暣浣撳畨瑁呮晥鏋滃浘绛夊浘鐗�</span>
</div>
</div>
<div class="layui-upload">
diff --git a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
index 9ebc728..822cc7e 100644
--- a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
+++ b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
@@ -84,7 +84,7 @@
<div class="layui-form layui-form-pane layui-form-default mrt5 mrl8 mrr8 mrb10" action="" lay-filter="">
<div class="layui-row">
<div class="layui-col-12">
- <button class="layui-btn layui-btn-normal layui-btn-sm" id="videoSelect">瑙嗛閫夋嫨</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" id="videoSelect">瑙嗛閫夋嫨鎴栨媿鎽�</button>
<span style="color: #FF0000;">璇蜂笂浼犳湁鍏虫満鎴跨殑瑙嗛</span>
</div>
<div class="layui-col-12 mrt5">
@@ -109,7 +109,7 @@
</div>
</div>
<div class="layui-col-12 t-align-right mrt5">
- <span style="color: #FF0000;" class="mrr4">璇蜂笂浼犲井淇℃媿鎽勭殑瑙嗛</span><button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">瑙嗛涓婁紶</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">瑙嗛涓婁紶</button>
</div>
</div>
</div>
@@ -119,8 +119,8 @@
<div class="rel-full">
<div class="layui-form layui-form-pane layui-form-default mrt5 mrl8 mrr8 mrb10" action="" lay-filter="">
<div class="layui-col-12">
- <button class="layui-btn layui-btn-normal layui-btn-sm" id="imgsSelect">鍥剧墖閫夋嫨</button>
- <span style="color: #FF0000;">璇蜂笂浼犳湁鍏虫満鎴跨殑鍥剧墖</span>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" id="imgsSelect">鍥剧墖閫夋嫨鎴栨媿鐓�</button>
+ <span style="color: #FF0000;">璇蜂笂浼犵數璇濆崱銆佹満鎴垮悕绉般�佺數姹犲瀷鍙枫�佽礋杞界數娴併�乥ts璁惧鎺ョ嚎銆佺數娴佹帴绾裤�佹暣浣撳畨瑁呮晥鏋滃浘绛夊浘鐗�</span>
</div>
<div class="layui-col-12">
<div class="layui-upload">
@@ -444,6 +444,11 @@
,'</td>'
,'</tr>'].join(''));
+ // 瀹氫箟鏂囦欢鍚嶇О
+ var fileName = 'image&&'+index+'.jpg';
+
+ obj.resetFile(index, file, fileName); //閲嶅懡鍚嶆枃浠跺悕
+
//鍗曚釜閲嶄紶
tr.find('.imgs-reload').on('click', function(){
obj.upload(index, file);
@@ -460,7 +465,16 @@
});
}
,before:function(obj) {
- //uploadImgsLoad = layer.load(1);
+ var isShowLoad = false;
+ // 閬嶅巻瀵硅薄鏌ョ湅鏄惁瀛樺湪鏂囦欢
+ Object.keys(this.files).forEach(function(key) {
+ isShowLoad = true;
+ });
+ if(isShowLoad) {
+ uploadImgsLoad = layer.load(1);
+ }else {
+ layer.msg('娌℃湁鍙笂浼犵殑鍐呭');
+ }
// 璁剧疆鎻愪氦鐨勫弬鏁�
this.data.json = JSON.stringify({
StationId: homeInfo.homeId
@@ -474,12 +488,12 @@
}
})
}
- ,done:function(res) {
- var rs = JSON.parse(res.result);
- if(rs.code == 1) {
- layer.msg('涓婁紶鎴愬姛锛�');
+ ,allDone: function(obj) {
+ console.log(obj);
+ if(obj.aborted == 0) {
+ layer.msg('涓婁紶瀹屾垚锛�');
}else {
- layer.msg('涓婁紶澶辫触锛�');
+ layer.msg('瀛樺湪'+obj.aborted+'涓笂浼犲け璐�,璇烽噸鏂颁笂浼狅紒');
}
layer.close(uploadImgsLoad);
}
--
Gitblit v1.9.1