增加专题iTme 标题，以及解除广告条只能有一个

admin/control/mb_special.php

@@ -134,12 +134,12 @@ class mb_specialControl extends SystemControl{
         $param['item_type'] = $_POST['item_type'];
 
         //广告只能添加一个
-        if($param['item_type'] == 'adv_list') {
-            $result = $model_mb_special->isMbSpecialItemExist($param);
-            if($result) {
-                echo json_encode(array('error' => '广告条板块只能添加一个'));die;
-            }
-        }
+//        if($param['item_type'] == 'adv_list') {
+//            $result = $model_mb_special->isMbSpecialItemExist($param);
+//            if($result) {
+//                echo json_encode(array('error' => '广告条板块只能添加一个'));die;
+//            }
+//        }
 
         $item_info = $model_mb_special->addMbSpecialItem($param);
         if($item_info) {

admin/templates/default/mb_special_item.edit.php

@@ -58,6 +58,10 @@
       <span>
       <input id="btn_upload_image" type="file" name="special_image">
       </span> <span id="dialog_image_desc" class="dialog-image-desc"></span>
+
+      <h4 class="dialog-handle-title">标题：</h4>
+        <input id="dialog_item_image_title" type="text" class="txt w200 marginright marginbot vatop"><br />
+
       <h4 class="dialog-handle-title">操作类型：</h4>
       <div>
         <select id="dialog_item_image_type" name="" class="vatop">
@@ -83,6 +87,7 @@
         <input nctype="image_name" name="item_data[item][<%=image_name%>][image]" type="hidden" value="<%=image_name%>">
         <input nctype="image_type" name="item_data[item][<%=image_name%>][type]" type="hidden" value="<%=image_type%>">
         <input nctype="image_data" name="item_data[item][<%=image_name%>][data]" type="hidden" value="<%=image_data%>">
+        <input nctype="image_title" name="item_data[item][<%=image_name%>][title]" type="hidden" value="<%=image_title%>">
         <a nctype="btn_del_item_image" href="javascript:;" class="a1"><i class="icon-trash"></i>删除</a>
         <a nctype="btn_edit_item_image" href="javascript:;" class="a2"><i class="icon-edit"></i>编辑</a>
     </div>
@@ -100,6 +105,7 @@
         var $current_content = null;
         var $current_image = null;
         var $current_image_name = null;
+        var $current_image_title = null;
         var $current_image_type = null;
         var $current_image_data = null;
         var old_image = '';
@@ -107,6 +113,7 @@
         var $dialog_item_image_name = $('#dialog_item_image_name');
         var special_id = <?php echo $output['item_info']['special_id'];?>;
 
+
         //保存
         $('#btn_save').on('click', function() {
             $('#form_item').submit();
@@ -120,11 +127,14 @@
             $current_image_name = $item_image.find('[nctype="image_name"]');
             $current_image_type = $item_image.find('[nctype="image_type"]');
             $current_image_data = $item_image.find('[nctype="image_data"]');
+            $current_image_title = $item_image.find('[nctype="image_title"]');
 
             $('#dialog_item_image').attr('src', $current_image.attr('src'));
             $('#dialog_item_image_name').val($current_image_name.val());
             $('#dialog_item_image_type').val($current_image_type.val());
             $('#dialog_item_image_data').val($current_image_data.val());
+            $('#dialog_item_image_title').val($current_image_title.val());
+
             $('#dialog_image_desc').text('推荐图片尺寸' + $(this).attr('data-desc'));
             $('#dialog_type').val('edit');
             change_image_type_desc($('#dialog_item_image_type').val());
@@ -195,6 +205,7 @@
             $current_image_name.val($('#dialog_item_image_name').val());
             $current_image_type.val($('#dialog_item_image_type').val());
             $current_image_data.val($('#dialog_item_image_data').val());
+            $current_image_title.val($('#dialog_item_image_title').val());
         }
 
         function add_item_image_save() {
@@ -204,6 +215,7 @@
             item.image_name = $('#dialog_item_image_name').val();
             item.image_type = $('#dialog_item_image_type').val();
             item.image_data = $('#dialog_item_image_data').val();
+            item.image_title = $('#dialog_item_image_title').val();
             var $templateObj = template.render('item_image_template', item);
             $current_content.append($templateObj);
         }
@@ -221,7 +233,6 @@
                 desc_array['special'] = '专题编号会跳转到指定的专题，输入框填写专题编号。';
                 desc_array['goods'] = '商品编号会跳转到指定的商品详细页面，输入框填写商品编号。';
                 desc_array['url'] = '链接会跳转到指定链接，输入框填写完整的URL。';
-
                 desc_array['brand'] = '品牌编号会跳转到指定的品牌详细页面，输入框填写品牌编号。';
                 desc_array['category'] = '分类编号会跳转到指定的分类搜索结果页面，输入框填写分类。';
                 desc_array['innerurl'] = '内嵌网页打开，输入框填写完整的URL。';

admin/templates/default/mb_special_item.module_adv_list.php

@@ -33,6 +33,7 @@
       <input nctype="image_name" name="item_data[item][<?php echo $item_key;?>][image]" type="hidden" value="<?php echo $item_value['image'];?>">
       <input nctype="image_type" name="item_data[item][<?php echo $item_key;?>][type]" type="hidden" value="<?php echo $item_value['type'];?>">
       <input nctype="image_data" name="item_data[item][<?php echo $item_key;?>][data]" type="hidden" value="<?php echo $item_value['data'];?>">
+      <input nctype="image_title" name="item_data[item][<?php echo $item_key;?>][title]" type="hidden" value="<?php echo $item_value['title'];?>">
       <a nctype="btn_edit_item_image" href="javascript:;" class="a2"><i class="icon-edit"></i>编辑</a>
       <a nctype="btn_del_item_image" href="javascript:;" class="a1"><i class="icon-trash"></i>删除</a>
       <?php } ?>

admin/templates/default/mb_special_item.module_home1.php

@@ -38,6 +38,7 @@
       <input nctype="image_name" name="item_data[image]" type="hidden" value="<?php echo $item_data['image'];?>">
       <input nctype="image_type" name="item_data[type]" type="hidden" value="<?php echo $item_data['type'];?>">
       <input nctype="image_data" name="item_data[data]" type="hidden" value="<?php echo $item_data['data'];?>">
+      <input nctype="image_title" name="item_data[data]" type="hidden" value="<?php echo $item_data['title'];?>">
       <a nctype="btn_edit_item_image" data-desc="640*260" href="javascript:;"><i class="icon-edit"></i>编辑</a>
       <?php } ?>
     </div>

admin/templates/default/mb_special_item.module_home2.php

@@ -39,6 +39,8 @@
         <input nctype="image_name" name="item_data[square_image]" type="hidden" value="<?php echo $item_data['square_image'];?>">
         <input nctype="image_type" name="item_data[square_type]" type="hidden" value="<?php echo $item_data['square_type'];?>">
         <input nctype="image_data" name="item_data[square_data]" type="hidden" value="<?php echo $item_data['square_data'];?>">
+        <input nctype="image_title" name="item_data[square_title]" type="hidden" value="<?php echo $item_data['square_title'];?>">
+
         <a nctype="btn_edit_item_image" data-desc="320*260" href="javascript:;"><i class="icon-edit"></i>编辑</a>
         <?php } ?>
       </div>
