From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/homeinfo.html | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/homeinfo.html b/gx_tieta/WebRoot/iframe/homeinfo.html
index e94a893..015315b 100644
--- a/gx_tieta/WebRoot/iframe/homeinfo.html
+++ b/gx_tieta/WebRoot/iframe/homeinfo.html
@@ -463,6 +463,7 @@
VideoOrImage: 'video'
})
}
+ ,exts: 'mp4|MOV|avi|rmvb'
,accept: 'video' //瑙嗛
,choose: function(obj) {
var files = this.files = obj.pushFile();
@@ -646,7 +647,7 @@
});
}
,before:function() {
- uploadImgsLoad = layer.load(1);
+ //uploadImgsLoad = layer.load(1);
}
,done:function(res) {
var rs = JSON.parse(res.result);
--
Gitblit v1.9.1