From f5284c28d44bae310e5bc45867113042e858d06e Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Mon, 15 Oct 2018 23:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/Application/Home/View/Default/UserFavor/Goods.html | 4 ++--
 service/Application/Service/GoodsService.class.php         | 4 ++--
 service/Public/Home/Default/Js/Goods.js                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/service/Application/Home/View/Default/UserFavor/Goods.html b/service/Application/Home/View/Default/UserFavor/Goods.html
index 139df6572..9ea596601 100755
--- a/service/Application/Home/View/Default/UserFavor/Goods.html
+++ b/service/Application/Home/View/Default/UserFavor/Goods.html
@@ -46,7 +46,7 @@
                     <tbody>
                         <notempty name="data_list">
                             <foreach name="data_list" item="v">
-                                <tr id="data-list-{{$v.id}}">
+                                <tr id="data-list-{{$v.goods_id}}">
                                     <td>
                                         <div class="goods-detail">
                                             <a href="{{$v.goods_url}}" target="_blank">
@@ -64,7 +64,7 @@
                                         <p class="line-price">￥{{$v.price}}</p>
                                     </td>
                                     <td>
-                                        <button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-ajax" data-url="{{:U('Home/UserFavor/Cancel')}}" data-id="{{$v.id}}" data-view="reload">取消</button>
+                                        <button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-ajax" data-url="{{:U('Home/UserFavor/Cancel')}}" data-id="{{$v.goods_id}}" data-view="delete">取消</button>
                                     </td>
                                 </tr>
                             </foreach>
diff --git a/service/Application/Service/GoodsService.class.php b/service/Application/Service/GoodsService.class.php
index 1aa03c044..c061b58d0 100755
--- a/service/Application/Service/GoodsService.class.php
+++ b/service/Application/Service/GoodsService.class.php
@@ -317,7 +317,7 @@ class GoodsService
             [
                 'checked_type'      => 'empty',
                 'key_name'          => 'id',
-                'error_msg'         => '删除数据id有误',
+                'error_msg'         => '商品id有误',
             ],
             [
                 'checked_type'      => 'empty',
@@ -333,7 +333,7 @@ class GoodsService
 
         // 开始操作
         $m = M('GoodsFavor');
-        $data = ['id'=>intval($params['id']), 'user_id'=>$params['user']['id']];
+        $data = ['goods_id'=>intval($params['id']), 'user_id'=>$params['user']['id']];
         $temp = $m->where($data)->find();
         if(empty($temp))
         {
diff --git a/service/Public/Home/Default/Js/Goods.js b/service/Public/Home/Default/Js/Goods.js
index fce4badfe..9ef21c3ad 100755
--- a/service/Public/Home/Default/Js/Goods.js
+++ b/service/Public/Home/Default/Js/Goods.js
@@ -205,7 +205,7 @@ $(function() {
                 type: 'post',
                 dataType: "json",
                 timeout: 10000,
-                data: {"goods_id": $('.goods-detail').data('id')},
+                data: {"id": $('.goods-detail').data('id')},
                 success: function(result)
                 {
                     poptit_close();