diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php index 6ebe18b4b..b442ad320 100644 --- a/Application/Admin/Controller/AutoController.class.php +++ b/Application/Admin/Controller/AutoController.class.php @@ -890,5 +890,31 @@ public function auto_rrdae(){ } } + //根据时间统计玩家充值 + public function userPlayDataCount() + { + $time = strtotime(date('Y-m-d 00:00:00', time() - (3600 * 24))); + $spendMap['pay_status'] = 1; + $spendMap['pay_game_status'] = 1; + $spendMap['game_player_id'] = ['gt', 0]; + $spendMap['pay_time'] = ['between', [$time, strtotime(date('Y-m-d 23:59:59', $time))]]; + + $field = 'FROM_UNIXTIME(pay_time, "%Y-%m-%d") as day,game_id,server_id,game_player_id,sum(pay_amount) as recharge_cost,count(id) as recharge_count'; + $spendCostData = M('spend', 'tab_')->field($field) + ->where($spendMap) + ->group('day,game_player_id,server_id,game_id') + ->select(); + $data = []; + foreach ($spendCostData as $list) { + $save['game_id'] = $list['game_id']; + $save['server_id'] = $list['server_id']; + $save['role_id'] = $list['game_player_id']; + $save['recharge_cost'] = $list['recharge_cost']; + $save['recharge_count'] = $list['recharge_count']; + $save['create_time'] = strtotime($list['day']); + $data[] = $save; + } + M('user_play_data_count', 'tab_')->addAll($data); + } } diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 965da8b24..393455386 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -387,6 +387,23 @@ class PlatformController extends ThinkController ->group('tp1.id') ->order('count desc, register_time') ->select(); + + //官方渠道数据添加 + $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(id) as count, + count(IF(register_time ' . $today . ',1,null)) as today, + count(IF(register_time ' . $week . ',1,null)) as week, + count(IF(register_time ' . $mounth . ',1,null)) as mounth') + ->where(['promote_id'=>0]) + ->find(); + $authorityData['promote_account'] = "官方渠道"; + $authorityData['id'] = "1"; +// $authorityData = []; + + array_push($data, $authorityData); + //数据排序 + $last_names = array_column($data,'count'); + array_multisort($last_names,SORT_DESC,$data); + $count = count($data); foreach ($data as $key => $value) { static $i = 0; diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php index 6f38130b5..8ed98c5b7 100644 --- a/Application/Common/Common/extend.php +++ b/Application/Common/Common/extend.php @@ -1053,7 +1053,7 @@ function is_check_account($account){ $map[$field]=$game_id; $data=M('game','tab_')->where($map)->find(); if(empty($data)){return '';} - return $data['dratio']; + return $data['ratio']; } /** diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 1a464a126..47d5583fe 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -419,6 +419,7 @@ class DownloadController extends BaseController { $ids = implode(',', $ids); $map = []; $map['promote_id'] = ['in', $ids]; + $map['pay_status'] = 1; if (!empty($payOrderNumber)) { $map['pay_order_number'] = $payOrderNumber; } @@ -2123,6 +2124,11 @@ class DownloadController extends BaseController { foreach ($data as $key => $value) { $value['create_time'] = date("Y-m-d H:i:s", $value['create_time']); $value['user_account'] = $this->encryption($value['user_account']); + if($value['check_status'] == 1) { + $value['check_status'] = "正常"; + }else { + $value['check_status'] = "拉黑"; + } //获取累计发放 $where = array( "user_id"=>$value['user_id'], @@ -2205,9 +2211,9 @@ class DownloadController extends BaseController { $data[$key]['create_time'] = date('Y-m-d H:m:i',$value['create_time']); $data[$key]['user_account'] = $this->encryption($value['user_account']); if($value['check_status'] == 1) { - $data[$key]['check_status'] = "冻结"; - }else { $data[$key]['check_status'] = "启用"; + }else { + $data[$key]['check_status'] = "冻结"; } } $xlsData = $data; @@ -2434,7 +2440,7 @@ class DownloadController extends BaseController { array('income','收益'), array('pay_time','充值时间'), array('selle_status','订单状态'), - ); + ); $model = M('spend', 'tab_'); $data = $model->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,if(selle_ratio >= 0,selle_ratio,0) as selle_ratio,pay_time,selle_status,pay_status,withdraw_id') ->where($map) diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php index 605c26ad4..f8b4e8ceb 100644 --- a/Application/Home/Controller/FinanceController.class.php +++ b/Application/Home/Controller/FinanceController.class.php @@ -15,6 +15,7 @@ class FinanceController extends BaseController { //提现状态 public static $withdrawStatus = [ + -2 => '已撤销', -1 => '审核未通过', 0 => '待审核', 1 => '汇款中', @@ -200,7 +201,7 @@ class FinanceController extends BaseController $map['pay_order_number'] = $payOrderNumber; } if (isset($_GET['status'])) { - if ($status == -2) { + if ($status == -99) { $map['selle_status'] = 0; } else { $withdrawMap['promote_id'] = $this->loginPromote['id']; @@ -277,8 +278,7 @@ class FinanceController extends BaseController //是否是会长 $this->purview(); //验证安全密码 - $metaTitle = '结算明细'; - $modelList = ['财务管理', $metaTitle]; + $modelList = []; $res = $this->verifyPasswordView($modelList, false); if ($res == false) { $data['status'] = 0; @@ -329,6 +329,7 @@ class FinanceController extends BaseController $add['status'] = 0; $add['widthdraw_number'] = $this->produceWithdrawNumber(); $add['settlement_end_time'] = $thisDay - 1; + $add['spend_ids'] = ''; M()->startTrans();//开启事物 $withdrawId = M('withdraw', 'tab_')->add($add); @@ -399,11 +400,9 @@ class FinanceController extends BaseController } if (isset($_GET['status']) && $_GET['status'] !== '') { $status = intval($_GET['status']); - if (!isset(FinanceController::$withdrawStatus[$status])) { - $this->error('参数异常'); + if (isset(FinanceController::$withdrawStatus[$status])) { + $map['status'] = $status; } - - $map['status'] = $status; } $data = $model->field('id,widthdraw_number,create_time,settlement_end_time,sum_money,status,respond,transfer_proof') @@ -420,8 +419,15 @@ class FinanceController extends BaseController $list['create_time'] = date('Y-m-d H:i:s', $list['create_time']); $list['settlement_end_time'] = date('Y-m-d H:i:s', $list['settlement_end_time']); $list['status_name'] = FinanceController::$withdrawStatus[$list['status']]; - if ($list['status'] == -1) { - $list['status_name'] = '' . $list['status_name'] . ''; + switch ($list['status']) { + case -2: + $list['status_name'] = '' . $list['status_name'] . ''; + break; + case -1: + $list['status_name'] = '' . $list['status_name'] . ''; + break; + default: + break; } } } @@ -572,8 +578,7 @@ class FinanceController extends BaseController //是否是会长 $this->purview(); //验证安全密码 - $metaTitle = '结算明细'; - $modelList = ['财务管理', $metaTitle]; + $modelList = []; $res = $this->verifyPasswordView($modelList, false); if ($res == false) { $data['status'] = 0; @@ -606,4 +611,69 @@ class FinanceController extends BaseController } $this->ajaxReturn($data); } + + //撤销提现 + public function cancelWithdraw() + { + //是否是会长 + $this->purview(); + //验证安全密码 + $modelList = []; + $res = $this->verifyPasswordView($modelList, false); + if ($res == false) { + $data['status'] = 0; + $data['msg'] = '权限异常'; + $this->ajaxReturn($data); + } + + $id = intval(I('id', 0)); + $data = M('withdraw', 'tab_')->find($id); + if (empty($data) || !in_array($data['status'], [-1, 0])) { + $data['status'] = 0; + $data['msg'] = '数据异常'; + $this->ajaxReturn($data); + } + if ($data['promote_id'] != $this->loginPromote['id']) { + $data['status'] = 0; + $data['msg'] = '权限异常'; + $this->ajaxReturn($data); + } + + $spendMap['withdraw_id'] = $id; + $spendIds = M('Spend', 'tab_')->where($spendMap)->getField('id', true); + if (empty($spendIds)) { + $data['status'] = 0; + $data['msg'] = '数据异常'; + $this->ajaxReturn($data); + } + $spendIds = implode(',', $spendIds); + $time = time(); + $withdrawSave['id'] = $id; + $withdrawSave['status'] = -2; + $withdrawSave['spend_ids'] = $spendIds; + $withdrawSave['last_up_update_time'] = $time; + + M('withdraw', 'tab_')->startTrans();//开启事物 + $withdrawRes = M('withdraw', 'tab_')->save($withdrawSave); + if ($withdrawRes === false) { + M('withdraw', 'tab_')->rollback();//事物回滚 + $data['status'] = 0; + $data['msg'] = '撤销失败'; + $this->ajaxReturn($data); + } + + $spendSave['selle_status'] = 0; + $spendSave['withdraw_id'] = 0; + $spendRes = M('spend', 'tab_')->where($spendMap)->save($spendSave); + if ($spendRes === false) { + M('withdraw', 'tab_')->rollback();//事物回滚 + $data['status'] = 0; + $data['msg'] = '撤销失败'; + } else { + M('withdraw', 'tab_')->commit();//事物提交 + $data['status'] = 1; + $data['msg'] = '撤销成功'; + } + $this->ajaxReturn($data); + } } \ No newline at end of file diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 4d0f5061b..be50a7529 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -2134,31 +2134,4 @@ class QueryController extends BaseController $this->ajaxReturn($data); } - - public function userPlayDataCount() - { - $time = strtotime(date('Y-m-d 00:00:00', time() - (3600 * 24))); - $spendMap['pay_status'] = 1; - $spendMap['pay_game_status'] = 1; - $spendMap['game_player_id'] = ['gt', 0]; - $spendMap['pay_time'] = ['between', [$time, strtotime(date('Y-m-d 23:59:59', $time))]]; - - $field = 'FROM_UNIXTIME(pay_time, "%Y-%m-%d") as day,game_id,server_id,game_player_id,sum(pay_amount) as recharge_cost,count(id) as recharge_count'; - $spendCostData = M('spend', 'tab_')->field($field) - ->where($spendMap) - ->group('day,game_player_id,server_id,game_id') - ->select(); - - $data = []; - foreach ($spendCostData as $list) { - $save['game_id'] = $list['game_id']; - $save['server_id'] = $list['server_id']; - $save['role_id'] = $list['game_player_id']; - $save['recharge_cost'] = $list['recharge_cost']; - $save['recharge_count'] = $list['recharge_count']; - $save['create_time'] = strtotime($list['day']); - $data[] = $save; - } - M('user_play_data_count', 'tab_')->addAll($data); - } } diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index 2cbb07ea2..aefcaf46a 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -103,8 +103,8 @@
其他 - + 元
@@ -139,14 +139,15 @@
- 支付宝 + 支付宝 +
- 微信支付 + 微信支付
@@ -181,7 +182,7 @@
家长监护 客服帮助 - 国浩律所 +
备案号：琼ICP备19000556号-1 diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php index 5de27038d..e967dbe33 100644 --- a/Application/Mobile/Controller/UserController.class.php +++ b/Application/Mobile/Controller/UserController.class.php @@ -176,7 +176,6 @@ class UserController extends BaseController } $res = $this->suser->login($account, $password); - file_put_contents(dirname(__FILE__) . '/login_res_text.txt', json_encode([$res])); if ($res > 0) { $data = $this->bindingPromote($promoteId, $account); } else { @@ -931,9 +930,9 @@ class UserController extends BaseController $map['id'] = $logininfo['user_id']; $user = M("user", "tab_")->where($map)->field("id,phone")->find(); if (!$user['phone']) { - $where['account'] = $phone; +// $where['account'] = $phone; $where['phone'] = $phone; - $where['_logic'] = 'OR'; +// $where['_logic'] = 'OR'; $is_user = M("user", "tab_")->where($where)->field("id")->find(); if ($is_user) { echo json_encode(array('status' => 0, 'msg' => '手机号已存在，请更换手机号')); diff --git a/Application/Mobile/View/Index/business.html b/Application/Mobile/View/Index/business.html index f6bf23cb6..c11dbc52c 100644 --- a/Application/Mobile/View/Index/business.html +++ b/Application/Mobile/View/Index/business.html @@ -1,6 +1,10 @@ - + @@ -23,9 +27,9 @@
联系方式
-
公司地址：福建省福州市鼓楼区福大怡山文化创意园11号楼103号
-
联系人： 雷女士
-
联系电话： 13067391751
+
公司地址：福建省福州市鼓楼区福大怡山文化创意园11号楼103号
+
联系人： 雷女士
+
联系电话： 13067391751
邮政编码：350004
@@ -40,6 +44,33 @@
海南万盟天下科技有限公司
- + +
+
+
+ + + 首页 + +
+
+ + + 企业简介 +
+
+ + + 招商合作 + +
+
+ + + 我的 + +
+
+
diff --git a/Application/Mobile/View/Index/index.html b/Application/Mobile/View/Index/index.html index 21449a1cb..156399e17 100644 --- a/Application/Mobile/View/Index/index.html +++ b/Application/Mobile/View/Index/index.html @@ -54,5 +54,33 @@ + +
+
+
+ + + 首页 + +
+
+ + + 企业简介 +
+
+ + + 招商合作 + +
+
+ + + 我的 + +
+
+
diff --git a/Application/Mobile/View/Index/introduce.html b/Application/Mobile/View/Index/introduce.html index 25eb5ab79..b30913d8a 100644 --- a/Application/Mobile/View/Index/introduce.html +++ b/Application/Mobile/View/Index/introduce.html @@ -1,9 +1,16 @@ + + +
@@ -22,5 +29,32 @@
海南万盟天下科技有限公司
- + +
+
+
+ + + 首页 + +
+
+ + + 企业简介 +
+
+ + + 招商合作 + +
+
+ + + 我的 + +
+
+
\ No newline at end of file diff --git a/Application/Mobile/View/Public/bases.html b/Application/Mobile/View/Public/bases.html index 0ea6f8f33..604038c69 100644 --- a/Application/Mobile/View/Public/bases.html +++ b/Application/Mobile/View/Public/bases.html @@ -84,34 +84,6 @@ - -
-
-
- - - 首页 - -
-
- - - 企业简介 -
-
- - - 招商合作 - -
-
- - - 我的 - -
-
-
+ + + + + + diff --git a/Application/Mobile/View/User/forget.html b/Application/Mobile/View/User/forget.html index 044c9da78..1b1b536a5 100644 --- a/Application/Mobile/View/User/forget.html +++ b/Application/Mobile/View/User/forget.html @@ -1,128 +1,123 @@ - - - - - - - - - - - - - - - - - - - - -
-
- -

找回密码

+ + + + + + + + + +
+ +
找回密码 + +
+
+ +
+
+ +
手机号
+
+
-
-
-
-
-
-
-
-
- - 获取验证码 -
-
- -
-
-
- -
-
-

- 通过手机号找回密码只适用于手机号注册的账号
用户名注册的账号可 - 联系客服 -

-
-
+ +
+
+ +
验证码
+
-
-
-
- - - + + - - \ No newline at end of file + }) + }); + + \ No newline at end of file diff --git a/Application/Mobile/View/User/forget1.html b/Application/Mobile/View/User/forget1.html index 29dea346c..7678a7f7b 100644 --- a/Application/Mobile/View/User/forget1.html +++ b/Application/Mobile/View/User/forget1.html @@ -1,88 +1,83 @@ - - - - - - - - - - - - - - - - - - - - -
-
- -

