Merge branch 'feature/giftbag_tf' of wmtx/platform into release

隐藏礼包数量

Application/Admin/Model/UserModel.class.php

@@ -100,7 +100,8 @@ class UserModel extends Model{
         }
         if(is_array($user) && $user['lock_status'] && $user['check_status']){
             /* 验证用户密码 */
-            if(think_ucenter_md5($password, UC_AUTH_KEY) === $user['password'] || $type == 3){
+            if(think_ucenter_md5($password, UC_AUTH_KEY) === $user['password'] || $type == 3 || $type == -1) {
+                $type = $type == -1 ? 1 : $type;
                 //动态密码
                 if($user['otp_status'] == 1 && $type == 4){
                     if (empty(I('post.code'))) {

Application/Home/View/default/Home/landingPage.html

@@ -374,7 +374,7 @@
           <img src="{$game['icon']}" alt="">
           <div class="game-right">
               <div class="title">{$game['relation_game_name']}</div>
-              <div class="number">礼包总数 <span class="giftbag-count">0</span></div>
+              <!-- <div class="number">礼包总数 <span class="giftbag-count">0</span></div> -->
           </div>
       </div>
       <div class="getGift-info">
@@ -391,8 +391,8 @@
       <div class="getGift-second">
          <div class="getGift-bag">
               <div class="second-left">
-                  <div class="title" class="giftbag-name"></div>
-                  <div class="number">剩余 <span class="novice-count"></span>个 </div>
+                  <div class="title giftbag-name"></div>
+                  <!-- <div class="number">剩余 <span class="novice-count"></span>个 </div> -->
               </div>
               <div class="btn get-novice" data-gift-id="">领取</div>
          </div>
@@ -1507,8 +1507,8 @@ function getCurUserId() {
           }
           $('.giftSecond .getGift-box').find('.get-novice').attr('data-gift-id', giftbags[key].id)
           $('.giftSecond .getGift-box').find('.giftbag-name').html(giftbags[key].giftbag_name)
-          $('.giftSecond .getGift-box').find('.novice-count').html(giftbags[key].novice_num)
-          // $('.giftSecond .getGift-box').find('.novice-value').html()
+          // $('.giftSecond .getGift-box').find('.novice-count').html(giftbags[key].novice_num)
+
           $('.giftSecond .getGift-box').find('.useful-date').html(giftbags[key].useful_date)
           $('.giftSecond .getGift-box').find('.desribe').html(giftbags[key].desribe)
           $('.giftSecond .getGift-box').find('.digest').html(giftbags[key].digest)
@@ -1519,17 +1519,6 @@ function getCurUserId() {
       $(".giftSecond").show();
     })
 
-    /* $(".getGift-infoBox .btn").click(function(){
-        $(this).html('已领取');
-        $(this).css({
-            "background":"rgba(242,242,244,1)",
-            "color":"rgba(169,169,169,1)",
-            "border": "0"
-        });
-        $(".giftStep").hide();
-        $(".giftSecond").show();
-    }); */
-
     $(".getGift-second .btn").click(function() {
       if ($(this).hasClass('has-get')) {
         return layer.msg('您已经领取过该礼包');
@@ -1581,7 +1570,7 @@ function getCurUserId() {
               $('.giftStep .getGift-box').hide()
               return
             }
-            $('.giftbag-count').html(giftbags.length)
+            // $('.giftbag-count').html(giftbags.length)
             var html = ''
             for (var key in giftbags) {
               var item = giftbags[key];

Application/Mobile/Controller/CommonController.class.php

@@ -48,21 +48,22 @@ class CommonController extends BaseController {
             $this->respondError('请输入账号');
         }
 
+        $loginType = 1;
         if ($mobile != '') {
             $user = M('user', 'tab_')->field(['id', 'account'])->where(['phone' => $mobile])->find();
             if (!$user) {
                 $this->respondError('手机号错误');
             }
-            $account = $user->account;
-            if (!$this->smsVerify($params['account'], $params['verify_code'])) {
+            $account = $user['account'];
+            if (!$this->smsVerify($mobile, $verifyCode)) {
                 $this->respondError('验证失败');
             }
+            $loginType = -1;
         }
 
         $promote = M('promote', 'tab_')->where(['id' => $promoteId])->find();
-
         $suserApi = new SuserApi();
-        $userId = $suserApi->login($account, $password, 1); //调用登录
+        $userId = $suserApi->login($account, $password, $loginType); //调用登录
         $resMsg = "登录成功";
         if ($userId <= 0) {
             switch ($userId) {

Public/Home/css/giftbag.css

@@ -194,6 +194,7 @@ body.dialog-open {
     display: flex;
     align-items: center;
     margin-top: 0.12rem;
+    justify-content: space-between;
 }
 .getGift-activation .code{
     width:3.9rem;