Skip to content
GitLab
Commit 286c0ae7 authored by Junling Bu's avatar Junling Bu
Browse files

chore[renard-wx]: 基于微信开发者工具的格式化代码

parent 20b97ec8
Show whitespace changes
Inline Side-by-side
renard-wx/pages/category/category.wxss
View file @ 286c0ae7
.container{ .container {
background: #fff; background: #fff;
} }
.cate-nav{
.cate-nav {
position: fixed; position: fixed;
left:0; left: 0;
top:0; top: 0;
z-index: 1000; z-index: 1000;
} }
.cate-nav-body{ .cate-nav-body {
height: 84rpx; height: 84rpx;
white-space: nowrap; white-space: nowrap;
background: #fff; background: #fff;
border-top: 1px solid rgba(0,0,0,.15); border-top: 1px solid rgba(0, 0, 0, 0.15);
overflow: hidden; overflow: hidden;
} }
.cate-nav .item{ .cate-nav .item {
display: inline-block; display: inline-block;
height: 84rpx; height: 84rpx;
min-width: 130rpx; min-width: 130rpx;
padding: 0 15rpx; padding: 0 15rpx;
} }
.cate-nav .item .name{ .cate-nav .item .name {
display: block; display: block;
height: 84rpx; height: 84rpx;
padding: 0 20rpx; padding: 0 20rpx;
...@@ -33,18 +34,18 @@ ...@@ -33,18 +34,18 @@
width: auto; width: auto;
} }
.cate-nav .item.active .name{ .cate-nav .item.active .name {
color: #a78845; color: #a78845;
border-bottom: 2px solid #a78845; border-bottom: 2px solid #a78845;
} }
.cate-item{ .cate-item {
margin-top: 94rpx; margin-top: 94rpx;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.cate-item .h{ .cate-item .h {
height: 145rpx; height: 145rpx;
width: 750rpx; width: 750rpx;
display: flex; display: flex;
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
justify-content: center; justify-content: center;
} }
.cate-item .h .name{ .cate-item .h .name {
display: block; display: block;
height: 35rpx; height: 35rpx;
margin-bottom: 18rpx; margin-bottom: 18rpx;
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
color: #333; color: #333;
} }
.cate-item .h .desc{ .cate-item .h .desc {
display: block; display: block;
height: 24rpx; height: 24rpx;
font-size: 24rpx; font-size: 24rpx;
......
renard-wx/pages/comment/comment.js
View file @ 286c0ae7
...@@ -16,9 +16,12 @@ Page({ ...@@ -16,9 +16,12 @@ Page({
picPage: 1, picPage: 1,
size: 20 size: 20
}, },
getCommentCount: function () { getCommentCount: function() {
let that = this; 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) { if (res.errno === 0) {
that.setData({ that.setData({
allCount: res.data.allCount, allCount: res.data.allCount,
...@@ -27,7 +30,7 @@ Page({ ...@@ -27,7 +30,7 @@ Page({
} }
}); });
}, },
getCommentList: function(){ getCommentList: function() {
let that = this; let that = this;
util.request(api.CommentList, { util.request(api.CommentList, {
valueId: that.data.valueId, valueId: that.data.valueId,
...@@ -35,7 +38,7 @@ Page({ ...@@ -35,7 +38,7 @@ Page({
size: that.data.size, size: that.data.size,
page: (that.data.showType == 0 ? that.data.allPage : that.data.picPage), page: (that.data.showType == 0 ? that.data.allPage : that.data.picPage),
showType: that.data.showType showType: that.data.showType
}).then(function (res) { }).then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
if (that.data.showType == 0) { if (that.data.showType == 0) {
...@@ -54,7 +57,7 @@ Page({ ...@@ -54,7 +57,7 @@ Page({
} }
}); });
}, },
onLoad: function (options) { onLoad: function(options) {
// 页面初始化 options为页面跳转所带来的参数 // 页面初始化 options为页面跳转所带来的参数
this.setData({ this.setData({
type: options.type, type: options.type,
...@@ -63,23 +66,23 @@ Page({ ...@@ -63,23 +66,23 @@ Page({
this.getCommentCount(); this.getCommentCount();
this.getCommentList(); 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; let that = this;
if (that.data.showType == 0) { if (that.data.showType == 0) {
that.setData({ that.setData({
...@@ -98,16 +101,16 @@ Page({ ...@@ -98,16 +101,16 @@ Page({
} }
this.getCommentList(); this.getCommentList();
}, },
onReachBottom: function(){ onReachBottom: function() {
console.log('onPullDownRefresh'); console.log('onPullDownRefresh');
if ( this.data.showType == 0) { if (this.data.showType == 0) {
if (this.data.allCount / this.data.size < this.data.allPage) { if (this.data.allCount / this.data.size < this.data.allPage) {
return false; return false;
} }
this.setData({ this.setData({
'allPage' : this.data.allPage + 1 'allPage': this.data.allPage + 1
}); });
} else { } else {
if (this.data.hasPicCount / this.data.size < this.data.picPage) { if (this.data.hasPicCount / this.data.size < this.data.picPage) {
......
renard-wx/pages/comment/comment.wxss
View file @ 286c0ae7
.comments{ .comments {
width: 100%; width: 100%;
height: auto; height: auto;
padding-left:30rpx; padding-left: 30rpx;
background: #fff; background: #fff;
margin: 20rpx 0; margin: 20rpx 0;
} }
.comments .h{ .comments .h {
position: fixed; position: fixed;
left:0; left: 0;
top:0; top: 0;
z-index: 1000; z-index: 1000;
width: 100%; width: 100%;
display: flex; display: flex;
background: #fff; background: #fff;
height: 84rpx; 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; display: inline-block;
height: 82rpx; height: 82rpx;
width: 50%; width: 50%;
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
text-align: center; text-align: center;
} }
.comments .h .item .txt{ .comments .h .item .txt {
display: inline-block; display: inline-block;
height: 82rpx; height: 82rpx;
padding: 0 20rpx; padding: 0 20rpx;
...@@ -36,22 +36,22 @@ ...@@ -36,22 +36,22 @@
width: 170rpx; width: 170rpx;
} }
.comments .h .item.active .txt{ .comments .h .item.active .txt {
color: #ab2b2b; color: #ab2b2b;
border-bottom: 4rpx solid #ab2b2b; border-bottom: 4rpx solid #ab2b2b;
} }
.comments .b{ .comments .b {
margin-top: 85rpx; margin-top: 85rpx;
height: auto; height: auto;
width: 720rpx; width: 720rpx;
} }
.comments .b.no-h{ .comments .b.no-h {
margin-top: 0; margin-top: 0;
} }
.comments .item{ .comments .item {
height: auto; height: auto;
width: 720rpx; width: 720rpx;
overflow: hidden; overflow: hidden;
...@@ -59,13 +59,13 @@ ...@@ -59,13 +59,13 @@
padding-bottom: 25rpx; padding-bottom: 25rpx;
} }
.comments .info{ .comments .info {
height: 127rpx; height: 127rpx;
width: 100%; width: 100%;
padding: 33rpx 0 27rpx 0; padding: 33rpx 0 27rpx 0;
} }
.comments .user{ .comments .user {
float: left; float: left;
width: auto; width: auto;
height: 67rpx; height: 67rpx;
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
font-size: 0; font-size: 0;
} }
.comments .user image{ .comments .user image {
float: left; float: left;
width: 67rpx; width: 67rpx;
height: 67rpx; height: 67rpx;
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
border-radius: 50%; border-radius: 50%;
} }
.comments .user text{ .comments .user text {
display: inline-block; display: inline-block;
width: auto; width: auto;
height: 66rpx; height: 66rpx;
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
line-height: 66rpx; line-height: 66rpx;
} }
.comments .time{ .comments .time {
display: block; display: block;
float: right; float: right;
width: auto; width: auto;
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
margin-right: 30rpx; margin-right: 30rpx;
} }
.comments .comment{ .comments .comment {
width: 720rpx; width: 720rpx;
padding-right: 30rpx; padding-right: 30rpx;
line-height: 45.8rpx; line-height: 45.8rpx;
...@@ -109,47 +109,46 @@ ...@@ -109,47 +109,46 @@
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.comments .imgs{ .comments .imgs {
width: 720rpx; width: 720rpx;
height: 150rpx; height: 150rpx;
margin-bottom: 25rpx; margin-bottom: 25rpx;
} }
.comments .imgs .img{ .comments .imgs .img {
height: 150rpx; height: 150rpx;
width: 150rpx; width: 150rpx;
margin-right: 28rpx; margin-right: 28rpx;
} }
.comments .spec{ .comments .spec {
width: 720rpx; width: 720rpx;
height: 25rpx; height: 25rpx;
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
} }
.comments .spec .item{ .comments .spec .item {
color: #7f7f7f; color: #7f7f7f;
font-size: 25rpx; font-size: 25rpx;
} }
.comments .customer-service{ .comments .customer-service {
width: 690rpx; width: 690rpx;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
margin-top: 23rpx; margin-top: 23rpx;
background: rgba(0,0,0,.03); background: rgba(0, 0, 0, 0.03);
padding: 21rpx; padding: 21rpx;
} }
.comments .customer-service .u {
.comments .customer-service .u{
font-size: 24rpx; font-size: 24rpx;
color: #333; color: #333;
line-height: 37.5rpx; line-height: 37.5rpx;
} }
.comments .customer-service .c{ .comments .customer-service .c {
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
line-height: 37.5rpx; line-height: 37.5rpx;
......
renard-wx/pages/commentPost/commentPost.js
View file @ 286c0ae7
...@@ -16,7 +16,7 @@ Page({ ...@@ -16,7 +16,7 @@ Page({
picUrls: [], picUrls: [],
files: [] files: []
}, },
chooseImage: function (e) { chooseImage: function(e) {
if (this.data.files.length >= 5) { if (this.data.files.length >= 5) {
util.showErrorToast('只能上传五张图片') util.showErrorToast('只能上传五张图片')
return false; return false;
...@@ -27,7 +27,7 @@ Page({ ...@@ -27,7 +27,7 @@ Page({
count: 1, count: 1,
sizeType: ['original', 'compressed'], sizeType: ['original', 'compressed'],
sourceType: ['album', 'camera'], sourceType: ['album', 'camera'],
success: function (res) { success: function(res) {
that.setData({ that.setData({
files: that.data.files.concat(res.tempFilePaths) files: that.data.files.concat(res.tempFilePaths)
}); });
...@@ -35,13 +35,13 @@ Page({ ...@@ -35,13 +35,13 @@ Page({
} }
}) })
}, },
upload: function (res) { upload: function(res) {
var that = this; var that = this;
const uploadTask = wx.uploadFile({ const uploadTask = wx.uploadFile({
url: api.StorageUpload, url: api.StorageUpload,
filePath: res.tempFilePaths[0], filePath: res.tempFilePaths[0],
name: 'file', name: 'file',
success: function (res) { success: function(res) {
var _res = JSON.parse(res.data); var _res = JSON.parse(res.data);
if (_res.errno === 0) { if (_res.errno === 0) {
var url = _res.data.url var url = _res.data.url
...@@ -52,7 +52,7 @@ Page({ ...@@ -52,7 +52,7 @@ Page({
}) })
} }
}, },
fail: function (e) { fail: function(e) {
wx.showModal({ wx.showModal({
title: '错误', title: '错误',
content: '上传失败', content: '上传失败',
...@@ -68,28 +68,24 @@ Page({ ...@@ -68,28 +68,24 @@ Page({
}) })
}, },
previewImage: function (e) { previewImage: function(e) {
wx.previewImage({ wx.previewImage({
current: e.currentTarget.id, // 当前显示图片的http链接 current: e.currentTarget.id, // 当前显示图片的http链接
urls: this.data.files // 需要预览的图片http链接列表 urls: this.data.files // 需要预览的图片http链接列表
}) })
}, },
selectRater: function (e) { selectRater: function(e) {
var star = e.currentTarget.dataset.star + 1; var star = e.currentTarget.dataset.star + 1;
var starText; var starText;
if (star == 1) { if (star == 1) {
starText = '很差'; starText = '很差';
} } else if (star == 2) {
else if (star == 2) {
starText = '不太满意'; starText = '不太满意';
} } else if (star == 3) {
else if (star == 3) {
starText = '满意'; starText = '满意';
} } else if (star == 4) {
else if (star == 4) {
starText = '比较满意'; starText = '比较满意';
} } else {
else {
starText = '十分满意' starText = '十分满意'
} }
this.setData({ this.setData({
...@@ -98,7 +94,7 @@ Page({ ...@@ -98,7 +94,7 @@ Page({
}) })
}, },
onLoad: function (options) { onLoad: function(options) {
var that = this; var that = this;
that.setData({ that.setData({
orderId: options.orderId, orderId: options.orderId,
...@@ -107,11 +103,12 @@ Page({ ...@@ -107,11 +103,12 @@ Page({
}); });
this.getOrderGoods(); this.getOrderGoods();
}, },
getOrderGoods: function () { getOrderGoods: function() {
let that = this; let that = this;
util.request(api.OrderGoods, { util.request(api.OrderGoods, {
orderId: that.data.orderId, goodsId: that.data.valueId orderId: that.data.orderId,
}).then(function (res) { goodsId: that.data.valueId
}).then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
that.setData({ that.setData({
orderGoods: res.data, orderGoods: res.data,
...@@ -119,10 +116,10 @@ Page({ ...@@ -119,10 +116,10 @@ Page({
} }
}); });
}, },
onClose: function () { onClose: function() {
wx.navigateBack(); wx.navigateBack();
}, },
onPost: function () { onPost: function() {
let that = this; let that = this;
if (!this.data.content) { if (!this.data.content) {
...@@ -137,11 +134,11 @@ Page({ ...@@ -137,11 +134,11 @@ Page({
star: that.data.star, star: that.data.star,
hasPicture: that.data.hasPicture, hasPicture: that.data.hasPicture,
picUrls: that.data.picUrls picUrls: that.data.picUrls
}, 'POST').then(function (res) { }, 'POST').then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
wx.showToast({ wx.showToast({
title: '评论成功', title: '评论成功',
complete: function () { complete: function() {
wx.navigateBack(); wx.navigateBack();
} }
}) })
...@@ -161,18 +158,18 @@ Page({ ...@@ -161,18 +158,18 @@ Page({
content: event.detail.value, content: event.detail.value,
}) })
}, },
onReady: function () { onReady: function() {
}, },
onShow: function () { onShow: function() {
// 页面显示 // 页面显示
}, },
onHide: function () { onHide: function() {
// 页面隐藏 // 页面隐藏
}, },
onUnload: function () { onUnload: function() {
// 页面关闭 // 页面关闭
} }
......
renard-wx/pages/goods/goods.js
View file @ 286c0ae7
...@@ -622,6 +622,5 @@ Page({ ...@@ -622,6 +622,5 @@ Page({
wx.stopPullDownRefresh() //停止下拉刷新 wx.stopPullDownRefresh() //停止下拉刷新
}, },
//根据已选的值，计算其它值的状态 //根据已选的值，计算其它值的状态
setSpecValueStatus: function() { setSpecValueStatus: function() {},
},
}) })
\ No newline at end of file
renard-wx/pages/goods/goods.json
View file @ 286c0ae7
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
"usingComponents": { "usingComponents": {
"sharePop": "/components/sharePop/sharePop", "sharePop": "/components/sharePop/sharePop",
"goodList": "/components/goodList/goodList", "goodList": "/components/goodList/goodList",
"van-notify": "../../components/notify/index" "van-notify": "/components/notify/index"
} }
} }
\ No newline at end of file
renard-wx/pages/goods/goods.wxml
View file @ 286c0ae7
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="bottom-btn"> <view class="bottom-btn">
<view class="l l-collect" bindtap="showShare" wx:if="{{!isGroupon}}"> <view class="l l-collect" bindtap="showShare" wx:if="{{!isGroupon}}">
<image class="icon" src="../../images/goods-share.png"/> <image class="icon" src="../../images/goods-share.png" />
</view> </view>
<view class="l l-cart" wx:if="{{!isGroupon}}"> <view class="l l-cart" wx:if="{{!isGroupon}}">
<view class="box"> <view class="box">
......
renard-wx/pages/groupon/grouponList/grouponList.js
View file @ 286c0ae7
...@@ -20,59 +20,59 @@ Page({ ...@@ -20,59 +20,59 @@ Page({
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function(options) {
this.getGrouponList(); this.getGrouponList();
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
onReady: function () { onReady: function() {
}, },
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function() {
}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
onHide: function () { onHide: function() {
}, },
/** /**
* 生命周期函数--监听页面卸载 * 生命周期函数--监听页面卸载
*/ */
onUnload: function () { onUnload: function() {
}, },
/** /**
* 页面相关事件处理函数--监听用户下拉动作 * 页面相关事件处理函数--监听用户下拉动作
*/ */
onPullDownRefresh: function () { onPullDownRefresh: function() {
}, },
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom: function () { onReachBottom: function() {
}, },
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
onShareAppMessage: function () { onShareAppMessage: function() {
}, },
getGrouponList: function () { getGrouponList: function() {
let that = this; let that = this;
that.setData({ that.setData({
...@@ -87,7 +87,10 @@ Page({ ...@@ -87,7 +87,10 @@ Page({
duration: 2000 duration: 2000
}); });
util.request(api.GroupOnList, { page: that.data.page, size: that.data.size }).then(function (res) { util.request(api.GroupOnList, {
page: that.data.page,
size: that.data.size
}).then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
that.setData({ that.setData({
...@@ -101,7 +104,7 @@ Page({ ...@@ -101,7 +104,7 @@ Page({
}); });
}, },
nextPage: function (event) { nextPage: function(event) {
var that = this; var that = this;
if (this.data.page > that.data.count / that.data.size) { if (this.data.page > that.data.count / that.data.size) {
return true; return true;
...@@ -115,7 +118,7 @@ Page({ ...@@ -115,7 +118,7 @@ Page({
this.getTopic(); this.getTopic();
}, },
prevPage: function (event) { prevPage: function(event) {
if (this.data.page <= 1) { if (this.data.page <= 1) {
return false; return false;
} }
......
renard-wx/pages/groupon/grouponList/grouponList.json
View file @ 286c0ae7
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
"navigationBarTitleText": "团购专区", "navigationBarTitleText": "团购专区",
"usingComponents": { "usingComponents": {
"zan-capsule": "/components/capsule/index" "zan-capsule": "/components/capsule/index"
} }
} }
\ No newline at end of file
renard-wx/pages/groupon/grouponList/grouponList.wxss
View file @ 286c0ae7
page ,.container{ page, .container {
width: 750rpx; width: 750rpx;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
background: #f4f4f4; background: #f4f4f4;
} }
.groupon-list{
.groupon-list {
width: 750rpx; width: 750rpx;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
...@@ -74,7 +75,7 @@ page ,.container{ ...@@ -74,7 +75,7 @@ page ,.container{
.groupon-list .price { .groupon-list .price {
width: 476rpx; width: 476rpx;
display: flex; display: flex;
color: #AB956D; color: #ab956d;
line-height: 50rpx; line-height: 50rpx;
font-size: 33rpx; font-size: 33rpx;
} }
...@@ -91,14 +92,14 @@ page ,.container{ ...@@ -91,14 +92,14 @@ page ,.container{
color: #a78845; color: #a78845;
} }
.page{ .page {
width: 750rpx; width: 750rpx;
height: 108rpx; height: 108rpx;
background: #fff; background: #fff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.page view{ .page view {
height: 108rpx; height: 108rpx;
width: 50%; width: 50%;
float: left; float: left;
...@@ -108,10 +109,10 @@ page ,.container{ ...@@ -108,10 +109,10 @@ page ,.container{
line-height: 108rpx; line-height: 108rpx;
} }
.page .prev{ .page .prev {
border-right: 1px solid #D9D9D9; border-right: 1px solid #d9d9d9;
} }
.page .disabled{ .page .disabled {
color: #ccc; color: #ccc;
} }
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