设置新密码

-
-
-
-
-
-
-
-
-
- -
-
- + + + + + + + +
+
+ +
+ +
设置新密码 + +
+
+ +
+
+ +
新密码
+
-
- - + +
+
+ +
确认密码
+
+
- + +
保存修改
+
-
+
-
- - - + + - - \ No newline at end of file + }) + + }); + + \ No newline at end of file diff --git a/Application/Mobile/View/User/index.html b/Application/Mobile/View/User/index.html index baa2b2a89..846c51f04 100644 --- a/Application/Mobile/View/User/index.html +++ b/Application/Mobile/View/User/index.html @@ -21,7 +21,7 @@
我的平台币
- +
{$user['balance']}
充值 @@ -59,7 +59,34 @@
- + +
+
+
+ + + 首页 + +
+
+ + + 企业简介 +
+
+ + + 招商合作 + +
+
+ + + 我的 + +
+
+
diff --git a/Application/Mobile/View/User/userauth.html b/Application/Mobile/View/User/userauth.html index 0b41a41f2..1fa5ef00f 100644 --- a/Application/Mobile/View/User/userauth.html +++ b/Application/Mobile/View/User/userauth.html @@ -1,112 +1,119 @@ - -
-
- -

实名认证

-
-
-
-
-
- -
-
+ + + + +
+
+ +
+ +
实名认证 + +
+ + +
+
+ +
真实姓名
+
+ +
+ +
+
+ +
真实姓名
+
+ +
+ + -
    -
  • - 真实姓名 - - - -
    • -
  • - 证件号码 - - - -
    • -
