From 98249f462ae20dd2ae4a7f2d7771926c69a61a73 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 29 Nov 2019 17:52:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/UserController.class.php | 8 ++--- Application/Mobile/View/User/login.html | 32 ++++++++++++++++--- Application/Mobile/View/User/userset.html | 29 +---------------- .../Sdk/View/default/Spend/pay_success.html | 5 ++- 4 files changed, 35 insertions(+), 39 deletions(-) diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php index fe9d28fdd..334fef288 100644 --- a/Application/Mobile/Controller/UserController.class.php +++ b/Application/Mobile/Controller/UserController.class.php @@ -1007,10 +1007,10 @@ class UserController extends BaseController if (!$invidcard) { $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码填写不正确', 'url' => U('User/userauth'))); } - $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find(); - if ($cardd) { - $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth'))); - } + // $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find(); + // if ($cardd) { + // $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth'))); + // } } if (C('tool_age.status') == 0) { diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html index 26a9b2d4c..7ba63d50c 100644 --- a/Application/Mobile/View/User/login.html +++ b/Application/Mobile/View/User/login.html @@ -42,15 +42,39 @@
+ +
+
+
+ + + 首页 + +
+
+ + + 企业简介 +
+
+ + + 招商合作 + +
+
+ + + 我的 + +
+
+
From 5413551650cda6efe976b11ef1da03351b982ec4 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 29 Nov 2019 18:01:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/SpendController.class.php | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php index 0f6515951..3ab04ae10 100644 --- a/Application/Sdk/Controller/SpendController.class.php +++ b/Application/Sdk/Controller/SpendController.class.php @@ -81,32 +81,32 @@ class SpendController extends Controller { } public function pay_success() { - // $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; - // if (! empty ( $_GET ['jinzhue'] )) { - // sleep ( 3 ); - // $orderno = $_GET ['jinzhue']; - // } - // $pay_where = substr ( $orderno, 0, 2 ); - // $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); - // $map ['pay_order_number'] = $orderno; - // switch ($pay_where) { - // case 'SP' : - // $result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find (); - // break; - // case 'PF' : - // $result = M ( 'deposit', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); - // break; + $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; + if (! empty ( $_GET ['jinzhue'] )) { + sleep ( 3 ); + $orderno = $_GET ['jinzhue']; + } + $pay_where = substr ( $orderno, 0, 2 ); + $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); + $map ['pay_order_number'] = $orderno; + switch ($pay_where) { + case 'SP' : + $result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find (); + break; + case 'PF' : + $result = M ( 'deposit', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); + break; - // case 'TB' : - // $result = M ( 'balance', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); - // break; + case 'TB' : + $result = M ( 'balance', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); + break; - // case 'BR' : - // $result = M ( 'bind_recharge', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); - // break; - // } - // $this->assign ( 'Scheme', $Scheme ); - // $this->assign ( 'paystatus', $result ['pay_status'] ); + case 'BR' : + $result = M ( 'bind_recharge', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); + break; + } + $this->assign ( 'Scheme', $Scheme ); + $this->assign ( 'paystatus', $result ['pay_status'] ); $this->display (); } public function pay_success2() { From d838b6fc224a3fdd22e999ee120ad7d181d4a936 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 29 Nov 2019 18:18:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=AE=98=E7=BD=91-?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Mobile/css/remove.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Public/Mobile/css/remove.css b/Public/Mobile/css/remove.css index 08e5de8c5..127d48c3d 100644 --- a/Public/Mobile/css/remove.css +++ b/Public/Mobile/css/remove.css @@ -37,7 +37,7 @@ height:0.6rem; background:rgba(33,177,235,1); border-radius:0.3rem; - font-size:0.15rem; + font-size:0.28rem; font-family:PingFang SC; font-weight:400; color:rgba(255,255,255,1);