From 6db4de77bb9f1554854e50778fda8d9b479d6781 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 07 十二月 2018 13:53:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/pages/homeInfo.js | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
index da07a63..d262d4d 100644
--- a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
+++ b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
@@ -15,7 +15,7 @@
var rs = JSON.parse(result.result);
if(rs.code == 1) {
var data = rs.data;
- //console.log(data);
+ console.log(data);
var rsData = formatHomeInfo(data);
$('#homeInfoIframeData').data('data', rsData);
// 鏄剧ず闈㈡澘
@@ -23,9 +23,13 @@
type: 2,
title: '<i class="fa fa-home"></i>鍩虹珯淇℃伅',
area: ['960px', '524px'],
- fixed: false, //涓嶅浐瀹�
+ btn:['閲嶇疆闈㈡澘'],
+ fixed: true, //涓嶅浐瀹�
maxmin: true,
- content: 'iframe/homeinfo.html'
+ content: 'iframe/homeinfo.html',
+ yes:function(index) {
+ layer.iframeSrc(index, 'iframe/homeinfo.html');
+ }
});
}else {
layer.msg('鏆傛棤鍩虹珯淇℃伅锛�');
@@ -185,6 +189,21 @@
tmp.cshow = '';
tabc.push(tmp);
+ // 鏈烘埧鍥剧墖妯″潡
+ var tmp = {};
+ tmp.type = 'envImg';
+ tmp.title = '鍩虹珯鐜鍥鹃泦';
+ tmp.tshow = '';
+ tmp.cshow = '';
+ tabc.push(tmp);
+
+ // 鏈烘埧鍥剧墖涓婁紶
+ var tmp = {};
+ tmp.type = 'envImgUpload';
+ tmp.title = '涓婁紶鍩虹珯鐜鍥剧墖';
+ tmp.tshow = '';
+ tmp.cshow = '';
+ tabc.push(tmp);
// 杩斿洖缁撴灉闆�
return rs;
--
Gitblit v1.9.1