@@ -50,6 +52,8 @@
           <input nctype="image_name" name="item_data[rectangle1_image]" type="hidden" value="<?php echo $item_data['rectangle1_image'];?>">
           <input nctype="image_type" name="item_data[rectangle1_type]" type="hidden" value="<?php echo $item_data['rectangle1_type'];?>">
           <input nctype="image_data" name="item_data[rectangle1_data]" type="hidden" value="<?php echo $item_data['rectangle1_data'];?>">
+          <input nctype="image_title" name="item_data[rectangle1_title]" type="hidden" value="<?php echo $item_data['rectangle1_title'];?>">
+
           <a nctype="btn_edit_item_image" data-desc="320*130" href="javascript:;"><i class="icon-edit"></i>编辑</a>
           <?php } ?>
         </div>
@@ -60,6 +64,8 @@
           <input nctype="image_name" name="item_data[rectangle2_image]" type="hidden" value="<?php echo $item_data['rectangle2_image'];?>">
           <input nctype="image_type" name="item_data[rectangle2_type]" type="hidden" value="<?php echo $item_data['rectangle2_type'];?>">
           <input nctype="image_data" name="item_data[rectangle2_data]" type="hidden" value="<?php echo $item_data['rectangle2_data'];?>">
+          <input nctype="image_title" name="item_data[rectangle2_title]" type="hidden" value="<?php echo $item_data['rectangle2_title'];?>">
+
           <a nctype="btn_edit_item_image" data-desc="320*130" href="javascript:;"><i class="icon-edit"></i>编辑</a>
           <?php } ?>
         </div>

admin/templates/default/mb_special_item.module_home3.php

