a

service/Application/Admin/View/Default/AlipayLifeMenu/Index.html

@@ -102,7 +102,7 @@
                                 </div>
                             </td>
                             <td class="view-operation">
-                                <if condition="in_array($v['status'], [1,4])">
+                                <if condition="in_array($v['status'], [0,4])">
                                     <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-send-o submit-ajax" data-url="{{:U('Admin/AlipayLifeMenu/Release')}}" data-id="{{$v.id}}" data-view="reload"> {{:L('common_operation_release')}}</button>
 
                                     <a href="{{:U('Admin/AlipayLifeMenu/ContentIndex', array('menu_id'=>$v['id']))}}">
@@ -116,11 +116,9 @@
                                     <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:U('Admin/AlipayLifeMenu/Delete')}}" data-id="{{$v.id}}"> {{:L('common_operation_delete')}}</button>
                                 </if>
 
-                                <if condition="in_array($v['status'], [2,3,4])">
-                                    <a href="{{:U('Admin/AlipayLifeMenu/Detail', array('message_id'=>$v['id']))}}">
-                                        <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-align-left"> {{:L('alipay_life_menu_detail_text')}}</button>
-                                    </a>
-                                </if>
+                                <a href="{{:U('Admin/AlipayLifeMenu/Detail', array('message_id'=>$v['id']))}}">
+                                    <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-align-left"> {{:L('alipay_life_menu_detail_text')}}</button>
+                                </a>
                             </td>
                         </tr>
                     </foreach>

service/Application/Admin/View/Default/AlipayLifeMessage/Index.html

@@ -123,11 +123,9 @@
                                     <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:U('Admin/AlipayLifeMessage/Delete')}}" data-id="{{$v.id}}"> {{:L('common_operation_delete')}}</button>
                                 </if>
 
-                                <if condition="in_array($v['status'], [2,3])">
-                                    <a href="{{:U('Admin/AlipayLifeMessage/Detail', array('message_id'=>$v['id']))}}">
-                                        <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-align-left"> {{:L('alipay_life_message_detail_text')}}</button>
-                                    </a>
-                                </if>
+                                <a href="{{:U('Admin/AlipayLifeMessage/Detail', array('message_id'=>$v['id']))}}">
+                                    <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-align-left"> {{:L('alipay_life_message_detail_text')}}</button>
+                                </a>
                             </td>
                         </tr>
                     </foreach>

service/Application/Admin/View/Default/Article/Index.html

@@ -67,12 +67,12 @@
 					<foreach name="list" item="v">
 						<tr id="data-list-{{$v.id}}" <if condition="$v['is_enable'] eq 0">class="am-active"</if>>
 							<td  class="td-title">
-								<a href="javascript:;" target="_blank" title="{{$v.title}}" <if condition="!empty($v['title_color'])"> style="color:{{$v.title_color}};" </if> >{{$v.title}}</a>
+								<a href="{{:HomeUrl('Article', 'Index', ['id'=>$v['id']])}}" target="_blank" title="{{$v.title}}" <if condition="!empty($v['title_color'])"> style="color:{{$v.title_color}};" </if> >{{$v.title}}</a>
 							</td>
 							<td class="am-hide-sm-only">{{$v.article_category_name}}</td>
 							<td class="am-hide-sm-only">{{$v.access_count}}</td>
 							<td>
-								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_enable'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Article/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-is-update-status="1"></a>
+								<a href="{{:HomeUrl('Article', 'Index', ['id'=>$v['id']])}}" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_enable'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Article/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-is-update-status="1"></a>
 							</td>
 							<td>
 								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_home_recommended'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Article/StatusHomeRecommended')}}" data-id="{{$v.id}}" data-state="{{$v['is_home_recommended']}}"></a>

service/Application/Common/Lang/zh-cn.php

@@ -553,7 +553,7 @@ return array(
 	// 支付宝生活号菜单类型
 	'common_alipay_life_menu_type_list'	=>	array(
 			0 => array('value' => 0, 'name' => '文字'),
-			1 => array('value' => 1, 'name' => '图标+文字'),
+			1 => array('value' => 1, 'name' => '文字+图标'),
 		),
 
 

service/Application/Home/Controller/SearchController.class.php

@@ -41,8 +41,11 @@ class SearchController extends CommonController
         $this->params['keywords'] = trim(I('keywords'));
 
         // 排序方式
-        $this->params['order_type'] = I('order_type', 'default');
-        $this->params['order_way'] = I('order_way', 'desc');
+        $this->params['order_by_field'] = I('order_by_field', 'default');
+        $this->params['order_by_type'] = I('order_by_type', 'desc');
+
+        // 用户信息
+        $this->params['user_id'] = isset($this->user['id']) ? $this->user['id'] : 0;
     }
     
     /**
@@ -58,9 +61,6 @@ class SearchController extends CommonController
         {
             $this->redirect('Home/Search/Index', ['keywords'=>$this->params['keywords']]);
         } else {
-            // 搜索记录
-            SearchService::SearchAdd($this->params);
-
             // 品牌列表
             $this->assign('brand_list', BrandService::CategoryBrandList(['category_id'=>$this->params['category_id']]));
 
@@ -86,11 +86,7 @@ class SearchController extends CommonController
      * @desc    description
      */
     public function GoodsList()
-    {
-        // 参数处理
-        $this->params['order_by_field'] = trim(I('order_by_field', 'default'));
-        $this->params['order_by_type'] = trim(I('order_by_type', 'desc'));
-        
+    {        
         // 获取商品列表
         $data = SearchService::GoodsList($this->params);
         if(empty($data['data']))
@@ -101,6 +97,11 @@ class SearchController extends CommonController
             $msg = L('common_operation_success');
             $code = 0;
         }
+
+        // 搜索记录
+        SearchService::SearchAdd($this->params);
+
+        // 返回
         $this->ajaxReturn($msg, $code, $data);
     }
 }

service/Application/Service/SearchService.class.php

@@ -137,7 +137,24 @@ class SearchService
      */
     public static function SearchAdd($params = [])
     {
+        // 筛选价格
+        $screening_price = '';
+        if(!empty($params['screening_price_id']))
+        {
+            $price = M('ScreeningPrice')->field('min_price,max_price')->where(['is_enable'=>1, 'id'=>intval($params['screening_price_id'])])->find();
+            if(!empty($price))
+            {
+                $screening_price = $price['min_price'].'-'.$price['max_price'];
+            }
+        }
         
+        // 参数
+        $params['screening_price'] = $screening_price;
+        $params['ymd'] = date('Ymd');
+        $params['add_time'] = time();
+
+        // 添加日志
+        M('SearchHistory')->add($params);
     }
 
     /**
@@ -150,7 +167,7 @@ class SearchService
      */
     public function SearchKeywordsList($params = [])
     {
-        return ['自动的', '自动2'];
+        return M('SearchHistory')->where(['keywords'=>['neq', '']])->group('keywords')->limit(10)->getField('keywords', true);
     }
 }
 ?>
\ No newline at end of file