修改下载地址

core/framework/function/core.php

@@ -96,7 +96,7 @@ function setNcCookie($name, $value, $expire='3600', $path='', $domain='', $secur
 	$name = defined('COOKIE_PRE') ? COOKIE_PRE.$name : strtoupper(substr(md5(MD5_KEY),0,4)).'_'.$name;
 	$expire = intval($expire)?intval($expire):(intval(SESSION_EXPIRE)?intval(SESSION_EXPIRE):3600);
 	if(is_mobile()) {
-		//$result = fcgi_setcookie($name, $value, time()+$expire, $path, $domain, $secure);
+		$result = fcgi_setcookie($name, $value, time()+$expire, $path, $domain, $secure);
 	} else {
 		$result = setcookie($name, $value, time()+$expire, $path, $domain, $secure);
 	}

core/framework/libraries/model.php

@@ -683,7 +683,6 @@ class ModelDb
             $sql = $this->buildSelectSql($options);
             $result = DB::getAll($sql,($options['lock'] === true || $options['master'] === true || defined('TRANS_MASTER')) ? 'master' : 'slave');
             return $result;
-
         }
         else
         {
@@ -692,7 +691,7 @@ class ModelDb
             if ($options['cache'] === true)
             {
                 $key =  is_string($_cache['cache_key']) ? $_cache['cache_key'] : md5($sql);
-                if (isset($_cache[$key])){
+                if (isset($_cache[$key])) {
                     return $_cache[$key];
                 }
             }

data/model/p_xianshi_goods.model.php

@@ -189,7 +189,7 @@ class p_xianshi_goodsModel extends Model{
             $condition['state'] = self::XIANSHI_GOODS_STATE_NORMAL;
             $condition['end_time'] = array('gt', time());
             $condition['goods_id'] = $goods_id;
-            $this->cls();
+            $this->cls()->table('p_xianshi_goods');
             $xianshi_goods_list = $this->getXianshiGoodsExtendList($condition, null, 'start_time asc', '*', 1);
             $info['info'] = serialize($xianshi_goods_list[0]);
             $this->_wGoodsXianshiCache($goods_id, $info);

data/resource/mobile/bonus/js/tel.js

@@ -12,7 +12,7 @@ $(function(){
             that.blurValidatetel('keyup');
             that.blurValidatetel('blur');
             that.message('#message');
-            that.focu('document');
+            that.focu();
             that.navigator();
         },
         // 判断设备
@@ -20,7 +20,7 @@ $(function(){
             var ua = navigator.userAgent.toLowerCase(),
                 downInstall=$('#link a');
             if (/iphone|ipad|ipod/.test(ua)) {
-                downInstall.attr('href','https://itunes.apple.com/us/app/xiong-mao-mei-zhuang/id945609424?l=zh&ls=1&mt=8');
+                downInstall.attr('href','http://a.app.qq.com/o/simple.jsp?pkgname=com.lrlz.beautyshop');
             } else if (/android/.test(ua)) {
                 downInstall.attr('href','http://p.lrlz.com/data/upload/package/xmmz_release.apk');
             }
@@ -304,7 +304,7 @@ $(function(){
         },
         //收起键盘
         focu:function(id){
-            $(id).live('touchstart',function(){
+            $(document).on('touchstart',function(){
                 $('input').blur();
                 //return false;
             })

mobile/control/bonusex.php

@@ -50,10 +50,15 @@ class bonusexControl extends mobileControl
             return self::outerr(errcode::ErrBonus,"无此红包.");
         }
         $this->fileter_typeinfos($type_infos,$type_info,$binded_info);
+        $type = \bonus\type::crate_by_paramer($type_infos['type_info']);
+
+        if($type->isStart() == false) {
+            return self::outsuccess(array('type_info' => $type_info),"bonus/open");
+        }
 
         $mine_bonus = bonus_helper::get_mine_by_typesn($type_sn);
         if($mine_bonus != false)
-        { //显示我抢到的红包，按照状态进行判断
+        {   //显示我抢到的红包，按照状态进行判断
             $bonus = \bonus\user_bonus::create_by_param($mine_bonus);
             $mine_bonus = bonus_helper::filter_bonus($mine_bonus);
 
@@ -70,7 +75,6 @@ class bonusexControl extends mobileControl
             }
             else
             {
-                $type = \bonus\type::crate_by_paramer($type_infos['type_info']);
                 if($type->isEnd()) {
                     return self::outsuccess(NULL,"bonus/end");
                 } else {
@@ -79,8 +83,7 @@ class bonusexControl extends mobileControl
             }
         }
         else
-        { //我没有抢过的情况
-            $type = \bonus\type::crate_by_paramer($type_infos['type_info']);
+        {   //我没有抢过的情况
             if($type->isEnd()) {
                 return self::outsuccess(NULL,"bonus/end");
             }
@@ -102,9 +105,14 @@ class bonusexControl extends mobileControl
         if(empty($type_infos)) {
             return self::outerr(errcode::ErrBonus,"无此红包.");
         }
+        $this->fileter_typeinfos($type_infos,$type_info,$binded_info);
+
+        $type = \bonus\type::crate_by_paramer($type_infos['type_info']);
+        if($type->isStart() == false) {
+            return self::outsuccess(array('type_info' => $type_info),"bonus/open");
+        }
 
         $mine_bonus = bonus_helper::get_mine_by_typesn($type_sn);
-        $this->fileter_typeinfos($type_infos,$type_info,$binded_info);
         if($mine_bonus != false) { //显示我抢到的红包，按照状态进行判断
             $mine_bonus = bonus_helper::filter_bonus($mine_bonus);
         }
@@ -123,14 +131,18 @@ class bonusexControl extends mobileControl
         if(empty($type_infos)) {
             return self::outerr(errcode::ErrBonus,"无此红包.");
         }
-
         $this->fileter_typeinfos($type_infos,$type_info,$binded_info);
+
+        $type = \bonus\type::crate_by_paramer($type_infos['type_info']);
+        if($type->isStart() == false) {
+            return self::outsuccess(array('type_info' => $type_info),"bonus/open");
+        }
+
         $mine_bonus = bonus_helper::get_mine_by_typesn($type_sn);
         if($mine_bonus != false)
         { //显示我抢到的红包，按照状态进行判断
             $bonus_obj = \bonus\user_bonus::create_by_param($mine_bonus);
             $mine_bonus = bonus_helper::filter_bonus($mine_bonus);
-            $type = \bonus\type::crate_by_paramer($type_infos['type_info']);
 
             if($bonus_obj->isBinded()) {
                 return self::outsuccess(array('type_info' => $type_info, 'mine_bonus' => $mine_bonus,'binded_info' => $binded_info),"bonus/content");
@@ -156,7 +168,6 @@ class bonusexControl extends mobileControl
         }
         else
         {
-            $type = \bonus\type::crate_by_paramer($type_infos['type_info']);
             if($type->isEnd()) {
                 return self::outsuccess(array('type_info' => $type_info),"bonus/end");
             }
@@ -197,7 +208,6 @@ class bonusexControl extends mobileControl
             return self::outerr(errcode::ErrParamter,"请输入红包序列号.");
         }
         $bonus_sn = $_GET['bonus_sn'];
-
         $mine_bonus = bonus_helper::get_mine_by_bonussn($bonus_sn);
         if($mine_bonus == false) {
             return self::outerr(errcode::ErrParamter, "您不能领没有抢到的红包.");

mobile/templates/default/bonus/unstart.php

@@ -1,7 +1,32 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: stanley-king
- * Date: 16/6/2
- * Time: 上午11:07
- */
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>熊猫美妆红包</title>
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">
+    <link rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/css/common.css"/>
+    <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js"></script>
+</head>
+
+<body>
+<div class="maincontent">
+    <div class="bg_position cloud_left"></div>
+    <div class="bg_position cloud_right"></div>
+    <div class="bg_position dot_left"></div>
+    <div class="bg_position dot_right"></div>
+    <div class="content center">
+        <div class="msg_box">
+            <p class="name"><?php bonus_output_sender($output); ?></p>
+        </div>
+        <div class="time_over">
+            <p>该红包已超过24小时。如已领取，</p>
+            <p>请在熊猫美妆APP中“我的红包”中查看～</p>
+        </div>
+    </div>
+    <div class="bottom_pro center">
+        <p class="">独家运营70多个知名化妆品品牌的天猫官方旗舰店</p>
+        <p><s class="icon_logo"></s>上海丽人丽妆化妆品股份有限公司</p>
+    </div>
+</div>
+</body>
+</html>