切换导航条
此项目
正在载入...
登录
何书鹏
/
anttest
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
何书鹏
4 years ago
提交
45cd70861be79ddba5eb60a0fdc28b86babd1c05
1 个父辈
f60b0483
购物车bug修改
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
11 行增加
和
8 行删除
addons/shopro/controller/Cart.php
application/api/controller/Cart.php
application/api/controller/User.php
public/api.html
addons/shopro/controller/Cart.php
查看文件 @
45cd708
...
...
@@ -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
);
}
...
...
application/api/controller/Cart.php
查看文件 @
45cd708
...
...
@@ -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'
);
...
...
application/api/controller/User.php
查看文件 @
45cd708
...
...
@@ -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
();
...
...
public/api.html
查看文件 @
45cd708
...
...
@@ -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-2
3 20:41:43
</div>
Generated on 2020-12-2
4 14:03:35
</div>
<div
class=
"col-md-6"
align=
"right"
>
<a
href=
"./"
target=
"_blank"
>
My Website
</a>
</div>
...
...
请
注册
或
登录
后发表评论