Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
20b97ec8
Commit
20b97ec8
authored
Nov 16, 2018
by
Junling Bu
Browse files
chore[litemall-wx]: 使用微信开发者工具的格式化代码
parent
822d5075
Changes
102
Show whitespace changes
Inline
Side-by-side
litemall-wx/pages/ucenter/collect/collect.wxss
View file @
20b97ec8
page{
page
{
background: #f4f4f4;
min-height: 100%;
}
.container{
.container
{
background: #f4f4f4;
min-height: 100%;
width: 100%;
...
...
@@ -11,20 +11,19 @@ page{
overflow: hidden;
}
.no-collect{
.no-collect {
width: 100%;
height: auto;
margin: 0 auto;
}
.no-collect .c{
.no-collect .c
{
width: 100%;
height: auto;
margin-top: 200rpx;
}
.no-collect .c image{
.no-collect .c image
{
margin: 0 auto;
display: block;
text-align: center;
...
...
@@ -32,7 +31,7 @@ page{
height: 258rpx;
}
.no-collect .c text{
.no-collect .c text
{
margin: 0 auto;
display: block;
width: 258rpx;
...
...
@@ -43,7 +42,7 @@ page{
color: #999;
}
.collect-list{
.collect-list
{
width: 100%;
height: auto;
overflow: hidden;
...
...
@@ -52,7 +51,7 @@ page{
border-top: 1px solid #e1e1e1;
}
.item{
.item
{
height: 212rpx;
width: 720rpx;
background: #fff;
...
...
@@ -60,17 +59,17 @@ page{
border-bottom: 1px solid #e1e1e1;
}
.item:last-child{
.item:last-child
{
border-bottom: 1px solid #fff;
}
.item .img{
.item .img
{
float: left;
width: 150rpx;
height: 150rpx;
}
.item .info{
.item .info
{
float: right;
width: 540rpx;
height: 150rpx;
...
...
@@ -80,21 +79,20 @@ page{
padding-left: 20rpx;
}
.item .info .name{
.item .info .name
{
font-size: 28rpx;
color: #333;
line-height: 40rpx;
}
.item .info .subtitle{
.item .info .subtitle {
margin-top: 8rpx;
font-size: 24rpx;
color: #888;
line-height: 40rpx;
}
.item .info .price{
.item .info .price
{
margin-top: 8rpx;
font-size: 28rpx;
color: #333;
...
...
litemall-wx/pages/ucenter/coupon/coupon.js
View file @
20b97ec8
var
util
=
require
(
'
../../../utils/util.js
'
);
var
api
=
require
(
'
../../../config/api.js
'
);
var
app
=
getApp
();
Page
({
data
:
{
},
onLoad
:
function
(
options
)
{
},
onReady
:
function
()
{
onLoad
:
function
(
options
)
{},
onReady
:
function
()
{
},
onShow
:
function
()
{
onShow
:
function
()
{
},
onHide
:
function
()
{
onHide
:
function
()
{
// 页面隐藏
},
onUnload
:
function
()
{
onUnload
:
function
()
{
// 页面关闭
}
})
\ No newline at end of file
litemall-wx/pages/ucenter/coupon/coupon.wxml
View file @
20b97ec8
litemall-wx/pages/ucenter/coupon/coupon.wxss
View file @
20b97ec8
page{
page
{
background: #f4f4f4;
min-height: 100%;
}
.container{
.container
{
background: #f4f4f4;
min-height: 100%;
padding-top: 30rpx;
}
.coupon-form{
.coupon-form
{
height: 110rpx;
width: 100%;
background: #fff;
...
...
@@ -19,7 +19,7 @@ page{
display: flex;
}
.input-box{
.input-box
{
flex: 1;
height: 70rpx;
color: #333;
...
...
@@ -31,7 +31,7 @@ page{
margin-right: 30rpx;
}
.input-box .coupon-sn{
.input-box .coupon-sn
{
position: absolute;
top: 10rpx;
left: 30rpx;
...
...
@@ -42,7 +42,7 @@ page{
font-size: 24rpx;
}
.clear-icon{
.clear-icon
{
position: absolute;
top: 21rpx;
right: 30rpx;
...
...
@@ -50,9 +50,9 @@ page{
height: 28rpx;
}
.add-btn{
.add-btn
{
height: 70rpx;
border:none;
border:
none;
width: 168rpx;
background: #b4282d;
border-radius: 0;
...
...
@@ -61,11 +61,11 @@ page{
font-size: 28rpx;
}
.add-btn.disabled{
.add-btn.disabled
{
background: #ccc;
}
.help{
.help
{
height: 72rpx;
line-height: 72rpx;
text-align: right;
...
...
@@ -76,7 +76,7 @@ page{
font-size: 24rpx;
}
.coupon-list{
.coupon-list
{
width: 100%;
height: auto;
overflow: hidden;
...
...
@@ -84,18 +84,18 @@ page{
padding-right: 30rpx;
}
.item{
.item
{
position: relative;
height: 290rpx;
width: 100%;
background: linear-gradient(to right,#cfa568,#e3bf79);
background: linear-gradient(to right,
#cfa568,
#e3bf79);
margin-bottom: 30rpx;
padding-top: 52rpx;
}
.tag{
.tag
{
height: 32rpx;
background: #
A
48143;
background: #
a
48143;
padding-left: 16rpx;
padding-right: 16rpx;
position: absolute;
...
...
@@ -107,8 +107,7 @@ page{
line-height: 32rpx;
}
.content{
.content {
margin-top: 24rpx;
margin-left: 40rpx;
display: flex;
...
...
@@ -117,50 +116,50 @@ page{
align-items: center;
}
.content .left{
.content .left
{
flex: 1;
}
.name{
.name
{
font-size: 44rpx;
color: #fff;
margin-bottom: 14rpx;
}
.time{
.time
{
font-size: 24rpx;
color: rgba(255,255,255, 0.8);
color: rgba(255,
255,
255, 0.8);
line-height: 30rpx;
}
.content .right{
.content .right
{
width: 162rpx;
}
.go{
.go
{
height: 48rpx;
border:none;
border:
none;
width: 162rpx;
background: rgba(255,255,255, 0.8);
background: rgba(255,
255,
255, 0.8);
border-radius: 4rpx;
line-height: 48rpx;
color: #b69150;
font-size: 24rpx;
}
.condition{
.condition
{
position: absolute;
width: 100%;
bottom: 0;
left:0;
left:
0;
height: 78rpx;
background: rgba(0,0,0,.08);
background: rgba(0,
0,
0,
0
.08);
padding: 24rpx 40rpx;
display: flex;
flex-direction: row;
}
.condition .txt{
.condition .txt
{
display: block;
height: 30rpx;
flex: 1;
...
...
@@ -170,8 +169,7 @@ page{
color: #fff;
}
.condition .icon{
.condition .icon {
margin-left: 30rpx;
width: 24rpx;
height: 24rpx;
...
...
litemall-wx/pages/ucenter/feedback/feedback.js
View file @
20b97ec8
...
...
@@ -15,7 +15,7 @@ Page({
picUrls
:
[],
files
:
[]
},
chooseImage
:
function
(
e
)
{
chooseImage
:
function
(
e
)
{
if
(
this
.
data
.
files
.
length
>=
5
)
{
util
.
showErrorToast
(
'
只能上传五张图片
'
)
return
false
;
...
...
@@ -26,7 +26,7 @@ Page({
count
:
1
,
sizeType
:
[
'
original
'
,
'
compressed
'
],
sourceType
:
[
'
album
'
,
'
camera
'
],
success
:
function
(
res
)
{
success
:
function
(
res
)
{
that
.
setData
({
files
:
that
.
data
.
files
.
concat
(
res
.
tempFilePaths
)
});
...
...
@@ -34,13 +34,13 @@ Page({
}
})
},
upload
:
function
(
res
)
{
upload
:
function
(
res
)
{
var
that
=
this
;
const
uploadTask
=
wx
.
uploadFile
({
url
:
api
.
StorageUpload
,
filePath
:
res
.
tempFilePaths
[
0
],
name
:
'
file
'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
var
_res
=
JSON
.
parse
(
res
.
data
);
if
(
_res
.
errno
===
0
)
{
var
url
=
_res
.
data
.
url
...
...
@@ -51,7 +51,7 @@ Page({
})
}
},
fail
:
function
(
e
)
{
fail
:
function
(
e
)
{
wx
.
showModal
({
title
:
'
错误
'
,
content
:
'
上传失败
'
,
...
...
@@ -67,7 +67,7 @@ Page({
})
},
previewImage
:
function
(
e
)
{
previewImage
:
function
(
e
)
{
wx
.
previewImage
({
current
:
e
.
currentTarget
.
id
,
// 当前显示图片的http链接
urls
:
this
.
data
.
files
// 需要预览的图片http链接列表
...
...
litemall-wx/pages/ucenter/feedback/feedback.wxss
View file @
20b97ec8
page{
page
{
background: #f4f4f4;
min-height: 100%;
}
.container{
.container
{
background: #f4f4f4;
min-height: 100%;
padding-top: 30rpx;
}
.fb-type{
.fb-type
{
height: 104rpx;
width: 100%;
background: #fff;
...
...
@@ -21,26 +21,26 @@
padding-right: 30rpx;
}
.fb-type .type-label{
.fb-type .type-label
{
height: 36rpx;
flex: 1;
color: #333;
font-size: 28rpx;
}
.fb-type .type-icon{
.fb-type .type-icon
{
height: 36rpx;
width: 36rpx;
}
.fb-body{
.fb-body
{
width: 100%;
background: #fff;
height: 600rpx;
padding: 18rpx 30rpx 64rpx 30rpx;
}
.fb-body .content{
.fb-body .content
{
width: 100%;
height: 400rpx;
color: #333;
...
...
@@ -48,7 +48,7 @@
font-size: 28rpx;
}
.weui-uploader__files{
.weui-uploader__files
{
width: 100%;
}
...
...
@@ -112,19 +112,19 @@
opacity: 0;
}
.fb-body .text-count{
.fb-body .text-count
{
line-height: 30rpx;
float: right;
color: #666;
font-size: 24rpx;
}
.fb-mobile{
.fb-mobile
{
height: 162rpx;
width: 100%;
}
.fb-mobile .label{
.fb-mobile .label
{
height: 58rpx;
width: 100%;
padding-top: 14rpx;
...
...
@@ -136,7 +136,7 @@
line-height: 33rpx;
}
.fb-mobile .mobile-box{
.fb-mobile .mobile-box
{
height: 104rpx;
width: 100%;
color: #333;
...
...
@@ -147,7 +147,7 @@
position: relative;
}
.fb-mobile .mobile{
.fb-mobile .mobile
{
position: absolute;
top: 27rpx;
left: 30rpx;
...
...
@@ -158,7 +158,7 @@
font-size: 24rpx;
}
.fb-mobile .clear-icon{
.fb-mobile .clear-icon
{
position: absolute;
top: 27rpx;
right: 30rpx;
...
...
@@ -167,7 +167,7 @@
z-index: 2;
}
.fb-btn{
.fb-btn
{
right: 0;
display: flex;
justify-content: center;
...
...
litemall-wx/pages/ucenter/footprint/footprint.js
View file @
20b97ec8
...
...
@@ -15,7 +15,10 @@ Page({
title
:
'
加载中...
'
,
});
let
that
=
this
;
util
.
request
(
api
.
FootprintList
,
{
page
:
that
.
data
.
page
,
size
:
that
.
data
.
size
}).
then
(
function
(
res
)
{
util
.
request
(
api
.
FootprintList
,
{
page
:
that
.
data
.
page
,
size
:
that
.
data
.
size
}).
then
(
function
(
res
)
{
if
(
res
.
errno
===
0
)
{
let
f1
=
that
.
data
.
footprintList
;
let
f2
=
res
.
data
.
footprintList
;
...
...
@@ -23,8 +26,7 @@ Page({
let
last
=
f1
.
length
-
1
;
if
(
last
>=
0
&&
f1
[
last
][
0
].
addTime
===
f2
[
i
].
addTime
)
{
f1
[
last
].
push
(
f2
[
i
]);
}
else
{
}
else
{
let
tmp
=
[];
tmp
.
push
(
f2
[
i
])
f1
.
push
(
tmp
);
...
...
@@ -39,7 +41,7 @@ Page({
wx
.
hideLoading
();
});
},
deleteItem
(
event
){
deleteItem
(
event
)
{
let
that
=
this
;
let
index
=
event
.
currentTarget
.
dataset
.
index
;
let
iindex
=
event
.
currentTarget
.
dataset
.
iindex
;
...
...
@@ -52,9 +54,11 @@ Page({
wx
.
showModal
({
title
:
''
,
content
:
'
要删除所选足迹?
'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
if
(
res
.
confirm
)
{
util
.
request
(
api
.
FootprintDelete
,
{
footprintId
:
footprintId
},
'
POST
'
).
then
(
function
(
res
)
{
util
.
request
(
api
.
FootprintDelete
,
{
footprintId
:
footprintId
},
'
POST
'
).
then
(
function
(
res
)
{
if
(
res
.
errno
===
0
)
{
wx
.
showToast
({
title
:
'
删除成功
'
,
...
...
@@ -62,7 +66,7 @@ Page({
duration
:
2000
});
that
.
data
.
footprintList
[
index
].
splice
(
iindex
,
1
)
if
(
that
.
data
.
footprintList
[
index
].
length
==
0
){
if
(
that
.
data
.
footprintList
[
index
].
length
==
0
)
{
that
.
data
.
footprintList
.
splice
(
index
,
1
)
}
that
.
setData
({
...
...
@@ -80,7 +84,7 @@ Page({
}
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
this
.
getFootprintList
();
},
onReachBottom
()
{
...
...
@@ -98,21 +102,21 @@ Page({
return
false
;
}
},
onReady
:
function
()
{
onReady
:
function
()
{
},
onShow
:
function
()
{
onShow
:
function
()
{
},
onHide
:
function
()
{
onHide
:
function
()
{
// 页面隐藏
},
onUnload
:
function
()
{
onUnload
:
function
()
{
// 页面关闭
},
//按下事件开始
touchStart
:
function
(
e
)
{
touchStart
:
function
(
e
)
{
let
that
=
this
;
that
.
setData
({
touchStart
:
e
.
timeStamp
...
...
@@ -120,7 +124,7 @@ Page({
console
.
log
(
e
.
timeStamp
+
'
- touchStart
'
)
},
//按下事件结束
touchEnd
:
function
(
e
)
{
touchEnd
:
function
(
e
)
{
let
that
=
this
;
that
.
setData
({
touchEnd
:
e
.
timeStamp
...
...
litemall-wx/pages/ucenter/footprint/footprint.wxml
View file @
20b97ec8
litemall-wx/pages/ucenter/footprint/footprint.wxss
View file @
20b97ec8
page{
page
{
background: #f4f4f4;
min-height: 100%;
}
.container{
.container
{
background: #f4f4f4;
min-height: 100%;
width: 100%;
...
...
@@ -11,19 +11,19 @@ page{
overflow: hidden;
}
.no-footprint{
.no-footprint
{
width: 100%;
height: auto;
margin: 0 auto;
}
.no-footprint .c{
.no-footprint .c
{
width: 100%;
height: auto;
margin-top: 200rpx;
}
.no-footprint .c image{
.no-footprint .c image
{
margin: 0 auto;
display: block;
text-align: center;
...
...
@@ -31,7 +31,7 @@ page{
height: 258rpx;
}
.no-footprint .c text{
.no-footprint .c text
{
margin: 0 auto;
display: block;
width: 258rpx;
...
...
@@ -42,21 +42,21 @@ page{
color: #999;
}
.footprint{
.footprint
{
height: auto;
overflow: hidden;
width: 100%;
border-top: 1px solid #e1e1e1;
}
.day-item{
.day-item
{
height: auto;
overflow: hidden;
width: 100%;
margin-bottom: 20rpx;
}
.day-hd{
.day-hd
{
height: 94rpx;
width: 100%;
line-height: 94rpx;
...
...
@@ -66,7 +66,7 @@ page{
font-size: 28rpx;
}
.day-list{
.day-list
{
width: 100%;
height: auto;
overflow: hidden;
...
...
@@ -75,7 +75,7 @@ page{
border-top: 1px solid #e1e1e1;
}
.item{
.item
{
height: 212rpx;
width: 720rpx;
background: #fff;
...
...
@@ -83,17 +83,17 @@ page{
border-bottom: 1px solid #e1e1e1;
}
.item:last-child{
.item:last-child
{
border-bottom: 1px solid #fff;
}
.item .img{
.item .img
{
float: left;
width: 150rpx;
height: 150rpx;
}
.item .info{
.item .info
{
float: right;
width: 540rpx;
height: 150rpx;
...
...
@@ -103,21 +103,20 @@ page{
padding-left: 20rpx;
}
.item .info .name{
.item .info .name
{
font-size: 28rpx;
color: #333;
line-height: 40rpx;
}
.item .info .subtitle{
.item .info .subtitle {
margin-top: 8rpx;
font-size: 24rpx;
color: #888;
line-height: 40rpx;
}
.item .info .price{
.item .info .price
{
margin-top: 8rpx;
font-size: 28rpx;
color: #333;
...
...
litemall-wx/pages/ucenter/index/index.json
View file @
20b97ec8
litemall-wx/pages/ucenter/index/index.wxml
View file @
20b97ec8
...
...
@@ -17,7 +17,7 @@
<view class='user_column_item' bindtap='goOrderIndex' data-index='1' data-route='/pages/ucenter/order/order'>
<text class="user_column_item_badge" wx:if="{{order.unpaid != 0}}">{{order.unpaid}}</text>
<image class='user_column_item_image' src='/static/images/pendpay.png'>
</image>
</image>
<view class='user_column_item_text'>待付款</view>
</view>
<view class='user_column_item' bindtap='goOrderIndex' data-index='2' data-route='/pages/ucenter/order/order'>
...
...
litemall-wx/pages/ucenter/index/index.wxss
View file @
20b97ec8
...
...
@@ -112,8 +112,8 @@ page {
background: #b4282d;
color: #fff;
border-radius: 50%;
margin-top:20rpx;
margin-left:40rpx;
margin-top:
20rpx;
margin-left:
40rpx;
}
.user_column_item_image {
...
...
@@ -137,20 +137,21 @@ page {
.user_column_item_phone {
width: 30%;
text-align:center;
display:flex;
justify-content:center;
align-items:center;
flex-wrap:wrap;
float:left;
background:#fff;
border-bottom:1px solid #fafafa;
}
.user_column_item_phone::after{
text-align: center;
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
float: left;
background: #fff;
border-bottom: 1px solid #fafafa;
}
.user_column_item_phone::after {
border: none;
}
.logout{
.logout
{
margin-top: 30rpx;
height: 100rpx;
width: 100%;
...
...
litemall-wx/pages/ucenter/order/order.js
View file @
20b97ec8
...
...
@@ -15,8 +15,7 @@ Page({
this
.
setData
({
showType
:
tab
});
}
catch
(
e
)
{
}
}
catch
(
e
)
{}
},
...
...
litemall-wx/pages/ucenter/order/order.wxml
View file @
20b97ec8
litemall-wx/pages/ucenter/order/order.wxss
View file @
20b97ec8
page{
page
{
height: 100%;
width: 100%;
background: #f4f4f4;
}
.orders-switch{
.orders-switch {
width: 100%;
background: #fff;
height: 84rpx;
/* border-bottom: 1px solid rgba(0,0,0,.15); */
}
.orders-switch .item{
.orders-switch .item
{
display: inline-block;
height: 82rpx;
width: 18%;
...
...
@@ -20,7 +19,7 @@ page{
text-align: center;
}
.orders-switch .item .txt{
.orders-switch .item .txt
{
display: inline-block;
height: 82rpx;
padding: 0 20rpx;
...
...
@@ -30,25 +29,24 @@ page{
width: 170rpx;
}
.orders-switch .item.active .txt{
color: #
AB
956
D
;
border-bottom: 4rpx solid #
AB
956
D
;
.orders-switch .item.active .txt
{
color: #
ab
956
d
;
border-bottom: 4rpx solid #
ab
956
d
;
}
.no-order{
.no-order {
width: 100%;
height: auto;
margin: 0 auto;
}
.no-order .c{
.no-order .c
{
width: 100%;
height: auto;
margin-top: 200rpx;
}
.no-order .c image{
.no-order .c image
{
margin: 0 auto;
display: block;
text-align: center;
...
...
@@ -56,7 +54,7 @@ page{
height: 258rpx;
}
.no-order .c text{
.no-order .c text
{
margin: 0 auto;
display: block;
width: 258rpx;
...
...
@@ -67,18 +65,18 @@ page{
color: #999;
}
.orders{
.orders
{
height: auto;
width: 100%;
overflow: hidden;
}
.order{
.order
{
margin-top: 20rpx;
background: #fff;
}
.order .h{
.order .h
{
height: 83.3rpx;
line-height: 83.3rpx;
margin-left: 31.25rpx;
...
...
@@ -88,41 +86,41 @@ page{
color: #333;
}
.order .h .l{
.order .h .l
{
float: left;
}
.order .h .r{
.order .h .r
{
float: right;
color: #b4282d;
font-size: 24rpx;
}
.order .goods{
.order .goods
{
display: flex;
align-items: center;
height: 199rpx;
margin-left: 31.25rpx;
}
.order .goods .img{
height:145.83rpx;
width:145.83rpx;
.order .goods .img
{
height:
145.83rpx;
width:
145.83rpx;
background: #f4f4f4;
}
.order .goods .img image{
height:145.83rpx;
width:145.83rpx;
.order .goods .img image
{
height:
145.83rpx;
width:
145.83rpx;
}
.order .goods .info{
.order .goods .info
{
height: 145.83rpx;
flex: 1;
padding-left: 20rpx;
}
.order .goods .name{
.order .goods .name
{
margin-top: 30rpx;
display: block;
height: 44rpx;
...
...
@@ -131,7 +129,7 @@ page{
font-size: 30rpx;
}
.order .goods .number{
.order .goods .number
{
display: block;
height: 37rpx;
line-height: 37rpx;
...
...
@@ -139,13 +137,13 @@ page{
font-size: 25rpx;
}
.order .goods .status{
width:105rpx;
.order .goods .status
{
width:
105rpx;
color: #b4282d;
font-size: 25rpx;
}
.order .b{
.order .b
{
height: 103rpx;
line-height: 103rpx;
margin-left: 31.25rpx;
...
...
@@ -155,15 +153,15 @@ page{
color: #333;
}
.order .b .l{
.order .b .l
{
float: left;
}
.order .b .r{
.order .b .r
{
float: right;
}
.order .b .btn{
.order .b .btn
{
margin-top: 19rpx;
height: 64.5rpx;
line-height: 64.5rpx;
...
...
litemall-wx/pages/ucenter/orderDetail/orderDetail.js
View file @
20b97ec8
...
...
@@ -10,7 +10,7 @@ Page({
flag
:
false
,
handleOption
:
{}
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
// 页面初始化 options为页面跳转所带来的参数
this
.
setData
({
orderId
:
options
.
id
...
...
@@ -29,19 +29,19 @@ Page({
flag
:
!
that
.
data
.
flag
})
},
getOrderDetail
:
function
()
{
getOrderDetail
:
function
()
{
wx
.
showLoading
({
title
:
'
加载中
'
,
});
setTimeout
(
function
()
{
setTimeout
(
function
()
{
wx
.
hideLoading
()
},
2000
);
let
that
=
this
;
util
.
request
(
api
.
OrderDetail
,
{
orderId
:
that
.
data
.
orderId
}).
then
(
function
(
res
)
{
}).
then
(
function
(
res
)
{
if
(
res
.
errno
===
0
)
{
console
.
log
(
res
.
data
);
that
.
setData
({
...
...
@@ -87,25 +87,24 @@ Page({
},
// “取消订单”点击效果
cancelOrder
:
function
()
{
cancelOrder
:
function
()
{
let
that
=
this
;
let
orderInfo
=
that
.
data
.
orderInfo
;
wx
.
showModal
({
title
:
''
,
content
:
'
确定要取消此订单?
'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
if
(
res
.
confirm
)
{
util
.
request
(
api
.
OrderCancel
,
{
orderId
:
orderInfo
.
id
},
'
POST
'
).
then
(
function
(
res
)
{
},
'
POST
'
).
then
(
function
(
res
)
{
if
(
res
.
errno
===
0
)
{
wx
.
showToast
({
title
:
'
取消订单成功
'
});
util
.
redirect
(
'
/pages/ucenter/order/order
'
);
}
else
{
}
else
{
util
.
showErrorToast
(
res
.
errmsg
);
}
});
...
...
@@ -114,25 +113,24 @@ Page({
});
},
// “取消订单并退款”点击效果
refundOrder
:
function
()
{
refundOrder
:
function
()
{
let
that
=
this
;
let
orderInfo
=
that
.
data
.
orderInfo
;
wx
.
showModal
({
title
:
''
,
content
:
'
确定要取消此订单?
'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
if
(
res
.
confirm
)
{
util
.
request
(
api
.
OrderRefund
,
{
orderId
:
orderInfo
.
id
},
'
POST
'
).
then
(
function
(
res
)
{
},
'
POST
'
).
then
(
function
(
res
)
{
if
(
res
.
errno
===
0
)
{
wx
.
showToast
({
title
:
'
取消订单成功
'
});
util
.
redirect
(
'
/pages/ucenter/order/order
'
);
}
else
{
}
else
{
util
.
showErrorToast
(
res
.
errmsg
);
}
});
...
...
@@ -141,25 +139,24 @@ Page({
});
},
// “删除”点击效果
deleteOrder
:
function
()
{
deleteOrder
:
function
()
{
let
that
=
this
;
let
orderInfo
=
that
.
data
.
orderInfo
;
wx
.
showModal
({
title
:
''
,
content
:
'
确定要删除此订单?
'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
if
(
res
.
confirm
)
{
util
.
request
(
api
.
OrderDelete
,
{
orderId
:
orderInfo
.
id
},
'
POST
'
).
then
(
function
(
res
)
{
},
'
POST
'
).
then
(
function
(
res
)
{
if
(
res
.
errno
===
0
)
{
wx
.
showToast
({
title
:
'
删除订单成功
'
});
util
.
redirect
(
'
/pages/ucenter/order/order
'
);
}
else
{
}
else
{
util
.
showErrorToast
(
res
.
errmsg
);
}
});
...
...
@@ -168,25 +165,24 @@ Page({
});
},
// “确认收货”点击效果
confirmOrder
:
function
()
{
confirmOrder
:
function
()
{
let
that
=
this
;
let
orderInfo
=
that
.
data
.
orderInfo
;
wx
.
showModal
({
title
:
''
,
content
:
'
确认收货?
'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
if
(
res
.
confirm
)
{
util
.
request
(
api
.
OrderConfirm
,
{
orderId
:
orderInfo
.
id
},
'
POST
'
).
then
(
function
(
res
)
{
},
'
POST
'
).
then
(
function
(
res
)
{
if
(
res
.
errno
===
0
)
{
wx
.
showToast
({
title
:
'
确认收货成功!
'
});
util
.
redirect
(
'
/pages/ucenter/order/order
'
);
}
else
{
}
else
{
util
.
showErrorToast
(
res
.
errmsg
);
}
});
...
...
@@ -194,16 +190,16 @@ Page({
}
});
},
onReady
:
function
()
{
onReady
:
function
()
{
// 页面渲染完成
},
onShow
:
function
()
{
onShow
:
function
()
{
// 页面显示
},
onHide
:
function
()
{
onHide
:
function
()
{
// 页面隐藏
},
onUnload
:
function
()
{
onUnload
:
function
()
{
// 页面关闭
}
})
\ No newline at end of file
litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml
View file @
20b97ec8
...
...
@@ -3,7 +3,9 @@
<view class="item-a">下单时间:{{orderInfo.addTime}}</view>
<view class="item-b">订单编号:{{orderInfo.orderSn}}</view>
<view class="item-c">
<view class="l">实付:<text class="cost">¥{{orderInfo.actualPrice}}</text></view>
<view class="l">实付:
<text class="cost">¥{{orderInfo.actualPrice}}</text>
</view>
<view class="r">
<view class="btn active" bindtap="cancelOrder" wx:if="{{handleOption.cancel}}">取消订单</view>
<view class="btn active" bindtap="payOrder" wx:if="{{handleOption.pay}}">去付款</view>
...
...
@@ -64,7 +66,7 @@
<text class="txt">¥{{orderInfo.actualPrice}}</text>
</view>
</view>
</view>
</view>
<!-- 物流信息,仅收货状态下可见 -->
<view class="order-express" bindtap="expandDetail" wx:if="{{ handleOption.confirm }}">
...
...
litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss
View file @
20b97ec8
page{
page
{
height: 100%;
width: 100%;
background: #f4f4f4;
}
.order-info{
.order-info
{
padding-top: 25rpx;
background: #fff;
height: auto;
overflow: hidden;
}
.item-a{
.item-a
{
padding-left: 31.25rpx;
height: 42.5rpx;
padding-bottom: 12.5rpx;
...
...
@@ -20,7 +20,7 @@ page{
color: #666;
}
.item-b{
.item-b
{
padding-left: 31.25rpx;
height: 29rpx;
line-height: 29rpx;
...
...
@@ -30,18 +30,18 @@ page{
color: #666;
}
.item-c{
.item-c
{
margin-left: 31.25rpx;
border-top: 1px solid #f4f4f4;
height: 103rpx;
line-height: 103rpx;
}
.item-c .l{
.item-c .l
{
float: left;
}
.item-c .r{
.item-c .r
{
height: 103rpx;
float: right;
display: flex;
...
...
@@ -49,15 +49,15 @@ page{
padding-right: 16rpx;
}
.item-c .r .btn{
.item-c .r .btn
{
float: right;
}
.item-c .cost{
.item-c .cost
{
color: #b4282d;
}
.item-c .btn{
.item-c .btn
{
line-height: 66rpx;
border-radius: 5rpx;
text-align: center;
...
...
@@ -66,17 +66,17 @@ page{
height: 66rpx;
}
.item-c .btn.active{
.item-c .btn.active
{
background: #b4282d;
color: #fff;
}
.order-goods{
.order-goods
{
margin-top: 20rpx;
background: #fff;
}
.order-goods .h{
.order-goods .h
{
height: 93.75rpx;
line-height: 93.75rpx;
margin-left: 31.25rpx;
...
...
@@ -84,19 +84,19 @@ page{
padding-right: 31.25rpx;
}
.order-goods .h .label{
.order-goods .h .label
{
float: left;
font-size: 30rpx;
color: #333;
}
.order-goods .h .status{
.order-goods .h .status
{
float: right;
font-size: 30rpx;
color: #b4282d;
}
.order-goods .item{
.order-goods .item
{
display: flex;
align-items: center;
height: 192rpx;
...
...
@@ -105,35 +105,35 @@ page{
border-bottom: 1px solid #f4f4f4;
}
.order-goods .item:last-child{
.order-goods .item:last-child
{
border-bottom: none;
}
.order-goods .item .img{
.order-goods .item .img
{
height: 145.83rpx;
width: 145.83rpx;
background: #f4f4f4;
}
.order-goods .item .img image{
.order-goods .item .img image
{
height: 145.83rpx;
width: 145.83rpx;
}
.order-goods .item .info{
.order-goods .item .info
{
flex: 1;
height: 145.83rpx;
margin-left: 20rpx;
}
.order-goods .item .t{
.order-goods .item .t
{
margin-top: 8rpx;
height: 33rpx;
line-height: 33rpx;
margin-bottom: 10.5rpx;
}
.order-goods .item .t .name{
.order-goods .item .t .name
{
display: block;
float: left;
height: 33rpx;
...
...
@@ -142,7 +142,7 @@ page{
font-size: 30rpx;
}
.order-goods .item .t .number{
.order-goods .item .t .number
{
display: block;
float: right;
height: 33rpx;
...
...
@@ -152,7 +152,7 @@ page{
font-size: 30rpx;
}
.order-goods .item .attr{
.order-goods .item .attr
{
height: 29rpx;
line-height: 29rpx;
color: #666;
...
...
@@ -160,7 +160,7 @@ page{
font-size: 25rpx;
}
.order-goods .item .price{
.order-goods .item .price
{
display: block;
float: left;
height: 30rpx;
...
...
@@ -169,7 +169,7 @@ page{
font-size: 30rpx;
}
.order-goods .item .btn{
.order-goods .item .btn
{
height: 50rpx;
line-height: 50rpx;
border-radius: 5rpx;
...
...
@@ -180,12 +180,12 @@ page{
padding: 0 20rpx;
}
.order-goods .item .btn.active{
.order-goods .item .btn.active
{
background: #b4282d;
color: #fff;
}
.order-bottom{
.order-bottom
{
margin-top: 20rpx;
padding-left: 31.25rpx;
height: auto;
...
...
@@ -193,19 +193,19 @@ page{
background: #fff;
}
.order-bottom .address{
.order-bottom .address
{
height: 128rpx;
padding-top: 25rpx;
border-bottom: 1px solid #f4f4f4;
}
.order-bottom .address .t{
.order-bottom .address .t
{
height: 35rpx;
line-height: 35rpx;
margin-bottom: 7.5rpx;
}
.order-bottom .address .name{
.order-bottom .address .name
{
display: inline-block;
height: 35rpx;
width: 140rpx;
...
...
@@ -213,33 +213,33 @@ page{
font-size: 30rpx;
}
.order-bottom .address .mobile{
.order-bottom .address .mobile
{
display: inline-block;
height: 35rpx;
line-height: 35rpx;
font-size: 30rpx;
}
.order-bottom .address .b{
.order-bottom .address .b
{
height: 35rpx;
line-height: 35rpx;
font-size: 30rpx;
}
.order-bottom .total{
.order-bottom .total
{
height: 106rpx;
padding-top: 20rpx;
border-bottom: 1px solid #f4f4f4;
}
.order-bottom .total .t{
.order-bottom .total .t
{
height: 30rpx;
line-height: 30rpx;
margin-bottom: 7.5rpx;
display: flex;
}
.order-bottom .total .label{
.order-bottom .total .label
{
width: 150rpx;
display: inline-block;
height: 35rpx;
...
...
@@ -247,7 +247,7 @@ page{
font-size: 30rpx;
}
.order-bottom .total .txt{
.order-bottom .total .txt
{
flex: 1;
display: inline-block;
height: 35rpx;
...
...
@@ -255,18 +255,18 @@ page{
font-size: 30rpx;
}
.order-bottom .pay-fee{
.order-bottom .pay-fee
{
height: 81rpx;
line-height: 81rpx;
}
.order-bottom .pay-fee .label{
.order-bottom .pay-fee .label
{
display: inline-block;
width: 140rpx;
color: #b4282d;
}
.order-bottom .pay-fee .txt{
.order-bottom .pay-fee .txt
{
display: inline-block;
width: 140rpx;
color: #b4282d;
...
...
litemall-wx/project.config.json
View file @
20b97ec8
litemall-wx/utils/check.js
View file @
20b97ec8
Prev
1
2
3
4
5
6
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment