发布v2.5.8版本

config/version.php

@@ -1,3 +1,3 @@
 <?php
-//版本2.5.7的版本
+//版本2.5.8的版本
-return '2.5.7';
+return '2.5.8';

js/js.js

@@ -32,13 +32,16 @@ $(document).ready(function(){
 	var openfrom = js.request('openfrom',js.getoption('openfrom','', true));
 	js.setoption('openfrom', openfrom, true);
 	
-	if(HOST=='127.0.0.1' || HOST=='localhost' || HOST.indexOf('192.168.0')>-1)window.addEventListener('error',function(e){
+	if(HOST=='127.0.0.1' || HOST=='localhost' || HOST.indexOf('192.168.')>-1)window.addEventListener('error',function(e){
 		var msg = '文件：'+e.filename+'\n行：'+e.lineno+'\n错误：<font color=red>'+e.message+'</font>';
 		js.alert(msg,'js错误');
 	});
+	if(navigator.userAgent.indexOf('XINHUOA')<0){
+		if(typeof(api)=='undefined')api={};
+	}
 	setTimeout(function(){
 		if(typeof(api)=='undefined'){
-			var api={};
+			api={};
 			api.systemType='androidnew';
 			api.deviceId='';
 		}
@@ -995,7 +998,11 @@ js.back=function(){
 	if(isapp){
 		plus.webview.currentWebview().close('auto');
 	}else if(apicloud){
-		api.historyBack({},function(ret){if(!ret.status)api.closeWin();});
+		if(api.historyBack){
+			api.historyBack({},function(ret){if(!ret.status)api.closeWin();});
+		}else{
+			api.closeWin();
+		}
 	}else{
 		history.back();
 	}
@@ -1149,7 +1156,7 @@ js.setapptitle=function(tit){
 	var svst = sessionStorage.getItem('apiwinname');
 	if(svst){
 		if(!tit)tit=document.title;
-		js.sendevent('title',svst,{title:tit})
+		//js.sendevent('title',svst,{title:tit})
 	}
 }
 js.fileoptWin=function(id){
@@ -1162,6 +1169,7 @@ js.fileoptWin=function(id){
 js.apiopenWin=function(url){
 	if(!apicloud)return false;
 	api.openWin({name:'url'+js.getrand(),url: url,bounces:false,softInputBarEnabled:false,slidBackEnabled:true,vScrollBarEnabled:false,hScrollBarEnabled:false,allowEdit:false,progress:{type:'',title:'', text:'',   color:''}});	
+	
 	return true;
 }
 js.appwin=function(na,dz){	
@@ -1179,7 +1187,7 @@ js.sendevent=function(typ,na,d){
 	if(!d)d={};
 	d.opttype=typ;
 	if(!na)na='xinhuhome';
-	if(api.sendEvent)api.sendEvent({name: na,extra:d});
+	if(api.sendEvent)api.sendEvent({name: na,stype:typ,extra:d});
 }
 
 function lang(ky){

webmain/model/reimModel.php

@@ -75,7 +75,8 @@ class reimClassModel extends Model
 		return array(
 			'recid' => $this->serverrecid,			
 			'title' => $this->servertitle,			
-			'chehui' => $chehui * 60,			
+			'chehui'=> $chehui * 60,			
+			'appwx' => $this->optiondb->getval('reimappwxsystem'),			
 			'wsurl' => $this->rock->jm->base64encode($this->serverhosturl)			
 		);
 	}
@@ -1105,6 +1106,9 @@ class reimClassModel extends Model
 		foreach($conta as $k=>$v)$contjson.=',"'.$k.'":"'.$v.'"';
 		$contjson 	= '{'.substr($contjson,1).'}';
 		
+		$pushcont = arrvalue($conta,'pushcont');
+		if(!$pushcont)$pushcont = arrvalue($conta,'cont'); //推送的内容已经是base64的
+		
 		//最新webapp也用服务端推送
 		$uid2019	= $alias['uid2019'];
 		$alias2019	= $alias['alias2019'];
@@ -1113,7 +1117,9 @@ class reimClassModel extends Model
 			$reimappwx= $this->option->getval('reimappwxsystem');
 			if($reimtype=='1' && $reimappwx=='1'){
 				$gbarr = $this->pushserver('sendapp', array(
-					'receid' => join(',', $uid2019)
+					'receid' => join(',', $uid2019),
+					'title'	 => $title,
+					'content'=> $pushcont
 				));
 				//服务端返回{"zshu":2,"yfuid":"1,8","wfuid":""}
 				if($gbarr && $gbarr['success'] && $bstr = arrvalue($gbarr, 'data')){
@@ -1131,8 +1137,7 @@ class reimClassModel extends Model
 				}
 			}
 		}
-		$pushcont = arrvalue($conta,'pushcont');
+		
-		if(!$pushcont)$pushcont = arrvalue($conta,'cont'); //推送的内容已经是base64的
 		return c('JPush')->push($title, $pushcont, $contjson, $alias);
 	}
 	

webmain/system/beifen/beifenAction.php

@@ -10,7 +10,7 @@ class beifenClassAction extends Action
 		if($myext!='-1')return '只有管理员才可以用';
 		
 		$tabstr 	= 'daily,file,files,flow_log,flow_todos,flow_checks,im_history,im_mess,im_messzt,infor,infors,log,logintoken,meet,reads,sjoin,work,todo,flow_chao,flow_bill,flow_remind,goodm,goodn,goodss,goods,kqanay,kqdkjl,kqerr,kqout,kqinfo,location,official,officialfa,officialhong,schedule,scheduld,project,userinfo,userinfos,userract,hrpositive,word,hrredund,hrsalary,customer,custsale,custract,custfina,custappy,assetm,book,bookborrow,carm,carms,carmang,carmrese,email_cont,emailm,emails,sealapl,vcard,tovoid,editrecord,wouser,dailyfx,knowtraim,knowtrais,fininfom,fininfos,hrtrsalary,hrtransfer,hrdemint,reward,offyuebd,repair,knowtiku,kqdisv,knowledge,kqjcmd,kqjuser,kqjsn,hrcheck,receipt,hrcheckn,hrchecks,hrkaohem,hrkaohes,hrkaohen,demo,finpiao,wordxie,wordeil,subscribe,subscribeinfo,news,finzhang,finkemu,finount,finjibook,custplan,wenjuan,wenjuat,wenjuau,dangan,danganjy,wotpl,seal,godepot,im_tonghua,bianjian';
-		$mrows		= m('mode')->getall('`id`>=108');
+		$mrows		= m('mode')->getall("`id`>=108 and `type`<>'系统'");
 		foreach($mrows as $k1=>$rs1){
 			if(!isempt($rs1['table']))$tabstr.=','.$rs1['table'].'';
 			if(!isempt($rs1['tables']))$tabstr.=','.$rs1['tables'].'';

webmain/task/api/indexreimAction.php

@@ -175,7 +175,9 @@ class indexreimClassAction extends apiAction
 		$arr['outunum']   = $this->option->getval('outunum'.$this->adminid.'');
 		$arr['outgroupopen']   = $this->option->getval('outgroupopen'.$this->adminid.'');
 		$arr['tonghuabo'] = getconfig('video_bool') ? '1' : '2';//是否开启音视频
-		$arr['lxrshow'] = ($this->option->getval('appsy_lxrshow')!='否') ? 1 : 2;
+		$arr['lxrshow'] 	= ($this->option->getval('appsy_lxrshow')!='否') ? 1 : 2;
+		
+		$arr['config'] 		= $dbs->getreims();
 		
 		$this->showreturn($arr);
 	}

webmain/we/ying/tpl_ying.html

@@ -74,8 +74,11 @@ function initApp(){
 		name: nowlist
 	}, function(ret, err) {
 		if(ret){
-			var lx = ret.value.opttype;
+			if(ret.value){
-			if(lx=='reload')yy.reload();
+				var lx = ret.value.opttype;
+				if(lx=='reload')yy.reload();
+			}
+			if(ret.stype=='reload')yy.reload();
 		}
 	});
 }