diff --git a/app/Http/Controllers/Home/IndexController.php b/app/Http/Controllers/Home/IndexController.php
index 79d177a..1ed8e7f 100644
--- a/app/Http/Controllers/Home/IndexController.php
+++ b/app/Http/Controllers/Home/IndexController.php
@@ -15,6 +15,17 @@ class IndexController extends CommonController
 	//首页
     public function index()
 	{
+        //推荐商品列表
+        $postdata = array(
+            'tuijian' => 1,
+            'status' => 0,
+            'limit'  => 6,
+            'offset' => 0
+		);
+        $url = env('APP_API_URL')."/goods_list";
+		$res = curl_request($url,$postdata,'GET');
+        $data['tjlist'] = $res['data']['list'];
+        
         //商品列表
         $pagesize = 15;
         $offset = 0;
diff --git a/public/css/style.css b/public/css/style.css
index 5870529..269c8f5 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -94,5 +94,5 @@ a{color:#313131;text-decoration:none;}a:hover{text-decoration:none;color:#22ac38
 .titem{padding-bottom:10px;border-bottom:1px dotted #e0e0e0;margin-bottom:10px;}
 .iztad{height:120px;overflow:hidden;margin-top:5px;}
 
-#footer{color:#fafafa;font-size:12px;background:#161616;padding:15px 0;text-align:center;}
+#footer{color:#666;font-size:12px;background:#f2f2f2;padding:15px 0;text-align:center;}
 .tm{overflow:hidden;position:fixed;left:1px;bottom:15px;z-index:999;_position:absolute;}
diff --git a/resources/views/admin/goods/add.blade.php b/resources/views/admin/goods/add.blade.php
index 6b79324..2333c52 100644
--- a/resources/views/admin/goods/add.blade.php
+++ b/resources/views/admin/goods/add.blade.php
@@ -86,6 +86,42 @@ function upImage()
 }
 </script>
 <script type="text/plain" id="ueditorimg"></script>
+    <tr>
+        <td align="right" style="vertical-align:middle;">商品图片：</td>
+        <td style="vertical-align:middle;" id="duotulist"><button type="button" onclick="upImage2();">选择图片</button></td>
+    </tr>
+<script type="text/javascript">
+var _editor2;
+$(function() {
+    //重新实例化一个编辑器，防止在上面的editor编辑器中显示上传的图片或者文件
+    _editor2 = UE.getEditor('ueditordimg');
+    _editor2.ready(function () {
+        //设置编辑器不可用
+        _editor2.setDisabled('insertimage');
+        //隐藏编辑器，因为不会用到这个编辑器实例，所以要隐藏
+        _editor2.hide();
+        //侦听图片上传
+        _editor2.addListener('beforeInsertImage', function (t, arg) {
+            $("#duotulist").html('<button type="button" onclick="upImage2();">选择图片</button>');
+            for (var i=0;i<arg.length;i++)
+            {
+                if(i<8)
+                {
+                    $("#duotulist").append('<img style="margin-left:10px;" src="'+arg[i].src+'" width="120" height="80"><input name="goods_img[]" type="text" value="'+arg[i].src+'" style="display:none;">');
+                }
+            }
+        })
+    });
+});
+//弹出图片上传的对话框
+function upImage2()
+{
+    var myImage = _editor2.getDialog("insertimage");
+	myImage.render();
+    myImage.open();
+}
+</script>
+<script type="text/plain" id="ueditordimg"></script>
     <tr>
         <td align="right">商品类目：</td>
         <td>
diff --git a/resources/views/home/common/header.blade.php b/resources/views/home/common/header.blade.php
index 8b2e457..09854db 100644
--- a/resources/views/home/common/header.blade.php
+++ b/resources/views/home/common/header.blade.php
@@ -21,9 +21,8 @@
         <h1 class="logo mouseleave"><a class="ju-logo ju-logo-show" href="<?php echo route('home'); ?>" title="logo"><img src="<?php echo env('APP_URL'); ?>/images/logo.png"></a></h1>             
         <ul id="J_NavMenu" class="nav-menu">  
             <li class="menu-home<?php if(route('home') == url()->full()){echo ' current';} ?>"><a class="menu-link" href="<?php echo route('home'); ?>">首页</a></li>
-            <li class="menu-brands<?php if(route('home_brandlist') == url()->full()){echo ' current';} ?>"><a class="menu-link" href="<?php echo route('home_brandlist'); ?>">品牌团</a></li>
             <li class="menu-goodslist<?php if(route('home_goodslist') == url()->full()){echo ' current';} ?>"><a class="menu-link" href="<?php echo route('home_goodslist'); ?>">优质精选</a></li>
-                        <li class="menu-goodslist<?php if(route('home_goodslist',array('orderby'=>1)) == url()->full()){echo ' current';} ?>"><a class="menu-link" href="<?php echo route('home_goodslist',array('orderby'=>1)); ?>">超值热卖</a></li>
+            <li class="menu-goodslist<?php if(route('home_goodslist',array('orderby'=>1)) == url()->full()){echo ' current';} ?>"><a class="menu-link" href="<?php echo route('home_goodslist',array('orderby'=>1)); ?>">超值热卖</a></li>
             <li class="menu-qqjx<?php if(route('home_arclist') == url()->full()){echo ' current';} ?>"><a class="menu-link" href="<?php echo route('home_arclist'); ?>">热点资讯</a></li>
             <li class="menu-liangfan<?php if(route('home_singlepage',array('id'=>'about')) == url()->full()){echo ' current';} ?>"><a class="menu-link" href="<?php echo route('home_singlepage',array('id'=>'about')); ?>">关于我们</a></li>
         </ul>
diff --git a/resources/views/home/index/goods.blade.php b/resources/views/home/index/goods.blade.php
index 5523b28..b7c1f77 100644
--- a/resources/views/home/index/goods.blade.php
+++ b/resources/views/home/index/goods.blade.php
@@ -19,19 +19,22 @@
 .normal-pic .item-pic-wrap {position: relative;}
 .normal-pic-wrapper .item-pic-wrap .pic {background-size: cover;background-position: center center;background-repeat: no-repeat;height: 360px;width: 360px;}
 .detail-main .main-box {float: right;width: 560px;_width: 545px;margin-right: 5px;_display: inline;}
-.detail-main .main-box .title {margin:8px 0;color: #3C3C3C;font-size: 18px;line-height: 28px;overflow: hidden;text-align: justify;}
-.detail-main .main-box .description {color: #aaa;font-size: 14px;line-height: 20px;word-break: break-all;margin-bottom:10px;}
-.price_bg {color: #6c6c6c;padding:15px;background-color:#FFF2E8;}
-.details_join a {text-align: center;padding:10px 40px;font-size: 16px;color: #fff;border-radius: 2px;background: #e61414;float:left;}
+.detail-main .main-box .title {margin:8px 0;color:#333;font-size:24px;line-height:34px;font-weight: normal;text-align: justify;}
+.detail-main .main-box .description {color:#999;font-size: 14px;line-height: 20px;word-break: break-all;}
+.detail-main .price {margin: 20px 0;font-size: 14px;}
+.detail-main .price .rmb {font-size: 30px;margin-right: 3px;color: #d33a31;}
+.detail-main .price em {margin-right: 4px;font-size: 30px;color: #d33a31;}
+.detail-main .price .dis {margin-left: 16px;font-size: 16px;color: #999;text-decoration: line-through;}
+.detail-main .price sub {position: relative;top: -5px;font-size: 14px;color: #cb3b3b;}
 </style>
 <div style="background-color:#f3f3f3;padding-bottom:10px;">
 <div class="box">
 <div class="detail-main  clearfix">
 <div class="header clearfix">
     <ul class="crumbs">
-        <li><a href="https://ju.taobao.com/tg/today_items.htm">今日团购</a></li>
+        <li><a href="<?php echo route('home'); ?>">首页</a></li>
         <span class="arrow"><small></small></span>
-        <li><a href="https://ju.taobao.com/tg/today_items.htm?stype=default&amp;page=1&amp;type=0">商品团</a></li>
+        <li><a href="<?php echo route('home_goodslist'); ?>">所有商品</a></li>
         <span class="arrow"><small></small></span>
         <li><a href="<?php echo route('home_goodslist',array('id'=>$post['id'])); ?>"><?php echo $post['type_name']; ?></a></li>
     </ul>
@@ -42,7 +45,7 @@
 <div class="main-pic">
     <div class="normal-pic-wrapper clearfix" data-spm="ne">
         <div class="normal-pic ">
-            <a href="https://detail.tmall.com/item.htm?id=523987525652&amp;tracelog=jubuybigpic" target="_blank" class="piclink">
+            <a href="javascript:;" target="_blank" class="piclink">
                 <div class="item-pic-wrap">
                 <div class="J_zoom pic " style="background-image: url(<?php echo $post['litpic']; ?>);"></div>
                 </div>
@@ -53,14 +56,9 @@
 
 <div class="main-box J_mainBox avil">
 <h2 class="title"><?php echo $post['title']; ?></h2>
-<div class="description"><?php echo $post['description']; ?></div>
-<div class="price_bg">
-价格: <b class="price" style="margin-left:10px;margin-right:10px;font-size:28px;font-style:normal;color:#f40;"><?php echo $post["price"]; ?></b> 邮费：0.00
-</div>
-<div class="stock_bg" style="margin-top:10px;margin-bottom:30px;">
-&nbsp;&nbsp;库存: <?php echo $post['goods_number']; ?>
-</div>
-<div class="details_join"><a href="javascript:submit();">立即抢购</a></div>
+<?php if($post['description']){ ?><div class="description"><?php echo $post['description']; ?></div><?php } ?>
+<p class="price "><span class="rmb">¥</span><em class="j-flag"><?php echo $post["price"]; ?></em><sub class="dis">¥<span class="j-flag j-original"><?php echo $post["market_price"]; ?></span></sub></p>
+<p class="buyorjoin j-flag f-cb"><a style="box-sizing: border-box;line-height: 47px;width: 170px;height: 50px;margin-top:10px;font-size: 18px;border: 2px solid #d33a31;color: #d33a31;background-color: white;display: inline-block;text-align: center;margin-right: 10px;" href="javascript:submit();">立即购买</a><a style="width: 188px;height: 50px;line-height: 50px;margin-top:10px;font-size: 18px;background-color: #d33a31;display: inline-block;text-align: center;color: #fff;" href="javascript:submit();">加入购物车</a></p>
 </div>
 <div class="cl"></div></div>
 </div>
diff --git a/resources/views/home/index/goodslist.blade.php b/resources/views/home/index/goodslist.blade.php
index f035051..8db5506 100644
--- a/resources/views/home/index/goodslist.blade.php
+++ b/resources/views/home/index/goodslist.blade.php
@@ -37,6 +37,9 @@
 </a></li>
 <?php }} ?>
 </ul></div>
+
+<div class="box nomore" style="text-align:center;line-height:46px;font-size:18px;color:#999;display:none;">没有更多数据了</div>
+
 <script>
 $(function(){
     var ajaxload  = false;
@@ -57,6 +60,7 @@ $(function(){
             if(startpage >= totalpage)
             {
                 //$("#submit_bt_one").html("已是最后一页，没有更多数据！");
+                $(".nomore").show();
                 return false;
             }
             
@@ -77,6 +81,7 @@ $(function(){
                         if(startpage >= totalpage)
                         {
                             maxpage = true;
+                            $(".nomore").show();
                             //$("#submit_bt_one").html("已是最后一页，没有更多数据！");
                         }
                         else
diff --git a/resources/views/home/index/index.blade.php b/resources/views/home/index/index.blade.php
index 6be8f0c..2ba0c0a 100644
--- a/resources/views/home/index/index.blade.php
+++ b/resources/views/home/index/index.blade.php
@@ -13,7 +13,7 @@
     <div class="swiper-container">
         <div class="swiper-wrapper">
         <?php foreach($slide_list as $k=>$v){ ?>
-            <div class="swiper-slide"><a href="<?php echo $v['url']; ?>"><img src="<?php echo $v['pic']; ?>" alt="<?php echo $v['title']; ?>"></a></div>
+            <div class="swiper-slide"><a href="<?php if($v['url']){echo $v['url'];}else{echo 'javascript:;';} ?>"><img src="<?php echo $v['pic']; ?>" alt="<?php echo $v['title']; ?>"></a></div>
         <?php } ?>
         </div>
         <!-- Add Pagination -->
@@ -92,21 +92,24 @@ var swiper = new Swiper('.swiper-container', {
 <div class="brand-des"><span class="fl"></span>
 <span class="fr"><em>234100</em>件已付款 &nbsp; <em>仅剩1天</em></span></div></a>
 </li>
-<li>
-<a href="http://ju.taobao.com/tg/brand_items.htm?act_sign_id=28794165&amp;seller_id=880734502" target="_blank">
-<img class="brand-pic" src="/images/3.jpg">
-<div class="brand-des"><span class="fl"></span>
-<span class="fr"><em>234100</em>件已付款 &nbsp; <em>仅剩1天</em></span></div></a>
-</li>
-<li>
-<a href="http://ju.taobao.com/tg/brand_items.htm?act_sign_id=28794165&amp;seller_id=880734502" target="_blank">
-<img class="brand-pic" src="/images/3.jpg">
-<div class="brand-des"><span class="fl"></span>
-<span class="fr"><em>234100</em>件已付款 &nbsp; <em>仅剩1天</em></span></div></a>
-</li>
 </ul></div>
 
 <div class="box">
+<p style="font-weight:bold;font-size:24px;color:#333;margin-top:30px;margin-bottom:20px;">编辑推荐</p>
+<ul class="pul">
+<?php if($tjlist){foreach($tjlist as $k=>$v){ ?>
+<li><a href="<?php echo route('home_goods',array('id'=>$v['id'])); ?>" target="_blank"><img src="<?php echo $v['litpic']; ?>" alt="<?php echo $v['title']; ?>">
+<p class="title"><?php echo $v['title']; ?></p>
+<p class="desc"><span class="price-point"><i></i>库存(<?php echo $v['goods_number']; ?>)</span> <?php echo $v['description']; ?></p>
+<div class="item-prices red"><div class="item-link">立即<br>抢购</div><div class="item-info"><div class="price"><i>¥</i><em class="J_actPrice"><span class="yen"><?php echo ceil($v['price']); ?></span></em></div>
+<div class="dock"><div class="dock-price"><del class="orig-price">¥<?php echo $v['market_price']; ?></del> <span class="benefit">包邮</span></div><div class="prompt"><div class="sold-num"><em><?php echo $v['sale']; ?></em> 件已付款</div></div></div>
+</div></div>
+</a></li>
+<?php }} ?>
+</ul></div>
+
+<div class="box">
+<p style="font-weight:bold;font-size:24px;color:#333;margin-top:30px;margin-bottom:20px;">热门商品</p>
 <ul class="pul" id="goods_list">
 <?php if($list){foreach($list as $k=>$v){ ?>
 <li><a href="<?php echo route('home_goods',array('id'=>$v['id'])); ?>" target="_blank"><img src="<?php echo $v['litpic']; ?>" alt="<?php echo $v['title']; ?>">
@@ -119,6 +122,8 @@ var swiper = new Swiper('.swiper-container', {
 <?php }} ?>
 </ul></div>
 
+<div class="box nomore" style="text-align:center;line-height:46px;font-size:18px;color:#999;margin-bottom:10px;display:none;">没有更多数据了</div>
+
 <script>
 $(function(){
     var ajaxload  = false;
@@ -139,6 +144,7 @@ $(function(){
             if(startpage >= totalpage)
             {
                 //$("#submit_bt_one").html("已是最后一页，没有更多数据！");
+                $(".nomore").show();
                 return false;
             }
             
@@ -159,6 +165,7 @@ $(function(){
                         if(startpage >= totalpage)
                         {
                             maxpage = true;
+                            $(".nomore").show();
                             //$("#submit_bt_one").html("已是最后一页，没有更多数据！");
                         }
                         else