Merge branch 'develop' of zhengxifeng/zc100 into master

template/pc/components/detail/cl.htm

             if((int)$product_tag_id === 0){
                 $where = " typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id=0 ".$where." OR typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id>0".$where; //and is_recom=1
             }else{
-                $where = " typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id=0 ".$where." OR typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id=".$product_tag_id.$where; //and is_recom=1
+                $where = " typeid=1232 and is_del=0 and status=1 and province_id=0 ".$where." OR typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id=".$product_tag_id.$where; //and is_recom=1 //and product_tag_id=0
             }
 
-            $sql = "select aid from ey_archives where $where order by product_tag_id desc,update_time desc limit 0,6";
+            $sql = "select aid from ey_archives where $where order by product_tag_id desc,click desc,update_time desc limit 0,6";
 
             //echo $sql;
             ?>

template/pc/components/detail/content.htm

             if((int)$product_tag_id === 0){
                 $where = " typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id=0 ".$where." OR typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id>0".$where; //and is_recom=1
             }else{
-                $where = " typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id=0 ".$where." OR typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id=".$product_tag_id.$where; //and is_recom=1
+                $where = " typeid=".$tid." and is_del=0 and status=1 and province_id=0 ".$where." OR typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id=".$product_tag_id.$where; //and is_recom=1 //and product_tag_id=0
             }
 
             $sql = "select aid from ey_archives where $where order by product_tag_id desc,update_time desc limit 0,6";
                 if((int)$product_tag_id === 0){
                     $where = " typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id=0 ".$where." OR typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id>0".$where; //and is_recom=1
                 }else{
-                    $where = " typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id=0 ".$where." OR typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id=".$product_tag_id.$where; //and is_recom=1
+                    $where = " typeid=".$tid." and is_del=0 and status=1 and province_id=0 ".$where." OR typeid=".$tid." and is_del=0 and status=1 and province_id=0 and product_tag_id=".$product_tag_id.$where; //and is_recom=1 //and product_tag_id=0
                 }
                 //优先标签前置
-                $sql = "select aid from ey_archives where $where order by product_tag_id desc,update_time desc limit 0,".$num;
+                $sql = "select aid from ey_archives where $where order by product_tag_id desc,click desc,update_time desc limit 0,".$num;
                 //var_dump($sql);
             ?>
 
             if((int)$product_tag_id === 0){
                 $where = " typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id=0 OR typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id>0"; //and is_recom=1
             }else{
-                $where = " typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id=0 OR typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id=$product_tag_id"; //and is_recom=1
+                $where = " typeid=1233 and is_del=0 and status=1 and province_id=0  OR typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id=$product_tag_id"; //and is_recom=1 //and product_tag_id=0
             }
 
-            $sql = "select aid from ey_archives where $where order by product_tag_id desc,update_time desc limit 0,6";
+            $sql = "select aid from ey_archives where $where order by product_tag_id desc,click desc,update_time desc limit 0,6";
 
             //echo $sql;
             ?>

template/pc/components/detail/new.htm

                 if((int)$product_tag_id === 0){
                     $where = " typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id=0 OR typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id > 0"; //and is_recom=1
                 }else{
-                    $where = " typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id=0 OR typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id=$product_tag_id"; //and is_recom=1
+                    $where = " typeid=1232 and is_del=0 and status=1 and province_id=0  OR typeid=1232 and is_del=0 and status=1 and province_id=0 and product_tag_id=$product_tag_id"; //and is_recom=1 //and product_tag_id=0
                 }
 
 
             if((int)$product_tag_id === 0){
                 $where = " typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id=0 OR typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id>0"; //and is_recom=1
             }else{
-                $where = " typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id=0 OR typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id=$product_tag_id"; //and is_recom=1
+                $where = " typeid=1233 and is_del=0 and status=1 and province_id=0 OR typeid=1233 and is_del=0 and status=1 and province_id=0 and product_tag_id=$product_tag_id"; //and is_recom=1 //and product_tag_id=0
             }
 
-            $sql = "select aid from ey_archives where $where order by product_tag_id desc,update_time desc limit 0,6";
+            $sql = "select aid from ey_archives where $where order by product_tag_id desc,click desc,update_time desc limit 0,6";
 
             //echo $sql;
             ?>