浏览代码

Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

张金坤 9 年之前
父节点
当前提交
817d68902e
共有 27 个文件被更改,包括 2497 次插入276 次删除
  1. 2 0
      core/src/qfw/swordfish/swordfishmanage.go
  2. 15 1
      core/src/web/staticres/css/dev-qfw.css
  3. 16 17
      core/src/web/staticres/css/mobile/incmobile.css
  4. 二进制
      core/src/web/staticres/images/u14.png
  5. 10 10
      core/src/web/staticres/js/entportrait.js
  6. 2076 0
      core/src/web/staticres/js/iscroll.js
  7. 44 40
      core/src/web/staticres/wxswordfish/main.js
  8. 71 10
      core/src/web/staticres/wxswordfish/style.css
  9. 0 33
      core/src/web/templates/index.html
  10. 1 1
      core/src/web/templates/member/incmobile/alter.html
  11. 35 35
      core/src/web/templates/member/incmobile/baseinfo.html
  12. 0 35
      core/src/web/templates/member/incmobile/detail.html
  13. 23 12
      core/src/web/templates/member/incmobile/detailindex.html
  14. 6 6
      core/src/web/templates/member/incmobile/index.html
  15. 14 9
      core/src/web/templates/member/incmobile/list.html
  16. 8 3
      core/src/web/templates/service/appointment.html
  17. 8 3
      core/src/web/templates/service/bid.html
  18. 8 2
      core/src/web/templates/service/demand.html
  19. 52 3
      core/src/web/templates/swordfish/rssset.html
  20. 7 3
      core/src/web/templates/swordfish/searchinfolist.html
  21. 2 1
      core/src/web/templates/swordfish/wxinfocontent.html
  22. 24 22
      core/src/web/templates/swordfish/wxsearch.html
  23. 43 22
      core/src/web/templates/swordfish/wxsearchlist.html
  24. 19 2
      core/src/web/templates/swordfish/wxtoolbar.html
  25. 2 2
      core/src/web/templates/yellowpage/enterpriseinfo.html
  26. 9 2
      push/src/qfw/push/cache.go
  27. 2 2
      push/src/qfw/push/dopush/dopush.go

+ 2 - 0
core/src/qfw/swordfish/swordfishmanage.go

@@ -75,6 +75,8 @@ func (s *SwordFish) RssSet() error {
 	list := getNewest()
 	s.T["list"] = list
 	s.T["msgset"] = msgset
+	s.T["searchtype"] = s.GetString("searchtype")
+	s.T["searchvalue"] = s.GetString("searchvalue")
 	return s.Render("/swordfish/rssset.html", &s.T)
 }
 

+ 15 - 1
core/src/web/staticres/css/dev-qfw.css

