2840b195 by simon

默认提交

1 parent 284f82e1
......@@ -39,7 +39,7 @@ Page({
let {
productInfo
} = this.data;
let title = `${productInfo.auctionName}拍卖热烈进行中!`;
let title = `${productInfo.auctionName}竞价热烈进行中!`;
let path = `pages/auction-detail/auction-detail?code=${productInfo.auctionCode}&share=true`;
let imageUrl = productInfo && productInfo.auctionImages[0] || "";
return {
......@@ -187,9 +187,6 @@ Page({
productInfo: result
});
console.log("queryAuctionDetail result:", result);
// wx.setNavigationBarTitle({
// title: result.auctionName || "拍卖活动"
// })
resolve();
}).catch((err) => {
if (err.code == 1002) {
......
{
"navigationBarTitleText": "拍卖活动"
"navigationBarTitleText": "竞价活动"
}
......
......@@ -24,9 +24,9 @@
<text class="t1">当前价格</text>
</view>
<view class="func-ele func-right {{productInfo.status != 1 || isTimeEnd ? 'disable' : ''}}">
<text wx:if="{{productInfo.status == 0}}" class="t1 t2">拍卖未开始</text>
<text wx:if="{{productInfo.status == 1}}" class="t1">拍卖进行中</text>
<text wx:if="{{productInfo.status == 2}}" class="t1 t2">拍卖已结束</text>
<text wx:if="{{productInfo.status == 0}}" class="t1 t2">竞价未开始</text>
<text wx:if="{{productInfo.status == 1}}" class="t1">竞价进行中</text>
<text wx:if="{{productInfo.status == 2}}" class="t1 t2">竞价已结束</text>
<text wx:if="{{productInfo.status == 1}}" class="t1 date">{{lastTime}}</text>
</view>
</view>
......
{
"navigationBarTitleText": "拍卖活动"
"navigationBarTitleText": "竞价活动"
}
......
......@@ -7,7 +7,7 @@
<view class="content">
<!-- 我的拍卖按钮 -->
<view class="my-btn">
<view bindtap="onShowAuctionMineHandler" class="btn">我的拍卖</view>
<view bindtap="onShowAuctionMineHandler" class="btn">我的竞价</view>
</view>
<view class="list">
<view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
......@@ -30,7 +30,7 @@
</view>
</view>
</view>
<empty-tips-light inner-text="当前未有拍卖活动,敬请期待" wx:if="{{dataList.length <= 0 && isInit}}"></empty-tips-light>
<empty-tips-light inner-text="当前未有竞价活动,敬请期待" wx:if="{{dataList.length <= 0 && isInit}}"></empty-tips-light>
</view>
</view>
<van-popup show="{{ authorizeVisible }}">
......
......@@ -53,7 +53,7 @@
</view>
<view bindtap="onAuctionHandler" class="nav-item">
<image class="icon" mode="widthFix" src="../../image/index/icon-auction.png" />
<view class="t1">拍卖</view>
<view class="t1">竞价</view>
</view>
</view>
<!-- 轮播 banner -->
......
......@@ -103,7 +103,7 @@
<view class="icon-wrap">
<span class="iconfont iconpaimai icon"></span>
</view>
<view class="txt">拍卖</view>
<view class="txt">竞价</view>
</view>
<view bindtap="onSeckillHandler" data-index="1" class="active-item">
<view class="icon-wrap">
......