@@ -54,7 +54,7 @@ | |||||
</view> | </view> | ||||
<view class="item moreItem" bindtap="lookAll"> | <view class="item moreItem" bindtap="lookAll"> | ||||
<view class="noDataImg"> | <view class="noDataImg"> | ||||
<image class="img" src="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_img_zwlp.png"></image> | |||||
<image class="img" src="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/gift.png"></image> | |||||
</view> | </view> | ||||
<view class="noDataText">查看更多优惠活动</view> | <view class="noDataText">查看更多优惠活动</view> | ||||
</view> | </view> | ||||
@@ -102,6 +102,7 @@ Page({ | |||||
}, | }, | ||||
//是否授权手机号 | //是否授权手机号 | ||||
ifPhoneInfo() { | ifPhoneInfo() { | ||||
const that = this | |||||
Http.get({ | Http.get({ | ||||
url: config.api.checkPhoneStatus, | url: config.api.checkPhoneStatus, | ||||
data: {} | data: {} | ||||
@@ -175,7 +175,7 @@ | |||||
</button> | </button> | ||||
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type !=8 && data.type !=50 && data.type != 51 && priceAndStockObj.salePrice / 100 == 0 && priceAndStockObj.remainInventory !=0 && endtime != '活动已结束' && data.activityStatus != 0}}">免费领取</button> | <button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type !=8 && data.type !=50 && data.type != 51 && priceAndStockObj.salePrice / 100 == 0 && priceAndStockObj.remainInventory !=0 && endtime != '活动已结束' && data.activityStatus != 0}}">免费领取</button> | ||||
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type == 51 && priceAndStockObj.remainInventory !=0 || data.type == 50 && priceAndStockObj.remainInventory != 0}}">马上兑换</button> | |||||
<button form-type="submit" disabled='{{showbutton || activityStatus == 0}}' class='buy' wx:if="{{data.type == 51 && (priceAndStockObj.remainInventory !=0 || data.type == 50) && priceAndStockObj.remainInventory != 0 }}">马上兑换</button> | |||||
<button class='buy buyHr' disabled='true' wx:if="{{data.sendType !=3 && (priceAndStockObj.remainInventory ==0 && endtime != '活动已结束' || priceAndStockObj.remainInventory ==0 && data.type == 8)}}">已售罄</button> | <button class='buy buyHr' disabled='true' wx:if="{{data.sendType !=3 && (priceAndStockObj.remainInventory ==0 && endtime != '活动已结束' || priceAndStockObj.remainInventory ==0 && data.type == 8)}}">已售罄</button> | ||||
@@ -61,7 +61,8 @@ Page({ | |||||
}); | }); | ||||
that.getList(options.id); | that.getList(options.id); | ||||
that.getCouponList(options.id); | that.getCouponList(options.id); | ||||
that.checkPhoneStatus() | |||||
// 2023-5-19,因微信公众平台审核无法通过,此页面不再要求授权手机号 | |||||
// that.checkPhoneStatus() | |||||
that.setData({ | that.setData({ | ||||
currentTab: 0 | currentTab: 0 | ||||
}) | }) | ||||
@@ -31,12 +31,10 @@ | |||||
<view class='rest' wx:if="{{data.validType==1}}" style="margin-bottom: 15rpx;"> | <view class='rest' wx:if="{{data.validType==1}}" style="margin-bottom: 15rpx;"> | ||||
<view class='timeX' style="margin-bottom: 10rpx;"> | <view class='timeX' style="margin-bottom: 10rpx;"> | ||||
售卖期:{{data.soldStartTime}} 至 {{data.soldEndTime}} | 售卖期:{{data.soldStartTime}} 至 {{data.soldEndTime}} | ||||
<text class="use"> (请在售卖期内购买)</text> | |||||
</view> | </view> | ||||
<view class='timeX'> | <view class='timeX'> | ||||
使用期:{{data.validStartDate}} 至 {{data.validEndDate}} | 使用期:{{data.validStartDate}} 至 {{data.validEndDate}} | ||||
<text class="use"> (请在使用期内使用)</text> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -446,7 +446,7 @@ button::after { | |||||
.timeX { | .timeX { | ||||
display: block; | display: block; | ||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #333; | |||||
color: #7c7c7c; | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
line-height: 33rpx; | line-height: 33rpx; | ||||
} | } | ||||