Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jcy2004x
ShopXO
提交
4c985184
ShopXO
项目概览
jcy2004x
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4c985184
编写于
11月 22, 2018
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
buy
上级
84d23725
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
80 addition
and
44 deletion
+80
-44
alipay/app.acss
alipay/app.acss
+1
-1
alipay/app.js
alipay/app.js
+1
-1
alipay/pages/buy/buy.axml
alipay/pages/buy/buy.axml
+2
-2
alipay/pages/buy/buy.js
alipay/pages/buy/buy.js
+17
-14
alipay/pages/cart/cart.axml
alipay/pages/cart/cart.axml
+1
-1
alipay/pages/cart/cart.js
alipay/pages/cart/cart.js
+28
-15
service/Application/Api/Controller/BuyController.class.php
service/Application/Api/Controller/BuyController.class.php
+30
-10
未找到文件。
alipay/app.acss
浏览文件 @
4c985184
...
...
@@ -189,7 +189,7 @@ textarea {
font-size: 32rpx;
}
.original-price {
color: #
ccc
;
color: #
888
;
font-size: 26rpx;
text-decoration: line-through;
margin-left: 10rpx;
...
...
alipay/app.js
浏览文件 @
4c985184
...
...
@@ -47,7 +47,7 @@ App({
// 请求地址
request_url
:
"
https://demo.shopxo.net/
"
,
//
request_url: 'http://localhost/project/shopxo/service/',
request_url
:
'
http://localhost/project/shopxo/service/
'
,
// 基础信息
application_title
:
"
ShopXO电商系统
"
,
...
...
alipay/pages/buy/buy.axml
浏览文件 @
4c985184
<view a:if="{{goods.length > 0}}" class="page">
<view a:if="{{goods
_list
.length > 0}}" class="page">
<view class="address bg-white arrow-right">
<navigator url="/pages/user-address/user-address?is_back=1" hover-class="none">
<view a:if="{{address != null}}">
...
...
@@ -19,7 +19,7 @@
<view class="address-divider spacing-mb"></view>
<view class="goods bg-white spacing-mb">
<view a:for="{{goods}}" class="goods-item oh">
<view a:for="{{goods
_list
}}" class="goods-item oh">
<image class="goods-image fl" src="{{item.images_url}}" mode="aspectFill" />
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
...
...
alipay/pages/buy/buy.js
浏览文件 @
4c985184
...
...
@@ -5,7 +5,8 @@ Page({
buy_submit_disabled_status
:
false
,
data_list_loding_msg
:
''
,
params
:
null
,
goods
:
[],
address_list
:
[],
goods_list
:
[],
address
:
null
,
is_first
:
1
,
address_id
:
0
,
...
...
@@ -17,14 +18,14 @@ Page({
{
my
.
alert
({
title
:
'
温馨提示
'
,
content
:
'
商品
信息有误
'
,
content
:
'
订单
信息有误
'
,
buttonText
:
'
确认
'
,
success
:
()
=>
{
my
.
navigateBack
();
},
});
}
else
{
this
.
setData
({
params
:
params
.
data
});
this
.
setData
({
params
:
JSON
.
parse
(
params
.
data
)
});
// 删除地址缓存
my
.
removeStorageSync
({
key
:
app
.
data
.
cache_buy_user_address_select_key
});
...
...
@@ -54,36 +55,38 @@ Page({
}
}
var
self
=
this
;
// 加载loding
my
.
showLoading
({
content
:
'
加载中...
'
});
this
.
setData
({
data_list_loding_status
:
1
});
var
data
=
this
.
data
.
params
;
data
[
'
address_id
'
]
=
this
.
data
.
address_id
;
my
.
httpRequest
({
url
:
app
.
get_request_url
(
"
Index
"
,
"
Buy
"
),
method
:
"
POST
"
,
data
:
{
goods
:
this
.
data
.
params
,
address_id
:
this
.
data
.
address_id
}
,
data
:
data
,
dataType
:
"
json
"
,
success
:
res
=>
{
my
.
hideLoading
();
if
(
res
.
data
.
code
==
0
)
{
var
data
=
res
.
data
.
data
;
if
(
data
.
goods
.
length
==
0
)
if
(
data
.
goods_list
.
length
==
0
)
{
self
.
setData
({
data_list_loding_status
:
0
});
this
.
setData
({
data_list_loding_status
:
0
});
}
else
{
self
.
setData
({
goods
:
data
.
goods
,
total_price
:
data
.
total_price
,
address
:
data
.
address
,
address_id
:
((
data
.
address
||
null
)
==
null
)
?
0
:
data
.
address
.
id
,
this
.
setData
({
goods_list
:
data
.
goods_list
,
address_list
:
data
.
user_address_list
,
total_price
:
data
.
base
.
total_price
,
address
:
data
.
base
.
address
,
address_id
:
((
data
.
base
.
address
||
null
)
==
null
)
?
0
:
data
.
base
.
address
.
id
,
data_list_loding_status
:
3
,
});
}
}
else
{
self
.
setData
({
this
.
setData
({
data_list_loding_status
:
2
,
data_list_loding_msg
:
res
.
data
.
msg
,
});
...
...
@@ -95,7 +98,7 @@ Page({
},
fail
:
()
=>
{
my
.
hideLoading
();
self
.
setData
({
this
.
setData
({
data_list_loding_status
:
2
,
data_list_loding_msg
:
'
服务器请求出错
'
,
});
...
...
alipay/pages/cart/cart.axml
浏览文件 @
4c985184
...
...
@@ -32,7 +32,7 @@
<view class="oh goods-price">
<text class="sales-price">¥{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">¥{{item.original_price}}</text>
<text class="buy-number">x{{item.stock}}</text>
<text class="buy-number
cr-888
">x{{item.stock}}</text>
</view>
</view>
</swipe-action>
...
...
alipay/pages/cart/cart.js
浏览文件 @
4c985184
...
...
@@ -6,7 +6,7 @@ Page({
data_bottom_line_status
:
false
,
data_list
:
[],
swipe_index
:
null
,
total_price
:
0
,
total_price
:
'
0.00
'
,
is_selected_all
:
false
,
buy_submit_disabled_status
:
true
,
},
...
...
@@ -45,7 +45,7 @@ Page({
get_data
()
{
this
.
setData
({
data_list_loding_status
:
1
,
total_price
:
0
,
total_price
:
'
0.00
'
,
is_selected_all
:
false
,
buy_submit_disabled_status
:
true
,
});
...
...
@@ -319,9 +319,7 @@ Page({
for
(
var
i
in
temp_data_list
)
{
if
((
temp_data_list
[
i
][
'
selected
'
]
||
false
)
==
true
)
{
total_price
+=
temp_data_list
[
i
][
'
stock
'
]
*
temp_data_list
[
i
][
'
price
'
];
if
((
temp_data_list
[
i
][
'
selected
'
]
||
false
)
==
true
)
{
selected_count
++
;
}
selected_count
++
;
}
}
...
...
@@ -334,17 +332,32 @@ Page({
// 结算
buy_submit_event
(
e
)
{
my
.
showToast
({
content
:
"
开发中...
"
});
var
selected_count
=
0
;
var
ids
=
[];
var
temp_data_list
=
this
.
data
.
data_list
;
for
(
var
i
in
temp_data_list
)
{
if
((
temp_data_list
[
i
][
'
selected
'
]
||
false
)
==
true
)
{
ids
.
push
(
temp_data_list
[
i
][
'
id
'
]);
selected_count
++
;
}
}
if
(
selected_count
<=
0
)
{
my
.
showToast
({
type
:
"
fail
"
,
content
:
'
请选择商品
'
});
return
false
}
// 进入订单确认页面
// var data = [{
// "buy_type": "goods",
// "goods_id": this.data.goods.id,
// "stock": this.data.temp_buy_number,
// "attr": attribute_all.join(',')
// }];
// my.navigateTo({
// url: '/pages/buy/buy?data=' + JSON.stringify(data)
// });
var
data
=
{
"
buy_type
"
:
"
cart
"
,
"
ids
"
:
ids
.
join
(
'
,
'
)
};
my
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
});
}
});
service/Application/Api/Controller/BuyController.class.php
浏览文件 @
4c985184
...
...
@@ -3,6 +3,8 @@
namespace
Api\Controller
;
use
Service\ResourcesService
;
use
Service\BuyService
;
use
Service\UserService
;
/**
* 购买确认
...
...
@@ -45,18 +47,36 @@ class BuyController extends CommonController
*/
public
function
Index
()
{
// 清单商品
$goods
=
$this
->
GetBuyGoods
();
// 获取商品列表
$params
=
$this
->
data_post
;
$params
[
'user'
]
=
$this
->
user
;
$ret
=
BuyService
::
BuyTypeGoodsList
(
$params
);
// 用户地址
$address
=
$this
->
GetBuyUserAddress
();
// 商品校验
if
(
isset
(
$ret
[
'code'
])
&&
$ret
[
'code'
]
==
0
)
{
// 商品/基础信息
$base
=
[
'total_price'
=>
empty
(
$ret
[
'data'
])
?
0
:
array_sum
(
array_column
(
$ret
[
'data'
],
'total_price'
)),
'total_stock'
=>
empty
(
$ret
[
'data'
])
?
0
:
array_sum
(
array_column
(
$ret
[
'data'
],
'stock'
)),
'address'
=>
UserService
::
UserDefaultAddress
([
'user'
=>
$this
->
user
])[
'data'
],
];
$result
=
[
'goods'
=>
$goods
[
'goods'
],
'total_price'
=>
$goods
[
'total_price'
],
'address'
=>
$address
,
];
$this
->
ajaxReturn
(
L
(
'common_operation_success'
),
0
,
$result
);
// 数据返回组装
$user_address_list
=
UserService
::
UserAddressList
([
'user'
=>
$this
->
user
]);
$express_list
=
ResourcesService
::
ExpressList
([
'is_enable'
=>
1
,
'is_open_user'
=>
1
]);
$payment_list
=
ResourcesService
::
BuyPaymentList
([
'is_enable'
=>
1
,
'is_open_user'
=>
1
]);
$result
=
[
'goods_list'
=>
$ret
[
'data'
],
'user_address_list'
=>
$user_address_list
[
'data'
],
'express_list'
=>
$express_list
,
'payment_list'
=>
$payment_list
,
'base'
=>
$base
,
];
$this
->
ajaxReturn
(
L
(
'common_operation_success'
),
0
,
$result
);
}
else
{
$this
->
ajaxReturn
(
isset
(
$ret
[
'msg'
])
?
$ret
[
'msg'
]
:
L
(
'common_param_error'
),
-
100
);
}
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录