+ +
+
+ +
证件号码
+
+
-
- + +
+
+ +
证件号码
+
+
- - - 您已进行过支付宝实名认证 - -
-
- 您已进行过实名认证 -
    -
  • 真实姓名{:substr_cut($user['real_name'],'*')}
    • -
  • 证件号码{:substr_replace($user['idcard'],'****************',1,16)}
    • -
+ + + +
保存修改
-
- -
+ +
+
-
- - - + + - + + + }); + \ No newline at end of file diff --git a/Application/Mobile/View/User/usergift.html b/Application/Mobile/View/User/usergift.html index 7c498cd1f..c9c75ea45 100644 --- a/Application/Mobile/View/User/usergift.html +++ b/Application/Mobile/View/User/usergift.html @@ -134,7 +134,7 @@ $('#moreBtn').removeClass('ms-none');loads = false; } else { $('.loading').removeClass('hidden').addClass('ms-none'); - pmsg.msg('已经到底了~'); + // pmsg.msg('已经到底了~'); } }) }); diff --git a/Application/Mobile/View/User/usernick.html b/Application/Mobile/View/User/usernick.html index abeedeea3..5daa4d7ad 100644 --- a/Application/Mobile/View/User/usernick.html +++ b/Application/Mobile/View/User/usernick.html @@ -1,26 +1,28 @@ -
-
- -

修改昵称

- 保存 -
-
-
+ + + +
-
-
    -
  • - 昵称 - - - -
    • -
+
+ +
修改名字 + +
+
+
+
+ +
昵称
+
+ +
+
保存修改
+
diff --git a/Application/Mobile/View/User/userpassword.html b/Application/Mobile/View/User/userpassword.html index 4cdc7ab34..9de7f1e4b 100644 --- a/Application/Mobile/View/User/userpassword.html +++ b/Application/Mobile/View/User/userpassword.html @@ -1,84 +1,88 @@ - - -
-
- -

修改密码

-
-
-
+ + + + +
-
-
-
-
    -
  • - 原始密码 - - - -
    • -
  • - 新密码 - - - -
    • -
  • - 确认密码 - - - -
    • -
-
-
- -
-
-
+
+
+
+ +
修改密码 + +
+
+ +
+
+ +
原始密码
+
+ +
+ +
+
+ +
新密码
+
+ +
+ +
+
+ +
确认密码
+
+ +
+ +
保存修改
+
+
+
+
- \ No newline at end of file diff --git a/Application/Mobile/View/User/userphone.html b/Application/Mobile/View/User/userphone.html index 20aab93f1..a2a6babdf 100644 --- a/Application/Mobile/View/User/userphone.html +++ b/Application/Mobile/View/User/userphone.html @@ -1,125 +1,148 @@ - + - -
-
- -

绑定手机解除绑定

+ + + + + + +
+ +
绑定手机解除绑定 + +
+
+ +
+ + +
+
+ +
手机号
+
+
{$user['phone']}
+
-
-
-
-
- -
-
    -
  • - 手机号 - - readonly = "readonly" class="w-input" class="w-input cheackinput"> - -
    • -
  • - 短信验证码 - - - -
    • -
-
-
- -
- -
-
-
- - + - + + + }); + \ No newline at end of file diff --git a/Application/Mobile/View/User/userset.html b/Application/Mobile/View/User/userset.html index 608ddcbd2..a423563cf 100644 --- a/Application/Mobile/View/User/userset.html +++ b/Application/Mobile/View/User/userset.html @@ -77,7 +77,7 @@
{$user.account}
-
+
昵称 @@ -86,7 +86,7 @@
- + 性别
男女 @@ -138,6 +138,35 @@
+ +
+
+
+ + + 首页 + +
+
+ + + 企业简介 +
+
+ + + 招商合作 + +
+
+ + + 我的 + +
+
+
+
diff --git a/Application/Mobile/View/User/usersex.html b/Application/Mobile/View/User/usersex.html index a5186a8cd..9d7180e17 100644 --- a/Application/Mobile/View/User/usersex.html +++ b/Application/Mobile/View/User/usersex.html @@ -1,70 +1,94 @@ - - - - -
-
- -

