Merge branch 'dev-xpy' into dev

app/controller/api/user/User.php

@@ -857,6 +857,28 @@ class User extends BaseController
     }
 
     /**
+     * 查询商品浏览记录以及删除
+     */
+    public function productHistory(){
+        $uid = $this->request->uid();
+        $list = Db::name('third_history')->where('uid', $uid)->order('create_time', 'desc')->limit(20)->column('keyword','id');
+        return app('json')->success(['count' => count($list), 'list'  => $list]);
+    }
+    public function deleteProductHistory(){
+        $uid = $this->request->uid();
+        $id = $this->request->post('id');
+        $deleted = Db::name('third_history')
+            ->where('id', $id)
+            ->where('uid', $uid)
+            ->delete();
+        if ($deleted) {
+            return app('json')->success('删除成功');
+        } else {
+            return app('json')->fail('删除失败');
+        }
+    }
+
+    /**
      * 签到  获取积分
      * @return mixed
      * @throws \think\db\exception\DataNotFoundException

route/api.php

@@ -226,6 +226,9 @@ Route::group('api/', function () {
             //浏览记录
             Route::get('history', 'User/history');
             Route::post('history/delete/:id', 'User/deleteHistory');
+            //商品浏览记录以及删除
+            Route::post('productHistory', 'User/productHistory');
+            Route::post('deleteProductHistory', 'User/deleteProductHistory');
             //获取用户签到记录
             Route::get('get_signin', 'User/get_signin');
             //签到