@@ -41,6 +41,7 @@
       <input nctype="image_name" name="item_data[item][<?php echo $item_key;?>][image]" type="hidden" value="<?php echo $item_value['image'];?>">
       <input nctype="image_type" name="item_data[item][<?php echo $item_key;?>][type]" type="hidden" value="<?php echo $item_value['type'];?>">
       <input nctype="image_data" name="item_data[item][<?php echo $item_key;?>][data]" type="hidden" value="<?php echo $item_value['data'];?>">
+      <input nctype="image_title" name="item_data[item][<?php echo $item_key;?>][data]" type="hidden" value="<?php echo $item_value['title'];?>">
       <a nctype="btn_del_item_image" href="javascript:;"><i class="icon-trash"></i>删除</a>
       <?php } ?>
     </div>

admin/templates/default/mb_special_item.module_home4.php

@@ -40,6 +40,7 @@
           <input nctype="image_name" name="item_data[rectangle1_image]" type="hidden" value="<?php echo $item_data['rectangle1_image'];?>">
           <input nctype="image_type" name="item_data[rectangle1_type]" type="hidden" value="<?php echo $item_data['rectangle1_type'];?>">
           <input nctype="image_data" name="item_data[rectangle1_data]" type="hidden" value="<?php echo $item_data['rectangle1_data'];?>">
+          <input nctype="image_title" name="item_data[rectangle1_title]" type="hidden" value="<?php echo $item_data['rectangle1_title'];?>">
           <a nctype="btn_edit_item_image" data-desc="320*130" href="javascript:;"><i class="icon-edit"></i>编辑</a>
           <?php } ?>
         </div>
@@ -49,6 +50,7 @@
             <input nctype="image_name" name="item_data[rectangle2_image]" type="hidden" value="<?php echo $item_data['rectangle2_image'];?>">
             <input nctype="image_type" name="item_data[rectangle2_type]" type="hidden" value="<?php echo $item_data['rectangle2_type'];?>">
             <input nctype="image_data" name="item_data[rectangle2_data]" type="hidden" value="<?php echo $item_data['rectangle2_data'];?>">
+            <input nctype="image_title" name="item_data[rectangle2_title]" type="hidden" value="<?php echo $item_data['rectangle2_title'];?>">
             <a nctype="btn_edit_item_image" data-desc="320*130" href="javascript:;"><i class="icon-edit"></i>编辑</a>
             <?php } ?>
           </div>
@@ -61,6 +63,7 @@
         <input nctype="image_name" name="item_data[square_image]" type="hidden" value="<?php echo $item_data['square_image'];?>">
         <input nctype="image_type" name="item_data[square_type]" type="hidden" value="<?php echo $item_data['square_type'];?>">
         <input nctype="image_data" name="item_data[square_data]" type="hidden" value="<?php echo $item_data['square_data'];?>">
+        <input nctype="image_title" name="item_data[square_title]" type="hidden" value="<?php echo $item_data['square_title'];?>">
         <a nctype="btn_edit_item_image" data-desc="320*260" href="javascript:;"><i class="icon-edit"></i>编辑</a>
         <?php } ?>
       </div>

admin/templates/default/mb_special_item.module_home5.php

@@ -40,6 +40,7 @@
             <input nctype="image_name" name="item_data[item][<?php echo $item_key;?>][image]" type="hidden" value="<?php echo $item_value['image'];?>">
             <input nctype="image_type" name="item_data[item][<?php echo $item_key;?>][type]" type="hidden" value="<?php echo $item_value['type'];?>">
             <input nctype="image_data" name="item_data[item][<?php echo $item_key;?>][data]" type="hidden" value="<?php echo $item_value['data'];?>">
+            <input nctype="image_titlte" name="item_data[item][<?php echo $item_key;?>][data]" type="hidden" value="<?php echo $item_value['title'];?>">
             <a nctype="btn_del_item_image" href="javascript:;" class="a1"><i class="icon-trash"></i>删除</a>
             <a nctype="btn_edit_item_image" href="javascript:;" class="a2"><i class="icon-edit"></i>编辑</a>
           <?php } ?>

helper/search_helper.php

@@ -13,7 +13,7 @@ function comp_history($left,$right)
     $t_r = intval($right['add_time']);
 
     if($t_l > $t_r) {
-        return 1;
+        return -1;
     }
     elseif($t_l == $t_r)
     {
@@ -31,11 +31,11 @@ function comp_history($left,$right)
         }
     }
     else {
-        return -1;
+        return 1;
     }
 }
 
-class search_helper
+class history_helper
 {
     private $mContainer;
 
@@ -83,7 +83,7 @@ class search_helper
         return true;
     }
 
