@@ -2,8 +2,8 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; | |||||
var appId = extConfig.appId; | var appId = extConfig.appId; | ||||
var config = { | var config = { | ||||
// url: "https://ciformall.youlane.cn/C/api", | // url: "https://ciformall.youlane.cn/C/api", | ||||
url:"https://c.malls.iformall.com/C/api", | |||||
// url:'https://ctest.malls.iformall.com/C/api', | |||||
// url:"https://c.malls.iformall.com/C/api", | |||||
url:'https://ctest.malls.iformall.com/C/api', | |||||
// url:'http://10.100.33.68:7000/C/api', | // url:'http://10.100.33.68:7000/C/api', | ||||
// url: 'http://202.165.179.86:4000/C/api', | // url: 'http://202.165.179.86:4000/C/api', | ||||
api: { | api: { | ||||
@@ -203,7 +203,7 @@ var config = { | |||||
}, | }, | ||||
weapp: { | weapp: { | ||||
AppId: "wx30caec1cc16c4634" | |||||
AppId: "wx649b3be73c1afe47" | |||||
}, | }, | ||||
ErrorCode: { | ErrorCode: { | ||||
@@ -234,15 +234,6 @@ Page({ | |||||
that.countdown(res.data.endTime); | that.countdown(res.data.endTime); | ||||
//当前时间与优惠券下架时间做计算 | //当前时间与优惠券下架时间做计算 | ||||
var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss"); | var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss"); | ||||
if (util.timechuo(endTime).indexOf('-') == 0) { | |||||
that.setData({ | |||||
endtime: "活动已结束", | |||||
}); | |||||
} else { | |||||
that.setData({ | |||||
endtime: util.timechuo(endTime) | |||||
}); | |||||
} | |||||
} | } | ||||
wx.hideLoading(); | wx.hideLoading(); | ||||
that.setData({ | that.setData({ | ||||
@@ -1,5 +1,4 @@ | |||||
<view wx:if="{{showPage}}"> | <view wx:if="{{showPage}}"> | ||||
<!-- 券的详情页面 --> | |||||
<view class='coupons'> | <view class='coupons'> | ||||
<view class="coupons-body"> | <view class="coupons-body"> | ||||
<view class='banner'> | <view class='banner'> | ||||
@@ -11,24 +10,6 @@ | |||||
<button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button> | <button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button> | ||||
</view> | </view> | ||||
<view> | <view> | ||||
<view class='distance' wx:if="{{data.targetAd==2&&data.endTime!=undefined&&data.type!=5}}"> | |||||
<view style='text-align:center;display:inline-block;'> | |||||
<image class='clock' src='{{clockUrl}}' mode='widthFix'></image> | |||||
<text class="qiang">距结束还剩 :</text> | |||||
</view> | |||||
<view wx:if="{{clock=='已经截止'||data.remainInventory==0||data.status==1}}" class='times'> | |||||
<text>{{day}}</text>天 | |||||
<text>{{hour}}</text>: | |||||
<text>{{min}}</text>: | |||||
<text>{{sec}}</text> | |||||
</view> | |||||
<view wx:if="{{clock!='已经截止'&&data.remainInventory!=0}}" class='times'> | |||||
<text>{{day}}</text>天 | |||||
<text>{{hour}}</text>: | |||||
<text>{{min}}</text>: | |||||
<text>{{sec}}</text> | |||||
</view> | |||||
</view> | |||||
<text class='title'>{{data.title}}</text> | <text class='title'>{{data.title}}</text> | ||||
<text class="subTitle">{{data.subTitle}}</text> | <text class="subTitle">{{data.subTitle}}</text> | ||||
<view class='salePriceStr clearfix'> | <view class='salePriceStr clearfix'> | ||||
@@ -17,13 +17,11 @@ | |||||
<text class="qiang">距结束还剩 :</text> | <text class="qiang">距结束还剩 :</text> | ||||
</view> | </view> | ||||
<view wx:if="{{clock=='已经截止'||data.remainInventory==0||data.status==1}}" class='times'> | <view wx:if="{{clock=='已经截止'||data.remainInventory==0||data.status==1}}" class='times'> | ||||
<text>{{day}}</text>天 | |||||
<text>{{hour}}</text>: | <text>{{hour}}</text>: | ||||
<text>{{min}}</text>: | <text>{{min}}</text>: | ||||
<text>{{sec}}</text> | <text>{{sec}}</text> | ||||
</view> | </view> | ||||
<view wx:if="{{clock!='已经截止'&&data.remainInventory!=0}}" class='times'> | <view wx:if="{{clock!='已经截止'&&data.remainInventory!=0}}" class='times'> | ||||
<text>{{day}}</text>天 | |||||
<text>{{hour}}</text>: | <text>{{hour}}</text>: | ||||
<text>{{min}}</text>: | <text>{{min}}</text>: | ||||
<text>{{sec}}</text> | <text>{{sec}}</text> | ||||
@@ -13,7 +13,7 @@ | |||||
}, | }, | ||||
"compileType": "miniprogram", | "compileType": "miniprogram", | ||||
"libVersion": "2.0.9", | "libVersion": "2.0.9", | ||||
"appid": "wx30caec1cc16c4634", | |||||
"appid": "wx649b3be73c1afe47", | |||||
"projectname": "C", | "projectname": "C", | ||||
"isGameTourist": false, | "isGameTourist": false, | ||||
"condition": { | "condition": { | ||||
@@ -92,7 +92,7 @@ function timechuo(startTime) { | |||||
var minute = Math.floor(runTime / 60); | var minute = Math.floor(runTime / 60); | ||||
var runTime = runTime % 60; | var runTime = runTime % 60; | ||||
var second = runTime; | var second = runTime; | ||||
return (day+"天"+hour+"小时"+minute+"分钟") | |||||
return (hour+"小时"+minute+"分钟") | |||||
} | } | ||||