Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
飞鱼0526
ShopXO
提交
8128dd0d
ShopXO
项目概览
飞鱼0526
/
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,发现更多精彩内容 >>
提交
8128dd0d
编写于
10月 19, 2019
作者:
D
Devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
商品详情购物车入口
上级
900f0f0d
变更
29
隐藏空白更改
内联
并排
Showing
29 changed file
with
276 addition
and
86 deletion
+276
-86
application/api/controller/Goods.php
application/api/controller/Goods.php
+2
-0
public/appmini/old/alipay/app.acss
public/appmini/old/alipay/app.acss
+18
-14
public/appmini/old/alipay/images/default-cart-icon.png
public/appmini/old/alipay/images/default-cart-icon.png
+0
-0
public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
...c/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+14
-0
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
...c/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+11
-1
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+5
-0
public/appmini/old/alipay/pages/goods-detail/goods-detail.json
...c/appmini/old/alipay/pages/goods-detail/goods-detail.json
+2
-1
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss
...old/alipay/pages/user-order-detail/user-order-detail.acss
+13
-0
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml
...old/alipay/pages/user-order-detail/user-order-detail.axml
+9
-0
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js
...i/old/alipay/pages/user-order-detail/user-order-detail.js
+25
-21
public/appmini/old/baidu/app.css
public/appmini/old/baidu/app.css
+18
-14
public/appmini/old/baidu/images/default-cart-icon.png
public/appmini/old/baidu/images/default-cart-icon.png
+0
-0
public/appmini/old/baidu/pages/goods-detail/goods-detail.css
public/appmini/old/baidu/pages/goods-detail/goods-detail.css
+14
-0
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
+5
-0
public/appmini/old/baidu/pages/goods-detail/goods-detail.json
...ic/appmini/old/baidu/pages/goods-detail/goods-detail.json
+2
-1
public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
...ic/appmini/old/baidu/pages/goods-detail/goods-detail.swan
+11
-1
public/appmini/old/baidu/pages/user-order-detail/user-order-detail.css
...i/old/baidu/pages/user-order-detail/user-order-detail.css
+13
-0
public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js
...ni/old/baidu/pages/user-order-detail/user-order-detail.js
+27
-4
public/appmini/old/baidu/pages/user-order-detail/user-order-detail.swan
.../old/baidu/pages/user-order-detail/user-order-detail.swan
+9
-0
public/appmini/old/weixin/app.wxss
public/appmini/old/weixin/app.wxss
+14
-21
public/appmini/old/weixin/images/default-cart-icon.png
public/appmini/old/weixin/images/default-cart-icon.png
+0
-0
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+5
-0
public/appmini/old/weixin/pages/goods-detail/goods-detail.json
...c/appmini/old/weixin/pages/goods-detail/goods-detail.json
+2
-1
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
...c/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+11
-1
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
...c/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
+14
-0
public/appmini/old/weixin/pages/lib/online-service/content.wxml
.../appmini/old/weixin/pages/lib/online-service/content.wxml
+2
-2
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js
...i/old/weixin/pages/user-order-detail/user-order-detail.js
+8
-4
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml
...old/weixin/pages/user-order-detail/user-order-detail.wxml
+9
-0
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss
...old/weixin/pages/user-order-detail/user-order-detail.wxss
+13
-0
未找到文件。
application/api/controller/Goods.php
浏览文件 @
8128dd0d
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
namespace
app\api\controller
;
namespace
app\api\controller
;
use
app\service\GoodsService
;
use
app\service\GoodsService
;
use
app\service\BuyService
;
use
app\service\GoodsCommentsService
;
use
app\service\GoodsCommentsService
;
/**
/**
...
@@ -126,6 +127,7 @@ class Goods extends Common
...
@@ -126,6 +127,7 @@ class Goods extends Common
'common_app_is_limitedtimediscount'
=>
(
int
)
MyC
(
'common_app_is_limitedtimediscount'
),
'common_app_is_limitedtimediscount'
=>
(
int
)
MyC
(
'common_app_is_limitedtimediscount'
),
'common_app_is_good_thing'
=>
(
int
)
MyC
(
'common_app_is_good_thing'
),
'common_app_is_good_thing'
=>
(
int
)
MyC
(
'common_app_is_good_thing'
),
'common_app_is_poster_share'
=>
(
int
)
MyC
(
'common_app_is_poster_share'
),
'common_app_is_poster_share'
=>
(
int
)
MyC
(
'common_app_is_poster_share'
),
'common_cart_total'
=>
BuyService
::
UserCartTotal
([
'user'
=>
$this
->
user
]),
// 优惠劵
// 优惠劵
'plugins_coupon_data'
=>
$this
->
PluginsCouponGoods
(
$goods_id
),
'plugins_coupon_data'
=>
$this
->
PluginsCouponGoods
(
$goods_id
),
...
...
public/appmini/old/alipay/app.acss
浏览文件 @
8128dd0d
...
@@ -55,21 +55,7 @@ textarea {
...
@@ -55,21 +55,7 @@ textarea {
.spacing-mb { margin-bottom: 20rpx; }
.spacing-mb { margin-bottom: 20rpx; }
.spacing-mt { margin-top: 20rpx; }
.spacing-mt { margin-top: 20rpx; }
/* 在线客服 */
.customer-service {
position: fixed;
bottom: 100rpx;
right: 0;
}
.customer-service image {
width: 80rpx;
height: 80rpx;
margin-right: 20rpx;
}
.drift { position: fixed; left: -1000px; }
.drift { position: fixed; left: -1000px; }
.nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; }
.nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; }
.tips { background: #ffffeb url('/images/tips.png') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 10rpx 10rpx 10rpx 45rpx; font-size: 26rpx; border-radius: 2px; display: block; }
.tips { background: #ffffeb url('/images/tips.png') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 10rpx 10rpx 10rpx 45rpx; font-size: 26rpx; border-radius: 2px; display: block; }
...
@@ -407,4 +393,22 @@ textarea {
...
@@ -407,4 +393,22 @@ textarea {
}
}
.coupon-container .item-disabled {
.coupon-container .item-disabled {
border: 1px solid #dfdfdf !important;
border: 1px solid #dfdfdf !important;
}
/**
* 快捷导航
*/
.common-quick-nav {
border: 0;
padding: 15rpx;
background: rgba(0, 0, 0, 0.6);
position: fixed;
right: 10rpx;
border-radius: 50%;
width: 90rpx;
height: 90rpx;
}
.common-quick-nav image {
width: 60rpx;
height: 60rpx;
}
}
\ No newline at end of file
public/appmini/old/alipay/images/default-cart-icon.png
0 → 100644
浏览文件 @
8128dd0d
2.5 KB
public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
浏览文件 @
8128dd0d
...
@@ -299,4 +299,18 @@
...
@@ -299,4 +299,18 @@
}
}
.coupon-container .v-left .desc {
.coupon-container .v-left .desc {
margin-top: 5rpx;
margin-top: 5rpx;
}
/*
* 购物车入口
*/
.quick-nav-cart {
bottom: calc(35% + 110rpx);
width: 60rpx;
height: 60rpx;
}
.quick-nav-cart .badge-icon {
position: absolute;
top: -5px;
left: calc(50% + 23rpx);
}
}
\ No newline at end of file
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
浏览文件 @
8128dd0d
...
@@ -184,4 +184,14 @@
...
@@ -184,4 +184,14 @@
<view a:if="{{goods == null}}">
<view a:if="{{goods == null}}">
<import src="/pages/common/nodata.axml" />
<import src="/pages/common/nodata.axml" />
<template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
<template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
</view>
</view>
\ No newline at end of file
<!-- 购物车 -->
<navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none">
<view class="common-quick-nav quick-nav-cart">
<view class="badge-icon">
<badge text="{{quick_nav_cart_count}}" dot="{{false}}"></badge>
</view>
<image src="/images/default-cart-icon.png" class="dis-block"></image>
</view>
</navigator>
\ No newline at end of file
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
浏览文件 @
8128dd0d
...
@@ -43,6 +43,9 @@ Page({
...
@@ -43,6 +43,9 @@ Page({
// 优惠劵
// 优惠劵
plugins_coupon_data
:
null
,
plugins_coupon_data
:
null
,
// 购物车快捷导航
quick_nav_cart_count
:
0
,
},
},
onLoad
(
params
)
{
onLoad
(
params
)
{
...
@@ -117,6 +120,7 @@ Page({
...
@@ -117,6 +120,7 @@ Page({
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
plugins_limitedtimediscount_data
:
data
.
plugins_limitedtimediscount_data
||
null
,
plugins_limitedtimediscount_data
:
data
.
plugins_limitedtimediscount_data
||
null
,
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
quick_nav_cart_count
:
data
.
common_cart_total
||
0
,
});
});
// 限时秒杀倒计时
// 限时秒杀倒计时
...
@@ -308,6 +312,7 @@ Page({
...
@@ -308,6 +312,7 @@ Page({
success
:
(
res
)
=>
{
success
:
(
res
)
=>
{
my
.
hideLoading
();
my
.
hideLoading
();
if
(
res
.
data
.
code
==
0
)
{
if
(
res
.
data
.
code
==
0
)
{
this
.
setData
({
quick_nav_cart_count
:
this
.
data
.
quick_nav_cart_count
+
this
.
data
.
temp_buy_number
});
this
.
popup_close_event
();
this
.
popup_close_event
();
app
.
showToast
(
res
.
data
.
msg
,
'
success
'
);
app
.
showToast
(
res
.
data
.
msg
,
'
success
'
);
}
else
{
}
else
{
...
...
public/appmini/old/alipay/pages/goods-detail/goods-detail.json
浏览文件 @
8128dd0d
{
{
"pullRefresh"
:
true
,
"pullRefresh"
:
true
,
"usingComponents"
:
{
"usingComponents"
:
{
"popup"
:
"mini-antui/es/popup/index"
"popup"
:
"mini-antui/es/popup/index"
,
"badge"
:
"mini-antui/es/badge/index"
}
}
}
}
\ No newline at end of file
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss
浏览文件 @
8128dd0d
...
@@ -71,4 +71,17 @@
...
@@ -71,4 +71,17 @@
}
}
.detail-list .item view {
.detail-list .item view {
line-height: 46rpx;
line-height: 46rpx;
}
/*
* 扩展数据
*/
.extension-list .item {
padding: 20rpx 30rpx;
}
.extension-list .item .title {
padding-right: 20rpx;
}
.extension-list .item .content {
padding-left: 20rpx;
}
}
\ No newline at end of file
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml
浏览文件 @
8128dd0d
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
</view>
</view>
</view>
</view>
<!-- 订单基础数据 -->
<view a:if="{{detail_list.length > 0}}" class="detail-list bg-white">
<view a:if="{{detail_list.length > 0}}" class="detail-list bg-white">
<view a:for="{{detail_list}}" class="item br-b oh">
<view a:for="{{detail_list}}" class="item br-b oh">
<view class="title fl">{{item.name}}</view>
<view class="title fl">{{item.name}}</view>
...
@@ -38,6 +39,14 @@
...
@@ -38,6 +39,14 @@
</view>
</view>
</view>
</view>
<!-- 扩展数据 -->
<view a:if="{{extension_data.length > 0}}" class="extension-list bg-white spacing-mt">
<view a:for="{{extension_data}}" class="item br-b oh">
<text class="title">{{item.name}}</text>
<text class="content cr-888 br-l">{{item.tips}}</text>
</view>
</view>
<import src="/pages/common/bottom_line.axml" />
<import src="/pages/common/bottom_line.axml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</view>
</view>
...
...
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js
浏览文件 @
8128dd0d
const
app
=
getApp
();
const
app
=
getApp
();
Page
({
Page
({
data
:
{
data
:
{
detail
:
null
,
params
:
null
,
detail_list
:
[],
data_list_loding_status
:
1
,
data_list_loding_status
:
1
,
data_list_loding_msg
:
''
,
data_list_loding_msg
:
''
,
data_bottom_line_status
:
false
,
data_bottom_line_status
:
false
,
params
:
null
,
detail
:
null
,
detail_list
:
[],
extension_data
:
[],
},
},
onLoad
(
params
)
{
onLoad
(
params
)
{
...
@@ -41,25 +43,27 @@ Page({
...
@@ -41,25 +43,27 @@ Page({
self
.
setData
({
self
.
setData
({
detail
:
data
,
detail
:
data
,
detail_list
:[
detail_list
:[
{
name
:
"
订单号
"
,
value
:
data
.
order_no
},
{
name
:
"
订单号
"
,
value
:
data
.
order_no
||
''
},
{
name
:
"
状态
"
,
value
:
data
.
status_name
},
{
name
:
"
状态
"
,
value
:
data
.
status_name
||
''
},
{
name
:
"
支付状态
"
,
value
:
data
.
pay_status_name
},
{
name
:
"
支付状态
"
,
value
:
data
.
pay_status_name
||
''
},
{
name
:
"
单价
"
,
value
:
data
.
price
},
{
name
:
"
单价
"
,
value
:
data
.
price
||
''
},
{
name
:
"
总价
"
,
value
:
data
.
total_price
},
{
name
:
"
总价
"
,
value
:
data
.
total_price
||
''
},
{
name
:
"
优惠
"
,
value
:
data
.
preferential_price
},
{
name
:
"
优惠金额
"
,
value
:
data
.
preferential_price
||
''
},
{
name
:
"
支付金额
"
,
value
:
data
.
pay_price
},
{
name
:
"
增加金额
"
,
value
:
data
.
increase_price
||
''
},
{
name
:
"
支付方式
"
,
value
:
data
.
payment_name
},
{
name
:
"
支付金额
"
,
value
:
data
.
pay_price
||
''
},
{
name
:
"
快递公司
"
,
value
:
data
.
express_name
},
{
name
:
"
支付方式
"
,
value
:
data
.
payment_name
||
''
},
{
name
:
"
快递单号
"
,
value
:
data
.
express_number
},
{
name
:
"
快递公司
"
,
value
:
data
.
express_name
||
''
},
{
name
:
"
用户留言
"
,
value
:
data
.
user_note
},
{
name
:
"
快递单号
"
,
value
:
data
.
express_number
||
''
},
{
name
:
"
创建时间
"
,
value
:
data
.
add_time
},
{
name
:
"
用户留言
"
,
value
:
data
.
user_note
||
''
},
{
name
:
"
确认时间
"
,
value
:
data
.
confirm_time
},
{
name
:
"
创建时间
"
,
value
:
data
.
add_time
||
''
},
{
name
:
"
支付时间
"
,
value
:
data
.
pay_time
},
{
name
:
"
确认时间
"
,
value
:
data
.
confirm_time
||
''
},
{
name
:
"
发货时间
"
,
value
:
data
.
delivery_time
},
{
name
:
"
支付时间
"
,
value
:
data
.
pay_time
||
''
},
{
name
:
"
收货时间
"
,
value
:
data
.
collect_time
},
{
name
:
"
发货时间
"
,
value
:
data
.
delivery_time
||
''
},
{
name
:
"
取消时间
"
,
value
:
data
.
close_time
},
{
name
:
"
收货时间
"
,
value
:
data
.
collect_time
||
''
},
{
name
:
"
关闭时间
"
,
value
:
data
.
close_time
},
{
name
:
"
取消时间
"
,
value
:
data
.
close_time
||
''
},
{
name
:
"
关闭时间
"
,
value
:
data
.
close_time
||
''
},
],
],
extension_data
:
data
.
extension_data
||
[],
data_list_loding_status
:
3
,
data_list_loding_status
:
3
,
data_bottom_line_status
:
true
,
data_bottom_line_status
:
true
,
data_list_loding_msg
:
''
,
data_list_loding_msg
:
''
,
...
...
public/appmini/old/baidu/app.css
浏览文件 @
8128dd0d
...
@@ -62,21 +62,7 @@ textarea {
...
@@ -62,21 +62,7 @@ textarea {
.spacing-mb
{
margin-bottom
:
20
rpx
;
}
.spacing-mb
{
margin-bottom
:
20
rpx
;
}
.spacing-mt
{
margin-top
:
20
rpx
;
}
.spacing-mt
{
margin-top
:
20
rpx
;
}
/* 在线客服 */
.customer-service
{
position
:
fixed
;
bottom
:
100
rpx
;
right
:
0
;
}
.customer-service
image
{
width
:
80
rpx
;
height
:
80
rpx
;
margin-right
:
20
rpx
;
}
.drift
{
position
:
fixed
;
left
:
-1000px
;
}
.drift
{
position
:
fixed
;
left
:
-1000px
;
}
.nav-submit-fixed
{
background
:
#eee
;
height
:
46px
;
position
:
fixed
;
bottom
:
0
;
z-index
:
10
;
}
.nav-submit-fixed
{
background
:
#eee
;
height
:
46px
;
position
:
fixed
;
bottom
:
0
;
z-index
:
10
;
}
.tips
{
background
:
#ffffeb
url('data:image/png;base64,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')
no-repeat
5
rpx
12
rpx
;
background-size
:
35
rpx
35
rpx
;
color
:
#f7b240
;
border
:
1px
solid
#faebd2
;
line-height
:
36
rpx
;
padding
:
10
rpx
10
rpx
10
rpx
45
rpx
;
font-size
:
26
rpx
;
border-radius
:
2px
;
display
:
block
;
}
.tips
{
background
:
#ffffeb
url('data:image/png;base64,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')
no-repeat
5
rpx
12
rpx
;
background-size
:
35
rpx
35
rpx
;
color
:
#f7b240
;
border
:
1px
solid
#faebd2
;
line-height
:
36
rpx
;
padding
:
10
rpx
10
rpx
10
rpx
45
rpx
;
font-size
:
26
rpx
;
border-radius
:
2px
;
display
:
block
;
}
...
@@ -475,4 +461,22 @@ button[disabled].bg-primary {
...
@@ -475,4 +461,22 @@ button[disabled].bg-primary {
}
}
.coupon-container
.item-disabled
{
.coupon-container
.item-disabled
{
border
:
1px
solid
#dfdfdf
!important
;
border
:
1px
solid
#dfdfdf
!important
;
}
/**
* 快捷导航
*/
.common-quick-nav
{
border
:
0
;
padding
:
15
rpx
;
background
:
rgba
(
0
,
0
,
0
,
0.6
);
position
:
fixed
;
right
:
10
rpx
;
border-radius
:
50%
;
width
:
90
rpx
;
height
:
90
rpx
;
}
.common-quick-nav
image
{
width
:
60
rpx
;
height
:
60
rpx
;
}
}
\ No newline at end of file
public/appmini/old/baidu/images/default-cart-icon.png
0 → 100644
浏览文件 @
8128dd0d
2.5 KB
public/appmini/old/baidu/pages/goods-detail/goods-detail.css
浏览文件 @
8128dd0d
...
@@ -328,4 +328,18 @@
...
@@ -328,4 +328,18 @@
}
}
.coupon-container
.v-left
.desc
{
.coupon-container
.v-left
.desc
{
margin-top
:
5
rpx
;
margin-top
:
5
rpx
;
}
/*
* 购物车入口
*/
.quick-nav-cart
{
bottom
:
calc
(
35%
+
110
rpx
);
width
:
60
rpx
;
height
:
60
rpx
;
}
.quick-nav-cart
.badge-icon
{
position
:
absolute
;
top
:
-5px
;
left
:
calc
(
50%
+
23
rpx
);
}
}
\ No newline at end of file
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
浏览文件 @
8128dd0d
...
@@ -44,6 +44,9 @@ Page({
...
@@ -44,6 +44,9 @@ Page({
// 优惠劵
// 优惠劵
plugins_coupon_data
:
null
,
plugins_coupon_data
:
null
,
// 购物车快捷导航
quick_nav_cart_count
:
0
,
},
},
onLoad
(
params
)
{
onLoad
(
params
)
{
...
@@ -117,6 +120,7 @@ Page({
...
@@ -117,6 +120,7 @@ Page({
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
plugins_limitedtimediscount_data
:
data
.
plugins_limitedtimediscount_data
||
null
,
plugins_limitedtimediscount_data
:
data
.
plugins_limitedtimediscount_data
||
null
,
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
quick_nav_cart_count
:
data
.
common_cart_total
||
0
,
});
});
// 限时秒杀倒计时
// 限时秒杀倒计时
...
@@ -286,6 +290,7 @@ Page({
...
@@ -286,6 +290,7 @@ Page({
success
:
res
=>
{
success
:
res
=>
{
swan
.
hideLoading
();
swan
.
hideLoading
();
if
(
res
.
data
.
code
==
0
)
{
if
(
res
.
data
.
code
==
0
)
{
this
.
setData
({
quick_nav_cart_count
:
this
.
data
.
quick_nav_cart_count
+
this
.
data
.
temp_buy_number
});
this
.
popup_close_event
();
this
.
popup_close_event
();
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
}
else
{
}
else
{
...
...
public/appmini/old/baidu/pages/goods-detail/goods-detail.json
浏览文件 @
8128dd0d
{
{
"enablePullDownRefresh"
:
true
,
"enablePullDownRefresh"
:
true
,
"usingComponents"
:
{
"usingComponents"
:
{
"component-popup"
:
"/components/popup/popup"
"component-popup"
:
"/components/popup/popup"
,
"component-badge"
:
"/components/badge/badge"
}
}
}
}
\ No newline at end of file
public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
浏览文件 @
8128dd0d
...
@@ -188,4 +188,14 @@
...
@@ -188,4 +188,14 @@
<view s-if="goods == null">
<view s-if="goods == null">
<import src="/pages/common/nodata.swan" />
<import src="/pages/common/nodata.swan" />
<template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template>
<template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template>
</view>
</view>
\ No newline at end of file
<!-- 购物车 -->
<navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none">
<view class="common-quick-nav quick-nav-cart">
<view class="badge-icon">
<component-badge number="{{quick_nav_cart_count}}"></component-badge>
</view>
<image src="/images/default-cart-icon.png" class="dis-block"></image>
</view>
</navigator>
\ No newline at end of file
public/appmini/old/baidu/pages/user-order-detail/user-order-detail.css
浏览文件 @
8128dd0d
...
@@ -71,4 +71,17 @@
...
@@ -71,4 +71,17 @@
}
}
.detail-list
.item
view
{
.detail-list
.item
view
{
line-height
:
46
rpx
;
line-height
:
46
rpx
;
}
/*
* 扩展数据
*/
.extension-list
.item
{
padding
:
20
rpx
30
rpx
;
}
.extension-list
.item
.title
{
padding-right
:
20
rpx
;
}
.extension-list
.item
.content
{
padding-left
:
20
rpx
;
}
}
\ No newline at end of file
public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js
浏览文件 @
8128dd0d
const
app
=
getApp
();
const
app
=
getApp
();
Page
({
Page
({
data
:
{
data
:
{
detail
:
null
,
params
:
null
,
detail_list
:
[],
data_list_loding_status
:
1
,
data_list_loding_status
:
1
,
data_list_loding_msg
:
''
,
data_list_loding_msg
:
''
,
data_bottom_line_status
:
false
,
data_bottom_line_status
:
false
,
params
:
null
detail
:
null
,
detail_list
:
[],
extension_data
:
[],
},
},
onLoad
(
params
)
{
onLoad
(
params
)
{
...
@@ -39,7 +41,28 @@ Page({
...
@@ -39,7 +41,28 @@ Page({
var
data
=
res
.
data
.
data
;
var
data
=
res
.
data
.
data
;
self
.
setData
({
self
.
setData
({
detail
:
data
,
detail
:
data
,
detail_list
:
[{
name
:
"
订单号
"
,
value
:
data
.
order_no
||
''
},
{
name
:
"
状态
"
,
value
:
data
.
status_name
||
''
},
{
name
:
"
支付状态
"
,
value
:
data
.
pay_status_name
||
''
},
{
name
:
"
单价
"
,
value
:
data
.
price
||
''
},
{
name
:
"
总价
"
,
value
:
data
.
total_price
||
''
},
{
name
:
"
优惠
"
,
value
:
data
.
preferential_price
||
''
},
{
name
:
"
支付金额
"
,
value
:
data
.
pay_price
||
''
},
{
name
:
"
支付方式
"
,
value
:
data
.
payment_name
||
''
},
{
name
:
"
快递公司
"
,
value
:
data
.
express_name
||
''
},
{
name
:
"
快递单号
"
,
value
:
data
.
express_number
||
''
},
{
name
:
"
用户留言
"
,
value
:
data
.
user_note
||
''
},
{
name
:
"
创建时间
"
,
value
:
data
.
add_time
||
''
},
{
name
:
"
确认时间
"
,
value
:
data
.
confirm_time
||
''
},
{
name
:
"
支付时间
"
,
value
:
data
.
pay_time
||
''
},
{
name
:
"
发货时间
"
,
value
:
data
.
delivery_time
||
''
},
{
name
:
"
收货时间
"
,
value
:
data
.
collect_time
||
''
},
{
name
:
"
取消时间
"
,
value
:
data
.
close_time
||
''
},
{
name
:
"
关闭时间
"
,
value
:
data
.
close_time
||
''
}],
detail_list
:[
{
name
:
"
订单号
"
,
value
:
data
.
order_no
||
''
},
{
name
:
"
状态
"
,
value
:
data
.
status_name
||
''
},
{
name
:
"
支付状态
"
,
value
:
data
.
pay_status_name
||
''
},
{
name
:
"
单价
"
,
value
:
data
.
price
||
''
},
{
name
:
"
总价
"
,
value
:
data
.
total_price
||
''
},
{
name
:
"
优惠金额
"
,
value
:
data
.
preferential_price
||
''
},
{
name
:
"
增加金额
"
,
value
:
data
.
increase_price
||
''
},
{
name
:
"
支付金额
"
,
value
:
data
.
pay_price
||
''
},
{
name
:
"
支付方式
"
,
value
:
data
.
payment_name
||
''
},
{
name
:
"
快递公司
"
,
value
:
data
.
express_name
||
''
},
{
name
:
"
快递单号
"
,
value
:
data
.
express_number
||
''
},
{
name
:
"
用户留言
"
,
value
:
data
.
user_note
||
''
},
{
name
:
"
创建时间
"
,
value
:
data
.
add_time
||
''
},
{
name
:
"
确认时间
"
,
value
:
data
.
confirm_time
||
''
},
{
name
:
"
支付时间
"
,
value
:
data
.
pay_time
||
''
},
{
name
:
"
发货时间
"
,
value
:
data
.
delivery_time
||
''
},
{
name
:
"
收货时间
"
,
value
:
data
.
collect_time
||
''
},
{
name
:
"
取消时间
"
,
value
:
data
.
close_time
||
''
},
{
name
:
"
关闭时间
"
,
value
:
data
.
close_time
||
''
},
],
extension_data
:
data
.
extension_data
||
[],
data_list_loding_status
:
3
,
data_list_loding_status
:
3
,
data_bottom_line_status
:
true
,
data_bottom_line_status
:
true
,
data_list_loding_msg
:
''
data_list_loding_msg
:
''
...
...
public/appmini/old/baidu/pages/user-order-detail/user-order-detail.swan
浏览文件 @
8128dd0d
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
</view>
</view>
</view>
</view>
<!-- 订单基础数据 -->
<view s-if="detail_list.length > 0" class="detail-list bg-white">
<view s-if="detail_list.length > 0" class="detail-list bg-white">
<view s-for="item, index in detail_list" class="item br-b oh">
<view s-for="item, index in detail_list" class="item br-b oh">
<view class="title fl">{{item.name}}</view>
<view class="title fl">{{item.name}}</view>
...
@@ -38,6 +39,14 @@
...
@@ -38,6 +39,14 @@
</view>
</view>
</view>
</view>
<!-- 扩展数据 -->
<view s-if="extension_data.length > 0" class="extension-list bg-white spacing-mt">
<view s-for="item, index in extension_data" class="item br-b oh">
<text class="title">{{item.name}}</text>
<text class="content cr-888 br-l">{{item.tips}}</text>
</view>
</view>
<import src="/pages/common/bottom_line.swan" />
<import src="/pages/common/bottom_line.swan" />
<template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
<template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
</view>
</view>
...
...
public/appmini/old/weixin/app.wxss
浏览文件 @
8128dd0d
...
@@ -62,21 +62,7 @@ textarea {
...
@@ -62,21 +62,7 @@ textarea {
.spacing-mb { margin-bottom: 20rpx; }
.spacing-mb { margin-bottom: 20rpx; }
.spacing-mt { margin-top: 20rpx; }
.spacing-mt { margin-top: 20rpx; }
/* 在线客服 */
.customer-service {
position: fixed;
bottom: 100rpx;
right: 0;
}
.customer-service image {
width: 80rpx;
height: 80rpx;
margin-right: 20rpx;
}
.drift { position: fixed; left: -1000px; }
.drift { position: fixed; left: -1000px; }
.nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; }
.nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; }
.tips { background: #ffffeb url('data:image/png;base64,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') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 10rpx 10rpx 10rpx 45rpx; font-size: 26rpx; border-radius: 2px; display: block; }
.tips { background: #ffffeb url('data:image/png;base64,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') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 10rpx 10rpx 10rpx 45rpx; font-size: 26rpx; border-radius: 2px; display: block; }
...
@@ -318,24 +304,31 @@ button[disabled].bg-primary {
...
@@ -318,24 +304,31 @@ button[disabled].bg-primary {
line-height: 85rpx;
line-height: 85rpx;
}
}
/*
/*
*
在线客服
* 快捷导航
*/
*/
.common-
online-service
{
.common-
quick-nav
{
border: 0;
border: 0;
padding: 15rpx;
padding: 15rpx;
background: rgba(0, 0, 0, 0.6);
background: rgba(0, 0, 0, 0.6);
position: fixed;
position: fixed;
right: 10rpx;
right: 10rpx;
bottom: 35%;
line-height: 30rpx;
border-radius: 50%;
border-radius: 50%;
width: 90rpx;
height: 90rpx;
}
}
.common-
online-service
image {
.common-
quick-nav
image {
width: 60rpx;
width: 60rpx;
height: 60rpx;
height: 60rpx;
}
}
/**
* 在线客服
*/
.common-online-service {
bottom: 35%;
}
/**
/**
* 表单
* 表单
*/
*/
...
...
public/appmini/old/weixin/images/default-cart-icon.png
0 → 100644
浏览文件 @
8128dd0d
2.5 KB
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
浏览文件 @
8128dd0d
...
@@ -62,6 +62,9 @@ Page({
...
@@ -62,6 +62,9 @@ Page({
// 优惠劵
// 优惠劵
plugins_coupon_data
:
null
,
plugins_coupon_data
:
null
,
// 购物车快捷导航
quick_nav_cart_count
:
0
,
},
},
onLoad
(
params
)
{
onLoad
(
params
)
{
...
@@ -152,6 +155,7 @@ Page({
...
@@ -152,6 +155,7 @@ Page({
common_app_is_poster_share
:
data
.
common_app_is_poster_share
||
0
,
common_app_is_poster_share
:
data
.
common_app_is_poster_share
||
0
,
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
quick_nav_cart_count
:
data
.
common_cart_total
||
0
,
});
});
// 限时秒杀倒计时
// 限时秒杀倒计时
...
@@ -327,6 +331,7 @@ Page({
...
@@ -327,6 +331,7 @@ Page({
success
:
(
res
)
=>
{
success
:
(
res
)
=>
{
wx
.
hideLoading
();
wx
.
hideLoading
();
if
(
res
.
data
.
code
==
0
)
{
if
(
res
.
data
.
code
==
0
)
{
this
.
setData
({
quick_nav_cart_count
:
this
.
data
.
quick_nav_cart_count
+
this
.
data
.
temp_buy_number
});
this
.
popup_close_event
();
this
.
popup_close_event
();
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
}
else
{
}
else
{
...
...
public/appmini/old/weixin/pages/goods-detail/goods-detail.json
浏览文件 @
8128dd0d
{
{
"enablePullDownRefresh"
:
true
,
"enablePullDownRefresh"
:
true
,
"usingComponents"
:
{
"usingComponents"
:
{
"component-popup"
:
"/components/popup/popup"
"component-popup"
:
"/components/popup/popup"
,
"component-badge"
:
"/components/badge/badge"
}
}
}
}
\ No newline at end of file
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
浏览文件 @
8128dd0d
...
@@ -228,4 +228,14 @@
...
@@ -228,4 +228,14 @@
<view wx:if="{{common_app_is_online_service == 1}}">
<view wx:if="{{common_app_is_online_service == 1}}">
<import src="/pages/lib/online-service/content.wxml" />
<import src="/pages/lib/online-service/content.wxml" />
<template is="online_service"></template>
<template is="online_service"></template>
</view>
</view>
\ No newline at end of file
<!-- 购物车 -->
<navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none">
<view class="common-quick-nav quick-nav-cart">
<view class="badge-icon">
<component-badge prop-number="{{quick_nav_cart_count}}"></component-badge>
</view>
<image src="/images/default-cart-icon.png" class="dis-block"></image>
</view>
</navigator>
\ No newline at end of file
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
浏览文件 @
8128dd0d
...
@@ -323,4 +323,18 @@
...
@@ -323,4 +323,18 @@
}
}
.coupon-container .v-left .desc {
.coupon-container .v-left .desc {
margin-top: 5rpx;
margin-top: 5rpx;
}
/*
* 购物车入口
*/
.quick-nav-cart {
bottom: calc(35% + 110rpx);
width: 60rpx;
height: 60rpx;
}
.quick-nav-cart .badge-icon {
position: absolute;
top: -5px;
left: calc(50% + 23rpx);
}
}
\ No newline at end of file
public/appmini/old/weixin/pages/lib/online-service/content.wxml
浏览文件 @
8128dd0d
<template name="online_service">
<template name="online_service">
<button open-type="contact" class="common-online-service">
<button open-type="contact" class="common-
quick-nav common-
online-service">
<image src="/pages/lib/online-service/icon.png"></image>
<image src="/pages/lib/online-service/icon.png"
class="dis-block"
></image>
</button>
</button>
</template>
</template>
\ No newline at end of file
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js
浏览文件 @
8128dd0d
const
app
=
getApp
();
const
app
=
getApp
();
Page
({
Page
({
data
:
{
data
:
{
detail
:
null
,
params
:
null
,
detail_list
:
[],
data_list_loding_status
:
1
,
data_list_loding_status
:
1
,
data_list_loding_msg
:
''
,
data_list_loding_msg
:
''
,
data_bottom_line_status
:
false
,
data_bottom_line_status
:
false
,
params
:
null
,
detail
:
null
,
detail_list
:
[],
extension_data
:
[],
},
},
onLoad
(
params
)
{
onLoad
(
params
)
{
...
@@ -45,7 +47,8 @@ Page({
...
@@ -45,7 +47,8 @@ Page({
{
name
:
"
支付状态
"
,
value
:
data
.
pay_status_name
||
''
},
{
name
:
"
支付状态
"
,
value
:
data
.
pay_status_name
||
''
},
{
name
:
"
单价
"
,
value
:
data
.
price
||
''
},
{
name
:
"
单价
"
,
value
:
data
.
price
||
''
},
{
name
:
"
总价
"
,
value
:
data
.
total_price
||
''
},
{
name
:
"
总价
"
,
value
:
data
.
total_price
||
''
},
{
name
:
"
优惠
"
,
value
:
data
.
preferential_price
||
''
},
{
name
:
"
优惠金额
"
,
value
:
data
.
preferential_price
||
''
},
{
name
:
"
增加金额
"
,
value
:
data
.
increase_price
||
''
},
{
name
:
"
支付金额
"
,
value
:
data
.
pay_price
||
''
},
{
name
:
"
支付金额
"
,
value
:
data
.
pay_price
||
''
},
{
name
:
"
支付方式
"
,
value
:
data
.
payment_name
||
''
},
{
name
:
"
支付方式
"
,
value
:
data
.
payment_name
||
''
},
{
name
:
"
快递公司
"
,
value
:
data
.
express_name
||
''
},
{
name
:
"
快递公司
"
,
value
:
data
.
express_name
||
''
},
...
@@ -59,6 +62,7 @@ Page({
...
@@ -59,6 +62,7 @@ Page({
{
name
:
"
取消时间
"
,
value
:
data
.
close_time
||
''
},
{
name
:
"
取消时间
"
,
value
:
data
.
close_time
||
''
},
{
name
:
"
关闭时间
"
,
value
:
data
.
close_time
||
''
},
{
name
:
"
关闭时间
"
,
value
:
data
.
close_time
||
''
},
],
],
extension_data
:
data
.
extension_data
||
[],
data_list_loding_status
:
3
,
data_list_loding_status
:
3
,
data_bottom_line_status
:
true
,
data_bottom_line_status
:
true
,
data_list_loding_msg
:
''
,
data_list_loding_msg
:
''
,
...
...
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml
浏览文件 @
8128dd0d
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
</view>
</view>
</view>
</view>
<!-- 订单基础数据 -->
<view wx:if="{{detail_list.length > 0}}" class="detail-list bg-white">
<view wx:if="{{detail_list.length > 0}}" class="detail-list bg-white">
<view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
<view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
<view class="title fl">{{item.name}}</view>
<view class="title fl">{{item.name}}</view>
...
@@ -38,6 +39,14 @@
...
@@ -38,6 +39,14 @@
</view>
</view>
</view>
</view>
<!-- 扩展数据 -->
<view wx:if="{{extension_data.length > 0}}" class="extension-list bg-white spacing-mt">
<view wx:for="{{extension_data}}" wx:key="item" class="item br-b oh">
<text class="title">{{item.name}}</text>
<text class="content cr-888 br-l">{{item.tips}}</text>
</view>
</view>
<import src="/pages/common/bottom_line.wxml" />
<import src="/pages/common/bottom_line.wxml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</view>
</view>
...
...
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss
浏览文件 @
8128dd0d
...
@@ -71,4 +71,17 @@
...
@@ -71,4 +71,17 @@
}
}
.detail-list .item view {
.detail-list .item view {
line-height: 46rpx;
line-height: 46rpx;
}
/*
* 扩展数据
*/
.extension-list .item {
padding: 20rpx 30rpx;
}
.extension-list .item .title {
padding-right: 20rpx;
}
.extension-list .item .content {
padding-left: 20rpx;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录