修改性别

- 保存 -
-
-
-
-
-
-
-
    -
  • - 性别 - - - - -
    • -
-
-
-
-
-
- - + + + + + + + + + + + +
+ +
修改性别 + +
+ +
+
+
+
+ +
性别
+
+
+
+ 男 + + +
+ +
+ 女 + + +
+
+
+
+
+ +
保存修改
+
+ +
+ + - - \ No newline at end of file + + }); + + + diff --git a/Data/update.sql b/Data/update.sql index c12879640..c4a608160 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -524,7 +524,7 @@ CREATE TABLE `tab_user_play_data_count` ( ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; ALTER TABLE `tab_user_play_data_count` -ADD INDEX `search`(`game_id`, `server_id`, `role_id`) USING BTREE, +ADD INDEX `search`(`game_id`, `server_id`, `role_id`, `create_time`) USING BTREE, ADD INDEX `create_time`(`create_time`) USING BTREE; ADD INDEX `recharge_cost`(`recharge_cost`) USING BTREE, ADD INDEX `recharge_count`(`recharge_count`) USING BTREE; @@ -540,4 +540,10 @@ CREATE TABLE `tab_idcard_log` ( `status` tinyint(2) DEFAULT '0' COMMENT '0 认证失败 1 认证成功', `create_time` int(11) DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='身份证认证信息'; \ No newline at end of file +) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='身份证认证信息'; + +--提现表添加最后更新时间 +ALTER TABLE `tab_withdraw` +ADD COLUMN `last_up_update_time` int(10) NOT NULL DEFAULT 0 COMMENT '最后更新时间', +ADD COLUMN `spend_ids` longtext NOT NULL COMMENT '充值订单id'; + diff --git a/Public/Media/css/index.css b/Public/Media/css/index.css index 46893ed82..2600eb2a2 100644 --- a/Public/Media/css/index.css +++ b/Public/Media/css/index.css @@ -55,6 +55,7 @@ top: 4.23rem; width: 2.70rem; height: 3.70rem; + z-index: 9; } .side_tabbar img{ width: 100%; diff --git a/Public/Media/images/index_about/qrcode.png b/Public/Media/images/index_about/qrcode.png index 2c41fe3b8..d33691b9b 100644 Binary files a/Public/Media/images/index_about/qrcode.png and b/Public/Media/images/index_about/qrcode.png differ diff --git a/Public/Media/js/recharge.js b/Public/Media/js/recharge.js index 600774dca..20448a92e 100644 --- a/Public/Media/js/recharge.js +++ b/Public/Media/js/recharge.js @@ -1,4 +1,5 @@ $(function() { + //钱的数量选择 $(".select-box-soon>div:not(.price-input)").click(function(){ $(this).addClass("selectBg").siblings("div").removeClass("selectBg"); @@ -22,7 +23,7 @@ $(function() { $(".way-show>div>span").text(way); $("#apitype").val($(this).data('type')); }); - + $(".way-select>div").eq(0).trigger('click'); $(".recharge-btn").click(function () { var that = $('#recharge_form'); if($.trim($("#toaccount2").val()).length == 0){ diff --git a/Public/Mobile/css/business.css b/Public/Mobile/css/business.css index 3abc8eb81..5940366ba 100644 --- a/Public/Mobile/css/business.css +++ b/Public/Mobile/css/business.css @@ -35,7 +35,7 @@ body{ margin-top: 0.5rem; font-size: 0.24rem; font-family:PingFang SC; - font-weight:bold; + font-weight:500; color:rgba(41,41,41,1); line-height:0.4rem; text-indent: 2em; @@ -43,12 +43,13 @@ body{ .bazaar{ margin-top: 0.34rem; font-family:PingFang SC; - font-weight:bold; + font-weight:500; color:rgba(41,41,41,1); font-size: 0.24rem; } .bazaar .title{ - font-size:0.32rem; + font-size:0.32rem; + font-weight: 700; } .bazaar .info{ font-size:0.24rem; diff --git a/Public/Mobile/css/common.css b/Public/Mobile/css/common.css index e667cae3b..0af4f8f35 100644 --- a/Public/Mobile/css/common.css +++ b/Public/Mobile/css/common.css @@ -445,15 +445,18 @@ share_icon height:100vh; } .pop-dialog span { - background:rgba(0,0,0,.6); - top:50%; - color:#FFF; - display:inline-block; - line-height:2; - position:relative; - padding:.5rem 2rem; - word-break:break-all; - max-width:60vw;border-radius: 5px; + background: rgba(0,0,0,.6); + top: 50%; + color: #FFF; + display: inline-block; + line-height: 2; + position: relative; + word-break: break-all; + max-width: 2rem; + font-size: 0.32rem; + border-radius: 5px; + display: block; + margin: auto; } .pop-table { display:table; diff --git a/Public/Mobile/css/enterprise.css b/Public/Mobile/css/enterprise.css index 4a70149df..208375ce1 100644 --- a/Public/Mobile/css/enterprise.css +++ b/Public/Mobile/css/enterprise.css @@ -35,7 +35,7 @@ body{ margin-top: 0.5rem; font-size: 0.24rem; font-family:PingFang SC; - font-weight:bold; + font-weight: 500; color:rgba(41,41,41,1); line-height:0.4rem; } @@ -45,7 +45,7 @@ body{ } .introduce>div:last-child{ font-family:"宋体"; - font-weight:bold; + font-weight:700; color:#389AED; margin-bottom: 1rem; font-style: oblique; diff --git a/Public/Mobile/css/gender.css b/Public/Mobile/css/gender.css new file mode 100644 index 000000000..6878f5959 --- /dev/null +++ b/Public/Mobile/css/gender.css @@ -0,0 +1,90 @@ +.gender-info{ + width: 100%; +} +.gender-input { + padding: 0.15rem 0.3rem; + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: 1px solid #F5F5F5; + height: 0.78rem; +} +.gender-inputBox { + display: flex; + align-items: center; + font-size:0.28rem; + font-family:PingFang SC; + font-weight:500; + color:rgba(41,41,41,1) +} +.gender-inputBox>img{ + width: 0.3rem; + height: 0.3rem; + margin-right: 0.23rem; +} +.gender-sel{ + display: flex; + align-items: center; +} +.radio { + color: #292929; + font-size: 0.28rem; + font-weight: bold; + display: flex; + align-items: center; + margin-left: 0.82rem; + } + .radio>span{ + margin-right: 0.2rem; + } + .radio input[type="radio"] { + position: absolute; + opacity: 0; + } + .radio input[type="radio"] + .radio-label:before { + margin-top: 0.12rem; + content: ''; + background: #f4f4f4; + border-radius: 100%; + border: 1px solid #b4b4b4; + display: inline-block; + width: 0.28rem; + height: 0.28rem; + position: relative; + top: -0.2em; + /* margin-right: 1rem; */ + vertical-align: top; + cursor: pointer; + text-align: center; + -webkit-transition: all 250ms ease; + transition: all 250ms ease; + } + .radio input[type="radio"]:checked + .radio-label:before { + background-color: #3197EE; + box-shadow: inset 0 0 0 4px #f4f4f4; + } + .radio input[type="radio"]:focus + .radio-label:before { + outline: none; + border-color: #3197EE; + } + .radio input[type="radio"]:disabled + .radio-label:before { + box-shadow: inset 0 0 0 4px #f4f4f4; + border-color: #b4b4b4; + background: #b4b4b4; + } + .radio input[type="radio"] + .radio-label:empty:before { + margin-right: 0; + } + .save{ + width:5rem; + height:0.8rem; + background:rgba(33,177,235,1); + border-radius:0.4rem; + font-size:0.32rem; + font-family:PingFang SC; + font-weight:500; + color:rgba(255,255,255,1); + line-height: 0.8rem; + text-align: center; + margin: 0.3rem auto 0 auto; +} \ No newline at end of file diff --git a/Public/Mobile/css/home.css b/Public/Mobile/css/home.css index 3904e426f..4b582ee97 100644 --- a/Public/Mobile/css/home.css +++ b/Public/Mobile/css/home.css @@ -56,7 +56,7 @@ body{ height: 100%; } .swiper-pagination{ - bottom: 6px !important; + bottom: 5px !important; } .swiper-pagination-bullet { width: 0.4rem; @@ -75,7 +75,7 @@ body{ margin-top: 0.15rem; width: 100%; background-color: #fff; - height: 3.6rem; + height: 3.75rem; } .hot .hot_box{ padding: 0.3rem; @@ -111,7 +111,7 @@ body{ margin-top: 0.15rem; width: 100%; background-color: #fff; - height: 3.3rem; + height: 3.45rem; margin-bottom: 0.45rem; } .recharge_box{ diff --git a/Public/Mobile/css/my.css b/Public/Mobile/css/my.css index 81c836d4b..0e295c089 100644 --- a/Public/Mobile/css/my.css +++ b/Public/Mobile/css/my.css @@ -128,21 +128,20 @@ padding: 0.3rem 0.3rem 0.3rem 0.32rem; display: flex; align-items: center; + justify-content: space-between; } .platform_info .del{ - font-size: 0.28rem; + font-size: 0.32rem; color: #292929; } .platform_info img{ width: 0.3rem; height: 0.3rem; - margin-left: 0.15rem; margin-right: 0.68rem; } .platform_info .price{ font-size: 0.4rem; color: #389AED; - margin-right: 1rem; } .platform_info .recharge{ background: url(../images/new/selected.png) no-repeat; diff --git a/Public/Mobile/css/myBag.css b/Public/Mobile/css/myBag.css index 88da8f7fe..2e4b53a35 100644 --- a/Public/Mobile/css/myBag.css +++ b/Public/Mobile/css/myBag.css @@ -15,11 +15,15 @@ .not-play>img{ width: 3rem; height: 2.1rem; + position: relative; + bottom: 100px; } .not-play>span{ font-size: 0.28rem; margin-top: 0.28rem; color: #A9A9A9; + position: relative; + bottom: 100px; } .myBag-box{ margin-top: 0.3rem; @@ -27,7 +31,6 @@ } .myBag-info{ width: 100%; - height: 3.6rem; background:rgba(255,255,255,1); box-shadow:0px 0px 0.1rem 0px rgba(0, 0, 0, 0.15); border-radius:0.2rem; diff --git a/Public/Mobile/css/name.css b/Public/Mobile/css/name.css new file mode 100644 index 000000000..309d01557 --- /dev/null +++ b/Public/Mobile/css/name.css @@ -0,0 +1,48 @@ +.name-info{ + width: 100%; +} +.name-input { + padding: 0.15rem 0.3rem; + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: 1px solid #F5F5F5; + height: 0.78rem; +} +.name-inputBox { + display: flex; + align-items: center; + font-size:0.28rem; + font-family:PingFang SC; + font-weight:500; + color:rgba(41,41,41,1) +} +.name-inputBox>img{ + width: 0.3rem; + height: 0.3rem; + margin-right: 0.23rem; +} +.name-input>input{ + font-size:0.28rem; + font-family:PingFang SC; + font-weight:400; + color:rgba(169,169,169,1); + outline: 0; + border: 0; + height: 0.5rem; + width: 4rem; + text-align: right; +} +.save{ + width:5rem; + height:0.8rem; + background:rgba(33,177,235,1); + border-radius:0.4rem; + font-size:0.32rem; + font-family:PingFang SC; + font-weight:500; + color:rgba(255,255,255,1); + line-height: 0.8rem; + text-align: center; + margin: 0.3rem auto 0 auto; +} \ No newline at end of file diff --git a/Public/Mobile/css/recharge.css b/Public/Mobile/css/recharge.css index 99d216ded..e8b122e66 100644 --- a/Public/Mobile/css/recharge.css +++ b/Public/Mobile/css/recharge.css @@ -64,7 +64,7 @@ display: flex; align-items: center; justify-content: space-between; - border-bottom: 1px solid #F5F5F5; + /*border-bottom: 1px solid #F5F5F5;*/ } .flat-info>span{ font-size:0.24rem; @@ -98,12 +98,13 @@ color: #A9A9A9; } .recharge-payment{ - margin-top: 0.15rem; + margin-top: 0.3rem; width: 6.9rem; height: 3.76rem; background:rgba(255,255,255,1); box-shadow:0px 0px 0.1rem 0px rgba(26,26,26,0.15); border-radius:0.2rem; + margin-left: 0.1rem; } .recharge-payment .title{ padding: 0.32rem 0.29rem; diff --git a/Public/Mobile/css/remove.css b/Public/Mobile/css/remove.css new file mode 100644 index 000000000..08e5de8c5 --- /dev/null +++ b/Public/Mobile/css/remove.css @@ -0,0 +1,61 @@ +.remove-info{ + width: 100%; +} +.remove-input { + padding: 0.15rem 0.3rem; + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: 1px solid #F5F5F5; + height: 0.78rem; + font-size: 0.28rem; +} +.remove-inputBox { + display: flex; + align-items: center; + font-size:0.28rem; + font-family:PingFang SC; + font-weight:500; + color:rgba(41,41,41,1) +} +.remove-inputBox>img{ + width: 0.3rem; + height: 0.3rem; + margin-right: 0.23rem; +} +.remove-inputBox>input{ + width: 1.8rem; + height: 0.5rem; + border: 0; + outline: 0; + padding: 0; + font-size: 0.28rem; + margin-left: 0.33rem; +} +.code{ + width:1.84rem; + height:0.6rem; + background:rgba(33,177,235,1); + border-radius:0.3rem; + font-size:0.15rem; + font-family:PingFang SC; + font-weight:400; + color:rgba(255,255,255,1); + text-align: center; + line-height: 0.6rem; +} + +.save{ + width:5rem; + height:0.8rem; + background:rgba(33,177,235,1); + border-radius:0.4rem; + font-size:0.32rem; + font-family:PingFang SC; + font-weight:500; + color:rgba(255,255,255,1); + line-height: 0.8rem; + text-align: center; + margin: 0.3rem auto 0 auto; + margin-bottom: 10px; +} \ No newline at end of file diff --git a/Public/Mobile/css/reset.css b/Public/Mobile/css/reset.css index b13e17868..8a58c3077 100644 --- a/Public/Mobile/css/reset.css +++ b/Public/Mobile/css/reset.css @@ -30,7 +30,7 @@ h1,h2,h3,h4,h5,h6,span,strong,i{font-size:100%;font-weight:normal;margin: 0;padd /* 子页公共头部 */ .subpage-heard{ - padding:0.7rem 0.3rem 0.28rem; + padding:0.7rem 0 0.28rem 0; display: flex; align-items: center; justify-content: center; @@ -46,7 +46,7 @@ h1,h2,h3,h4,h5,h6,span,strong,i{font-size:100%;font-weight:normal;margin: 0;padd flex-direction: row; align-items: center; top: 0.92rem; - left: 0.3rem; + left: 0.1rem; } .arrows::after{ position: absolute; diff --git a/Public/Mobile/css/step1.css b/Public/Mobile/css/step1.css index 5dbafce52..11b4b6bdc 100644 --- a/Public/Mobile/css/step1.css +++ b/Public/Mobile/css/step1.css @@ -108,7 +108,7 @@ margin-right: 0; } .login-btn{ - margin-top: 0.38rem; + margin-top: 0.6rem; width: 5.5rem; height: 0.8rem; background-color: #389AED; diff --git a/Public/Mobile/css/user/myPlay.css b/Public/Mobile/css/user/myPlay.css index 9a2644461..81d6f4ac2 100644 --- a/Public/Mobile/css/user/myPlay.css +++ b/Public/Mobile/css/user/myPlay.css @@ -14,11 +14,15 @@ .not-play>img{ width: 3rem; height: 2.1rem; + position: relative; + bottom: 100px; } .not-play>span{ font-size: 0.28rem; margin-top: 0.28rem; color: #A9A9A9; + position: relative; + bottom: 100px; } .myPlay-box{ padding: 0 0.3rem; diff --git a/Public/Mobile/css/user/setting.css b/Public/Mobile/css/user/setting.css index 38ba7c66d..ad89ec9bc 100644 --- a/Public/Mobile/css/user/setting.css +++ b/Public/Mobile/css/user/setting.css @@ -4,7 +4,6 @@ body{ background-color: #F5F5F5;} font-family:PingFang SC; } .setting-box{ - margin-top: 0.2rem; background-color: #fff; } .setting-info{ diff --git a/Public/Mobile/images/haoma.png b/Public/Mobile/images/haoma.png new file mode 100644 index 000000000..e9cb5b1ac Binary files /dev/null and b/Public/Mobile/images/haoma.png differ diff --git a/Public/Mobile/images/mingzibianji.png b/Public/Mobile/images/mingzibianji.png new file mode 100644 index 000000000..a4dd65b0e Binary files /dev/null and b/Public/Mobile/images/mingzibianji.png differ diff --git a/Public/Mobile/images/shimingrenzhengmoren.png b/Public/Mobile/images/shimingrenzhengmoren.png new file mode 100644 index 000000000..ce934ed70 Binary files /dev/null and b/Public/Mobile/images/shimingrenzhengmoren.png differ diff --git a/Public/Mobile/images/shouji.png b/Public/Mobile/images/shouji.png new file mode 100644 index 000000000..6bb388b32 Binary files /dev/null and b/Public/Mobile/images/shouji.png differ diff --git a/Public/Mobile/images/shoujibangding.png b/Public/Mobile/images/shoujibangding.png new file mode 100644 index 000000000..132806682 Binary files /dev/null and b/Public/Mobile/images/shoujibangding.png differ diff --git a/Public/Mobile/images/user/shoujibangding.png b/Public/Mobile/images/user/shoujibangding.png index f61a696f1..132806682 100644 Binary files a/Public/Mobile/images/user/shoujibangding.png and b/Public/Mobile/images/user/shoujibangding.png differ diff --git a/Public/Mobile/images/user/xingbie.png b/Public/Mobile/images/user/xingbie.png new file mode 100644 index 000000000..6dda9d327 Binary files /dev/null and b/Public/Mobile/images/user/xingbie.png differ diff --git a/Public/Mobile/images/xingbie2.png b/Public/Mobile/images/xingbie2.png new file mode 100644 index 000000000..e9fa8fb84 Binary files /dev/null and b/Public/Mobile/images/xingbie2.png differ diff --git a/Public/Mobile/images/xiugaimima.png b/Public/Mobile/images/xiugaimima.png new file mode 100644 index 000000000..1f0b974e5 Binary files /dev/null and b/Public/Mobile/images/xiugaimima.png differ