520483d3 by simon

默认提交

1 parent d845adea
......@@ -7,6 +7,7 @@ let app = getApp();
Page({
data: {
authorizeVisible: false,
isInit: false,
total: 0,
page: 1,
size: 10,
......@@ -98,7 +99,8 @@ Page({
dataList = this.data.dataList.concat(dataList);
this.setData({
dataList: dataList,
total: result.total
total: result.total,
isInit: true,
})
resolve();
})
......
......@@ -42,7 +42,11 @@ $contentWidth:690px;
align-items: center;
.prize {
margin: 0 24px;
margin: 0 20px;
border: solid 1PX #F0F0F0;
border-radius: 8px;
padding: 12px;
.image {
width: 120px;
......@@ -50,11 +54,12 @@ $contentWidth:690px;
}
}
.cont {
position: relative;
height: 100%;
flex: 1;
padding-right: 8px;
// padding-right: 8px;
@extend .bb;
.t1 {
......
......@@ -31,7 +31,7 @@
</view>
</view>
</view>
<empty-tips-light inner-text="当前未有拍卖活动,敬请期待" wx:if="{{dataList.length <= 0}}"></empty-tips-light>
<empty-tips-light inner-text="当前未有拍卖活动,敬请期待" wx:if="{{dataList.length <= 0 && isInit}}"></empty-tips-light>
</view>
</view>
<van-popup show="{{ authorizeVisible }}">
......
......@@ -7,10 +7,12 @@ let app = getApp();
Page({
data: {
authorizeVisible: false,
isInit: false,
total: 0,
page: 1,
size: 10,
dataList: [],
},
onShareAppMessage() {},
showAuth() {
......@@ -57,17 +59,21 @@ Page({
size: this.data.size,
}
}).then((result) => {
// if (!result) return;
// if (!result.list) return;
// let dataList = result.list;
// dataList.forEach(element => {
// element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd hh:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd hh:mm");
// });
// dataList = this.data.dataList.concat(dataList);
// console.log("dataList:", dataList);
if (!result) return;
if (!result.list) return;
let dataList = result.list;
dataList.forEach(element => {
element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd hh:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd hh:mm");
});
dataList = this.data.dataList.concat(dataList);
dataList.forEach(element => {
element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd hh:mm:ss");
});
console.log("dataList:", dataList);
this.setData({
dataList: result,
total: result.total || 0
dataList: dataList,
total: result.total || 0,
isInit: true,
})
resolve();
})
......
......@@ -22,6 +22,7 @@ $contentWidth:690px;
.list {
width: $contentWidth;
margin: 24px auto 0;
font-size: 22px;
&-item {
@extend .bb;
......@@ -31,7 +32,11 @@ $contentWidth:690px;
align-items: center;
.prize {
margin: 0 24px;
margin: 0 32px;
border:solid 1PX #F0F0F0;
border-radius: 8px;
padding: 16px;
.image {
width: 160px;
......@@ -43,15 +48,34 @@ $contentWidth:690px;
position: relative;
height: 100%;
flex: 1;
padding: 0 8px 0 12px;
// padding: 0 0 0 16px;
@extend .bb;
.tt{
.tt {}
.t1 {
font-size: 32px;
}
.t1 {
font-size: 30px;
.t2 {
font-size: 26px;
margin-top: 8px;
}
.t3 {
font-size: 26px;
font-weight: bold;
margin-top: 4px;
}
.t4 {
font-size: 22px;
margin-top: 4px;
color: #666666;
}
.sp4{
margin-top: 24px;
}
}
......
<wxs module="filter" src="../../utils/utilswxs.wxs"></wxs>
<view class="page">
<view class="app__bgc bgc"></view>
<view class="app__bg bg"></view>
......@@ -12,10 +13,15 @@
</view>
<view class="cont">
<view class="tt t1">{{item.auctionName}}</view>
<view class="tt t2">原价:{{filter.Fen2Yuan(item.originalPrice)}}元</view>
<view class="tt t3 price">竞拍价格:{{filter.Fen2Yuan(item.auctionPrice)}}元</view>
<view class="tt t4 sp4">订单编号:A20191008103818293X</view>
<view class="tt t4">竞拍时间:{{item.auctionTime}}</view>
</view>
</view>
</view>
</view>
<empty-tips-light inner-text="这里空空如也~" wx:if="{{dataList.length <= 0 && isInit}}"></empty-tips-light>
</view>
</view>
<van-popup show="{{ authorizeVisible }}">
......