diff --git a/Application/Common/Conf/seo_media_config.php b/Application/Common/Conf/seo_media_config.php index e54a12d7b..1090b7b55 100644 --- a/Application/Common/Conf/seo_media_config.php +++ b/Application/Common/Conf/seo_media_config.php @@ -13,7 +13,7 @@ ), 'wap_index' => array ( - 'seo_title' => '溪谷手游', + 'seo_title' => '万盟天下', 'seo_keyword' => 'asdasdasd', 'seo_description' => 'asdasdasd', ), diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php index 674d9ea2d..91893d0ab 100644 --- a/Application/Mobile/Controller/UserController.class.php +++ b/Application/Mobile/Controller/UserController.class.php @@ -1348,28 +1348,42 @@ class UserController extends BaseController * @return [type] [description] * @author wyr <840186209@qq.com> */ - public function usergame($p = 1) + // public function usergame($p = 1) + // { + // if (!$this->islogin()) { + // $this->redirect('Mobile/User/login'); + // } + // $page = intval($p); + // $page = $page ? $page : 1; //默认显示第一页数据 + // $row = C('LIST_ROWS'); + // $map['user_id'] = $this->suser->login_info('user_id'); + // $data = D('DownRecord')->table('tab_down_record AS tdr') + // ->field('tab_game.id,tab_game.dow_status,tab_game.game_name,tab_game.game_size,tab_game.dow_num,tab_game.icon,tab_game.features,tdr.user_id,tab_game.and_dow_address,tab_game.add_game_address,tab_game.ios_dow_address,tab_game.ios_game_address,tab_game.game_score,tab_game.sdk_version') + // ->join("tab_game ON tdr.game_id = tab_game.id") + // ->where($map) + // ->page($page, $row) + // ->select(); + + // $this->assign("data", $data); + // $this->assign("page", $page); + // $this->display(); + // } + public function usergame() { if (!$this->islogin()) { $this->redirect('Mobile/User/login'); } - $page = intval($p); - $page = $page ? $page : 1; //默认显示第一页数据 - $row = C('LIST_ROWS'); $map['user_id'] = $this->suser->login_info('user_id'); $data = D('DownRecord')->table('tab_down_record AS tdr') ->field('tab_game.id,tab_game.dow_status,tab_game.game_name,tab_game.game_size,tab_game.dow_num,tab_game.icon,tab_game.features,tdr.user_id,tab_game.and_dow_address,tab_game.add_game_address,tab_game.ios_dow_address,tab_game.ios_game_address,tab_game.game_score,tab_game.sdk_version') ->join("tab_game ON tdr.game_id = tab_game.id") ->where($map) - ->page($page, $row) ->select(); $this->assign("data", $data); - $this->assign("page", $page); $this->display(); } - /** * 个人中心->我的游戏 AJAX加载更多 * @return [type] [description] @@ -1680,6 +1694,8 @@ class UserController extends BaseController $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 $data = D("Giftbag")->getMyGiftRecord($this->suser->login_info('account'), $page); +// echo D("Giftbag")->_sql(); +// dump($data);die(); foreach ($data as $key => $value) { $data[$key]['end_time'] = empty($value['end_time']) ? "永久" : date('Y-m-d H:i:s', $value['end_time']); } diff --git a/Application/Mobile/Controller/login_res_text.txt b/Application/Mobile/Controller/login_res_text.txt new file mode 100644 index 000000000..05dba8ad5 --- /dev/null +++ b/Application/Mobile/Controller/login_res_text.txt @@ -0,0 +1 @@ +["23665"] \ No newline at end of file diff --git a/Application/Mobile/Model/GiftbagModel.class.php b/Application/Mobile/Model/GiftbagModel.class.php index 75504e28d..c4b456590 100644 --- a/Application/Mobile/Model/GiftbagModel.class.php +++ b/Application/Mobile/Model/GiftbagModel.class.php @@ -199,8 +199,9 @@ class GiftbagModel extends Model{ //$map['status'] = 0; $data = $this ->table("tab_gift_record as r") - ->field("r.gift_id,r.novice,r.gift_name,r.game_name,g.icon,r.start_time,r.end_time") + ->field("r.gift_id,r.novice,r.gift_name,r.game_name,g.icon,r.start_time,r.end_time,b.desribe") ->join("left join tab_game g on g.id = r.game_id and g.game_status = 1 ") + ->join("left join tab_giftbag b on b.id = r.gift_id ") ->where($map) ->page($page,$row) ->select(); diff --git a/Application/Mobile/View/User/index - 副本 (2).html b/Application/Mobile/View/User/index - 副本 (2).html deleted file mode 100644 index c5c461e66..000000000 --- a/Application/Mobile/View/User/index - 副本 (2).html +++ /dev/null @@ -1,83 +0,0 @@ - - - - -
-
- 每日签到 - - 编辑资料 -
-
-
-
-
- -
- -
-
-
-
- -
-
-
-
-
- -
- - - - - diff --git a/Application/Mobile/View/User/index - 副本 (3).html b/Application/Mobile/View/User/index - 副本 (3).html deleted file mode 100644 index c5c461e66..000000000 --- a/Application/Mobile/View/User/index - 副本 (3).html +++ /dev/null @@ -1,83 +0,0 @@ - - - - -
-
- 每日签到 - - 编辑资料 -
-
-
-
-
- -
- -
-
-
-
- -
-
-
-
-
- -
- - - - - diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html index c5eb8b662..f1b1f3097 100644 --- a/Application/Mobile/View/User/login.html +++ b/Application/Mobile/View/User/login.html @@ -1,100 +1,51 @@ - - - - - - - - - - - - - -
-
-
-
-
+
忘记密码？
+ + +
还没有账号？ 账号注册 | 手机注册
+ +
还没有账号？ 账号注册 | 手机注册
+ + +
-
+
+ + + - \ No newline at end of file diff --git a/Application/Mobile/View/User/step1.html b/Application/Mobile/View/User/step1.html index b0ae1dc24..26ce78ec0 100644 --- a/Application/Mobile/View/User/step1.html +++ b/Application/Mobile/View/User/step1.html @@ -32,7 +32,7 @@ - @@ -73,7 +73,7 @@ var account = $.trim($('#account').val()); var nickname = $.trim($('#nickname').val()) var password = $.trim($('#password').val()); - var sex = $.trim($('input[name=sex]:checked').val()); + // var sex = $.trim($('input[name=sex]:checked').val()); var promoteId = parseInt("{:I('get.pid')}") ? parseInt("{:I('get.pid')}") : 0; var gameId = parseInt("{:I('get.gid')}") ? parseInt("{:I('get.gid')}") : 0; @@ -106,7 +106,7 @@ $.ajax({ type:'POST', url:'{:U("User/step1")}', - data:{'account':account,'nickname':nickname,'password':password,'sex':sex,'promote_id':promoteId,'game_id':gameId}, + data:{'account':account,'nickname':nickname,'password':password,'promote_id':promoteId,'game_id':gameId}, dataType:"Json", success:function(data){ pmsg.msg(data.msg); diff --git a/Application/Mobile/View/User/usergame copy.html b/Application/Mobile/View/User/usergame copy.html new file mode 100644 index 000000000..69d93a70e --- /dev/null +++ b/Application/Mobile/View/User/usergame copy.html @@ -0,0 +1,160 @@ + + + + + + + +
+
+ +

