From b71c81d764b1f2f06b8ca0a031393727b0659719 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 4 Aug 2020 18:25:17 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinanceController.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 3940b4203..ffd4d0b9a 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -709,13 +709,15 @@ class FinanceController extends ThinkController $searchGameIds = null; $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id'); + $gameWhere = []; if ($game_ids) { $map['s.game_id'] = ['in', $game_ids]; - $searchGameIds = $game_ids; + $gameWhere['id'] = ['in', $game_ids]; } if (!empty(I('partner_id'))) { $map['g.partner_id'] = I('partner_id'); + $gameWhere['partner_id'] = I('partner_id'); } if (!empty(I('timestart'))) { @@ -733,9 +735,10 @@ class FinanceController extends ThinkController if (!empty(I('game_type_id'))) { $map['g.game_type_id'] = I('game_type_id'); - $searchGameIds = M('game', 'tab_')->where(['game_type_id' => I('game_type_id', 0)])->getField('id', true); + $gameWhere['game_type_id'] = I('game_type_id', 0); } - + + $searchGameIds = M('game', 'tab_')->where($gameWhere)->getField('id', true); $startTime = time(); //游戏统计列表 $data = D("spend")->gameStatistics($map, $row, $p); From 672b2762288b73c3c652838e020afe39c5c9e05c Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 4 Aug 2020 18:53:36 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 9 +++++++-- Application/Admin/Controller/FinanceController.class.php | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index e05aa5125..1cc106976 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -8281,14 +8281,16 @@ class ExportController extends Controller $searchGameIds = null; $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id'); + $gameWhere = []; if ($game_ids) { $map['s.game_id'] = ['in', $game_ids]; - $searchGameIds = $game_ids; + $gameWhere['id'] = ['in', $game_ids]; } if (!empty(I('partner_id'))) { $map['g.partner_id'] = I('partner_id'); + $gameWhere['partner_id'] = I('partner_id'); } if (!empty(I('timestart'))) { @@ -8306,8 +8308,10 @@ class ExportController extends Controller if (!empty(I('game_type_id'))) { $map['g.game_type_id'] = I('game_type_id'); - $searchGameIds = M('game', 'tab_')->where(['game_type_id' => I('game_type_id', 0)])->getField('id', true); + $gameWhere['game_type_id'] = I('game_type_id', 0); } + + $searchGameIds = M('game', 'tab_')->where($gameWhere)->getField('id', true); $xlsData = D("spend")->gameStatistics($map); @@ -8335,6 +8339,7 @@ class ExportController extends Controller 'started_at' => I('timestart', ''), 'ended_at' => I('timeend', ''), 'search_games' => $searchGameCodes, + 'device_type' => I("sdk_type", 0), ]); $aggData = []; $aggTotal = '0.00'; diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index ffd4d0b9a..862140bae 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -766,6 +766,7 @@ class FinanceController extends ThinkController 'started_at' => I('timestart', ''), 'ended_at' => I('timeend', ''), 'search_games' => $searchGameCodes, + 'device_type' => I("sdk_type", 0), ]); $aggData = []; $aggTotal = '0.00'; From ba20c3683a3f615018d18f156e62a35848c014a2 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 14:27:39 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinanceController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 4cfd24076..bc0b8d2ba 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -726,7 +726,7 @@ class FinanceController extends ThinkController if (!empty($map['_string'])) { $map['_string'] .= " and "; } - $map['_string'] .= " s.payed_time < {$timeend}"; + $map['_string'] .= " s.payed_time <= {$timeend}"; } if (!empty(I('game_type_id'))) { From 9b61a39620d4cea0c293f871b915d612efce1e8d Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 14:31:32 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 3e430fb47..034c3d047 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -8298,7 +8298,7 @@ class ExportController extends Controller if (!empty($map['_string'])) { $map['_string'] .= " and "; } - $map['_string'] .= " s.pay_time < {$timeend}"; + $map['_string'] .= " s.pay_time <= {$timeend}"; } if (!empty(I('game_type_id'))) { From 7335f5da1536b996cd0dad35a690b04384af1759 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 15:20:46 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=B8=B8=E9=9D=9E0?= =?UTF-8?q?=E9=83=BD=E8=A6=81=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index b3c0fb626..01e75078f 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -653,14 +653,14 @@ class CompanyStatementController extends ThinkController } if($va['pay_amount'] < $no_pool_money){ //依旧小于不结算金额存旧版 - if($lackcompany['pay_amount'] > 0){ + if($lackcompany['pay_amount'] != 0){ $lask_id = $LackStatement->add($lackcompany); $v['create_lack_ids'][] =$lask_id; $v['lack_statement_money'] +=$lackcompany['statement_money']; $v['lack_platform_amount'] +=$lackcompany['platform_amount']; } }else{ - if($va['pay_amount'] > 0){ + if($va['pay_amount'] != 0){ //存成功 $company =[ "pool_id"=>0, From 978a42b4df2a4a0b1c128feac8284929803b3d74 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 15:24:24 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=88=A4=E5=AE=9A=E4=BE=9D=E6=97=A7=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementController.class.php | 4 ++-- .../Admin/Controller/CompanyStatementSetController.class.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 01e75078f..e727fe19d 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -616,7 +616,7 @@ class CompanyStatementController extends ThinkController } //创建基础未满基础信息 - if($va['pay_amount'] < $no_pool_money){ + if($va['platform_amount'] < $no_pool_money){ $lackcompany =[ "company_id"=>$company_info['id'], "company_type"=>$v['company_type'], @@ -651,7 +651,7 @@ class CompanyStatementController extends ThinkController array_multisort($last_names,SORT_DESC,SORT_STRING,$va['statement_info']); } } - if($va['pay_amount'] < $no_pool_money){ + if($va['platform_amount'] < $no_pool_money){ //依旧小于不结算金额存旧版 if($lackcompany['pay_amount'] != 0){ $lask_id = $LackStatement->add($lackcompany); diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index f64485abe..bff112784 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -1067,7 +1067,7 @@ class CompanyStatementSetController extends Controller { if($type == 2 && $v['statement_money'] == 0){ //补点不存 }else{ - if($v['pay_amount'] < 300){ + if($v['platform_amount'] < 300){ //存未满 if($lackcompany['pay_amount'] > 0){ $lask_id = $LackStatement->add($lackcompany); From b2239380bfd0aab6ce71d5faffbd3670c9d2a29f Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 15:32:56 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=9F=E6=95=B0?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementSetController.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index bff112784..1bb986703 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -715,7 +715,7 @@ class CompanyStatementSetController extends Controller { //金额为0不补点 continue; } - if($add_data['platform_amount'] <= 0){ + if($add_data['platform_amount'] == 0){ return; } // dd($add_data); @@ -1069,7 +1069,7 @@ class CompanyStatementSetController extends Controller { }else{ if($v['platform_amount'] < 300){ //存未满 - if($lackcompany['pay_amount'] > 0){ + if($lackcompany['pay_amount'] != 0){ $lask_id = $LackStatement->add($lackcompany); $countdata['create_lack_ids'][] =$lask_id; $countdata['lack_statement_money'] +=$lackcompany['statement_money']; @@ -1077,7 +1077,7 @@ class CompanyStatementSetController extends Controller { } }else{ - if($v['pay_amount'] > 0){ + if($v['pay_amount'] != 0){ //存成功配置单号 $company =[ "pool_id"=>0, From 0b0450f29d0c41bda519c3701546e3484f60b544 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 6 Aug 2020 10:25:45 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Admin/excel/up_stream.xls | Bin 22528 -> 23040 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Public/Admin/excel/up_stream.xls b/Public/Admin/excel/up_stream.xls index a1021799d16d088dad316b3cfbe2f17dbac49e63..277866bcef274768bb278b515e9c3a4d44a69301 100644 GIT binary patch delta 5033 zcmb7|3s6+o8OOhK_rZl-mR;Bt7Tjf#HwZ2dUr1O~T4NBww^5?vgG4YT5mT!o7sW^7 zBRZbxlw_QYF{zU_sbgmy+QF1C)=rw~gj%PqOk$f%t+v`|8;$L#)$MoAz5Bl2neLfA zyZ3zG_dDM?-+%Akd;89izO&?vUa*w_z~ew5pvO-GzKf|t*q>OWjF$S}7FLpD`t>R6 z1k>}AZ~cLs7`!_+(D_H&t=}u;HuxXtpAiM4K);=QKIzBVpC)_)0vPo))pCMZso&B; zfVxxCBYP(ZFv4i8 z6`)#P3$s3swoW7jrpcKzYq>3Ac18xM3&*aCx7xzi*JG^$q=&7;u~vZEu=RGVHME~B zD>vVBxnA=Av+qN^B181gXyv_gC|E(Zs{qa*e~4ne$dLcvse2OWXPHOo_RKZ@j;v{f zzL}Fm59JKfOivO$?y}GW6W*gYCz$9XPjZC_r7%;M2{4UV>pk@zfDzA^Sg;~Ko{Hl( z8y^>xaXLGDj4fx)`QBmy_+(+>nP#mMk)Qg-Rrf-D-mf5#cy} z%AMY%&}xYdEA9zOEF2ZR26-GMshS_JB%U{w%7j+mBif;dEkE=+3SBd<{D_{)y+f@9 zR0j#|W0# z0n_6Vtg5ky;s}H!|G5TB>42Je1}k4Iqb!0UBZ3ukz>IhVt5PhYf*~@Z{^NtCNrYPZ z`J@u^6g7HFNFA-f-bY)#W%OLd5fbn>Rtkc%FCXv@2jDt>vdfEE1puS?d55-F=aQG` zf$D6-?gJmDJ)oznbEJ-6dad93&)&!V7YD~S4;B4zZ1m*Ztve@PO3C=^Ps=)v?5R%t zjQpm!JFShDJcz3X>geeeBm9^NiKce$jZMb}^W z!8eI?)#b~}uHCkKi{Ci4_{Lk)YcuGkBf0NhNyyu_ap(A5*D`0Mjr7* zf3NytaCGg}TfO#;b^YmMpX#eVYF%^BcXQI;j4Q`dJ{X*H<1ek!g`7uapD*kzr`?Z# zf9_~`M)?nZcDC*MM?diqfIvV8EsZ+89gO}!t~IfnJ>Arr-Bj zX`3&T{EqhcW|KQ~#8*RZ(TBe26T)}N04BkXyDPu&_5prd1F&GGe`)=LL>If*0~m&J z*z2$w-4SgIeeoHm^qS&f#!Egu9Dsvx2#oLulJGbImav-`jAvF6k9NUsv@olH?P+9! za-@UTFkbc*Vn_lfu?GW;Bp|5^`e6?vQA49+GRtAwfPR@ci`jKC(K;T@uBK(H5>1;M zo%x61bvTSo&RCD0FCks_)bot@!ajPq(J37Pxyhae^n4x?6;A_tu7dsWs0{m9#%kd(6$(_reDM}CSF+!Mszje zk?fWLt&kFQ!$h9L3+^B=5sz3&<(MS+4&MS1r(Fim!b-YrUZJZM<3-LAaY3u`x>xoW zF{L&17xSi)HhOPffwY$Uu)?jw`(n1VRP@ln`iLfCURgMr2piBN_!_}<4A77W`Vp2$ z61H{@Ga*a@2l@@;(o6{32HSa)ciDss-NCgt43ZfgL_F+)od{rSXHw|Hi#s`-75)|Y zE^l(U8N+)OyBWPjJlYE1Q=*f3G~Oce$&=%vlXz66!uZW_4Qfasz1cjSo@@5f&gK?613&*Uzr~;1@+ac=&MG6v7M@M$GyIA_ zEIYSwuFfb3^q&hH{_%^h5Yk24W;Xg8mJ|?TrkzW_w&&t}O&iy3?&|Jp-{NU*Z{N6X J1MOIL^nV-(_7?yE delta 4809 zcma)AdvH|M8UN1Ro8)Gb-R$PQNjBMqydO00EGCd8STI0d5C}*`5CwryXb_|lxCtm2 zpfTn|iydXOBV+!cG-lD6T8vaWA{FSAR;yE>PMu`5I(B3#87Po`=iJxs=60s{%suy> z^L@YH`Ofz{cXLj9PLrMyG9n7j0sy!-H8myTGXn2?nj{>uv7SQJa_`Ny4l*b{8h5I^ z-f#KfWAgc@s}B#I|CsI&pAlN;2X2dtB*6-Ff$e?kgDsb$E`R`$5{KExDp4QZ;eOaizx&LN5#q0cF!4&01?I*MA;*V3ob1_GPYeMF9eBA91M z1@Of?{2spt;H>9!6eXzN8Qh=G{o~PJ5d7fB<)Qc+{kUL)`U`Y_(|+3KNoZpcxRBA| zglQ45erHGoN@T2`I5C2-h*`gvUdu|Moo;)!K8xL<9Do-Aob`6ElYWp@*od!TE_Tgj zw>NC~G9}!)@NjuQo##zx(mcWg)cQjiCHxAw1l^%Q+OZ#lq;Gl>yevg&(_&Pn$NJfn za~k#3gw4h14;?vI7e^gg6*HG^$z15lG)fqCRk-E}qa;%KC|eUe8KS z3mrz{bUZ%}dMYECp3Hc=R!^D_oVZfWxI)%d5DDGtekl_j*zYucOuEbfYjc z(j$KkcU}+(BT|ML<`PApk>)f^h!=jM62GiB5?xZBUh-~Hc9$p{ibw974OvEgtQa$Am zy%`zHe2O`jnTj(Ft{^Hy#8h)CO+=Z;&nqJ4nQ|E_y3DyMO|n&FN@a+crc%jaYu-%7 zADD6(DyExed)h&=y9%r@mRRLnHz(o_r< zG2fKR5HTx+O4fgE%v3Bk^u z4L6YbC`=m-lA{bo#2g)?31Wje8iu}Bk|c`-x{H=)8}4{@T9#XlR%0#EA=*b_gL(tP zQWy>?(;?d0kH$@+0Q9BuK2jW*Ss@6n;cUQNJb)d;@51M1d|t+98l77;GiPVai$NJ= zp|mcxh=~x1=MF$Mzq%gx-V{Ap<&~Syl{$Vn`M{k6<0Xq;9`#E(U+q8NfBu))=D9Zjiec?kV{$A7a z*{@dg^`@oPtveBS?BDNsN03gpaCr<@Vg| zv0vKRCSOhcy6<`47Z>LLb=>myh38a@n@=v9FC7S+9sJ8T!?zY( zNN$+*hu`FVKkN0PzSl0TdcXaaYvju{k5&DtYWTY6M$FOpb0e{R5C3ta$5k@%UhVO| zZ~pels?Ial`bYb_tJhp?{@qmK+VAVXO!)Ifd9{qY?x`sYCWZFZ#0E}Q|6YnvQnIst z1u3N$>wUyUBm9lz6WZdRFHB0bcWwcF*Y6-V=w<)x8O9kAAVx@J3Fa5>k>Jj3fPMZz z!MxkiZnk#;7=vW2aX4rTDod$Pdj_Z<^E zqy`4CAl({x7}lzRSvXykN@wA8>);VJFcH}r`7#^BEt!bu_3$X(>s7Rf=*LuhEJTa= z+5sD2BVD`1C2t3%C>e-A*PlSNI#2|9cEJvKLLDd)2il46N`518pk44JFS~)2pQ?UQ z=yw!i(2wOU3jO-|m!q^q7yz4QYsW3*Qy4XFCxu9Kjl`DX76pS4r@3Jud-&E`u|;Ex z39n$R(9P2<;jll0=iqs|q$$rmhtDOBm87I?z-@Hq#HAa^)@DhsoQC z=Sns;w$Zb|)}SI`TsJ+>Y>P@RY8=+2ZVlgS;qkJHmVMKQPQ5i?frk z)eHL(J%$I?I7A2 z);7AUwUp+zw$hs|rF5*t7r5DajSRM*j)KXFKK8$)-?leeP&xXqWl4dI Date: Thu, 6 Aug 2020 10:29:25 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Admin/excel/up_stream.xls | Bin 23040 -> 22528 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Public/Admin/excel/up_stream.xls b/Public/Admin/excel/up_stream.xls index 277866bcef274768bb278b515e9c3a4d44a69301..e5513683d8c06fe0f2e56969739770c6e36a3003 100644 GIT binary patch delta 1896 zcmZ`(S#KLv6#iz$j>qv5+gXg8*d2%3aT5@UP$7yCIPegpW^vL`Q=rf`lqKmxAQVy( z5|$F66jePhR6^p3(n^3@87lD-RXiaf7V*Rjh?o8WDpg`j`0kyF6Gx4Yd}r=C-*?tK zckwG@@v?E*XU2B|SXo_N_3`QFzaY)#QbcJwJl>mB8vxp*KUUU9H6V~-Gu|dDHir-4_ zm~bTKG&RKIMW^VjIn2vcW+2s}>5UARsIhj)_n86d+nlYP(jywn|TXV-<%u>#OlHztM}E z<_0gc8a?ublT0gLDdrK2LlwH7htf-b){UVMM!dKw#+mlyVa2}HR97FY=kl13&WlZRP%5*F*kK`haYu(Em>`tr7>8(Zbb2 z38NciOp3cx3v(VK%=CSj$Lm-?9sWZ-_W{hR?~Ht9wYgiw8?-2^NqLw);q5HUk?&&7 zO`c5cNnIJrlSxl+;w`+bJjt)Sn|o9ay&w6?_Jhi9ZDL!R9q`zeVoPQ)ojZkhaEjt) z>mzE3HaCV(XZtSRlLLdPh4n)rM4akIfViW2ChpFMvWT%dYXJ&`?6Wk9`GjBc$+DW%h{oOjYs6Wq5NHYHAW4s z%-dC!mLS5yqZ`C#Uaiyyu}{*&nT5wRCq&K=nl&fNaxEUXm$bOe46&XWeZ17@Ld<4{ z?L0w0stPsiVI)1a8tp51Rg23GlRfL%!$hkib`q~C_5zoPrt>ml!cp!v(<7Sh+QYOf z`m9SQJ4*Jm;K#1nQL-oSoEA5Dl@@Z*QPL#SOUn8;!>^%>{J QzxI8WEuXJ^Gd|$|A73L#^8f$< delta 1864 zcmZWqUu;ul6#w1Z+wOMj%5C?j7S_`4FJllp6C+NDb1|7_)|ELyV89eaMJ5jBA7rD$ zKMaJS;k@j@2Yn$DgIUr^q9KGAeJ~Nn8xMx?f^Qmy7o*7hec!$7+S!wS-#zF2e&?L; zoZGLHv&Q6{F>9HTwE*rfEG$^u{rt8|ojDa;<5@cjUzj_LbJhX>=a=r@n2}Ly%4~YF z@V9loTIQqcC+0!<|bG!|6_S zr+}-eTd2hvO^9lOwws<^`VzhIcI~a9HySDRw#!$E-jZaFBli>aaxZa0_9rXzX_Tf2 zmDE&fUn4 zKGq^5=~yRV-~nJP?e^K5j!U6^JW^&4ll4501E1pHW4~OGYmIm0RBx!U9yqjJ3|V;tg|+7!oxI(G4Mm`?`6{B;-;_HyUg zl2gny9J$$+lp||v3s1LR2pJ27yAPRWe6j@y5%??jL)?2>fot6F6v7YRuJZrPIc_fe z)%{N}F-j|N1@&Bg#2zk@F>(6h`BNSu#F{L8jMF%S0RBZK^$I+%-azt|*QRzH@6)5a zCgmx{gs1s%ihLJqE{kO9NNl@~WHQo0e1H#CB>A$hu2a>pVaD2O_oz(1Wo(~jtNFQJ zvgP-_M9VbJVw&PsYZ3J(BfBU|SNjo8NamS%{u8+3BK<_Zf}n@=6S)ghIO&}$z;nII zXBDTOv3+&!t+^d0VjH zFtz3MYE5_jA^H{lm`f)+O!j8*p3v+t*;x!|ag&G1&Vqj}y0Kxhvy^AayuzESZUyPj zVbGI)D9K5(|MAQqDW`3RUp^E+14wX|K1cuS85|^^{I}6%w8?btQQ4KtNH~|1oBbI% e+n+1^kn1uE^F8y%xq)vi|Mxd$3f~U&`u_u$!BHXr From 54239b1f54301de87a5f84321b2f1f8c6b1bf443 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 6 Aug 2020 10:58:30 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index da39793d0..192d82a71 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1946,12 +1946,12 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ //收款方 $objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+2), $data['receive_company']['payee_name']); - $objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+3), $data['receive_company']['bank_account']); + $objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+3), $data['receive_company']['bank_account']."\t"); $objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+4), $data['receive_company']['opening_bank']); //付款方 $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+2), $data['pay_company']['payee_name']); - $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+3), $data['pay_company']['bank_account']); + $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+3), $data['pay_company']['bank_account']."\t"); $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+4), $data['pay_company']['opening_bank']); $statement_begin_time = date('Y.m.d', $data['statement_begin_time']);//对账开始时间 From 1ac4c280ad939c5e53cf30c72367ac876f0ef9c1 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 6 Aug 2020 11:18:17 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 192d82a71..5355c1002 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1884,14 +1884,14 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ //增加甲方信息 $objPHPExcel->getActiveSheet()->setCellValue('D2', $data['first_party_info']['partner']); $objPHPExcel->getActiveSheet()->setCellValue('D3', $data['first_party_info']['link_man']); - $objPHPExcel->getActiveSheet()->setCellValue('D4', $data['first_party_info']['link_phone']); + $objPHPExcel->getActiveSheet()->setCellValue('D4', $data['first_party_info']['link_phone']."\t"); $objPHPExcel->getActiveSheet()->setCellValue('D5', $data['first_party_info']['address']); $objPHPExcel->getActiveSheet()->setCellValue('D6', $data['first_party_info']['company_tax_no']); //增加乙方信息 $objPHPExcel->getActiveSheet()->setCellValue('J2', $data['second_party_info']['partner']); $objPHPExcel->getActiveSheet()->setCellValue('J3', $data['second_party_info']['link_man']); - $objPHPExcel->getActiveSheet()->setCellValue('J4', $data['second_party_info']['link_phone']); + $objPHPExcel->getActiveSheet()->setCellValue('J4', $data['second_party_info']['link_phone']."\t"); $objPHPExcel->getActiveSheet()->setCellValue('J5', $data['second_party_info']['address']); $objPHPExcel->getActiveSheet()->setCellValue('J6', $data['second_party_info']['company_tax_no']); @@ -2039,18 +2039,18 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al //甲方信息 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+3), $data['pay_company']['partner']);//甲方 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+4), $data['pay_company']['link_man']);//联系人 - $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+5), $data['pay_company']['link_phone']);//联系电话 + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+5), $data['pay_company']['link_phone']."\t");//联系电话 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+6), $data['receive_company']['invoice_content']);//开票项目 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $data['receive_company']['invoice_type']);//发票类型 //乙方信息 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+3), $data['receive_company']['partner']);//乙方 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+4), $data['receive_company']['link_man']);//联系人 - $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+5), $data['receive_company']['link_phone']);//联系电话 + $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+5), $data['receive_company']['link_phone']."\t");//联系电话 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+6), $data['receive_company']['address']);//邮寄地址 // $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $value['pay_amount']);//请汇入此账号 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['receive_company']['payee_name']);//户名 - $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['receive_company']['bank_account']);//银行账号 + $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['receive_company']['bank_account']."\t");//银行账号 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['receive_company']['opening_bank']);//开户行 $fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$statement_begin_time}-{$statement_end_time}"; From 8d1415258f3eaa1a9ea01d4c12d66eb915f7c556 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 6 Aug 2020 16:50:51 +0800 Subject: [PATCH 12/13] upt --- .../Home/View/default/Home/landingPage.html | 41 ++++++++++++++++-- Public/Home/images/next_bg.png | Bin 0 -> 2389 bytes 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 Public/Home/images/next_bg.png diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 01234b95f..32b5d780d 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -615,9 +615,10 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;">
- +
-
一、请先安装并打开testflight平台
+
一、请先安装并打开testflight平台
+
@@ -625,7 +626,7 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;">
-
二、安装步骤窗口点击按钮，下载游戏
+
二、安装步骤窗口点击按钮，下载游戏
@@ -639,6 +640,26 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;"> + + + @@ -731,6 +752,7 @@ function getCurUserId() { } $(function(){ + // 极速下载 $(".stabilization").click(function(){ event.stopPropagation(); if (isLogin()) { @@ -741,6 +763,7 @@ function getCurUserId() { } $(".window").hide(); }); + $(".login .register-heard>a").click(function(){ $(".login").hide(); $(".window").show(); @@ -911,10 +934,22 @@ function getCurUserId() { lazyLoading:true,//图片延迟加载 lazyLoadingInPrevNext:true,//前一个和后一个延迟加载 autoplayDisableOnInteraction : false, + preventClicksPropagation : false, pagination: { el: '.swiper-pagination', clickable: true, }, + // on : { + // click : function (e) { + // // var realIdx = this.realIndex + // // //var item = mySwiper.list[realIdx] + // // console.log(realIdx) + // // if (realIdx == 0) { + // // $(".mounting").hide(); + // // $(".installPop").show(); + // // } + // } + // }, autoplay: { delay: 2000, stopOnLastSlide: false, diff --git a/Public/Home/images/next_bg.png b/Public/Home/images/next_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..84628e808726f850b9b0877b7aacec7e6f3afb32 GIT binary patch literal 2389 zcmV-b399yqP)ZMo1mF!Ct`|ek4fR6q*#(;t_rcK$0oyHub$Q|N{!>++OVDZAiAMk~f}H0V!1~MI zkGy%R%40!ITqg)g05}Mtw4o%tA7sz}8TmRvP|JypF+h8b(efR|xqr(je3A_(2r2{M zTH+@H*LF<^t=>I_DZhBV1POPZ!1)*kkJlH4pW-RJjRiG{PC!A=!AA}7kYm|f8s_JI z?uV$UTQ%BBCJqCzJUE|$`i0HN?;4A76!1^@^qSbc1j_-i2am))2Php82_M)#hn<;- z>UObU;$a#rg}gZ2<=D<$M^llvUR%trOgJp8iQNydNWl1ho5@!QRhTovFV)RrG96HU z&4-~ZjJ_YhJOE>R9|bs)>S<6hEE3u2=V9G0Rvn)V!Htu30tQIiYv)6UiqawE}5?Zlq4%;$m4G^bp!YE7et0|TXIMX9z zLwwgj4|GfnZ%^xX5(_p*PdAP=&yiLF9Oc33BJfX#x_3k*^73FYuGfSmv2asz38dwa zCV+jK6Lgs1a_e~FPnojHHQQvh#uLjZ+zMbEycR&dPddxQ$S%J@yrA~@cVGwB5cs~J zJnsVmZAQvG*m+Kj=CHU|k?9yy@k6JeJ;GlC;8v5i(kxWpSQ0ki;o8dlq*4Mk_Btu68^lpD-RP9~f+5H1+t zcFmCUJu0l7x7cU;GK z1)Zf3Z=ojE4FoRS&^8Jtc(;h_2%PQ>m~K{SZu&6)owD;Y zW|XN_(a~1GDi?J%h12? zspIPoox30|0N^oav^JDPdP(wbuF-E_wI_#}sBF{GaY@DQtZftwxKYa18lbqCnNR(F<-bxanu z7{Y7--tyrK3D20IS??C3CnacFP4c^z>|cp+YlfV@AP8H)V}UL_S$8ljk&D|vvJHC>|rf!Xnwvwg@=&m|@V?_6ZfH#cc z@*TzDzogf;c*Ul~Sj*Opq*(^2k6^%USzcuzu(W=D*6V((Ccj3ZY{k!$;iC||ErVO3 z|JMM&=`yME#^PaLq{F+ivL%uXj<`s~FNyB#*RvczpM$8j0+Cg9*RkJtrQ3qsLM$0d z%%ZqN(hmW6o7W~mRe=<1>lQ`ak;b5_+b!8~6{#fvE*sFi{#(G)PPX%G>n8nAB?1-m;MH>Nca)%J z(kV|iKA0cok_Uo`+$KN039P(1G{To{SCv@k0nlWh-YBteszat z2MwHcsm{*l(`nlaHDF-oezHOAf$Vj#a$oe@EcX#a{)0AdSFmlrpW4QInE?d-)dKEl z%?ZD?Zw@o}Sm_B$K&WsmKDnzX)a)nQ^}r1v$enVok%Ow8*XQ(1K7Hw*1vRlF5Vts8 z9p!$tGZ6U%L9apD*qMkuvip`Z{Iws0T(O`gu>#Vypi|mVlDpH_O9pJ}CMXy$CwWE6 z!JUoQNA?W`hcl|9g&%+X(JOwM&cP1IuQ-w$%*&h9^}(xqc9%`@JvSZukt$%}q00000NkvXX Hu0mjfIBI;z literal 0 HcmV?d00001 From ba91c60d5de887fe303cd155041753c2c811b420 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 6 Aug 2020 17:06:56 +0800 Subject: [PATCH 13/13] upt --- Application/Home/View/default/Home/landingPage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 32b5d780d..0f074607d 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -642,7 +642,7 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;">