默认提交
Showing
6 changed files
with
62 additions
and
19 deletions
| ... | @@ -7,6 +7,7 @@ let app = getApp(); | ... | @@ -7,6 +7,7 @@ let app = getApp(); |
| 7 | Page({ | 7 | Page({ |
| 8 | data: { | 8 | data: { |
| 9 | authorizeVisible: false, | 9 | authorizeVisible: false, |
| 10 | isInit: false, | ||
| 10 | total: 0, | 11 | total: 0, |
| 11 | page: 1, | 12 | page: 1, |
| 12 | size: 10, | 13 | size: 10, |
| ... | @@ -98,7 +99,8 @@ Page({ | ... | @@ -98,7 +99,8 @@ Page({ |
| 98 | dataList = this.data.dataList.concat(dataList); | 99 | dataList = this.data.dataList.concat(dataList); |
| 99 | this.setData({ | 100 | this.setData({ |
| 100 | dataList: dataList, | 101 | dataList: dataList, |
| 101 | total: result.total | 102 | total: result.total, |
| 103 | isInit: true, | ||
| 102 | }) | 104 | }) |
| 103 | resolve(); | 105 | resolve(); |
| 104 | }) | 106 | }) | ... | ... |
| ... | @@ -42,7 +42,11 @@ $contentWidth:690px; | ... | @@ -42,7 +42,11 @@ $contentWidth:690px; |
| 42 | align-items: center; | 42 | align-items: center; |
| 43 | 43 | ||
| 44 | .prize { | 44 | .prize { |
| 45 | margin: 0 24px; | 45 | margin: 0 20px; |
| 46 | |||
| 47 | border: solid 1PX #F0F0F0; | ||
| 48 | border-radius: 8px; | ||
| 49 | padding: 12px; | ||
| 46 | 50 | ||
| 47 | .image { | 51 | .image { |
| 48 | width: 120px; | 52 | width: 120px; |
| ... | @@ -50,11 +54,12 @@ $contentWidth:690px; | ... | @@ -50,11 +54,12 @@ $contentWidth:690px; |
| 50 | } | 54 | } |
| 51 | } | 55 | } |
| 52 | 56 | ||
| 57 | |||
| 53 | .cont { | 58 | .cont { |
| 54 | position: relative; | 59 | position: relative; |
| 55 | height: 100%; | 60 | height: 100%; |
| 56 | flex: 1; | 61 | flex: 1; |
| 57 | padding-right: 8px; | 62 | // padding-right: 8px; |
| 58 | @extend .bb; | 63 | @extend .bb; |
| 59 | 64 | ||
| 60 | .t1 { | 65 | .t1 { | ... | ... |
| ... | @@ -31,7 +31,7 @@ | ... | @@ -31,7 +31,7 @@ |
| 31 | </view> | 31 | </view> |
| 32 | </view> | 32 | </view> |
| 33 | </view> | 33 | </view> |
| 34 | <empty-tips-light inner-text="当前未有拍卖活动，敬请期待" wx:if="{{dataList.length <= 0}}"></empty-tips-light> | 34 | <empty-tips-light inner-text="当前未有拍卖活动，敬请期待" wx:if="{{dataList.length <= 0 && isInit}}"></empty-tips-light> |
| 35 | </view> | 35 | </view> |
| 36 | </view> | 36 | </view> |
| 37 | <van-popup show="{{ authorizeVisible }}"> | 37 | <van-popup show="{{ authorizeVisible }}"> | ... | ... |
| ... | @@ -7,10 +7,12 @@ let app = getApp(); | ... | @@ -7,10 +7,12 @@ let app = getApp(); |
| 7 | Page({ | 7 | Page({ |
| 8 | data: { | 8 | data: { |
| 9 | authorizeVisible: false, | 9 | authorizeVisible: false, |
| 10 | isInit: false, | ||
| 10 | total: 0, | 11 | total: 0, |
| 11 | page: 1, | 12 | page: 1, |
| 12 | size: 10, | 13 | size: 10, |
| 13 | dataList: [], | 14 | dataList: [], |
| 15 | |||
| 14 | }, | 16 | }, |
| 15 | onShareAppMessage() {}, | 17 | onShareAppMessage() {}, |
| 16 | showAuth() { | 18 | showAuth() { |
| ... | @@ -57,17 +59,21 @@ Page({ | ... | @@ -57,17 +59,21 @@ Page({ |
| 57 | size: this.data.size, | 59 | size: this.data.size, |
| 58 | } | 60 | } |
| 59 | }).then((result) => { | 61 | }).then((result) => { |
| 60 | // if (!result) return; | 62 | if (!result) return; |
| 61 | // if (!result.list) return; | 63 | if (!result.list) return; |
| 62 | // let dataList = result.list; | 64 | let dataList = result.list; |
| 63 | // dataList.forEach(element => { | 65 | dataList.forEach(element => { |
| 64 | // element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd hh:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd hh:mm"); | 66 | element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd hh:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd hh:mm"); |
| 65 | // }); | 67 | }); |
| 66 | // dataList = this.data.dataList.concat(dataList); | 68 | dataList = this.data.dataList.concat(dataList); |
| 67 | // console.log("dataList:", dataList); | 69 | dataList.forEach(element => { |
| 70 | element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd hh:mm:ss"); | ||
| 71 | }); | ||
| 72 | console.log("dataList:", dataList); | ||
| 68 | this.setData({ | 73 | this.setData({ |
| 69 | dataList: result, | 74 | dataList: dataList, |
| 70 | total: result.total || 0 | 75 | total: result.total || 0, |
| 76 | isInit: true, | ||
| 71 | }) | 77 | }) |
| 72 | resolve(); | 78 | resolve(); |
| 73 | }) | 79 | }) | ... | ... |
| ... | @@ -22,6 +22,7 @@ $contentWidth:690px; | ... | @@ -22,6 +22,7 @@ $contentWidth:690px; |
| 22 | .list { | 22 | .list { |
| 23 | width: $contentWidth; | 23 | width: $contentWidth; |
| 24 | margin: 24px auto 0; | 24 | margin: 24px auto 0; |
| 25 | font-size: 22px; | ||
| 25 | 26 | ||
| 26 | &-item { | 27 | &-item { |
| 27 | @extend .bb; | 28 | @extend .bb; |
| ... | @@ -31,7 +32,11 @@ $contentWidth:690px; | ... | @@ -31,7 +32,11 @@ $contentWidth:690px; |
| 31 | align-items: center; | 32 | align-items: center; |
| 32 | 33 | ||
| 33 | .prize { | 34 | .prize { |
| 34 | margin: 0 24px; | 35 | margin: 0 32px; |
| 36 | |||
| 37 | border:solid 1PX #F0F0F0; | ||
| 38 | border-radius: 8px; | ||
| 39 | padding: 16px; | ||
| 35 | 40 | ||
| 36 | .image { | 41 | .image { |
| 37 | width: 160px; | 42 | width: 160px; |
| ... | @@ -43,15 +48,34 @@ $contentWidth:690px; | ... | @@ -43,15 +48,34 @@ $contentWidth:690px; |
| 43 | position: relative; | 48 | position: relative; |
| 44 | height: 100%; | 49 | height: 100%; |
| 45 | flex: 1; | 50 | flex: 1; |
| 46 | padding: 0 8px 0 12px; | 51 | // padding: 0 0 0 16px; |
| 47 | @extend .bb; | 52 | @extend .bb; |
| 48 | 53 | ||
| 49 | .tt{ | 54 | .tt {} |
| 50 | 55 | ||
| 56 | .t1 { | ||
| 57 | font-size: 32px; | ||
| 51 | } | 58 | } |
| 52 | 59 | ||
| 53 | .t1 { | 60 | .t2 { |
| 54 | font-size: 30px; | 61 | font-size: 26px; |
| 62 | margin-top: 8px; | ||
| 63 | } | ||
| 64 | |||
| 65 | .t3 { | ||
| 66 | font-size: 26px; | ||
| 67 | font-weight: bold; | ||
| 68 | margin-top: 4px; | ||
| 69 | } | ||
| 70 | |||
| 71 | .t4 { | ||
| 72 | font-size: 22px; | ||
| 73 | margin-top: 4px; | ||
| 74 | color: #666666; | ||
| 75 | } | ||
| 76 | |||
| 77 | .sp4{ | ||
| 78 | margin-top: 24px; | ||
| 55 | } | 79 | } |
| 56 | } | 80 | } |
| 57 | 81 | ... | ... |
| 1 | <wxs module="filter" src="../../utils/utilswxs.wxs"></wxs> | ||
| 1 | <view class="page"> | 2 | <view class="page"> |
| 2 | <view class="app__bgc bgc"></view> | 3 | <view class="app__bgc bgc"></view> |
| 3 | <view class="app__bg bg"></view> | 4 | <view class="app__bg bg"></view> |
| ... | @@ -12,10 +13,15 @@ | ... | @@ -12,10 +13,15 @@ |
| 12 | </view> | 13 | </view> |
| 13 | <view class="cont"> | 14 | <view class="cont"> |
| 14 | <view class="tt t1">{{item.auctionName}}</view> | 15 | <view class="tt t1">{{item.auctionName}}</view> |
| 16 | <view class="tt t2">原价：{{filter.Fen2Yuan(item.originalPrice)}}元</view> | ||
| 17 | <view class="tt t3 price">竞拍价格：{{filter.Fen2Yuan(item.auctionPrice)}}元</view> | ||
| 18 | <view class="tt t4 sp4">订单编号：A20191008103818293X</view> | ||
| 19 | <view class="tt t4">竞拍时间：{{item.auctionTime}}</view> | ||
| 15 | </view> | 20 | </view> |
| 16 | </view> | 21 | </view> |
| 17 | </view> | 22 | </view> |
| 18 | </view> | 23 | </view> |
| 24 | <empty-tips-light inner-text="这里空空如也~" wx:if="{{dataList.length <= 0 && isInit}}"></empty-tips-light> | ||
| 19 | </view> | 25 | </view> |
| 20 | </view> | 26 | </view> |
| 21 | <van-popup show="{{ authorizeVisible }}"> | 27 | <van-popup show="{{ authorizeVisible }}"> | ... | ... |
-
Please register or sign in to post a comment