我的游戏

+
+
+
+
+
+
+ +
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/Application/Mobile/View/User/usergame.html b/Application/Mobile/View/User/usergame.html index 69d93a70e..17dbad32f 100644 --- a/Application/Mobile/View/User/usergame.html +++ b/Application/Mobile/View/User/usergame.html @@ -1,130 +1,93 @@ - - - - - + + + + + + + 万盟天下 + + + + + + + - -
-
- -

我的游戏

-
-
-
-
-
-
- +
-
-
-
+ +
+ - - + \ No newline at end of file diff --git a/Application/Mobile/View/User/usergift.html b/Application/Mobile/View/User/usergift.html index cae28fd95..7c498cd1f 100644 --- a/Application/Mobile/View/User/usergift.html +++ b/Application/Mobile/View/User/usergift.html @@ -1,155 +1,147 @@ + + + + + + + + - -
-
- -

我的礼包

+ +
+ +
我的礼包 + +
+
+ + + +
+ + 您还没有相关内容哦
-
-
-
-
-
-
    - -
  • -
    - - - - -
    -   - 删除 -
    -
    -
    - {$vo.gift_name} -
    -
    有效期：{$vo.start_time|date="Y-m-d",###}~{$vo['end_time']}
    - -
    -
    -

    礼包码：

     - - - - - - -
    -
    - -
    -
    -
    • -     -
+ +
+ +
+
+
+
特权礼包
+
+ + {$data.gift_name} +
+
[{$data.desribe}]
+
+
兑换码：{$data.novice}
+ 复制兑换码 +
+
+
-
-
- -
-
-
- - - - - + + + + + clipboard.on('error', function(e) { + pmsg.msg('此浏览器不支持此操作，请长按礼包码复制'); + }); + + + $('.jscopy').click(function(event) { + var elem = $(this).siblings('input'); + if (window.clipboarData) { + window.clipboarData.clearData(); + window.clipboarData.setData('text',elem.val()); + alert('已经成功复制'); + } else { + elem.select(); + alert('请长按礼包号码上选择'); + } + return false; + }); + + slider.init('.jsbutton'); + var pop = $('.pop').pop(); + $('.jsdel').click(function() { + pop.msg('dddd'); + }); + + var popmsg = $('.loading').pop(); + + + pmsg.msg('暂无数据'); + + var ac = $('#ajaxContainer'); + ajaxload('{:U("ajaxUserGift")}',{},function(data) { + if (data.status == 1) { + ac.attr('currentpage',data.page); + var html = '',d = data.lists; + for (var i in d) { + var item = d[i]; + html += '
'+ + '
'+ + '
' + + '
特权礼包
' + + '
' + + '' + + '{$data.gift_name}
' + + '
[' + item.desribe+ ']
'+ + '
'+ + '
兑换码：'+item.novice+'
' + + '复制兑换码'+ + '
'; + } + ac.append(html); + + + + + + $('.loading').addClass('ms-none'); + $('#moreBtn').removeClass('ms-none');loads = false; + } else { + $('.loading').removeClass('hidden').addClass('ms-none'); + pmsg.msg('已经到底了~'); + } + }) + }); + + + + \ No newline at end of file diff --git a/Application/Mobile/View/User/userset.html b/Application/Mobile/View/User/userset.html index 4f0a7c18a..608ddcbd2 100644 --- a/Application/Mobile/View/User/userset.html +++ b/Application/Mobile/View/User/userset.html @@ -20,14 +20,46 @@ +
设置中心 - +
@@ -35,59 +67,79 @@ 头像
- + +
账号
-
Zz1213
+
{$user.account}
昵称
-
啊哈哈
+ {$user['nickname']}
性别
-
男
+ 男女
绑定手机
-
已绑定
+ 去绑定已绑定
实名认证
-
未绑定
-
-
-
- - 修改密码 +
+ + + 未认证 + + + 已认证 + + + 未成年 + + 未认证 +
+ +
+ + 修改密码 +
+
+ +
+
+ 退出登录
-
+
-
+ X +
+
-
+