Merge branch 'bonus_manager' of 121.43.114.153:/home/git/repositories/shopnc into bonus_manager

admin/templates/default/mb_special_item.module_adv_list.php

@@ -56,14 +56,14 @@
                         <input nctype="image_title" name="item_data[item][<?php echo $item_key; ?>][title]" type="hidden" value="<?php echo $item_value['title']; ?>">
                         <div style="color: red;float: left;">
                             <?php
-                            $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);
-                            if(!$ret) {
-                                echo "无法获取当前图片尺寸。";
-                                return;
-                            }
-                                $width = doubleval($ret[0]);
-                                $height= doubleval($ret[1]);
-                                echo $width.'*'.$height;
+                                $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);
+                                if(!$ret) {
+                                    echo "无法获取当前图片尺寸。";
+                                } else {
+                                    $width = doubleval($ret[0]);
+                                    $height= doubleval($ret[1]);
+                                    echo $width.'*'.$height;
+                                }
                             ?>
                         </div>
                         <a nctype="btn_edit_item_image" href="javascript:;" class="a2"><i class="icon-edit"></i>编辑</a>

admin/templates/default/mb_special_item.module_goods.php

@@ -66,14 +66,14 @@
                         <input nctype="image_title" name="item_data[item][<?php echo $item_key; ?>][title]" type="hidden" value="<?php echo $item_value['title']; ?>">
                         <div style="color: red;float: left;">
                             <?php
-                            $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);
-                            if(!$ret) {
-                                echo "无法获取当前图片尺寸。";
-                                return;
-                            }
-                            $width = doubleval($ret[0]);
-                            $height= doubleval($ret[1]);
-                            echo $width.'*'.$height;
+                                $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);
+                                if(!$ret) {
+                                    echo "无法获取当前图片尺寸。";
+                                } else {
+                                    $width = doubleval($ret[0]);
+                                    $height= doubleval($ret[1]);
+                                    echo $width.'*'.$height;
+                                }
                             ?>
                         </div>
                         <a nctype="btn_edit_item_image" href="javascript:;" class="a2"><i class="icon-edit"></i>编辑</a>

admin/templates/default/mb_special_item.module_home1.php

@@ -65,11 +65,11 @@
                     $ret = @getimagesize(getMbSpecialImageUrl($item_data['image']),$info);
                     if(!$ret) {
                         echo "无法获取当前图片尺寸。";
-                        return;
+                    } else {
+                        $width = doubleval($ret[0]);
+                        $height= doubleval($ret[1]);
+                        echo $width.'*'.$height;
                     }
-                    $width = doubleval($ret[0]);
-                    $height= doubleval($ret[1]);
-                    echo $width.'*'.$height;
                     ?>
                 </div>
                 <a nctype="btn_edit_item_image" data-desc="640*260" href="javascript:;"><i class="icon-edit"></i>编辑</a>

admin/templates/default/mb_special_item.module_home2.php

@@ -64,11 +64,11 @@
                         $ret = @getimagesize(getMbSpecialImageUrl($item_data['square_image']),$info);
                         if(!$ret) {
                             echo "无法获取当前图片尺寸。";
-                            return;
+                        } else {
+                            $width = doubleval($ret[0]);
+                            $height= doubleval($ret[1]);
+                            echo $width.'*'.$height;
                         }
-                        $width = doubleval($ret[0]);
-                        $height= doubleval($ret[1]);
-                        echo $width.'*'.$height;
                         ?>
                     </div>
                     <a nctype="btn_edit_item_image" data-desc="320*260" href="javascript:;"><i class="icon-edit"></i>编辑</a>

admin/templates/default/mb_special_item.module_home3.php

@@ -67,11 +67,11 @@
                             $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);
                             if(!$ret) {
                                 echo "无法获取当前图片尺寸。";
-                                return;
+                            } else {
+                                $width = doubleval($ret[0]);
+                                $height= doubleval($ret[1]);
+                                echo $width.'*'.$height;
                             }
-                            $width = doubleval($ret[0]);
-                            $height= doubleval($ret[1]);
-                            echo $width.'*'.$height;
                             ?>
                         </div>
                         <a nctype="btn_edit_item_image" data-desc="320*130" href="javascript:;"><i class="icon-edit"></i>编辑</a>

admin/templates/default/mb_special_item.module_home4.php

@@ -64,11 +64,11 @@
                             $ret = @getimagesize(getMbSpecialImageUrl($item_data['rectangle1_image']),$info);
                             if(!$ret) {
                                 echo "无法获取当前图片尺寸。";
-                                return;
+                            } else {
+                                $width = doubleval($ret[0]);
+                                $height= doubleval($ret[1]);
+                                echo $width.'*'.$height;
                             }
-                            $width = doubleval($ret[0]);
-                            $height= doubleval($ret[1]);
-                            echo $width.'*'.$height;
                             ?>
                         </div>
                         <a nctype="btn_edit_item_image" data-desc="320*130" href="javascript:;"><i class="icon-edit"></i>编辑</a>

admin/templates/default/mb_special_item.module_home5.php

@@ -66,11 +66,11 @@
                             $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);
                             if(!$ret) {
                                 echo "无法获取当前图片尺寸。";
-                                return;
+                            } else {
+                                $width = doubleval($ret[0]);
+                                $height= doubleval($ret[1]);
+                                echo $width.'*'.$height;
                             }
-                            $width = doubleval($ret[0]);
-                            $height= doubleval($ret[1]);
-                            echo $width.'*'.$height;
                             ?>
                         </div>
                         <a nctype="btn_del_item_image" href="javascript:;" class="a1"><i class="icon-trash"></i>删除</a>

admin/templates/default/mb_special_item.module_home6.php