@@ -2884,4 +2884,18 @@ style="color:#D03102;margin-right:5px;"
 }
 /*图标*/
 .jhtb{color:#FF5A5F; font-size:18px;top:4px;}
-.jhtbtype{color:#FF5A5F; font-size:18px; top:7px;}
+.jhtbtype{color:#FF5A5F; font-size:18px; top:7px;}
+
+.notetips{
+	z-index: 99999;
+	display:none;
+	top: 100px;
+	position: fixed;
+	border: 1px solid #ccc;
+	margin-left: 36%;
+	width: 230px;
+	height: 75px;
+	line-height: 75px;
+	text-align: center;
+	background: #FFF;
+}

+ 16 - 17
core/src/web/staticres/css/mobile/incmobile.css

@@ -61,7 +61,7 @@ ul{
 	display: inline-block;
 	position: absolute;
 	height: 26px;
-	line-height: 30px;
+	line-height: 26px;
 	margin: 3px 0 0 -80px;
 	text-align: center;
 	color: #A0A0A0;
@@ -94,18 +94,19 @@ ul{
 .inclist caption div.left{  
 	float:left;
 	width:75%;
-	font-size:13px;
+	font-size:16px;
 	font-weight:600;
 	color:#1A1A1A !important;
 	clear:both;
 }
 .inclist td{
 	color:#B5B6BB;
+	word-break: break-all;
 	font-size:12px;
 }
-.inclist td.left{
+/*.inclist td.left{
 	padding-right:15px;
-}
+}*/
 .inclist span{
 	color:#666666 !important;
 }
@@ -140,7 +141,6 @@ span#camera {
 }
 .nomore{
 	color:#B5B6BB;
-	font-size:11px;
 }
 .col-xs-12{
 	padding:0;	
@@ -254,7 +254,6 @@ span#camera {
 
 .index-header div.title,.index-header div.type ,.index-header div.taupe,.index-header div.abn{
 	display:inline-table;
-	font-size: 11px;
 	color:#FFF;
 	margin:5px 0 0 0 ;
 	line-height:19px;
@@ -262,13 +261,13 @@ span#camera {
 .index-header div.taupe{
 	padding-left:8px;
 	margin-left:5px;
-	width:45px;
+	width:46px;
 	text-align:left;	
 }
 .index-header div.title{
 	clear:both;
 	margin-top:10px;
-	font-size:14px;
+	font-size:16px;
 	font-weight:600;
 }
 .index-header div.abn{
@@ -365,8 +364,6 @@ span#camera {
 }
 .combody{
 	text-align:left;
-	font-size:11px;
-
 }
 .baseinfo li{
 	padding:20px 0 0 10px;
@@ -547,7 +544,10 @@ span#camera {
 }
 .creditrules div.content{
 	overflow-y: scroll;
-	padding: 10px 20px;
+	padding: 5px 20px;
+	padding-bottom: 20px;
+	overflow: scroll;
+	max-height: 320px;
 }
 .ent-dishonesty{
 	text-align:left;
@@ -557,12 +557,12 @@ span#camera {
 .ent-dishonesty .ent-table .b-com-first {
     margin-bottom: 5px;
     font-weight: bold;
-    font-size: 13px;
+    font-size: 16px;
 }
 .ent-dishonesty .ent-table .b-com-second,.ent-dishonesty .ent-table .b-com-third {
     margin-bottom: 5px;
     color: #a0a0a0;
-	font-size:10px;
+	font-size:14px;
 }
 .ent-dishonesty .ent-table td {
 	text-align:left;
@@ -601,9 +601,9 @@ span#camera {
 	font-size:16px;
 }
 .index-bodybg .main div.smallsign{
-	font-size:9px;
-	padding-bottom:10px;
-	color:#DBDBDC;
+	font-size: 14px;
+	padding-bottom: 10px;
+	color: #A0A0A0;
 }
 .form-control{
 	border-radius:0px;
@@ -624,7 +624,6 @@ span#camera {
 	z-index: 30;
 	position: absolute;
 	color: #A0A0A0;
-	font-size:11px;
 }
 .input-before{
 	top: 14px;

二进制
core/src/web/staticres/images/u14.png


+ 10 - 10
core/src/web/staticres/js/entportrait.js

@@ -28,7 +28,7 @@ $(function(){
 		workCopyRight = copyright.WorkCopyRight;
 		workCopyRightFlag = typeof(workCopyRight) != "undefined" && workCopyRight != null;
 		//软件
-		computerSoftCopyRight = copyright.ComputerSoftCopyRight;
+		computerSoftCopyRight = copyright.SoftWareCopyRight;
 		computerSoftCopyRightFlag = typeof(computerSoftCopyRight) != "undefined" && computerSoftCopyRight != null;
 		//专利
 		patent = copyright.Patent;
@@ -356,9 +356,9 @@ function CopyrightEntity(){
 			if(patentFlag){
 				$("#patentList .badge").text(patent.length);
 				patent.sort(function(a,b){
-					if(a.PublicDate<b.PublicDate){
+					if(a.publicdate<b.publicdate){
 						return 1;
-					}else if(a.PublicDate==b.PublicDate){
+					}else if(a.publicdate==b.publicdate){
 						return 0;
 					}
 					return -1;
@@ -366,14 +366,14 @@ function CopyrightEntity(){
 				var frontPaging = new FrontPaging("patentListPaging",patent,5,function(r){
 					var hm = '';
 					for(var i=0;i<r.length;i++){
-						hm += '<tr><td><div class="b-com-first">'+(r[i].PatentName?r[i].PatentName:"")+'</div>'
+						hm += '<tr><td><div class="b-com-first">'+(r[i].patentname?r[i].patentname:"")+'</div>'
 							+'<div class="b-com-second"><div>'
-							+'<span>申请人:'+(r[i].ApplyPerson?r[i].ApplyPerson:"")+'</span>'
-							+'<span>申请号:'+(r[i].ApplyNo?r[i].ApplyNo:"")+'</span>'
-							+'<span>申请日期:'+(r[i].ApplyDate?r[i].ApplyDate.replace(/\./g,"-"):"")+'</span>'
-							+'</div><span>分类号:'+(r[i].IpcTypeNo?r[i].IpcTypeNo:"")+'</span>'
-							+'<span>公开号:'+(r[i].PublicNo?r[i].PublicNo:"")+'</span>'
-							+'<span>公开日期:'+(r[i].PublicDate?r[i].PublicDate.replace(/\./g,"-"):"")+'</span>'
+							+'<span>申请人:'+(r[i].applyperson?r[i].applyperson:"")+'</span>'
+							+'<span>申请号:'+(r[i].applyno?r[i].applyno:"")+'</span>'
+							+'<span>申请日期:'+(r[i].applydate?r[i].applydate.replace(/\./g,"-"):"")+'</span>'
+							+'</div><span>分类号:'+(r[i].ipctypeno?r[i].ipctypeno:"")+'</span>'
+							+'<span>公开号:'+(r[i].publicno?r[i].publicno:"")+'</span>'
+							+'<span>公开日期:'+(r[i].publicdate?r[i].publicdate.replace(/\./g,"-"):"")+'</span>'
 							+'</div></td></tr>';
 					}
 					$("#patentListPaging").parent().prevAll().remove();

+ 2076 - 0
core/src/web/staticres/js/iscroll.js

@@ -0,0 +1,2076 @@
+/*! iScroll v5.1.3 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
+(function (window, document, Math) {
+var rAF = window.requestAnimationFrame	||
+	window.webkitRequestAnimationFrame	||
+	window.mozRequestAnimationFrame		||
+	window.oRequestAnimationFrame		||
+	window.msRequestAnimationFrame		||
+	function (callback) { window.setTimeout(callback, 1000 / 60); };
+
+var utils = (function () {
+	var me = {};
+
+	var _elementStyle = document.createElement('div').style;
+	var _vendor = (function () {
+		var vendors = ['t', 'webkitT', 'MozT', 'msT', 'OT'],
+			transform,
+			i = 0,
+			l = vendors.length;
+
+		for ( ; i < l; i++ ) {
+			transform = vendors[i] + 'ransform';
+			if ( transform in _elementStyle ) return vendors[i].substr(0, vendors[i].length-1);
+		}
+
+		return false;
+	})();
+
+	function _prefixStyle (style) {
+		if ( _vendor === false ) return false;
+		if ( _vendor === '' ) return style;
+		return _vendor + style.charAt(0).toUpperCase() + style.substr(1);
+	}
+
+	me.getTime = Date.now || function getTime () { return new Date().getTime(); };
+
+	me.extend = function (target, obj) {
+		for ( var i in obj ) {
+			target[i] = obj[i];
+		}
+	};
+
+	me.addEvent = function (el, type, fn, capture) {
+		el.addEventListener(type, fn, !!capture);
+	};
+
+	me.removeEvent = function (el, type, fn, capture) {
+		el.removeEventListener(type, fn, !!capture);
+	};
+
+	me.prefixPointerEvent = function (pointerEvent) {
+		return window.MSPointerEvent ?
+			'MSPointer' + pointerEvent.charAt(7).toUpperCase() + pointerEvent.substr(8):
+			pointerEvent;
+	};
+
+	me.momentum = function (current, start, time, lowerMargin, wrapperSize, deceleration) {
+		var distance = current - start,
+			speed = Math.abs(distance) / time,
+			destination,
+			duration;
+
+		deceleration = deceleration === undefined ? 0.0006 : deceleration;
+
+		destination = current + ( speed * speed ) / ( 2 * deceleration ) * ( distance < 0 ? -1 : 1 );
+		duration = speed / deceleration;
+
+		if ( destination < lowerMargin ) {
+			destination = wrapperSize ? lowerMargin - ( wrapperSize / 2.5 * ( speed / 8 ) ) : lowerMargin;
+			distance = Math.abs(destination - current);
+			duration = distance / speed;
+		} else if ( destination > 0 ) {
+			destination = wrapperSize ? wrapperSize / 2.5 * ( speed / 8 ) : 0;
+			distance = Math.abs(current) + destination;
+			duration = distance / speed;
+		}
+
+		return {
+			destination: Math.round(destination),
+			duration: duration
+		};
+	};
+
+	var _transform = _prefixStyle('transform');
+
+	me.extend(me, {
+		hasTransform: _transform !== false,
+		hasPerspective: _prefixStyle('perspective') in _elementStyle,
+		hasTouch: 'ontouchstart' in window,
+		hasPointer: !!(window.PointerEvent || window.MSPointerEvent), // IE10 is prefixed
+		hasTransition: _prefixStyle('transition') in _elementStyle
+	});
+
+	/*
+	This should find all Android browsers lower than build 535.19 (both stock browser and webview)
+	- galaxy S2 is ok
+    - 2.3.6 : `AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1`
+    - 4.0.4 : `AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30`
+   - galaxy S3 is badAndroid (stock brower, webview)
+     `AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30`
+   - galaxy S4 is badAndroid (stock brower, webview)
+     `AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30`
+   - galaxy S5 is OK
+     `AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.36 (Chrome/)`
+   - galaxy S6 is OK
+     `AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.36 (Chrome/)`
+  */
+	me.isBadAndroid = (function() {
+		var appVersion = window.navigator.appVersion;
+		// Android browser is not a chrome browser.
+		if (/Android/.test(appVersion) && !(/Chrome\/\d/.test(appVersion))) {
+			var safariVersion = appVersion.match(/Safari\/(\d+.\d)/);
+			if(safariVersion && typeof safariVersion === "object" && safariVersion.length >= 2) {
+				return parseFloat(safariVersion[1]) < 535.19;
+			} else {
+				return true;
+			}
+		} else {
+			return false;
+		}
+	})();
+
+	me.extend(me.style = {}, {
+		transform: _transform,
+		transitionTimingFunction: _prefixStyle('transitionTimingFunction'),
+		transitionDuration: _prefixStyle('transitionDuration'),
+		transitionDelay: _prefixStyle('transitionDelay'),
+		transformOrigin: _prefixStyle('transformOrigin')
+	});
+
+	me.hasClass = function (e, c) {
+		var re = new RegExp("(^|\\s)" + c + "(\\s|$)");
+		return re.test(e.className);
+	};
+
+	me.addClass = function (e, c) {
+		if ( me.hasClass(e, c) ) {
+			return;
+		}
+
+		var newclass = e.className.split(' ');
+		newclass.push(c);
+		e.className = newclass.join(' ');
+	};
+
+	me.removeClass = function (e, c) {
+		if ( !me.hasClass(e, c) ) {
+			return;
+		}
+
+		var re = new RegExp("(^|\\s)" + c + "(\\s|$)", 'g');
+		e.className = e.className.replace(re, ' ');
+	};
+
+	me.offset = function (el) {
+		var left = -el.offsetLeft,
+			top = -el.offsetTop;
+
+		// jshint -W084
+		while (el = el.offsetParent) {
+			left -= el.offsetLeft;
+			top -= el.offsetTop;
+		}
+		// jshint +W084
+
+		return {
+			left: left,
+			top: top
+		};
+	};
+
+	me.preventDefaultException = function (el, exceptions) {
+		for ( var i in exceptions ) {
+			if ( exceptions[i].test(el[i]) ) {
+				return true;
+			}
+		}
+
+		return false;
+	};
+
+	me.extend(me.eventType = {}, {
+		touchstart: 1,
+		touchmove: 1,
+		touchend: 1,
+
+		mousedown: 2,
+		mousemove: 2,
+		mouseup: 2,
+
+		pointerdown: 3,
+		pointermove: 3,
+		pointerup: 3,
+
+		MSPointerDown: 3,
+		MSPointerMove: 3,
+		MSPointerUp: 3
+	});
+
+	me.extend(me.ease = {}, {
+		quadratic: {
+			style: 'cubic-bezier(0.25, 0.46, 0.45, 0.94)',
+			fn: function (k) {
+				return k * ( 2 - k );
+			}
+		},
+		circular: {
+			style: 'cubic-bezier(0.1, 0.57, 0.1, 1)',	// Not properly "circular" but this looks better, it should be (0.075, 0.82, 0.165, 1)
+			fn: function (k) {
+				return Math.sqrt( 1 - ( --k * k ) );
+			}
+		},
+		back: {
+			style: 'cubic-bezier(0.175, 0.885, 0.32, 1.275)',
+			fn: function (k) {
+				var b = 4;
+				return ( k = k - 1 ) * k * ( ( b + 1 ) * k + b ) + 1;
+			}
+		},
+		bounce: {
+			style: '',
+			fn: function (k) {
+				if ( ( k /= 1 ) < ( 1 / 2.75 ) ) {
+					return 7.5625 * k * k;
+				} else if ( k < ( 2 / 2.75 ) ) {
+					return 7.5625 * ( k -= ( 1.5 / 2.75 ) ) * k + 0.75;
+				} else if ( k < ( 2.5 / 2.75 ) ) {
+					return 7.5625 * ( k -= ( 2.25 / 2.75 ) ) * k + 0.9375;
+				} else {
+					return 7.5625 * ( k -= ( 2.625 / 2.75 ) ) * k + 0.984375;
+				}
+			}
+		},
+		elastic: {
+			style: '',
+			fn: function (k) {
+				var f = 0.22,
+					e = 0.4;
+
+				if ( k === 0 ) { return 0; }
+				if ( k == 1 ) { return 1; }
+
+				return ( e * Math.pow( 2, - 10 * k ) * Math.sin( ( k - f / 4 ) * ( 2 * Math.PI ) / f ) + 1 );
+			}
+		}
+	});
+
+	me.tap = function (e, eventName) {
+		var ev = document.createEvent('Event');
+		ev.initEvent(eventName, true, true);
+		ev.pageX = e.pageX;
+		ev.pageY = e.pageY;
+		e.target.dispatchEvent(ev);
+	};
+
+	me.click = function (e) {
+		var target = e.target,
+			ev;
+
+		if ( !(/(SELECT|INPUT|TEXTAREA)/i).test(target.tagName) ) {
+			ev = document.createEvent('MouseEvents');
+			ev.initMouseEvent('click', true, true, e.view, 1,
+				target.screenX, target.screenY, target.clientX, target.clientY,
+				e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
+				0, null);
+
+			ev._constructed = true;
+			target.dispatchEvent(ev);
+		}
+	};
+
+	return me;
+})();
+function IScroll (el, options) {
+	this.wrapper = typeof el == 'string' ? document.querySelector(el) : el;
+	this.scroller = this.wrapper.children[0];
+	this.scrollerStyle = this.scroller.style;		// cache style for better performance
+
+	this.options = {
+
+		resizeScrollbars: true,
+
+		mouseWheelSpeed: 20,
+
+		snapThreshold: 0.334,
+
+// INSERT POINT: OPTIONS
+		disablePointer : !utils.hasPointer,
+		disableTouch : utils.hasPointer || !utils.hasTouch,
+		disableMouse : utils.hasPointer || utils.hasTouch,
+		startX: 0,
+		startY: 0,
+		scrollY: true,
+		directionLockThreshold: 5,
+		momentum: true,
+
+		bounce: true,
+		bounceTime: 600,
+		bounceEasing: '',
+
+		preventDefault: true,
+		preventDefaultException: { tagName: /^(INPUT|TEXTAREA|BUTTON|SELECT)$/ },
+
+		HWCompositing: true,
+		useTransition: true,
+		useTransform: true,
+		bindToWrapper: typeof window.onmousedown === "undefined"
+	};
+
+	for ( var i in options ) {
+		this.options[i] = options[i];
+	}
+
+	// Normalize options
+	this.translateZ = this.options.HWCompositing && utils.hasPerspective ? ' translateZ(0)' : '';
+
+	this.options.useTransition = utils.hasTransition && this.options.useTransition;
+	this.options.useTransform = utils.hasTransform && this.options.useTransform;
+
+	this.options.eventPassthrough = this.options.eventPassthrough === true ? 'vertical' : this.options.eventPassthrough;
+	this.options.preventDefault = !this.options.eventPassthrough && this.options.preventDefault;
+
+	// If you want eventPassthrough I have to lock one of the axes
+	this.options.scrollY = this.options.eventPassthrough == 'vertical' ? false : this.options.scrollY;
+	this.options.scrollX = this.options.eventPassthrough == 'horizontal' ? false : this.options.scrollX;
+
+	// With eventPassthrough we also need lockDirection mechanism
+	this.options.freeScroll = this.options.freeScroll && !this.options.eventPassthrough;
+	this.options.directionLockThreshold = this.options.eventPassthrough ? 0 : this.options.directionLockThreshold;
+
+	this.options.bounceEasing = typeof this.options.bounceEasing == 'string' ? utils.ease[this.options.bounceEasing] || utils.ease.circular : this.options.bounceEasing;
+
+	this.options.resizePolling = this.options.resizePolling === undefined ? 60 : this.options.resizePolling;
+
+	if ( this.options.tap === true ) {
+		this.options.tap = 'tap';
+	}
+
+	if ( this.options.shrinkScrollbars == 'scale' ) {
+		this.options.useTransition = false;
+	}
+
+	this.options.invertWheelDirection = this.options.invertWheelDirection ? -1 : 1;
+
+// INSERT POINT: NORMALIZATION
+
+	// Some defaults
+	this.x = 0;
+	this.y = 0;
+	this.directionX = 0;
+	this.directionY = 0;
+	this._events = {};
+
+// INSERT POINT: DEFAULTS
+
+	this._init();
+	this.refresh();
+
+	this.scrollTo(this.options.startX, this.options.startY);
+	this.enable();
+}
+
+IScroll.prototype = {
+	version: '5.1.3',
+
+	_init: function () {
+		this._initEvents();
+
+		if ( this.options.scrollbars || this.options.indicators ) {
+			this._initIndicators();
+		}
+
+		if ( this.options.mouseWheel ) {
+			this._initWheel();
+		}
+
+		if ( this.options.snap ) {
+			this._initSnap();
+		}
+
+		if ( this.options.keyBindings ) {
+			this._initKeys();
+		}
+
+// INSERT POINT: _init
+
+	},
+
+	destroy: function () {
+		this._initEvents(true);
+		clearTimeout(this.resizeTimeout);
+ 		this.resizeTimeout = null;
+		this._execEvent('destroy');
+	},
+
+	_transitionEnd: function (e) {
+		if ( e.target != this.scroller || !this.isInTransition ) {
+			return;
+		}
+
+		this._transitionTime();
+		if ( !this.resetPosition(this.options.bounceTime) ) {
+			this.isInTransition = false;
+			this._execEvent('scrollEnd');
+		}
+	},
+
+	_start: function (e) {
+		// React to left mouse button only
+		if ( utils.eventType[e.type] != 1 ) {
+			if ( e.button !== 0 ) {
+				return;
+			}
+		}
+
+		if ( !this.enabled || (this.initiated && utils.eventType[e.type] !== this.initiated) ) {
+			return;
+		}
+
+		if ( this.options.preventDefault && !utils.isBadAndroid && !utils.preventDefaultException(e.target, this.options.preventDefaultException) ) {
+			e.preventDefault();
+		}
+
+		var point = e.touches ? e.touches[0] : e,
+			pos;
+
+		this.initiated	= utils.eventType[e.type];
+		this.moved		= false;
+		this.distX		= 0;
+		this.distY		= 0;
+		this.directionX = 0;
+		this.directionY = 0;
+		this.directionLocked = 0;
+
+		this.startTime = utils.getTime();
+
+		if ( this.options.useTransition && this.isInTransition ) {
+			this._transitionTime();
+			this.isInTransition = false;
+			pos = this.getComputedPosition();
+			this._translate(Math.round(pos.x), Math.round(pos.y));
+			this._execEvent('scrollEnd');
+		} else if ( !this.options.useTransition && this.isAnimating ) {
+			this.isAnimating = false;
+			this._execEvent('scrollEnd');
+		}
+
+		this.startX    = this.x;
+		this.startY    = this.y;
+		this.absStartX = this.x;
+		this.absStartY = this.y;
+		this.pointX    = point.pageX;
+		this.pointY    = point.pageY;
+
+		this._execEvent('beforeScrollStart');
+	},
+
+	_move: function (e) {
+		if ( !this.enabled || utils.eventType[e.type] !== this.initiated ) {
+			return;
+		}
+
+		if ( this.options.preventDefault ) {	// increases performance on Android? TODO: check!
+			e.preventDefault();
+		}
+
+		var point		= e.touches ? e.touches[0] : e,
+			deltaX		= point.pageX - this.pointX,
+			deltaY		= point.pageY - this.pointY,
+			timestamp	= utils.getTime(),
+			newX, newY,
+			absDistX, absDistY;
+
+		this.pointX		= point.pageX;
+		this.pointY		= point.pageY;
+
+		this.distX		+= deltaX;
+		this.distY		+= deltaY;
+		absDistX		= Math.abs(this.distX);
+		absDistY		= Math.abs(this.distY);
+
+		// We need to move at least 10 pixels for the scrolling to initiate
+		if ( timestamp - this.endTime > 300 && (absDistX < 10 && absDistY < 10) ) {
+			return;
+		}
+
+		// If you are scrolling in one direction lock the other
+		if ( !this.directionLocked && !this.options.freeScroll ) {
+			if ( absDistX > absDistY + this.options.directionLockThreshold ) {
+				this.directionLocked = 'h';		// lock horizontally
+			} else if ( absDistY >= absDistX + this.options.directionLockThreshold ) {
+				this.directionLocked = 'v';		// lock vertically
+			} else {
+				this.directionLocked = 'n';		// no lock
+			}
+		}
+
+		if ( this.directionLocked == 'h' ) {
+			if ( this.options.eventPassthrough == 'vertical' ) {
+				e.preventDefault();
+			} else if ( this.options.eventPassthrough == 'horizontal' ) {
+				this.initiated = false;
+				return;
+			}
+
+			deltaY = 0;
+		} else if ( this.directionLocked == 'v' ) {
+			if ( this.options.eventPassthrough == 'horizontal' ) {
+				e.preventDefault();
+			} else if ( this.options.eventPassthrough == 'vertical' ) {
+				this.initiated = false;
+				return;
+			}
+
+			deltaX = 0;
+		}
+
+		deltaX = this.hasHorizontalScroll ? deltaX : 0;
+		deltaY = this.hasVerticalScroll ? deltaY : 0;
+
+		newX = this.x + deltaX;
+		newY = this.y + deltaY;
+
+		// Slow down if outside of the boundaries
+		if ( newX > 0 || newX < this.maxScrollX ) {
+			newX = this.options.bounce ? this.x + deltaX / 3 : newX > 0 ? 0 : this.maxScrollX;
+		}
+		if ( newY > 0 || newY < this.maxScrollY ) {
+			newY = this.options.bounce ? this.y + deltaY / 3 : newY > 0 ? 0 : this.maxScrollY;
+		}
+
+		this.directionX = deltaX > 0 ? -1 : deltaX < 0 ? 1 : 0;
+		this.directionY = deltaY > 0 ? -1 : deltaY < 0 ? 1 : 0;
+
+		if ( !this.moved ) {
+			this._execEvent('scrollStart');
+		}
+
+		this.moved = true;
+
+		this._translate(newX, newY);
+
+/* REPLACE START: _move */
+
+		if ( timestamp - this.startTime > 300 ) {
+			this.startTime = timestamp;
+			this.startX = this.x;
+			this.startY = this.y;
+		}
+
+/* REPLACE END: _move */
+
+	},
+
+	_end: function (e) {
+		if ( !this.enabled || utils.eventType[e.type] !== this.initiated ) {
+			return;
+		}
+
+		if ( this.options.preventDefault && !utils.preventDefaultException(e.target, this.options.preventDefaultException) ) {
+			e.preventDefault();
+		}
+
+		var point = e.changedTouches ? e.changedTouches[0] : e,
+			momentumX,
+			momentumY,
+			duration = utils.getTime() - this.startTime,
+			newX = Math.round(this.x),
+			newY = Math.round(this.y),
+			distanceX = Math.abs(newX - this.startX),
+			distanceY = Math.abs(newY - this.startY),
+			time = 0,
+			easing = '';
+
+		this.isInTransition = 0;
+		this.initiated = 0;
+		this.endTime = utils.getTime();
+
+		// reset if we are outside of the boundaries
+		if ( this.resetPosition(this.options.bounceTime) ) {
+			return;
+		}
+
+		this.scrollTo(newX, newY);	// ensures that the last position is rounded
+
+		// we scrolled less than 10 pixels
+		if ( !this.moved ) {
+			if ( this.options.tap ) {
+				utils.tap(e, this.options.tap);
+			}
+
+			if ( this.options.click ) {
+				utils.click(e);
+			}
+
+			this._execEvent('scrollCancel');
+			return;
+		}
+
+		if ( this._events.flick && duration < 200 && distanceX < 100 && distanceY < 100 ) {
+			this._execEvent('flick');
+			return;
+		}
+
+		// start momentum animation if needed
+		if ( this.options.momentum && duration < 300 ) {
+			momentumX = this.hasHorizontalScroll ? utils.momentum(this.x, this.startX, duration, this.maxScrollX, this.options.bounce ? this.wrapperWidth : 0, this.options.deceleration) : { destination: newX, duration: 0 };
+			momentumY = this.hasVerticalScroll ? utils.momentum(this.y, this.startY, duration, this.maxScrollY, this.options.bounce ? this.wrapperHeight : 0, this.options.deceleration) : { destination: newY, duration: 0 };
+			newX = momentumX.destination;
+			newY = momentumY.destination;
+			time = Math.max(momentumX.duration, momentumY.duration);
+			this.isInTransition = 1;
+		}
+
+
+		if ( this.options.snap ) {
+			var snap = this._nearestSnap(newX, newY);
+			this.currentPage = snap;
+			time = this.options.snapSpeed || Math.max(
+					Math.max(
+						Math.min(Math.abs(newX - snap.x), 1000),
+						Math.min(Math.abs(newY - snap.y), 1000)
+					), 300);
+			newX = snap.x;
+			newY = snap.y;
+
+			this.directionX = 0;
+			this.directionY = 0;
+			easing = this.options.bounceEasing;
+		}
+
+// INSERT POINT: _end
+
+		if ( newX != this.x || newY != this.y ) {
+			// change easing function when scroller goes out of the boundaries
+			if ( newX > 0 || newX < this.maxScrollX || newY > 0 || newY < this.maxScrollY ) {
+				easing = utils.ease.quadratic;
+			}
+
+			this.scrollTo(newX, newY, time, easing);
+			return;
+		}
+
+		this._execEvent('scrollEnd');
+	},
+
+	_resize: function () {
+		var that = this;
+
+		clearTimeout(this.resizeTimeout);
+
+		this.resizeTimeout = setTimeout(function () {
+			that.refresh();
+		}, this.options.resizePolling);
+	},
+
+	resetPosition: function (time) {
+		var x = this.x,
+			y = this.y;
+
+		time = time || 0;
+
+		if ( !this.hasHorizontalScroll || this.x > 0 ) {
+			x = 0;
+		} else if ( this.x < this.maxScrollX ) {
+			x = this.maxScrollX;
+		}
+
+		if ( !this.hasVerticalScroll || this.y > 0 ) {
+			y = 0;
+		} else if ( this.y < this.maxScrollY ) {
+			y = this.maxScrollY;
+		}
+
+		if ( x == this.x && y == this.y ) {
+			return false;
+		}
+
+		this.scrollTo(x, y, time, this.options.bounceEasing);
+
+		return true;
+	},
+
+	disable: function () {
+		this.enabled = false;
+	},
+
+	enable: function () {
+		this.enabled = true;
+	},
+
+	refresh: function () {
+		var rf = this.wrapper.offsetHeight;		// Force reflow
+
+		this.wrapperWidth	= this.wrapper.clientWidth;
+		this.wrapperHeight	= this.wrapper.clientHeight;
+
+/* REPLACE START: refresh */
+
+		this.scrollerWidth	= this.scroller.offsetWidth;
+		this.scrollerHeight	= this.scroller.offsetHeight;
+
+		this.maxScrollX		= this.wrapperWidth - this.scrollerWidth;
+		this.maxScrollY		= this.wrapperHeight - this.scrollerHeight;
+
+/* REPLACE END: refresh */
+
+		this.hasHorizontalScroll	= this.options.scrollX && this.maxScrollX < 0;
+		this.hasVerticalScroll		= this.options.scrollY && this.maxScrollY < 0;
+
+		if ( !this.hasHorizontalScroll ) {
+			this.maxScrollX = 0;
+			this.scrollerWidth = this.wrapperWidth;
+		}
+
+		if ( !this.hasVerticalScroll ) {
+			this.maxScrollY = 0;
+			this.scrollerHeight = this.wrapperHeight;
+		}
+
+		this.endTime = 0;
+		this.directionX = 0;
+		this.directionY = 0;
+
+		this.wrapperOffset = utils.offset(this.wrapper);
+
+		this._execEvent('refresh');
+
+		this.resetPosition();
+
+// INSERT POINT: _refresh
+
+	},
+
+	on: function (type, fn) {
+		if ( !this._events[type] ) {
+			this._events[type] = [];
+		}
+
+		this._events[type].push(fn);
+	},
+
+	off: function (type, fn) {
+		if ( !this._events[type] ) {
+			return;
+		}
+
+		var index = this._events[type].indexOf(fn);
+
+		if ( index > -1 ) {
+			this._events[type].splice(index, 1);
+		}
+	},
+
+	_execEvent: function (type) {
+		if ( !this._events[type] ) {
+			return;
+		}
+
+		var i = 0,
+			l = this._events[type].length;
+
+		if ( !l ) {
+			return;
+		}
+
+		for ( ; i < l; i++ ) {
+			this._events[type][i].apply(this, [].slice.call(arguments, 1));
+		}
+	},
+
+	scrollBy: function (x, y, time, easing) {
+		x = this.x + x;
+		y = this.y + y;
+		time = time || 0;
+
+		this.scrollTo(x, y, time, easing);
+	},
+
+	scrollTo: function (x, y, time, easing) {
+		easing = easing || utils.ease.circular;
+
+		this.isInTransition = this.options.useTransition && time > 0;
+		var transitionType = this.options.useTransition && easing.style;
+		if ( !time || transitionType ) {
+				if(transitionType) {
+					this._transitionTimingFunction(easing.style);
+					this._transitionTime(time);
+				}
+			this._translate(x, y);
+		} else {
+			this._animate(x, y, time, easing.fn);
+		}
+	},
+
+	scrollToElement: function (el, time, offsetX, offsetY, easing) {
+		el = el.nodeType ? el : this.scroller.querySelector(el);
+
+		if ( !el ) {
+			return;
+		}
+
+		var pos = utils.offset(el);
+
+		pos.left -= this.wrapperOffset.left;
+		pos.top  -= this.wrapperOffset.top;
+
+		// if offsetX/Y are true we center the element to the screen
+		if ( offsetX === true ) {
+			offsetX = Math.round(el.offsetWidth / 2 - this.wrapper.offsetWidth / 2);
+		}
+		if ( offsetY === true ) {
+			offsetY = Math.round(el.offsetHeight / 2 - this.wrapper.offsetHeight / 2);
+		}
+
+		pos.left -= offsetX || 0;
+		pos.top  -= offsetY || 0;
+
+		pos.left = pos.left > 0 ? 0 : pos.left < this.maxScrollX ? this.maxScrollX : pos.left;
+		pos.top  = pos.top  > 0 ? 0 : pos.top  < this.maxScrollY ? this.maxScrollY : pos.top;
+
+		time = time === undefined || time === null || time === 'auto' ? Math.max(Math.abs(this.x-pos.left), Math.abs(this.y-pos.top)) : time;
+
+		this.scrollTo(pos.left, pos.top, time, easing);
+	},
+
+	_transitionTime: function (time) {
+		time = time || 0;
+
+		var durationProp = utils.style.transitionDuration;
+		this.scrollerStyle[durationProp] = time + 'ms';
+
+		if ( !time && utils.isBadAndroid ) {
+			this.scrollerStyle[durationProp] = '0.0001ms';
+			// remove 0.0001ms
+			var self = this;
+			rAF(function() {
+				if(self.scrollerStyle[durationProp] === '0.0001ms') {
+					self.scrollerStyle[durationProp] = '0s';
+				}
+			});
+		}
+
+
+		if ( this.indicators ) {
+			for ( var i = this.indicators.length; i--; ) {
+				this.indicators[i].transitionTime(time);
+			}
+		}
+
+
+// INSERT POINT: _transitionTime
+
+	},
+
+	_transitionTimingFunction: function (easing) {
+		this.scrollerStyle[utils.style.transitionTimingFunction] = easing;
+
+
+		if ( this.indicators ) {
+			for ( var i = this.indicators.length; i--; ) {
+				this.indicators[i].transitionTimingFunction(easing);
+			}
+		}
+
+
+// INSERT POINT: _transitionTimingFunction
+
+	},
+
+	_translate: function (x, y) {
+		if ( this.options.useTransform ) {
+
+/* REPLACE START: _translate */
+
+			this.scrollerStyle[utils.style.transform] = 'translate(' + x + 'px,' + y + 'px)' + this.translateZ;
+
+/* REPLACE END: _translate */
+
+		} else {
+			x = Math.round(x);
+			y = Math.round(y);
+			this.scrollerStyle.left = x + 'px';
+			this.scrollerStyle.top = y + 'px';
+		}
+
+		this.x = x;
+		this.y = y;
+
+
+	if ( this.indicators ) {
+		for ( var i = this.indicators.length; i--; ) {
+			this.indicators[i].updatePosition();
+		}
+	}
+
+
+// INSERT POINT: _translate
+
+	},
+
+	_initEvents: function (remove) {
+		var eventType = remove ? utils.removeEvent : utils.addEvent,
+			target = this.options.bindToWrapper ? this.wrapper : window;
+
+		eventType(window, 'orientationchange', this);
+		eventType(window, 'resize', this);
+
+		if ( this.options.click ) {
+			eventType(this.wrapper, 'click', this, true);
+		}
+
+		if ( !this.options.disableMouse ) {
+			eventType(this.wrapper, 'mousedown', this);
+			eventType(target, 'mousemove', this);
+			eventType(target, 'mousecancel', this);
+			eventType(target, 'mouseup', this);
+		}
+
+		if ( utils.hasPointer && !this.options.disablePointer ) {
+			eventType(this.wrapper, utils.prefixPointerEvent('pointerdown'), this);
+			eventType(target, utils.prefixPointerEvent('pointermove'), this);
+			eventType(target, utils.prefixPointerEvent('pointercancel'), this);
+			eventType(target, utils.prefixPointerEvent('pointerup'), this);
+		}
+
+		if ( utils.hasTouch && !this.options.disableTouch ) {
+			eventType(this.wrapper, 'touchstart', this);
+			eventType(target, 'touchmove', this);
+			eventType(target, 'touchcancel', this);
+			eventType(target, 'touchend', this);
+		}
+
+		eventType(this.scroller, 'transitionend', this);
+		eventType(this.scroller, 'webkitTransitionEnd', this);
+		eventType(this.scroller, 'oTransitionEnd', this);
+		eventType(this.scroller, 'MSTransitionEnd', this);
+	},
+
+	getComputedPosition: function () {
+		var matrix = window.getComputedStyle(this.scroller, null),
+			x, y;
+
+		if ( this.options.useTransform ) {
+			matrix = matrix[utils.style.transform].split(')')[0].split(', ');
+			x = +(matrix[12] || matrix[4]);
+			y = +(matrix[13] || matrix[5]);
+		} else {
+			x = +matrix.left.replace(/[^-\d.]/g, '');
+			y = +matrix.top.replace(/[^-\d.]/g, '');
+		}
+
+		return { x: x, y: y };
+	},
+	_initIndicators: function () {
+		var interactive = this.options.interactiveScrollbars,
+			customStyle = typeof this.options.scrollbars != 'string',
+			indicators = [],
+			indicator;
+
+		var that = this;
+
+		this.indicators = [];
+
+		if ( this.options.scrollbars ) {
+			// Vertical scrollbar
+			if ( this.options.scrollY ) {
+				indicator = {
+					el: createDefaultScrollbar('v', interactive, this.options.scrollbars),
+					interactive: interactive,
+					defaultScrollbars: true,
+					customStyle: customStyle,
+					resize: this.options.resizeScrollbars,
+					shrink: this.options.shrinkScrollbars,
+					fade: this.options.fadeScrollbars,
+					listenX: false
+				};
+
+				this.wrapper.appendChild(indicator.el);
+				indicators.push(indicator);
+			}
+
+			// Horizontal scrollbar
+			if ( this.options.scrollX ) {
+				indicator = {
+					el: createDefaultScrollbar('h', interactive, this.options.scrollbars),
+					interactive: interactive,
+					defaultScrollbars: true,
+					customStyle: customStyle,
+					resize: this.options.resizeScrollbars,
+					shrink: this.options.shrinkScrollbars,
+					fade: this.options.fadeScrollbars,
+					listenY: false
+				};
+
+				this.wrapper.appendChild(indicator.el);
+				indicators.push(indicator);
+			}
+		}
+
+		if ( this.options.indicators ) {
+			// TODO: check concat compatibility
+			indicators = indicators.concat(this.options.indicators);
+		}
+
+		for ( var i = indicators.length; i--; ) {
+			this.indicators.push( new Indicator(this, indicators[i]) );
+		}
+
+		// TODO: check if we can use array.map (wide compatibility and performance issues)
+		function _indicatorsMap (fn) {
+			for ( var i = that.indicators.length; i--; ) {
+				fn.call(that.indicators[i]);
+			}
+		}
+
+		if ( this.options.fadeScrollbars ) {
+			this.on('scrollEnd', function () {
+				_indicatorsMap(function () {
+					this.fade();
+				});
+			});
+
+			this.on('scrollCancel', function () {
+				_indicatorsMap(function () {
+					this.fade();
+				});
+			});
+
+			this.on('scrollStart', function () {
+				_indicatorsMap(function () {
+					this.fade(1);
+				});
+			});
+
+			this.on('beforeScrollStart', function () {
+				_indicatorsMap(function () {
+					this.fade(1, true);
+				});
+			});
+		}
+
+
+		this.on('refresh', function () {
+			_indicatorsMap(function () {
+				this.refresh();
+			});
+		});
+
+		this.on('destroy', function () {
+			_indicatorsMap(function () {
+				this.destroy();
+			});
+
+			delete this.indicators;
+		});
+	},
+
+	_initWheel: function () {
+		utils.addEvent(this.wrapper, 'wheel', this);
+		utils.addEvent(this.wrapper, 'mousewheel', this);
+		utils.addEvent(this.wrapper, 'DOMMouseScroll', this);
+
+		this.on('destroy', function () {
+			clearTimeout(this.wheelTimeout);
+			this.wheelTimeout = null;
+			utils.removeEvent(this.wrapper, 'wheel', this);
+			utils.removeEvent(this.wrapper, 'mousewheel', this);
+			utils.removeEvent(this.wrapper, 'DOMMouseScroll', this);
+		});
+	},
+
+	_wheel: function (e) {
+		if ( !this.enabled ) {
+			return;
+		}
+
+		e.preventDefault();
+
+		var wheelDeltaX, wheelDeltaY,
+			newX, newY,
+			that = this;
+
+		if ( this.wheelTimeout === undefined ) {
+			that._execEvent('scrollStart');
+		}
+
+		// Execute the scrollEnd event after 400ms the wheel stopped scrolling
+		clearTimeout(this.wheelTimeout);
+		this.wheelTimeout = setTimeout(function () {
+			that._execEvent('scrollEnd');
+			that.wheelTimeout = undefined;
+		}, 400);
+
+		if ( 'deltaX' in e ) {
+			if (e.deltaMode === 1) {
+				wheelDeltaX = -e.deltaX * this.options.mouseWheelSpeed;
+				wheelDeltaY = -e.deltaY * this.options.mouseWheelSpeed;
+			} else {
+				wheelDeltaX = -e.deltaX;
+				wheelDeltaY = -e.deltaY;
+			}
+		} else if ( 'wheelDeltaX' in e ) {
+			wheelDeltaX = e.wheelDeltaX / 120 * this.options.mouseWheelSpeed;
+			wheelDeltaY = e.wheelDeltaY / 120 * this.options.mouseWheelSpeed;
+		} else if ( 'wheelDelta' in e ) {
+			wheelDeltaX = wheelDeltaY = e.wheelDelta / 120 * this.options.mouseWheelSpeed;
+		} else if ( 'detail' in e ) {
+			wheelDeltaX = wheelDeltaY = -e.detail / 3 * this.options.mouseWheelSpeed;
+		} else {
+			return;
+		}
+
+		wheelDeltaX *= this.options.invertWheelDirection;
+		wheelDeltaY *= this.options.invertWheelDirection;
+
+		if ( !this.hasVerticalScroll ) {
+			wheelDeltaX = wheelDeltaY;
+			wheelDeltaY = 0;
+		}
+
+		if ( this.options.snap ) {
+			newX = this.currentPage.pageX;
+			newY = this.currentPage.pageY;
+
+			if ( wheelDeltaX > 0 ) {
+				newX--;
+			} else if ( wheelDeltaX < 0 ) {
+				newX++;
+			}
+
+			if ( wheelDeltaY > 0 ) {
+				newY--;
+			} else if ( wheelDeltaY < 0 ) {
+				newY++;
+			}
+
+			this.goToPage(newX, newY);
+
+			return;
+		}
+
+		newX = this.x + Math.round(this.hasHorizontalScroll ? wheelDeltaX : 0);
+		newY = this.y + Math.round(this.hasVerticalScroll ? wheelDeltaY : 0);
+
+		this.directionX = wheelDeltaX > 0 ? -1 : wheelDeltaX < 0 ? 1 : 0;
+		this.directionY = wheelDeltaY > 0 ? -1 : wheelDeltaY < 0 ? 1 : 0;
+
+		if ( newX > 0 ) {
+			newX = 0;
+		} else if ( newX < this.maxScrollX ) {
+			newX = this.maxScrollX;
+		}
+
+		if ( newY > 0 ) {
+			newY = 0;
+		} else if ( newY < this.maxScrollY ) {
+			newY = this.maxScrollY;
+		}
+
+		this.scrollTo(newX, newY, 0);
+
+// INSERT POINT: _wheel
+	},
+
+	_initSnap: function () {
+		this.currentPage = {};
+
+		if ( typeof this.options.snap == 'string' ) {
+			this.options.snap = this.scroller.querySelectorAll(this.options.snap);
+		}
+
+		this.on('refresh', function () {
+			var i = 0, l,
+				m = 0, n,
+				cx, cy,
+				x = 0, y,
+				stepX = this.options.snapStepX || this.wrapperWidth,
+				stepY = this.options.snapStepY || this.wrapperHeight,
+				el;
+
+			this.pages = [];
+
+			if ( !this.wrapperWidth || !this.wrapperHeight || !this.scrollerWidth || !this.scrollerHeight ) {
+				return;
+			}
+
+			if ( this.options.snap === true ) {
+				cx = Math.round( stepX / 2 );
+				cy = Math.round( stepY / 2 );
+
+				while ( x > -this.scrollerWidth ) {
+					this.pages[i] = [];
+					l = 0;
+					y = 0;
+
+					while ( y > -this.scrollerHeight ) {
+						this.pages[i][l] = {
+							x: Math.max(x, this.maxScrollX),
+							y: Math.max(y, this.maxScrollY),
+							width: stepX,
+							height: stepY,
+							cx: x - cx,
+							cy: y - cy
+						};
+
+						y -= stepY;
+						l++;
+					}
+
+					x -= stepX;
+					i++;
+				}
+			} else {
+				el = this.options.snap;
+				l = el.length;
+				n = -1;
+
+				for ( ; i < l; i++ ) {
+					if ( i === 0 || el[i].offsetLeft <= el[i-1].offsetLeft ) {
+						m = 0;
+						n++;
+					}
+
+					if ( !this.pages[m] ) {
+						this.pages[m] = [];
+					}
+
+					x = Math.max(-el[i].offsetLeft, this.maxScrollX);
+					y = Math.max(-el[i].offsetTop, this.maxScrollY);
+					cx = x - Math.round(el[i].offsetWidth / 2);
+					cy = y - Math.round(el[i].offsetHeight / 2);
+
+					this.pages[m][n] = {
+						x: x,
+						y: y,
+						width: el[i].offsetWidth,
+						height: el[i].offsetHeight,
+						cx: cx,
+						cy: cy
+					};
+
+					if ( x > this.maxScrollX ) {
+						m++;
+					}
+				}
+			}
+
+			this.goToPage(this.currentPage.pageX || 0, this.currentPage.pageY || 0, 0);
+
+			// Update snap threshold if needed
+			if ( this.options.snapThreshold % 1 === 0 ) {
+				this.snapThresholdX = this.options.snapThreshold;
+				this.snapThresholdY = this.options.snapThreshold;
+			} else {
+				this.snapThresholdX = Math.round(this.pages[this.currentPage.pageX][this.currentPage.pageY].width * this.options.snapThreshold);
+				this.snapThresholdY = Math.round(this.pages[this.currentPage.pageX][this.currentPage.pageY].height * this.options.snapThreshold);
+			}
+		});
+
+		this.on('flick', function () {
+			var time = this.options.snapSpeed || Math.max(
+					Math.max(
+						Math.min(Math.abs(this.x - this.startX), 1000),
+						Math.min(Math.abs(this.y - this.startY), 1000)
+					), 300);
+
+			this.goToPage(
+				this.currentPage.pageX + this.directionX,
+				this.currentPage.pageY + this.directionY,
+				time
+			);
+		});
+	},
+
+	_nearestSnap: function (x, y) {
+		if ( !this.pages.length ) {
+			return { x: 0, y: 0, pageX: 0, pageY: 0 };
+		}
+
+		var i = 0,
+			l = this.pages.length,
+			m = 0;
+
+		// Check if we exceeded the snap threshold
+		if ( Math.abs(x - this.absStartX) < this.snapThresholdX &&
+			Math.abs(y - this.absStartY) < this.snapThresholdY ) {
+			return this.currentPage;
+		}
+
+		if ( x > 0 ) {
+			x = 0;
+		} else if ( x < this.maxScrollX ) {
+			x = this.maxScrollX;
+		}
+
+		if ( y > 0 ) {
+			y = 0;
+		} else if ( y < this.maxScrollY ) {
+			y = this.maxScrollY;
+		}
+
+		for ( ; i < l; i++ ) {
+			if ( x >= this.pages[i][0].cx ) {
+				x = this.pages[i][0].x;
+				break;
+			}
+		}
+
+		l = this.pages[i].length;
+
+		for ( ; m < l; m++ ) {
+			if ( y >= this.pages[0][m].cy ) {
+				y = this.pages[0][m].y;
+				break;
+			}
+		}
+
+		if ( i == this.currentPage.pageX ) {
+			i += this.directionX;
+
+			if ( i < 0 ) {
+				i = 0;
+			} else if ( i >= this.pages.length ) {
+				i = this.pages.length - 1;
+			}
+
+			x = this.pages[i][0].x;
+		}
+
+		if ( m == this.currentPage.pageY ) {
+			m += this.directionY;
+
+			if ( m < 0 ) {
+				m = 0;
+			} else if ( m >= this.pages[0].length ) {
+				m = this.pages[0].length - 1;
+			}
+
+			y = this.pages[0][m].y;
+		}
+
+		return {
+			x: x,
+			y: y,
+			pageX: i,
+			pageY: m
+		};
+	},
+
+	goToPage: function (x, y, time, easing) {
+		easing = easing || this.options.bounceEasing;
+
+		if ( x >= this.pages.length ) {
+			x = this.pages.length - 1;
+		} else if ( x < 0 ) {
+			x = 0;
+		}
+
+		if ( y >= this.pages[x].length ) {
+			y = this.pages[x].length - 1;
+		} else if ( y < 0 ) {
+			y = 0;
+		}
+
+		var posX = this.pages[x][y].x,
+			posY = this.pages[x][y].y;
+
+		time = time === undefined ? this.options.snapSpeed || Math.max(
+			Math.max(
+				Math.min(Math.abs(posX - this.x), 1000),
+				Math.min(Math.abs(posY - this.y), 1000)
+			), 300) : time;
+
+		this.currentPage = {
+			x: posX,
+			y: posY,
+			pageX: x,
+			pageY: y
+		};
+
+		this.scrollTo(posX, posY, time, easing);
+	},
+
+	next: function (time, easing) {
+		var x = this.currentPage.pageX,
+			y = this.currentPage.pageY;
+
+		x++;
+
+		if ( x >= this.pages.length && this.hasVerticalScroll ) {
+			x = 0;
+			y++;
+		}
+
+		this.goToPage(x, y, time, easing);
+	},
+
+	prev: function (time, easing) {
+		var x = this.currentPage.pageX,
+			y = this.currentPage.pageY;
+
+		x--;
+
+		if ( x < 0 && this.hasVerticalScroll ) {
+			x = 0;
+			y--;
+		}
+
+		this.goToPage(x, y, time, easing);
+	},
+
+	_initKeys: function (e) {
+		// default key bindings
+		var keys = {
+			pageUp: 33,
+			pageDown: 34,
+			end: 35,
+			home: 36,
+			left: 37,
+			up: 38,
+			right: 39,
+			down: 40
+		};
+		var i;
+
+		// if you give me characters I give you keycode
+		if ( typeof this.options.keyBindings == 'object' ) {
+			for ( i in this.options.keyBindings ) {
+				if ( typeof this.options.keyBindings[i] == 'string' ) {
+					this.options.keyBindings[i] = this.options.keyBindings[i].toUpperCase().charCodeAt(0);
+				}
+			}
+		} else {
+			this.options.keyBindings = {};
+		}
+
+		for ( i in keys ) {
+			this.options.keyBindings[i] = this.options.keyBindings[i] || keys[i];
+		}
+
+		utils.addEvent(window, 'keydown', this);
+
+		this.on('destroy', function () {
+			utils.removeEvent(window, 'keydown', this);
+		});
+	},
+
+	_key: function (e) {
+		if ( !this.enabled ) {
+			return;
+		}
+
+		var snap = this.options.snap,	// we are using this alot, better to cache it
+			newX = snap ? this.currentPage.pageX : this.x,
+			newY = snap ? this.currentPage.pageY : this.y,
+			now = utils.getTime(),
+			prevTime = this.keyTime || 0,
+			acceleration = 0.250,
+			pos;
+
+		if ( this.options.useTransition && this.isInTransition ) {
+			pos = this.getComputedPosition();
+
+			this._translate(Math.round(pos.x), Math.round(pos.y));
+			this.isInTransition = false;
+		}
+
+		this.keyAcceleration = now - prevTime < 200 ? Math.min(this.keyAcceleration + acceleration, 50) : 0;
+
+		switch ( e.keyCode ) {
+			case this.options.keyBindings.pageUp:
+				if ( this.hasHorizontalScroll && !this.hasVerticalScroll ) {
+					newX += snap ? 1 : this.wrapperWidth;
+				} else {
+					newY += snap ? 1 : this.wrapperHeight;
+				}
+				break;
+			case this.options.keyBindings.pageDown:
+				if ( this.hasHorizontalScroll && !this.hasVerticalScroll ) {
+					newX -= snap ? 1 : this.wrapperWidth;
+				} else {
+					newY -= snap ? 1 : this.wrapperHeight;
+				}
+				break;
+			case this.options.keyBindings.end:
+				newX = snap ? this.pages.length-1 : this.maxScrollX;
+				newY = snap ? this.pages[0].length-1 : this.maxScrollY;
+				break;
+			case this.options.keyBindings.home:
+				newX = 0;
+				newY = 0;
+				break;
+			case this.options.keyBindings.left:
+				newX += snap ? -1 : 5 + this.keyAcceleration>>0;
+				break;
+			case this.options.keyBindings.up:
+				newY += snap ? 1 : 5 + this.keyAcceleration>>0;
+				break;
+			case this.options.keyBindings.right:
+				newX -= snap ? -1 : 5 + this.keyAcceleration>>0;
+				break;
+			case this.options.keyBindings.down:
+				newY -= snap ? 1 : 5 + this.keyAcceleration>>0;
+				break;
+			default:
+				return;
+		}
+
+		if ( snap ) {
+			this.goToPage(newX, newY);
+			return;
+		}
+
+		if ( newX > 0 ) {
+			newX = 0;
+			this.keyAcceleration = 0;
+		} else if ( newX < this.maxScrollX ) {
+			newX = this.maxScrollX;
+			this.keyAcceleration = 0;
+		}
+
+		if ( newY > 0 ) {
+			newY = 0;
+			this.keyAcceleration = 0;
+		} else if ( newY < this.maxScrollY ) {
+			newY = this.maxScrollY;
+			this.keyAcceleration = 0;
+		}
+
+		this.scrollTo(newX, newY, 0);
+
+		this.keyTime = now;
+	},
+
+	_animate: function (destX, destY, duration, easingFn) {
+		var that = this,
+			startX = this.x,
+			startY = this.y,
+			startTime = utils.getTime(),
+			destTime = startTime + duration;
+
+		function step () {
+			var now = utils.getTime(),
+				newX, newY,
+				easing;
+
+			if ( now >= destTime ) {
+				that.isAnimating = false;
+				that._translate(destX, destY);
+
+				if ( !that.resetPosition(that.options.bounceTime) ) {
+					that._execEvent('scrollEnd');
+				}
+
+				return;
+			}
+
+			now = ( now - startTime ) / duration;
+			easing = easingFn(now);
+			newX = ( destX - startX ) * easing + startX;
+			newY = ( destY - startY ) * easing + startY;
+			that._translate(newX, newY);
+
+			if ( that.isAnimating ) {
+				rAF(step);
+			}
+		}
+
+		this.isAnimating = true;
+		step();
+	},
+	handleEvent: function (e) {
+		switch ( e.type ) {
+			case 'touchstart':
+			case 'pointerdown':
+			case 'MSPointerDown':
+			case 'mousedown':
+				this._start(e);
+				break;
+			case 'touchmove':
+			case 'pointermove':
+			case 'MSPointerMove':
+			case 'mousemove':
+				this._move(e);
+				break;
+			case 'touchend':
+			case 'pointerup':
+			case 'MSPointerUp':
+			case 'mouseup':
+			case 'touchcancel':
+			case 'pointercancel':
+			case 'MSPointerCancel':
+			case 'mousecancel':
+				this._end(e);
+				break;
+			case 'orientationchange':
+			case 'resize':
+				this._resize();
+				break;
+			case 'transitionend':
+			case 'webkitTransitionEnd':
+			case 'oTransitionEnd':
+			case 'MSTransitionEnd':
+				this._transitionEnd(e);
+				break;
+			case 'wheel':
+			case 'DOMMouseScroll':
+			case 'mousewheel':
+				this._wheel(e);
+				break;
+			case 'keydown':
+				this._key(e);
+				break;
+			case 'click':
+				if ( !e._constructed ) {
+					e.preventDefault();
+					e.stopPropagation();
+				}
+				break;
+		}
+	}
+};
+function createDefaultScrollbar (direction, interactive, type) {
+	var scrollbar = document.createElement('div'),
+		indicator = document.createElement('div');
+
+	if ( type === true ) {
+		scrollbar.style.cssText = 'position:absolute;z-index:9999';
+		indicator.style.cssText = '-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;background:rgba(0,0,0,0.5);border:1px solid rgba(255,255,255,0.9);border-radius:3px';
+	}
+
+	indicator.className = 'iScrollIndicator';
+
+	if ( direction == 'h' ) {
+		if ( type === true ) {
+			scrollbar.style.cssText += ';height:7px;left:2px;right:2px;bottom:0';
+			indicator.style.height = '100%';
+		}
+		scrollbar.className = 'iScrollHorizontalScrollbar';
+	} else {
+		if ( type === true ) {
+			scrollbar.style.cssText += ';width:7px;bottom:2px;top:2px;right:1px';
+			indicator.style.width = '100%';
+		}
+		scrollbar.className = 'iScrollVerticalScrollbar';
+	}
+
+	scrollbar.style.cssText += ';overflow:hidden';
+
+	if ( !interactive ) {
+		scrollbar.style.pointerEvents = 'none';
+	}
+
+	scrollbar.appendChild(indicator);
+
+	return scrollbar;
+}
+
+function Indicator (scroller, options) {
+	this.wrapper = typeof options.el == 'string' ? document.querySelector(options.el) : options.el;
+	this.wrapperStyle = this.wrapper.style;
+	this.indicator = this.wrapper.children[0];
+	this.indicatorStyle = this.indicator.style;
+	this.scroller = scroller;
+
+	this.options = {
+		listenX: true,
+		listenY: true,
+		interactive: false,
+		resize: true,
+		defaultScrollbars: false,
+		shrink: false,
+		fade: false,
+		speedRatioX: 0,
+		speedRatioY: 0
+	};
+
+	for ( var i in options ) {
+		this.options[i] = options[i];
+	}
+
+	this.sizeRatioX = 1;
+	this.sizeRatioY = 1;
+	this.maxPosX = 0;
+	this.maxPosY = 0;
+
+	if ( this.options.interactive ) {
+		if ( !this.options.disableTouch ) {
+			utils.addEvent(this.indicator, 'touchstart', this);
+			utils.addEvent(window, 'touchend', this);
+		}
+		if ( !this.options.disablePointer ) {
+			utils.addEvent(this.indicator, utils.prefixPointerEvent('pointerdown'), this);
+			utils.addEvent(window, utils.prefixPointerEvent('pointerup'), this);
+		}
+		if ( !this.options.disableMouse ) {
+			utils.addEvent(this.indicator, 'mousedown', this);
+			utils.addEvent(window, 'mouseup', this);
+		}
+	}
+
+	if ( this.options.fade ) {
+		this.wrapperStyle[utils.style.transform] = this.scroller.translateZ;
+		var durationProp = utils.style.transitionDuration;
+		this.wrapperStyle[durationProp] = utils.isBadAndroid ? '0.0001ms' : '0ms';
+		// remove 0.0001ms
+		var self = this;
+		if(utils.isBadAndroid) {
+			rAF(function() {
+				if(self.wrapperStyle[durationProp] === '0.0001ms') {
+					self.wrapperStyle[durationProp] = '0s';
+				}
+			});
+		}
+		this.wrapperStyle.opacity = '0';
+	}
+}
+
+Indicator.prototype = {
+	handleEvent: function (e) {
+		switch ( e.type ) {
+			case 'touchstart':
+			case 'pointerdown':
+			case 'MSPointerDown':
+			case 'mousedown':
+				this._start(e);
+				break;
+			case 'touchmove':
+			case 'pointermove':
+			case 'MSPointerMove':
+			case 'mousemove':
+				this._move(e);
+				break;
+			case 'touchend':
+			case 'pointerup':
+			case 'MSPointerUp':
+			case 'mouseup':
+			case 'touchcancel':
+			case 'pointercancel':
+			case 'MSPointerCancel':
+			case 'mousecancel':
+				this._end(e);
+				break;
+		}
+	},
+
+	destroy: function () {
+		if ( this.options.fadeScrollbars ) {
+			clearTimeout(this.fadeTimeout);
+			this.fadeTimeout = null;
+		}
+		if ( this.options.interactive ) {
+			utils.removeEvent(this.indicator, 'touchstart', this);
+			utils.removeEvent(this.indicator, utils.prefixPointerEvent('pointerdown'), this);
+			utils.removeEvent(this.indicator, 'mousedown', this);
+
+			utils.removeEvent(window, 'touchmove', this);
+			utils.removeEvent(window, utils.prefixPointerEvent('pointermove'), this);
+			utils.removeEvent(window, 'mousemove', this);
+
+			utils.removeEvent(window, 'touchend', this);
+			utils.removeEvent(window, utils.prefixPointerEvent('pointerup'), this);
+			utils.removeEvent(window, 'mouseup', this);
+		}
+
+		if ( this.options.defaultScrollbars ) {
+			this.wrapper.parentNode.removeChild(this.wrapper);
+		}
+	},
+
+	_start: function (e) {
+		var point = e.touches ? e.touches[0] : e;
+
+		e.preventDefault();
+		e.stopPropagation();
+
+		this.transitionTime();
+
+		this.initiated = true;
+		this.moved = false;
+		this.lastPointX	= point.pageX;
+		this.lastPointY	= point.pageY;
+
+		this.startTime	= utils.getTime();
+
+		if ( !this.options.disableTouch ) {
+			utils.addEvent(window, 'touchmove', this);
+		}
+		if ( !this.options.disablePointer ) {
+			utils.addEvent(window, utils.prefixPointerEvent('pointermove'), this);
+		}
+		if ( !this.options.disableMouse ) {
+			utils.addEvent(window, 'mousemove', this);
+		}
+
+		this.scroller._execEvent('beforeScrollStart');
+	},
+
+	_move: function (e) {
+		var point = e.touches ? e.touches[0] : e,
+			deltaX, deltaY,
+			newX, newY,
+			timestamp = utils.getTime();
+
+		if ( !this.moved ) {
+			this.scroller._execEvent('scrollStart');
+		}
+
+		this.moved = true;
+
+		deltaX = point.pageX - this.lastPointX;
+		this.lastPointX = point.pageX;
+
+		deltaY = point.pageY - this.lastPointY;
+		this.lastPointY = point.pageY;
+
+		newX = this.x + deltaX;
+		newY = this.y + deltaY;
+
+		this._pos(newX, newY);
+
+// INSERT POINT: indicator._move
+
+		e.preventDefault();
+		e.stopPropagation();
+	},
+
+	_end: function (e) {
+		if ( !this.initiated ) {
+			return;
+		}
+
+		this.initiated = false;
+
+		e.preventDefault();
+		e.stopPropagation();
+
+		utils.removeEvent(window, 'touchmove', this);
+		utils.removeEvent(window, utils.prefixPointerEvent('pointermove'), this);
+		utils.removeEvent(window, 'mousemove', this);
+
+		if ( this.scroller.options.snap ) {
+			var snap = this.scroller._nearestSnap(this.scroller.x, this.scroller.y);
+
+			var time = this.options.snapSpeed || Math.max(
+					Math.max(
+						Math.min(Math.abs(this.scroller.x - snap.x), 1000),
+						Math.min(Math.abs(this.scroller.y - snap.y), 1000)
+					), 300);
+
+			if ( this.scroller.x != snap.x || this.scroller.y != snap.y ) {
+				this.scroller.directionX = 0;
+				this.scroller.directionY = 0;
+				this.scroller.currentPage = snap;
+				this.scroller.scrollTo(snap.x, snap.y, time, this.scroller.options.bounceEasing);
+			}
+		}
+
+		if ( this.moved ) {
+			this.scroller._execEvent('scrollEnd');
+		}
+	},
+
+	transitionTime: function (time) {
+		time = time || 0;
+		var durationProp = utils.style.transitionDuration;
+		this.indicatorStyle[durationProp] = time + 'ms';
+
+		if ( !time && utils.isBadAndroid ) {
+			this.indicatorStyle[durationProp] = '0.0001ms';
+			// remove 0.0001ms
+			var self = this;
+			rAF(function() {
+				if(self.indicatorStyle[durationProp] === '0.0001ms') {
+					self.indicatorStyle[durationProp] = '0s';
+				}
+			});
+		}
+	},
+
+	transitionTimingFunction: function (easing) {
+		this.indicatorStyle[utils.style.transitionTimingFunction] = easing;
+	},
+
+	refresh: function () {
+		this.transitionTime();
+
+		if ( this.options.listenX && !this.options.listenY ) {
+			this.indicatorStyle.display = this.scroller.hasHorizontalScroll ? 'block' : 'none';
+		} else if ( this.options.listenY && !this.options.listenX ) {
+			this.indicatorStyle.display = this.scroller.hasVerticalScroll ? 'block' : 'none';
+		} else {
+			this.indicatorStyle.display = this.scroller.hasHorizontalScroll || this.scroller.hasVerticalScroll ? 'block' : 'none';
+		}
+
+		if ( this.scroller.hasHorizontalScroll && this.scroller.hasVerticalScroll ) {
+			utils.addClass(this.wrapper, 'iScrollBothScrollbars');
+			utils.removeClass(this.wrapper, 'iScrollLoneScrollbar');
+
+			if ( this.options.defaultScrollbars && this.options.customStyle ) {
+				if ( this.options.listenX ) {
+					this.wrapper.style.right = '8px';
+				} else {
+					this.wrapper.style.bottom = '8px';
+				}
+			}
+		} else {
+			utils.removeClass(this.wrapper, 'iScrollBothScrollbars');
+			utils.addClass(this.wrapper, 'iScrollLoneScrollbar');
+
+			if ( this.options.defaultScrollbars && this.options.customStyle ) {
+				if ( this.options.listenX ) {
+					this.wrapper.style.right = '2px';
+				} else {
+					this.wrapper.style.bottom = '2px';
+				}
+			}
+		}
+
+		var r = this.wrapper.offsetHeight;	// force refresh
+
+		if ( this.options.listenX ) {
+			this.wrapperWidth = this.wrapper.clientWidth;
+			if ( this.options.resize ) {
+				this.indicatorWidth = Math.max(Math.round(this.wrapperWidth * this.wrapperWidth / (this.scroller.scrollerWidth || this.wrapperWidth || 1)), 8);
+				this.indicatorStyle.width = this.indicatorWidth + 'px';
+			} else {
+				this.indicatorWidth = this.indicator.clientWidth;
+			}
+
+			this.maxPosX = this.wrapperWidth - this.indicatorWidth;
+
+			if ( this.options.shrink == 'clip' ) {
+				this.minBoundaryX = -this.indicatorWidth + 8;
+				this.maxBoundaryX = this.wrapperWidth - 8;
+			} else {
+				this.minBoundaryX = 0;
+				this.maxBoundaryX = this.maxPosX;
+			}
+
+			this.sizeRatioX = this.options.speedRatioX || (this.scroller.maxScrollX && (this.maxPosX / this.scroller.maxScrollX));
+		}
+
+		if ( this.options.listenY ) {
+			this.wrapperHeight = this.wrapper.clientHeight;
+			if ( this.options.resize ) {
+				this.indicatorHeight = Math.max(Math.round(this.wrapperHeight * this.wrapperHeight / (this.scroller.scrollerHeight || this.wrapperHeight || 1)), 8);
+				this.indicatorStyle.height = this.indicatorHeight + 'px';
+			} else {
+				this.indicatorHeight = this.indicator.clientHeight;
+			}
+
+			this.maxPosY = this.wrapperHeight - this.indicatorHeight;
+
+			if ( this.options.shrink == 'clip' ) {
+				this.minBoundaryY = -this.indicatorHeight + 8;
+				this.maxBoundaryY = this.wrapperHeight - 8;
+			} else {
+				this.minBoundaryY = 0;
+				this.maxBoundaryY = this.maxPosY;
+			}
+
+			this.maxPosY = this.wrapperHeight - this.indicatorHeight;
+			this.sizeRatioY = this.options.speedRatioY || (this.scroller.maxScrollY && (this.maxPosY / this.scroller.maxScrollY));
+		}
+
+		this.updatePosition();
+	},
+
+	updatePosition: function () {
+		var x = this.options.listenX && Math.round(this.sizeRatioX * this.scroller.x) || 0,
+			y = this.options.listenY && Math.round(this.sizeRatioY * this.scroller.y) || 0;
+
+		if ( !this.options.ignoreBoundaries ) {
+			if ( x < this.minBoundaryX ) {
+				if ( this.options.shrink == 'scale' ) {
+					this.width = Math.max(this.indicatorWidth + x, 8);
+					this.indicatorStyle.width = this.width + 'px';
+				}
+				x = this.minBoundaryX;
+			} else if ( x > this.maxBoundaryX ) {
+				if ( this.options.shrink == 'scale' ) {
+					this.width = Math.max(this.indicatorWidth - (x - this.maxPosX), 8);
+					this.indicatorStyle.width = this.width + 'px';
+					x = this.maxPosX + this.indicatorWidth - this.width;
+				} else {
+					x = this.maxBoundaryX;
+				}
+			} else if ( this.options.shrink == 'scale' && this.width != this.indicatorWidth ) {
+				this.width = this.indicatorWidth;
+				this.indicatorStyle.width = this.width + 'px';
+			}
+
+			if ( y < this.minBoundaryY ) {
+				if ( this.options.shrink == 'scale' ) {
+					this.height = Math.max(this.indicatorHeight + y * 3, 8);
+					this.indicatorStyle.height = this.height + 'px';
+				}
+				y = this.minBoundaryY;
+			} else if ( y > this.maxBoundaryY ) {
+				if ( this.options.shrink == 'scale' ) {
+					this.height = Math.max(this.indicatorHeight - (y - this.maxPosY) * 3, 8);
+					this.indicatorStyle.height = this.height + 'px';
+					y = this.maxPosY + this.indicatorHeight - this.height;
+				} else {
+					y = this.maxBoundaryY;
+				}
+			} else if ( this.options.shrink == 'scale' && this.height != this.indicatorHeight ) {
+				this.height = this.indicatorHeight;
+				this.indicatorStyle.height = this.height + 'px';
+			}
+		}
+
+		this.x = x;
+		this.y = y;
+
+		if ( this.scroller.options.useTransform ) {
+			this.indicatorStyle[utils.style.transform] = 'translate(' + x + 'px,' + y + 'px)' + this.scroller.translateZ;
+		} else {
+			this.indicatorStyle.left = x + 'px';
+			this.indicatorStyle.top = y + 'px';
+		}
+	},
+
+	_pos: function (x, y) {
+		if ( x < 0 ) {
+			x = 0;
+		} else if ( x > this.maxPosX ) {
+			x = this.maxPosX;
+		}
+
+		if ( y < 0 ) {
+			y = 0;
+		} else if ( y > this.maxPosY ) {
+			y = this.maxPosY;
+		}
+
+		x = this.options.listenX ? Math.round(x / this.sizeRatioX) : this.scroller.x;
+		y = this.options.listenY ? Math.round(y / this.sizeRatioY) : this.scroller.y;
+
+		this.scroller.scrollTo(x, y);
+	},
+
+	fade: function (val, hold) {
+		if ( hold && !this.visible ) {
+			return;
+		}
+
+		clearTimeout(this.fadeTimeout);
+		this.fadeTimeout = null;
+
+		var time = val ? 250 : 500,
+			delay = val ? 0 : 300;
+
+		val = val ? '1' : '0';
+
+		this.wrapperStyle[utils.style.transitionDuration] = time + 'ms';
+
+		this.fadeTimeout = setTimeout((function (val) {
+			this.wrapperStyle.opacity = val;
+			this.visible = +val;
+		}).bind(this, val), delay);
+	}
+};
+
+IScroll.utils = utils;
+
+if ( typeof module != 'undefined' && module.exports ) {
+	module.exports = IScroll;
+} else if ( typeof define == 'function' && define.amd ) {
+        define( function () { return IScroll; } );
+} else {
+	window.IScroll = IScroll;
+}
+
+})(window, document, Math);

+ 44 - 40
core/src/web/staticres/wxswordfish/main.js

@@ -118,7 +118,7 @@ KeyWordDialog.AppendNode = function(dialogObj,value){
 	var getHtml = function(index,value){
 		return '<div class="keyWordGroup">'
 					+'<lable style="white-space:nowrap;">关键词<font>'+index+'</font></lable>'
-					+'<div><input type="text" onfocus="setFocus(this)" value="'+(value?value:"")+'" placeholder="示例:综合布线 电话线 网线" maxlength="100"></div>'
+					+'<div><input type="text" onfocus="setFocus(this)" value="'+(value?value:"")+'" placeholder="示例:税务局 软件" maxlength="100"></div>'
 					+'<div>'+(index==1?'':'<img src="/wxswordfish/images/delete.png" class="delete">')+'</div>'
 				+'</div>';
 	}
@@ -248,7 +248,7 @@ function showAlls(){
 							alert("请稍后再试"+st)
 						}
 					})
-					window.location.reload()
+					window.location.href="/swordfish/page";
 				})
 				$("html,body").addClass("overflow-hidden");
 			})
@@ -281,7 +281,7 @@ function showAlls(){
 						alert("请稍后再试"+st)
 					}
 				})
-				window.location.reload()
+				window.location.href="/swordfish/page";
 		})
 		$("#txt_tip").text(contents+strs)
 		$(".visible").show()
@@ -464,7 +464,7 @@ $(function(){
 			liobj.next(".child-node").find("li:eq(1)").append('<div class="com-last">全国</div>');
 		}
 	}
-	var setKeyWord = function(type,keys,searchnameIsExsit){
+	var setKeyWord = function(type,keys){
 		if(typeof(keys) == "undefined" || keys.length == 0){
 			return;
 		}
@@ -472,13 +472,7 @@ $(function(){
 			keys[i] = keys[i].replace(/\+/g," ");
 			KeyWordDialog.AppendNode($("#"+type+"-keyword"),keys[i]);
 		}
-		if(!searchnameIsExsit){
-			$("#"+type+"-content li:first .com-last").remove();
-			$("#"+type+"-content li:first").append('<div class="com-last">'+keys.join(";")+'</div>');
-			commonAjaxReq($("#tender-keyword"),type);
-		}else{
-			$("#"+type+"-content li:first").append('<div class="com-last">'+keys.join(";")+'</div>');
-		}
+		$("#"+type+"-content li:first").append('<div class="com-last">'+keys.join(";")+'</div>');
 	}
 	var setScope = function(type,scope){
 		var dialogObj = $("#"+type+"-scope");
@@ -504,6 +498,36 @@ $(function(){
 	}
 	$("body").append($("#tender-keyword").clone().removeAttr("id").attr("id","bid-keyword"))
 			.append($("#tender-scope").clone().removeAttr("id").attr("id","bid-scope"));
+	var searchnameIsExsit = false;
+	if(msgset == ""){
+		if(typeof(searchname) != "undefined" && searchname.length > 0 ){
+			msgset = {};
+			msgset[s_type] = {"a_key":[searchname],"s_scope":"A"};
+		}
+	}else{
+		if (typeof(searchname) != "undefined" && searchname.length > 0 ){
+			if(typeof(msgset[s_type]) != "undefined"){
+				var keywordes = msgset[s_type].a_key;
+				if(typeof(keywordes) != "undefined" && keywordes.length > 0){
+					for(var i=0;i<keywordes.length;i++){
+						var keywordesArr = keywordes[i].split("+");
+						for(var k=0;k<keywordesArr.length;k++){
+							if(keywordesArr[k] == searchname){
+								searchnameIsExsit = true;
+							}
+						}
+					}
+					if(!searchnameIsExsit){
+						keywordes.push(searchname);
+					}
+				}else{
+					msgset[s_type]["a_key"] = [searchname];
+				}
+			}else{
+				msgset[s_type] = {"a_key":[searchname]};
+			}
+		}
+	}
 	if(typeof(msgset.tender) != "undefined"){
 		setKeyWord("tender",msgset.tender.a_key,false);
 		setScope("tender",msgset.tender.s_scope);
@@ -540,9 +564,17 @@ $(function(){
 			turnOn($(this));
 		}
 		//判断是不是开,是开再判断是不是在有效期内,如果不在有效期内,则进行提示并存快照
-		
 		commonAjaxReq(null,$(this).attr("v"));
 	});
+	//直接订阅带过来的关键字不存在
+	if(typeof(searchname) != "undefined" && searchname.length > 0){
+		//自动打开
+		if(!$("#"+s_type +"-on-off").hasClass("open")){
+			$("#"+s_type+"-on-off").click();
+		}else if(!searchnameIsExsit){//修改关键词
+			commonAjaxReq($("#"+s_type+"-keyword"),s_type);
+		}
+	}
 	//收费规则
 	$(".rule").closest(".parent-node").click(function(){
 		$(".credit-dialog").show();
@@ -587,32 +619,4 @@ $(function(){
 			alert("请输入关键字后预览。")
 		}
 	})
-	if (typeof(searchname) != "undefined" && searchname.length > 0 ){
-		if(typeof(msgset[s_type]) != "undefined"){
-			var keywordes = msgset[s_type].a_key
-			if(keywordes && keywordes.length > 0){
-				var searchnameIsExsit = false;
-				for(var i=0;i<keywordes.length;i++){
-					var keywordesArr = keywordes[i].split("+");
-					for(var k=0;k<keywordesArr.length;k++){
-						if(keywordesArr[k] == searchname){
-							searchnameIsExsit = true;
-						}
-					}
-				}
-				if(!searchnameIsExsit){
-					keywordes.push(searchname);
-				}
-			}else{
-				keywordes.push(searchname)
-			}
-			
-		}else{
-			keywordes.push(searchname);
-		}
-		setKeyWord(s_type,keywordes,searchnameIsExsit);
-		if(!$("#"+s_type +"-on-off").hasClass("open")){
-			$("#"+s_type+"-on-off").click();
-		}
-	}
 });

+ 71 - 10
core/src/web/staticres/wxswordfish/style.css

@@ -69,6 +69,7 @@ img{
 	border-bottom: 1px solid #CCCCCC;
 	position: relative;
 	font-size: 16px;
+	padding-left: 5px;
 }
 .parent-node-view{
 	width: 100%;
@@ -122,14 +123,15 @@ img{
 	display: none;
 }
 .operation .child-node li{
-	border-bottom: 1px solid #ccc;
+	border-bottom: 1px solid #ddd;
 	padding: 15px 0px;
 }
 
 .operation .child-node img{
-	width: 10px;
-	height: 17px;
+	width: 8px;
+	height: 15px;
 	float: right;
+	margin-right: 15px;
 }
 .operation .child-node li>div:first-child{
 	
@@ -508,12 +510,13 @@ img{
 	width: 100%;
 	border-top: 1px solid #CCCCCC;
 	background-color: #F8F8F8;
+	z-index: 1;
 }
 .bottom-toolbar>li{
 	display: table-cell;
 	width: 33%;
-	height: 40px;
-	line-height: 40px;
+	height: 45px;
+	line-height: 45px;
 	text-align: center;
 }
 .bottom-toolbar>li:first-child img{
@@ -544,6 +547,7 @@ img{
 	padding:5px;
 	background-color:#FAF5DF;
 	border:1px solid #F5DC9A;
+	opacity: 0.8;
 }
 .tip-button{
 	float: right;
@@ -551,15 +555,18 @@ img{
 	margin-top:5px;
 }
 .tip-button span{
-	border-radius:4px;
+	border-radius:2px;
 	display:inline-block;
-	padding:4px 20px;
+	padding:5px 35px;
 	margin-right:10px;
-	border:1px solid #689AFF;
+	border:1px solid #24C0D7;
 	cursor:pointer;
+	color: #24C0D7;
+	background-color: #ffffff;
 }
 .tip-button span:nth-child(2){
 	background-color:#24C0D7;
+	color: #ffffff;
 }
 .visible{
 	display:none;
@@ -641,11 +648,13 @@ img{
 	bottom: 65px;
 	left: 50%;
 	margin-left: -45px;
-	z-index: 1;
 	display: none;
 }
 .popover-ul li{
 	line-height: 38px;
+	padding-left: 10px;
+	width: 100%;
+	text-align: left;
 }
 .toolbar-popover .popover-arrow{
 	bottom: -11px;
@@ -673,7 +682,59 @@ img{
 	background-color: #EAEAEA;
 }
 .popover-ul >li:nth-child(2){
-	width: 85%;
 	border-top:1px solid #e5e6e9;
 	border-bottom:1px solid #e5e6e9;
+}
+.toolbar-popover-mask{
+	background-color: transparent;
+	position: absolute;
+	left: 0px;
+	right: 0px;
+	top: 0px;
+	bottom: 0px;
+	display: none;
+}
+.scroller{
+	overflow-y: auto;
+	-webkit-tap-highlight-color: rgba(0,0,0,0);
+	-webkit-transform: translateZ(0);
+	-moz-transform: translateZ(0);
+	-ms-transform: translateZ(0);
+	-o-transform: translateZ(0);
+	transform: translateZ(0);
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	-webkit-text-size-adjust: none;
+	-moz-text-size-adjust: none;
+	-ms-text-size-adjust: none;
+	-o-text-size-adjust: none;
+	text-size-adjust: none;
+}
+.iScrollVerticalScrollbar{
+	position: absolute;
+    z-index: 9999;
+    width: 5px;
+    bottom: 2px;
+    top: 2px;
+    right: 3px;
+    overflow: hidden;
+    transform: translateZ(0px);
+    transition-duration: 500ms;
+    opacity: 0;
+}
+.iScrollIndicator{
+	box-sizing: border-box;
+    position: absolute;
+    border: 1px solid rgba(255, 255, 255, 0.901961);
+    border-radius: 4px;
+    width: 100%;
+    transition-duration: 0ms;
+    display: block;
+    transform: translate(0px, 0px) translateZ(0px);
+    background: rgba(0, 0, 0, 0.498039);
+	opacity: 0.5;
+	height: 100px;
 }

+ 0 - 33
core/src/web/templates/index.html

@@ -18,39 +18,6 @@ $(function(){
 </script>
 </head>
 <body>
-
-<!--手机版首页 start-->
-<div class="index-new-head b-head visible-xs">
-	
-	<div class="b-nav index-new-nva text-center" style="height:69px;">
-		<a href="/"><img src="/images/logo.png" class="logo"></a>
-	</div>
-</div>
-{{$s:=(Ad "index-center-mob" 1)}}
-	{{range $k,$v := $s}}
-<div class="text-center visible-xs" style="margin-top:10px;">
-	<div class="index-mob-wzjs" >
-	<div class="index-mobwz-title" >
-	<div class="indexmob-tleft" ></div>
-	<div class="indexmob-tright" >网站介绍</div>
-	<div style="clear:both;"></div>
-	</div>
-	<div class="indexmob-cont" >
-	{{if $v.s_remark}}{{$v.s_remark}} {{end}}
-	</div>
-	</div>
-	<div class="indexmob-sjty" >
-	<div class="index-mobwz-title" >
-	<div class="indexmob-tleft" ></div>
-	<div class="indexmob-tright" >手机体验</div>
-	<div style="clear:both;"></div>
-	</div>
-	<div class="indexmob-cont" ><img src="{{if $v.s_pic}} {{$v.s_pic}} {{else}}/images/u109.png{{end}}"></div>
-	<div  class="indexmob-cont" style="width:100%;" class="text-center">微信关注企明星公众号qmx-cn,体验企明星的强大功能。</div>	
-	</div>
-</div>
-	{{end}}
-<!--手机版首页 end-->
 {{include "/common/indexhead.html"}}
 <div class="a-content a-index hidden-xs">	
 	<div class="a-index-head index-new-head">

+ 1 - 1
core/src/web/templates/member/incmobile/alter.html

@@ -57,7 +57,7 @@
 	</div>
 	</div>
 </div>
-<div style="position: absolute;width:100%;z-index:4410;background:#FFF;bottom: 0;display:none;font-size:12px;overflow:auto;min-height:150px;" class="creditrules">
+<div style="position: fixed;width:100%;z-index:4410;background:#FFF;bottom: 0;display:none;font-size:12px;overflow:auto;min-height:160px;" class="creditrules">
 		<div class="title">
 			详细变更信息
 			<button class="btn btn-link navcolor " style="float:right;"onclick="$(this).parent().parent().hide();$('.modal-backdrop').hide()" >确定</button>

+ 35 - 35
core/src/web/templates/member/incmobile/baseinfo.html

@@ -5,98 +5,98 @@
 <div class="combody baseinfo">
 	<ul>
 		<li>
-			<div class="col-xs-4">
-					<img src="/images/entcommunity/zhucehao.png"   width=14 />
+			<div class="col-xs-5">
+					<img src="{{Msg "seo" "cdn"}}/images/entcommunity/zhucehao.png"   width=23 />
 					<span class="ent {{if not .T.res.RegNo}}entnull{{end}}">注册号</span>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.RegNo}}{{.T.res.RegNo}}{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.RegNo}}{{.T.res.RegNo}}{{end}}</span>
 		</li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/hangye.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/hangye.png"  width=23 />
 				<span class="ent {{if not .T.res.IndustryPhyName}}entnull{{end}}">行业</span>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.IndustryPhyName}}{{.T.res.IndustryPhyName}}{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.IndustryPhyName}}{{.T.res.IndustryPhyName}}{{end}}</span>
 		</li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/chenglirizi.png"  width=14/>
+			<div class="col-xs-5">
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/chenglirizi.png"  width=23/>
 				<span class="ent {{if not .T.res.EstDate}}entnull{{end}}">成立日期</span>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.EstDate}}{{.T.res.EstDate}}{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.EstDate}}{{.T.res.EstDate}}{{end}}</span>
 		</li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/shijian.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/shijian.png"  width=23 />
 				<span class="ent {{if and (not .T.res.OpFrom) (not .T.res.OpTo)}} entnull{{end}}">营业期限</span>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.OpFrom}}{{.T.res.OpFrom}}{{end}}{{if .T.res.OpTo}}&nbsp;-&nbsp;{{.T.res.OpTo}}{{else}}&nbsp;-&nbsp;长期{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.OpFrom}}{{.T.res.OpFrom}}{{end}}{{if .T.res.OpTo}}&nbsp;-&nbsp;{{.T.res.OpTo}}{{else}}&nbsp;-&nbsp;长期{{end}}</span>
 		</li>
 		<li>
 		{{if and .T.res.RegCap .T.res.EntType}}
 			{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810") (ne .T.res.EntType "4540") (ne .T.res.EntType "4533")}}
-				<div class="col-xs-4">
-					<img src="/images/entcommunity/zhuceziben.png"  width=14 />
+				<div class="col-xs-5">
+					<img src="{{Msg "seo" "cdn"}}/images/entcommunity/zhuceziben.png"  width=23 />
 					<span class="ent">注册资本</span>
 				</div>
-				<span class="col-xs-8 entvar">
+				<span class="col-xs-7 entvar">
 								<script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if .T.res.RegCapCurName}}{{.T.res.RegCapCurName}}{{else}}元{{end}}
 				</span>
 				{{else}}
-					<div class="col-xs-4">
-						<img src="/images/entcommunity/ziben.png"  width=14 />
+					<div class="col-xs-5">
+						<img src="{{Msg "seo" "cdn"}}/images/entcommunity/zhuceziben.png"  width=23 />
 						<span class="ent entnull">注册资本</span>
 					</div>
-					<span class="col-xs-8 entvar">
+					<span class="col-xs-7 entvar">
 					</span>
 				{{end}}
 			{{else}}
-				<div class="col-xs-4">
+				<div class="col-xs-5">
 					<span class="glyphicon glyphicon-flag colorc"></span>
 					<span class="ent entnull">注册资本</span>
 				</div>
-				<span class="col-xs-8 entvar">
+				<span class="col-xs-7 entvar">
 				</span>
 			{{end}}
 			
 		</li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/dizhi.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/dizhi.png"  width=23 />
 				<span class="ent {{if not .T.res.Dom}}entnull{{end}}">地址</span>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.Dom}}{{.T.res.Dom}}{{else}}空{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.Dom}}{{.T.res.Dom}}{{else}}空{{end}}</span>
 		</li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/gongsileixing.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/gongsileixing.png"  width=23 />
 				<span class="ent {{if not .T.res.EntTypeName}} entnull{{end}}">企业类型</span>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.EntTypeName}}{{.T.res.EntTypeName}}{{else}}空{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.EntTypeName}}{{.T.res.EntTypeName}}{{else}}空{{end}}</span>
 		</li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/dengjijiguan.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/dengjijiguan.png"  width=23 />
 				<span class="ent {{if not .T.res.RegOrgName}}entnull{{end}}">登记机关</span>
 			</div>
-			<span class="col-xs-8 entvar ">{{if .T.res.RegOrgName}}{{.T.res.RegOrgName}}{{else}}空{{end}}</span>
+			<span class="col-xs-7 entvar ">{{if .T.res.RegOrgName}}{{.T.res.RegOrgName}}{{else}}空{{end}}</span>
 		</li>
 <!--		<li>
-			<div class="col-xs-4">
+			<div class="col-xs-5">
 				<span class="glyphicon glyphicon-flag colorc"></span>
 				<span class="ent entnull">公司规模</span>
 			</div>
-			<span class="col-xs-8 entvar">空</span>
+			<span class="col-xs-7 entvar">空</span>
 		</li>-->
 		<li>
-			<div class="col-xs-5">
-				<img src="/images/entcommunity/ren.png"  width=14 />
+			<div class="col-xs-6" style="max-width:145px;">
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/ren.png"  width=23 />
 				<span class="ent {{if not .T.res.LeRep}} entnull {{end}}">法定代表人</span>
 			</div>
-			<div class="col-xs-6" style="margin-left:-3%;">
-				<span class="col-xs-8 entvar">{{if not .T.res.LeRep}}空{{else}}{{.T.res.LeRep}}{{end}}</span>
+			<div class="col-xs-6">
+				<span class="col-xs-6 entvar">{{if not .T.res.LeRep}}空{{else}}{{.T.res.LeRep}}{{end}}</span>
 			</div>
 		</li>
 	</ul>

+ 0 - 35
core/src/web/templates/member/incmobile/detail.html

@@ -1,35 +0,0 @@
-<!DOCTYPE HTML>
-<html>
- <head>
-  <title> 企业社区-列表</title>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
-	<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
-	<link href="/css/bootstrap.min.css" rel="stylesheet" />
- 	<link href="/css/entcommunity.css" rel="stylesheet" />
-	<link href="/css/mobile/incmobile.css" rel="stylesheet" />
-	
-	<style>
-		body{
-			background:#FFF;
-		}
-		.entinfo-page .b-right {
-			margin-top: 0px;
-			float: none;
-			margin-left: 5px;
-			color:#222222;
-		}
-		.entinfo-page .b-right span{
-			font-size:11px;
-		}
-	</style>
- </head>
- <body>
-{{include "/member/incmobile/news.html"}}
-<script src="/js/jquery.js"></script>
-<script src="/js/qfw.js"></script>
-<script src="/js/fastclick.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/entcommunity.js"></script>
- </body>
-<html>

+ 23 - 12
core/src/web/templates/member/incmobile/detailindex.html

@@ -1,13 +1,13 @@
 <html>
  <head>
-  <title> 企业社区-列表</title>
+  <title> {{.T.res.EntName}}- 企业信息</title>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 	<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
-	<link href="/css/bootstrap.min.css" rel="stylesheet" />
-	<link href="/css/qfw.css" rel="stylesheet" />
-	<link href="/css/entcommunity.css" rel="stylesheet" />
- 	<link href="/css/mobile/incmobile.css" rel="stylesheet" />
+	<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet" />
+	<link href="{{Msg "seo" "cdn"}}/css/qfw.css" rel="stylesheet" />
+	<link href="{{Msg "seo" "cdn"}}/css/entcommunity.css" rel="stylesheet" />
+ 	<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet" />
 	<style>
 		body{
 			background:#FFF;
@@ -26,7 +26,6 @@
 		}
 		.ent-mainpersons .b-com-name{
 			font-weight: bold;
-			font-size: 13px;
 			margin-bottom: 5px;
 		}
 		.ent-mainpersons font {
@@ -49,6 +48,7 @@
 			border: none !important;
 			border-bottom: 1px solid #e5e6e9 !important;
 			border-radius: 0px !important;
+			height: 55px;
 		}
 		#entrelation-restore,#entrelation-fullscreen{
 			display:none;
