From 45cd70861be79ddba5eb60a0fdc28b86babd1c05 Mon Sep 17 00:00:00 2001
From: heshupeng <hsp@bronet.cn>
Date: Thu, 24 Dec 2020 15:44:19 +0800
Subject: [PATCH] 购物车bug修改
---
addons/shopro/controller/Cart.php | 3 +++
application/api/controller/Cart.php | 4 ++--
application/api/controller/User.php | 4 ++--
public/api.html | 8 ++++----
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/addons/shopro/controller/Cart.php b/addons/shopro/controller/Cart.php
index 4ae009d..2a7f162 100644
--- a/addons/shopro/controller/Cart.php
+++ b/addons/shopro/controller/Cart.php
@@ -13,6 +13,9 @@ class Cart extends Base
public function index()
{
$data = CartModel::info();
+ foreach ($data as $key => $v) {
+ $data[$key]['sku_price'] = \addons\shopro\model\Goods::operActivitySkuPrice($v['goods'], [$v['sku_price']])['sku_price'][0];
+ }
$this->success('我的购物车', $data);
}
diff --git a/application/api/controller/Cart.php b/application/api/controller/Cart.php
index eb80ba6..6dc53b0 100644
--- a/application/api/controller/Cart.php
+++ b/application/api/controller/Cart.php
@@ -93,7 +93,7 @@ class Cart extends Base
* @ApiMethod (POST)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
- * @ApiParams (name=goods_list[], type=array, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
+ * @ApiParams (name=goods_list, type=array, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
*
* @ApiReturn({
"code": 1,
@@ -105,7 +105,7 @@ class Cart extends Base
public function add()
{
$params = $this->request->post();
-
+ $params['goods_list'] = is_string($params['goods_list']) ? json_decode(htmlspecialchars_decode($params['goods_list']),true) : $params['goods_list'];
// 表单验证
$this->shoproValidate($params, get_class(), 'add');
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index d2a1ccf..9cf9971 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -263,8 +263,8 @@ class User extends Base
if (empty($decryptData['openid'])) {
$this->error(__('code错误'), $decryptData);
}
-
- $ret = $this->oauthLoginOrRegister($decryptData, 'wxMiniProgram', 'Wechat',0, $post['user_id']);
+ $pid = isset($post['user_id']) ? $post['user_id'] : 0;
+ $ret = $this->oauthLoginOrRegister($decryptData, 'wxMiniProgram', 'Wechat',0, $pid);
if ($ret) {
$data = $ret->getUserinfo();
diff --git a/public/api.html b/public/api.html
index 7144abc..670146e 100755
--- a/public/api.html
+++ b/public/api.html
@@ -9814,7 +9814,7 @@
</thead>
<tbody>
<tr>
- <td>goods_list[]</td>
+ <td>goods_list</td>
<td>array</td>
<td>否</td>
<td>购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]</td>
@@ -9849,8 +9849,8 @@
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/cart/add" method="POST" name="form10" id="form10">
<div class="form-group">
- <label class="control-label" for="goods_list[]">goods_list[]</label>
- <input type="array" class="form-control input-sm" id="goods_list[]" placeholder="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]" name="goods_list[]">
+ <label class="control-label" for="goods_list">goods_list</label>
+ <input type="array" class="form-control input-sm" id="goods_list" placeholder="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]" name="goods_list">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="10">提交</button>
@@ -11317,7 +11317,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
- Generated on 2020-12-23 20:41:43 </div>
+ Generated on 2020-12-24 14:03:35 </div>
<div class="col-md-6" align="right">
<a href="./" target="_blank">My Website</a>
</div>
--
libgit2 0.24.0