From acf7627f5c57d62fd7d93dd9794911c6e7b4e42f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期五, 19 十月 2018 14:15:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 0efbfc9..385d8b4 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -29,8 +29,8 @@
//this.resize(options);
// 缁欏鍣ㄥ唴瀹规坊鍔犵粦瀹氫簨浠�
- this.ele.off('click.treeView.folder').on('click.treeView.folder', '.sider-menu-folder>i.fa-caret-right', function() {
- $(this).parent().parent().toggleClass('sider-menu-open');
+ this.ele.off('click.treeView.folder').on('click.treeView.folder', '.sider-menu-folder', function() {
+ $(this).parent().toggleClass('sider-menu-open');
});
this.ele.off('click.treeView.file').on('click.treeView.file', '.sider-menu-file', function() {
@@ -172,7 +172,6 @@
var tgt = aFolders.eq(0);
aFolders.each(function() {
var _txt = $(this).find('.treeview-txt').text();
- console.info();
if(txt == _txt) {
tgt = $(this);
}
@@ -203,6 +202,14 @@
// 瀹氫箟椤甸潰涓殑siderbar缁勪欢
;(function($, window, document, gl, undefined) {
gl.namespace('pages.siderbar');
+
+ // 鑾峰彇褰撳墠閫変腑鍐呭锛堢渷-甯�-鏈烘埧-鐢垫睜缁勶級
+ var province = getQueryString('province'); // 鐪�
+ var city = getQueryString('city'); // 甯�
+ var home = getQueryString('home'); // 鏈烘埧
+
+ console.log(province);
+
// 鐢熸垚涓�绾у鑸�-鐪�
function first(treeView, container) {
//treeView.addProgress(container);
--
Gitblit v1.9.1