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
286c0ae7
Commit
286c0ae7
authored
Nov 16, 2018
by
Junling Bu
Browse files
chore[renard-wx]: 基于微信开发者工具的格式化代码
parent
20b97ec8
Changes
94
Show whitespace changes
Inline
Side-by-side
renard-wx/pages/groupon/myGroupon/myGroupon.json
View file @
286c0ae7
renard-wx/pages/groupon/myGroupon/myGroupon.wxml
View file @
286c0ae7
renard-wx/pages/groupon/myGroupon/myGroupon.wxss
View file @
286c0ae7
renard-wx/pages/hotGoods/hotGoods.js
View file @
286c0ae7
renard-wx/pages/hotGoods/hotGoods.wxml
View file @
286c0ae7
renard-wx/pages/hotGoods/hotGoods.wxss
View file @
286c0ae7
page{
page
{
background: #f4f4f4;
}
.brand-info .name{
.brand-info .name
{
width: 100%;
height: 278rpx;
position: relative;
}
.brand-info .img{
.brand-info .img
{
position: absolute;
top:0;
left:0;
top:
0;
left:
0;
width: 100%;
height: 278rpx;
}
.brand-info .info-box{
.brand-info .info-box
{
position: absolute;
top:0;
left:0;
top:
0;
left:
0;
width: 100%;
height: 278rpx;
text-align: center;
...
...
@@ -28,18 +28,18 @@ page{
align-items: center;
}
.brand-info .info{
.brand-info .info
{
display: block;
}
.brand-info .txt{
.brand-info .txt
{
display: block;
height: 40rpx;
font-size: 37.5rpx;
color: #fff;
}
.brand-info .line{
.brand-info .line
{
margin: 0 auto;
margin-top: 16rpx;
display: block;
...
...
@@ -48,14 +48,14 @@ page{
background: #fff;
}
.sort{
.sort
{
position: relative;
background: #fff;
width: 100%;
height: 78rpx;
}
.sort-box{
.sort-box
{
background: #fff;
width: 100%;
height: 78rpx;
...
...
@@ -65,42 +65,42 @@ page{
border-bottom: 1px solid #d9d9d9;
}
.sort-box .item{
.sort-box .item
{
height: 78rpx;
line-height: 78rpx;
text-align: center;
flex:1;
flex:
1;
color: #333;
font-size: 30rpx;
}
.sort-box .item .txt{
.sort-box .item .txt
{
display: block;
width: 100%;
height: 100%;
color: #333;
}
.sort-box .item.active .txt{
.sort-box .item.active .txt
{
color: #b4282d;
}
.sort-box .item.by-price{
.sort-box .item.by-price
{
background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat;
background-size: 15rpx 21rpx;
}
.sort-box .item.by-price.active.asc{
.sort-box .item.by-price.active.asc
{
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat;
background-size: 15rpx 21rpx;
}
.sort-box .item.by-price.active.desc{
.sort-box .item.by-price.active.desc
{
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat;
background-size: 15rpx 21rpx;
}
.sort-box-category{
.sort-box-category
{
background: #fff;
width: 100%;
height: auto;
...
...
@@ -109,7 +109,7 @@ page{
border-bottom: 1px solid #d9d9d9;
}
.sort-box-category .item{
.sort-box-category .item
{
height: 54rpx;
line-height: 54rpx;
text-align: center;
...
...
@@ -121,12 +121,12 @@ page{
font-size: 24rpx;
}
.sort-box-category .item.active{
.sort-box-category .item.active
{
color: #b4282d;
border: 1px solid #b4282d;
}
.cate-item .b{
.cate-item .b
{
width: 750rpx;
height: auto;
overflow: hidden;
...
...
@@ -134,7 +134,7 @@ page{
margin-top: 20rpx;
}
.cate-item .b .item{
.cate-item .b .item
{
float: left;
background: #fff;
width: 375rpx;
...
...
@@ -145,17 +145,17 @@ page{
text-align: center;
}
.cate-item .b .item-b{
.cate-item .b .item-b
{
border-right: 1rpx solid #f4f4f4;
}
.cate-item .item .img{
.cate-item .item .img
{
margin-top: 10rpx;
width: 302rpx;
height: 302rpx;
}
.cate-item .item .name{
.cate-item .item .name
{
display: block;
width: 365.625rpx;
height: 35rpx;
...
...
@@ -167,7 +167,7 @@ page{
color: #333;
}
.cate-item .item .price{
.cate-item .item .price
{
display: block;
width: 365.625rpx;
height: 30rpx;
...
...
renard-wx/pages/index/index.js
View file @
286c0ae7
renard-wx/pages/index/index.json
View file @
286c0ae7
renard-wx/pages/index/index.wxml
View file @
286c0ae7
renard-wx/pages/index/index.wxss
View file @
286c0ae7
renard-wx/pages/newGoods/newGoods.js
View file @
286c0ae7
renard-wx/pages/newGoods/newGoods.json
View file @
286c0ae7
renard-wx/pages/newGoods/newGoods.wxml
View file @
286c0ae7
renard-wx/pages/newGoods/newGoods.wxss
View file @
286c0ae7
renard-wx/pages/payResult/payResult.js
View file @
286c0ae7
...
...
@@ -7,25 +7,25 @@ Page({
status
:
false
,
orderId
:
0
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
// 页面初始化 options为页面跳转所带来的参数
this
.
setData
({
orderId
:
options
.
orderId
,
status
:
options
.
status
===
'
1
'
?
true
:
false
})
},
onReady
:
function
()
{
onReady
:
function
()
{
},
onShow
:
function
()
{
onShow
:
function
()
{
// 页面显示
},
onHide
:
function
()
{
onHide
:
function
()
{
// 页面隐藏
},
onUnload
:
function
()
{
onUnload
:
function
()
{
// 页面关闭
},
...
...
@@ -33,7 +33,7 @@ Page({
let
that
=
this
;
util
.
request
(
api
.
OrderPrepay
,
{
orderId
:
that
.
data
.
orderId
},
'
POST
'
).
then
(
function
(
res
)
{
},
'
POST
'
).
then
(
function
(
res
)
{
if
(
res
.
errno
===
0
)
{
const
payParam
=
res
.
data
;
console
.
log
(
"
支付过程开始
"
)
...
...
@@ -43,17 +43,17 @@ Page({
'
package
'
:
payParam
.
packageValue
,
'
signType
'
:
payParam
.
signType
,
'
paySign
'
:
payParam
.
paySign
,
'
success
'
:
function
(
res
)
{
'
success
'
:
function
(
res
)
{
console
.
log
(
"
支付过程成功
"
)
that
.
setData
({
status
:
true
});
},
'
fail
'
:
function
(
res
)
{
'
fail
'
:
function
(
res
)
{
console
.
log
(
"
支付过程失败
"
)
util
.
showErrorToast
(
'
支付失败
'
);
},
'
complete
'
:
function
(
res
)
{
'
complete
'
:
function
(
res
)
{
console
.
log
(
"
支付过程结束
"
)
}
});
...
...
renard-wx/pages/payResult/payResult.wxml
View file @
286c0ae7
...
...
@@ -10,7 +10,8 @@
<view class="error" wx:if="{{!status}}">
<view class="msg">付款失败</view>
<view class="tips">
<view class="p">请在 <text class="time">半小时</text> 内完成付款</view>
<view class="p">请在
<text class="time">半小时</text> 内完成付款</view>
<view class="p">否则订单将会被系统取消</view>
</view>
<view class="btns">
...
...
renard-wx/pages/payResult/payResult.wxss
View file @
286c0ae7
...
...
@@ -33,7 +33,7 @@ page {
width: 200rpx;
line-height: 78rpx;
border: 1px solid #868686;
color: #000
000
;
color: #000;
border-radius: 5rpx;
}
...
...
renard-wx/pages/search/search.js
View file @
286c0ae7
renard-wx/pages/search/search.json
View file @
286c0ae7
renard-wx/pages/search/search.wxml
View file @
286c0ae7
Prev
1
2
3
4
5
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