Merge remote-tracking branch 'origin/master'

ipu-server/web/biz/js/common/util.js

@@ -2,6 +2,10 @@
 * util用于将模块化变量全局化,方便使用
 * 如果每个js都需要引入的相同模块,则绑定到window对象即可
 */
define(["jcl"],function(Wade) {
	window.$ = window.Wade = Wade;
define(["jcl","o","iScroll","iScroll5","wmWebUI"],function($,O,iScroll,iScroll5,WmWebUI) {
	window.$ = window.Wade = $;
	window.O = O;
	window.iScroll = iScroll;
	window.iScroll5 = iScroll5;
	window.WmWebUI=WmWebUI;
});

ipu-server/web/res/js/ui/wm-slider.js

@@ -39,6 +39,9 @@ define(["iScroll","util"],function(iScroll){
		this.page=this.entity.children("div").eq(1);
		this.lis=this.wrapper.find("li");
		this.items=new Array();
		var _size = this.lis.size();
        $('.c_slide-col-4 .frame .wrapper').css('width',_size * 100 + '%');
        $('.c_slide-col-4 .frame li').css('width',100 / _size + '%');
		console.log(this.lis.size());
		var that=this;
		$.each(this.lis,function(index,item){