Skip to content
GitLab
Commit 20b97ec8 authored by Junling Bu's avatar Junling Bu
Browse files

chore[litemall-wx]: 使用微信开发者工具的格式化代码

parent 822d5075
Show whitespace changes
Inline Side-by-side
litemall-wx/pages/cart/cart.wxss
View file @ 20b97ec8
......@@ -449,7 +449,7 @@ page {
border-bottom-right-radius: 50rpx;
letter-spacing: 3rpx;
/* background-image: linear-gradient(to right, #ff7701 100%); */
background-image: linear-gradient(to right, #AB956D 0%, #AB956D 100%);
background-image: linear-gradient(to right, #ab956d 0%, #ab956d 100%);
}
.action_btn_area .checkout {
......@@ -508,7 +508,7 @@ page {
border-top-right-radius: 50rpx;
border-bottom-right-radius: 50rpx;
letter-spacing: 3rpx;
background-image: linear-gradient(to right, #AB956D 0%, #AB956D 100%);
background-image: linear-gradient(to right, #ab956d 0%, #ab956d 100%);
/* background-image: linear-gradient(to right, #ff7701 0%, #fe4800 100%); */
}
......
litemall-wx/pages/catalog/catalog.wxss
View file @ 20b97ec8
......@@ -68,9 +68,9 @@ page {
}
.catalog .nav .item.active {
color: #AB956D;
color: #ab956d;
font-size: 36rpx;
border-left: 6rpx solid #AB956D;
border-left: 6rpx solid #ab956d;
}
.catalog .cate {
......
litemall-wx/pages/category/category.js
View file @ 20b97ec8
......@@ -13,7 +13,7 @@ Page({
page: 1,
size: 100
},
onLoad: function (options) {
onLoad: function(options) {
// 页面初始化 options为页面跳转所带来的参数
var that = this;
if (options.id) {
......@@ -23,7 +23,7 @@ Page({
}
wx.getSystemInfo({
success: function (res) {
success: function(res) {
that.setData({
scrollHeight: res.windowHeight
});
......@@ -34,10 +34,12 @@ Page({
this.getCategoryInfo();
},
getCategoryInfo: function () {
getCategoryInfo: function() {
let that = this;
util.request(api.GoodsCategory, { id: this.data.id })
.then(function (res) {
util.request(api.GoodsCategory, {
id: this.data.id
})
.then(function(res) {
if (res.errno == 0) {
that.setData({
......@@ -78,30 +80,34 @@ Page({
});
},
onReady: function () {
onReady: function() {
// 页面渲染完成
},
onShow: function () {
onShow: function() {
// 页面显示
console.log(1);
},
onHide: function () {
onHide: function() {
// 页面隐藏
},
getGoodsList: function () {
getGoodsList: function() {
var that = this;
util.request(api.GoodsList, {categoryId: that.data.id, page: that.data.page, size: that.data.size})
.then(function (res) {
util.request(api.GoodsList, {
categoryId: that.data.id,
page: that.data.page,
size: that.data.size
})
.then(function(res) {
that.setData({
goodsList: res.data.goodsList,
});
});
},
onUnload: function () {
onUnload: function() {
// 页面关闭
},
switchCate: function (event) {
switchCate: function(event) {
if (this.data.id == event.currentTarget.dataset.id) {
return false;
}
......
litemall-wx/pages/category/category.wxml
View file @ 20b97ec8
......@@ -14,7 +14,7 @@
<text class="desc">{{currentCategory.frontName}}</text>
</view>
<view class="b">
<navigator class="item {{(iindex + 1) % 2 == 0 ? 'item-b' : ''}}" url="/pages/goods/goods?id={{iitem.id}}" wx:for="{{goodsList}}" wx:key="id" wx:for-item="iitem" wx:for-index="iindex" >
<navigator class="item {{(iindex + 1) % 2 == 0 ? 'item-b' : ''}}" url="/pages/goods/goods?id={{iitem.id}}" wx:for="{{goodsList}}" wx:key="id" wx:for-item="iitem" wx:for-index="iindex">
<image class="img" src="{{iitem.picUrl}}" background-size="cover"></image>
<text class="name">{{iitem.name}}</text>
<text class="price">￥{{iitem.retailPrice}}</text>
......
litemall-wx/pages/category/category.wxss
View file @ 20b97ec8
.container{
.container {
background: #f9f9f9;
}
.cate-nav{
.cate-nav {
position: fixed;
left:0;
top:0;
left: 0;
top: 0;
z-index: 1000;
}
.cate-nav-body{
.cate-nav-body {
height: 84rpx;
white-space: nowrap;
background: #fff;
border-top: 1px solid rgba(0,0,0,.15);
border-top: 1px solid rgba(0, 0, 0, 0.15);
overflow: hidden;
}
.cate-nav .item{
.cate-nav .item {
display: inline-block;
height: 84rpx;
min-width: 130rpx;
padding: 0 15rpx;
}
.cate-nav .item .name{
.cate-nav .item .name {
display: block;
height: 84rpx;
padding: 0 20rpx;
......@@ -33,18 +34,18 @@
width: auto;
}
.cate-nav .item.active .name{
color: #AB956D;
border-bottom: 2px solid #AB956D;
.cate-nav .item.active .name {
color: #ab956d;
border-bottom: 2px solid #ab956d;
}
.cate-item{
.cate-item {
margin-top: 94rpx;
height: auto;
overflow: hidden;
}
.cate-item .h{
.cate-item .h {
height: 145rpx;
width: 750rpx;
display: flex;
......@@ -53,7 +54,7 @@
justify-content: center;
}
.cate-item .h .name{
.cate-item .h .name {
display: block;
height: 35rpx;
margin-bottom: 18rpx;
......@@ -61,21 +62,21 @@
color: #333;
}
.cate-item .h .desc{
.cate-item .h .desc {
display: block;
height: 24rpx;
font-size: 24rpx;
color: #999;
}
.cate-item .b{
.cate-item .b {
width: 750rpx;
padding: 0 6.25rpx;
height: auto;
overflow: hidden;
}
.cate-item .b .item{
.cate-item .b .item {
float: left;
background: #fff;
width: 365rpx;
......@@ -86,16 +87,16 @@
text-align: center;
}
.cate-item .b .item-b{
.cate-item .b .item-b {
margin-left: 6.25rpx;
}
.cate-item .item .img{
.cate-item .item .img {
width: 302rpx;
height: 302rpx;
}
.cate-item .item .name{
.cate-item .item .name {
display: block;
width: 365.625rpx;
height: 35rpx;
......@@ -107,11 +108,11 @@
color: #333;
}
.cate-item .item .price{
.cate-item .item .price {
display: block;
width: 365.625rpx;
height: 30rpx;
text-align: center;
font-size: 30rpx;
color: #AB956D;
color: #ab956d;
}
litemall-wx/pages/checkout/checkout.js
View file @ 20b97ec8
......@@ -59,7 +59,7 @@ Page({
url: '/pages/ucenter/address/address',
})
},
bindMessageInput: function (e) {
bindMessageInput: function(e) {
this.setData({
message: e.detail.value
});
......
litemall-wx/pages/checkout/checkout.wxss
View file @ 20b97ec8
page{
page {
height: 100%;
background: #f4f4f4;
}
.address-box{
.address-box {
width: 100%;
height: 166.55rpx;
background: url('http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/address-bg-bd30f2bfeb.png') 0 0 repeat-x;
......@@ -12,24 +12,24 @@ page{
padding-top: 10.5rpx;
}
.address-item{
.address-item {
display: flex;
height: 155.55rpx;
background: #fff;
padding: 41.6rpx 0 41.6rpx 31.25rpx;
}
.address-item.address-empty{
.address-item.address-empty {
line-height: 75rpx;
text-align: center;
}
.address-box .l{
.address-box .l {
width: 125rpx;
height: 100%;
}
.address-box .l .name{
.address-box .l .name {
margin-left: 6.25rpx;
margin-top: -7.25rpx;
display: block;
......@@ -39,10 +39,9 @@ page{
font-size: 30rpx;
color: #333;
margin-bottom: 5rpx;
}
.address-box .l .default{
.address-box .l .default {
margin-left: 6.25rpx;
display: block;
width: 62rpx;
......@@ -55,30 +54,30 @@ page{
color: #b4282d;
}
.address-box .m{
.address-box .m {
flex: 1;
height: 72.25rpx;
color: #999;
}
.address-box .mobile{
.address-box .mobile {
display: block;
height: 29rpx;
line-height: 29rpx;
margin-bottom: 6.25rpx;
font-size: 30rpx;
color:#333;
color: #333;
}
.address-box .address{
.address-box .address {
display: block;
height: 37.5rpx;
line-height: 37.5rpx;
font-size: 25rpx;
color:#666;
color: #666;
}
.address-box .r{
.address-box .r {
width: 77rpx;
height: 77rpx;
display: flex;
......@@ -86,19 +85,19 @@ page{
align-items: center;
}
.address-box .r image{
.address-box .r image {
width: 52.078rpx;
height: 52.078rpx;
}
.coupon-box{
.coupon-box {
width: 100%;
height: auto;
overflow: hidden;
background: #fff;
}
.coupon-box .coupon-item{
.coupon-box .coupon-item {
width: 100%;
height: 108.3rpx;
overflow: hidden;
......@@ -107,26 +106,26 @@ page{
padding-left: 31.25rpx;
}
.coupon-box .l{
.coupon-box .l {
flex: 1;
height: 43rpx;
line-height: 43rpx;
padding-top: 35rpx;
}
.coupon-box .l .name{
.coupon-box .l .name {
float: left;
font-size: 30rpx;
color: #666;
}
.coupon-box .l .txt{
.coupon-box .l .txt {
float: right;
font-size: 30rpx;
color: #666;
}
.coupon-box .r{
.coupon-box .r {
margin-top: 15.5rpx;
width: 77rpx;
height: 77rpx;
......@@ -135,12 +134,12 @@ page{
align-items: center;
}
.coupon-box .r image{
.coupon-box .r image {
width: 52.078rpx;
height: 52.078rpx;
}
.message-box{
.message-box {
margin-top: 20rpx;
width: 100%;
height: auto;
......@@ -148,7 +147,7 @@ page{
background: #fff;
}
.message-box .message-item{
.message-box .message-item {
height: 52.078rpx;
overflow: hidden;
background: #fff;
......@@ -158,7 +157,7 @@ page{
padding-top: 26rpx;
}
.order-box{
.order-box {
margin-top: 20rpx;
width: 100%;
height: auto;
......@@ -166,7 +165,7 @@ page{
background: #fff;
}
.order-box .order-item{
.order-box .order-item {
height: 104.3rpx;
overflow: hidden;
background: #fff;
......@@ -177,7 +176,7 @@ page{
border-bottom: 1px solid #d9d9d9;
}
.order-box .order-item .l{
.order-box .order-item .l {
float: left;
height: 52rpx;
width: 50%;
......@@ -185,7 +184,7 @@ page{
overflow: hidden;
}
.order-box .order-item .r{
.order-box .order-item .r {
float: right;
text-align: right;
width: 50%;
......@@ -194,11 +193,11 @@ page{
overflow: hidden;
}
.order-box .order-item.no-border{
.order-box .order-item.no-border {
border-bottom: none;
}
.goods-items{
.goods-items {
margin-top: 20rpx;
width: 100%;
height: auto;
......@@ -208,42 +207,41 @@ page{
margin-bottom: 120rpx;
}
.goods-items .item{
.goods-items .item {
height: 192rpx;
padding-right: 31.25rpx;
display: flex;
align-items: center;
border-bottom: 1px solid rgba(0,0,0,0.15);
border-bottom: 1px solid rgba(0, 0, 0, 0.15);
}
.goods-items .item.no-border{
.goods-items .item.no-border {
border-bottom: none;
}
.goods-items .item:last-child{
.goods-items .item:last-child {
border-bottom: none;
}
.goods-items .img{
.goods-items .img {
height: 145.83rpx;
width: 145.83rpx;
background-color: #f4f4f4;
margin-right: 20rpx;
}
.goods-items .img image{
.goods-items .img image {
height: 145.83rpx;
width: 145.83rpx;
}
.goods-items .info{
.goods-items .info {
flex: 1;
height: 145.83rpx;
padding-top: 5rpx;
}
.goods-items .t{
.goods-items .t {
height: 33rpx;
line-height: 33rpx;
margin-bottom: 10rpx;
......@@ -252,12 +250,12 @@ page{
color: #333;
}
.goods-items .t .name{
.goods-items .t .name {
display: block;
float: left;
}
.goods-items .t .number{
.goods-items .t .number {
display: block;
float: right;
text-align: right;
......@@ -280,16 +278,16 @@ page{
color: #333;
}
.order-total{
.order-total {
position: fixed;
left:0;
left: 0;
bottom: 0;
height: 100rpx;
width: 100%;
display: flex;
}
.order-total .l{
.order-total .l {
flex: 1;
height: 100rpx;
line-height: 100rpx;
......@@ -297,11 +295,11 @@ page{
background: #fff;
font-size: 33rpx;
padding-left: 31.25rpx;
border-top: 1rpx solid rgba(0,0,0,0.2);
border-bottom: 1rpx solid rgba(0,0,0,0.2);
border-top: 1rpx solid rgba(0, 0, 0, 0.2);
border-bottom: 1rpx solid rgba(0, 0, 0, 0.2);
}
.order-total .r{
.order-total .r {
width: 233rpx;
height: 100rpx;
background: #b4282d;
......
litemall-wx/pages/comment/comment.js
View file @ 20b97ec8
......@@ -16,9 +16,12 @@ Page({
picPage: 1,
size: 20
},
getCommentCount: function () {
getCommentCount: function() {
let that = this;
util.request(api.CommentCount, { valueId: that.data.valueId, type: that.data.type}).then(function (res) {
util.request(api.CommentCount, {
valueId: that.data.valueId,
type: that.data.type
}).then(function(res) {
if (res.errno === 0) {
that.setData({
allCount: res.data.allCount,
......@@ -27,7 +30,7 @@ Page({
}
});
},
getCommentList: function(){
getCommentList: function() {
let that = this;
util.request(api.CommentList, {
valueId: that.data.valueId,
......@@ -35,7 +38,7 @@ Page({
size: that.data.size,
page: (that.data.showType == 0 ? that.data.allPage : that.data.picPage),
showType: that.data.showType
}).then(function (res) {
}).then(function(res) {
if (res.errno === 0) {
if (that.data.showType == 0) {
......@@ -54,7 +57,7 @@ Page({
}
});
},
onLoad: function (options) {
onLoad: function(options) {
// 页面初始化 options为页面跳转所带来的参数
this.setData({
type: options.type,
......@@ -63,23 +66,23 @@ Page({
this.getCommentCount();
this.getCommentList();
},
onReady: function () {
onReady: function() {
// 页面渲染完成
},
onShow: function () {
onShow: function() {
// 页面显示
},
onHide: function () {
onHide: function() {
// 页面隐藏
},
onUnload: function () {
onUnload: function() {
// 页面关闭
},
switchTab: function () {
switchTab: function() {
let that = this;
if (that.data.showType == 0) {
that.setData({
......@@ -98,16 +101,16 @@ Page({
}
this.getCommentList();
},
onReachBottom: function(){
onReachBottom: function() {
console.log('onPullDownRefresh');
if ( this.data.showType == 0) {
if (this.data.showType == 0) {
if (this.data.allCount / this.data.size < this.data.allPage) {
return false;
}
this.setData({
'allPage' : this.data.allPage + 1
'allPage': this.data.allPage + 1
});
} else {
if (this.data.hasPicCount / this.data.size < this.data.picPage) {
......
litemall-wx/pages/comment/comment.wxss
View file @ 20b97ec8
.comments{
.comments {
width: 100%;
height: auto;
padding-left:30rpx;
padding-left: 30rpx;
background: #fff;
margin: 20rpx 0;
}
.comments .h{
.comments .h {
position: fixed;
left:0;
top:0;
left: 0;
top: 0;
z-index: 1000;
width: 100%;
display: flex;
background: #fff;
height: 84rpx;
border-bottom: 1px solid rgba(0,0,0,.15);
border-bottom: 1px solid rgba(0, 0, 0, 0.15);
}
.comments .h .item{
.comments .h .item {
display: inline-block;
height: 82rpx;
width: 50%;
......@@ -26,7 +26,7 @@
text-align: center;
}
.comments .h .item .txt{
.comments .h .item .txt {
display: inline-block;
height: 82rpx;
padding: 0 20rpx;
......@@ -36,22 +36,22 @@
width: 170rpx;
}
.comments .h .item.active .txt{
.comments .h .item.active .txt {
color: #ab2b2b;
border-bottom: 4rpx solid #ab2b2b;
}
.comments .b{
.comments .b {
margin-top: 85rpx;
height: auto;
width: 720rpx;
}
.comments .b.no-h{
.comments .b.no-h {
margin-top: 0;
}
.comments .item{
.comments .item {
height: auto;
width: 720rpx;
overflow: hidden;
......@@ -59,13 +59,13 @@
padding-bottom: 25rpx;
}
.comments .info{
.comments .info {
height: 127rpx;
width: 100%;
padding: 33rpx 0 27rpx 0;
}
.comments .user{
.comments .user {
float: left;
width: auto;
height: 67rpx;
......@@ -73,7 +73,7 @@
font-size: 0;
}
.comments .user image{
.comments .user image {
float: left;
width: 67rpx;
height: 67rpx;
......@@ -81,7 +81,7 @@
border-radius: 50%;
}
.comments .user text{
.comments .user text {
display: inline-block;
width: auto;
height: 66rpx;
......@@ -90,7 +90,7 @@
line-height: 66rpx;
}
.comments .time{
.comments .time {
display: block;
float: right;
width: auto;
......@@ -101,7 +101,7 @@
margin-right: 30rpx;
}
.comments .comment{
.comments .comment {
width: 720rpx;
padding-right: 30rpx;
line-height: 45.8rpx;
......@@ -109,47 +109,46 @@
margin-bottom: 16rpx;
}
.comments .imgs{
.comments .imgs {
width: 720rpx;
height: 150rpx;
margin-bottom: 25rpx;
}
.comments .imgs .img{
.comments .imgs .img {
height: 150rpx;
width: 150rpx;
margin-right: 28rpx;
}
.comments .spec{
.comments .spec {
width: 720rpx;
height: 25rpx;
font-size: 24rpx;
color: #999;
}
.comments .spec .item{
.comments .spec .item {
color: #7f7f7f;
font-size: 25rpx;
}
.comments .customer-service{
.comments .customer-service {
width: 690rpx;
height: auto;
overflow: hidden;
margin-top: 23rpx;
background: rgba(0,0,0,.03);
background: rgba(0, 0, 0, 0.03);
padding: 21rpx;
}
.comments .customer-service .u{
.comments .customer-service .u {
font-size: 24rpx;
color: #333;
line-height: 37.5rpx;
}
.comments .customer-service .c{
.comments .customer-service .c {
font-size: 24rpx;
color: #999;
line-height: 37.5rpx;
......
litemall-wx/pages/commentPost/commentPost.js
View file @ 20b97ec8
......@@ -16,7 +16,7 @@ Page({
picUrls: [],
files: []
},
chooseImage: function (e) {
chooseImage: function(e) {
if (this.data.files.length >= 5) {
util.showErrorToast('只能上传五张图片')
return false;
......@@ -27,7 +27,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)
});
......@@ -35,13 +35,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
......@@ -52,7 +52,7 @@ Page({
})
}
},
fail: function (e) {
fail: function(e) {
wx.showModal({
title: '错误',
content: '上传失败',
......@@ -68,28 +68,24 @@ Page({
})
},
previewImage: function (e) {
previewImage: function(e) {
wx.previewImage({
current: e.currentTarget.id, // 当前显示图片的http链接
urls: this.data.files // 需要预览的图片http链接列表
})
},
selectRater: function (e) {
selectRater: function(e) {
var star = e.currentTarget.dataset.star + 1;
var starText;
if (star == 1) {
starText = '很差';
}
else if (star == 2) {
} else if (star == 2) {
starText = '不太满意';
}
else if (star == 3) {
} else if (star == 3) {
starText = '满意';
}
else if (star == 4) {
} else if (star == 4) {
starText = '比较满意';
}
else {
} else {
starText = '十分满意'
}
this.setData({
......@@ -98,7 +94,7 @@ Page({
})
},
onLoad: function (options) {
onLoad: function(options) {
var that = this;
that.setData({
orderId: options.orderId,
......@@ -107,11 +103,12 @@ Page({
});
this.getOrderGoods();
},
getOrderGoods: function () {
getOrderGoods: function() {
let that = this;
util.request(api.OrderGoods, {
orderId: that.data.orderId, goodsId: that.data.valueId
}).then(function (res) {
orderId: that.data.orderId,
goodsId: that.data.valueId
}).then(function(res) {
if (res.errno === 0) {
that.setData({
orderGoods: res.data,
......@@ -119,10 +116,10 @@ Page({
}
});
},
onClose: function () {
onClose: function() {
wx.navigateBack();
},
onPost: function () {
onPost: function() {
let that = this;
if (!this.data.content) {
......@@ -136,11 +133,11 @@ Page({
star: that.data.star,
hasPicture: that.data.hasPicture,
picUrls: that.data.picUrls
}, 'POST').then(function (res) {
}, 'POST').then(function(res) {
if (res.errno === 0) {
wx.showToast({
title: '评论成功',
complete: function () {
complete: function() {
wx.switchTab({
url: '/pages/ucenter/index/index'
})
......@@ -162,18 +159,18 @@ Page({
content: event.detail.value,
})
},
onReady: function () {
onReady: function() {
},
onShow: function () {
onShow: function() {
// 页面显示
},
onHide: function () {
onHide: function() {
// 页面隐藏
},
onUnload: function () {
onUnload: function() {
// 页面关闭
}
......
litemall-wx/pages/goods/goods.wxss
View file @ 20b97ec8
......@@ -823,7 +823,6 @@
line-height: 65rpx;
}
.contact {
height: 100rpx;
width: 100rpx;
......@@ -932,6 +931,7 @@
height: 128rpx;
margin-top: 0rpx;
}
.sharebtn_text {
/* border: 1px solid #757575; */
width: 150rpx;
......@@ -941,6 +941,7 @@
font-size: 20rpx;
color: #555;
}
.separate {
background: #e0e3da;
width: 100%;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment