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

helper/func.php

@@ -1,11 +1,11 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: dell
  * Date: 2016/2/18
  * Time: 17:47
  */
-
 class func
 {
     // 添加图片路径
@@ -14,6 +14,12 @@ class func
         return UPLOAD_SITE_URL . '/shop/brand/' . $filename;
     }
 
+    // 添加图片路径
+    public static function format_brand_img_circle($filename)
+    {
+        return UPLOAD_SITE_URL . '/shop/brand/' . 'circle_' . $filename;
+    }
+
     /**
      * 添加图片路径
      */

mobile/control/brand.php

@@ -27,7 +27,7 @@ class brandControl extends mobileHomeControl
             foreach ($brand_c_list as $brand) {
                 $brand['brand_pic'] = func::format_brand_img_rect($brand['brand_pic']);
                 $brand['brand_img_bg'] = func::format_brand_img($brand['brand_img_bg']);
-                $brand['brand_img_logo'] = func::format_brand_img($brand['brand_img_logo']);
+                $brand['brand_img_logo'] = func::format_brand_img_circle($brand['brand_img_logo']);
                 if ($brand['brand_area_id'] == $brand_area['area_id']) {
                     if (empty($brand_area['data'])) {
                         $brand_area['data'] = array();

mobile/control/find.php

@@ -38,6 +38,8 @@ class findControl extends mobileHomeControl
      */
     public function category_list_2Op()
     {
+
+
         $category_list = Model()->table('category_item')->where(array('category_type' => 'keyword', 'enable' => '1'))->order('sort asc')->select();
 
         $result = array();