Merge branch 'dev' of

http://121.42.53.174:3000/bulomakaka/ekexiu.app.git into dev

app/html/updateProfile.html

@@ -21,7 +21,7 @@
		<script>
			function autoGrow(oField) {
				document.getElementById("tt").style.width=oField.scrollWidth+"px";
				document.getElementById("tt").value=oField.value.substr(0,500);
				document.getElementById("tt").value=oField.value;
				oField.style.height=document.getElementById("tt").scrollHeight+"px";
			}
		</script>

app/js/articleShow.js

@@ -727,13 +727,17 @@ mui.plusReady(function() {
		var length = trim(this.value);
		if(length) {
			document.getElementsByClassName("mui-btn")[0].removeAttribute("disabled");
			this.value=this.value.substr(0,200);
			
		} else {
			document.getElementsByClassName("mui-btn")[0].setAttribute("disabled", "true")
		}
		
	})
	document.getElementsByClassName("mui-btn")[0].addEventListener("tap", function() {
		if(document.getElementById("textInputThis").value.length>200) {
				plus.nativeUI.toast("留言不得超过200个字", toastStyle);
				return;
			}
		mui.ajax(baseUrl + "/ajax/leaveWord", {
			data: {
				"articleId": plus.webview.currentWebview().articleId,

app/js/index.js

@@ -8,6 +8,9 @@ mui.plusReady(function() {
	plus.nativeUI.showWaiting();
	checkVersion();
})
document.addEventListener("resume", function(){
	checkVersion();
}, false)
document.getElementById("demandP").addEventListener("tap", function() {
	var userid = plus.storage.getItem('userid');
	if(userid == null) {
@@ -383,4 +386,4 @@ function datalistEach(datalist) {
		table.appendChild(li, table.firstChild);
	});
}
}

app/js/paperShow.js

@@ -771,12 +771,15 @@ document.getElementById("textInputThis").addEventListener("input", function() {
		var length = trim(this.value);
		if(length) {
			document.getElementsByClassName("mui-btn")[0].removeAttribute("disabled");
			this.value=this.value.substr(0,200);
		} else {
			document.getElementsByClassName("mui-btn")[0].setAttribute("disabled", "true")
		}
	})
document.getElementsByClassName("mui-btn")[0].addEventListener("tap", function() {
	if(document.getElementById("textInputThis").value.length>200) {
				plus.nativeUI.toast("留言不得超过200个字", toastStyle);
				return;
			}
		mui.ajax(baseUrl + "/ajax/leaveWord/paper", {
			data: {
				"paperId": paperId,
@@ -917,4 +920,4 @@ mui('.commentBlock').on('tap', '.useHead,.h1Font', function() {
				"patentId": id
			});
		})
});
});

app/js/patentShow.js

@@ -747,12 +747,15 @@ document.getElementById("textInputThis").addEventListener("input", function() {
		var length = trim(this.value);
		if(length) {
			document.getElementsByClassName("mui-btn")[0].removeAttribute("disabled");
			this.value=this.value.substr(0,200);
		} else {
			document.getElementsByClassName("mui-btn")[0].setAttribute("disabled", "true")
		}
	})
document.getElementsByClassName("mui-btn")[0].addEventListener("tap", function() {
	if(document.getElementById("textInputThis").value.length>200) {
				plus.nativeUI.toast("留言不得超过200个字", toastStyle);
				return;
			}
		mui.ajax(baseUrl + "/ajax/leaveWord/patent", {
			data: {
				"patentId": patentId,

app/js/public/base.js

@@ -373,3 +373,63 @@ function cancelCollectionAbout(watchObject,sel, num,flag) {
	});
}
function checkVersion(){
		mui.plusReady(function(){
			if(!plus.webview.currentWebview()) return;
			// 获取本地应用资源版本号
		    plus.runtime.getProperty(plus.runtime.appid,function(inf){
			    wgtVer=inf.version;
			    console.log("当前应用版本："+wgtVer);
			    mui.ajax(baseUrl + "/data/manager/version.json", {
					dataType: 'json', //数据格式类型
					type: 'GET', //http请求类型
					timeout: 10000, //超时设置
					async: false,
					success: function(data) {
						if (data.version > wgtVer) {
							var btn = ["立即更新", "取消更新"];
							mui.confirm("新版本上线了，为了不影响您的正常使用，赶快更新吧", "提示", btn, function(e) {
								if(e.index == 0) {
									if(mui.os.ios) {
										plus.runtime.openURL('https://itunes.apple.com/cn/app/ke-xiu-da-jian-qi-ye-yu-zhuan/id1197110983?l=en&mt=8');
										return;
									}
								try {
									     plus.nativeUI.showWaiting("检测更新...");
									     //var d="http://192.168.3.233/download/app1.0.6.apk";
										 plus.downloader.createDownload( data.wgt, {filename:"_doc/update/"}, function(d,status){
									        if ( status == 200 ) { 
									            plus.runtime.install(d.filename, {}, function() {
													console.log("安装新版本文件成功！");
													/*plus.nativeUI.alert("应用资源更新完成,程序需要立即重启", function() {
														plus.runtime.restart();
													});*/
												}, function(e) {
													console.log("安装新版文件失败[" + e.code + "]：" + e.message);
													plus.nativeUI.toast("安装新版文件失败[" + e.code + "]：" + e.message);
												});
									            
									        } else {
									            console.log("下载新版本失败！");
									            plus.nativeUI.toast("下载新版本失败！");
									        }
							       			plus.nativeUI.closeWaiting();
							    		}).start();
						    		} catch (e) {
										console.log(e.message);
									}	
								}
							});
						}else{
							//plus.nativeUI.toast("您使用的是最新版本，请放心使用！", toastStyle);
						}
					},
					error: function() {
						plus.nativeUI.toast("服务器链接超时", toastStyle);
						return;
					}
				});
			});
		})
	}

app/js/setup.js

@@ -107,6 +107,10 @@ mui.ready(function() {
							var btn = ["确定更新", "取消更新"];
							mui.confirm("检测到新版本，是否更新？", "提示", btn, function(e) {
								if(e.index == 0) {
									if(mui.os.ios) {
										plus.runtime.openURL('https://itunes.apple.com/cn/app/ke-xiu-da-jian-qi-ye-yu-zhuan/id1197110983?l=en&mt=8');
										return;
									}
								try {
									     plus.nativeUI.showWaiting("检测更新...");
									     //var d="http://192.168.3.233/download/app1.0.6.apk";

app/js/updateJob.js

@@ -10,10 +10,10 @@ mui.ready(function() {
				var arr = [];
				for(var i = 0; i < obj.data.length; i++) {
					if(obj.flag == 1) {
						var str = '<li class="mui-table-view-cell listitem" data-o="'+i+'">'
						var str = '<li class="mui-table-view-cell listitemExit" data-o="'+i+'">'
						var name = obj.data[i].name;
					} else {
						var str = '<li class="mui-table-view-cell listitem" data-o="'+i+'">'
						var str = '<li class="mui-table-view-cell listitemExit" data-o="'+i+'">'
						var name = obj.data[i].company;
					}
					oarr[i]=obj.data[i];
@@ -23,7 +23,7 @@ mui.ready(function() {
					}else{
						odescp = obj.data[i].title
					}
					var os = '<div class="h4Tit listtit2" style="margin-right:40px;">' + name + '<span class="updatebox mui-clearfix" style="top:0;margin-right:-40px;"><em></em>修改</span></div>' +
					var os = '<div class="listtit2" style="margin-right:40px;">' + name + '<span class="updatebox mui-clearfix" style="top:5px;"><em></em>修改</span></div>' +
						 ' <p class="listtit3">'+odescp+'</p>'+
						' <p class="listtit3">' + timeT({
							startMonth: obj.data[i].startMonth,

app/js/updateProfile.js

@@ -15,8 +15,6 @@ mui.ready(function() {
				document.getElementById("fontAdd").innerHTML = web.descp.length;
			}
			document.getElementById("title").addEventListener("input", function() {
				
					this.value = this.value.substring(0, 500);
					document.getElementById("fontAdd").innerHTML = this.value.length;
			})
		}

app/js/updateProject.js

@@ -11,7 +11,7 @@ mui.ready(function() {
				var arr = [];
				for(var i = 0; i < obj.data.length; i++) {
					if(obj.flag == 1) {
						var str = '<li class="mui-table-view-cell listitem" data-o="'+i+'">'
						var str = '<li class="mui-table-view-cell listitemExit" data-o="'+i+'">'
						var name = obj.data[i].name;
					} else {
						var str = '<li class="mui-table-view-cell listitem" style="margin-right:40px;"data-o="'+i+'">'
@@ -22,7 +22,7 @@ mui.ready(function() {
					if(obj.data[i].descp) {
						odescp = obj.data[i].descp
					}
					var os = '<div class="h4Tit listtit2" style="margin-right:40px;">' + name + '<span class="updatebox mui-clearfix" style="top:0;margin-right:-40px;"><em></em>修改</span></div>' +
					var os = '<div class="listtit2" style="margin-right:40px;">' + name + '<span class="updatebox mui-clearfix" style="top:5px;"><em></em>修改</span></div>' +
						' <p class="listtit3">' + timeT({
							startMonth: obj.data[i].startMonth,
							stopMonth: obj.data[i].stopMonth