diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index dcb4958bf..bf8486ae7 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -430,23 +430,4 @@ class SsgController extends BaseController { } } - /** - * 领取激活码 - * @param $token - * @param $gift_id - * author: xmy 280564871@qq.com - */ - public function get_novice($user_id,$gift_id){ - - $model = D("Giftbag"); - $exist = $model->checkAccountGiftExist($logininfo['user_id'],$gift_id); - if($exist){ - $this->error("您已经领取过该礼包!"); - } - $novice = $model->getNovice($logininfo['user_id'],$logininfo['account'],$gift_id); - if(empty($novice)){ - $this->error("暂无激活码"); - } - $this->success("领取成功",$novice); - } } diff --git a/Public/Mobile/js/ssg/flexible.min.js b/Public/Mobile/js/ssg/flexible.min.js index 0e8f568ad..64e088904 100644 --- a/Public/Mobile/js/ssg/flexible.min.js +++ b/Public/Mobile/js/ssg/flexible.min.js @@ -13,8 +13,8 @@ docEl.style.fontSize = Math.max(Math.min(20 * (clientWidth / 1536), 22.5), 17.5) * 5 + 'px'; }else{ - /* 8.55:小于320px不再缩小,11.2:大于420px不再放大 */ - docEl.style.fontSize = Math.max(Math.min(20 * (clientWidth / docWidth), 11.2), 8.55) * 5 + 'px'; + /* 8.55:小于320px不再缩小,11.2:大于420px不再放大 ,17.2 大于667不再放大*/ + docEl.style.fontSize = Math.max(Math.min(20 * (clientWidth / docWidth), 17.2), 8.55) * 5 + 'px'; } return refreshRem; })();