From 117f629dccdc83f68b71405eb4b412e9d7d297e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E4=B8=AD=E7=A3=90=E7=9F=B3?= Date: Thu, 16 Feb 2023 16:04:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E5=91=BCv2.5.3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +- config/version.php | 4 +- js/reim_xina.js | 6 ++ webmain/flow/input/inputjs/input_two.js | 5 +- webmain/flow/input/inputjs/mode_custgys.js | 4 ++ webmain/flow/input/mode_custgysAction.php | 33 +++++++++++ webmain/flow/page/input_custgys.html | 1 + webmain/flow/page/rock_page_custgys.php | 59 ++++++++++++++++++++ webmain/flow/page/rock_page_finccbxchart.php | 1 + webmain/flow/page/rock_page_receipt.php | 1 + webmain/flow/page/rock_page_remind.php | 1 + webmain/index/indexAction.php | 6 ++ webmain/index/indexscript.js | 9 +++ webmain/index/tpl_index.html | 6 +- webmain/model/adminModel.php | 6 +- webmain/model/flow/custgysModel.php | 15 +++++ webmain/model/flow/flow.php | 2 +- webmain/model/modeModel.php | 1 + webmain/system/cog/cogAction.php | 2 + webmain/system/cog/rock_cog_moreset.php | 2 +- webmain/system/option/optionAction.php | 27 ++++++++- webmain/system/option/rock_option.php | 31 +++++++--- webmain/task/runt/dayAction.php | 2 + webmain/task/runt/kaoqinAction.php | 2 + webmain/we/index/indexAction.php | 1 + webmain/webmainAction.php | 7 +++ 26 files changed, 217 insertions(+), 23 deletions(-) create mode 100644 webmain/flow/input/inputjs/mode_custgys.js create mode 100644 webmain/flow/input/mode_custgysAction.php create mode 100644 webmain/flow/page/input_custgys.html create mode 100644 webmain/flow/page/rock_page_custgys.php create mode 100644 webmain/model/flow/custgysModel.php diff --git a/README.md b/README.md index 226d3ec..c7f9265 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ 官网网站：http://www.rockoa.com/ 源码仅供学习二次开发使用，禁止二次发布，禁止用于商业用途出售等(违者必究) 版权：Copyright @2016-2023 信呼开发团队 -版本整理时间：2023-01-12 23:59:59 -版本号：V2.5.2 +版本整理时间：2023-02-16 23:59:59 +版本号：V2.5.3 -### V2.5.2更新说明 +### V2.5.3更新说明 1、完善系统安全性。 2、更多升级日志详见：http://www.rockoa.com/view_core.html diff --git a/config/version.php b/config/version.php index 076b865..e768fd1 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ '; s+=' '; s+=' '; + if(type=='gout')s+=' '; s+=''; s+='
'; @@ -1612,6 +1613,10 @@ function chatcreate(cans){ } if(this.rightqipaoobj)this.rightqipaoobj.hide(); }; + this.kefuat=function(){ + this.atid = 2; + this.addinput('@淇″懠瀹㈡湇 '); + }; this.exitgroups=function(){ js.msg('wait','閫鍑轰腑...'); reim.ajax(this.getapiurl('reim','exitgroup'),{gid:this.gid,aid:this.sendinfo.id}, function(da){ @@ -1801,6 +1806,7 @@ function chatcreate(cans){ if(lx=='sou0' || lx=='sou1' || lx=='sou2')this.recordsearch(lx); if(lx=='sou3')this.searchjilu(); if(lx=='star')this.showstar(); + if(lx=='atkf')this.kefuat(); }; this.getemts=function(o){ if(!get('aemtsdiv')){ diff --git a/webmain/flow/input/inputjs/input_two.js b/webmain/flow/input/inputjs/input_two.js index a0e1cb9..dca28a7 100644 --- a/webmain/flow/input/inputjs/input_two.js +++ b/webmain/flow/input/inputjs/input_two.js @@ -376,7 +376,10 @@ var inputtwo={ var sna = d1.sna; if(form(sna))form(sna).value=d1.address+'|'+d1.lat+','+d1.lng+''; var sna1 = d1.snall; - if(sna1 && form(sna1))form(sna1).value=''+d1.lat+','+d1.lng+','+d1.zoom+''; + if(sna1 && form(sna1)){ + form(sna1).value=''+d1.lat+','+d1.lng+','+d1.zoom+''; + form(sna).value=d1.address; + } c.onselectmap(sna,d1); }); this.geocoderObj.setError(function() { diff --git a/webmain/flow/input/inputjs/mode_custgys.js b/webmain/flow/input/inputjs/mode_custgys.js new file mode 100644 index 0000000..c174886 --- /dev/null +++ b/webmain/flow/input/inputjs/mode_custgys.js @@ -0,0 +1,4 @@ +//娴佺▼妯″潡銆恈ustgys.渚涘簲鍟嗐戜笅褰曞叆椤甸潰鑷畾涔塲s椤甸潰,鍒濆鍑芥暟 +function initbodys(){ + +} \ No newline at end of file diff --git a/webmain/flow/input/mode_custgysAction.php b/webmain/flow/input/mode_custgysAction.php new file mode 100644 index 0000000..b03b073 --- /dev/null +++ b/webmain/flow/input/mode_custgysAction.php @@ -0,0 +1,33 @@ +'閿欒鎻愮ず鍐呭','rows'=> array()) 鍙繑鍥炵┖瀛楃涓诧紝鎴栬呮暟缁 rows 鏄彲鍚屾椂淇濆瓨鍒版暟鎹簱涓婃暟缁 + */ + protected function savebefore($table, $arr, $id, $addbo){ + $rows['isgys'] = '1';//涓嶈兘鍘绘帀 + return array( + 'rows'=>$rows + ); + } + + /** + * 閲嶅啓鍑芥暟锛氫繚瀛樺悗澶勭悊锛屼富瑕佷繚瀛樺叾浠栬〃鏁版嵁 + * $table String 瀵瑰簲琛ㄥ悕 + * $arr Array 琛ㄥ崟鍙傛暟 + * $id Int 瀵瑰簲琛ㄤ笂璁板綍Id + * $addbo Boolean 鏄惁娣诲姞鏃 + */ + protected function saveafter($table, $arr, $id, $addbo){ + + } +} + \ No newline at end of file diff --git a/webmain/flow/page/input_custgys.html b/webmain/flow/page/input_custgys.html new file mode 100644 index 0000000..92f607b --- /dev/null +++ b/webmain/flow/page/input_custgys.html @@ -0,0 +1 @@ +
*^name^{name}{addresslatlng}*^type^{type}
^unitname^{unitname}^linkname^{linkname}
^mobile^{mobile}^tel^{tel}
^address^{address}
^explain^{explain}
*^status^{status}
^file_content^{file_content}
\ No newline at end of file diff --git a/webmain/flow/page/rock_page_custgys.php b/webmain/flow/page/rock_page_custgys.php new file mode 100644 index 0000000..e600713 --- /dev/null +++ b/webmain/flow/page/rock_page_custgys.php @@ -0,0 +1,59 @@ + + + + +
+ + + + + + + + + + + + + +
+ +
+ +
+
+ +
+
+
+
+ \ No newline at end of file diff --git a/webmain/flow/page/rock_page_finccbxchart.php b/webmain/flow/page/rock_page_finccbxchart.php index 7c327fd..3c130a3 100644 --- a/webmain/flow/page/rock_page_finccbxchart.php +++ b/webmain/flow/page/rock_page_finccbxchart.php @@ -62,6 +62,7 @@ $(document).ready(function(){ if(tlx!='pie'){ option.xAxis={data: xAxis}; option.yAxis={type : 'value'}; + option.tooltip.formatter="{b} : {c}鍏"; } myChart[oi].setOption(option); }, diff --git a/webmain/flow/page/rock_page_receipt.php b/webmain/flow/page/rock_page_receipt.php index 6b4e9e3..9278ad0 100644 --- a/webmain/flow/page/rock_page_receipt.php +++ b/webmain/flow/page/rock_page_receipt.php @@ -26,6 +26,7 @@ c.view=function(){ var d=a.changedata; openxiangs('璇︽儏',d.modenumshow,d.mid,'opegs{rand}'); } +$('#tdleft_{rand}').hide(); //[鑷畾涔夊尯鍩焑nd] c.initpagebefore(); diff --git a/webmain/flow/page/rock_page_remind.php b/webmain/flow/page/rock_page_remind.php index 709536f..6cc8380 100644 --- a/webmain/flow/page/rock_page_remind.php +++ b/webmain/flow/page/rock_page_remind.php @@ -36,6 +36,7 @@ c.setcolumns('modenum',{ c.clickwin=function(){ js.msg('msg','涓嶈兘浠庤繖閲屾柊澧炴彁閱'); } +$('#tdleft_{rand}').hide(); //[鑷畾涔夊尯鍩焑nd] c.initpagebefore(); diff --git a/webmain/index/indexAction.php b/webmain/index/indexAction.php index 0352b93..31d9d23 100644 --- a/webmain/index/indexAction.php +++ b/webmain/index/indexAction.php @@ -3,10 +3,15 @@ class indexClassAction extends Action{ public $homestylebool = false; + + public function defaultAction() { if(strlen(getconfig('randkey'))!=26)exit('閰嶇疆鏂囦欢randkey涓嶆纭紝璇烽噸鏂拌缃负锛'.$this->jm->getRandkey().''); + $notuserids = getconfig('notuserids'); + $this->pannouser(); + $homestyle = getconfig('homestyle'); if($homestyle>=1 && !$this->homestylebool){ $temshot = $this->getsession('homestyle'); @@ -247,6 +252,7 @@ class indexClassAction extends Action{ */ public function getshtmlAction() { + $this->pannouser(); $surl = $this->jm->base64decode($this->get('surl')); $num = $this->get('num'); $menuname = $this->jm->base64decode($this->get('menuname')); diff --git a/webmain/index/indexscript.js b/webmain/index/indexscript.js index 6e0ed99..fa10962 100644 --- a/webmain/index/indexscript.js +++ b/webmain/index/indexscript.js @@ -90,6 +90,15 @@ function initbody(){ history.pushState(null, null, document.URL); }); }catch(e){} + + /* + var o1 = $('#index-navbar-center'); + var hei = $('#index-navbar-left').width()+$('#index-navbar-right').width(); + var wid = winWb()-hei; + if(o1.width()>wid){ + o1.css({width:''+(wid-30)+'px',height:''+$('#index-navbar-right').height()+'px'}); + $('#index-navbar-right').prepend('
    • '); + }*/ } diff --git a/webmain/index/tpl_index.html b/webmain/index/tpl_index.html index 97defc0..24d0ccd 100644 --- a/webmain/index/tpl_index.html +++ b/webmain/index/tpl_index.html @@ -55,7 +55,7 @@ echo 'body{--main-color:'.$maincolor.'}';