@@ -59,6 +59,15 @@
 		.disabled{
 			color:#BCBCBC;
 		}
+		.col-xs-5{
+			max-width:120px;
+		}
+		.ent-mainpersons .staffinfo-vertical{
+			    margin-bottom: -19px !important;
+		}
+		.staffinfo-level-2{
+			margin-top:5px;
+		}
 	</style>
  </head>
  <body>
@@ -92,7 +101,7 @@
 			</div>
 		</div>
 		<div class="col-xs-12 index-middle">
-			<div class="col-xs-6" style="border-right: 1px solid #16A086;" data-id="c_card" onclick="childrenshow(this);"><span class="glyphicon qiyemingpian" style="font-size:11px;"></span>&nbsp;企业名片</div>
+			<div class="col-xs-6" style="border-right: 1px solid #16A086;" data-id="c_card" onclick="childrenshow(this);"><span class="glyphicon qiyemingpian"></span>&nbsp;企业名片</div>
 			{{if .T.res.s_microwebsite}}
 			<div class="col-xs-6" onclick="wgw();"><span class="glyphicon weiguanwang2"></span>&nbsp;微官网</a></div>
 			{{else}}
@@ -176,13 +185,11 @@
 	</div>
 <body>
 
-<script src="/js/fastclick.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/entcommunity.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/fastclick.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/entcommunity.js"></script>
 <script>
 	$(function(){		   
-			$("#entrelation").css("width",window.screen.width+"px");
-			$("#entrelation").css("height",window.screen.height+"px");
 			resize();
 			mCommunity().initmemer();
 			DishonestyPaging();
@@ -248,6 +255,10 @@
 	}
 	function resize(){
 			$(".index-navtable div.content").height($(".index-navtable div.content").width());
+			$("#entrelation").css("width",$(window).width()+"px");
+			$("#entrelation").css("height",$(window).height()+"px");
+			$("svg").attr("width",$(window).width()+"");		
+			$("svg").attr("height",$(window).height()+"");
 	}
 	$(function(){
 		$(".date").each(function(i,n){

+ 6 - 6
core/src/web/templates/member/incmobile/index.html

@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <html>
 	<head>
-		<title> 企业社区-列表</title>
+		<title> 企业社区-首页</title>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 		<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
-		<link href="/css/bootstrap.min.css" rel="stylesheet">
-		<link href="/css/mobile/incmobile.css" rel="stylesheet">
+		<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
+		<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet">
 		<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script>
 var signature = {{.T.signature}};
@@ -75,11 +75,11 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 		</div>
 		<footer class="footer">
 	      <div class="container">
-						<img src="/images/mobile/mobilebottom.png" width=110 />	
+						<img src="{{Msg "seo" "cdn"}}/images/mobile/mobilebottom.png" width=110 />	
 	      </div>
 		</footer>
-<script src="/js/jquery.js"></script>
-<script src="/js/qfw.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/qfw.js"></script>
 <script>
 $("#camera").click(function(){
 	wx.chooseImage({

+ 14 - 9
core/src/web/templates/member/incmobile/list.html

@@ -5,8 +5,8 @@
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 	<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
-	<link href="/css/bootstrap.min.css" rel="stylesheet">
- 	<link href="/css/mobile/incmobile.css" rel="stylesheet">
+	<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
+ 	<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet">
 	<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  </head>
  <body>
@@ -62,7 +62,7 @@
 		<ul class="inclist">
 				
 		</ul>
-	<div class="text-center hides" style="margin:20% auto;" id="finderror"><img src="//cdn.qmx.top:9000/images/findnull.png" width=150 style="margin-left:18px;">
+	<div class="text-center hides" style="margin:20% auto;" id="finderror"><img src="{{Msg "seo" "cdn"}}/images/findnull.png" width=150 style="margin-left:18px;">
 		<h6 id="case1" style="display:none;"><strong class="text-muted">没有找到相关内容,换个关键词试试</strong></h6>
 		<h6 id="case2" style="display:none;margin-top: -12px;"><strong class="text-muted">
 		
@@ -72,12 +72,12 @@
 	<center style="clear:both;"><a class="loadmore btn btn-link hides"  onclick="loadData();">加载更多</a></center>
 	<center class="nomore hides"><div style="margin:20px;">没有搜索到?尝试更精确的搜索条件!</div></center>
 	</div>
-	<script src="/js/jquery.js"></script>
-	<script src="/js/qfw.js"></script>
-	<script src="/js/fastclick.js"></script>
-	<script src="/js/bootstrap.min.js"></script>
-	<script src="/js/jquery.cxselect.js"></script>
-	<script src="/js/entcommunity.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/qfw.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/fastclick.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/jquery.cxselect.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/entcommunity.js"></script>
 	<script>
 		$(function(){
 			mCommunity().initIndex();
@@ -154,6 +154,11 @@
 				}
 				$(".inclist").append($(li));
 		}
+	$(function(){
+		$("ul.inclist li").click(function(n){
+			window.location.href=$(n.currentTarget).find("a").attr("href");
+		});
+	});
 	</script>
 	<script>
 		var signature = {{.T.signature}};

+ 8 - 3
core/src/web/templates/service/appointment.html

@@ -140,6 +140,9 @@
 		</div>
 	</div>
 </div>
+<div class="notetips">
+	<img src="{{Msg "seo" "cdn"}}/images/u28.png"/>预约服务成功
+</div>
 <script type="text/javascript">
 //未注册用户提交
 function appointment(){		
@@ -175,9 +178,11 @@ $(document).ready(function(){
 			    $('#appointmentModal').modal('hide');
 				alert("您不能预约自己公司发布的服务!");
 		  	}else if(status == "y"){
-			    $('#appointmentModal').modal('hide');
-				alert("预约成功!");
-		        window.location.href = "/market/detail/{{.T.sinfo._id}}.html";	
+				$(".notetips").show();
+				$('#appointmentModal').modal('hide');
+				setTimeout(function(){
+					window.location.href = "/market/detail/{{.T.sinfo._id}}.html";	
+				},2000)
 		  	}else{
 				alert("预约失败!"); 
 		        window.location.href = "/market/detail/{{.T.sinfo._id}}.html";	

+ 8 - 3
core/src/web/templates/service/bid.html

@@ -79,6 +79,9 @@
 		</div>
 	</div>
 </div>
+<div class="notetips">
+	<img src="{{Msg "seo" "cdn"}}/images/u28.png"/>竞标成功
+</div>
 <script src="/js/validform-min.js"></script>
 <script type="text/javascript">
 function reLoadCaptcha(){
@@ -116,12 +119,14 @@ $(function(){
 			}
 			var msg = null;
 			if(flag == "y"){
-				msg = "投标成功!";
+				$(".notetips").show();
 			}else{
 				msg = "投标失败!";
+				alert(msg);
 			}
-			alert(msg);
-			window.location.href = window.location.href;
+			 setTimeout(function(){
+					window.location.href = window.location.href;
+				},2000)
 		}
 	},"m-tbform");
 });

+ 8 - 2
core/src/web/templates/service/demand.html

@@ -194,6 +194,9 @@
 		</div>
 	</div>
 </div>
+	<div class="notetips">
+		<img src="{{Msg "seo" "cdn"}}/images/u28.png"/>发布成功
+	</div>
 	{{include "/common/bottom.html"}}
 	<!-- inner Js-->
 <script>
@@ -259,8 +262,11 @@ $(function(){
 			isPic=1;
 			var status=data.responseText;
 			if(status.indexOf("y,")>-1){
-				alert("发布成功");
-				window.location.href="/market/demandview/"+status.split(",")[1]+".html";
+				$(".notetips").show();
+				setTimeout(function(){
+							window.location.href="/market/demandview/"+status.split(",")[1]+".html";
+				},2000)
+				
 			}else if(status.indexOf("ident,")>-1){
 				$("#myModal").modal();
 			  setTimeout(function(){

+ 52 - 3
core/src/web/templates/swordfish/rssset.html

@@ -302,6 +302,15 @@
 <!-- 底部 -->
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
+var searchtype = {{.T.searchtype}};
+if(searchtype == "1"){
+	searchtype = "tender";
+}else if(searchtype == "2"){
+	searchtype = "bid";
+}else{
+	searchtype = "";
+}
+var searchvalue = {{.T.searchvalue}};
 //Array.prototype.indexOf = function (val) {for (var i = 0; i < this.length; i++) {if (this[i] == val) {return i;}} return -1;};  
 //Array.prototype.removevalue = function (val){var index=this.indexOf(val);if(index > -1){this.splice(index, 1);}}; 
 var oprarr = new Array();
@@ -337,6 +346,36 @@ $(function(){
 		}
 	}
 	var msgset = {{.T.msgset}};
+	var searchvalueIsExsit = false;
+	if(msgset == ""){
+		if(typeof(searchvalue) != "undefined" && searchvalue.length > 0 ){
+			msgset = {};
+			msgset[searchtype] = {"a_key":[searchvalue],"s_scope":"A"};
+		}
+	}else{
+		if (typeof(searchvalue) != "undefined" && searchvalue.length > 0 ){
+			if(typeof(msgset[searchtype]) != "undefined"){
+				var keywordes = msgset[searchtype].a_key;
+				if(typeof(keywordes) != "undefined" && keywordes.length > 0){
+					for(var i=0;i<keywordes.length;i++){
+						var keywordesArr = keywordes[i].split("+");
+						for(var k=0;k<keywordesArr.length;k++){
+							if(keywordesArr[k] == searchvalue){
+								searchvalueIsExsit = true;
+							}
+						}
+					}
+					if(!searchvalueIsExsit){
+						keywordes.push(searchvalue);
+					}
+				}else{
+					msgset[searchtype]["a_key"] = [searchvalue];
+				}
+			}else{
+				msgset[searchtype] = {"a_key":[searchvalue]};
+			}
+		}
+	}
 	if(msgset != ""){
 		if(typeof(msgset.tender) != "undefined"){
 			selectScope("tender",msgset.tender.s_scope);
@@ -418,6 +457,16 @@ $(function(){
 		$(this).hide();
 		ajaxReq();
 	});
+	//直接订阅带过来的关键字不存在
+	
+	if(typeof(searchvalue) != "undefined" && searchvalue.length > 0){
+		//自动打开
+		if($("#"+searchtype+" .swordfish-checked").is(":hidden")){
+			$("#"+searchtype+" .swordfish-uncheck").click();
+		}else if(!searchvalueIsExsit){//修改关键词
+			ajaxReq();
+		}
+	}
 	//针对页面异常关闭
 	if(typeof(msgset.tender) != "undefined"&&typeof(msgset.tender.i_switchstatus) != "undefined"&&msgset.tender.i_switchstatus==1){
 		if(tender_i_status==0){
@@ -482,13 +531,13 @@ function appendKeyWord(type,value,isFocus){
 	this.getHtml = function(index,value){
 		var html='<div class="swordfish-keyword">'
 					+'<lable>关键词<font>'+index+'</font>:</lable>'
-					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例:综合布线 电话线 网线" maxlength="100">'
+					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例:税务局 软件" maxlength="100">'
 					+'<img src="{{Msg "seo" "cdn"}}/images/swordfish/delete.png">'
 				+'</div>';
 		if (index==1){
 			html='<div class="swordfish-keyword">'
 					+'<lable>关键词<font>'+index+'</font>:</lable>'
-					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例:综合布线 电话线 网线" maxlength="100">'
+					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例:税务局 软件" maxlength="100">'
 				+'</div>';
 		}
 		return html;
@@ -616,7 +665,7 @@ function swordfishpay(oprtype){
 			alert("请稍后再试"+st)
 		}
 	})
-	window.location.reload()
+	window.location.href="/member/swordfish/rssset";
 }
 //弹窗关闭,取消
 $('#tishiModal').on('hidden.bs.modal', function () {

+ 7 - 3
core/src/web/templates/swordfish/searchinfolist.html

@@ -282,7 +282,7 @@ $(function(){
 		<form action="/member/swordfish/searchinfolist" name="searchsword" method="post">
 		<div class="form-group">
 		<div class="col-sm-7">
-        <input class="form-control" id="searchname" name="searchname" value="{{.T.keywords}}" style="background-color:#FFFFFF; border:1px solid #e5e6e9;" placeholder="输入关键词查询"/>
+        <input class="form-control" id="searchname" name="searchname" value="{{.T.keywords}}" style="background-color:#FFFFFF; border:1px solid #e5e6e9;" placeholder="示例:税务局 软件"/>
 	    </div>
 		<div class="col-sm-2">
 		<input name="s_type" id="sea_type" value="1" style="display:none;"/>
@@ -309,10 +309,14 @@ $(function(){
 				</div>
 			</div>
 		</div>
+		<form action="/member/swordfish/rssset" method="post" id="goToRsssetForm">
+		<input type="hidden" name="searchtype" value="{{.T.s_type}}"/>
+		<input type="hidden" name="searchvalue" value="{{.T.keywords}}"/>
 		<div id="searchts" class="text-center hidden">
-		<div class="dybtn"  onClick="window.location.href='/member/swordfish/rssset';">订阅</div>
+		<div class="dybtn" onclick="document.getElementById('goToRsssetForm').submit()">订阅</div>
 		<div>确认该关键词查询结果无误</div>
-		</div>	
+		</div>
+		</form>	
 	</div>
 	<div class="b-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">

+ 2 - 1
core/src/web/templates/swordfish/wxinfocontent.html

@@ -21,7 +21,6 @@ body{
 	padding:0;
 	color: #333;
 	padding-bottom: 50px;
-	font-size:14px;
 	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
 }
 pre {
@@ -29,6 +28,7 @@ pre {
 	word-wrap: break-word;
 	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
 	color:#5E6060;
+	font-size:14px;
 }
 .content{
 	padding:5px;
@@ -38,6 +38,7 @@ pre {
 }
 .abs{
 	height:35px;
+	font-size:14px;
 	line-height:35px;
 	text-overflow:ellipsis;
     white-space:nowrap;

+ 24 - 22
core/src/web/templates/swordfish/wxsearch.html

@@ -29,7 +29,7 @@ body{
 	height:45px;
 	width:100%;
     border-radius: 10px;
-	padding:2px 10px 2px 60px;
+	padding:2px 10px 2px 42px;
 	font-size:16px;
 	position:relative;
 }
@@ -40,10 +40,10 @@ body{
 .tubiao img{
     position: absolute;
     z-index: 10;
-    margin-top: 12px;
+    margin-top: 15px;
     color: #000;
-	margin-left:20px;
-	height:25px;
+	margin-left:15px;
+	height:18px;
 }
 .xiaochu{
 	float:right;
@@ -51,9 +51,9 @@ body{
 .xiaochu img{
     position: absolute;
     z-index: 10;
-    top: 20px;
+    top: 22px;
 	right: 30px;
-	height:25px;
+	height:20px;
 }
 .searchzhao1,.searchzhong1{
 	margin-top: 10px;
@@ -82,6 +82,7 @@ body{
 	word-break: break-all;
 	white-space: normal !important;
 	margin-left: -5px;
+	vertical-align: top;
 }
 .searchzhao3 span , .searchzhong3 span{
 	float:left;
@@ -113,6 +114,7 @@ body{
 }
 .searchbs{
 	cursor:hand;
+	border-bottom:1px solid #e5e6e9; 
 }
 .parent-node img {
 	vertical-align: sub !important;
@@ -124,7 +126,7 @@ body{
 </head>
 <body>
 
-<div class="wxhead"><span class="tubiao"><img src="{{Msg "seo" "cdn"}}/images/wxjss.png"/></span><input class="form-control searchname" name="searchnameshow" value="" placeholder="输入关键词查询"/>
+<div class="wxhead"><span class="tubiao"><img src="{{Msg "seo" "cdn"}}/images/wxjss.png"/></span><input class="form-control searchname" name="searchnameshow" value="" placeholder="示例:税务局 软件"/>
 <span class="xiaochu"><img class="qcimg" src="{{Msg "seo" "cdn"}}/images/wxqc.png"/></span>
 </div>
 <div class="kongbai"></div>
@@ -137,14 +139,12 @@ body{
 		<div class="searchzhao3">
 		<span>{{.T.keywords}}</span>
 		</div>
-		<div style="clear:both"></div>
 		<input name="searchname" id="searchname1" value="" style="display:none;"/>
 		<input name="s_type" id="sea_type" value="1" style="display:none;"/>
 		<input name="s_name" id="sea_name1" value="" style="display:none;"/>
 		</div>
 	</form>
 		<!--招标 end-->
-		<div class="wx-xhx" ></div>
 		<!--中标 start-->
 	<form action="/member/wxswordfish/searchlist" name="searchtwo" method="post" style="margin-bottom: auto;">
 		<div onClick="searchbiao(2)"  class="searchbs" >
@@ -153,14 +153,12 @@ body{
 		<div class="searchzhong3">
 		<span>{{.T.keywords}}</span>
 		</div>
-		<div style="clear:both"></div>
 		<input name="searchname" id="searchname2" value="" style="display:none;"/>
 		<input name="s_type" id="sea_type" value="2" style="display:none;"/>
 		<input name="s_name" id="sea_name2" value="" style="display:none;"/>
 		</div>
 	</form>
 		<!--中标 end-->
-		<div  class="wx-xhx"></div>
 		<!--企业情报 start
 	<form action="/member/wxswordfish/searchlist" name="searchthree" method="post" style="margin-bottom: auto;">
 		<div onClick="searchbiao(3)"  class="searchbs  hidden" >
@@ -208,17 +206,21 @@ body{
 </div>
 {{include "/swordfish/wxtoolbar.html"}}
 <script type="text/javascript">
-	$(".searchname").keyup(function(){
-        var restr = $(".searchname").val();
-		if (restr.length > 0){
-			$(".kongbai").addClass("hidden");
-			$(".searchshow").removeClass("hidden");
-		}else{
-			$(".searchshow").addClass("hidden");
-			$(".kongbai").removeClass("hidden");
-		}
-		$(".searchzhao3 span").html(restr);
-		$(".searchzhong3 span").html(restr);
+	var appendHtml = function(){
+		var restr = $(".searchname").val();
+			if (restr.length > 0){
+				$(".kongbai").addClass("hidden");
+				$(".searchshow").removeClass("hidden");
+			}else{
+				$(".searchshow").addClass("hidden");
+				$(".kongbai").removeClass("hidden");
+			}
+			$(".searchzhao3 span").html(restr);
+			$(".searchzhong3 span").html(restr);
+	}
+	appendHtml();
+	$(".searchname").on("input propertychange",function(){
+        appendHtml();
     });
 	$(".qcimg").click(function(){
 		$(".searchname").val("");

+ 43 - 22
core/src/web/templates/swordfish/wxsearchlist.html

@@ -11,6 +11,7 @@
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/main.js"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/jquery.resize.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/iscroll.js"></script>
 <script>
 	var msgset= {{.T.msgset}};
 	initShare({{.T.signature}},{{.T.shareid}});
@@ -26,7 +27,7 @@ $(function(){
 	if (!flog){
 		$(".nullcontent").removeClass("hidden");
 		$(".resbm").addClass("hidden");
-		$(".rescontent").addClass("hidden");
+		$(".scroller").addClass("hidden");
 	}else{
 		$("#resbm").removeClass("hidden");
 		var str = ""
@@ -35,7 +36,7 @@ $(function(){
 		a_visitedindex=temp["a_visitedindex"];
 		a_publishtime=temp["a_publishtime"];
 		f_id=temp["_id"];
-		$(".rescontent").append('<div id="ycwords" datatype="'+temp["s_type"]+'">'+str+'</div>')
+		$(".scroller").append('<div id="ycwords" datatype="'+temp["s_type"]+'">'+str+'</div>')
 		//信息条总数
 		le=$(".tslist").length;
 		//
@@ -147,7 +148,7 @@ body{
 	height:45px;
 	width:78%;
     border-radius: 10px;
-	padding:2px 10px 2px 60px;
+	padding: 2px 10px 2px 42px;
 	font-size:16px;
 	position:absolute;
 }
@@ -160,10 +161,10 @@ body{
 .tubiao img{
     position: absolute;
     z-index: 10;
-    margin-top: 12px;
+    margin-top: 15px;
     color: #000;
-	margin-left:20px;
-	height:25px;
+	margin-left:15px;
+	height:18px;
 }
 .xiaochu{
 	float:right;
@@ -171,9 +172,9 @@ body{
 .xiaochu img{
     position: absolute;
     z-index: 10;
-    top: 20px;
+    top: 22px;
 	right: 22%;
-	height:25px;
+	height:20px;
 }
 .rsssetbtn{
 	border:1px solid #37c6da; 
@@ -194,7 +195,7 @@ body{
 .reslist{
 	width:100%;
 	height:90px;
-	border-bottom:1px solid #e5e6e9;
+	border-bottom:1px solid #ddd;
 	padding-top:5px;
 }
 .resnumb .one{
@@ -219,14 +220,14 @@ body{
 .restime{
 	float:right; 
 	color:#999;
-	margin-top:5px;
+	margin-top:10px;
 }
 .resbm {
     display: table;
     position: fixed;
     left: 0px;
     right: 0px;
-    bottom: 41px;
+    bottom: 46px;
     height: 50px;
     width: 100%;
     background-color: #37c6da;
@@ -254,18 +255,26 @@ body{
     overflow: hidden;
 	width:60%;
 }
-.rescontent,.nullcontent{
-	padding:10px 20px;
+#wrapper,.nullcontent{
+	padding:0px 20px;
 	background-color:#fff;
-	width:100%;
+	position: absolute;
+    top: 65px;
+	left: 0px;
+	right: 0px;
+	overflow: hidden;
+	z-index: 1;
 }
 .nullcontent{
-	height: 100%;
+	bottom: 46px;
+	padding-top: 30%;
+}
+#wrapper{
+	bottom: 98px;
 }
 .tslist{
-	height:80px;
-	border-bottom: 1px solid #ccc;
-	padding: 5px;
+	border-bottom: 1px solid #e5e6e9;
+	padding: 15px 5px 40px 5px;
 }
 .keyword{
 	color: #FF5A5F;
@@ -285,7 +294,7 @@ body{
 	margin: 2px 0px;
 	float:right;
 	width:13%;
-	height:41px;
+	height:40px;
 	border:1px solid #35C5DA;
 	background-color:#35C5DA;
 	border-radius: 5px;
@@ -309,10 +318,11 @@ body{
 <i class="glyphicon sousuo"></i>
 </span>
 </div>
-<div class="rescontent">
+<div id="wrapper">
+	<div class="scroller">
 	
+	</div>
 </div>
-<div style="height:80px;"></div>
 
 </div>
 <div class="resbm" >
@@ -326,7 +336,7 @@ body{
 
 <div class="nullcontent text-center  hidden">
 <div >
-<img style="width:137px;margin-top:160px;" src="{{Msg "seo" "cdn"}}/images/findnull.png">
+<img style="width:137px;margin-top:20px;" src="{{Msg "seo" "cdn"}}/images/findnull.png">
 </div>
 <div>没有找到和该关键词匹配的信息</div>
 </div>
@@ -368,6 +378,17 @@ body{
 		document.getElementById("searchnametwo").value = searchname;
 		document.forms['searchtwo'].submit();
 	}
+	$(function(){
+		new IScroll('#wrapper', {
+			scrollbarClass: "myScrollbar",
+			scrollbars: "custom",
+			mouseWheel: true,
+			interactiveScrollbars: true,
+			shrinkScrollbars: 'scale',
+			fadeScrollbars: true,
+			resizeScrollbars: false
+		});
+	});
 </script>
 </body>
 </html>

+ 19 - 2
core/src/web/templates/swordfish/wxtoolbar.html

@@ -9,8 +9,7 @@
 	</li>
 	<li class="parent-node toolbar-list" id="toolbar-list">
 		<div class="toolbar-popover">
-			<ul class="popover-ul" style="padding-left: 10px;
-    text-align: left;">
+			<ul class="popover-ul">
 				<li>查看演示</li>
 				<li>分享</li>
 				<li>意见反馈</li>
@@ -80,6 +79,7 @@
 		</div>
 	</div>
 </div>
+<div class="toolbar-popover-mask"></div>
 <script type="text/javascript">
 //意见反馈
 var feedback = null;
@@ -91,6 +91,13 @@ $(function(){
 			window.location.href = "/swordfish/page";
 		}else if($(this).index() == 2){
 			$(this).children(".toolbar-popover").toggle();
+			if($(this).children(".toolbar-popover").is(":hidden")){
+				$(".toolbar-popover-mask").hide();
+				//$("html,body").removeClass("overflow-hidden");
+			}else{
+				$(".toolbar-popover-mask").show();
+				//$("html,body").addClass("overflow-hidden");
+			}
 		}
 	});
 	$(".popover-ul>li").click(function(event){
@@ -111,11 +118,21 @@ $(function(){
 			}
 			obj.parents(".toolbar-popover").hide();
 			obj.removeClass("active");
+			$(".toolbar-popover-mask").hide();
+			//$("html,body").removeClass("overflow-hidden");
 		},100);
 	});
+	$(".toolbar-popover-mask").click(function(e){
+		$(".toolbar-popover").hide();
+		//$("html,body").removeClass("overflow-hidden");
+	});
+	$(window).scroll(function(){
+		$(".toolbar-popover-mask").height($("body").height());
+	});
 	$("body").click(function(e){
 		if(e.target.id != "toolbar-list"){
 			$(".toolbar-popover").hide();
+			$(".toolbar-popover-mask").hide();
 		}
 	});
 	$("[id='goToShare']").click(function(){

+ 2 - 2
core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -132,7 +132,7 @@
 		<li class="ent-active"><div class="b-com-border-top"></div>{{if eq .T.res.s_action "01"}}企业{{else if eq .T.res.s_action "02"}}商家{{else if eq .T.res.s_action "03"}}机构{{else}}企业{{end}}概况</li>
 		<li><div class="b-com-border-top"></div>关系网</li>
 		<li{{if not .T.res.staffinfo}} class="disabled"{{end}}><div class="b-com-border-top"></div>主要人员<front class="badge" id="ent-tab-staffinfo">0</front></li>
-		<li{{if and (not .T.copyright.WorkCopyRight) (not .T.copyright.ComputerSoftCopyRight) (not .T.copyright.Patent)}} class="disabled"{{end}}><div class="b-com-border-top"></div>著作权<front class="badge" id="ent-tab-copyright">0</front></li>
+		<li{{if and (not .T.copyright.WorkCopyRight) (not .T.copyright.SoftWareCopyRight) (not .T.copyright.Patent)}} class="disabled"{{end}}><div class="b-com-border-top"></div>著作权<front class="badge" id="ent-tab-copyright">0</front></li>
 		<li{{if not .T.res.alterInfo}} class="disabled"{{end}}><div class="b-com-border-top"></div>变更信息<front class="badge{{if .T.res.alterInfo}}{{if eq (len .T.res.alterInfo) 0}} disabled{{end}}{{else}} disabled{{end}}">{{if .T.res.alterInfo}}{{len .T.res.alterInfo}}{{else}}0{{end}}</front></li>
 		<li{{if not .T.dishonesty.count}} class="disabled"{{end}}><div class="b-com-border-top"></div>失信信息<front class="badge" id="ent-tab-dishonesty">0</front></li>
 		<li class="{{if and (not .T.service.count) (not .T.res.s_synopsis)}}disabled {{end}}border-r-0"><div class="b-com-border-top"></div>{{if eq .T.res.s_action "01"}}企业{{else if eq .T.res.s_action "02"}}商家{{else if eq .T.res.s_action "03"}}机构{{else}}企业{{end}}黄页</li>
@@ -340,7 +340,7 @@
 		<!--著作权-->
 		<div class="ent-copyright hide">
 			<!--计算机软件著作权信息-->
-			{{if .T.copyright.ComputerSoftCopyRight}}
+			{{if .T.copyright.SoftWareCopyRight}}
 			<div class="ent-layout-down" id="computerSoftCopyRightList">
 				<div class="b-com-title">
 					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>计算机软件著作权信息<front class="badge">0</front>

+ 9 - 2
push/src/qfw/push/cache.go

@@ -25,7 +25,7 @@ type MemberInterest struct {
 }
 
 //初始化缓存,在每次执行任务时调用,
-func InitCache(flag, m_openid string) map[string]*[]*MemberInterest {
+func InitCache(flag, m_openid string,bview bool) map[string]*[]*MemberInterest {
 	defer func() {
 		if r := recover(); r != nil {
 			log.Println("[E]", r)
@@ -42,11 +42,18 @@ func InitCache(flag, m_openid string) map[string]*[]*MemberInterest {
 	cache := make(map[string]*[]*MemberInterest)
 	q := map[string]interface{}{}
 	if m_openid != "" {
-		q = map[string]interface{}{
+		if bview{
+			q = map[string]interface{}{
+			"s_m_openid":                           m_openid,
+			}	
+		}else{
+			q = map[string]interface{}{
 			"o_msgset." + flag + ".i_switchstatus": 1,
 			"o_msgset." + flag + ".i_status":       1,
 			"s_m_openid":                           m_openid,
+			}	
 		}
+		
 	} else {
 		fixPush := util.ObjToString(PushConfig["fixPush"])
 		if len(fixPush) > 5 {

+ 2 - 2
push/src/qfw/push/dopush/dopush.go

@@ -69,7 +69,7 @@ func (p *Pjob) EachInfoForView(mopenid, words string) map[string]interface{} {
 			words: &ss,
 		}
 	} else {
-		*p.Cache = push.InitCache(p.Stype, mopenid)
+		*p.Cache = push.InitCache(p.Stype, mopenid,true)
 	}
 	p.CreateUserInterestWord()
 	session := mongodb.GetMgoConn()
@@ -171,7 +171,7 @@ func (p *Pjob) EachInfoForView(mopenid, words string) map[string]interface{} {
 func (p *Pjob) DoPush(mopenid, stime string, opr int, ltime int64) bool {
 	log.Println("开始执行任务:", p.StypeName, stime)
 	p.Cache = new(map[string]*[]*push.MemberInterest)
-	*p.Cache = push.InitCache(p.Stype, mopenid)
+	*p.Cache = push.InitCache(p.Stype, mopenid,false)
 	p.CreateUserInterestWord()
 	return EachAllBidInfo(p.Stype, "["+p.StypeName+"信息]", p.StypeName, ltime, p.MaxPushSize, p.Dfa, p.Cache, opr)
 }