From 8f467d3492f84d21919e26631df165b8bd702644 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Wed, 29 Aug 2018 11:21:00 +0800
Subject: [PATCH] detail mv goods

---
 .../Application/Admin/Controller/GoodsController.class.php  | 3 +++
 service/Application/Admin/View/Default/Goods/Index.html     | 4 ++--
 ...DetailController.class.php => GoodsController.class.php} | 6 +++---
 .../Home/View/Default/{Detail => Goods}/Index.html          | 6 +++---
 service/Application/Home/View/Default/Index/Index.html      | 2 +-
 service/Public/Home/Default/Css/{Detail.css => Goods.css}   | 0
 service/Public/Home/Default/Js/{Detail.js => Goods.js}      | 0
 7 files changed, 12 insertions(+), 9 deletions(-)
 rename service/Application/Home/Controller/{DetailController.class.php => GoodsController.class.php} (94%)
 rename service/Application/Home/View/Default/{Detail => Goods}/Index.html (98%)
 rename service/Public/Home/Default/Css/{Detail.css => Goods.css} (100%)
 rename service/Public/Home/Default/Js/{Detail.js => Goods.js} (100%)

diff --git a/service/Application/Admin/Controller/GoodsController.class.php b/service/Application/Admin/Controller/GoodsController.class.php
index dd3218663..5b7d17221 100755
--- a/service/Application/Admin/Controller/GoodsController.class.php
+++ b/service/Application/Admin/Controller/GoodsController.class.php
@@ -102,6 +102,9 @@ class GoodsController extends CommonController
 				// 产地
 				$v['place_origin_text'] = M('Region')->where(['id'=>$v['place_origin']])->getField('name');
 
+				// 商品url地址
+				$v['goods_url'] = HomeUrl('Goods', 'Index', ['id'=>$v['id']]);
+
 				// 创建时间
 				$v['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
 
diff --git a/service/Application/Admin/View/Default/Goods/Index.html b/service/Application/Admin/View/Default/Goods/Index.html
index 2eb73c387..c6a3e91e7 100755
--- a/service/Application/Admin/View/Default/Goods/Index.html
+++ b/service/Application/Admin/View/Default/Goods/Index.html
@@ -62,10 +62,10 @@
 					<foreach name="list" item="v">
 						<tr id="data-list-{{$v.id}}" <if condition="$v['is_shelves'] eq 0">class="am-active"</if>>
 							<td>
-								<a href="javascript:;" target="_blank" title="{{$v.title}}">
+								<a href="{{$v.goods_url}}" target="_blank" title="{{$v.title}}">
 									<img src="{{$image_host}}{{$v['images']}}" class="am-img-thumbnail am-radius goods-images am-hide-sm-only" />
 								</a>
-								<a href="javascript:;" target="_blank" title="{{$v.title}}" <if condition="!empty($v['title_color'])"> style="color:{{$v.title_color}};" </if> >{{$v.title}}</a>
+								<a href="{{$v.goods_url}}" target="_blank" title="{{$v.title}}" <if condition="!empty($v['title_color'])"> style="color:{{$v.title_color}};" </if> >{{$v.title}}</a>
 							</td>
 							<td>
 								{{$v.price}}
diff --git a/service/Application/Home/Controller/DetailController.class.php b/service/Application/Home/Controller/GoodsController.class.php
similarity index 94%
rename from service/Application/Home/Controller/DetailController.class.php
rename to service/Application/Home/Controller/GoodsController.class.php
index f7b261e16..37158522d 100644
--- a/service/Application/Home/Controller/DetailController.class.php
+++ b/service/Application/Home/Controller/GoodsController.class.php
@@ -9,7 +9,7 @@ namespace Home\Controller;
  * @version  0.0.1
  * @datetime 2016-12-01T21:51:08+0800
  */
-class DetailController extends CommonController
+class GoodsController extends CommonController
 {
     /**
      * [_initialize 前置操作-继承公共前置方法]
@@ -33,10 +33,10 @@ class DetailController extends CommonController
      */
     public function Index()
     {
-        $goods_id = I('goods_id');
+        $id = I('id');
         $params = [
             'where' => [
-                'g.id'    => $goods_id,
+                'g.id'    => $id,
                 'g.is_delete_time' => 0,
             ],
             'is_photo' => true,
diff --git a/service/Application/Home/View/Default/Detail/Index.html b/service/Application/Home/View/Default/Goods/Index.html
similarity index 98%
rename from service/Application/Home/View/Default/Detail/Index.html
rename to service/Application/Home/View/Default/Goods/Index.html
index 0b56db7f3..dc529475b 100644
--- a/service/Application/Home/View/Default/Detail/Index.html
+++ b/service/Application/Home/View/Default/Goods/Index.html
@@ -192,12 +192,12 @@
                         <foreach name="left_goods" key="key" item="v">
                             <li <if condition="$key eq 0">class="first"</if>>
                                 <div class="p-img">                    
-                                    <a href="{{:U('/Home/Detail/Index', ['goods_id'=>$v['id']])}}">
+                                    <a href="{{:U('/Home/Goods/Index', ['id'=>$v['id']])}}">
                                         <img alt="{{$v.title}}" src="{{$v.images}}">
                                     </a>               
                                 </div>
                                 <div class="p-name">
-                                    <a href="{{:U('/Home/Detail/Index', ['goods_id'=>$v['id']])}}">{{$v.title}}</a>
+                                    <a href="{{:U('/Home/Goods/Index', ['id'=>$v['id']])}}">{{$v.title}}</a>
                                 </div>
                                 <div class="p-price"><strong>￥{{$v.price}}</strong></div>
                             </li>
@@ -260,7 +260,7 @@
                                     <foreach name="detail_like_goods" key="key" item="v">
                                         <li>
                                             <div class="i-pic limit">
-                                                <a href="{{:U('/Home/Detail/Index', ['goods_id'=>$v['id']])}}">
+                                                <a href="{{:U('/Home/Goods/Index', ['id'=>$v['id']])}}">
                                                     <img alt="{{$v.title}}" src="{{$v.home_recommended_images}}" />
                                                 </a>
                                                 <p class="ellipsis">{{$v.title}}</p>
diff --git a/service/Application/Home/View/Default/Index/Index.html b/service/Application/Home/View/Default/Index/Index.html
index 8adda85c4..402f05ba8 100755
--- a/service/Application/Home/View/Default/Index/Index.html
+++ b/service/Application/Home/View/Default/Index/Index.html
@@ -146,7 +146,7 @@
 											<div class="goods-title ellipsis">{{$goods.title}}</div>	
 											<div class="price">￥{{$goods.price}}</div>
 										</div>
-										<a href="{{:U('/Home/Detail/Index', ['goods_id'=>$goods['id']])}}">
+										<a href="{{:U('/Home/Goods/Index', ['id'=>$goods['id']])}}">
 											<img src="{{$goods.home_recommended_images}}" />
 										</a>
 									</div>
diff --git a/service/Public/Home/Default/Css/Detail.css b/service/Public/Home/Default/Css/Goods.css
similarity index 100%
rename from service/Public/Home/Default/Css/Detail.css
rename to service/Public/Home/Default/Css/Goods.css
diff --git a/service/Public/Home/Default/Js/Detail.js b/service/Public/Home/Default/Js/Goods.js
similarity index 100%
rename from service/Public/Home/Default/Js/Detail.js
rename to service/Public/Home/Default/Js/Goods.js