2840b195 by simon

默认提交

1 parent 284f82e1
...@@ -39,7 +39,7 @@ Page({ ...@@ -39,7 +39,7 @@ Page({
39 let { 39 let {
40 productInfo 40 productInfo
41 } = this.data; 41 } = this.data;
42 let title = `${productInfo.auctionName}拍卖热烈进行中!`; 42 let title = `${productInfo.auctionName}竞价热烈进行中!`;
43 let path = `pages/auction-detail/auction-detail?code=${productInfo.auctionCode}&share=true`; 43 let path = `pages/auction-detail/auction-detail?code=${productInfo.auctionCode}&share=true`;
44 let imageUrl = productInfo && productInfo.auctionImages[0] || ""; 44 let imageUrl = productInfo && productInfo.auctionImages[0] || "";
45 return { 45 return {
...@@ -187,9 +187,6 @@ Page({ ...@@ -187,9 +187,6 @@ Page({
187 productInfo: result 187 productInfo: result
188 }); 188 });
189 console.log("queryAuctionDetail result:", result); 189 console.log("queryAuctionDetail result:", result);
190 // wx.setNavigationBarTitle({
191 // title: result.auctionName || "拍卖活动"
192 // })
193 resolve(); 190 resolve();
194 }).catch((err) => { 191 }).catch((err) => {
195 if (err.code == 1002) { 192 if (err.code == 1002) {
......
1 { 1 {
2 "navigationBarTitleText": "拍卖活动" 2 "navigationBarTitleText": "竞价活动"
3 } 3 }
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
24 <text class="t1">当前价格</text> 24 <text class="t1">当前价格</text>
25 </view> 25 </view>
26 <view class="func-ele func-right {{productInfo.status != 1 || isTimeEnd ? 'disable' : ''}}"> 26 <view class="func-ele func-right {{productInfo.status != 1 || isTimeEnd ? 'disable' : ''}}">
27 <text wx:if="{{productInfo.status == 0}}" class="t1 t2">拍卖未开始</text> 27 <text wx:if="{{productInfo.status == 0}}" class="t1 t2">竞价未开始</text>
28 <text wx:if="{{productInfo.status == 1}}" class="t1">拍卖进行中</text> 28 <text wx:if="{{productInfo.status == 1}}" class="t1">竞价进行中</text>
29 <text wx:if="{{productInfo.status == 2}}" class="t1 t2">拍卖已结束</text> 29 <text wx:if="{{productInfo.status == 2}}" class="t1 t2">竞价已结束</text>
30 <text wx:if="{{productInfo.status == 1}}" class="t1 date">{{lastTime}}</text> 30 <text wx:if="{{productInfo.status == 1}}" class="t1 date">{{lastTime}}</text>
31 </view> 31 </view>
32 </view> 32 </view>
......
1 { 1 {
2 "navigationBarTitleText": "拍卖活动" 2 "navigationBarTitleText": "竞价活动"
3 } 3 }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <view class="content"> 7 <view class="content">
8 <!-- 我的拍卖按钮 --> 8 <!-- 我的拍卖按钮 -->
9 <view class="my-btn"> 9 <view class="my-btn">
10 <view bindtap="onShowAuctionMineHandler" class="btn">我的拍卖</view> 10 <view bindtap="onShowAuctionMineHandler" class="btn">我的竞价</view>
11 </view> 11 </view>
12 <view class="list"> 12 <view class="list">
13 <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item"> 13 <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 </view> 30 </view>
31 </view> 31 </view>
32 </view> 32 </view>
33 <empty-tips-light inner-text="当前未有拍卖活动,敬请期待" wx:if="{{dataList.length <= 0 && isInit}}"></empty-tips-light> 33 <empty-tips-light inner-text="当前未有竞价活动,敬请期待" wx:if="{{dataList.length <= 0 && isInit}}"></empty-tips-light>
34 </view> 34 </view>
35 </view> 35 </view>
36 <van-popup show="{{ authorizeVisible }}"> 36 <van-popup show="{{ authorizeVisible }}">
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 </view> 53 </view>
54 <view bindtap="onAuctionHandler" class="nav-item"> 54 <view bindtap="onAuctionHandler" class="nav-item">
55 <image class="icon" mode="widthFix" src="../../image/index/icon-auction.png" /> 55 <image class="icon" mode="widthFix" src="../../image/index/icon-auction.png" />
56 <view class="t1">拍卖</view> 56 <view class="t1">竞价</view>
57 </view> 57 </view>
58 </view> 58 </view>
59 <!-- 轮播 banner --> 59 <!-- 轮播 banner -->
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 <view class="icon-wrap"> 103 <view class="icon-wrap">
104 <span class="iconfont iconpaimai icon"></span> 104 <span class="iconfont iconpaimai icon"></span>
105 </view> 105 </view>
106 <view class="txt">拍卖</view> 106 <view class="txt">竞价</view>
107 </view> 107 </view>
108 <view bindtap="onSeckillHandler" data-index="1" class="active-item"> 108 <view bindtap="onSeckillHandler" data-index="1" class="active-item">
109 <view class="icon-wrap"> 109 <view class="icon-wrap">
......