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

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

parent 822d5075
Hide whitespace changes
Inline Side-by-side
litemall-wx/pages/ucenter/collect/collect.wxss
View file @ 20b97ec8
page{ page {
background: #f4f4f4; background: #f4f4f4;
min-height: 100%; min-height: 100%;
} }
.container{ .container {
background: #f4f4f4; background: #f4f4f4;
min-height: 100%; min-height: 100%;
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.no-collect {
.no-collect{ width: 100%;
width: 100%; height: auto;
height: auto; margin: 0 auto;
margin: 0 auto;
} }
.no-collect .c{ .no-collect .c {
width: 100%; width: 100%;
height: auto; height: auto;
margin-top: 200rpx; margin-top: 200rpx;
} }
.no-collect .c image{ .no-collect .c image {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
text-align: center; text-align: center;
width: 258rpx; width: 258rpx;
height: 258rpx; height: 258rpx;
} }
.no-collect .c text{ .no-collect .c text {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
width: 258rpx; width: 258rpx;
height: 29rpx; height: 29rpx;
line-height: 29rpx; line-height: 29rpx;
text-align: center; text-align: center;
font-size: 29rpx; font-size: 29rpx;
color: #999; color: #999;
} }
.collect-list{ .collect-list {
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
...@@ -52,7 +51,7 @@ page{ ...@@ -52,7 +51,7 @@ page{
border-top: 1px solid #e1e1e1; border-top: 1px solid #e1e1e1;
} }
.item{ .item {
height: 212rpx; height: 212rpx;
width: 720rpx; width: 720rpx;
background: #fff; background: #fff;
...@@ -60,17 +59,17 @@ page{ ...@@ -60,17 +59,17 @@ page{
border-bottom: 1px solid #e1e1e1; border-bottom: 1px solid #e1e1e1;
} }
.item:last-child{ .item:last-child {
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
} }
.item .img{ .item .img {
float: left; float: left;
width: 150rpx; width: 150rpx;
height: 150rpx; height: 150rpx;
} }
.item .info{ .item .info {
float: right; float: right;
width: 540rpx; width: 540rpx;
height: 150rpx; height: 150rpx;
...@@ -80,21 +79,20 @@ page{ ...@@ -80,21 +79,20 @@ page{
padding-left: 20rpx; padding-left: 20rpx;
} }
.item .info .name{ .item .info .name {
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
line-height: 40rpx; line-height: 40rpx;
} }
.item .info .subtitle {
.item .info .subtitle{
margin-top: 8rpx; margin-top: 8rpx;
font-size: 24rpx; font-size: 24rpx;
color: #888; color: #888;
line-height: 40rpx; line-height: 40rpx;
} }
.item .info .price{ .item .info .price {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
......
litemall-wx/pages/ucenter/coupon/coupon.js
View file @ 20b97ec8
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({
data: { data: {
}, },
onLoad: function (options) { onLoad: function(options) {},
}, 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/coupon/coupon.wxml
View file @ 20b97ec8
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="tag">新人专享</view> <view class="tag">新人专享</view>
<view class="content"> <view class="content">
<view class="left"> <view class="left">
......
litemall-wx/pages/ucenter/coupon/coupon.wxss
View file @ 20b97ec8
page{ page {
background: #f4f4f4; background: #f4f4f4;
min-height: 100%; min-height: 100%;
} }
.container{ .container {
background: #f4f4f4; background: #f4f4f4;
min-height: 100%; min-height: 100%;
padding-top: 30rpx; padding-top: 30rpx;
} }
.coupon-form{ .coupon-form {
height: 110rpx; height: 110rpx;
width: 100%; width: 100%;
background: #fff; background: #fff;
...@@ -19,7 +19,7 @@ page{ ...@@ -19,7 +19,7 @@ page{
display: flex; display: flex;
} }
.input-box{ .input-box {
flex: 1; flex: 1;
height: 70rpx; height: 70rpx;
color: #333; color: #333;
...@@ -31,7 +31,7 @@ page{ ...@@ -31,7 +31,7 @@ page{
margin-right: 30rpx; margin-right: 30rpx;
} }
.input-box .coupon-sn{ .input-box .coupon-sn {
position: absolute; position: absolute;
top: 10rpx; top: 10rpx;
left: 30rpx; left: 30rpx;
...@@ -42,7 +42,7 @@ page{ ...@@ -42,7 +42,7 @@ page{
font-size: 24rpx; font-size: 24rpx;
} }
.clear-icon{ .clear-icon {
position: absolute; position: absolute;
top: 21rpx; top: 21rpx;
right: 30rpx; right: 30rpx;
...@@ -50,9 +50,9 @@ page{ ...@@ -50,9 +50,9 @@ page{
height: 28rpx; height: 28rpx;
} }
.add-btn{ .add-btn {
height: 70rpx; height: 70rpx;
border:none; border: none;
width: 168rpx; width: 168rpx;
background: #b4282d; background: #b4282d;
border-radius: 0; border-radius: 0;
...@@ -61,11 +61,11 @@ page{ ...@@ -61,11 +61,11 @@ page{
font-size: 28rpx; font-size: 28rpx;
} }
.add-btn.disabled{ .add-btn.disabled {
background: #ccc; background: #ccc;
} }
.help{ .help {
height: 72rpx; height: 72rpx;
line-height: 72rpx; line-height: 72rpx;
text-align: right; text-align: right;
...@@ -76,7 +76,7 @@ page{ ...@@ -76,7 +76,7 @@ page{
font-size: 24rpx; font-size: 24rpx;
} }
.coupon-list{ .coupon-list {
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
...@@ -84,18 +84,18 @@ page{ ...@@ -84,18 +84,18 @@ page{
padding-right: 30rpx; padding-right: 30rpx;
} }
.item{ .item {
position: relative; position: relative;
height: 290rpx; height: 290rpx;
width: 100%; width: 100%;
background: linear-gradient(to right,#cfa568,#e3bf79); background: linear-gradient(to right, #cfa568, #e3bf79);
margin-bottom: 30rpx; margin-bottom: 30rpx;
padding-top: 52rpx; padding-top: 52rpx;
} }
.tag{ .tag {
height: 32rpx; height: 32rpx;
background: #A48143; background: #a48143;
padding-left: 16rpx; padding-left: 16rpx;
padding-right: 16rpx; padding-right: 16rpx;
position: absolute; position: absolute;
...@@ -107,8 +107,7 @@ page{ ...@@ -107,8 +107,7 @@ page{
line-height: 32rpx; line-height: 32rpx;
} }
.content {
.content{
margin-top: 24rpx; margin-top: 24rpx;
margin-left: 40rpx; margin-left: 40rpx;
display: flex; display: flex;
...@@ -117,50 +116,50 @@ page{ ...@@ -117,50 +116,50 @@ page{
align-items: center; align-items: center;
} }
.content .left{ .content .left {
flex: 1; flex: 1;
} }
.name{ .name {
font-size: 44rpx; font-size: 44rpx;
color: #fff; color: #fff;
margin-bottom: 14rpx; margin-bottom: 14rpx;
} }
.time{ .time {
font-size: 24rpx; font-size: 24rpx;
color: rgba(255,255,255, 0.8); color: rgba(255, 255, 255, 0.8);
line-height: 30rpx; line-height: 30rpx;
} }
.content .right{ .content .right {
width: 162rpx; width: 162rpx;
} }
.go{ .go {
height: 48rpx; height: 48rpx;
border:none; border: none;
width: 162rpx; width: 162rpx;
background: rgba(255,255,255, 0.8); background: rgba(255, 255, 255, 0.8);
border-radius: 4rpx; border-radius: 4rpx;
line-height: 48rpx; line-height: 48rpx;
color: #b69150; color: #b69150;
font-size: 24rpx; font-size: 24rpx;
} }
.condition{ .condition {
position: absolute; position: absolute;
width: 100%; width: 100%;
bottom: 0; bottom: 0;
left:0; left: 0;
height: 78rpx; height: 78rpx;
background: rgba(0,0,0,.08); background: rgba(0, 0, 0, 0.08);
padding: 24rpx 40rpx; padding: 24rpx 40rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.condition .txt{ .condition .txt {
display: block; display: block;
height: 30rpx; height: 30rpx;
flex: 1; flex: 1;
...@@ -170,9 +169,8 @@ page{ ...@@ -170,9 +169,8 @@ page{
color: #fff; color: #fff;
} }
.condition .icon {
.condition .icon{
margin-left: 30rpx; margin-left: 30rpx;
width: 24rpx; width: 24rpx;
height: 24rpx; height: 24rpx;
} }
\ No newline at end of file
litemall-wx/pages/ucenter/feedback/feedback.js
View file @ 20b97ec8
...@@ -15,7 +15,7 @@ Page({ ...@@ -15,7 +15,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;
...@@ -26,7 +26,7 @@ Page({ ...@@ -26,7 +26,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)
}); });
...@@ -34,13 +34,13 @@ Page({ ...@@ -34,13 +34,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
...@@ -51,7 +51,7 @@ Page({ ...@@ -51,7 +51,7 @@ Page({
}) })
} }
}, },
fail: function (e) { fail: function(e) {
wx.showModal({ wx.showModal({
title: '错误', title: '错误',
content: '上传失败', content: '上传失败',
...@@ -67,12 +67,12 @@ Page({ ...@@ -67,12 +67,12 @@ 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链接列表
}) })
}, },
bindPickerChange: function(e) { bindPickerChange: function(e) {
this.setData({ this.setData({
index: e.detail.value index: e.detail.value
......
litemall-wx/pages/ucenter/feedback/feedback.wxss
View file @ 20b97ec8
page{ page {
background: #f4f4f4; background: #f4f4f4;
min-height: 100%; min-height: 100%;
} }
.container{ .container {
background: #f4f4f4; background: #f4f4f4;
min-height: 100%; min-height: 100%;
padding-top: 30rpx; padding-top: 30rpx;
} }
.fb-type{ .fb-type {
height: 104rpx; height: 104rpx;
width: 100%; width: 100%;
background: #fff; background: #fff;
...@@ -21,26 +21,26 @@ ...@@ -21,26 +21,26 @@
padding-right: 30rpx; padding-right: 30rpx;
} }
.fb-type .type-label{ .fb-type .type-label {
height: 36rpx; height: 36rpx;
flex: 1; flex: 1;
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
} }
.fb-type .type-icon{ .fb-type .type-icon {
height: 36rpx; height: 36rpx;
width: 36rpx; width: 36rpx;
} }
.fb-body{ .fb-body {
width: 100%; width: 100%;
background: #fff; background: #fff;
height: 600rpx; height: 600rpx;
padding: 18rpx 30rpx 64rpx 30rpx; padding: 18rpx 30rpx 64rpx 30rpx;
} }
.fb-body .content{ .fb-body .content {
width: 100%; width: 100%;
height: 400rpx; height: 400rpx;
color: #333; color: #333;
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
font-size: 28rpx; font-size: 28rpx;
} }
.weui-uploader__files{ .weui-uploader__files {
width: 100%; width: 100%;
} }
...@@ -112,19 +112,19 @@ ...@@ -112,19 +112,19 @@
opacity: 0; opacity: 0;
} }
.fb-body .text-count{ .fb-body .text-count {
line-height: 30rpx; line-height: 30rpx;
float: right; float: right;
color: #666; color: #666;
font-size: 24rpx; font-size: 24rpx;
} }
.fb-mobile{ .fb-mobile {
height: 162rpx; height: 162rpx;
width: 100%; width: 100%;
} }
.fb-mobile .label{ .fb-mobile .label {
height: 58rpx; height: 58rpx;
width: 100%; width: 100%;
padding-top: 14rpx; padding-top: 14rpx;
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
line-height: 33rpx; line-height: 33rpx;
} }
.fb-mobile .mobile-box{ .fb-mobile .mobile-box {
height: 104rpx; height: 104rpx;
width: 100%; width: 100%;
color: #333; color: #333;
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
position: relative; position: relative;
} }
.fb-mobile .mobile{ .fb-mobile .mobile {
position: absolute; position: absolute;
top: 27rpx; top: 27rpx;
left: 30rpx; left: 30rpx;
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
font-size: 24rpx; font-size: 24rpx;
} }
.fb-mobile .clear-icon{ .fb-mobile .clear-icon {
position: absolute; position: absolute;
top: 27rpx; top: 27rpx;
right: 30rpx; right: 30rpx;
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
z-index: 2; z-index: 2;
} }
.fb-btn{ .fb-btn {
right: 0; right: 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
border-radius: 0; border-radius: 0;
padding: 0; padding: 0;
margin: 0; margin: 0;
margin-left: 10%; margin-left: 10%;
text-align: center; text-align: center;
/* padding-left: -5rpx; */ /* padding-left: -5rpx; */
font-size: 25rpx; font-size: 25rpx;
...@@ -192,4 +192,4 @@ ...@@ -192,4 +192,4 @@
border-bottom-right-radius: 50rpx; border-bottom-right-radius: 50rpx;
letter-spacing: 3rpx; letter-spacing: 3rpx;
background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%); background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
} }
\ No newline at end of file
litemall-wx/pages/ucenter/footprint/footprint.js
View file @ 20b97ec8
...@@ -15,7 +15,10 @@ Page({ ...@@ -15,7 +15,10 @@ Page({
title: '加载中...', title: '加载中...',
}); });
let that = this; 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) { if (res.errno === 0) {
let f1 = that.data.footprintList; let f1 = that.data.footprintList;
let f2 = res.data.footprintList; let f2 = res.data.footprintList;
...@@ -23,8 +26,7 @@ Page({ ...@@ -23,8 +26,7 @@ Page({
let last = f1.length - 1; let last = f1.length - 1;
if (last >= 0 && f1[last][0].addTime === f2[i].addTime) { if (last >= 0 && f1[last][0].addTime === f2[i].addTime) {
f1[last].push(f2[i]); f1[last].push(f2[i]);
} } else {
else{
let tmp = []; let tmp = [];
tmp.push(f2[i]) tmp.push(f2[i])
f1.push(tmp); f1.push(tmp);
...@@ -39,7 +41,7 @@ Page({ ...@@ -39,7 +41,7 @@ Page({
wx.hideLoading(); wx.hideLoading();
}); });
}, },
deleteItem (event){ deleteItem(event) {
let that = this; let that = this;
let index = event.currentTarget.dataset.index; let index = event.currentTarget.dataset.index;
let iindex = event.currentTarget.dataset.iindex; let iindex = event.currentTarget.dataset.iindex;
...@@ -52,9 +54,11 @@ Page({ ...@@ -52,9 +54,11 @@ Page({
wx.showModal({ wx.showModal({
title: '', title: '',
content: '要删除所选足迹？', content: '要删除所选足迹？',
success: function (res) { success: function(res) {
if (res.confirm) { 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) { if (res.errno === 0) {
wx.showToast({ wx.showToast({
title: '删除成功', title: '删除成功',
...@@ -62,7 +66,7 @@ Page({ ...@@ -62,7 +66,7 @@ Page({
duration: 2000 duration: 2000
}); });
that.data.footprintList[index].splice(iindex, 1) 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.data.footprintList.splice(index, 1)
} }
that.setData({ that.setData({
...@@ -78,9 +82,9 @@ Page({ ...@@ -78,9 +82,9 @@ Page({
url: '/pages/goods/goods?id=' + goodsId, url: '/pages/goods/goods?id=' + goodsId,
}); });
} }
}, },
onLoad: function (options) { onLoad: function(options) {
this.getFootprintList(); this.getFootprintList();
}, },
onReachBottom() { onReachBottom() {
...@@ -98,21 +102,21 @@ Page({ ...@@ -98,21 +102,21 @@ Page({
return false; 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; let that = this;
that.setData({ that.setData({
touchStart: e.timeStamp touchStart: e.timeStamp
...@@ -120,11 +124,11 @@ Page({ ...@@ -120,11 +124,11 @@ Page({
console.log(e.timeStamp + '- touchStart') console.log(e.timeStamp + '- touchStart')
}, },
//按下事件结束 //按下事件结束
touchEnd: function (e) { touchEnd: function(e) {
let that = this; let that = this;
that.setData({ that.setData({
touchEnd: e.timeStamp touchEnd: e.timeStamp
}) })
console.log(e.timeStamp + '- touchEnd') console.log(e.timeStamp + '- touchEnd')
}, },
}) })
\ No newline at end of file
litemall-wx/pages/ucenter/footprint/footprint.wxml
View file @ 20b97ec8
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
<text>没有浏览足迹</text> <text>没有浏览足迹</text>
</view> </view>
</view> </view>
<view class="footprint" wx:if="{{footprintList.length > 0}}"> <view class="footprint" wx:if="{{footprintList.length > 0}}">
<view class="day-item" wx:for="{{footprintList}}" wx:key="*this" wx:for-index="index"> <view class="day-item" wx:for="{{footprintList}}" wx:key="*this" wx:for-index="index">
<view class="day-hd" wx:if="{{item.length > 0}}">{{item[0].addTime}}</view> <view class="day-hd" wx:if="{{item.length > 0}}">{{item[0].addTime}}</view>
<view class="day-list" wx:if="{{item.length > 0}}"> <view class="day-list" wx:if="{{item.length > 0}}">
<view class="item" data-index="{{index}}" data-iindex="{{iindex}}" bindtouchstart="touchStart" bindtouchend="touchEnd" bindtap="deleteItem" wx:for="{{item}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id"> <view class="item" data-index="{{index}}" data-iindex="{{iindex}}" bindtouchstart="touchStart" bindtouchend="touchEnd" bindtap="deleteItem" wx:for="{{item}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="id">
<image class="img" src="{{iitem.picUrl}}"></image> <image class="img" src="{{iitem.picUrl}}"></image>
<view class="info"> <view class="info">
<view class="name">{{iitem.name}}</view> <view class="name">{{iitem.name}}</view>
......
litemall-wx/pages/ucenter/footprint/footprint.wxss
View file @ 20b97ec8
page{ page {
background: #f4f4f4; background: #f4f4f4;
min-height: 100%; min-height: 100%;
} }
.container{ .container {
background: #f4f4f4; background: #f4f4f4;
min-height: 100%; min-height: 100%;
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.no-footprint{ .no-footprint {
width: 100%; width: 100%;
height: auto; height: auto;
margin: 0 auto; margin: 0 auto;
} }
.no-footprint .c{ .no-footprint .c {
width: 100%; width: 100%;
height: auto; height: auto;
margin-top: 200rpx; margin-top: 200rpx;
} }
.no-footprint .c image{ .no-footprint .c image {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
text-align: center; text-align: center;
width: 258rpx; width: 258rpx;
height: 258rpx; height: 258rpx;
} }
.no-footprint .c text{ .no-footprint .c text {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
width: 258rpx; width: 258rpx;
height: 29rpx; height: 29rpx;
line-height: 29rpx; line-height: 29rpx;
text-align: center; text-align: center;
font-size: 29rpx; font-size: 29rpx;
color: #999; color: #999;
} }
.footprint{ .footprint {
height: auto; height: auto;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
border-top: 1px solid #e1e1e1; border-top: 1px solid #e1e1e1;
} }
.day-item{ .day-item {
height: auto; height: auto;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.day-hd{ .day-hd {
height: 94rpx; height: 94rpx;
width: 100%; width: 100%;
line-height: 94rpx; line-height: 94rpx;
...@@ -66,7 +66,7 @@ page{ ...@@ -66,7 +66,7 @@ page{
font-size: 28rpx; font-size: 28rpx;
} }
.day-list{ .day-list {
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
...@@ -75,7 +75,7 @@ page{ ...@@ -75,7 +75,7 @@ page{
border-top: 1px solid #e1e1e1; border-top: 1px solid #e1e1e1;
} }
.item{ .item {
height: 212rpx; height: 212rpx;
width: 720rpx; width: 720rpx;
background: #fff; background: #fff;
...@@ -83,17 +83,17 @@ page{ ...@@ -83,17 +83,17 @@ page{
border-bottom: 1px solid #e1e1e1; border-bottom: 1px solid #e1e1e1;
} }
.item:last-child{ .item:last-child {
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
} }
.item .img{ .item .img {
float: left; float: left;
width: 150rpx; width: 150rpx;
height: 150rpx; height: 150rpx;
} }
.item .info{ .item .info {
float: right; float: right;
width: 540rpx; width: 540rpx;
height: 150rpx; height: 150rpx;
...@@ -103,21 +103,20 @@ page{ ...@@ -103,21 +103,20 @@ page{
padding-left: 20rpx; padding-left: 20rpx;
} }
.item .info .name{ .item .info .name {
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
line-height: 40rpx; line-height: 40rpx;
} }
.item .info .subtitle {
.item .info .subtitle{
margin-top: 8rpx; margin-top: 8rpx;
font-size: 24rpx; font-size: 24rpx;
color: #888; color: #888;
line-height: 40rpx; line-height: 40rpx;
} }
.item .info .price{ .item .info .price {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
......
litemall-wx/pages/ucenter/index/index.json
View file @ 20b97ec8
{ {
"backgroundColor": "#f4f4f4", "backgroundColor": "#f4f4f4",
"navigationBarTitleText": "个人中心", "navigationBarTitleText": "个人中心",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
\ No newline at end of file
litemall-wx/pages/ucenter/index/index.wxml
View file @ 20b97ec8
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
</view> </view>
</view> </view>
<view class='separate'></view> <view class='separate'></view>
<view class='user_area'> <view class='user_area'>
<view class='user_row' bindtap='goOrder'> <view class='user_row' bindtap='goOrder'>
<view class='user_row_left'>我的订单</view> <view class='user_row_left'>我的订单</view>
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<view class='user_column'> <view class='user_column'>
<view class='user_column_item' bindtap='goOrderIndex' data-index='1' data-route='/pages/ucenter/order/order'> <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> <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 class='user_column_item_image' src='/static/images/pendpay.png'>
</image> </image>
<view class='user_column_item_text'>待付款</view> <view class='user_column_item_text'>待付款</view>
</view> </view>
<view class='user_column_item' bindtap='goOrderIndex' data-index='2' data-route='/pages/ucenter/order/order'> <view class='user_column_item' bindtap='goOrderIndex' data-index='2' data-route='/pages/ucenter/order/order'>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class='separate'></view> <view class='separate'></view>
<view class='user_row'> <view class='user_row'>
......
litemall-wx/pages/ucenter/index/index.wxss
View file @ 20b97ec8
...@@ -112,8 +112,8 @@ page { ...@@ -112,8 +112,8 @@ page {
background: #b4282d; background: #b4282d;
color: #fff; color: #fff;
border-radius: 50%; border-radius: 50%;
margin-top:20rpx; margin-top: 20rpx;
margin-left:40rpx; margin-left: 40rpx;
} }
.user_column_item_image { .user_column_item_image {
...@@ -137,26 +137,27 @@ page { ...@@ -137,26 +137,27 @@ page {
.user_column_item_phone { .user_column_item_phone {
width: 30%; width: 30%;
text-align:center; text-align: center;
display:flex; display: flex;
justify-content:center; justify-content: center;
align-items:center; align-items: center;
flex-wrap:wrap; flex-wrap: wrap;
float:left; float: left;
background:#fff; background: #fff;
border-bottom:1px solid #fafafa; border-bottom: 1px solid #fafafa;
} }
.user_column_item_phone::after{
.user_column_item_phone::after {
border: none; border: none;
} }
.logout{ .logout {
margin-top: 30rpx; margin-top: 30rpx;
height: 100rpx; height: 100rpx;
width: 100%; width: 100%;
line-height: 100rpx; line-height: 100rpx;
text-align: center; text-align: center;
background: #fff; background: #fff;
color: red; color: red;
font-size: 30rpx; font-size: 30rpx;
} }
litemall-wx/pages/ucenter/order/order.js
View file @ 20b97ec8
...@@ -2,62 +2,61 @@ var util = require('../../../utils/util.js'); ...@@ -2,62 +2,61 @@ var util = require('../../../utils/util.js');
var api = require('../../../config/api.js'); var api = require('../../../config/api.js');
Page({ Page({
data: { data: {
orderList: [], orderList: [],
showType: 0 showType: 0
}, },
onLoad: function(options) { onLoad: function(options) {
// 页面初始化 options为页面跳转所带来的参数 // 页面初始化 options为页面跳转所带来的参数
let that = this let that = this
try { try {
var tab = wx.getStorageSync('tab'); var tab = wx.getStorageSync('tab');
this.setData({ this.setData({
showType: tab showType: tab
}); });
} catch (e) { } catch (e) {}
}
}, },
onPullDownRefresh() { onPullDownRefresh() {
wx.showNavigationBarLoading() //在标题栏中显示加载 wx.showNavigationBarLoading() //在标题栏中显示加载
this.getOrderList(); this.getOrderList();
wx.hideNavigationBarLoading() //完成停止加载 wx.hideNavigationBarLoading() //完成停止加载
wx.stopPullDownRefresh() //停止下拉刷新 wx.stopPullDownRefresh() //停止下拉刷新
}, },
getOrderList() { getOrderList() {
let that = this; let that = this;
util.request(api.OrderList, { util.request(api.OrderList, {
showType: that.data.showType showType: that.data.showType
}).then(function(res) { }).then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
console.log(res.data); console.log(res.data);
that.setData({ that.setData({
orderList: res.data.data orderList: res.data.data
});
}
}); });
} },
}); switchTab: function(event) {
}, let showType = event.currentTarget.dataset.index;
switchTab: function(event) { this.setData({
let showType = event.currentTarget.dataset.index; showType: showType
this.setData({ });
showType: showType this.getOrderList();
}); },
this.getOrderList(); onReady: function() {
}, // 页面渲染完成
onReady: function() { },
// 页面渲染完成 onShow: function() {
}, // 页面显示
onShow: function() { this.getOrderList();
// 页面显示 },
this.getOrderList(); onHide: function() {
}, // 页面隐藏
onHide: function() { },
// 页面隐藏 onUnload: function() {
}, // 页面关闭
onUnload: function() { }
// 页面关闭
}
}) })
\ No newline at end of file
litemall-wx/pages/ucenter/order/order.wxml
View file @ 20b97ec8
<view class="container"> <view class="container">
<view class="orders-switch"> <view class="orders-switch">
<view class="item {{ showType == 0 ? 'active' : ''}}" bindtap="switchTab" data-index='0'> <view class="item {{ showType == 0 ? 'active' : ''}}" bindtap="switchTab" data-index='0'>
<view class="txt">全部</view> <view class="txt">全部</view>
</view>
<view class="item {{ showType == 1 ? 'active' : ''}}" bindtap="switchTab" data-index='1'>
<view class="txt">待付款</view>
</view>
<view class="item {{ showType == 2 ? 'active' : ''}}" bindtap="switchTab" data-index='2'>
<view class="txt">待发货</view>
</view>
<view class="item {{ showType == 3 ? 'active' : ''}}" bindtap="switchTab" data-index='3'>
<view class="txt">待收货</view>
</view>
<view class="item {{ showType == 4 ? 'active' : ''}}" bindtap="switchTab" data-index='4'>
<view class="txt">待评价</view>
</view>
</view> </view>
<view class="no-order" wx:if="{{orderList.length <= 0}}"> <view class="item {{ showType == 1 ? 'active' : ''}}" bindtap="switchTab" data-index='1'>
<view class="c"> <view class="txt">待付款</view>
<image src="http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/noCart-a8fe3f12e5.png" />
<text>还没有任何订单呢</text>
</view>
</view> </view>
<view class="item {{ showType == 2 ? 'active' : ''}}" bindtap="switchTab" data-index='2'>
<view class="orders"> <view class="txt">待发货</view>
<navigator url="../orderDetail/orderDetail?id={{item.id}}" class="order" open-type="redirect" wx:for="{{orderList}}" wx:key="id"> </view>
<view class="h"> <view class="item {{ showType == 3 ? 'active' : ''}}" bindtap="switchTab" data-index='3'>
<view class="l">订单编号：{{item.orderSn}}</view> <view class="txt">待收货</view>
<view class="r">{{item.orderStatusText}}</view>
</view>
<view class="goods" wx:for="{{item.goodsList}}" wx:key="id" wx:for-item="gitem">
<view class="img">
<image src="{{gitem.picUrl}}"></image>
</view>
<view class="info">
<text class="name">{{gitem.goodsName}}</text>
<text class="number">共{{gitem.number}}件商品</text>
</view>
<view class="status"></view>
</view>
<view class="b">
<view class="l">实付：￥{{item.actualPrice}}</view>
</view>
</navigator>
</view> </view>
</view> <view class="item {{ showType == 4 ? 'active' : ''}}" bindtap="switchTab" data-index='4'>
<view class="txt">待评价</view>
</view>
</view>
<view class="no-order" wx:if="{{orderList.length <= 0}}">
<view class="c">
<image src="http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/noCart-a8fe3f12e5.png" />
<text>还没有任何订单呢</text>
</view>
</view>
<view class="orders">
<navigator url="../orderDetail/orderDetail?id={{item.id}}" class="order" open-type="redirect" wx:for="{{orderList}}" wx:key="id">
<view class="h">
<view class="l">订单编号：{{item.orderSn}}</view>
<view class="r">{{item.orderStatusText}}</view>
</view>
<view class="goods" wx:for="{{item.goodsList}}" wx:key="id" wx:for-item="gitem">
<view class="img">
<image src="{{gitem.picUrl}}"></image>
</view>
<view class="info">
<text class="name">{{gitem.goodsName}}</text>
<text class="number">共{{gitem.number}}件商品</text>
</view>
<view class="status"></view>
</view>
<view class="b">
<view class="l">实付：￥{{item.actualPrice}}</view>
</view>
</navigator>
</view>
</view>
\ No newline at end of file
litemall-wx/pages/ucenter/order/order.wxss
View file @ 20b97ec8
page{ page {
height: 100%; height: 100%;
width: 100%; width: 100%;
background: #f4f4f4; background: #f4f4f4;
} }
.orders-switch {
.orders-switch{ width: 100%;
width: 100%; 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,.15); */
} }
.orders-switch .item{ .orders-switch .item {
display: inline-block; display: inline-block;
height: 82rpx; height: 82rpx;
width: 18%; width: 18%;
padding: 0 15rpx; padding: 0 15rpx;
text-align: center; text-align: center;
} }
.orders-switch .item .txt{ .orders-switch .item .txt {
display: inline-block; display: inline-block;
height: 82rpx; height: 82rpx;
padding: 0 20rpx; padding: 0 20rpx;
line-height: 82rpx; line-height: 82rpx;
color: #9a9ba1; color: #9a9ba1;
font-size: 30rpx; font-size: 30rpx;
width: 170rpx; width: 170rpx;
} }
.orders-switch .item.active .txt{ .orders-switch .item.active .txt {
color: #AB956D; color: #ab956d;
border-bottom: 4rpx solid #AB956D; border-bottom: 4rpx solid #ab956d;
} }
.no-order {
.no-order{ width: 100%;
width: 100%; height: auto;
height: auto; margin: 0 auto;
margin: 0 auto;
} }
.no-order .c{ .no-order .c {
width: 100%; width: 100%;
height: auto; height: auto;
margin-top: 200rpx; margin-top: 200rpx;
} }
.no-order .c image{ .no-order .c image {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
text-align: center; text-align: center;
width: 258rpx; width: 258rpx;
height: 258rpx; height: 258rpx;
} }
.no-order .c text{ .no-order .c text {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
width: 258rpx; width: 258rpx;
height: 29rpx; height: 29rpx;
line-height: 29rpx; line-height: 29rpx;
text-align: center; text-align: center;
font-size: 29rpx; font-size: 29rpx;
color: #999; color: #999;
} }
.orders{ .orders {
height: auto; height: auto;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
} }
.order{ .order {
margin-top: 20rpx; margin-top: 20rpx;
background: #fff; background: #fff;
} }
.order .h{ .order .h {
height: 83.3rpx; height: 83.3rpx;
line-height: 83.3rpx; line-height: 83.3rpx;
margin-left: 31.25rpx; margin-left: 31.25rpx;
padding-right: 31.25rpx; padding-right: 31.25rpx;
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
font-size: 30rpx; font-size: 30rpx;
color: #333; color: #333;
} }
.order .h .l{ .order .h .l {
float: left; float: left;
} }
.order .h .r{ .order .h .r {
float: right; float: right;
color: #b4282d; color: #b4282d;
font-size: 24rpx; font-size: 24rpx;
} }
.order .goods{ .order .goods {
display: flex; display: flex;
align-items: center; align-items: center;
height: 199rpx; height: 199rpx;
margin-left: 31.25rpx; margin-left: 31.25rpx;
} }
.order .goods .img{ .order .goods .img {
height:145.83rpx; height: 145.83rpx;
width:145.83rpx; width: 145.83rpx;
background: #f4f4f4; background: #f4f4f4;
} }
.order .goods .img image{ .order .goods .img image {
height:145.83rpx; height: 145.83rpx;
width:145.83rpx; width: 145.83rpx;
} }
.order .goods .info{ .order .goods .info {
height: 145.83rpx; height: 145.83rpx;
flex: 1; flex: 1;
padding-left: 20rpx; padding-left: 20rpx;
} }
.order .goods .name{ .order .goods .name {
margin-top: 30rpx; margin-top: 30rpx;
display: block; display: block;
height: 44rpx; height: 44rpx;
line-height: 44rpx; line-height: 44rpx;
color: #333; color: #333;
font-size: 30rpx; font-size: 30rpx;
} }
.order .goods .number{ .order .goods .number {
display: block; display: block;
height: 37rpx; height: 37rpx;
line-height: 37rpx; line-height: 37rpx;
color: #666; color: #666;
font-size: 25rpx; font-size: 25rpx;
} }
.order .goods .status{ .order .goods .status {
width:105rpx; width: 105rpx;
color: #b4282d; color: #b4282d;
font-size: 25rpx; font-size: 25rpx;
} }
.order .b{ .order .b {
height: 103rpx; height: 103rpx;
line-height: 103rpx; line-height: 103rpx;
margin-left: 31.25rpx; margin-left: 31.25rpx;
padding-right: 31.25rpx; padding-right: 31.25rpx;
border-top: 1px solid #f4f4f4; border-top: 1px solid #f4f4f4;
font-size: 30rpx; font-size: 30rpx;
color: #333; color: #333;
} }
.order .b .l{ .order .b .l {
float: left; float: left;
} }
.order .b .r{ .order .b .r {
float: right; float: right;
} }
.order .b .btn{ .order .b .btn {
margin-top: 19rpx; margin-top: 19rpx;
height: 64.5rpx; height: 64.5rpx;
line-height: 64.5rpx; line-height: 64.5rpx;
text-align: center; text-align: center;
padding: 0 20rpx; padding: 0 20rpx;
border-radius: 5rpx; border-radius: 5rpx;
font-size: 28rpx; font-size: 28rpx;
color: #fff; color: #fff;
background: #b4282d; background: #b4282d;
} }
\ No newline at end of file
litemall-wx/pages/ucenter/orderDetail/orderDetail.js
View file @ 20b97ec8
...@@ -10,38 +10,38 @@ Page({ ...@@ -10,38 +10,38 @@ Page({
flag: false, flag: false,
handleOption: {} handleOption: {}
}, },
onLoad: function (options) { onLoad: function(options) {
// 页面初始化 options为页面跳转所带来的参数 // 页面初始化 options为页面跳转所带来的参数
this.setData({ this.setData({
orderId: options.id orderId: options.id
}); });
this.getOrderDetail(); this.getOrderDetail();
}, },
onPullDownRefresh() { onPullDownRefresh() {
wx.showNavigationBarLoading() //在标题栏中显示加载 wx.showNavigationBarLoading() //在标题栏中显示加载
this.getOrderDetail(); this.getOrderDetail();
wx.hideNavigationBarLoading() //完成停止加载 wx.hideNavigationBarLoading() //完成停止加载
wx.stopPullDownRefresh() //停止下拉刷新 wx.stopPullDownRefresh() //停止下拉刷新
}, },
expandDetail: function() { expandDetail: function() {
let that = this; let that = this;
this.setData({ this.setData({
flag: !that.data.flag flag: !that.data.flag
}) })
}, },
getOrderDetail: function () { getOrderDetail: function() {
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
}); });
setTimeout(function () { setTimeout(function() {
wx.hideLoading() wx.hideLoading()
}, 2000); }, 2000);
let that = this; let that = this;
util.request(api.OrderDetail, { util.request(api.OrderDetail, {
orderId: that.data.orderId orderId: that.data.orderId
}).then(function (res) { }).then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
console.log(res.data); console.log(res.data);
that.setData({ that.setData({
...@@ -50,62 +50,61 @@ Page({ ...@@ -50,62 +50,61 @@ Page({
handleOption: res.data.orderInfo.handleOption, handleOption: res.data.orderInfo.handleOption,
expressInfo: res.data.expressInfo expressInfo: res.data.expressInfo
}); });
} }
wx.hideLoading(); wx.hideLoading();
}); });
}, },
// “去付款”按钮点击效果 // “去付款”按钮点击效果
payOrder: function() { payOrder: function() {
let that = this; let that = this;
util.request(api.OrderPrepay, { util.request(api.OrderPrepay, {
orderId: that.data.orderId orderId: that.data.orderId
}, 'POST').then(function(res) { }, 'POST').then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
const payParam = res.data; const payParam = res.data;
console.log("支付过程开始"); console.log("支付过程开始");
wx.requestPayment({ wx.requestPayment({
'timeStamp': payParam.timeStamp, 'timeStamp': payParam.timeStamp,
'nonceStr': payParam.nonceStr, 'nonceStr': payParam.nonceStr,
'package': payParam.packageValue, 'package': payParam.packageValue,
'signType': payParam.signType, 'signType': payParam.signType,
'paySign': payParam.paySign, 'paySign': payParam.paySign,
'success': function(res) { 'success': function(res) {
console.log("支付过程成功"); console.log("支付过程成功");
util.redirect('/pages/ucenter/order/order'); util.redirect('/pages/ucenter/order/order');
}, },
'fail': function(res) { 'fail': function(res) {
console.log("支付过程失败"); console.log("支付过程失败");
util.showErrorToast('支付失败'); util.showErrorToast('支付失败');
}, },
'complete': function(res) { 'complete': function(res) {
console.log("支付过程结束") console.log("支付过程结束")
} }
});
}
}); });
}
});
}, },
// “取消订单”点击效果 // “取消订单”点击效果
cancelOrder: function () { cancelOrder: function() {
let that = this; let that = this;
let orderInfo = that.data.orderInfo; let orderInfo = that.data.orderInfo;
wx.showModal({ wx.showModal({
title: '', title: '',
content: '确定要取消此订单？', content: '确定要取消此订单？',
success: function (res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
util.request(api.OrderCancel, { util.request(api.OrderCancel, {
orderId: orderInfo.id orderId: orderInfo.id
}, 'POST').then(function (res) { }, 'POST').then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
wx.showToast({ wx.showToast({
title: '取消订单成功' title: '取消订单成功'
}); });
util.redirect('/pages/ucenter/order/order'); util.redirect('/pages/ucenter/order/order');
} } else {
else {
util.showErrorToast(res.errmsg); util.showErrorToast(res.errmsg);
} }
}); });
...@@ -114,79 +113,76 @@ Page({ ...@@ -114,79 +113,76 @@ Page({
}); });
}, },
// “取消订单并退款”点击效果 // “取消订单并退款”点击效果
refundOrder: function () { refundOrder: function() {
let that = this; let that = this;
let orderInfo = that.data.orderInfo; let orderInfo = that.data.orderInfo;
wx.showModal({ wx.showModal({
title: '', title: '',
content: '确定要取消此订单？', content: '确定要取消此订单？',
success: function (res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
util.request(api.OrderRefund, { util.request(api.OrderRefund, {
orderId: orderInfo.id orderId: orderInfo.id
}, 'POST').then(function (res) { }, 'POST').then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
wx.showToast({ wx.showToast({
title: '取消订单成功' title: '取消订单成功'
}); });
util.redirect('/pages/ucenter/order/order'); util.redirect('/pages/ucenter/order/order');
} } else {
else {
util.showErrorToast(res.errmsg); util.showErrorToast(res.errmsg);
} }
}); });
} }
} }
}); });
}, },
// “删除”点击效果 // “删除”点击效果
deleteOrder: function () { deleteOrder: function() {
let that = this; let that = this;
let orderInfo = that.data.orderInfo; let orderInfo = that.data.orderInfo;
wx.showModal({ wx.showModal({
title: '', title: '',
content: '确定要删除此订单？', content: '确定要删除此订单？',
success: function (res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
util.request(api.OrderDelete, { util.request(api.OrderDelete, {
orderId: orderInfo.id orderId: orderInfo.id
}, 'POST').then(function (res) { }, 'POST').then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
wx.showToast({ wx.showToast({
title: '删除订单成功' title: '删除订单成功'
}); });
util.redirect('/pages/ucenter/order/order'); util.redirect('/pages/ucenter/order/order');
} } else {
else {
util.showErrorToast(res.errmsg); util.showErrorToast(res.errmsg);
} }
}); });
} }
} }
}); });
}, },
// “确认收货”点击效果 // “确认收货”点击效果
confirmOrder: function () { confirmOrder: function() {
let that = this; let that = this;
let orderInfo = that.data.orderInfo; let orderInfo = that.data.orderInfo;
wx.showModal({ wx.showModal({
title: '', title: '',
content: '确认收货？', content: '确认收货？',
success: function (res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
util.request(api.OrderConfirm, { util.request(api.OrderConfirm, {
orderId: orderInfo.id orderId: orderInfo.id
}, 'POST').then(function (res) { }, 'POST').then(function(res) {
if (res.errno === 0) { if (res.errno === 0) {
wx.showToast({ wx.showToast({
title: '确认收货成功！' title: '确认收货成功！'
}); });
util.redirect('/pages/ucenter/order/order'); util.redirect('/pages/ucenter/order/order');
} } else {
else {
util.showErrorToast(res.errmsg); util.showErrorToast(res.errmsg);
} }
}); });
...@@ -194,16 +190,16 @@ Page({ ...@@ -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
<view class="container"> <view class="container">
<view class="order-info"> <view class="order-info">
<view class="item-a">下单时间：{{orderInfo.addTime}}</view> <view class="item-a">下单时间：{{orderInfo.addTime}}</view>
<view class="item-b">订单编号：{{orderInfo.orderSn}}</view> <view class="item-b">订单编号：{{orderInfo.orderSn}}</view>
<view class="item-c"> <view class="item-c">
<view class="l">实付：<text class="cost">￥{{orderInfo.actualPrice}}</text></view> <view class="l">实付：
<view class="r"> <text class="cost">￥{{orderInfo.actualPrice}}</text>
<view class="btn active" bindtap="cancelOrder" wx:if="{{handleOption.cancel}}">取消订单</view> </view>
<view class="btn active" bindtap="payOrder" wx:if="{{handleOption.pay}}">去付款</view> <view class="r">
<view class="btn active" bindtap="confirmOrder" wx:if="{{handleOption.confirm}}">确认收货</view> <view class="btn active" bindtap="cancelOrder" wx:if="{{handleOption.cancel}}">取消订单</view>
<view class="btn active" bindtap="deleteOrder" wx:if="{{handleOption.delete}}">删除订单</view> <view class="btn active" bindtap="payOrder" wx:if="{{handleOption.pay}}">去付款</view>
<view class="btn active" bindtap="refundOrder" wx:if="{{handleOption.refund}}">申请退款</view> <view class="btn active" bindtap="confirmOrder" wx:if="{{handleOption.confirm}}">确认收货</view>
</view> <view class="btn active" bindtap="deleteOrder" wx:if="{{handleOption.delete}}">删除订单</view>
</view> <view class="btn active" bindtap="refundOrder" wx:if="{{handleOption.refund}}">申请退款</view>
</view>
</view> </view>
</view>
<view class="order-goods"> <view class="order-goods">
<view class="h"> <view class="h">
<view class="label">商品信息</view> <view class="label">商品信息</view>
<view class="status">{{orderInfo.orderStatusText}}</view> <view class="status">{{orderInfo.orderStatusText}}</view>
</view>
<view class="goods">
<view class="item" wx:for="{{orderGoods}}" wx:key="id">
<view class="img">
<image src="{{item.picUrl}}"></image>
</view> </view>
<view class="goods"> <view class="info">
<view class="item" wx:for="{{orderGoods}}" wx:key="id"> <view class="t">
<view class="img"> <text class="name">{{item.goodsName}}</text>
<image src="{{item.picUrl}}"></image> <text class="number">x{{item.number}}</text>
</view> </view>
<view class="info"> <view class="attr">{{item.specifications}}</view>
<view class="t"> <view class="price">￥{{item.price}}</view>
<text class="name">{{item.goodsName}}</text> <view class="btn active" wx:if="{{handleOption.comment && (item.comment == 0)}}">
<text class="number">x{{item.number}}</text> <navigator url="../../commentPost/commentPost?orderId={{item.orderId}}&&valueId={{item.goodsId}}&type=0">去评价</navigator>
</view> </view>
<view class="attr">{{item.specifications}}</view> <view class="btn active" wx:if="{{handleOption.rebuy}}">
<view class="price">￥{{item.price}}</view> <navigator url="../../goods/goods?id={{item.goodsId}}">再次购买</navigator>
<view class="btn active" wx:if="{{handleOption.comment && (item.comment == 0)}}"> </view>
<navigator url="../../commentPost/commentPost?orderId={{item.orderId}}&&valueId={{item.goodsId}}&type=0">去评价</navigator>
</view>
<view class="btn active" wx:if="{{handleOption.rebuy}}">
<navigator url="../../goods/goods?id={{item.goodsId}}">再次购买</navigator>
</view>
</view>
</view>
</view> </view>
</view>
</view>
<view class="order-bottom"> <view class="order-bottom">
<view class="address"> <view class="address">
<view class="t"> <view class="t">
<text class="name">{{orderInfo.consignee}}</text> <text class="name">{{orderInfo.consignee}}</text>
<text class="mobile">{{orderInfo.mobile}}</text> <text class="mobile">{{orderInfo.mobile}}</text>
</view>
<view class="b">{{orderInfo.address}}</view>
</view> </view>
<view class="total"> <view class="b">{{orderInfo.address}}</view>
<view class="t"> </view>
<text class="label">商品合计：</text> <view class="total">
<text class="txt">￥{{orderInfo.goodsPrice}}</text> <view class="t">
</view> <text class="label">商品合计：</text>
<view class="t"> <text class="txt">￥{{orderInfo.goodsPrice}}</text>
<text class="label">运费：</text>
<text class="txt">￥{{orderInfo.freightPrice}}</text>
</view>
</view> </view>
<view class="pay-fee"> <view class="t">
<text class="label">实付：</text> <text class="label">运费：</text>
<text class="txt">￥{{orderInfo.actualPrice}}</text> <text class="txt">￥{{orderInfo.freightPrice}}</text>
</view> </view>
</view>
<view class="pay-fee">
<text class="label">实付：</text>
<text class="txt">￥{{orderInfo.actualPrice}}</text>
</view>
</view> </view>
</view>
<!-- 物流信息,仅收货状态下可见 -->
<view class="order-express" bindtap="expandDetail" wx:if="{{ handleOption.confirm }}">
<view class="order-express">
<view class="title">
<view class="t">快递公司：{{expressInfo.shipperName}}</view>
<view class="b">物流单号：{{expressInfo.shipperCode}}</view>
</view>
<image class="ti" src="/static/images/address_right.png" background-size="cover"></image>
</view> </view>
<view class="traces" wx:for="{{expressInfo.Traces}}" wx:key="item" wx:for-item="iitem" wx:if="{{ flag }}">
<view class="trace"> <!-- 物流信息,仅收货状态下可见 -->
<view class="acceptStation">{{iitem.AcceptStation}}</view> <view class="order-express" bindtap="expandDetail" wx:if="{{ handleOption.confirm }}">
<view class="acceptTime">{{iitem.AcceptTime}}</view> <view class="order-express">
</view> <view class="title">
<view class="t">快递公司：{{expressInfo.shipperName}}</view>
<view class="b">物流单号：{{expressInfo.shipperCode}}</view>
</view>
<image class="ti" src="/static/images/address_right.png" background-size="cover"></image>
</view>
<view class="traces" wx:for="{{expressInfo.Traces}}" wx:key="item" wx:for-item="iitem" wx:if="{{ flag }}">
<view class="trace">
<view class="acceptStation">{{iitem.AcceptStation}}</view>
<view class="acceptTime">{{iitem.AcceptTime}}</view>
</view>
</view>
</view> </view>
</view>
</view> </view>
\ No newline at end of file
litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss
View file @ 20b97ec8
page{ page {
height: 100%; height: 100%;
width: 100%; width: 100%;
background: #f4f4f4; background: #f4f4f4;
} }
.order-info{ .order-info {
padding-top: 25rpx; padding-top: 25rpx;
background: #fff; background: #fff;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.item-a{ .item-a {
padding-left: 31.25rpx; padding-left: 31.25rpx;
height: 42.5rpx; height: 42.5rpx;
padding-bottom: 12.5rpx; padding-bottom: 12.5rpx;
line-height: 30rpx; line-height: 30rpx;
font-size: 30rpx; font-size: 30rpx;
color: #666; color: #666;
} }
.item-b{ .item-b {
padding-left: 31.25rpx; padding-left: 31.25rpx;
height: 29rpx; height: 29rpx;
line-height: 29rpx; line-height: 29rpx;
margin-top: 12.5rpx; margin-top: 12.5rpx;
margin-bottom: 41.5rpx; margin-bottom: 41.5rpx;
font-size: 30rpx; font-size: 30rpx;
color: #666; color: #666;
} }
.item-c{ .item-c {
margin-left: 31.25rpx; margin-left: 31.25rpx;
border-top: 1px solid #f4f4f4; border-top: 1px solid #f4f4f4;
height: 103rpx; height: 103rpx;
line-height: 103rpx; line-height: 103rpx;
} }
.item-c .l{ .item-c .l {
float: left; float: left;
} }
.item-c .r{ .item-c .r {
height: 103rpx; height: 103rpx;
float: right; float: right;
display: flex; display: flex;
align-items: center; align-items: center;
padding-right: 16rpx; padding-right: 16rpx;
} }
.item-c .r .btn{ .item-c .r .btn {
float: right; float: right;
} }
.item-c .cost{ .item-c .cost {
color: #b4282d; color: #b4282d;
} }
.item-c .btn{ .item-c .btn {
line-height: 66rpx; line-height: 66rpx;
border-radius: 5rpx; border-radius: 5rpx;
text-align: center; text-align: center;
margin: 0 15rpx; margin: 0 15rpx;
padding: 0 20rpx; padding: 0 20rpx;
height: 66rpx; height: 66rpx;
} }
.item-c .btn.active{ .item-c .btn.active {
background: #b4282d; background: #b4282d;
color: #fff; color: #fff;
} }
.order-goods{ .order-goods {
margin-top: 20rpx; margin-top: 20rpx;
background: #fff; background: #fff;
} }
.order-goods .h{ .order-goods .h {
height: 93.75rpx; height: 93.75rpx;
line-height: 93.75rpx; line-height: 93.75rpx;
margin-left: 31.25rpx; margin-left: 31.25rpx;
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
padding-right: 31.25rpx; padding-right: 31.25rpx;
} }
.order-goods .h .label{ .order-goods .h .label {
float: left; float: left;
font-size: 30rpx; font-size: 30rpx;
color: #333; color: #333;
} }
.order-goods .h .status{ .order-goods .h .status {
float: right; float: right;
font-size: 30rpx; font-size: 30rpx;
color: #b4282d; color: #b4282d;
} }
.order-goods .item{ .order-goods .item {
display: flex; display: flex;
align-items: center; align-items: center;
height: 192rpx; height: 192rpx;
margin-left: 31.25rpx; margin-left: 31.25rpx;
padding-right: 31.25rpx; padding-right: 31.25rpx;
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
} }
.order-goods .item:last-child{ .order-goods .item:last-child {
border-bottom: none; border-bottom: none;
} }
.order-goods .item .img{ .order-goods .item .img {
height: 145.83rpx; height: 145.83rpx;
width: 145.83rpx; width: 145.83rpx;
background: #f4f4f4; background: #f4f4f4;
} }
.order-goods .item .img image{ .order-goods .item .img image {
height: 145.83rpx; height: 145.83rpx;
width: 145.83rpx; width: 145.83rpx;
} }
.order-goods .item .info{ .order-goods .item .info {
flex: 1; flex: 1;
height: 145.83rpx; height: 145.83rpx;
margin-left: 20rpx; margin-left: 20rpx;
} }
.order-goods .item .t{ .order-goods .item .t {
margin-top: 8rpx; margin-top: 8rpx;
height: 33rpx; height: 33rpx;
line-height: 33rpx; line-height: 33rpx;
margin-bottom: 10.5rpx; margin-bottom: 10.5rpx;
} }
.order-goods .item .t .name{ .order-goods .item .t .name {
display: block; display: block;
float: left; float: left;
height: 33rpx; height: 33rpx;
line-height: 33rpx; line-height: 33rpx;
color: #333; color: #333;
font-size: 30rpx; font-size: 30rpx;
} }
.order-goods .item .t .number{ .order-goods .item .t .number {
display: block; display: block;
float: right; float: right;
height: 33rpx; height: 33rpx;
text-align: right; text-align: right;
line-height: 33rpx; line-height: 33rpx;
color: #333; color: #333;
font-size: 30rpx; font-size: 30rpx;
} }
.order-goods .item .attr{ .order-goods .item .attr {
height: 29rpx; height: 29rpx;
line-height: 29rpx; line-height: 29rpx;
color: #666; color: #666;
margin-bottom: 25rpx; margin-bottom: 25rpx;
font-size: 25rpx; font-size: 25rpx;
} }
.order-goods .item .price{ .order-goods .item .price {
display: block; display: block;
float: left; float: left;
height: 30rpx; height: 30rpx;
line-height: 30rpx; line-height: 30rpx;
color: #333; color: #333;
font-size: 30rpx; font-size: 30rpx;
} }
.order-goods .item .btn{ .order-goods .item .btn {
height: 50rpx; height: 50rpx;
line-height: 50rpx; line-height: 50rpx;
border-radius: 5rpx; border-radius: 5rpx;
text-align: center; text-align: center;
display: block; display: block;
float: right; float: right;
margin: 0 15rpx; margin: 0 15rpx;
padding: 0 20rpx; padding: 0 20rpx;
} }
.order-goods .item .btn.active{ .order-goods .item .btn.active {
background: #b4282d; background: #b4282d;
color: #fff; color: #fff;
} }
.order-bottom{ .order-bottom {
margin-top: 20rpx; margin-top: 20rpx;
padding-left: 31.25rpx; padding-left: 31.25rpx;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
} }
.order-bottom .address{ .order-bottom .address {
height: 128rpx; height: 128rpx;
padding-top: 25rpx; padding-top: 25rpx;
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
} }
.order-bottom .address .t{ .order-bottom .address .t {
height: 35rpx; height: 35rpx;
line-height: 35rpx; line-height: 35rpx;
margin-bottom: 7.5rpx; margin-bottom: 7.5rpx;
} }
.order-bottom .address .name{ .order-bottom .address .name {
display: inline-block; display: inline-block;
height: 35rpx; height: 35rpx;
width: 140rpx; width: 140rpx;
line-height: 35rpx; line-height: 35rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.order-bottom .address .mobile{ .order-bottom .address .mobile {
display: inline-block; display: inline-block;
height: 35rpx; height: 35rpx;
line-height: 35rpx; line-height: 35rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.order-bottom .address .b{ .order-bottom .address .b {
height: 35rpx; height: 35rpx;
line-height: 35rpx; line-height: 35rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.order-bottom .total{ .order-bottom .total {
height: 106rpx; height: 106rpx;
padding-top: 20rpx; padding-top: 20rpx;
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
} }
.order-bottom .total .t{ .order-bottom .total .t {
height: 30rpx; height: 30rpx;
line-height: 30rpx; line-height: 30rpx;
margin-bottom: 7.5rpx; margin-bottom: 7.5rpx;
display: flex; display: flex;
} }
.order-bottom .total .label{ .order-bottom .total .label {
width: 150rpx; width: 150rpx;
display: inline-block; display: inline-block;
height: 35rpx; height: 35rpx;
line-height: 35rpx; line-height: 35rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.order-bottom .total .txt{ .order-bottom .total .txt {
flex: 1; flex: 1;
display: inline-block; display: inline-block;
height: 35rpx; height: 35rpx;
line-height: 35rpx; line-height: 35rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.order-bottom .pay-fee{ .order-bottom .pay-fee {
height: 81rpx; height: 81rpx;
line-height: 81rpx; line-height: 81rpx;
} }
.order-bottom .pay-fee .label{ .order-bottom .pay-fee .label {
display: inline-block; display: inline-block;
width: 140rpx; width: 140rpx;
color: #b4282d; color: #b4282d;
} }
.order-bottom .pay-fee .txt{ .order-bottom .pay-fee .txt {
display: inline-block; display: inline-block;
width: 140rpx; width: 140rpx;
color: #b4282d; color: #b4282d;
} }
.order-express { .order-express {
margin-top: 20rpx; margin-top: 20rpx;
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
background: #fff; background: #fff;
} }
.order-express .title { .order-express .title {
float: left; float: left;
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding: 10rpx; padding: 10rpx;
} }
.order-express .ti { .order-express .ti {
float: right; float: right;
width: 52rpx; width: 52rpx;
height: 52rpx; height: 52rpx;
margin-right: 16rpx; margin-right: 16rpx;
margin-top: 28rpx; margin-top: 28rpx;
} }
.order-express .t { .order-express .t {
font-size: 29rpx; font-size: 29rpx;
margin-left: 10.25rpx; margin-left: 10.25rpx;
color: #a78845; color: #a78845;
} }
.order-express .b { .order-express .b {
font-size: 29rpx; font-size: 29rpx;
margin-left: 10.25rpx; margin-left: 10.25rpx;
color: #a78845; color: #a78845;
} }
.order-express .traces { .order-express .traces {
padding: 17.5rpx; padding: 17.5rpx;
background: #fff; background: #fff;
border-bottom: 1rpx solid #f1e6cdcc; border-bottom: 1rpx solid #f1e6cdcc;
} }
.order-express .trace { .order-express .trace {
padding-bottom: 17.5rpx; padding-bottom: 17.5rpx;
padding-top: 17.5rpx; padding-top: 17.5rpx;
background: #fff; background: #fff;
} }
.order-express .acceptTime { .order-express .acceptTime {
margin-top: 20rpx; margin-top: 20rpx;
margin-right: 40rpx; margin-right: 40rpx;
text-align: right; text-align: right;
font-size: 26rpx; font-size: 26rpx;
} }
.order-express .acceptStation { .order-express .acceptStation {
font-size: 26rpx; font-size: 26rpx;
} }
litemall-wx/project.config.json
View file @ 20b97ec8
{ {
"description": "项目配置文件。", "description": "项目配置文件。",
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": true, "es6": true,
"postcss": true, "postcss": true,
"minified": true, "minified": true,
"newFeature": true "newFeature": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "1.9.93", "libVersion": "1.9.93",
"appid": "wxa5b486c6b918ecfb", "appid": "wxa5b486c6b918ecfb",
"projectname": "litemall-wx", "projectname": "litemall-wx",
"condition": { "condition": {
"search": { "search": {
"current": -1, "current": -1,
"list": [] "list": []
}, },
"conversation": { "conversation": {
"current": -1, "current": -1,
"list": [] "list": []
}, },
"plugin": { "plugin": {
"current": -1, "current": -1,
"list": [] "list": []
}, },
"game": { "game": {
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 34, "current": 34,
"list": [ "list": [
{ {
"id": -1, "id": -1,
"name": "首页", "name": "首页",
"pathName": "pages/index/index", "pathName": "pages/index/index",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "专题", "name": "专题",
"pathName": "pages/topic/topic", "pathName": "pages/topic/topic",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "专题详情", "name": "专题详情",
"pathName": "pages/topicDetail/topicDetail", "pathName": "pages/topicDetail/topicDetail",
"query": "id=314" "query": "id=314"
}, },
{ {
"id": -1, "id": -1,
"name": "专题评论列表", "name": "专题评论列表",
"pathName": "pages/topicComment/topicComment", "pathName": "pages/topicComment/topicComment",
"query": "valueId=314&type=1" "query": "valueId=314&type=1"
}, },
{ {
"id": -1, "id": -1,
"name": "专题评论添加", "name": "专题评论添加",
"pathName": "pages/topicCommentPost/topicCommentPost", "pathName": "pages/topicCommentPost/topicCommentPost",
"query": "valueId=314&type=1" "query": "valueId=314&type=1"
}, },
{ {
"id": -1, "id": -1,
"name": "品牌", "name": "品牌",
"pathName": "pages/brand/brand", "pathName": "pages/brand/brand",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "品牌详情", "name": "品牌详情",
"pathName": "pages/brandDetail/brandDetail", "pathName": "pages/brandDetail/brandDetail",
"query": "id=1001000" "query": "id=1001000"
}, },
{ {
"id": -1, "id": -1,
"name": "人气推荐", "name": "人气推荐",
"pathName": "pages/hotGoods/hotGoods", "pathName": "pages/hotGoods/hotGoods",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "新品首发", "name": "新品首发",
"pathName": "pages/newGoods/newGoods", "pathName": "pages/newGoods/newGoods",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "分类", "name": "分类",
"pathName": "pages/catalog/catalog", "pathName": "pages/catalog/catalog",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "分类详情", "name": "分类详情",
"pathName": "pages/category/category", "pathName": "pages/category/category",
"query": "id=1008002" "query": "id=1008002"
}, },
{ {
"id": -1, "id": -1,
"name": "查找", "name": "查找",
"pathName": "pages/search/search", "pathName": "pages/search/search",
"query": "" "query": ""
}, },
{ {
"id": 12, "id": 12,
"name": "商品", "name": "商品",
"pathName": "pages/goods/goods", "pathName": "pages/goods/goods",
"query": "id=1181003" "query": "id=1181003"
}, },
{ {
"id": -1, "id": -1,
"name": "商品评论列表", "name": "商品评论列表",
"pathName": "pages/comment/comment", "pathName": "pages/comment/comment",
"query": "valueId=1181000&type=0" "query": "valueId=1181000&type=0"
}, },
{ {
"id": -1, "id": -1,
"name": "购物车", "name": "购物车",
"pathName": "pages/cart/cart", "pathName": "pages/cart/cart",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "下单", "name": "下单",
"pathName": "pages/checkout/checkout", "pathName": "pages/checkout/checkout",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "支付结果", "name": "支付结果",
"pathName": "pages/payResult/payResult", "pathName": "pages/payResult/payResult",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "我的", "name": "我的",
"pathName": "pages/ucenter/index/index", "pathName": "pages/ucenter/index/index",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "我的订单列表", "name": "我的订单列表",
"pathName": "pages/ucenter/order/order", "pathName": "pages/ucenter/order/order",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "我的订单详情", "name": "我的订单详情",
"pathName": "pages/ucenter/orderDetail/orderDetail", "pathName": "pages/ucenter/orderDetail/orderDetail",
"query": "id=1" "query": "id=1"
}, },
{ {
"id": 22, "id": 22,
"name": "待评价的订单详情", "name": "待评价的订单详情",
"pathName": "pages/ucenter/orderDetail/orderDetail", "pathName": "pages/ucenter/orderDetail/orderDetail",
"query": "id=1" "query": "id=1"
}, },
{ {
"id": -1, "id": -1,
"name": "购买商品评价", "name": "购买商品评价",
"pathName": "pages/commentPost/commentPost", "pathName": "pages/commentPost/commentPost",
"query": "orderId=2&type=0&valueId=1116011" "query": "orderId=2&type=0&valueId=1116011"
}, },
{ {
"id": -1, "id": -1,
"name": "我的优惠券", "name": "我的优惠券",
"pathName": "pages/ucenter/coupon/coupon", "pathName": "pages/ucenter/coupon/coupon",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "我的收藏", "name": "我的收藏",
"pathName": "pages/ucenter/collect/collect", "pathName": "pages/ucenter/collect/collect",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "我的足迹", "name": "我的足迹",
"pathName": "pages/ucenter/footprint/footprint", "pathName": "pages/ucenter/footprint/footprint",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "我的地址", "name": "我的地址",
"pathName": "pages/ucenter/address/address", "pathName": "pages/ucenter/address/address",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "我的地址添加", "name": "我的地址添加",
"pathName": "pages/ucenter/addressAdd/addressAdd", "pathName": "pages/ucenter/addressAdd/addressAdd",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "登录", "name": "登录",
"pathName": "pages/auth/login/login", "pathName": "pages/auth/login/login",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "账号登录", "name": "账号登录",
"pathName": "pages/auth/accountLogin/accountLogin", "pathName": "pages/auth/accountLogin/accountLogin",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "注册", "name": "注册",
"pathName": "pages/auth/register/register", "pathName": "pages/auth/register/register",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "找回密码", "name": "找回密码",
"pathName": "pages/auth/reset/reset", "pathName": "pages/auth/reset/reset",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "关于", "name": "关于",
"pathName": "pages/about/about", "pathName": "pages/about/about",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "测试更新", "name": "测试更新",
"pathName": "pages/index/index", "pathName": "pages/index/index",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "意见反馈", "name": "意见反馈",
"pathName": "pages/ucenter/feedback/feedback", "pathName": "pages/ucenter/feedback/feedback",
"query": "" "query": ""
}, },
{ {
"id": -1, "id": -1,
"name": "团购专区", "name": "团购专区",
"pathName": "pages/groupon/grouponList/grouponList", "pathName": "pages/groupon/grouponList/grouponList",
"query": "" "query": ""
} }
] ]
} }
} }
} }
\ No newline at end of file
litemall-wx/utils/check.js
View file @ 20b97ec8
...@@ -5,7 +5,7 @@ function isValidPhone(str) { ...@@ -5,7 +5,7 @@ function isValidPhone(str) {
} else { } else {
return true; return true;
} }
} }
module.exports = { module.exports = {
isValidPhone isValidPhone
......
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