渲染页面

@@ -15,7 +15,6 @@ use think\Config;
 
 
 class LoginController extends HomeBaseController
 class LoginController extends HomeBaseController
 {
 {
-    private $config;
 
 
     //登录页面
     //登录页面
     public function login(){
     public function login(){
@@ -101,9 +100,8 @@ class LoginController extends HomeBaseController
     }
     }
 
 
     //首页个人中心
     //首页个人中心
-    public function getInfo(){
-        $avatar = session('avatar');
-        $this->assign('avatar',$avatar);
+    public function info(){
+        return $this->fetch();
     }
     }
 
 
     //首页个人中心修改头像
     //首页个人中心修改头像
@@ -132,8 +130,8 @@ class LoginController extends HomeBaseController
                 $userModel = new UserModel();
                 $userModel = new UserModel();
                 $res = $userModel->allowField(true)->update(['id'=>$id,'avatar'=>$avatar]);
                 $res = $userModel->allowField(true)->update(['id'=>$id,'avatar'=>$avatar]);
                 if($res){
                 if($res){
-
-                    session('avatar', $avatar);
+                    $userInfo = $userModel->where('id',$id)->find();
+                    cmf_update_current_user($userInfo);
                     $this->apiResponse(1,'上传成功！');
                     $this->apiResponse(1,'上传成功！');
                 }else{
                 }else{
                     $this->apiResponse(0,'上传失败！');
                     $this->apiResponse(0,'上传失败！');
@@ -148,10 +146,6 @@ class LoginController extends HomeBaseController
 
 
     //个人中心编辑页面
     //个人中心编辑页面
     public function editInfo(){
     public function editInfo(){
-        $avatar = session('avatar');
-        $nickname = session('nickname');
-        $this->assign('avatar',$avatar);
-        $this->assign('nickname',$nickname);
         return $this->fetch();
         return $this->fetch();
     }
     }
 
 
@@ -165,10 +159,11 @@ class LoginController extends HomeBaseController
             $id = cmf_get_current_user_id();
             $id = cmf_get_current_user_id();
             $res = $userModel->allowField(true)->update(['id'=>$id,'user_nickname'=>$nickname]);
             $res = $userModel->allowField(true)->update(['id'=>$id,'user_nickname'=>$nickname]);
             if($res){
             if($res){
-                session('user_nickname', $nickname);
-                $this->apiResponse(1,'成功！');
+                $userInfo = $userModel->where('id',$id)->find();
+                cmf_update_current_user($userInfo);
+                $this->apiResponse(1,'保存成功！');
             }else{
             }else{
-                $this->apiResponse(0,'失败！');
+                $this->apiResponse(0,'保存失败！');
             }
             }
         }else{
         }else{
             $this->apiResponse(0,'请登录后修改资料！');
             $this->apiResponse(0,'请登录后修改资料！');

@@ -150,6 +150,7 @@ class RegionController extends HomeBaseController
             $value['city_name'] = $this->getCityCategory($value['city_id']);
             $value['city_name'] = $this->getCityCategory($value['city_id']);
         }
         }
         $this->assign('res',$res);
         $this->assign('res',$res);
+        return $this->fetch();
     }
     }
 
 
     //明星访谈更多
     //明星访谈更多

@@ -24,6 +24,10 @@ class StarController extends HomeBaseController
     public function index(){
     public function index(){
         //按照城市查询
         //按照城市查询
         $city_id = $this->request->param('city_id');
         $city_id = $this->request->param('city_id');
+        //查询城市名称
+        $city_name = $this->getCityName($city_id);
+        $this->assign('city_name',$city_name);
+        $this->assign('city_id',$city_id);
         $position['city_id'] = $city_id;
         $position['city_id'] = $city_id;
         //星球故事
         //星球故事
         $position['category_id'] = CityCategoryModel::xqgs;
         $position['category_id'] = CityCategoryModel::xqgs;
@@ -35,8 +39,12 @@ class StarController extends HomeBaseController
                 $value['audio'] = $more['audio'];
                 $value['audio'] = $more['audio'];
             }
             }
         }
         }
+        if($res_xqgs){
+            $res_xqgs = $res_xqgs[0];
+        }
         $this->assign('res_xqgs',$res_xqgs);
         $this->assign('res_xqgs',$res_xqgs);
 
 
+
         //网红美景
         //网红美景
         $position['category_id'] = CityCategoryModel::whmj;
         $position['category_id'] = CityCategoryModel::whmj;
         $field = 'id,thumbnail,post_title,post_hits,post_favorites';
         $field = 'id,thumbnail,post_title,post_hits,post_favorites';
@@ -52,8 +60,8 @@ class StarController extends HomeBaseController
         //良宿美寝
         //良宿美寝
         $position['category_id'] = CityCategoryModel::lsmq;
         $position['category_id'] = CityCategoryModel::lsmq;
         $field = 'id,thumbnail,post_title';
         $field = 'id,thumbnail,post_title';
-        $res_lsmj = $this->getChildArticle($position,$field,$this->index_limit);
-        $this->assign('res_lsmj',$res_lsmj);
+        $res_lsmq = $this->getChildArticle($position,$field,$this->index_limit);
+        $this->assign('res_lsmq',$res_lsmq);
 
 
         //活力生态
         //活力生态
         $position['category_id'] = CityCategoryModel::hlst;
         $position['category_id'] = CityCategoryModel::hlst;
@@ -69,12 +77,22 @@ class StarController extends HomeBaseController
         return $this->fetch();
         return $this->fetch();
     }
     }
 
 
+    //获取城市名称
+    public function getCityName($city_id){
+        $city_name = Db::name('city_category')
+            ->where('id',$city_id)
+            ->field('id,name')
+            ->find();
+        $city_name = empty($city_name)?'':$city_name['name'];
+        return $city_name;
+    }
+
     //根据子类获取文章
     //根据子类获取文章
     public function getChildArticle($position,$field,$limit=''){
     public function getChildArticle($position,$field,$limit=''){
         $pre = CityCategoryModel::pre;
         $pre = CityCategoryModel::pre;
         $limit = empty($limit)?0:$limit;
         $limit = empty($limit)?0:$limit;
         $post_id = Db::table($pre.'portal_category_post')
         $post_id = Db::table($pre.'portal_category_post')
-            ->whereIn('category_id',$position['category_id'])
+            ->where('category_id',$position['category_id'])
             ->field('post_id')
             ->field('post_id')
             ->select()
             ->select()
             ->toArray();
             ->toArray();
@@ -93,9 +111,9 @@ class StarController extends HomeBaseController
     }
     }
 
 
     //根据子类获取文章分页
     //根据子类获取文章分页
-    public function getChildArticlePage($position,$field,$page){
+    public function getChildArticlePage($position,$field,$limit = ''){
         $pre = CityCategoryModel::pre;
         $pre = CityCategoryModel::pre;
-        $limit = $this->more_limit;
+        $limit = empty($limit)?$this->more_limit:$limit;
         $post_id = Db::table($pre.'portal_category_post')
         $post_id = Db::table($pre.'portal_category_post')
             ->whereIn('category_id',$position['category_id'])
             ->whereIn('category_id',$position['category_id'])
             ->field('post_id')
             ->field('post_id')
@@ -108,10 +126,10 @@ class StarController extends HomeBaseController
             ->where('city_id',$position['city_id'])
             ->where('city_id',$position['city_id'])
             ->where('delete_time', 0)
             ->where('delete_time', 0)
             ->field($field)
             ->field($field)
-            ->page($page,$limit)
             ->order('weigh desc')
             ->order('weigh desc')
-            ->select()
-            ->toArray();
+            ->paginate($limit,false,['query'=>request()->param()]);
+        $res['data'] = $res->toArray();
+        $res['page'] = $res->render();
         return $res;
         return $res;
     }
     }
 
 
@@ -162,11 +180,17 @@ class StarController extends HomeBaseController
 
 
     //良宿美寝更多
     //良宿美寝更多
     public function getMoreHotel(){
     public function getMoreHotel(){
-        $page = $this->request->param('page',1,'intval');
+        $city_id = $this->request->param('city_id',0,'intval');
+        //查询城市名称
+        $city_name = $this->getCityName($city_id);
+        $this->assign('city_name',$city_name);
+
         $position['category_id'] = CityCategoryModel::lsmq;
         $position['category_id'] = CityCategoryModel::lsmq;
+        $position['city_id'] = $city_id;
         $field = 'id,thumbnail,post_title';
         $field = 'id,thumbnail,post_title';
-        $res = $this->getChildArticlePage($position,$field,$page);
+        $res = $this->getChildArticlePage($position,$field);
         $this->assign('res',$res);
         $this->assign('res',$res);
+        return $this->fetch();
     }
     }
 
 
     //良宿美寝详情
     //良宿美寝详情
@@ -204,11 +228,18 @@ class StarController extends HomeBaseController
 
 
     //便利出行更多
     //便利出行更多
     public function getMoreTravel(){
     public function getMoreTravel(){
-        $page = $this->request->param('page',1,'intval');
+        $city_id = $this->request->param('city_id',0,'intval');
+        //查询城市名称
+        $city_name = $this->getCityName($city_id);
+        $this->assign('city_name',$city_name);
+
         $position['category_id'] = CityCategoryModel::blcx;
         $position['category_id'] = CityCategoryModel::blcx;
+        $position['city_id'] = $city_id;
         $field = 'id,thumbnail,post_title,post_excerpt';
         $field = 'id,thumbnail,post_title,post_excerpt';
-        $res = $this->getChildArticlePage($position,$field,$page);
-        $this->assign('res',$res);
+        $res = $this->getChildArticlePage($position,$field);
+        $this->assign('res',$res['data']);
+        $this->assign('page',$res['page']);
+        return $this->fetch();
     }
     }
 
 
     //便利出行详情
     //便利出行详情
@@ -221,6 +252,7 @@ class StarController extends HomeBaseController
             $res['image_url'] = isset($more['photos']) && !empty($more['photos'])?$more['photos'][0]['url']:'';
             $res['image_url'] = isset($more['photos']) && !empty($more['photos'])?$more['photos'][0]['url']:'';
         }
         }
         $this->assign('res',$res);
         $this->assign('res',$res);
+        return $this->fetch();
     }
     }
 
 
     //获取文章详情(评论列表)
     //获取文章详情(评论列表)
@@ -232,13 +264,9 @@ class StarController extends HomeBaseController
             ->find();
             ->find();
         $contentModel = new PortalPostModel();
         $contentModel = new PortalPostModel();
         $res['post_content'] = $contentModel->getPostContentAttr($res['post_content']);
         $res['post_content'] = $contentModel->getPostContentAttr($res['post_content']);
-        $comment = Db::name('comment')
-            ->alias('c')
-            ->join('user u','c.user_id = u.id','LEFT')
-            ->where(['c.status'=>1,'post_id'=>$id])
-            ->field('u.user_nickname nickname,u.avatar,c.content,c.create_time')
-            ->select()->toArray();
-        $res['comment'] = $comment;
+        //查看数+1
+        $postModel = new PortalPostModel();
+        $postModel->where('id',$id)->setInc('post_hits', 1);
         return $res;
         return $res;
     }
     }
 
 
@@ -260,12 +288,12 @@ class StarController extends HomeBaseController
         //判断是否登录
         //判断是否登录
         $login = cmf_is_user_login();
         $login = cmf_is_user_login();
         $article_id = $this->request->param('article_id');//文章id
         $article_id = $this->request->param('article_id');//文章id
