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/app.js
View file @
286c0ae7
renard-wx/app.json
View file @
286c0ae7
renard-wx/app.wxss
View file @
286c0ae7
/**app.wxss**/
/**app.wxss**/
.container {
.container {
box-sizing: border-box;
box-sizing: border-box;
font-family: PingFangSC-Light,helvetica,'Heiti SC';
font-family: PingFangSC-Light,
helvetica,
'Heiti SC';
width: 100%;
width: 100%;
height: 100%;
height: 100%;
}
}
view,image,text,navigator{
view,
image,
text,
navigator
{
box-sizing: border-box;
box-sizing: border-box;
padding:0;
padding: 0;
margin:0;
margin: 0;
}
}
view,text{
view,
text
{
font-family: PingFangSC-Light,helvetica,'Heiti SC';
font-family: PingFangSC-Light,
helvetica,
'Heiti SC';
font-size: 29rpx;
font-size: 29rpx;
color: #a78845;
color: #a78845;
}
}
...
...
renard-wx/config/api.js
View file @
286c0ae7
// 以下是业务服务器API地址
// 以下是业务服务器API地址
// 本机开发时使用
// 本机开发时使用
var
WxApiRoot
=
'
http://localhost:8080/wx/
'
;
var
WxApiRoot
=
'
http://localhost:8080/wx/
'
;
// 局域网测试使用
// 局域网测试使用
// var WxApiRoot = 'http://192.168.0.101:8080/wx/';
// var WxApiRoot = 'http://192.168.0.101:8080/wx/';
// 云平台上线时使用
// 云平台上线时使用
...
...
renard-wx/pages/auth/login/login.js
View file @
286c0ae7
...
@@ -4,29 +4,28 @@ var user = require('../../../utils/user.js');
...
@@ -4,29 +4,28 @@ var user = require('../../../utils/user.js');
var
app
=
getApp
();
var
app
=
getApp
();
Page
({
Page
({
data
:
{
data
:
{},
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
// 页面初始化 options为页面跳转所带来的参数
// 页面初始化 options为页面跳转所带来的参数
// 页面渲染完成
// 页面渲染完成
},
},
onReady
:
function
()
{
onReady
:
function
()
{
},
},
onShow
:
function
()
{
onShow
:
function
()
{
// 页面显示
// 页面显示
},
},
onHide
:
function
()
{
onHide
:
function
()
{
// 页面隐藏
// 页面隐藏
},
},
onUnload
:
function
()
{
onUnload
:
function
()
{
// 页面关闭
// 页面关闭
},
},
wxLogin
:
function
(
e
)
{
wxLogin
:
function
(
e
)
{
if
(
e
.
detail
.
userInfo
==
undefined
){
if
(
e
.
detail
.
userInfo
==
undefined
)
{
app
.
globalData
.
hasLogin
=
false
;
app
.
globalData
.
hasLogin
=
false
;
util
.
showErrorToast
(
'
微信登录失败
'
);
util
.
showErrorToast
(
'
微信登录失败
'
);
return
;
return
;
...
...
renard-wx/pages/auth/login/login.wxml
View file @
286c0ae7
renard-wx/pages/auth/login/login.wxss
View file @
286c0ae7
.form-box{
.form-box
{
width: 100%;
width: 100%;
height: auto;
height: auto;
overflow: hidden;
overflow: hidden;
...
@@ -7,14 +7,14 @@
...
@@ -7,14 +7,14 @@
background: #fff;
background: #fff;
}
}
.form-item{
.form-item
{
position: relative;
position: relative;
background: #fff;
background: #fff;
height: 96rpx;
height: 96rpx;
border-bottom: 1px solid #a78845;
border-bottom: 1px solid #a78845;
}
}
.form-item .username, .form-item .password, .form-item .code{
.form-item .username, .form-item .password, .form-item .code
{
position: absolute;
position: absolute;
top: 26rpx;
top: 26rpx;
left: 0;
left: 0;
...
@@ -26,26 +26,26 @@
...
@@ -26,26 +26,26 @@
font-size: 30rpx;
font-size: 30rpx;
}
}
.form-item-code{
.form-item-code
{
margin-top:32rpx;
margin-top:
32rpx;
height: auto;
height: auto;
overflow: hidden;
overflow: hidden;
width: 100%;
width: 100%;
}
}
.form-item-code .form-item{
.form-item-code .form-item
{
float: left;
float: left;
width: 350rpx;
width: 350rpx;
}
}
.form-item-code .code-img{
.form-item-code .code-img
{
float: right;
float: right;
margin-top: 4rpx;
margin-top: 4rpx;
height: 88rpx;
height: 88rpx;
width: 236rpx;
width: 236rpx;
}
}
.form-item .clear{
.form-item .clear
{
position: absolute;
position: absolute;
top: 26rpx;
top: 26rpx;
right: 18rpx;
right: 18rpx;
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
width: 44rpx;
width: 44rpx;
}
}
.login-btn{
.login-btn
{
margin: 60rpx 0 40rpx 0;
margin: 60rpx 0 40rpx 0;
height: 96rpx;
height: 96rpx;
line-height: 96rpx;
line-height: 96rpx;
...
@@ -67,13 +67,13 @@
...
@@ -67,13 +67,13 @@
border-radius: 6rpx;
border-radius: 6rpx;
}
}
.form-item-text{
.form-item-text
{
height: 35rpx;
height: 35rpx;
width: 100%;
width: 100%;
color: #a78845;
color: #a78845;
}
}
.form-item-text .register{
.form-item-text .register
{
display: block;
display: block;
height: 34rpx;
height: 34rpx;
float: left;
float: left;
...
@@ -81,7 +81,7 @@
...
@@ -81,7 +81,7 @@
color: #a78845;
color: #a78845;
}
}
.form-item-text .reset{
.form-item-text .reset
{
display: block;
display: block;
height: 34rpx;
height: 34rpx;
float: right;
float: right;
...
...
renard-wx/pages/brand/brand.js
View file @
286c0ae7
renard-wx/pages/brand/brand.wxml
View file @
286c0ae7
renard-wx/pages/brand/brand.wxss
View file @
286c0ae7
.brand-list .item{
.brand-list .item
{
display: block;
display: block;
width: 750rpx;
width: 750rpx;
height: 416rpx;
height: 416rpx;
...
@@ -6,32 +6,32 @@
...
@@ -6,32 +6,32 @@
margin-bottom: 4rpx;
margin-bottom: 4rpx;
}
}
.brand-list .item .img-bg{
.brand-list .item .img-bg
{
position: absolute;
position: absolute;
left:0;
left:
0;
top:0;
top:
0;
z-index: 0;
z-index: 0;
width: 750rpx;
width: 750rpx;
height: 417rpx;
height: 417rpx;
overflow: hidden;
overflow: hidden;
}
}
.brand-list .item .img-bg image{
.brand-list .item .img-bg image
{
width: 750rpx;
width: 750rpx;
height: 416rpx;
height: 416rpx;
}
}
.brand-list .item .txt-box{
.brand-list .item .txt-box
{
position: absolute;
position: absolute;
left:0;
left:
0;
top:0;
top:
0;
display: table;
display: table;
z-index: 0;
z-index: 0;
width: 750rpx;
width: 750rpx;
height: 417rpx;
height: 417rpx;
}
}
.brand-list .item .line{
.brand-list .item .line
{
display: table-cell;
display: table-cell;
vertical-align: middle;
vertical-align: middle;
text-align: center;
text-align: center;
...
@@ -39,14 +39,14 @@
...
@@ -39,14 +39,14 @@
line-height: 63rpx;
line-height: 63rpx;
}
}
.brand-list .item .line text{
.brand-list .item .line text
{
font-size: 35rpx;
font-size: 35rpx;
font-weight: 700;
font-weight: 700;
text-shadow: 1rpx 1rpx rgba(0,0,0,.32);
text-shadow: 1rpx 1rpx rgba(0,
0,
0,
0
.32);
color: #fff;
color: #fff;
}
}
.brand-list .item .line .s{
.brand-list .item .line .s
{
padding: 0 10rpx;
padding: 0 10rpx;
font-size: 40rpx;
font-size: 40rpx;
}
}
renard-wx/pages/brandDetail/brandDetail.js
View file @
286c0ae7
var
util
=
require
(
'
../../utils/util.js
'
);
var
util
=
require
(
'
../../utils/util.js
'
);
var
api
=
require
(
'
../../config/api.js
'
);
var
api
=
require
(
'
../../config/api.js
'
);
var
app
=
getApp
();
var
app
=
getApp
();
Page
({
Page
({
...
...
renard-wx/pages/brandDetail/brandDetail.json
View file @
286c0ae7
renard-wx/pages/brandDetail/brandDetail.wxml
View file @
286c0ae7
renard-wx/pages/brandDetail/brandDetail.wxss
View file @
286c0ae7
renard-wx/pages/cart/cart.js
View file @
286c0ae7
renard-wx/pages/cart/cart.json
View file @
286c0ae7
renard-wx/pages/cart/cart.wxml
View file @
286c0ae7
renard-wx/pages/cart/cart.wxss
View file @
286c0ae7
renard-wx/pages/catalog/catalog.js
View file @
286c0ae7
renard-wx/pages/catalog/catalog.wxss
View file @
286c0ae7
.HotName{
.HotName
{
font-size:80rpx;
font-size:
80rpx;
margin-left:40rpx;
margin-left:
40rpx;
color:#293539;
color:
#293539;
font-weight:300;
font-weight:
300;
position: relative;
position: relative;
}
}
.HotName text{
width:14rpx;
.HotName text {
height:14rpx;
width: 14rpx;
position:absolute;
height: 14rpx;
border:2px solid #a78845;
position: absolute;
border-radius:50%;
border: 2px solid #a78845;
}
border-radius: 50%;
.menu-box{
}
width:80%;
margin:0 auto;
.menu-box {
margin-top:40rpx;
width: 80%;
}
margin: 0 auto;
.menu-box-list{
margin-top: 40rpx;
text-align:center;
}
margin-bottom:30rpx;
}
.menu-box-list {
.menu-box-list .menu-list-title{
text-align: center;
color:#6a7275;
margin-bottom: 30rpx;
font-size:40rpx;
}
font-weight:300;
letter-spacing:20rpx;
.menu-box-list .menu-list-title {
color: #6a7275;
font-size: 40rpx;
font-weight: 300;
letter-spacing: 20rpx;
position: relative;
position: relative;
}
}
.menu-box-list .hover{
color:#a78845;
.menu-box-list .hover {
}
color: #a78845;
.menu-box-list .hover .l{
}
width:10rpx;
height:10rpx;
.menu-box-list .hover .l {
position:absolute;
width: 10rpx;
border:2rpx solid #a78845;
height: 10rpx;
border-radius:50%;
position: absolute;
margin-left:-38rpx;
border: 2rpx solid #a78845;
margin-top:30rpx;
border-radius: 50%;
}
margin-left: -38rpx;
.menu-box-list .hover .r{
margin-top: 30rpx;
width:10rpx;
}
height:10rpx;
position:absolute;
.menu-box-list .hover .r {
border:2rpx solid #a78845;
width: 10rpx;
border-radius:50%;
height: 10rpx;
margin-left:6rpx;
position: absolute;
margin-top:30rpx;
border: 2rpx solid #a78845;
}
border-radius: 50%;
.menu-list-pro{
margin-left: 6rpx;
margin-top: 30rpx;
}
.menu-list-pro {
overflow-x: scroll;
overflow-x: scroll;
margin-top: 40rpx;
margin-top: 40rpx;
white-space:nowrap;
white-space:
nowrap;
text-overflow:ellipsis;
text-overflow:
ellipsis;
height: auto;
height: auto;
width: 100%;
width: 100%;
overflow: hidden;
overflow: hidden;
...
@@ -70,8 +78,8 @@
...
@@ -70,8 +78,8 @@
.menu-list-pro .icon {
.menu-list-pro .icon {
height: 100rpx;
height: 100rpx;
width: 100rpx;
width: 100rpx;
border-radius:12rpx;
border-radius:
12rpx;
box-shadow:0px 4rpx 4rpx 0px #cfc9ca;
box-shadow:
0px 4rpx 4rpx 0px #cfc9ca;
}
}
.menu-list-pro .txt {
.menu-list-pro .txt {
...
@@ -115,7 +123,7 @@
...
@@ -115,7 +123,7 @@
font-size: 30rpx;
font-size: 30rpx;
}
}
/* .menu-list-pro image{
/* .menu-list-pro image{
height: 80px;
height: 80px;
width: 80px;
width: 80px;
margin-right: 34rpx;
margin-right: 34rpx;
...
...
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