-    public function get_words()
+    public function histories()
     {
         $result = [];
         foreach ($this->mContainer as $key => $value) {

helper/search/searcher.php

@@ -224,8 +224,10 @@ class searcher
 {
     private $name_dict;
     private $jingle_dict;
+
     private $brand_dict;
     private $category_dict;
+
     private static $stInstance;
 
     public static function instance()

helper/search/tcp_client.php

@@ -55,13 +55,13 @@ class tcp_client
         return false;
     }
 
-    public function get_result($word)
+    public function get_result($params)
     {
         if($this->init_socket() == false) {
             return false;
         }
 
-        $param = array("type" => processor::SearchReasult, "keyword" => $word);
+        $param = array("type" => processor::SearchReasult, "params" => $params);
         $ret = $this->write_param($param);
 
         if($ret == true)

mobile/control/search.php

@@ -6,10 +6,51 @@ defined('InShopNC') or exit('Access Invalid!');
 require_once (BASE_ROOT_PATH . '/helper/category_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/goods_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/search_helper.php');
-require_once(BASE_ROOT_PATH . '/helper/search/searcher.php');
-require_once(BASE_ROOT_PATH . '/helper/search/server.php');
-require_once(BASE_ROOT_PATH . '/helper/search/processor.php');
-require_once(BASE_ROOT_PATH . '/helper/search/tcp_client.php');
+require_once (BASE_ROOT_PATH . '/helper/search/searcher.php');
+require_once (BASE_ROOT_PATH . '/helper/search/server.php');
+require_once (BASE_ROOT_PATH . '/helper/search/processor.php');
+require_once (BASE_ROOT_PATH . '/helper/search/tcp_client.php');
+
+class search_param
+{
+    private $mKeyWord;
+    private $mBrandId;
+    private $mHotId;
+
+    public function __construct($param)
+    {
+        $this->mKeyWord = '';
+        $this->mBrandId = 0;
+        $this->mHotId = 0;
+
+        if (!empty(trim($param['keyword']))) {
+            $this->mKeyWord = trim(urldecode($param['keyword']));
+            $helper = new history_helper();
+            $helper->add_word($this->mKeyWord);
+        }
+        if (intval($param['brand_id']) > 0) {
+            $this->mBrandId = intval($param['brand_id']);
+        }
+        if (!empty(trim($param['hot_id']))) {
+            $this->mHotId = intval($param['hot_id']);
+        }
+    }
+
+    public function format()
+    {
+        if(empty($this->mKeyWord || $this->mBrandId == 0 || $this->mHotId == 0)) {
+            return false;
+        }
+        else {
+            $result = [];
+            $result['keyword']  = $this->mKeyWord;
+            $result['brand_id'] = $this->mBrandId;
+            $result['hot_id']   = $this->mHotId;
+
+            return $result;
+        }
+    }
+}
 
 class searchControl extends mobileHomeControl
 {
@@ -20,13 +61,17 @@ class searchControl extends mobileHomeControl
 
     public function indexOp()
     {
-        $condition = $this->condition();
-        if(empty($condition)) {
+        $param = new search_param();
+        $params = $param->format();
+        if($params == false) {
             return self::outerr(errcode::ErrParamter);
+        } else {
+            $result = search\tcp_client::instance()->get_result($params);
         }
         $order = $this->get_order($_GET['key'], $_GET['order']);
 
         $model_goods = Model('goods');
+        $condition = [];
         $goods_list = $model_goods->getGoodsListByColorDistinct($condition, goods_helper::fieldstr, $order, $this->page_size());
         $page_count = $model_goods->gettotalpage();
         $model_goods->cls();
@@ -81,11 +126,12 @@ class searchControl extends mobileHomeControl
 
     public function historyOp()
     {
-        $helper = new search_helper();
-        $result = $helper->get_words();
+        $helper = new history_helper();
+        $result = $helper->histories();
         $result = $this->separate_page($result,$pages);
         return self::outsuccess(array('words' => $result,'mobile_page' => mobile_page($pages)));
     }
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     /**
      * @return array
@@ -100,7 +146,7 @@ class searchControl extends mobileHomeControl
         // 关键字
         if (!empty(trim($_GET['keyword']))) {
             $word = trim(urldecode($_GET['keyword']));
-            $helper = new search_helper();
+            $helper = new history_helper();
             $helper->add_word($word);
             $condition['goods_name|goods_jingle'] = array('like', '%' . urldecode($_GET['keyword']) . '%');
         }

mobile/control/special.php

@@ -24,7 +24,8 @@ class specialControl extends mobileHomeControl
 
     public function indexOp()
     {
-        if(!isset($_GET['special_id']) || empty($_GET['special_id'])) {
+        $special_id = intval($_GET['special_id']);
+        if($special_id <= 0) {
             return self::outerr(errcode::ErrParamter);
         }