-        $comment = $this->request->param('comment');//评论内容
+        $content = $this->request->param('content');//评论内容
         $url = $this->request->param('url');//评论文章链接
         $url = $this->request->param('url');//评论文章链接
         if($login){
         if($login){
             $data['user_id'] = cmf_get_current_user_id();
             $data['user_id'] = cmf_get_current_user_id();
             $data['post_id'] = $article_id;
             $data['post_id'] = $article_id;
-            $data['content'] = $comment;
+            $data['content'] = $content;
             $data['url'] = $url;
             $data['url'] = $url;
             $data['create_time'] = time();
             $data['create_time'] = time();
             $validate = new CommentValidate();
             $validate = new CommentValidate();

@@ -11,13 +11,13 @@ class CommentValidate extends Validate
 {
 {
     protected $rule = [
     protected $rule = [
         'post_id' => 'require|number',
         'post_id' => 'require|number',
-        'comment' => 'require',
+        'content' => 'require',
         'url'     => 'require'
         'url'     => 'require'
     ];
     ];
     protected $message = [
     protected $message = [
         'post_id.require' => '评论文章id不能为空！',
         'post_id.require' => '评论文章id不能为空！',
         'post_id.number'  => '评论文章id必须为数字！',
         'post_id.number'  => '评论文章id必须为数字！',
-        'comment.require' => '评论内容不能为空！',
+        'content.require' => '评论内容不能为空！',
         'url.require'     => '文章链接不能为空！',
         'url.require'     => '文章链接不能为空！',
     ];
     ];
 
 

@@ -8,6 +8,7 @@
 	<link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment.css">
 	<link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment.css">
 	<link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
 	<link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
 	<link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment_outdoors.css">
 	<link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment_outdoors.css">
+	<link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
 </head>
 </head>
 
 
 <body>
 <body>
@@ -22,6 +23,10 @@
 		</div>
 		</div>
 	</div>
 	</div>
 	<main>
 	<main>
+		<!--彈出框-->
+		<div class="mask">
+
+		</div>
 		<div class="container">
 		<div class="container">
 			<div class="outdoors">
 			<div class="outdoors">
 				<div class="outdoors_title clearfix">
 				<div class="outdoors_title clearfix">

@@ -40,7 +40,7 @@
                     <p>北美洲</p>
                     <p>北美洲</p>
                     <ul class="star_happy_box">
                     <ul class="star_happy_box">
                         <volist name="res_city.north" id="vo">
                         <volist name="res_city.north" id="vo">
-                            <li><a href="javascript:void(0);">{$vo.name}</a></li>
+                            <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li>
                         </volist>
                         </volist>
                     </ul>
                     </ul>
                 </em>
                 </em>
@@ -49,7 +49,7 @@
                     <p>南美洲</p>
                     <p>南美洲</p>
                     <ul class="star_happy_box">
                     <ul class="star_happy_box">
                         <volist name="res_city.south" id="vo">
                         <volist name="res_city.south" id="vo">
-                            <li><a href="javascript:void(0);">{$vo.name}</a></li>
+                            <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li>
                         </volist>
                         </volist>
                     </ul>
                     </ul>
                 </em>
                 </em>
@@ -58,7 +58,7 @@
                     <p>南极洲</p>
                     <p>南极洲</p>
                     <ul class="star_happy_box">
                     <ul class="star_happy_box">
                         <volist name="res_city.antarctica" id="vo">
                         <volist name="res_city.antarctica" id="vo">
-                            <li><a href="javascript:void(0);">{$vo.name}</a></li>
+                            <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li>
                         </volist>
                         </volist>
                     </ul>
                     </ul>
                 </em>
                 </em>
@@ -67,7 +67,7 @@
                     <p>欧洲</p>
                     <p>欧洲</p>
                     <ul class="star_happy_box">
                     <ul class="star_happy_box">
                         <volist name="res_city.europe" id="vo">
                         <volist name="res_city.europe" id="vo">
-                            <li><a href="javascript:void(0);">{$vo.name}</a></li>
+                            <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li>
                         </volist>
                         </volist>
                     </ul>
                     </ul>
                 </em>
                 </em>
@@ -76,7 +76,7 @@
                     <p>非洲</p>
                     <p>非洲</p>
                     <ul class="star_happy_box">
                     <ul class="star_happy_box">
                         <volist name="res_city.africa" id="vo">
                         <volist name="res_city.africa" id="vo">
-                            <li><a href="javascript:void(0);">{$vo.name}</a></li>
+                            <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li>
                         </volist>
                         </volist>
                     </ul>
                     </ul>
                 </em>
                 </em>
@@ -85,7 +85,7 @@
                     <p>亚洲</p>
                     <p>亚洲</p>
                     <ul class="star_happy_box">
                     <ul class="star_happy_box">
                         <volist name="res_city.asia" id="vo">
                         <volist name="res_city.asia" id="vo">
-                            <li><a href="javascript:void(0);">{$vo.name}</a></li>
+                            <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li>
                         </volist>
                         </volist>
                     </ul>
                     </ul>
                 </em>
                 </em>
@@ -94,7 +94,7 @@
                     <p>大洋洲</p>
                     <p>大洋洲</p>
                     <ul class="star_happy_box">
                     <ul class="star_happy_box">
                         <volist name="res_city.oceania" id="vo">
                         <volist name="res_city.oceania" id="vo">
-                            <li><a href="javascript:void(0);">{$vo.name}</a></li>
+                            <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li>
                         </volist>
                         </volist>
                     </ul>
                     </ul>
                 </em>
                 </em>
@@ -565,14 +565,25 @@
                 <!-- 视频 -->
                 <!-- 视频 -->
                 <div class="star_video">
                 <div class="star_video">
                     <notempty name="res_xqyy">
                     <notempty name="res_xqyy">
-                        <video id="video" width="100%" height="678" poster="{:cmf_get_image_url($res_xqyy.thumbnail)}" src="{:cmf_get_file_download_url($res_xqyy.video)}"></video>
+                        <video id="video" width="100%" height="675"  src="{:cmf_get_file_download_url($res_xqyy.video)}"></video>
+                        <img class="show_in_poster" src="{:cmf_get_image_url($res_xqyy.thumbnail)}" alt="">
                         <else/>
                         <else/>
-                        <video id="video" width="100%" height="678" poster="__TMPL__/public/assets/starImg/bicon_34.png" src="__TMPL__//public/assets/starImg/video.mp4"></video>
+                        <video id="video" width="100%" height="675"  src="__TMPL__//public/assets/starImg/video.mp4"></video>
+                        <img class="show_in_poster" src="__TMPL__/public/assets/starImg/bicon_34.png" alt="">
                     </notempty>
                     </notempty>
                     <img onclick="bofang()" class="show_in_banner2" src="__TMPL__/public/assets/starImg/aicon_30.png" alt="">
                     <img onclick="bofang()" class="show_in_banner2" src="__TMPL__/public/assets/starImg/aicon_30.png" alt="">
                 </div>
                 </div>
                 <!-- 人物简介 -->
                 <!-- 人物简介 -->
+                <notempty name="res_mxft">
+                    <!-- 标题 -->
+
                     <div class="star_personal clearfix star_ming">
                     <div class="star_personal clearfix star_ming">
+                        <div class="star_title clearfix">
+                            <span>
+                                <p>明星<i>访谈</i></p>
+                                <p>Star Interview</p>
+                            </span>
+                        </div>
                         <!-- 左侧头像 -->
                         <!-- 左侧头像 -->
                         <input type="hidden" id="star_id" value="{$res_mxft.id}">
                         <input type="hidden" id="star_id" value="{$res_mxft.id}">
                         <div class="personal_left">
                         <div class="personal_left">
@@ -595,9 +606,9 @@
                                     </p>
                                     </p>
                                 </div>
                                 </div>
                             </div>
                             </div>
-
                         </div>
                         </div>
                     </div>
                     </div>
+                </notempty>
             </div>
             </div>
         </div>
         </div>
         <!-- 星域画廊 -->
         <!-- 星域画廊 -->
@@ -711,12 +722,12 @@
         $('.africa p,.asia p,.north p,.south p,.antarctica p,.europe p,.oceania p').click(function() {
         $('.africa p,.asia p,.north p,.south p,.antarctica p,.europe p,.oceania p').click(function() {
             if ($(this).prev('img').attr('src') == "__TMPL__/public/assets/starImg/aicon_41.png") {
             if ($(this).prev('img').attr('src') == "__TMPL__/public/assets/starImg/aicon_41.png") {
                 $(this).prev('img').attr('src', "__TMPL__/public/assets/starImg/aicon_42.png");
                 $(this).prev('img').attr('src', "__TMPL__/public/assets/starImg/aicon_42.png");
-                    $(this).next('ul').toggle();
+                $(this).next('ul').show();
             } else {
             } else {
                 $(this).prev('img').attr('src', "__TMPL__/public/assets/starImg/aicon_41.png");
                 $(this).prev('img').attr('src', "__TMPL__/public/assets/starImg/aicon_41.png");
-                    $(this).next('ul').toggle();
+                $(this).next('ul').hide();
             }
             }
-            })
+        });
             // tab切换
             // tab切换
         $('.star_happy_box li').click(function() {
         $('.star_happy_box li').click(function() {
             $(this).addClass('active').siblings().removeClass('active');
             $(this).addClass('active').siblings().removeClass('active');
@@ -758,6 +769,7 @@
             video.play();
             video.play();
             $('#video').attr('controls', 'controls')
             $('#video').attr('controls', 'controls')
             $('.show_in_banner2').hide();
             $('.show_in_banner2').hide();
+            $('.show_in_poster').hide();
         }
         }
     </script>
     </script>
 </body>
 </body>

+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title>个人中心</title>
+	<link rel="stylesheet" href="__TMPL__/public/assets/css/login.css">
+	<link rel="stylesheet" href="__TMPL__/public/assets/css/person.css">
+	<link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
+</head>
+
+<body>
+	<!--头部  -->
+	<include file="public@header"/>
+	<main>
+		<!--彈出框-->
+		<div class="mask">
+
+		</div>
+		<div class="personal_center" style="height:273px;">
+			<!--頭像-->
+			<div class="personal_center_avatar">
+				<notempty name="user.avatar">
+					<img src="{:cmf_get_image_url($user.avatar)}" alt="">
+					<else/>
+					<img src="__TMPL__/public/assets/starImg/aicon_83.png" alt="">
+				</notempty>
+			</div>
+			<div class="updateInfo">
+				<span class="nickname" >昵称</span>
+				<notempty name="user.user_nickname">
+					<input type="text" value="{$user.user_nickname}" id="nickname"/>
+					<else/>
+					<input type="text" value="随风漂泊" id="nickname"/>
+				</notempty>
+			</div>
+			<!--編輯頭像-->
+			<div class="save_info">
+				<span>保存</span>
+			</div>
+		</div>
+
+	</main>
+	<div class="Keep" style="margin-top:157px;">
+		Copyright © 2004-2019 独角星球 版权所有
+	</div>
+</body>
+</html>
+<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
+<script src="__TMPL__/public/assets/js/public.js"></script>
+<script>
+	$(function(){
+	    $('.save_info').click(function(){
+	        var nickname = $('#nickname').val();
+            $.ajax({
+                type: 'POST',
+                url: "/portal/login/updateNickname",
+                data: {
+                    'nickname': nickname,
+                },
+                dataType: 'json',
+                success: function (data) {
+                    console.log(data);
+                    if (data.code == 1) {
+                        mask(data.msg);
+                        window.location.href = '/';
+                    } else {
+                        mask(data.msg);
+                    }
+                }
+            });
+		});
+	});
+</script>

+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title>个人中心</title>
+	<link rel="stylesheet" href="__TMPL__/public/assets/css/login.css">
+	<link rel="stylesheet" href="__TMPL__/public/assets/css/person.css">
+	<link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
+</head>
+
+<body>
+	<!--头部  -->
+	<include file="public@header"/>
+	<main>
+		<!--彈出框-->
+		<div class="mask">
+
+		</div>
+		<div class="personal_center">
+			<!--頭像-->
+			<div class="personal_center_avatar">
+				<notempty name="user.avatar">
+					<img src="{:cmf_get_image_url($user.avatar)}" alt="">
+					<else/>
+					<img src="__TMPL__/public/assets/starImg/aicon_83.png" alt="">
+				</notempty>
+			</div>
+			<!--編輯頭像-->
+			<div class="Editor_avatar clearfix">
+				<div class="Editor_avatar_icon">
+					<img src="__TMPL__/public/assets/starImg/aicon_84.png" alt="">
+				</div>
+				<span><input type="file" id="personal-photo" name="avatar">编辑头像</span>
+			</div>
+			<!--修改資料-->
+			<div class="Modifying clearfix" id="editInfo">
+				<div class="Modifying_icon">
+					<img src="__TMPL__/public/assets/starImg/aicon_85.png" alt="">
+				</div>
+				<span>修改资料</span>
+			</div>
+			<!--我的收藏-->
+			<div class="Collection clearfix">
+				<div class="Collection_icon">
+					<img src="__TMPL__/public/assets/starImg/aicon_86.png" alt="">
+				</div>
+				<span>我的收藏</span>
+			</div>
+		</div>
+
+	</main>
+	<div class="Keep">
+		Copyright © 2004-2019 独角星球 版权所有
+	</div>
+</body>
+</html>
+<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
+<script src="__TMPL__/public/assets/js/public.js"></script>
+<script src="__TMPL__/public/assets/js/uploadfile.js"></script>
+<script>
+	$(function(){
+        $("#personal-photo").on("change",function(){
+            var img_size = $("input[type=file]").get(0).files[0].size;
+            if (img_size > 1024000){
+                mask("上传图片过大，请上传小于1M的图片");
+            }else {
+                $.ajaxFileUpload({
+                    url: '/portal/login/updateAvatar', //用于文件上传的服务器端请求地址
+                    secureuri: false, //是否需要安全协议，一般设置为false
+                    fileElementId: 'personal-photo', //文件上传域的ID
+                    dataType: 'json', //返回值类型 一般设置为json
+                    success: function (data){  //服务器成功响应处理函数
+                       mask(data.msg);
+                       window.location.href = '/';
+                    }
+                });
+            }
+        });
+	});
+</script>

@@ -91,7 +91,7 @@
                 success: function (data) {
                 success: function (data) {
                     if (data.code == 1) {
                     if (data.code == 1) {
                         mask(data.msg);
                         mask(data.msg);
-//                        window.location.href = '/';
+                        window.location.href = '/';
                     } else {
                     } else {
                         mask(data.msg);
                         mask(data.msg);
                     }
                     }

@@ -7,11 +7,16 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>童趣未来详情</title>
     <title>童趣未来详情</title>
     <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
     <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
 </head>
 </head>
 
 
 <body>
 <body>
     <!--头部-->
     <!--头部-->
     <include file="public@header"/>
     <include file="public@header"/>
+    <!--彈出框-->
+    <div class="mask">
+
+    </div>
     <!--主体内容-->
     <!--主体内容-->
     <div class="show_2">
     <div class="show_2">
         <!--banner-->
         <!--banner-->

+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>星域秀场--星球影院</title>
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
+</head>
+
+<body>
+    <!-- 弹出框 -->
+    <div class="video_mask">
+        您还不是VIP，可试看15秒
+    </div>
+    <div class="show_9 clearfix">
+        <!-- 视频 -->
+        <div class="show_9_video">
+            <img class="video_poster" src="__TMPL__/public/assets/starImg/bicon_28.png" alt="">
+            <video id="video" width="100%" height="426" src="__TMPL__/public/assets/starImg/video.mp4"></video>
+            <img class="play_button" onclick="bofang()" src="__TMPL__/public/assets/starImg/aicon_30.png" alt="">
+        </div>
+        <!-- 视频侧边选择 -->
+        <div class="show_9_video_aside">
+            <!-- 顶部 -->
+            <div class="show_9_video_asideTie clearfix">
+                <p>专辑</p>
+                <div class="select">
+                    <input type="text" value="中国" readonly="readonly">
+                    <img src="__TMPL__/public/assets/starImg/down.png" alt="">
+                    <ul>
+                        <li>中国</li>
+                        <li>美国</li>
+                    </ul>
+                </div>
+            </div>
+            <!-- 视频 -->
+            <div class="show_9_video_asideCon">
+                <ul class="curren video_active">
+                    <li class="clearfix">
+                        <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">
+                        <p>
+                            令人神往的 蒙大拿州
+                        </p>
+                    </li>
+                    <li class="clearfix">
+                        <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">
+                        <p>
+                            令人神往的 蒙大拿州
+                        </p>
+                    </li>
+                    <li class="clearfix">
+                        <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">
+                        <p>
+                            令人神往的 蒙大拿州
+                        </p>
+                    </li>
+                    <li class="clearfix">
+                        <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">
+                        <p>
+                            令人神往的 蒙大拿州
+                        </p>
+                    </li>
+                    <li class="clearfix">
+                        <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">
+                        <p>
+                            令人神往的 蒙大拿州
+                        </p>
+                    </li>
+                </ul>
+                <ul class="curren">
+                    <li class="clearfix">
+                        <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">
+                        <p>
+                            令人神往的 蒙大拿州
+                        </p>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <!-- 底部 -->
+        <div class="show_9_video_asideTxt clearfix">
+            <!-- 标题 -->
+            <h1>令人神往的蒙大拿州弗里德黑德湖</h1>
+            <!-- 国家 -->
+            <div class="show_9_video_asideTxt2">
+                <p>国家：美国</p>
+                <p>取景：蒙大拿州弗里德黑德湖</p>
+                <p>上映时间：2019-11-12</p>
+            </div>
+            <!-- 分享 -->
+            <div class="show_9_video_asideTxt3 clearfix">
+                <p>分享:</p>
+                <img src="__TMPL__/public/assets/starImg/aicon_89.png" alt="">
+                <img src="__TMPL__/public/assets/starImg/aicon_90.png" alt="">
+            </div>
+        </div>
+    </div>
+    <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
+    <script>
+        // 星域秀场视频
+        $(function() {
+                $('.select input').click(function() {
+                    if ($(this).next('img').attr('src') == "__TMPL__/public/assets/starImg/down.png") {
+                        $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/up.png")
+                        $('.select ul').toggle();
+                    } else {
+                        $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/down.png")
+                        $('.select ul').toggle();
+                    }
+
+                })
+
+                $('.select ul li').click(function() {
+                    $('.select input').val($(this).text());
+                    $('.select ul').hide();
+                    var index = $(this).index();
+                    $('.curren').eq(index).addClass('video_active').siblings().removeClass('video_active');
+                });
+
+                $(document).ready(function() {
+                    var val = $('.select input').val();
+                    var val2 = $('.select ul li:first-child').text();
+                    val = val2;
+                    $('.select input').val(val)
+                })
+
+                // 弹出框
+                setInterval(function() {
+                    $('.video_mask').hide();
+                }, 4000)
+            })
+            // 点击播放
+        function bofang() {
+            video.play();
+            $('#video').attr('controls', 'controls')
+            $('.show_9_video img').hide();
+        }
+    </script>
+</body>
+
+</html>

@@ -7,10 +7,15 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>独角日志详情</title>
     <title>独角日志详情</title>
     <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
     <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
 </head>
 </head>
 
 
 <body>
 <body>
     <include file="public@header"/>
     <include file="public@header"/>
+    <!--彈出框-->
+    <div class="mask">
+
+    </div>
     <!-- 侧边栏 -->
     <!-- 侧边栏 -->
     <div class="sidebar">
     <div class="sidebar">
         <!-- 收藏 -->
         <!-- 收藏 -->

@@ -7,10 +7,15 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>明星访谈详情</title>
     <title>明星访谈详情</title>
     <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
     <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
 </head>
 </head>
 
 
 <body>
 <body>
     <include file="public@header"/>
     <include file="public@header"/>
+    <!--彈出框-->
+    <div class="mask">
+
+    </div>
     <!-- 侧边栏 -->
     <!-- 侧边栏 -->
     <div class="sidebar">
     <div class="sidebar">
         <!-- 收藏 -->
         <!-- 收藏 -->

@@ -8,8 +8,6 @@
 	<link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
 	<link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
 	<link rel="stylesheet" href="__TMPL__/public/assets/css/activity_Travel.css">
 	<link rel="stylesheet" href="__TMPL__/public/assets/css/activity_Travel.css">
 </head>
 </head>
-
-<>
 	<include file="public@header"/>
 	<include file="public@header"/>
 	<main>
 	<main>
 		<div class="container">
 		<div class="container">

+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>良宿美寝更多</title>
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/layui.css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/happy.css">
+</head>
+
+<body>
+    <include file="public@header"/>
+    <div class="happy_live">
+        <!-- 选择区域 -->
+        <div class="happy_select clearfix">
+            <img src="__TMPL__/public/assets/starImg/aicon_42.png" alt="">
+            <p>澳大利亚</p>
+        </div>
+        <!-- 顶部标题 -->
+        <div class="show_INMain_tit clearfix">
+            <div class="show_IN1 clearfix">
+                <img src="__TMPL__/public/assets/starImg/aicon_17.png" alt="" style="margin-top:7px">
+                <p>良宿<span>美寝</span></p>
+                <h2>Accommodation</h2>
+            </div>
+        </div>
+        <!-- 盒子 -->
+        <div class="happy_live_box">
+            <!-- 内容 -->
+            <div class="happy_live_con">
+                <!-- 第一部分 -->
+                <div class="happy_live_con_1">
+                    <div class="happy_live_con_1Img">
+                        <img src="__TMPL__/public/assets/starImg/aicon_13.png" alt="">
+                    </div>
+                    <p>全球唯一漂浮在海上的梦幻酒店，此生必打卡！</p>
+                    <div class="happy_live_con_1_introduce">
+                        酒店功能完善，设有包括总统套房、豪华商务套房等各色客房297间，酒店拥有中餐厅、西餐厅、韩国餐厅、火锅餐厅四个不同风味的餐饮场所，就餐总座位数1600余位，另设有可接待500人的宴会厅、可容纳400人的国际会议中心以及夜总会.
+                    </div>
+                </div>
+                <!-- 第二部分 -->
+                <div class="happy_live_con_2">
+                    <ul class="clearfix">
+                        <li>
+                            <div class="happy_live_con_2Img">
+                                <img src="__TMPL__/public/assets/starImg/aicon_13.png" alt="">
+                            </div>
+                            <div class="happy_live_con_2Txt">
+                                <h1>广州圣丰索菲特大酒店</h1>
+                                <p>作为经济文化中心，不乏豪华特色酒店。或坐落庭院之中，亭台楼阁，竹影婆娑__TMPL__/public/assets.</p>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="happy_live_con_2Img">
+                                <img src="__TMPL__/public/assets/starImg/aicon_13.png" alt="">
+                            </div>
+                            <div class="happy_live_con_2Txt">
+                                <h1>广州圣丰索菲特大酒店</h1>
+                                <p>作为经济文化中心，不乏豪华特色酒店。或坐落庭院之中，亭台楼阁，竹影婆娑__TMPL__/public/assets.</p>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="happy_live_con_2Img">
+                                <img src="__TMPL__/public/assets/starImg/aicon_13.png" alt="">
+                            </div>
+                            <div class="happy_live_con_2Txt">
+                                <h1>广州圣丰索菲特大酒店</h1>
+                                <p>作为经济文化中心，不乏豪华特色酒店。或坐落庭院之中，亭台楼阁，竹影婆娑__TMPL__/public/assets.</p>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <!-- 第一部分 -->
+                <div class="happy_live_con_1">
+                    <div class="happy_live_con_1Img">
+                        <img src="__TMPL__/public/assets/starImg/aicon_13.png" alt="">
+                    </div>
+                    <p>全球唯一漂浮在海上的梦幻酒店，此生必打卡！</p>
+                    <div class="happy_live_con_1_introduce">
+                        酒店功能完善，设有包括总统套房、豪华商务套房等各色客房297间，酒店拥有中餐厅、西餐厅、韩国餐厅、火锅餐厅四个不同风味的餐饮场所，就餐总座位数1600余位，另设有可接待500人的宴会厅、可容纳400人的国际会议中心以及夜总会.
+                    </div>
+                </div>
+                <!-- 第二部分 -->
+                <div class="happy_live_con_2">
+                    <ul class="clearfix">
+                        <li>
+                            <div class="happy_live_con_2Img">
+                                <img src="__TMPL__/public/assets/starImg/aicon_13.png" alt="">
+                            </div>
+                            <div class="happy_live_con_2Txt">
+                                <h1>广州圣丰索菲特大酒店</h1>
+                                <p>作为经济文化中心，不乏豪华特色酒店。或坐落庭院之中，亭台楼阁，竹影婆娑__TMPL__/public/assets.</p>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="happy_live_con_2Img">
+                                <img src="__TMPL__/public/assets/starImg/aicon_13.png" alt="">
+                            </div>
+                            <div class="happy_live_con_2Txt">
+                                <h1>广州圣丰索菲特大酒店</h1>
+                                <p>作为经济文化中心，不乏豪华特色酒店。或坐落庭院之中，亭台楼阁，竹影婆娑__TMPL__/public/assets.</p>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="happy_live_con_2Img">
+                                <img src="__TMPL__/public/assets/starImg/aicon_13.png" alt="">
+                            </div>
+                            <div class="happy_live_con_2Txt">
+                                <h1>广州圣丰索菲特大酒店</h1>
+                                <p>作为经济文化中心，不乏豪华特色酒店。或坐落庭院之中，亭台楼阁，竹影婆娑__TMPL__/public/assets.</p>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <!-- 分页 -->
+            <div id="page">
+                123456
+            </div>
+        </div>
+    </div>
+
+    <include file="public@footer"/>
+    <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
+    <script src="__TMPL__/public/assets/js/public.js"></script>
+</body>
+
+</html>

+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>便利出行更多</title>
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/bootstrap4.0.css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/happy.css">
+</head>
+
+<body>
+    <include file="public@header"/>
+    <div class="happy_convenient">
+        <!-- 选择区域 -->
+        <div class="happy_select clearfix">
+            <img src="__TMPL__/public/assets/starImg/aicon_42.png" alt="">
+            <p>{$city_name}</p>
+        </div>
+        <!-- 顶部标题 -->
+        <div class="show_INMain_tit clearfix">
+            <div class="show_IN1 clearfix">
+                <img src="__TMPL__/public/assets/starImg/aicon_19.png" alt="" style="width:34px;margin-top: 2px;">
+                <p>便利<span>出行</span></p>
+                <h2>Easy Travel</h2>
+            </div>
+        </div>
+        <!-- 盒子 -->
+        <div class="happy_convenient_box">
+            <!-- 内容 -->
+            <div class="happy_convenient_con">
+                <!-- 内容一 -->
+                <div class="happy_convenient_con_1 clearfix">
+                    <volist name="res['data']" id="vo" length="3">
+                        <div class="happy_convenient_con_1Img">
+                            <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
+                            <span></span>
+                        </div>
+                    </volist>
+                </div>
+                <!-- 内容二 -->
+                <div class="happy_convenient_con_2">
+                    <ul>
+                        <volist name="res['data']" id="vo">
+                            <li class="clearfix">
+                                <a href="/portal/star/getTravelDetail?id={$vo.id}">
+                                    <div class="happy_convenient_con_2Img">
+                                        <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
+                                    </div>
+                                    <div class="happy_convenient_con_2_txt">
+                                        <h1>{$vo.post_title}</h1>
+                                        <p>
+                                            {$vo.post_excerpt}
+                                        </p>
+                                    </div>
+                                </a>
+                            </li>
+                        </volist>
+                    </ul>
+                </div>
+            </div>
+        </div>
+
+        <!--分页-->
+        <div class="pagination">
+            {$page|default=''}
+        </div>
+    </div>
+    <include file="public@footer"/>
+    <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
+    <script src="__TMPL__/public/assets/js/public.js"></script>
+</body>
+
+</html>

@@ -8,10 +8,15 @@
     <title>星球故事详情</title>
     <title>星球故事详情</title>
     <link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
     <link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
     <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
     <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
 </head>
 </head>
 
 
 <body>
 <body>
     <include file="public@header"/>
     <include file="public@header"/>
+    <!--弹出框-->
+    <div class="mask">
+
+    </div>
     <!-- 侧边栏 -->
     <!-- 侧边栏 -->
     <div class="sidebar">
     <div class="sidebar">
         <!-- 收藏 -->
         <!-- 收藏 -->

+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>便利出行详情</title>
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/happy.css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
+</head>
+
+<body>
+    <include file="public@header"/>
+    <!--弹窗-->
+    <div class="mask">
+
+    </div>
+    <!-- 侧边栏 -->
+    <div class="sidebar">
+        <!-- 收藏 -->
+        <div class="collections">
+            <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">
+        </div>
+        <!-- 喜欢 -->
+        <div class="likes">
+            <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">
+        </div>
+        <!-- wx分享 -->
+        <div class="wx_go">
+            <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">
+            <p>168</p>
+        </div>
+        <!-- wb分享 -->
+        <div class="wb_go">
+            <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">
+            <p>168</p>
+        </div>
+    </div>
+    <div class="happy_travel">
+        <div class="happy_travel_con1 clearfix">
+            <!-- 图片 -->
+            <div class="happy_travel_con1_img">
+                <img src="{:cmf_get_image_url($res.thumbnail)}" alt="">
+            </div>
+            <!-- 文字 -->
+            <div class="happy_travel_con1_txt">
+                <h1>
+                    {$res.post_title}
+                </h1>
+                <p>
+                    {$res.post_excerpt}
+                </p>
+            </div>
+        </div>
+        <!-- 副文本 -->
+        <div class="happy_travel_con2">
+            {$res.post_content}
+        </div>
+    </div>
+    <!-- 评论 -->
+    <include file="public@comment"/>
+
+    <include file="public@footer"/>
+    <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
+    <script src="__TMPL__/public/assets/js/public.js"></script>
+</body>
+
+</html>

+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+    <title>星球奇境</title>
+    <link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css" />
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/happy_index.css" />
+</head>
+
+<body>
+    <include file="public@header"/>
+    <div class="happy_index">
+        <!-- banner轮播图 -->
+        <div class="happy_banner">
+            <img src="__TMPL__/public/assets/starImg/aicon_01.png" alt="" />
+            <h3>Planet Discovery</h3>
+        </div>
+        <!-- main 背景 -->
+        <div class="happy_InMain">
+            <!-- 搜索框 -->
+            <div class="happy_search">
+                <input type="text" />
+                <div class="happy_search_icon">
+                    <span><img src="__TMPL__/public/assets/starImg/aicon_42.png" alt=""/></span>
+                    <span class="address">{$city_name}</span>
+                </div>
+            </div>
+            <!-- 星球故事盒子 -->
+            <div class="show_InMain_box show_InMain_box2">
+                <!-- 顶部标题 -->
+                <div class="happy_INMain_tit clearfix">
+                    <div class="happy_IN1 clearfix">
+                        <img src="__TMPL__/public/assets/starImg/aicon_03.png" alt="">
+                        <p>星球<span>故事</span></p>
+                        <h2>Planet Story</h2>
+                    </div>
+                    <!-- 更多 -->
+                    <!--<div class="happy_IN2">-->
+                        <!--<a href=""> MORE+ </a>-->
+                    <!--</div>-->
+                </div>
+                <!-- 内容 -->
+                <div class="show_INMain_con2_2">
+                    <notempty name="res_xqgs">
+                        <div class="swiper-slide">
+                            <div class="show_index_con2Txt clearfix">
+                                <!-- 左侧图片 -->
+                                <img class="show_indexImg1" src="{:cmf_get_image_url($res_xqgs.thumbnail)}" alt="">
+                                <!-- 文字 -->
+                                <div class="show_index_con2Txt2">
+                                    {$res_xqgs.post_excerpt}
+                                </div>
+                                <!-- 进度条 -->
+                                <div class="show_index_progress">
+                                    <img src="__TMPL__/public/assets/starImg/aicon_15.png" alt="">
+                                </div>
+                            </div>
+                        </div>
+                    </notempty>
+                </div>
+            </div>
+            <!-- 网红美景 -->
+            <div class="happy_InMain_box2 show_InMain_box2">
+                <!-- 顶部标题 -->
+                <div class="happy_INMain_tit clearfix">
+                    <div class="happy_IN1 clearfix">
+                        <img style="width:28px;" src="__TMPL__/public/assets/starImg/aicon_06.png" alt="" />
+                        <p>网红<span>美景</span></p>
+                        <h2>Top Attraction</h2>
+                    </div>
+                    <!-- 更多 -->
+                    <div class="happy_IN2">
+                        <a href=""> MORE+ </a>
+                    </div>
+                </div>
+                <!-- 第二部分 -->
+                <div class="happy_food_con2_2 clearfix swiper-container2">
+                    <ul class="swiper-wrapper">
+                        <volist name="res_whmj" id="vo">
+                            <li class="swiper-slide ">
+                                <div class="happy_food_con2_2Img">
+                                    <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
+                                </div>
+                                <div class="happy_food_con2_2Txt2 clearfix">
+                                    <h2>{$vo.post_title}</h2>
+                                    <div>
+                                        <img src="__TMPL__/public/assets/starImg/bicon_14.png" alt="">
+                                        <p>{$vo.post_hits}</p>
+                                    </div>
+                                    <div>
+                                        <img src="__TMPL__/public/assets/starImg/bicon_13.png" alt="">
+                                        <p>{$vo.post_favorites}</p>
+                                    </div>
+                                </div>
+                            </li>
+                        </volist>
+                    </ul>
+                    <div class="show_swiper2_btn clearfix">
+
+                        <div class="swiper-button-prev2"></div>
+                        <div class="swiper-pagination">
+
+                        </div>
+                        <div class="swiper-button-next2"></div>
+                    </div>
+                </div>
+            </div>
+            <!-- 异域珍馐 -->
+            <div class="show_InMain_box3 show_InMain_box2">
+                <!-- 顶部标题 -->
+                <div class="happy_INMain_tit clearfix">
+                    <div class="happy_IN1 clearfix">
+                        <img style="width:38px;" src="__TMPL__/public/assets/starImg/aicon_11.png" alt="" />
+                        <p>异域<span>珍馐</span></p>
+                        <h2>Gastronomy</h2>
+                    </div>
+                    <!-- 更多 -->
+                    <div class="happy_IN2">
+                        <a href=""> MORE+ </a>
+                    </div>
+                </div>
+                <!-- 第一部分 -->
+                <div class="happy_food_con2_1 swiper-container3">
+                    <ul class="clearfix swiper-wrapper">
+                        <volist name="res_yyzx" id="vo">
+                            <li class="swiper-slide">
+                                <div class="happy_food_con2_1Img">
+                                    <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
+                                </div>
+                                <div class="happy_food_con2_1Txt clearfix">
+                                    <h2>{$vo.post_title}</h2>
+                                </div>
+                            </li>
+                        </volist>
+                    </ul>
+                    <div class="show_swiper2_btn clearfix">
+
+                        <div class="swiper-button-prev2"></div>
+                        <div class="swiper-pagination">
+
+                        </div>
+                        <div class="swiper-button-next2"></div>
+                    </div>
+                </div>
+            </div>
+            <!-- 良宿美寝 -->
+            <div class="show_InMain_box4 show_InMain_box2">
+                <!-- 顶部标题 -->
+                <div class="happy_INMain_tit clearfix">
+                    <div class="happy_IN1 clearfix">
+                        <img style="width:38px;" src="__TMPL__/public/assets/starImg/aicon_17.png" alt="" />
+                        <p>良宿<span>美寝</span></p>
+                        <h2>Accommodation</h2>
+                    </div>
+                    <!-- 更多 -->
+                    <div class="happy_IN2">
+                        <a href="/portal/star/getMoreHotel?city_id={$city_id}"> MORE+ </a>
+                    </div>
+                </div>
+                <!-- 第一部分 -->
+                <div class="happy_live_con_1 swiper-container4">
+                    <div class="swiper-wrapper">
+                        <volist name="res_lsmq" id="vo">
+                            <div class="swiper-slide">
+                                <div class="happy_live_con_1Img">
+                                    <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
+                                </div>
+                                <p>{$vo.post_title}</p>
+                            </div>
+                        </volist>
+                    </div>
+                    <div class="show_swiper2_btn clearfix">
+
+                        <div class="swiper-button-prev2"></div>
+                        <div class="swiper-pagination">
+
+                        </div>
+                        <div class="swiper-button-next2"></div>
+                    </div>
+                </div>
+            </div>
+            <!-- 活力生态 -->
+            <div class="show_InMain_box5 show_InMain_box2">
+                <!-- 顶部标题 -->
+                <div class="happy_INMain_tit clearfix">
+                    <div class="happy_IN1 clearfix">
+                        <img style="width:38px;" src="__TMPL__/public/assets/starImg/aicon_18.png" alt="" />
+                        <p>活力<span>生态</span></p>
+                        <h2>Responsible Tourism</h2>
+                    </div>
+                    <!-- 更多 -->
+                    <div class="happy_IN2">
+                        <a href=""> MORE+ </a>
+                    </div>
+                </div>
+                <!-- 第一部分 -->
+                <div class="happy_ecological_con2_1">
+                    <ul class="clearfix">
+                        <volist name="res_hlst" id="vo">
+                            <li>
+                                <div class="happy_ecological_con2_1Img">
+                                    <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
+                                </div>
+                                <div class="happy_ecological_con2_1Txt">
+                                    <h1>{$vo.post_title}</h1>
+                                    <p>
+                                        {$vo.post_excerpt}
+                                    </p>
+                                </div>
+                            </li>
+                        </volist>
+                    </ul>
+                </div>
+            </div>
+            <!-- 便利出行 -->
+            <div class="show_InMain_box6 show_InMain_box2">>
+                <!-- 顶部标题 -->
+                <div class="happy_INMain_tit clearfix">
+                    <div class="happy_IN1 clearfix">
+                        <img src="__TMPL__/public/assets/starImg/aicon_19.png" alt="" style="width:34px;margin-top: 2px;">
+                        <p>便利<span>出行</span></p>
+                        <h2>Easy Travel</h2>
+                    </div>
+                    <!-- 更多 -->
+                    <div class="happy_IN2">
+                        <a href="/portal/star/getMoreTravel?city_id={$city_id}"> MORE+ </a>
+                    </div>
+                </div>
+                <!-- 内容一 -->
+                <div class="happy_convenient_con_1 clearfix">
+                    <volist name="res_blcx" id="vo">
+                        <a href="/portal/star/getTravelDetail?id={$vo.id}">
+                            <div class="happy_convenient_con_1Img">
+                                <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
+                            </div>
+                        </a>
+                    </volist>
+                </div>
+            </div>
+        </div>
+    </div>
+    <include file="public@footer"/>
+    <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
+    <script src="__TMPL__/public/assets/js/swiper4/swiper.min.js"></script>
+    <script src="__TMPL__/public/assets/js/public.js"></script>
+    <script>
+        // swiper
+        var swiper = new Swiper(".swiper-container", {
+            slidesPerView: 4,
+            spaceBetween: 53,
+            pagination: {
+                el: ".swiper-pagination",
+                clickable: true
+            },
+            navigation: {
+                nextEl: ".swiper-button-next",
+                prevEl: ".swiper-button-prev"
+            }
+        });
+        // 星球故事swiper
+        var swiper = new Swiper('.swiper-container2', {
+            slidesPerView: 4,
+            spaceBetween: 16,
+            // loop: true,
+            pagination: {
+                el: '.swiper-pagination',
+                clickable: true,
+            },
+            navigation: {
+                nextEl: '.swiper-button-next2',
+                prevEl: '.swiper-button-prev2',
+            },
+        });
+        // 异域珍馐swiper
+        var swiper = new Swiper('.swiper-container3', {
+            slidesPerView: 2,
+            spaceBetween: 16,
+            // loop: true,
+            pagination: {
+                el: '.swiper-pagination',
+                clickable: true,
+            },
+            navigation: {
+                nextEl: '.swiper-button-next2',
+                prevEl: '.swiper-button-prev2',
+            },
+        });
+        // 良宿美寝swiper
+        var swiper = new Swiper('.swiper-container4', {
+            slidesPerView: 1,
+            spaceBetween: 16,
+            // loop: true,
+            pagination: {
+                el: '.swiper-pagination',
+                clickable: true,
+            },
+            navigation: {
+                nextEl: '.swiper-button-next2',
+                prevEl: '.swiper-button-prev2',
+            },
+        });
+        // banner视频
+        var video = document.getElementById("video");
+
+        function bofang() {
+            video.play();
+            $("#video").attr("controls", "controls");
+            $(".show_in_banner2").hide();
+        }
+    </script>
+</body>
+
+</html>

@@ -145,6 +145,8 @@ body {
 .show_comments_icon {
 .show_comments_icon {
 	width: 44px;
 	width: 44px;
 	float: left;
 	float: left;
+	height:44px;
+	border-radius:50%;
 }
 }
 
 
 .show_main2_show ul li {
 .show_main2_show ul li {
@@ -153,6 +155,7 @@ body {
 	padding-bottom: 30px;
 	padding-bottom: 30px;
 	box-sizing: border-box;
 	box-sizing: border-box;
 	border-bottom: 1px solid #EBEBEB;
 	border-bottom: 1px solid #EBEBEB;
+	height:146px;
 }
 }
 
 
 .show_comments_con {
 .show_comments_con {
@@ -173,6 +176,7 @@ body {
 	line-height: 24px;
 	line-height: 24px;
 	margin-top: 4px;
 	margin-top: 4px;
 	color: rgba(102, 102, 102, 1);
 	color: rgba(102, 102, 102, 1);
+	height:48px;
 }
 }
 
 
 .show_comments_con p {
 .show_comments_con p {

+/*公共Css样式*/
+
+body,
+ol,
+ul,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+th,
+td,
+dl,
+dd,
+form,
+fieldset,
+legend,
+input,
+textarea,
+select {
+    margin: 0;
+    padding: 0
+}
+
+body {
+    font: 12px "微软雅黑", "MicrosoftYaHei", HELVETICA;
+    background: #fff;
+    -webkit-text-size-adjust: 100%;
+}
+
+a {
+    color: #2d374b;
+    text-decoration: none
+}
+
+em,
+i {
+    font-style: normal
+}
+
+li {
+    list-style: none
+}
+
+img {
+    border: 0;
+    vertical-align: middle
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0
+}
+
+p {
+    word-wrap: break-word
+}
+
+body {
+    background-color: #3C3C94;
+}
+
+.clearfix::after {
+    content: ".";
+    clear: both;
+    display: block;
+    overflow: hidden;
+    font-size: 0;
+    height: 0;
+}
+
+.clearfix {
+    zoom: 1;
+}
+
+
+/*公共Css样式*/
+
+
+/* 侧边栏 */
+
+.sidebar {
+    position: fixed;
+    top: 200px;
+    right: 206px;
+}
+
+.collections,
+.likes {
+    width: 60px;
+    padding: 15px 0;
+    background: rgba(84, 84, 175, 1);
+    border-radius: 4px;
+    margin-bottom: 10px;
+}
+
+.collections img,
+.likes img,
+.wx_go img,
+.wb_go img {
+    width: 30px;
+    display: block;
+    margin: auto;
+}
+
+.wx_go {
+    width: 60px;
+    padding: 10px 0;
+    margin-bottom: 10px;
+    background: rgba(51, 194, 82, 1);
+    border-radius: 4px;
+}
+
+.wb_go {
+    width: 60px;
+    padding: 10px 0;
+    background: rgba(253, 99, 73, 1);
+    border-radius: 4px;
+}
+
+.wx_go p,
+.wb_go p {
+    text-align: center;
+    font-size: 16px;
+    color: rgba(255, 255, 255, 1);
+}
+
+
+/* page */
+
+.layui-laypage a,
+.layui-laypage span {
+    margin-right: 6px;
+}
+
+#page {
+    text-align: center;
+    margin-top: 30px;
+}
+
+.layui-laypage-curr em {
+    color: black !important;
+    background: #09FF8E !important;
+}
+
+.layui-laypage a,
+.layui-laypage span {
+    padding: 4px 15px;
+}
+
+
+/* 星球画廊页面 */
+
+.happy_gallery_banner img {
+    width: 100%;
+}
+
+.happy_gallery_con {
+    width: 1200px;
+    margin: 142px auto 100px;
+}
+
+.show_IN1 {
+    float: left;
+    line-height: 1;
+}
+
+.show_IN1 img {
+    width: 36px;
+    float: left;
+    margin-top: 4px;
+}
+
+.show_IN1 p {
+    cursor: pointer;
+    float: left;
+    margin-left: 20px;
+    font-size: 40px;
+    font-weight: bold;
+    color: rgba(255, 255, 255, 1);
+}
+
+.show_IN1 p span {
+    color: #09FF8E;
+}
+
+.show_IN1 h2 {
+    float: left;
+    margin-left: 20px;
+    margin-top: 22px;
+    font-size: 20px;
+    font-weight: bold;
+    color: rgba(255, 255, 255, .8);
+}
+
+.happy_gallery_con2 ul {
+    width: calc(100% + 53px);
+}
+
+.happy_gallery_con2 ul li {
+    float: left;
+    margin-top: 40px;
+    margin-right: 53px;
+}
+
+.happy_gallery_con2 ul li img {
+    width: 260px;
+}
+
+
+/* 良宿美寝页面 */
+
+.happy_house {
+    width: 1200px;
+    padding: 32px;
+    box-sizing: border-box;
+    margin: 78px auto 100px;
+    background: white;
+}
+
+.happy_house h1 {
+    text-align: center;
+    font-size: 28px;
+    font-weight: bold;
+    color: rgba(26, 26, 26, 1);
+}
+
+
+/* 左侧 */
+
+.happy_house_left {
+    float: left;
+    width: 750px;
+    margin-top: 30px;
+}
+
+.happy_house_leftImg1 {
+    width: 750px;
+    height: 444px;
+}
+
+.happy_house_leftImg1 img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_house_leftImg2 {
+    margin-top: 14px;
+    overflow: hidden;
+    width: calc(100% + 15px);
+}
+
+.happy_house_leftImg2 div {
+    width: 240px;
+    height: 142px;
+    float: left;
+    cursor: pointer;
+    margin-right: 15px;
+    position: relative;
+}
+
+.happy_house_leftImg2 img {
+    opacity: 0.9;
+    width: 100%;
+    height: 100%;
+}
+
+.happy_house_leftImg2 div:hover:after {
+    opacity: 0;
+}
+
+.happy_house_leftImg2 div:after {
+    content: "";
+    display: block;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    opacity: 0.6;
+    background: black;
+}
+
+
+/* 右侧 */
+
+.happy_house_right {
+    float: left;
+    margin-top: 8px;
+    margin-left: 35px;
+}
+
+.happy_house_right ul li img {
+    width: 20px;
+}
+
+.happy_house_right1 {
+    float: left;
+}
+
+.happy_house_right ul li {
+    padding-bottom: 26px;
+    margin-top: 26px;
+    border-bottom: 1px dashed #CFCFCF;
+}
+
+.happy_house_right ul li span {
+    font-size: 18px;
+    margin-left: 15px;
+    vertical-align: middle;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_house_right ul li p {
+    width: 240px;
+    vertical-align: middle;
+    display: inline-block;
+    font-size: 18px;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_house_rightTxt {
+    width: 350px;
+    height: 320px;
+    font-size: 16px;
+    margin-top: 29px;
+    color: rgba(102, 102, 102, 1);
+    line-height: 32px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 10;
+    -webkit-box-orient: vertical;
+}
+
+
+/* 评论 */
+
+.show_main2 {
+    width: 1200px;
+    margin: auto;
+}
+
+.show_main2 textarea {
+    width: 100%;
+    height: 120px;
+    padding: 24px;
+    border: 0;
+    resize: none;
+    margin-top: 40px;
+    box-sizing: border-box;
+    background: rgba(255, 255, 255, 1);
+}
+
+.show_main2_bottom {
+    line-height: 40px;
+    margin-top: 20px;
+}
+
+.show_main2_bottom p {
+    float: left;
+    font-size: 14px;
+    color: rgba(255, 255, 255, 1);
+}
+
+.show_main2_btn {
+    float: right;
+    width: 111px;
+    height: 42px;
+    border: 0;
+    cursor: pointer;
+    background: rgba(9, 255, 142, 1);
+    border-radius: 21px;
+    font-size: 20px;
+    color: rgba(26, 26, 26, 1);
+    line-height: 42px;
+    text-align: center;
+}
+
+.layui-laypage a,
+.layui-laypage span {
+    margin-right: 6px;
+}
+
+.show_main2_show_H {
+    height: 352px;
+    overflow: hidden;
+}
+
+.show_main2_show {
+    width: 100%;
+    background-color: white;
+    margin-top: 40px;
+    padding: 30px;
+    box-sizing: border-box;
+    margin-bottom: 100px;
+}
+
+.show_comments_icon {
+    width: 44px;
+    float: left;
+}
+
+.show_main2_show ul li {
+    margin: 0 30px 30px;
+    cursor: pointer;
+    padding-bottom: 30px;
+    box-sizing: border-box;
+    border-bottom: 1px solid #EBEBEB;
+}
+
+.show_comments_con {
+    float: left;
+    width: 1000px;
+    margin-left: 24px;
+}
+
+.show_comments_con h1 {
+    font-size: 18px;
+    font-weight: bold;
+    color: rgba(62, 228, 152, 1);
+}
+
+.show_comments_con h2 {
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 24px;
+    margin-top: 4px;
+    color: rgba(102, 102, 102, 1);
+}
+
+.show_comments_con p {
+    font-size: 14px;
+    margin-top: 20px;
+    color: rgba(153, 153, 153, 1);
+}
+
+.show_main_more {
+    cursor: pointer;
+    text-align: center;
+    font-size: 18px;
+    color: rgba(62, 228, 152, 1);
+}
+
+
+/* 便利出行页面 */
+
+.happy_travel {
+    width: 1200px;
+    padding: 40px 34px;
+    box-sizing: border-box;
+    margin: 78px auto;
+    background-color: white;
+}
+
+.happy_travel_con1_img {
+    width: 620px;
+    height: 404px;
+    float: left;
+}
+
+.happy_travel_con1_img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_travel_con1_txt {
+    width: 449px;
+    float: left;
+    margin-top: 30px;
+    margin-left: 55px;
+}
+
+.happy_travel_con1_txt h1 {
+    font-size: 28px;
+    cursor: pointer;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_travel_con1_txt p {
+    font-size: 16px;
+    margin-top: 22px;
+    color: rgba(102, 102, 102, 1);
+    line-height: 32px;
+    height:256px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 8;
+    -webkit-box-orient: vertical;
+}
+
+.happy_travel_con2 {
+    margin-top: 50px;
+    font-size: 16px;
+    color: rgba(102, 102, 102, 1);
+    line-height: 32px;
+}
+
+
+/* 活力生态页面 */
+
+.happy_ecological {
+    width: 1200px;
+    margin: 30px auto 100px;
+}
+
+.happy_select {
+    width: 316px;
+    padding: 22px 0;
+    outline: none;
+    cursor: pointer;
+    background: rgba(255, 255, 255, 0.1);
+    border-radius: 30px;
+}
+
+.happy_select img {
+    float: left;
+    margin-top: 4px;
+    padding-left: 30px;
+    box-sizing: border-box;
+}
+
+.happy_select p {
+    float: left;
+    font-size: 18px;
+    margin-left: 14px;
+    color: rgba(255, 255, 255, 1);
+}
+
+.happy_ecological_con2 {
+    margin-top: 40px;
+}
+
+.happy_ecological_con2_1,
+.happy_ecological_con2_2 {
+    margin-top: 18px;
+}
+
+.happy_ecological_con2_1Img {
+    width: 388px;
+    height: 218px;
+}
+
+.happy_ecological_con2_2Img {
+    width: 591px;
+    height: 332px;
+}
+
+.happy_ecological_con2_1Img img,
+.happy_ecological_con2_2Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_ecological_con2_1 ul,
+.happy_ecological_con2_2 ul {
+    width: calc(100% + 18px);
+}
+
+.happy_ecological_con2_1 ul li {
+    width: 388px;
+}
+
+.happy_ecological_con2_2 ul li {
+    width: 591px;
+}
+
+.happy_ecological_con2_1 ul li,
+.happy_ecological_con2_2 ul li {
+    cursor: pointer;
+    float: left;
+    margin-right: 18px;
+    background-color: white;
+}
+
+.happy_ecological_con2_1Txt {
+    margin: auto;
+    padding: 14px 23px;
+}
+
+.happy_ecological_con2_1Txt h1 {
+    height: 19px;
+    cursor: pointer;
+    font-weight: 600;
+    font-size: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_ecological_con2_1Txt p,
+.happy_ecological_con2_2Txt p {
+    height: 48px;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    font-size: 14px;
+    margin-top: 10px;
+    color: rgba(153, 153, 153, 1);
+    line-height: 24px;
+}
+
+
+/* 异域珍馐页面 */
+
+.happy_food {
+    width: 1200px;
+    margin: 30px auto 100px;
+}
+
+.show_INMain_tit {
+    margin-top: 55px;
+}
+
+.happy_food_con {
+    margin-top: 55px;
+}
+
+.happy_food_con2 {
+    margin-top: 40px;
+}
+
+.happy_food_con2_1 ul {
+    width: calc(100% + 16px);
+}
+
+.happy_food_con2_1 ul li {
+    width: 592px;
+    float: left;
+    margin-right: 16px;
+    background-color: white;
+}
+
+.happy_food_con2_1Img {
+    width: 592px;
+    height: 300px;
+}
+
+.happy_food_con2_1Img img,
+.happy_food_con2_2Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_food_con2_1Txt {
+    padding: 14px 22px;
+    box-sizing: border-box;
+}
+
+.happy_food_con2_1Txt h2 {
+    float: left;
+    cursor: pointer;
+    font-weight: 400;
+    font-size: 16px;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_food_con2_1Txt2 {
+    float: right;
+}
+
+.happy_food_con2_1Txt2 div {
+    float: left;
+    cursor: pointer;
+    margin-left: 15px;
+}
+
+.happy_food_con2_1Txt2 div img {
+    width: 15px;
+    display: inline-block;
+    margin-right: 2px;
+}
+
+.happy_food_con2_1Txt2 div p {
+    display: inline-block;
+    margin-top: -2px;
+    vertical-align: middle;
+}
+
+.happy_food_con2_2 {
+    margin-top: 24px;
+}
+
+.happy_food_con2_2 ul {
+    width: calc(100% + 16px);
+}
+
+.happy_food_con2_2 ul li {
+    width: 288px;
+    float: left;
+    margin-top: 16px;
+    margin-right: 16px;
+    background-color: white;
+}
+
+.happy_food_con2_2Img {
+    width: 288px;
+    height: 146px;
+}
+
+.happy_food_con2_2Txt2 {
+    padding: 8px 22px;
+    box-sizing: border-box;
+}
+
+.happy_food_con2_2Txt2 h2 {
+    font-size: 16px;
+    cursor: pointer;
+    font-weight: 400;
+    margin-bottom: 5px;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_food_con2_2Txt2 div {
+    float: left;
+    cursor: pointer;
+    margin-right: 15px;
+}
+
+.happy_food_con2_2Txt2 div img {
+    width: 15px;
+    display: inline-block;
+    margin-right: 2px;
+}
+
+.happy_food_con2_2Txt2 div p,
+.happy_food_con2_1Txt2 div p {
+    display: inline-block;
+    vertical-align: middle;
+    margin-top: -2px;
+    font-size: 14px;
+    color: rgba(153, 153, 153, 1);
+}
+
+
+/* 良宿美寝页面 */
+
+.happy_live {
+    width: 1200px;
+    margin: 30px auto 100px;
+}
+
+.happy_live_con {
+    margin-top: 40px;
+}
+
+.happy_live_con_1,
+.happy_live_con_2 {
+    margin-top: 14px;
+}
+
+.happy_live_con_1 {
+    position: relative;
+    width: 100%;
+    background-color: white;
+}
+
+.happy_live_con_1_introduce {
+    cursor: pointer;
+    position: absolute;
+    top: 254px;
+    right: 24px;
+    width: 365px;
+    padding: 24px 16px;
+    box-sizing: border-box;
+    height: 160px;
+    background: rgba(0, 0, 0, 0.7);
+    font-size: 14px;
+    color: rgba(255, 255, 255, 1);
+    line-height: 24px;
+}
+
+.happy_live_con_1Img {
+    width: 100%;
+    height: 438px;
+}
+
+.happy_live_con_1Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_live_con_1 p {
+    cursor: pointer;
+    font-size: 16px;
+    padding: 13px 28px;
+    box-sizing: border-box;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_live_con_2 ul {
+    width: calc(100% + 18px);
+}
+
+.happy_live_con_2 ul li {
+    width: 388px;
+    float: left;
+    background-color: white;
+    margin-right: 18px;
+}
+
+.happy_live_con_2Img {
+    width: 388px;
+    height: 240px;
+}
+
+.happy_live_con_2Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_live_con_2Txt {
+    padding: 15px 24px;
+    box-sizing: border-box;
+}
+
+.happy_live_con_2Txt h1 {
+    cursor: pointer;
+    font-size: 16px;
+    font-weight: 400;
+    padding-bottom: 14px;
+    border-bottom: 1px dashed #CFCFCF;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_live_con_2Txt p {
+    font-size: 14px;
+    color: rgba(153, 153, 153, 1);
+    line-height: 22px;
+    margin-top: 12px;
+}
+
+
+/* 网红美景页面 */
+
+.happy_beauty {
+    width: 1200px;
+    margin: 30px auto 100px;
+}
+
+.happy_beauty_con {
+    margin-top: 46px;
+}
+
+.happy_beauty_con_1 {
+    background-color: white;
+    padding-bottom: 24px;
+}
+
+.happy_beauty_con_1topimg1 {
+    width: 1200px;
+    height: 426px;
+}
+
+.happy_beauty_con_1top {
+    position: relative;
+    display: none;
+}
+
+.happy_beauty_con_1topTxt {
+    position: absolute;
+    width: 100%;
+    padding: 12px 26px;
+    box-sizing: border-box;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.6);
+}
+
+.happy_beauty_con_1topimg1 img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_beauty_con_1topTxt h1 {
+    font-size: 22px;
+    float: left;
+    font-weight: 400;
+    color: rgba(255, 255, 255, 1);
+}
+
+.happy_food_con2_1Txt2 {
+    margin-top: 7px;
+}
+
+.happy_beauty_active {
+    display: block;
+}
+
+.happy_beauty_conTab {
+    margin: 24px 24px 0;
+}
+
+.happy_beauty_conTab ul {
+    width: calc(100% + 8px);
+}
+
+.happy_beauty_conTab ul li {
+    width: 224px;
+    float: left;
+    cursor: pointer;
+    margin-right: 8px;
+}
+
+.happy_beauty_conTab ul li:hover p {
+    color: white;
+    background: rgba(36, 41, 48, 1);
+}
+
+.happy_beauty_conTab ul li:hover span {
+    opacity: 0;
+}
+
+.happy_beauty_conTab ul li p {
+    width: 100%;
+    padding: 10px 0;
+    box-sizing: border-box;
+    text-align: center;
+    font-size: 14px;
+    color: rgba(36, 41, 48, 1);
+}
+
+.happy_beauty_conTabImg {
+    position: relative;
+    width: 224px;
+    height: 120px;
+}
+
+.happy_beauty_conTabImg img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_beauty_conTabImg span {
+    display: block;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, 0.6);
+}
+
+
+/* 便利出行页面 */
+
+.happy_convenient {
+    width: 1200px;
+    margin: 30px auto 150px;
+}
+
+.happy_convenient_con {
+    margin-top: 40px;
+}
+
+.happy_convenient_con_1Img {
+    cursor: pointer;
+    position: relative;
+    width: 388px;
+    height: 200px;
+    float: left;
+}
+
+.happy_convenient_con_1Img span {
+    display: block;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background-color: rgba(255, 255, 255, 0.4)
+}
+
+.happy_convenient_con_1Img:hover span {
+    opacity: 0;
+}
+
+.happy_convenient_con_1Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_convenient_con_1Img:nth-child(2) {
+    margin: 0 16px;
+}
+
+.happy_convenient_con_2 {
+    width: 100%;
+    padding: 0 30px 30px;
+    box-sizing: border-box;
+    margin-top: 14px;
+    background-color: white;
+}
+
+.happy_convenient_con_2 ul {
+    overflow: hidden;
+}
+
+.happy_convenient_con_2 ul li {
+    padding-bottom: 30px;
+    margin-top: 30px;
+    border-bottom: 1px solid #EBEBEB;
+}
+
+.happy_convenient_con_2 ul li:last-child {
+    padding-bottom: 0;
+    border-bottom: 0;
+}
+
+.happy_convenient_con_2Img {
+    width: 230px;
+    height: 150px;
+    float: left;
+}
+
+.happy_convenient_con_2Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_convenient_con_2_txt {
+    width: 870px;
+    float: left;
+    margin-left: 29px;
+    margin-top: 36px;
+}
+
+.happy_convenient_con_2_txt h1 {
+    font-size: 18px;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_convenient_con_2_txt p {
+    font-size: 14px;
+    margin-top: 10px;
+    color: rgba(153, 153, 153, 1);
+    line-height: 22px;
+    height:44px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}

+/* css公共样式 */
+
+body,
+ol,
+ul,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+th,
+td,
+dl,
+dd,
+form,
+fieldset,
+legend,
+input,
+textarea,
+select {
+    margin: 0;
+    padding: 0;
+}
+
+body {
+    font: 12px "微软雅黑", "MicrosoftYaHei", HELVETICA;
+    background: #fff;
+    -webkit-text-size-adjust: 100%;
+}
+
+a {
+    color: #2d374b;
+    text-decoration: none;
+}
+
+em,
+i {
+    font-style: normal;
+}
+
+li {
+    list-style: none;
+}
+
+img {
+    border: 0;
+    vertical-align: middle;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+p {
+    word-wrap: break-word;
+}
+
+body {
+    background-color: #3C3C94;
+}
+
+.clearfix::after {
+    content: ".";
+    clear: both;
+    display: block;
+    overflow: hidden;
+    font-size: 0;
+    height: 0;
+}
+
+.clearfix {
+    zoom: 1;
+}
+
+
+/* css公共样式 */
+
+
+/* show_index */
+
+
+/* banner轮播图 */
+
+.show_InMain_box {
+    margin-top: 51px !important;
+}
+
+.happy_banner {
+    position: relative
+}
+
+.happy_banner img {
+    width: 100%;
+    height: 678px;
+}
+
+.happy_banner h3 {
+    width: 530px;
+    height: 42px;
+    font-size: 58px;
+    font-family: Quicksand-Bold;
+    font-weight: bold;
+    color: rgba(255, 255, 255, 1);
+    line-height: 48px;
+    text-shadow: 0px 6px 14px rgba(0, 0, 0, 0.3);
+    position: absolute;
+    top: 499px;
+    left: 365px
+}
+
+
+/* 搜索框 */
+
+.happy_search {
+    width: 1200px;
+    margin: 0 auto;
+    position: relative;
+    padding-top: 30px;
+}
+
+.happy_search input {
+    width: 316px;
+    height: 60px;
+    background: rgba(255, 255, 255, 1);
+    opacity: 0.1;
+    border-radius: 30px;
+    padding-left: 60px
+}
+
+
+/* 搜索框图标 */
+
+.happy_search_icon {
+    position: absolute;
+    top: 25px;
+    left: 30px;
+}
+
+.happy_search_icon img {
+    width: 16px;
+    height: 18px;
+    margin-right: 14px;
+    margin-bottom: 5px
+}
+
+.happy_search_icon .address {
+    width: 72px;
+    height: 18px;
+    font-size: 18px;
+    font-family: MicrosoftYaHei;
+    font-weight: 400;
+    color: rgba(255, 255, 255, 1);
+    line-height: 73px;
+}
+
+.show_in_banner2 {
+    width: 120px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    -ms-transform: translate(-50%, -50%);
+    -moz-transform: translate(-50%, -50%);
+    -webkit-transform: translate(-50%, -50%);
+    -o-transform: translate(-50%, -50%);
+}
+
+#video {
+    display: block;
+}
+
+.happy_InMain {
+    margin-bottom: 100px;
+    overflow: hidden;
+    width: 100%;
+    background-image: url("../starImg/aicon_04.png")
+}
+
+.happy_InMain_box {
+    width: 1200px;
+    margin: auto;
+    margin-top: 51px;
+}
+
+.happy_IN1 {
+    float: left;
+    line-height: 1;
+    margin-bottom: 40px;
+}
+
+.happy_IN1 img {
+    width: 36px;
+    float: left;
+    margin-top: 4px;
+}
+
+.happy_IN1 p {
+    float: left;
+    margin-left: 20px;
+    font-size: 40px;
+    font-weight: bold;
+    color: rgba(255, 255, 255, 1);
+}
+
+.happy_IN1 p span {
+    color: #09FF8E;
+}
+
+.happy_IN1 h2 {
+    float: left;
+    margin-left: 20px;
+    margin-top: 22px;
+    font-size: 20px;
+    font-weight: bold;
+    color: rgba(255, 255, 255, .8);
+}
+
+.happy_IN2 {
+    float: right;
+    width: 125px;
+    height: 42px;
+    text-align: center;
+    line-height: 42px;
+    background: rgba(9, 255, 142, 1);
+    border-radius: 21px;
+    font-size: 24px;
+    font-family: Impact;
+    font-weight: 400;
+    color: rgba(26, 26, 26, 1);
+}
+
+
+/*  星球故事 */
+
+.show_InMain_box2 {
+    width: 1200px;
+    margin: auto;
+    margin-top: 100px;
+}
+
+.swiper-container2 {
+    position: relative;
+    width: 1200px;
+    overflow: hidden;
+}
+
+.swiper-container2 .swiper-wrapper {
+    height: 242px;
+}
+
+.swiper-container2 ul li {
+    width: 288px !important;
+}
+
+.show_index_con2Txt {
+    width: 1200px;
+    height: 400px;
+    background-color: white;
+}
+
+.show_indexImg1 {
+    width: 400px;
+    float: left;
+    height:400px;
+}
+
+.show_index_con2Txt2 {
+    width: 712px;
+    height: 252px;
+    float: left;
+    margin-left: 39px;
+    margin-top: 43px;
+    font-size: 16px;
+    color: rgba(102, 102, 102, 1);
+    line-height: 28px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 9;
+    -webkit-box-orient: vertical;
+}
+
+.show_index_progress {
+    width: 800px;
+    height: 50px;
+    float: left;
+    margin-top: 55px;
+    background: rgba(225, 225, 230, 1);
+}
+
+.show_index_progress img {
+    margin: 10px 0 0 45px;
+}
+
+.swiper-button-next2,
+.swiper-button-prev2 {
+    position: absolute;
+    width: 34px;
+    height: 34px;
+    z-index: 10;
+    cursor: pointer;
+    border-radius: 50%;
+    background-size: 34px 34x;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
+.swiper-button-prev2,
+.swiper-button-next2 {
+    background-color: rgba(9, 255, 142, 1);
+}
+
+.swiper-button-next2.swiper-button-disabled,
+.swiper-button-prev2.swiper-button-disabled {
+    opacity: 1;
+    cursor: auto;
+    pointer-events: none;
+    background-color: white;
+}
+
+.swiper-button-prev2 {
+    position: static;
+    float: left;
+    background-size: 14px 14px;
+    background-image: url("../starImg/left.png")
+}
+
+.swiper-button-next2 {
+    position: static;
+    float: left;
+    background-size: 14px 14px;
+    background-image: url("../starImg/right.png")
+}
+
+.swiper-pagination {
+    position: static;
+    float: left;
+    margin: 9px 16px 0;
+}
+
+.swiper-button-next2 {
+    position: static;
+    float: left;
+}
+
+.swiper-pagination-clickable .swiper-pagination-bullet {
+    margin-right: 8px;
+}
+
+.swiper-pagination-clickable .swiper-pagination-bullet:last-child {
+    margin-right: 0px;
+}
+
+.swiper-pagination-bullet {
+    background: rgba(255, 255, 255, 1);
+    opacity: 0.6;
+}
+
+.swiper-pagination-bullet-active {
+    background: rgba(9, 255, 142, 1);
+    opacity: 0.6;
+}
+
+.show_swiper2_btn {
+    margin-top: 30px;
+    left: 45%;
+    z-index: 1;
+    position: relative;
+}
+
+
+/* 网红美景 */
+
+.happy_food_con2_2Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_food_con2_2 ul {
+    width: calc(100% + 16px);
+}
+
+.happy_food_con2_2 ul li {
+    width: 288px;
+    float: left;
+    margin-right: 16px;
+    background-color: white;
+}
+
+.happy_food_con2_2Img {
+    width: 288px;
+    height: 180px;
+}
+
+.happy_food_con2_2Txt2 {
+    padding: 8px 22px;
+    box-sizing: border-box;
+}
+
+.happy_food_con2_2Txt2 h2 {
+    font-size: 16px;
+    cursor: pointer;
+    font-weight: 400;
+    margin-bottom: 5px;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_food_con2_2Txt2 div {
+    float: left;
+    cursor: pointer;
+    margin-right: 15px;
+}
+
+.happy_food_con2_2Txt2 div img {
+    width: 15px;
+    display: inline-block;
+    margin-right: 2px;
+}
+
+.happy_food_con2_2Txt2 div p {
+    display: inline-block;
+    vertical-align: middle;
+    margin-top: -2px;
+    font-size: 14px;
+    color: rgba(153, 153, 153, 1);
+}
+
+
+/*异域珍馐  */
+
+.swiper-container3 {
+    overflow: hidden;
+}
+
+.happy_food_con2_1 ul {
+    width: calc(100% + 16px);
+}
+
+.happy_food_con2_1 ul li {
+    width: 592px;
+    float: left;
+    margin-right: 16px;
+    background-color: white;
+}
+
+.happy_food_con2_1Img {
+    width: 592px;
+    height: 300px;
+}
+
+.happy_food_con2_1Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_food_con2_1Txt {
+    padding: 14px 22px;
+    box-sizing: border-box;
+}
+
+.happy_food_con2_1Txt h2 {
+    float: left;
+    cursor: pointer;
+    font-weight: 400;
+    font-size: 16px;
+    color: rgba(26, 26, 26, 1);
+}
+
+
+/* 良宿美寝 */
+
+.swiper-container4 {
+    overflow: hidden;
+}
+
+.swiper-container4 .swiper-slide {
+    background-color: white;
+}
+
+.happy_live_con_1 {
+    width: 100%;
+}
+
+.happy_live_con_1Img {
+    width: 100%;
+    height: 438px;
+}
+
+.happy_live_con_1Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_live_con_1 p {
+    cursor: pointer;
+    font-size: 16px;
+    padding: 13px 28px;
+    box-sizing: border-box;
+    color: rgba(26, 26, 26, 1);
+}
+
+
+/* 活力生态 */
+
+.happy_ecological_con2_1Img {
+    width: 388px;
+    height: 218px;
+}
+
+.happy_ecological_con2_2Img {
+    width: 591px;
+    height: 332px;
+}
+
+.happy_ecological_con2_1Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_ecological_con2_1 ul {
+    width: calc(100% + 18px);
+}
+
+.happy_ecological_con2_1 ul li {
+    width: 388px;
+}
+
+.happy_ecological_con2_2 ul li {
+    width: 591px;
+}
+
+.happy_ecological_con2_1 ul li {
+    cursor: pointer;
+    float: left;
+    margin-right: 18px;
+    background-color: white;
+}
+
+.happy_ecological_con2_1Txt {
+    margin: auto;
+    padding: 14px 23px;
+}
+
+.happy_ecological_con2_1Txt h1 {
+    height: 19px;
+    cursor: pointer;
+    font-weight: 600;
+    font-size: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_ecological_con2_1Txt p {
+    height: 48px;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    font-size: 14px;
+    margin-top: 10px;
+    color: rgba(153, 153, 153, 1);
+    line-height: 24px;
+}
+
+
+/* 便利出行 */
+
+.happy_convenient_con_1Img {
+    cursor: pointer;
+    position: relative;
+    width: 388px;
+    height: 200px;
+    float: left;
+}
+
+.happy_convenient_con_1Img img {
+    width: 100%;
+    height: 100%;
+}
+
+.happy_convenient_con_1Img:nth-child(2) {
+    margin: 0 16px;
+}
+
+
+/* 星球奇遇-异域珍馐 */
+
+
+/* happy_foods */
+
+.happy_foods_banner img {
+    width: 100%;
+    height: 678px;
+}
+
+
+/* happy_foods*/
+
+.happy_foods {
+    width: 1200px;
+    margin: auto;
+}
+
+.happy_foods_banner {
+    margin-top: 78px;
+}
+
+
+/*内容*/
+
+.happy_foodsCont {
+    width: 100%;
+    margin-top: 20px;
+    line-height: 30px;
+    padding: 0 50px 50px;
+    box-sizing: border-box;
+    background-color: white;
+}
+
+.happy_foods_Tit {
+    padding-top: 54px;
+}
+
+.happy_foods_Tit h1 {
+    float: left;
+    cursor: pointer;
+    font-size: 32px;
+    color: rgba(26, 26, 26, 1);
+}
+
+.happy_foods_Tit p {
+    float: right;
+    cursor: pointer;
+    font-size: 22px;
+    line-height: 40px;
+    color: rgba(102, 102, 102, 1);
+}
+
+
+/* 文字内容 */
+
+.happy_foods_txt p {
+    margin-top: 30px;
+    font-size: 16px;
+    color: rgba(102, 102, 102, 1);
+    line-height: 32px;
+}
+
+.happy_foods_banner {
+    width: 100%;
+    margin-top: 38px;
+}
+
+.happy_foodes textarea {
+    width: 100%;
+    height: 120px;
+    padding: 24px;
+    border: 0;
+    margin-top: 40px;
+    box-sizing: border-box;
+    background: rgba(255, 255, 255, 1);
+}
+
+.happy_foodes_bottom {
+    line-height: 40px;
+    margin-top: 20px;
+}
+
+.happy_foodes_bottom p {
+    float: left;
+    font-size: 14px;
+    color: rgba(255, 255, 255, 1);
+}
+
+.happy_foodes_btn {
+    float: right;
+    width: 111px;
+    height: 42px;
+    border: 0;
+    cursor: pointer;
+    background: rgba(9, 255, 142, 1);
+    border-radius: 21px;
+    font-size: 20px;
+    color: rgba(26, 26, 26, 1);
+    line-height: 42px;
+    text-align: center;
+}
+
+.happy_foodes_show {
+    width: 100%;
+    background-color: white;
+    margin-top: 40px;
+    padding: 30px;
+    box-sizing: border-box;
+    margin-bottom: 100px;
+}
+
+.happy_foodese_icon {
+    width: 44px;
+    float: left;
+}
+
+.happy_foodes_show ul li {
+    margin: 0 30px 30px;
+    cursor: pointer;
+    padding-bottom: 30px;
+    box-sizing: border-box;
+    border-bottom: 1px solid #EBEBEB;
+}
+
+.happy_foodese_con {
+    float: left;
+    width: 1000px;
+    margin-left: 24px;
+}
+
+.happy_foodese_con h1 {
+    font-size: 18px;
+    font-weight: bold;
+    color: rgba(62, 228, 152, 1);
+}
+
+.happy_foodese_con h2 {
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 24px;
+    margin-top: 4px;
+    color: rgba(102, 102, 102, 1);
+}
+
+.happy_foodese_con p {
+    font-size: 14px;
+    margin-top: 20px;
+    color: rgba(153, 153, 153, 1);
+}
+
+.happy_foods_more {
+    text-align: center;
+    font-size: 18px;
+    color: rgba(62, 228, 152, 1);
+}

@@ -178,6 +178,21 @@
     /*margin-top: 20px*/
     /*margin-top: 20px*/
 /*}*/
 /*}*/
 
 
-#register,#login{
+#register,#login,.login_person{
     cursor: pointer;
     cursor: pointer;
 }
 }
+.login_person{
+    margin-left: 13px;
+}
+.login_person img{
+    width: 44px;
+    height:44px;
+    border-radius:50%;
+}
+.login_person span{
+    font-size:14px;
+    color:rgba(51,51,51,1);
+    margin-left: 10px;
+    display: inline-block;
+    vertical-align:middle;
+}

@@ -170,7 +170,8 @@ p {
 }
 }
 
 
 #star_main .star_happy em p {
 #star_main .star_happy em p {
-    margin-left: 6px
+    margin-left: 6px;
+
 }
 }
 
 
 
 
@@ -379,19 +380,19 @@ p {
     /*远近度*/
     /*远近度*/
     perspective: 400px;
     perspective: 400px;
     -webkit-perspective: 400;
     -webkit-perspective: 400;
-    transition: all 1s;
-    -ms-transition: all 1s;
-    -moz-transition: all 1s;
-    -webkit-transition: all 1s;
-    -o-transition: all 1s;
+    transition: all 2s;
+    -ms-transition: all 2s;
+    -moz-transition: all 2s;
+    -webkit-transition: all 2s;
+    -o-transition: all 2s;
 }
 }
 
 
 .hovers {
 .hovers {
-    transition: all 1s;
-    -ms-transition: all 1s;
-    -moz-transition: all 1s;
-    -webkit-transition: all 1s;
-    -o-transition: all 1s;
+    transition: all 2s;
+    -ms-transition: all 2s;
+    -moz-transition: all 2s;
+    -webkit-transition: all 2s;
+    -o-transition: all 2s;
     /*背面不可视*/
     /*背面不可视*/
     backface-visibility: hidden;
     backface-visibility: hidden;
 }
 }
@@ -410,11 +411,11 @@ p {
     -moz-transform: rotateY(180deg);
     -moz-transform: rotateY(180deg);
     -webkit-transform: rotateY(180deg);
     -webkit-transform: rotateY(180deg);
     -o-transform: rotateY(180deg);
     -o-transform: rotateY(180deg);
-    transition: all 1s;
-    -ms-transition: all 1s;
-    -moz-transition: all 1s;
-    -webkit-transition: all 1s;
-    -o-transition: all 1s;
+    transition: all 2s;
+    -ms-transition: all 2s;
+    -moz-transition: all 2s;
+    -webkit-transition: all 2s;
+    -o-transition: all 2s;
     position: absolute;
     position: absolute;
     top: 0px;
     top: 0px;
     left: 0px;
     left: 0px;
@@ -578,7 +579,13 @@ p {
     /* width:100%;
     /* width:100%;
     height:675px; */
     height:675px; */
 }
 }
-
+.show_in_poster{
+    width: 100%;
+    height: 100%;
+    position:absolute;
+    top:0;
+    left: 0;
+ }
 
 
 /* 播放按钮 */
 /* 播放按钮 */
 
 
@@ -602,9 +609,8 @@ p {
 /* 人物简介 */
 /* 人物简介 */
 
 
 #star_main .star_planet .star_personal {
 #star_main .star_planet .star_personal {
-    margin-top: 40px;
+    margin-top: 76px;
     width: 1200px;
     width: 1200px;
-    height: 220px;
 }
 }
 
 
 
 

 .mask{
 .mask{
 	position:fixed;
 	position:fixed;
-	left: 44%;
+	/*left: 44%;*/
+	top: 40%;
+	left: 50%;
+	transform: translate(-50%,-50%);
+	-webkit-transform: translate(-50%,-50%);
+	-o-transform: translate(-50%,-50%);
+	-moz-transform: translate(-50%,-50%);
+	-ms-transform: translate(-50%,-50%);
 	display: none;
 	display: none;
-	top: 300px;
+	/*top: 300px;*/
 	padding: 24px 32px;
 	padding: 24px 32px;
 	box-sizing:border-box;
 	box-sizing:border-box;
 	background:rgba(0,0,0,0.6);
 	background:rgba(0,0,0,0.6);
 	border-radius:10px;
 	border-radius:10px;
 	font-size:18px;
 	font-size:18px;
 	color:rgba(255,255,255,1);
 	color:rgba(255,255,255,1);
+	z-index: 1000;
 }
 }

+.personal_center {
+	width: 519px;
+	height: 432px;
+	background: rgba(255, 255, 255, 1);
+	box-shadow: 0px 32px 36px 2px rgba(0, 0, 0, 0.04);
+	border-radius: 20px;
+	margin: 0 auto;
+	position: relative;
+	padding: 0 160px;
+	padding-top: 116px;
+	box-sizing: border-box;
+}
+
+.personal_center_avatar {
+	width: 150px;
+	height: 150px;
+	background: #fff;
+	border-radius: 50%;
+	top: -75px;
+	position: absolute;
+	left: 185px;
+}
+
+.personal_center_avatar img {
+	margin: 5px;
+	width:140px;
+	height:140px;
+}
+
+.Editor_avatar,
+.Modifying,
+.Collection {
+	height: 64px;
+	background: rgba(43, 213, 135, 1);
+	border-radius: 32px;
+	padding: 22px 41px;
+	box-sizing: border-box;
+	color: #fff;
+	font-size: 20px;
+	margin-bottom: 24px;
+	cursor: pointer;
+}
+
+.Editor_avatar_icon,
+.Modifying_icon,
+.Collection_icon {
+	width: 20px;
+	height: 20px;
+	float: left;
+}
+
+.personal_center img {
+	display: block;
+	vertical-align: middle;
+}
+
+.Editor_avatar span ,.Modifying span ,.Collection span{
+	float: right;
+	line-height: 20px;
+}
+.updateInfo{
+	width:340px;
+	margin-bottom:50px;
+	margin-left:-60px;
+}
+.updateInfo span{
+	font-size:22px;
+	font-family:MicrosoftYaHei;
+	font-weight:400;
+	color:rgba(102,102,102,1);
+}
+.updateInfo input{
+	width:240px;
+	height:40px;
+	background:rgba(235,235,235,1);
+	border-radius:4px;
+	border:none;
+	outline:medium;
+	font-size:20px;
+	color:rgba(51,51,51,1);
+	margin-left:10px;
+	padding-left:10px;
+}
+.save_info{
+	color: rgba(26,26,26,1);;
+	font-size: 18px;
+	cursor: pointer;
+	text-align:center;
+	margin-left:35px;
+	width:125px;
+	height:42px;
+	background:rgba(9,255,142,1);
+	border-radius:21px;
+}
+.save_info span{
+	line-height:38px;
+	vertical-align: middle;
+}
+#personal-photo{
+	position: absolute;
+	width: 150px;
+	height: 55px;
+	font-size: 12px;
+	right: 185px;
+	top: 120px;
+	opacity: 0;
+	cursor: pointer;
+}

@@ -998,3 +998,221 @@ body {
     color: rgba(102, 102, 102, 1);
     color: rgba(102, 102, 102, 1);
     line-height: 32px;
     line-height: 32px;
 }
 }
+/* 星球影院页 */
+
+.show_9 {
+    width: 1200px;
+    margin: 75px auto 100px;
+}
+
+.show_9_video {
+    float: left;
+    position: relative;
+    width: 955px;
+    height: 426px;
+    background-color: black;
+}
+
+.video_poster {
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: 426px;
+}
+
+.show_9_video .play_button {
+    position: absolute;
+    left: 0;
+    right: 0;
+    margin: auto;
+    top: 35%;
+}
+
+.show_9_video_aside {
+    width: 245px;
+    height: 426px;
+    overflow-y: scroll;
+    padding: 24px 10px 0;
+    box-sizing: border-box;
+    background: rgba(49, 49, 49, 1);
+}
+
+.show_9_video_aside::-webkit-scrollbar {
+    width: 6px;
+    background: rgba(73, 73, 73, 1);
+}
+
+.show_9_video_aside::-webkit-scrollbar-thumb {
+    width: 6px;
+    background: rgba(107, 107, 107, 1);
+}
+
+.show_9_video_asideTie {
+    height: 32px;
+    line-height: 32px;
+    box-sizing: border-box;
+}
+
+.select {
+    position: relative;
+}
+
+.select ul {
+    display: none;
+    position: absolute;
+    width: 142px;
+    top: 32px;
+    left: 52px;
+    z-index: 1;
+}
+
+.select ul li {
+    cursor: pointer;
+    border-bottom: 1px solid #EBEBEB;
+    padding-left: 16px;
+    background-color: white;
+}
+
+.select ul li:last-child {
+    border-bottom: 0;
+}
+
+.select ul li:hover {
+    background: #09FF8E;
+}
+
+.show_9_video_asideTie .select input {
+    cursor: pointer;
+    width: 169px;
+    height: 32px;
+    outline: none;
+    border: 0;
+    color: #1A1A1A;
+    padding-left: 20px;
+    box-sizing: border-box;
+    margin-left: 11px;
+    background-color: rgba(255, 255, 255, 1);
+    box-shadow: -18px 18px 54px 0px rgba(0, 0, 0, 0.1);
+    opacity: 0.9;
+    border-radius: 16px;
+}
+
+.select img {
+    position: absolute;
+    top: 11px;
+    right: 24px;
+    width: 14px;
+    height: 14px;
+}
+
+.curren {
+    display: none;
+}
+
+.video_active {
+    display: block !important;
+}
+
+.show_9_video_asideTie p {
+    float: left;
+    font-size: 14px;
+    color: rgba(255, 255, 255, 1);
+}
+
+.show_9_video_asideCon {
+    margin-top: 19px;
+}
+
+.show_9_video_asideCon ul {
+    display: none;
+}
+
+.show_9_video_asideCon ul li {
+    cursor: pointer;
+    margin-bottom: 30px;
+}
+
+.show_9_video_asideCon ul li img {
+    float: left;
+    width: 128px;
+    opacity: 0.3;
+}
+
+.show_9_video_asideCon ul li p {
+    width: 70px;
+    float: left;
+    margin-left: 10px;
+    font-size: 14px;
+    color: rgba(153, 153, 153, 1);
+    line-height: 22px;
+}
+
+.show_9_video_asideTxt {
+    padding: 24px 32px;
+    box-sizing: border-box;
+    width: 100%;
+    background: rgba(255, 255, 255, 1);
+}
+
+.show_9_video_asideTxt h1 {
+    font-size: 16px;
+    font-weight: 400;
+    cursor: pointer;
+    color: rgba(0, 0, 0, 1);
+}
+
+.show_9_video_asideTxt2 {
+    float: left;
+}
+
+.show_9_video_asideTxt2 p {
+    font-size: 14px;
+    color: #858585;
+    margin-top: 20px;
+    display: inline-block;
+    margin-right: 80px;
+}
+
+.show_9_video_asideTxt3 {
+    float: right;
+}
+
+.show_9_video_asideTxt3 p {
+    font-size: 16px;
+    float: left;
+    line-height: 42px;
+    margin-right: 15px;
+    color: rgba(26, 26, 26, 1);
+}
+
+.show_9_video_asideTxt3 img {
+    width: 40px;
+    cursor: pointer;
+    border-radius: 50%;
+    margin-right: 8px;
+    display: inline-block;
+}
+
+.show_9_video_asideCon ul li:hover img {
+    opacity: 1;
+}
+
+.show_9_video_asideCon ul li:hover p {
+    color: #09FF8E;
+}
+.video_mask {
+    position: fixed;
+    top: 44%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    -webkit-transform: translate(-50%, -50%);
+    -moz-transform: translate(-50%, -50%);
+    -ms-transform: translate(-50%, -50%);
+    -o-transform: translate(-50%, -50%);
+    padding: 24px 33px;
+    background: rgba(0, 0, 0, 1);
+    border-radius: 10px;
+    z-index: 1;
+    font-size: 18px;
+    color: rgba(255, 255, 255, 1);
+}

-/** layui-v2.4.5 MIT License By https://www.layui.com */
- ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function u(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(o.getStyle(document.getElementById(f),"width"))?i():setTimeout(u,100))}()}}},r={v:"3.1.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},s=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="layui-layer-move"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),i("#layui-layer-shade"+e.index).css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+l[0]+e),s=a.find(l[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:s,left:f,top:n.height()-s,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+l[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e){var t=i("#"+l[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var s="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+l[5]+")").remove();for(var a=t.find("."+s),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(s)}else{if(n===o.type[2])try{var f=i("#"+l[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+l[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("isOutAnim")&&t.addClass("layer-anim "+a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),r.ie&&r.ie<10||!t.data("isOutAnim")?f():setTimeout(function(){f()},200)}},r.closeAll=function(e){i.each(i("."+l[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=t.photos.constructor===Object,f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0),h()}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.hover(function(){s.imgsee.show()},function(){s.imgsee.hide()}),s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev()}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext()}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'"><div class="layui-layer-imgsee">'+(u.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);

-/** layui-v2.4.5 MIT License By https://www.layui.com */
- ;layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});

@@ -16,7 +16,7 @@ $(function(){
         }
         }
     });
     });
     // 评论判断长度显示与隐藏
     // 评论判断长度显示与隐藏
-    if ($('.show_2_pinL').length < 2) {
+    if ($('.show_2_pinL').length < 3) {
         $('.show_main_more').hide();
         $('.show_main_more').hide();
         $('.show_main2_show ul').removeClass('show_main2_show_H');
         $('.show_main2_show ul').removeClass('show_main2_show_H');
     } else {
     } else {
@@ -70,6 +70,42 @@ $(function(){
         window.location.href = '/portal/login/login';
         window.location.href = '/portal/login/login';
     });
     });
 
 
+    //个人中心
+    $('.login_person').click(function(){
+        window.location.href = '/portal/login/info';
+    });
+
+    //修改资料页面
+    $('#editInfo').click(function(){
+        window.location.href = '/portal/login/editInfo';
+    });
+
+    //评论
+    $('#comment').click(function(){
+        var content = $('#comment_content').val();
+        var article_id = getUrlParam('id');
+        var url = window.location.href;
+        $.ajax({
+            type: 'POST',
+            url: "/portal/star/comment",
+            data: {
+                'content': content,
+                'article_id':article_id,
+                'url':url
+
+            },
+            dataType: 'json',
+            success: function (data) {
+                console.log(data);
+                if (data.code == 1) {
+                    mask(data.msg);
+                    $('#comment_content').val('');
+                } else {
+                    mask(data.msg);
+                }
+            }
+        });
+    });
 });
 });
 
 
 //弹框
 //弹框
@@ -81,3 +117,25 @@ function mask(msg) {
         $('.mask').text('');
         $('.mask').text('');
     },4000);
     },4000);
 }
 }
+
+//获取url的参数
+function getUrlParam(paraName) {
+    var url = document.location.toString();
+    var arrObj = url.split("?");
+
+    if (arrObj.length > 1) {
+        var arrPara = arrObj[1].split("&");
+        var arr;
+
+        for (var i = 0; i < arrPara.length; i++) {
+            arr = arrPara[i].split("=");
+
+            if (arr != null && arr[0] == paraName) {
+                return arr[1];
+            }
+        }
+        return "";
+    } else {
+        return "";
+    }
+}

+jQuery.extend({
+
+
+    createUploadIframe: function(id, uri)
+    {
+        //create frame
+        var frameId = 'jUploadFrame' + id;
+
+        if(window.ActiveXObject) {
+            var io = document.createElement('<iframe id="' + frameId + '" name="' + frameId + '" />');
+            if(typeof uri== 'boolean'){
+                io.src = 'javascript:false';
+            }
+            else if(typeof uri== 'string'){
+                io.src = uri;
+            }
+        }
+        else {
+            var io = document.createElement('iframe');
+            io.id = frameId;
+            io.name = frameId;
+        }
+        io.style.position = 'absolute';
+        io.style.top = '-1000px';
+        io.style.left = '-1000px';
+
+        document.body.appendChild(io);
+
+        return io
+    },
+    createUploadForm: function(id, fileElementId)
+    {
+        //create form
+        var formId = 'jUploadForm' + id;
+        var fileId = 'jUploadFile' + id;
+        var form = $('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
+        var oldElement = $('#' + fileElementId);
+        var newElement = $(oldElement).clone(true);
+        $(oldElement).attr('id', fileId);
+        $(oldElement).before(newElement);
+        $(oldElement).appendTo(form);
+        //set attributes
+        $(form).css('position', 'absolute');
+        $(form).css('top', '-1200px');
+        $(form).css('left', '-1200px');
+        $(form).appendTo('body');
+        return form;
+    },
+    addOtherRequestsToForm: function(form,data)
+    {
+        // add extra parameter
+        var originalElement = $('<input type="hidden" name="" value="">');
+        for (var key in data) {
+            name = key;
+            value = data[key];
+            var cloneElement = originalElement.clone();
+            cloneElement.attr({'name':name,'value':value});
+            $(cloneElement).appendTo(form);
+        }
+        return form;
+    },
+
+    ajaxFileUpload: function(s) {
+        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout
+        s = jQuery.extend({}, jQuery.ajaxSettings, s);
+        var id = new Date().getTime()
+        var form = jQuery.createUploadForm(id, s.fileElementId);
+        if ( s.data ) form = jQuery.addOtherRequestsToForm(form,s.data);
+        var io = jQuery.createUploadIframe(id, s.secureuri);
+        var frameId = 'jUploadFrame' + id;
+        var formId = 'jUploadForm' + id;
+        // Watch for a new set of requests
+        if ( s.global && ! jQuery.active++ )
+        {
+            jQuery.event.trigger( "ajaxStart" );
+        }
+        var requestDone = false;
+        // Create the request object
+        var xml = {}
+        if ( s.global )
+            jQuery.event.trigger("ajaxSend", [xml, s]);
+        // Wait for a response to come back
+        var uploadCallback = function(isTimeout)
+        {
+            var io = document.getElementById(frameId);
+            try
+            {
+                if(io.contentWindow)
+                {
+                    xml.responseText = io.contentWindow.document.body?io.contentWindow.document.body.innerHTML:null;
+                    xml.responseXML = io.contentWindow.document.XMLDocument?io.contentWindow.document.XMLDocument:io.contentWindow.document;
+
+                }else if(io.contentDocument)
+                {
+                    xml.responseText = io.contentDocument.document.body?io.contentDocument.document.body.innerHTML:null;
+                    xml.responseXML = io.contentDocument.document.XMLDocument?io.contentDocument.document.XMLDocument:io.contentDocument.document;
+                }
+            }catch(e)
+            {
+                jQuery.handleError(s, xml, null, e);
+            }
+            if ( xml || isTimeout == "timeout")
+            {
+                requestDone = true;
+                var status;
+                try {
+                    status = isTimeout != "timeout" ? "success" : "error";
+                    // Make sure that the request was successful or notmodified
+                    if ( status != "error" )
+                    {
+                        // process the data (runs the xml through httpData regardless of callback)
+                        var data = jQuery.uploadHttpData( xml, s.dataType );
+                        // If a local callback was specified, fire it and pass it the data
+                        if ( s.success )
+                            s.success( data, status );
+
+                        // Fire the global callback
+                        if( s.global )
+                            jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+                    } else
+                        jQuery.handleError(s, xml, status);
+                } catch(e)
+                {
+                    status = "error";
+                    jQuery.handleError(s, xml, status, e);
+                }
+
+                // The request was completed
+                if( s.global )
+                    jQuery.event.trigger( "ajaxComplete", [xml, s] );
+
+                // Handle the global AJAX counter
+                if ( s.global && ! --jQuery.active )
+                    jQuery.event.trigger( "ajaxStop" );
+
+                // Process result
+                if ( s.complete )
+                    s.complete(xml, status);
+
+                jQuery(io).unbind()
+
+                setTimeout(function()
+                {	try
+                {
+                    $(io).remove();
+                    $(form).remove();
+
+                } catch(e)
+                {
+                    jQuery.handleError(s, xml, null, e);
+                }
+
+                }, 100)
+
+                xml = null
+
+            }
+        }
+        // Timeout checker
+        if ( s.timeout > 0 )
+        {
+            setTimeout(function(){
+                // Check to see if the request is still happening
+                if( !requestDone ) uploadCallback( "timeout" );
+            }, s.timeout);
+        }
+        try
+        {
+            // var io = $('#' + frameId);
+            var form = $('#' + formId);
+            $(form).attr('action', s.url);
+            $(form).attr('method', 'POST');
+            $(form).attr('target', frameId);
+            if(form.encoding)
+            {
+                form.encoding = 'multipart/form-data';
+            }
+            else
+            {
+                form.enctype = 'multipart/form-data';
+            }
+            $(form).submit();
+
+        } catch(e)
+        {
+            jQuery.handleError(s, xml, null, e);
+        }
+        if(window.attachEvent){
+            document.getElementById(frameId).attachEvent('onload', uploadCallback);
+        }
+        else{
+            document.getElementById(frameId).addEventListener('load', uploadCallback, false);
+        }
+        return {abort: function () {}};
+
+    },
+
+    uploadHttpData: function( r, type ) {
+        var data = !type;
+        data = type == "xml" || data ? r.responseXML : r.responseText;
+        // If the type is "script", eval it in global context
+        if ( type == "script" )
+            jQuery.globalEval( data );
+        // Get the JavaScript object, if JSON is used.
+        if ( type == "json" )
+        {
+            // If you add mimetype in your response,
+            // you have to delete the '<pre></pre>' tag.
+            // The pre tag in Chrome has attribute, so have to use regex to remove
+            var data = r.responseText;
+            var rx = new RegExp("<pre.*?>(.*?)</pre>","i");
+            var am = rx.exec(data);
+            //this is the desired data extracted
+            var data = (am) ? am[1] : "";    //the only submatch or empty
+            eval( "data = " + data );
+        }
+        // evaluate scripts within html
+        if ( type == "html" )
+            jQuery("<div>").html(data).evalScripts();
+        //alert($('param', data).each(function(){alert($(this).attr('value'));}));
+        return data;
+    }
+})

 <div class="show_main2">
 <div class="show_main2">
-    <form action="">
-        <textarea placeholder="说点什么吧" maxlength="100"></textarea>
+    <!--<form action="">-->
+        <textarea placeholder="说点什么吧" maxlength="400" id="comment_content"></textarea>
         <!-- 评论底部 -->
         <!-- 评论底部 -->
         <div class="show_main2_bottom clearfix">
         <div class="show_main2_bottom clearfix">
             <p>字数限400字符内</p>
             <p>字数限400字符内</p>
-            <button type="submit" class="show_main2_btn">添加评论</button>
+            <button type="submit" class="show_main2_btn" id="comment">添加评论</button>
         </div>
         </div>
-    </form>
+    <!--</form>-->
     <!-- 评论展示 -->
     <!-- 评论展示 -->
+    <notempty name="comment">
         <div class="show_main2_show ">
         <div class="show_main2_show ">
             <ul class="show_main2_show_H">
             <ul class="show_main2_show_H">
+                <volist name="comment" id="vo">
                     <li class="clearfix show_2_pinL">
                     <li class="clearfix show_2_pinL">
-                <img class="show_comments_icon" src="__TMPL__/public/assets/starImg//aicon_82.png" alt="">
+                        <img class="show_comments_icon" src="{:cmf_get_image_url($vo.avatar)}" alt="">
                         <div class="show_comments_con">
                         <div class="show_comments_con">
-                    <h1>身份三</h1>
-                    <h2>网络世界便是如此，每年都有许多刷屏的事件发生。当旅游成为老百姓的生活方式以后，刷屏事件自是免不了。不过，此次青岛大虾事件有点特别就是行内与公众一起刷屏，甚至业内比公众还要热闹。</h2>
-                    <p>2017-10-08</p>
-                </div>
-            </li>
-            <li class="clearfix show_2_pinL">
-                <img class="show_comments_icon" src="__TMPL__/public/assets/starImg//aicon_82.png" alt="">
-                <div class="show_comments_con">
-                    <h1>身份三</h1>
-                    <h2>网络世界便是如此，每年都有许多刷屏的事件发生。当旅游成为老百姓的生活方式以后，刷屏事件自是免不了。不过，此次青岛大虾事件有点特别就是行内与公众一起刷屏，甚至业内比公众还要热闹。</h2>
-                    <p>2017-10-08</p>
-                </div>
-            </li>
-            <li class="clearfix show_2_pinL">
-                <img class="show_comments_icon" src="__TMPL__/public/assets/starImg//aicon_82.png" alt="">
-                <div class="show_comments_con">
-                    <h1>身份三</h1>
-                    <h2>网络世界便是如此，每年都有许多刷屏的事件发生。当旅游成为老百姓的生活方式以后，刷屏事件自是免不了。不过，此次青岛大虾事件有点特别就是行内与公众一起刷屏，甚至业内比公众还要热闹。</h2>
-                    <p>2017-10-08</p>
+                            <h1>{$vo.nickname}</h1>
+                            <h2>{$vo.content}</h2>
+                            <p>{$vo.create_time|date="Y-m-d",###}</p>
                         </div>
                         </div>
                     </li>
                     </li>
+                </volist>
             </ul>
             </ul>
             <p class="show_main_more">查看更多评论</p>
             <p class="show_main_more">查看更多评论</p>
         </div>
         </div>
+        <else/>
+        <div class="show_main2_show" style="background-color: #3C3C94;margin-bottom:0;">
+        </div>
+    </notempty>
 </div>
 </div>

@@ -23,9 +23,9 @@
                 <!-- 关注我们 -->
                 <!-- 关注我们 -->
                 <div class="about_bot">
                 <div class="about_bot">
                     <!-- 标题 -->
                     <!-- 标题 -->
-                    <span class="title">
-                            <p class="ch">关注我们</p>
-                        </span>
+                    <!--<span class="title">-->
+                            <!--<p class="ch">关注我们</p>-->
+                        <!--</span>-->
                     <!-- 二维码 -->
                     <!-- 二维码 -->
                     <div class="qr_code">
                     <div class="qr_code">
                         <volist name="focus" id="vo">
                         <volist name="focus" id="vo">

@@ -41,6 +41,20 @@
             <i class="search_icon"></i>
             <i class="search_icon"></i>
             <input type="text" placeholder="巴厘岛">
             <input type="text" placeholder="巴厘岛">
         </section>
         </section>
+        <notempty name="user">
+            <section class="home_login login_person">
+                <notempty name="user.avatar">
+                    <img src="{:cmf_get_image_url($user.avatar)}" alt="">
+                    <else/>
+                    <img src="__TMPL__/public/assets/starImg/aicon_82.png" alt="">
+                </notempty>
+                <notempty name="user.user_nickname">
+                    <span>{$user.user_nickname}</span>
+                    <else/>
+                    <span>随风漂泊</span>
+                </notempty>
+            </section>
+            <else/>
             <!-- 登录注册 -->
             <!-- 登录注册 -->
             <section class="home_login">
             <section class="home_login">
             <span>
             <span>
@@ -48,7 +62,7 @@
                 <p id="login">登录</p>
                 <p id="login">登录</p>
             </span>
             </span>
             </section>
             </section>
+        </notempty>
     </div>
     </div>
     <!-- logo -->
     <!-- logo -->
-
 </div>
 </div>

@@ -29,6 +29,7 @@ class HomeBaseController extends BaseController
         $this->getUserLoginInfo();
         $this->getUserLoginInfo();
         $this->getFooter();
         $this->getFooter();
         $this->getHeader();
         $this->getHeader();
+        $this->getComment();
     }
     }
 
 
     protected function _initializeView()
     protected function _initializeView()
@@ -261,9 +262,9 @@ hello;
      * 获取登录信息
      * 获取登录信息
      */
      */
     public function getUserLoginInfo(){
     public function getUserLoginInfo(){
-        $user_mobile = Session::get('userInfo');
-        $user_mobile = empty($user_mobile)?'0':$user_mobile;
-        $this->assign('user_mobile',$user_mobile);
+        $user = cmf_get_current_user();
+        $user = empty($user)?'':$user;
+        $this->assign('user',$user);
     }
     }
 
 
     //获取底部相关内容
     //获取底部相关内容
@@ -328,4 +329,16 @@ hello;
         $this->assign('slide',$arr);
         $this->assign('slide',$arr);
     }
     }
 
 
+    //获取评论内容
+    public function getComment(){
+        $id = $this->request->param('id',0,'intval');
+        $comment = Db::name('comment')
+            ->alias('c')
+            ->join('user u','c.user_id = u.id','LEFT')
+            ->where(['c.status'=>1,'post_id'=>$id])
+            ->field('u.user_nickname nickname,u.avatar,c.content,c.create_time')
+            ->select()->toArray();
+        $this->assign('comment',$comment);
+    }
+
 }
 }