From 3163190d538ae90174379d8e4f44dde136869203 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Sun, 29 Sep 2019 11:51:05 +0800 Subject: [PATCH 01/65] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E9=A6=96=E9=A1=B5=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 48 +++++++++++++++++-- .../Home/View/default/Promote/index.html | 4 +- .../Home/View/default/Promote/msg_list.html | 12 ++++- .../View/default/Promote/quick_menu_list.html | 44 ++++++++--------- Public/Home/css/index/index.new.css | 8 +++- 5 files changed, 85 insertions(+), 31 deletions(-) diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index 434e276ca..d17f86828 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -268,20 +268,62 @@ class PromoteController extends BaseController // 消息列表 - public function msg_list($type=56){ + public function msg_list($type=56,$p=0){ + if (isset($_REQUEST['row'])) { + $row = $_REQUEST['row']; + } else { + $row = 10; + } + $page = $p ? $p : 1; //默认显示第一页数据 if($type==51){ - $data_list = M("document","sys_")->limit('0,50')->where("category_id=51 and status=1")->order("update_time desc")->select(); //游戏咨询 + $data_list = M("document","sys_")->where("category_id=51 and status=1")->order("update_time desc") ->page($page, $row)->select(); //游戏咨询 + $count = M("document","sys_")->where("category_id=51 and status=1")->count(); }elseif ($type==50){ $data_list = null; + $count = 0; }else{ - $data_list = M("document","sys_")->limit('0,50')->where("category_id=56 and status=1")->order("update_time desc")->select(); //游戏公告 + $data_list = M("document","sys_")->limit('0,50')->where("category_id=56 and status=1")->order("update_time desc")->page($page, $row)->select(); //游戏公告 + $count = M("document","sys_")->where("category_id=56 and status=1")->count(); + } + $parameter['p'] = I('get.p', 1); + $parameter['row'] = I('get.row'); + $page = set_pagination($count, $row, $parameter); + if ($page) { + $this->assign('_page', $page); } + $this->meta_title = "公告列表"; $this->assign("type", $type); $this->assign("data_list", $data_list); $this->display(); } + /* public function page_show($model,$map,$p=1) + { + if (isset($_REQUEST['row'])) { + $row = $_REQUEST['row']; + } else { + $row = 10; + } + $this->meta_title = "平台币充值"; + $page = $p ? $p : 1; //默认显示第一页数据 + $data = M($model, 'tab_') + ->where($map) + ->order('id DESC') + ->page($page, $row) + ->select(); + + $count = M($model, "tab_")->where($map)->count(); + $parameter = $map; + $parameter['p'] = I('get.p', 1); + $parameter['row'] = I('get.row'); + $page = set_pagination($count, $row, $parameter); + if ($page) { + $this->assign('_page', $page); + } + $this->assign("data_list", $data); + $this->display(); + }*/ /** * 我的基本信息 diff --git a/Application/Home/View/default/Promote/index.html b/Application/Home/View/default/Promote/index.html index 28e850a6d..d628ae620 100644 --- a/Application/Home/View/default/Promote/index.html +++ b/Application/Home/View/default/Promote/index.html @@ -1,6 +1,6 @@ - +
@@ -42,7 +42,7 @@
  • -
    公告 消息 游戏活动查看更多>
    +
    公告 消息 游戏活动查看更多>
    暂无公告 diff --git a/Application/Home/View/default/Promote/msg_list.html b/Application/Home/View/default/Promote/msg_list.html index 99636880f..33db7955f 100644 --- a/Application/Home/View/default/Promote/msg_list.html +++ b/Application/Home/View/default/Promote/msg_list.html @@ -1,6 +1,6 @@  - + @@ -10,7 +10,7 @@
    当前位置：后台首页>公告列表
    -
    +
    curr">公告 @@ -30,7 +30,15 @@
    +
    + {$_page} +
    + \ No newline at end of file diff --git a/Application/Home/View/default/Promote/quick_menu_list.html b/Application/Home/View/default/Promote/quick_menu_list.html index 097cf441b..dbf9f99c4 100644 --- a/Application/Home/View/default/Promote/quick_menu_list.html +++ b/Application/Home/View/default/Promote/quick_menu_list.html @@ -13,28 +13,28 @@
    • -
    - - - - - - - - - - - - - - - - - - - -
    图标模块名称是否添加操作

    暂无数据

    {$data.name}已添加未添加移除添加
    -
    +
    + + + + + + + + + + + + + + + + + + + +
    图标模块名称是否添加操作

    暂无数据

    {$data.name}已添加未添加移除添加
    +
    diff --git a/Public/Home/css/index/index.new.css b/Public/Home/css/index/index.new.css index c6dcaccd1..e87caec75 100644 --- a/Public/Home/css/index/index.new.css +++ b/Public/Home/css/index/index.new.css @@ -42,15 +42,19 @@ .more:hover{color:#26C7DB} .fxui-tab {font-size: 14px;} .fxui-tab-hand{height: 45px;line-height: 35px;margin: 10px;border-bottom: 1px solid #ddd} -.fxui-tab-tit {display: block;float: left;font-size: 14px;height: 28px;line-height: 28px;padding: 2px 20px ;cursor: pointer;border: 1px solid #ddd} +.fxui-tab-tit{display: block;float: left;font-size: 14px;height: 35px;line-height: 35px;cursor: pointer;border: 1px solid #ddd;} +.fxui-tab-tit a{display: block;height: 35px;line-height: 35px;padding: 0 20px ;} .fxui-tab-tit:first-child{border-bottom-left-radius:3px;border-top-left-radius: 3px} .fxui-tab-tit:last-child{border-bottom-right-radius:3px;border-top-right-radius: 3px} .fxui-tab-hand .curr {background: #26C7DB;color: #fff;border: 1px solid #26C7DB} .fxui-tab-nav {padding: 15px;height: 280px;margin-top: -10px} .fxui-tab-nav p{height: 50px;line-height: 50px;border-bottom: 1px solid #ddd} .fxui-tab-nav p span:first-child{width: 80%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display: inline-block} -.fxui-tab-nav p span:last-child{float: right;width: 15%;display: inline-block} +.fxui-tab-nav p span:last-child{float: right;width: 15%;display: inline-block;text-align: right} +#pagechange{ + margin-right: 20px; +} /*.article-type{vertical-align: middle;padding-right: 10px;} .article-title{width: 400px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;vertical-align: middle;color: #515974;font-size: 13px;} From abbed4b177b41ae6b5bc5738df4e709290276f1e Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 29 Sep 2019 11:31:51 +0800 Subject: [PATCH 02/65] sdk chinaChar --- Application/Admin/Model/UserModel.class.php | 2 +- Application/Sdk/Common/function.php | 33 ++++++++++++++++++++ Application/Sdk/SecretKey/Data/chinaChar.txt | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 Application/Sdk/SecretKey/Data/chinaChar.txt diff --git a/Application/Admin/Model/UserModel.class.php b/Application/Admin/Model/UserModel.class.php index bf6dd2fe9..e031fb6a5 100644 --- a/Application/Admin/Model/UserModel.class.php +++ b/Application/Admin/Model/UserModel.class.php @@ -374,7 +374,7 @@ class UserModel extends Model{ $data = array( 'account' => $account, 'password' => $password, - 'nickname' => $account, + 'nickname' => getChinaChar(rand(2,4)), 'phone' => $phone, 'head_img' =>'', 'promote_id' => $promote_id, diff --git a/Application/Sdk/Common/function.php b/Application/Sdk/Common/function.php index eca4d24e7..dcc79890e 100644 --- a/Application/Sdk/Common/function.php +++ b/Application/Sdk/Common/function.php @@ -218,3 +218,36 @@ function get_game_param($game_id,$field="",$type=''){ } return $find; } +/** + * 生成随机汉字字符串 + * @param $num 数量 + * @return [type] [description] + */ + +function getChinaChar($num) +{ + // $string = ''; + // for ($i=0; $i<$num; $i++) { + // // 使用chr()函数拼接双字节汉字，前一个chr()为高位字节，后一个为低位字节 + // $a = chr(mt_rand(0xB0,0xD0)).chr(mt_rand(0xA1, 0xF0)); + // // 转码 + // $string .= iconv('GB2312', 'UTF-8', $a); + // } + // return $string; + $char = file_get_contents(APP_PATH.'Sdk/SecretKey/Data/chinaChar.txt'); + $str = ''; + $length = strlen($char); + for($i = 0;$i < $num;$i++) + { + $rand = rand(0,$length); + for(;$rand >= 0;$rand--) + { + if($rand == 0 || $rand %3 ==0) + { + break; + } + } + $str = $str . substr($char,$rand,3); + } + return $str; +} diff --git a/Application/Sdk/SecretKey/Data/chinaChar.txt b/Application/Sdk/SecretKey/Data/chinaChar.txt new file mode 100644 index 000000000..cad57c0bf --- /dev/null +++ b/Application/Sdk/SecretKey/Data/chinaChar.txt @@ -0,0 +1 @@ +的一了是我不在人们有来他这上着个地到大里说去子得也和那要下看天时过出小么起你都把好还多没为又可家学只以主会样年想能生同老中从自面前头到它后然走很像见两用她国动进成回什边作对开而已些现山民候经发工向事命给长水几义三声于高正妈手知理眼志点心战二问但身方实吃做叫当住听革打呢真党全才四已所敌之最光产情路分总条白话东席次亲如被花口放儿常西气五第使写军吧文运在果怎定许快明行因别飞外树物活部门无往船望新带队先力完间却站代员机更九您每风级跟笑啊孩万少直意夜比阶连车重便斗马哪化太指变社似士者干石满决百原拿群究各六本思解立河爸村八难早论吗根共让相研今其书坐接应关信觉死步反处记将千找争领或师结块跑谁草越字加脚紧爱等习阵怕月青半火法题建赶位唱海七女任件感准张团屋爷离色脸片科倒睛利世病刚且由送切星晚表够整认响雪流未场该并底深刻平伟忙提确近亮轻讲农古黑告界拉名呀土清阳照办史改历转画造嘴此治北必服雨穿父内识验传业菜爬睡兴 \ No newline at end of file From 0089f2a3a3b9939c45dab195029ec2836d32e917 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 15:01:51 +0800 Subject: [PATCH 03/65] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/my_game.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 06457f978..cd6f688b3 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -237,7 +237,9 @@
    From b5a2749fc512d47852e27489591beb7a8b5d9f12 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 15:42:30 +0800 Subject: [PATCH 04/65] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/my_game.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index cd6f688b3..85385e3ff 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -237,12 +237,14 @@
    -
    +
    添加组长游戏 添加推广员游戏 From b1ac9c6667fc3654d1f78dba7c81c1d260f7c16d Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 15:45:28 +0800 Subject: [PATCH 05/65] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/my_game.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 85385e3ff..4e42bca3c 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -237,14 +237,12 @@
    -
    +
    添加组长游戏 添加推广员游戏 From 385d493bf719199a20d46fdbf53ac23a2a51ba54 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 15:49:24 +0800 Subject: [PATCH 06/65] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/my_game.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 4e42bca3c..805987d2d 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -237,9 +237,14 @@
    From d99bb87fc6613ebbcee3070dd64c428839966c0f Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 15:51:21 +0800 Subject: [PATCH 07/65] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/my_game.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 805987d2d..fc3e346b9 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -245,6 +245,8 @@ } } + echo $qrcode; + $qrcode = base64_encode(base64_encode(get_cover($vo['icon'],'path'))); ?>
    From 2a98642e111939850d3ea68bd6f664517345bf3e Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 15:53:20 +0800 Subject: [PATCH 08/65] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/my_game.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index fc3e346b9..e47ca12db 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -245,11 +245,10 @@ } } - echo $qrcode; - - $qrcode = base64_encode(base64_encode(get_cover($vo['icon'],'path'))); + $qrcodes = $qrcode; + $qrcode = base64_encode(base64_encode($qrcode)); ?> -
    +
    添加组长游戏 添加推广员游戏 From d90652797035966245a557aa3fd3566561c58821 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 16:58:04 +0800 Subject: [PATCH 09/65] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=88=86=E5=8C=85?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AutoPackController.class.php | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index 9da29ddaf..69c4a53c4 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -37,7 +37,6 @@ class AutoPackController extends Think public function package() { - $find_web_stie = M('config') -> field('value') -> where(['name' => 'WEB_SITE']) @@ -49,18 +48,10 @@ class AutoPackController extends Think } $this->checkPackageStatus(); - $this->app_package();//app渠道自动打包 - $this->channel(); - $this->launch_package(false); - $this->leak_detection(); - - - - } /** @@ -209,7 +200,7 @@ class AutoPackController extends Think $to = "./Uploads/" . $file_name . "/" . $new_name; copy($url, ROOTTT . ltrim($to, './')); $zip_res = $zip -> open(ROOTTT . ltrim($to, './'), \ZipArchive::CREATE); - + if($zip_res == true) { #打包数据 $pack_data = array( @@ -311,7 +302,6 @@ class AutoPackController extends Think * @throws \think\exception\DbException */ private function channel() { - $zip = new \ZipArchive(); $map['status'] = 1; @@ -346,13 +336,11 @@ class AutoPackController extends Think $launchCount = $launchModel->where(['apply_id'=>$value['id']])->count(); if($launchCount>0) { - $applyModel->where(['id' => $value['id']]) -> setField('enable_status', 3); $launchModel->where(['apply_id'=>$value['id'], 'launch_packge'=>['in',[0,2,3]]])->save(['launch_packge'=>2,'launch_down_url'=>'','launch_plist_url'=>'']); } else { - $applyModel -> where(['id' => $value['id']]) -> setField('enable_status', 3); if ($value['sdk_version'] == 1) { @@ -377,6 +365,7 @@ class AutoPackController extends Think } $new_name = "game_package" . $value['game_id'] . "-" . $value['promote_id'] . $str_ver; $to = "./Uploads/" . $file_name . "/" . $new_name; + $localPath = ROOTTT . ltrim($to, './'); copy(get_game_source_file_url($value['game_id']), ROOTTT . ltrim($to, './')); $zip_res = $zip -> open(ROOTTT . ltrim($to, './'), \ZipArchive::CREATE); if ($zip_res == true) { @@ -408,9 +397,14 @@ class AutoPackController extends Think $new_to = ROOTTT . "Uploads/" . $file_name . "/" . $newname; $updata['savename'] = $newname; $updata['path'] = $new_to; - $this -> upload_game_pak_oss($updata); + $result = $this -> upload_game_pak_oss($updata); @unlink($new_to); + if ($result) { + if (file_exists($localPath)) { + unlink($localPath); + } + } } elseif (get_tool_status("qiniu_storage") == 1) { $this -> dleteQiNiuFile($newname); From 57f1929bf9d8e039f0020bc0adb7410fb9ee5cab Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Mon, 30 Sep 2019 17:00:10 +0800 Subject: [PATCH 10/65] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9Dwap=20=E6=94=AF=E4=BB=98=E8=BF=94=E5=9B=9E=20bug?= =?UTF-8?q?=E3=80=82android=20=20ios=20=E9=83=BD=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/SpendController.class.php | 3 +++ .../Sdk/View/default/Spend/pay_error.html | 20 ++++++++++++++++--- .../Library/Think/Pay/Driver/Alipay.class.php | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php index 45e606255..3ab04ae10 100644 --- a/Application/Sdk/Controller/SpendController.class.php +++ b/Application/Sdk/Controller/SpendController.class.php @@ -146,6 +146,9 @@ class SpendController extends Controller { $this->display ( 'pay_success' ); } public function pay_error() { + $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); + + $this->assign ('Scheme', $Scheme?$Scheme:'txplatformsdk'); $this->display (); } public function notice($user_id = 0, $game_id = 0, $msg = '') { diff --git a/Application/Sdk/View/default/Spend/pay_error.html b/Application/Sdk/View/default/Spend/pay_error.html index e044ca8a7..380872648 100644 --- a/Application/Sdk/View/default/Spend/pay_error.html +++ b/Application/Sdk/View/default/Spend/pay_error.html @@ -41,6 +41,7 @@ border: 1px solid #999;
    +
    @@ -48,7 +49,7 @@ border: 1px solid #999;

    支付失败

    -返回 +返回
    @@ -62,8 +63,21 @@ border: 1px solid #999; diff --git a/ThinkPHP/Library/Think/Pay/Driver/Alipay.class.php b/ThinkPHP/Library/Think/Pay/Driver/Alipay.class.php index 26fa0e91e..76dff8521 100644 --- a/ThinkPHP/Library/Think/Pay/Driver/Alipay.class.php +++ b/ThinkPHP/Library/Think/Pay/Driver/Alipay.class.php @@ -66,7 +66,7 @@ class Alipay extends \Think\Pay\Pay $param['return_url'] = $returnUrl; else $param['return_url']='http://' . $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success"; - $param['show_url'] = 'http://' . $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_error"; + $param['show_url'] = 'http://' . $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_error/game_id/".$vo->getGameId(); break; case 'refund': $param['seller_email'] = $this->config['email']; From 1f1954e9f15f84c0720a79da1cf8b3d1aa8fa121 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 17:03:46 +0800 Subject: [PATCH 11/65] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=88=86=E5=8C=85?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/AutoPackController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index 69c4a53c4..c883bcd6a 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -366,7 +366,7 @@ class AutoPackController extends Think $new_name = "game_package" . $value['game_id'] . "-" . $value['promote_id'] . $str_ver; $to = "./Uploads/" . $file_name . "/" . $new_name; $localPath = ROOTTT . ltrim($to, './'); - copy(get_game_source_file_url($value['game_id']), ROOTTT . ltrim($to, './')); + copy(get_game_source_file_url($value['game_id']), $localPath); $zip_res = $zip -> open(ROOTTT . ltrim($to, './'), \ZipArchive::CREATE); if ($zip_res == true) { #打包数据 From fd8c59f1141584177550039635e41b25448ac018 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 17:13:53 +0800 Subject: [PATCH 12/65] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=88=86=E5=8C=85?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/AutoPackController.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index c883bcd6a..e23db14e8 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -398,11 +398,10 @@ class AutoPackController extends Think $updata['savename'] = $newname; $updata['path'] = $new_to; $result = $this -> upload_game_pak_oss($updata); - @unlink($new_to); if ($result) { - if (file_exists($localPath)) { - unlink($localPath); + if (file_exists($new_to)) { + @unlink($new_to); } } } elseif (get_tool_status("qiniu_storage") == 1) { From fc0053c6cd532b1e16a51dcb2b694d29f9cfab0f Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 17:28:18 +0800 Subject: [PATCH 13/65] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=88=86=E5=8C=85?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/AutoPackController.class.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index e23db14e8..39ed6e914 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -397,12 +397,10 @@ class AutoPackController extends Think $new_to = ROOTTT . "Uploads/" . $file_name . "/" . $newname; $updata['savename'] = $newname; $updata['path'] = $new_to; - $result = $this -> upload_game_pak_oss($updata); + $this -> upload_game_pak_oss($updata); - if ($result) { - if (file_exists($new_to)) { - @unlink($new_to); - } + if (file_exists($new_to)) { + @unlink($new_to); } } elseif (get_tool_status("qiniu_storage") == 1) { From 699820eab7e4f7ff193d88a2921f658e474ae915 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 30 Sep 2019 19:23:10 +0800 Subject: [PATCH 14/65] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=83=A8=E5=88=86=E9=93=BE=E6=8E=A5=E9=9A=90?= =?UTF-8?q?=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Promote/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Home/View/default/Promote/index.html b/Application/Home/View/default/Promote/index.html index d628ae620..bc94821dd 100644 --- a/Application/Home/View/default/Promote/index.html +++ b/Application/Home/View/default/Promote/index.html @@ -21,21 +21,21 @@
    • -
      快捷菜单自定义>
      +
      快捷菜单
      暂无数据 -
        +
      From 07ee1fc43eeac572c0ca15d2020899114ece711a Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 19:34:51 +0800 Subject: [PATCH 15/65] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Apply/my_game.html | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index e47ca12db..b042d28bd 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -235,6 +235,21 @@ 游戏类型:{$vo.game_type_name}  

    + + 添加推广员游戏     - 复制下载链接 + 复制下载链接 $vo['id'],'pid'=>$vo['promote_id']));?> - 落地页链接 + 落地页链接 下架
    @@ -971,6 +986,17 @@ $('.game-link').on('click', function () { var url = $(this).attr('data-url'); var qrcode = $(this).attr('data-qrcode'); + var enableStatus = $(this).attr('data-status'); + + if (enableStatus != '已打包') { + var iconIndex = 7; + if (enableStatus == '打包失败') { + iconIndex = 5; + } + + layer.msg(enableStatus, {icon: iconIndex}); + return false; + } // $.ajax({ // type: "post", From 8187faf89ff34a100e80794f3cbc7c7e10a20db0 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 19:44:31 +0800 Subject: [PATCH 16/65] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=88=86=E5=8C=85?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/ApplyController.class.php | 3 ++- Application/Home/View/default/Apply/my_game.html | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php index 8dd1a22ad..32bc8c359 100644 --- a/Application/Home/Controller/ApplyController.class.php +++ b/Application/Home/Controller/ApplyController.class.php @@ -519,7 +519,7 @@ class ApplyController extends BaseController $data = M("game", "tab_") /* 查询指定字段，不指定则查询所有字段 */ - ->field("tab_game.id,tab_game.game_size,tab_game.game_name,tab_game.features,tab_game.money,tab_game.sdk_version,tab_game.ratio,tab_game.icon,tab_game.game_type_name,tab_game.recommend_status,promote_id,status,tab_apply.dow_status,tab_apply.plist_url,tab_apply.id as applyid,enable_status,tab_game.sort,tab_game.relation_game_id,tab_game.relation_game_name,tab_game.material_url,dispose_time,tab_apply.promote_money as applymoney,tab_apply.promote_ratio as applyratio,apply_time,tab_apply.status as applystatus,tab_game.and_dow_address,tab_game.ios_dow_address,tab_game.add_game_address,tab_game.ios_game_address") + ->field("tab_game.id,tab_game.game_size,tab_game.game_name,tab_game.features,tab_game.money,tab_game.sdk_version,tab_game.ratio,tab_game.icon,tab_game.game_type_name,tab_game.recommend_status,promote_id,status,tab_apply.dow_status,tab_apply.plist_url,tab_apply.id as applyid,tab_apply.enable_status,tab_game.sort,tab_game.relation_game_id,tab_game.relation_game_name,tab_game.material_url,dispose_time,tab_apply.promote_money as applymoney,tab_apply.promote_ratio as applyratio,apply_time,tab_apply.status as applystatus,tab_game.and_dow_address,tab_game.ios_dow_address,tab_game.add_game_address,tab_game.ios_game_address") ->join("tab_apply ON tab_game.id = tab_apply.game_id and tab_apply.promote_id = " . $promoteId) // ->join("left join tab_game as tg ON (tab_game.id = tg.relation_game_id and tg.game_status = 1 and tab_game.id!=tab_game.relation_game_id) or (tab_game.id = tg.relation_game_id and tab_game.id!=tg.id and tg.game_status = 1) or (tab_game.id!=tab_game.relation_game_id and tab_game.relation_game_id=tg.id and tab_game.game_status=1)") // 查询条件 @@ -564,6 +564,7 @@ class ApplyController extends BaseController $this->assign('model', $model); $this->assign('promoteId', $promoteId); $this->assign('thisParentPromoteId', getParentPromoteId(PID)); + $this->assign('parentPromoteId', getParentPromoteId($promoteId)); $this->assign('pID', PID); $this->assign('promoteRole', $promoteRole); $this->assign('promoteData', getAllPromoteListByType($promoteRole)); diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index b042d28bd..235e9ceb5 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -265,7 +265,9 @@ ?>
    - 添加组长游戏 + + 添加组长游戏 + 添加推广员游戏 From 015602d646558e2a7575af8e22d8e0c470f2e44d Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 20:18:56 +0800 Subject: [PATCH 17/65] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=B9=B3=E5=8F=B0=E5=B8=81=E7=AE=A1=E7=90=86=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/default/Public/promote_base.html | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html index 36c149d7f..7fa21b98e 100644 --- a/Application/Home/View/default/Public/promote_base.html +++ b/Application/Home/View/default/Public/promote_base.html @@ -47,16 +47,17 @@ 推广员管理
    - + + + + + + + + + + + @@ -82,14 +83,16 @@ --> -
    平台币管理
    -
    - 我的平台币 - 平台币转移 - - 平台币充值 - -
    + +
    平台币管理
    +
    + 我的平台币 + 平台币转移 + + 平台币充值 + +
    +     From ec2c9161e9cb40b56a731d63d9c4397b1662bb08 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 30 Sep 2019 20:20:29 +0800 Subject: [PATCH 18/65] =?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/UserController.class.php | 2 +- Application/User/Model/UcenterMemberModel.class.php | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 59b64d639..79ced5041 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -272,7 +272,7 @@ class UserController extends AdminController { $list=D('AuthGroup')->where(array('status'=>1))->select(); $this->assign('lists',$list); $this->meta_title = '新增管理员'; - + $this->m_title = '管理员列表'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'User/index','status'=>1])->find()); diff --git a/Application/User/Model/UcenterMemberModel.class.php b/Application/User/Model/UcenterMemberModel.class.php index 69506c4ab..6f927f44b 100644 --- a/Application/User/Model/UcenterMemberModel.class.php +++ b/Application/User/Model/UcenterMemberModel.class.php @@ -113,11 +113,14 @@ class UcenterMemberModel extends Model{ //验证手机 if(empty($data['mobile'])) unset($data['mobile']); - /* 添加用户 */ - if($this->create($data)){ - $uid = $this->add(); - return $uid ? $uid : 0; //0-未知错误，大于0-注册成功 + if($data = $this->create($data)){ + $status = M('UcenterMember', 'sys_')->data($data)->add(); + $uid = 0; + if ($status) { + $uid = M()->getLastInsID(); + } + return $uid; //0-未知错误，大于0-注册成功 } else { return $this->getError(); //错误详情见自动验证注释 } From 558714d6200c98ab484602e6c97749333818df64 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 20:41:15 +0800 Subject: [PATCH 19/65] =?UTF-8?q?=E7=BB=84=E9=95=BF=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Promote/mygrand.html | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Application/Home/View/default/Promote/mygrand.html b/Application/Home/View/default/Promote/mygrand.html index 9d4b99d78..0a6417de4 100644 --- a/Application/Home/View/default/Promote/mygrand.html +++ b/Application/Home/View/default/Promote/mygrand.html @@ -87,18 +87,21 @@ 解冻 重置密码 - - - 换组 - - 取消换组 + + + + 换组 + + 取消换组 + - - - - 玩家迁移 - - 取消玩家迁移 + + + + 玩家迁移 + + 取消玩家迁移 + From c726705d333b4cd0f537b44d6db32e30de5677f3 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 20:45:58 +0800 Subject: [PATCH 20/65] =?UTF-8?q?=E7=BB=84=E9=95=BF=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Promote/mygrand.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Application/Home/View/default/Promote/mygrand.html b/Application/Home/View/default/Promote/mygrand.html index 0a6417de4..98c0f7d55 100644 --- a/Application/Home/View/default/Promote/mygrand.html +++ b/Application/Home/View/default/Promote/mygrand.html @@ -87,13 +87,11 @@ 解冻 重置密码 - - - - 换组 - - 取消换组 - + + + 换组 + + 取消换组 From 29e4b4e5012f54fb932dd2039168ae088748036f Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 30 Sep 2019 20:52:35 +0800 Subject: [PATCH 21/65] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/UserController.class.php | 9 ++++++++- Application/User/Model/UcenterMemberModel.class.php | 6 ++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 79ced5041..b9b8ff816 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -250,7 +250,14 @@ class UserController extends AdminController { if($password != $repassword){ $this->error('管理员密码和确认密码不一致！'); } - + $usernameUser = M('UcenterMember', 'sys_')->field('username')->where(['username' => $username])->find(); + if (!empty($usernameUser)) { + $this->error('用户名已存在！'); + } + $emailUser = M('UcenterMember', 'sys_')->field('username')->where(['username' => $username])->find(); + if (!empty($emailUser)) { + $this->error('邮箱已存在！'); + } /* 调用注册接口注册用户 */ $User = new UserApi; $uid = $User->register($username, $password, $email,$second_pwd); diff --git a/Application/User/Model/UcenterMemberModel.class.php b/Application/User/Model/UcenterMemberModel.class.php index 6f927f44b..0ff123746 100644 --- a/Application/User/Model/UcenterMemberModel.class.php +++ b/Application/User/Model/UcenterMemberModel.class.php @@ -102,7 +102,7 @@ class UcenterMemberModel extends Model{ * @param string $mobile 用户手机号码 * @return integer 注册成功-用户信息，注册失败-错误编号 */ - public function register($username, $password, $email,$second_pwd,$mobile){ + public function register($username, $password, $email, $second_pwd,$mobile){ $data = array( 'username' => $username, 'password' => $password, @@ -110,11 +110,13 @@ class UcenterMemberModel extends Model{ 'email' => $email, 'mobile' => $mobile, ); - + //验证手机 if(empty($data['mobile'])) unset($data['mobile']); /* 添加用户 */ if($data = $this->create($data)){ + $data['username'] = $username; + $data['email'] = $email; $status = M('UcenterMember', 'sys_')->data($data)->add(); $uid = 0; if ($status) { From 519da42edd8a423622b3d3e8e4982b3f24d8ba39 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 21:23:15 +0800 Subject: [PATCH 22/65] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Public/promote_base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html index 7fa21b98e..5fc9abf33 100644 --- a/Application/Home/View/default/Public/promote_base.html +++ b/Application/Home/View/default/Public/promote_base.html @@ -83,7 +83,7 @@ --> - +
    平台币管理
    我的平台币 From 827c7ee446807746918497eb588d3fcad9c10145 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 22:26:21 +0800 Subject: [PATCH 23/65] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Apply/my_game.html | 55 ++++++------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 235e9ceb5..f7739b1e4 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -235,20 +235,6 @@ 游戏类型:{$vo.game_type_name}  

    - 添加推广员游戏     - 复制下载链接 + 复制下载链接 $vo['id'],'pid'=>$vo['promote_id']));?> - 落地页链接 + 落地页链接 下架
    @@ -988,36 +974,27 @@ $('.game-link').on('click', function () { var url = $(this).attr('data-url'); var qrcode = $(this).attr('data-qrcode'); - var enableStatus = $(this).attr('data-status'); + var enableStatus = parseInt($(this).attr('data-status')); - if (enableStatus != '已打包') { + if (enableStatus != 1) { var iconIndex = 7; - if (enableStatus == '打包失败') { - iconIndex = 5; + var enableStatusName = ''; + + switch (enableStatus) { + case 2: + case 3: + enableStatusName = '打包中'; + break; + case -1: + iconIndex = 5; + enableStatusName = '打包失败'; + break; } - layer.msg(enableStatus, {icon: iconIndex}); + layer.alert(enableStatusName, {icon: iconIndex}); return false; } - // $.ajax({ - // type: "post", - // url: "__URL__/qrcodeNew", - // dataType: "json", - // data: {'url':url}, - // success: function (data) { - // console.log(data); - // }, - // error: function (result) { - // layer.msg('网络异常', {icon: 5}); - // } - // }); - - // $.get("__URL__/qrcodeNew/url/" + url,function(data,status){ - // console.log(data); - // qrcode = data; - // }); - // $('#download_copy').attr('data-url',url); $('#game_link_ercode').attr('src',qrcode); $('#game_link_address').text(url); From c2a19ceb45549e3736d1cc8fc4b216c0378b9836 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 22:32:26 +0800 Subject: [PATCH 24/65] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/Home/promitionofregestion.html | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/Home/promitionofregestion.html b/Application/Home/View/default/Home/promitionofregestion.html index 406287833..9a3818a06 100644 --- a/Application/Home/View/default/Home/promitionofregestion.html +++ b/Application/Home/View/default/Home/promitionofregestion.html @@ -2,7 +2,19 @@ - + + + + @@ -57,7 +69,7 @@ - + @@ -152,7 +164,8 @@ }) var title = $('[name=title]').val(); var description = $('[name=desc]').val(); - var icon = window.location.protocol + "//" + window.location.host + $('[name=icon]').val(); + // var icon = window.location.protocol + "//" + window.location.host + $('[name=icon]').val(); + var icon = $('[name=icon]').val(); wxReady(title, description, icon) } } From 7bc6cac01a6958df57bf736d244953c910ed426a Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 22:42:16 +0800 Subject: [PATCH 25/65] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/my_game.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index f7739b1e4..ce8a3b1f1 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -981,6 +981,9 @@ var enableStatusName = ''; switch (enableStatus) { + case 0: + enableStatusName = '未打包'; + break; case 2: case 3: enableStatusName = '打包中'; From d29984aaeb02e053cac15fc4d1e3cfd53b879ff9 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 30 Sep 2019 22:51:56 +0800 Subject: [PATCH 26/65] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/HomeController.class.php | 52 ++++++++++++------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 8e4344851..8b3c61d2a 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -55,26 +55,42 @@ class HomeController extends Controller $secret = 'd3219c70a45c5e1954be4608b288d38b'; $tokenUrl = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=' . $appid . '&secret=' . $secret; - $result = file_get_contents($tokenUrl); - $result = json_decode($result, true); - if (!$result || isset($result['errcode'])) { - $this->ajaxReturn([ - 'status' => false, - 'msg' => '获取失败', - ]); + $content = file_get_contents(RUNTIME_PATH . 'Data/wechat_ticket'); + $ticketData = null; + if ($content) { + $ticketData = json_decode($content, true); } - $accessToken = $result['access_token']; - - $ticketUrl = 'https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=' . $accessToken . '&type=jsapi'; - $result = file_get_contents($ticketUrl); - $result = json_decode($result, true); - if (!$result || $result['errcode'] != 0) { - $this->ajaxReturn([ - 'status' => false, - 'msg' => '获取失败', - ]); + + $isExpired = false; + if ($ticketData) { + $isExpired = time() > $ticketData['expired_at'] ? true : false; + } + + $ticket = ''; + if (!$ticketData || $isExpired) { + $ticket = $ticketData['ticket']; + $result = file_get_contents($tokenUrl); + $result = json_decode($result, true); + if (!$result || isset($result['errcode'])) { + $this->ajaxReturn([ + 'status' => false, + 'msg' => '获取失败', + ]); + } + $accessToken = $result['access_token']; + + $ticketUrl = 'https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=' . $accessToken . '&type=jsapi'; + $result = file_get_contents($ticketUrl); + $result = json_decode($result, true); + if (!$result || $result['errcode'] != 0) { + $this->ajaxReturn([ + 'status' => false, + 'msg' => '获取失败', + ]); + } + $ticket = $result['ticket']; + file_put_contents(RUNTIME_PATH . 'Data/wechat_ticket', json_encode(['ticket' => $ticket, 'expired_at' => time() + 3600])); } - $ticket = $result['ticket']; $randStr = 'aaabbbxeclsx'; $time = time(); From 0e192a2f7524d49d4e21a7c581d14404e44fb99e Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 30 Sep 2019 22:54:26 +0800 Subject: [PATCH 27/65] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/ApplyController.class.php | 14 ++++ .../Home/View/default/Apply/my_game.html | 84 +++++++++++-------- 2 files changed, 65 insertions(+), 33 deletions(-) diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php index 32bc8c359..156950d71 100644 --- a/Application/Home/Controller/ApplyController.class.php +++ b/Application/Home/Controller/ApplyController.class.php @@ -1557,4 +1557,18 @@ class ApplyController extends BaseController $this->ajaxReturn(array("status" => 0, "msg" => "添加成功")); } + + public function getEnableStatus() + { + $applyId = I('post.apply_id'); + + if (empty($applyId)) { + $this->ajaxReturn(['status' => 0, 'msg' => '数据异常']); + } + + $map['id'] = $applyId; + $enableStatus = M('Apply', 'tab_')->where($map)->getField('enable_status'); + + $this->ajaxReturn(['status' => 1, 'data' => $enableStatus]); + } } diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index ce8a3b1f1..5d9c45901 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -257,9 +257,9 @@ 添加推广员游戏 - 复制下载链接 + 复制下载链接 $vo['id'],'pid'=>$vo['promote_id']));?> - 落地页链接 + 落地页链接 下架
    @@ -974,40 +974,58 @@ $('.game-link').on('click', function () { var url = $(this).attr('data-url'); var qrcode = $(this).attr('data-qrcode'); - var enableStatus = parseInt($(this).attr('data-status')); - - if (enableStatus != 1) { - var iconIndex = 7; - var enableStatusName = ''; - - switch (enableStatus) { - case 0: - enableStatusName = '未打包'; - break; - case 2: - case 3: - enableStatusName = '打包中'; - break; - case -1: - iconIndex = 5; - enableStatusName = '打包失败'; - break; - } + var applyId = parseInt($(this).attr('data-apply-id')); - layer.alert(enableStatusName, {icon: iconIndex}); - return false; - } + $.ajax({ + type: "post", + url: "__URL__/getEnableStatus", + dataType: "json", + data: {'apply_id': applyId}, + success: function (data) { + console.log(data); + if (data.status == 0) { + layer.msg(data.msg, {icon: 5}); + return false; + } - // $('#download_copy').attr('data-url',url); - $('#game_link_ercode').attr('src',qrcode); - $('#game_link_address').text(url); - $('#game_link_address_copy').text(url); - $('#game_link').show(); - $('.game-window-bg').show(); + var enableStatus = parseInt(data.data); + if (enableStatus == 1) { + // $('#download_copy').attr('data-url',url); + $('#game_link_ercode').attr('src',qrcode); + $('#game_link_address').text(url); + $('#game_link_address_copy').text(url); + $('#game_link').show(); + $('.game-window-bg').show(); + + var e = document.getElementById("game_link_address_copy"); + e.select(); // 选择对象 + document.execCommand("Copy"); // 执行浏览器复制命令 + } else { + var iconIndex = 7; + var enableStatusName = ''; + + switch (enableStatus) { + case 0: + enableStatusName = '未打包'; + break; + case 2: + case 3: + enableStatusName = '打包中'; + break; + case -1: + iconIndex = 5; + enableStatusName = '打包失败'; + break; + } - var e = document.getElementById("game_link_address_copy"); - e.select(); // 选择对象 - document.execCommand("Copy"); // 执行浏览器复制命令 + layer.alert(enableStatusName, {icon: iconIndex}); + return false; + } + }, + error: function (result) { + layer.msg('网络异常', {icon: 5}); + } + }); }); // $("#download_copy").zclip({ From a002276bafd5f7c28a36085a3c3ff2bd3a3ec4c4 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Mon, 30 Sep 2019 23:30:13 +0800 Subject: [PATCH 28/65] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=8E=A8=E5=B9=BFID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 6 +++ .../Home/View/default/Promote/base_info.html | 9 +++++ .../Mobile/Controller/SsgController.class.php | 40 +++++++++++++++++++ Application/Mobile/View/Ssg/login.html | 10 ++++- .../Sdk/Controller/Ipa365Controller.class.php | 7 +++- 5 files changed, 70 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index 023febd51..4e0a89f40 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -541,6 +541,12 @@ class PromoteController extends BaseController $this->assign("data", $data); $this->wxQrcode($data); + $user = D('Promote')->isLogin(); + if (empty($user)) { + $this->redirect("Home/Index/index"); + } + $promoteUrl = "https://m.wmtxkj.com/mobile.php?s=Ssg/login/promote_id/".$user['pid']; + $this->assign("promote_url", $promoteUrl); $this->display(); } diff --git a/Application/Home/View/default/Promote/base_info.html b/Application/Home/View/default/Promote/base_info.html index 7edb422c7..197e7e551 100644 --- a/Application/Home/View/default/Promote/base_info.html +++ b/Application/Home/View/default/Promote/base_info.html @@ -82,6 +82,15 @@ + + + *超级签链接： + + {$promote_url} + + + + diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index 07c49507c..354e53961 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -21,9 +21,19 @@ class SsgController extends BaseController { public function login(){ $user = session("user_auth"); + $promoteId = I("promote_id"); + if (!$promoteId) { + $this->error("参数非法"); + } + $exists = M("promote", "tab_")->where(array('id' => $promoteId))->find(); + if (!$exists) { + $this->error("参数非法."); + } + /*if ($user) { redirect(U("ssg/index")); }*/ + $this->assign("promote_id", $promoteId); $this->display(); } @@ -36,6 +46,15 @@ class SsgController extends BaseController { { $account = I("Account"); $password = I("Password"); + $promoteId = I("promote_id"); + if (!$promoteId) { + $this->ajaxReturn(array("ErrorCode" => -97, "ResultMsg" => "参数非法")); + } + $promote = M("promote", "tab_")->where(array('id' => $promoteId))->find(); + if (!$promote) { + $this->ajaxReturn(array("ErrorCode" => -97, "ResultMsg" => "参数非法.")); + } + //var_dump($password); $verify = new \Think\Verify(); if (!$verify->check(I("VerifyCode"))) { @@ -62,6 +81,18 @@ class SsgController extends BaseController { } if($user_id>0){ $_SESSION['user_id'] = $user_id; + + $user = M('user', 'tab_')->where(array( + 'id' => $user_id + ))->find(); + if (!$user['promote_id']) { + M('user', 'tab_')->where(array( + 'id' => $user_id + ))->save(array( + 'promote_id' => $promoteId, + 'promote_account' => $promote['account'] + )); + } } $this->ajaxReturn(array("ErrorCode"=>$res_code,"ResultMsg"=>$res_msg),'JSON'); } @@ -95,6 +126,15 @@ class SsgController extends BaseController { $map['a.user_id']= $user['user_id']; $map['a.sdk_version'] = 2; $game_list = M("user_play a","tab_")->field("b.*,b.id as game_id,od.pay_status")->join("inner join tab_game b on a.game_id=b.id left join tab_game_supersign od on od.user_id=a.user_id and od.game_id=b.id and od.pay_status=1")->where($map)->select(); + if (!$game_list) { + $game_list = M("game", "tab_")->field("*, id as game_id")->where(array( + "sdk_version" => 2, + "game_status" => 1, + ))->select(); + foreach ($game_list as &$v) { + $v['pay_status'] = 0; + } + } $this->assign("data_list",$game_list); $this->display(); } diff --git a/Application/Mobile/View/Ssg/login.html b/Application/Mobile/View/Ssg/login.html index 710adda9e..31367ac15 100644 --- a/Application/Mobile/View/Ssg/login.html +++ b/Application/Mobile/View/Ssg/login.html @@ -15,6 +15,7 @@ @@ -53,6 +55,7 @@ var loginName = $("#userAccount").val(); var loginPass = $("#password").val(); var userCode = $("#userCode").val(); + var promoteId = $("#promote_id").val(); if (loginName == "") { alert("账号不能为空"); return false; @@ -65,6 +68,10 @@ alert("验证码不能为空"); return false; } + if (promoteId == "") { + alert("推广员ID不能为空"); + return false; + } jQuery.ajax({ type: 'POST', @@ -72,7 +79,8 @@ data: { 'Account':loginName, 'Password':(loginPass), - 'VerifyCode':userCode + 'VerifyCode':userCode, + 'promote_id' :promoteId, }, dataType: 'JSON', xhrFields:{ diff --git a/Application/Sdk/Controller/Ipa365Controller.class.php b/Application/Sdk/Controller/Ipa365Controller.class.php index b32278965..782f2ad17 100644 --- a/Application/Sdk/Controller/Ipa365Controller.class.php +++ b/Application/Sdk/Controller/Ipa365Controller.class.php @@ -6,9 +6,10 @@ use Mobile\Controller\SsgController; // a8eeac3335cef5ee117d357738598f691932513b class Ipa365Controller extends BaseController{ - const signprice = 0.01; // 超级签价格 + const signprice = 10; // 超级签价格 public function test(){ + die(); $ipa365 = new Ipa365Controller(); $result = $ipa365->pay_notify(array( 'trade_id' => "2222", @@ -62,12 +63,16 @@ class Ipa365Controller extends BaseController{ } public function pay_notify_test() { + die(); $this->pay_notify(array( 'order_id' => 'SS_20190924102317T2jO', 'game_id' => 1, )); } + /** + * 订单检查 + */ public function pay_order_check() { $orderId = I('order_id'); From 1931bd61977fc134c670e6b35974e95821e2b9dd Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 30 Sep 2019 23:49:46 +0800 Subject: [PATCH 29/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/HomeController.class.php | 57 +++++++++++++++++++ Application/User/Api/MemberApi.class.php | 7 ++- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 8b3c61d2a..b41ee879c 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -18,6 +18,7 @@ namespace Home\Controller; use Think\Controller; +use User\Api\MemberApi; /** * 前台公共控制器 @@ -192,4 +193,60 @@ class HomeController extends Controller $this->assign('data', $data); $this->display(); } + + public function register() + { + $userApi = new MemberApi(); + $id = $userApi->wap_register($_POST); + if ($id > 0) { + $this->add_user_play($_POST); + $this->ajaxReturn([ + 'status' => true, + 'msg' => '注册成功' + ]); + } else { + $this->ajaxReturn([ + 'status' => false, + 'msg' => '数据有误' + ]); + } + } + + /** + *添加玩家信息 + */ + private function add_user_play($user = array()) + { + + $user_play = M("UserPlay", "tab_"); + $map["game_id"] = $user["game_id"]; + $map["user_id"] = $user["user_id"]; + $map['sdk_version'] = $user['sdk_version']; + $res = $user_play -> where($map) -> find(); + if (empty($res)) { + $user_entity = get_user_entity($user["user_id"]); + $data["user_id"] = $user["user_id"]; + $data["user_account"] = $user_entity["account"]; + $data["user_nickname"] = $user_entity["nickname"]; + $data["game_id"] = $user["game_id"]; + $data["game_appid"] = $user["game_appid"]; + $data["game_name"] = get_game_name($user["game_id"]); + $data["server_id"] = 0; + $data["server_name"] = ""; + $data["role_id"] = 0; + $data['parent_id'] = $user_entity["parent_id"]; + $data['parent_name'] = $user_entity["parent_name"]; + $data["role_name"] = ""; + $data["role_level"] = 0; + $data["bind_balance"] = 0; + $data["promote_id"] = $user_entity["promote_id"]; + $data["promote_account"] = $user_entity["promote_account"]; + $data['play_time'] = time(); + $data['play_ip'] = get_client_ip(); + $data["sdk_version"] = $user["sdk_version"]; + $data['ppuid'] = $user['puid'] == '' ? 0 : $user['puid']; + $data['check_time'] = time(); + $user_play -> add($data); + } + } } diff --git a/Application/User/Api/MemberApi.class.php b/Application/User/Api/MemberApi.class.php index 011f8ed8e..6df0a929c 100644 --- a/Application/User/Api/MemberApi.class.php +++ b/Application/User/Api/MemberApi.class.php @@ -29,9 +29,14 @@ class MemberApi extends Api{ return $this->model->register($data); } - public function sdk_register($data){ + public function sdk_register($data){ return $this->model->sdk_register($data); } + + public function wap_register($data){ + return $this->model->wap_register($data); + } + /** * 注册一个新用户user表加game_id * @param string $account 用户名 From 9fdbdc539efed9bf45a39db4f8a587a1ab835d7f Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 1 Oct 2019 00:02:44 +0800 Subject: [PATCH 30/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9oa=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/FengHuoApiController.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Sdk/Controller/FengHuoApiController.class.php b/Application/Sdk/Controller/FengHuoApiController.class.php index 4fd168f79..264aa5440 100644 --- a/Application/Sdk/Controller/FengHuoApiController.class.php +++ b/Application/Sdk/Controller/FengHuoApiController.class.php @@ -74,7 +74,7 @@ class FengHuoApiController extends Controller{ $pageSize = intval($pageSize); $row = $pageSize ? $pageSize : 1000; // 默认排序：id降序 - $order = 'id desc'; + $order = 'register_time asc'; $data = M('user','tab_') ->field('id,account,promote_account,register_ip,register_time,device_type,device_number') ->where($where) @@ -131,7 +131,7 @@ class FengHuoApiController extends Controller{ $pageSize = intval($pageSize); $row = $pageSize ? $pageSize : 1000; // 默认排序：id降序 - $order = 'id desc'; + $order = 'pay_time asc'; $where['pay_status'] = array('neq',0); $data = M('spend','tab_') @@ -181,7 +181,7 @@ class FengHuoApiController extends Controller{ $pageSize = intval($pageSize); $row = $pageSize ? $pageSize : 1000; // 默认排序：id降序 - $order = 'id desc'; + $order = 'play_time asc'; $data = M('user_play_info','tab_') ->field('promote_account,user_id,game_name,server_name,role_name,role_level,play_time,role_id,user_account') ->where($where) @@ -230,7 +230,7 @@ class FengHuoApiController extends Controller{ $pageSize = intval($pageSize); $row = $pageSize ? $pageSize : 1000; // 默认排序：id降序 - $order = 'id desc'; + $order = 'login_time asc'; $where['login_time'] = array('neq',0); @@ -295,7 +295,7 @@ class FengHuoApiController extends Controller{ $pageSize = intval($pageSize); $row = $pageSize ? $pageSize : 1000; // 默认排序：id降序 - $order = 'm.id desc'; + $order = 'm.create_time asc'; $data = M('mend as m', 'tab_') ->join('tab_user as u on m.user_id = u.id','LEFT') ->field('m.user_id,m.create_time,m.promote_account,m.promote_account_to,m.bind_type,m.user_account,u.register_time') From 38b57d8ad65437e574bf1036c9c49dc1b7479da8 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Tue, 1 Oct 2019 00:06:08 +0800 Subject: [PATCH 31/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=AD=BE=E6=94=AF=E4=BB=98url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/View/default/Ipa365/pay.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Sdk/View/default/Ipa365/pay.html b/Application/Sdk/View/default/Ipa365/pay.html index 1bb04584d..6b8f9916e 100644 --- a/Application/Sdk/View/default/Ipa365/pay.html +++ b/Application/Sdk/View/default/Ipa365/pay.html @@ -69,7 +69,7 @@ {$price}元
    支付宝 From 77c1f1c6d9e8a6fee6c473b4e8280bbd7e8f0c78 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Tue, 1 Oct 2019 00:12:32 +0800 Subject: [PATCH 32/65] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/Ipa365Controller.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Sdk/Controller/Ipa365Controller.class.php b/Application/Sdk/Controller/Ipa365Controller.class.php index 782f2ad17..018a4e144 100644 --- a/Application/Sdk/Controller/Ipa365Controller.class.php +++ b/Application/Sdk/Controller/Ipa365Controller.class.php @@ -150,8 +150,8 @@ class Ipa365Controller extends BaseController{ $param['payway'] = 1; $param['title'] = $price; $param['body'] = $price; - $param['callback'] = "https://api.wmtxkj.com/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; - $param['notifyurl'] = "https://api.wmtxkj.com/callback.php/Notify/notify/apitype/alipay"; + $param['callback'] = "https://m.wmtxkj.com/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; + $param['notifyurl'] = "https://m.wmtxkj.com/callback.php/Notify/notify/apitype/alipay"; $ret = $this->alipay($param); From ce734492caf62a1d4903488b3461b1820db36b00 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 1 Oct 2019 00:14:28 +0800 Subject: [PATCH 33/65] =?UTF-8?q?https/http=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Common/Common/function.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php index 1c86b10b5..4d3b136fa 100644 --- a/Application/Common/Common/function.php +++ b/Application/Common/Common/function.php @@ -1011,25 +1011,25 @@ function get_cover($cover_id, $field = null, $root = 1, $flag = true) if (!empty($picture['oss_url'])) { return $picture['oss_url']; } else { - return 'http://' . $_SERVER['HTTP_HOST'] . __ROOT__ . $picture['path']; + return '//' . $_SERVER['HTTP_HOST'] . __ROOT__ . $picture['path']; } } elseif (get_tool_status("qiniu_storage") == 1) { if (!empty($picture['url'])) { return $picture['url']; } else { - return 'http://' . $_SERVER['HTTP_HOST'] . __ROOT__ . $picture['path']; + return '//' . $_SERVER['HTTP_HOST'] . __ROOT__ . $picture['path']; } } elseif (get_tool_status("cos_storage") == 1) { if (!empty($picture['url'])) { return $picture['url']; } else { - return 'http://' . $_SERVER['HTTP_HOST'] . __ROOT__ . $picture['path']; + return '//' . $_SERVER['HTTP_HOST'] . __ROOT__ . $picture['path']; } } elseif (get_tool_status("bos_storage") == 1) { if (!empty($picture['bos_url'])) { return $picture['bos_url']; } else { - return 'http://' . $_SERVER['HTTP_HOST'] . __ROOT__ . $picture['path']; + return '//' . $_SERVER['HTTP_HOST'] . __ROOT__ . $picture['path']; } } else { if ($field == 'path') { From 32b325eb36714a194a3ace10c40d84aa60240fab Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Tue, 1 Oct 2019 00:31:41 +0800 Subject: [PATCH 34/65] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E4=B8=8D=E5=81=9A?= =?UTF-8?q?=E7=99=BB=E5=85=A5=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/Ipa365Controller.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Application/Sdk/Controller/Ipa365Controller.class.php b/Application/Sdk/Controller/Ipa365Controller.class.php index 018a4e144..44c23e724 100644 --- a/Application/Sdk/Controller/Ipa365Controller.class.php +++ b/Application/Sdk/Controller/Ipa365Controller.class.php @@ -214,8 +214,13 @@ class Ipa365Controller extends BaseController{ public function install_show() { $orderId = I('order_id', 0); $gameId = I('game_id', 0); + $userId = I('user_id', 0); - $userId = $_SESSION['user_id']; + $user = M('user', 'tab_')->where(array( + 'id' => $userId + ))->find(); + +// $userId = $_SESSION['user_id']; if (!$userId ) { $this->error("请登入", "/mobile.php/ssg/login"); } From 7ba207b7ddc3752c3c000fcea642f049418129da Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Tue, 1 Oct 2019 00:42:53 +0800 Subject: [PATCH 35/65] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=99=BB=E5=85=A5=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/Ssg/order.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Mobile/View/Ssg/order.html b/Application/Mobile/View/Ssg/order.html index 1e752618c..5ba994a79 100644 --- a/Application/Mobile/View/Ssg/order.html +++ b/Application/Mobile/View/Ssg/order.html @@ -26,7 +26,7 @@
      -
    • +

    • 订单编号：{$data.order_id}

      @@ -54,10 +54,10 @@
    From e2af2869bf66943dc0bef5569ed9eb5328f6e634 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Tue, 1 Oct 2019 00:46:49 +0800 Subject: [PATCH 36/65] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=99=BB=E5=85=A5=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/Ssg/order.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Mobile/View/Ssg/order.html b/Application/Mobile/View/Ssg/order.html index 5ba994a79..a9fa77510 100644 --- a/Application/Mobile/View/Ssg/order.html +++ b/Application/Mobile/View/Ssg/order.html @@ -26,7 +26,7 @@