@@ -67,11 +67,11 @@
                             $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);
                             if(!$ret) {
                                 echo "无法获取当前图片尺寸。";
-                                return;
+                            } else {
+                                $width = doubleval($ret[0]);
+                                $height= doubleval($ret[1]);
+                                echo $width.'*'.$height;
                             }
-                            $width = doubleval($ret[0]);
-                            $height= doubleval($ret[1]);
-                            echo $width.'*'.$height;
                             ?>
                         </div>
                         <a nctype="btn_edit_item_image" data-desc="320*130" href="javascript:;"><i class="icon-edit"></i>编辑</a>

admin/templates/default/mb_special_item.module_home7.php

@@ -68,11 +68,11 @@
                             $ret = @getimagesize(getMbSpecialImageUrl($item_value['image']),$info);
                             if(!$ret) {
                                 echo "无法获取当前图片尺寸。";
-                                return;
+                            } else {
+                                $width = doubleval($ret[0]);
+                                $height= doubleval($ret[1]);
+                                echo $width.'*'.$height;
                             }
-                            $width = doubleval($ret[0]);
-                            $height= doubleval($ret[1]);
-                            echo $width.'*'.$height;
                             ?>
                         </div>
                         <a nctype="btn_edit_item_image" href="javascript:;" class="a2"><i class="icon-edit"></i>编辑</a>

helper/index_tab.php

@@ -40,10 +40,17 @@ class index_tab
 
     public function tabs()
     {
-        if(StatesHelper::fetch_state('tags')) {
-            $this->init();
+        if($_SESSION['is_lasted'])
+        {
+            if(StatesHelper::fetch_state('tags')) {
+                $this->init();
+            }
+            return $this->mTabs;
+        }
+        else {
+            global $config;
+            return $config['old_tabs'];
         }
-        return $this->mTabs;
     }
 
     private function init()

helper/special_helper.php

@@ -83,10 +83,12 @@ class special_formater
     private $special_id;
     private $filter_data;
     private $goods_ids;
+    private $old_version;
 
-    public function __construct($special_id)
+    public function __construct($special_id,$old_version = false)
     {
         $this->special_id = $special_id;
+        $this->old_version = $old_version;
         $this->read_cache();
     }
 
@@ -356,7 +358,7 @@ class special_formater
                 $block['item_type'] = 'home_goods';
             }
             elseif($key == 'home3') {
-                $scale = $block_scale;
+                if($this->old_version == false) $scale = $block_scale;
             }
             elseif($key == 'home6') {
                 $block['item_type'] = 'horizon';
@@ -717,12 +719,22 @@ class special_manager
             $data = $this->mContents[$special_id]['data'];
             $goods_ids = $this->mContents[$special_id]['gids'];
             return $data;
-        } else {
-            $formater = new special_formater($special_id);
+        }
+        else
+        {
+
+            $formater = new special_formater($special_id,$this->old_version($special_id));
             $data = $formater->format($goods_ids);
+
             $this->mContents[$special_id]['data'] = $data;
             $this->mContents[$special_id]['gids'] = $goods_ids;
             return $data;
         }
     }
+    private function old_version($special_id)
+    {
+        global $config;
+        if($_SESSION['is_lasted']) return false;
+        return in_array($special_id,$config['old_specials']);
+    }
 }

mobile/control/control.php

@@ -99,6 +99,26 @@ class mobileControl
             $_SESSION['client_version'] = $version;
         }
 
+        $version = intval($version * 100 + 0.5);
+        if($client == 'ios')
+        {
+            $lastest_version = 220;
+            if($version >= $lastest_version) {
+                $_SESSION['is_lasted'] = true;
+            } else {
+                $_SESSION['is_lasted'] = false;
+            }
+        }
+        elseif($client == 'android')
+        {
+            $lastest_version = 1400;
+            if($version >= $lastest_version) {
+                $_SESSION['is_lasted'] = true;
+            } else {
+                $_SESSION['is_lasted'] = false;
+            }
+        }
+
         return true;
     }
 

mobile/control/special.php

@@ -34,18 +34,12 @@ class specialControl extends mobileHomeControl
 
     protected function get_special($special_id)
     {
-        $start = microtime(true);
         $specials = special_manager::instance()->special($special_id,$goods_ids);
-        perfor_period("special",$start,"get_special");
-
 
         if (!empty($goods_ids))
         {
-            $start = microtime(true);
             $helper = new goods_helper();
             $goodsex = $helper->get_summary($goods_ids, $related_goods);
-            perfor_period("special",$start,"get_summary");
-
 
             return array('special_list' => $specials,
                 'summary' => $goodsex['summary'],

mobile/framework/function/function.php

@@ -43,7 +43,8 @@ function joutput_data($datas,$type='')
     $data['code'] = $code;
     $data['message'] = errcode::msg($code);
     $data['datas'] = $datas;
-//    ob_clean();
+
+    ob_clean();
     if(!empty($type) && $type == 'web') {
         echo(json_encode($data,JSON_UNESCAPED_UNICODE));
     } else {

test/activity_helperTest.php

@@ -42,6 +42,16 @@ class activity_helperTest extends PHPUnit_Framework_TestCase
         $ret = $helper->get_spu(2629,4182,$err);
     }
 
+    public function testTesterConfig()
+    {
+        $config['old_tabs'] = array(
+            array('special_id' => 110,'name' => "home3"),
+            array('special_id' => 181,'name' => "美妆教学"),
+            array('special_id' => 161,'name' => "公司动态"),
+            array('special_id' => 184,'name' => "热销榜单"));
+        $config['old_specials'] = array(0,23,74,87,105,110,182,184,186,187);
+    }
+
     public function testFull()
     {
         $contents = activity\full_sent::instance()->rules();