@@ -1,7 +1,8 @@ | |||
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:'http://10.100.33.66:7000/C/api', | |||
api: { | |||
/** | |||
* 接口用途:login | |||
@@ -277,8 +277,14 @@ Page({ | |||
}) | |||
.then(res => { | |||
wx.hideLoading() | |||
console.log(res); | |||
if (!type) { | |||
// 有价券 | |||
if (!type&&type!='free') { | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${ | |||
orderId | |||
}` | |||
}); | |||
}else if(type=='free'){ | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${ | |||
orderId | |||
@@ -488,25 +494,16 @@ Page({ | |||
}) | |||
} else { | |||
// 免费券 | |||
that.payOrderUpdate(orderId, "0", 1, '', 'fail'); | |||
that.payOrderUpdate(orderId, "0", 1, '', 'free'); | |||
wx.setStorage({ | |||
key: 'couponNum', | |||
data: "couponNum" | |||
}) | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${ | |||
that.data.orderId | |||
}` | |||
}); | |||
// setTimeout(function () { | |||
// }, 1000) | |||
// if (that.data.data.type == 5) { | |||
// setTimeout(() => { | |||
// wx.switchTab({ | |||
// url: '/pages/passCar/passCar' | |||
// }); | |||
// }, 1600); | |||
// } | |||
// wx.navigateTo({ | |||
// url: `/pages/order/detail/index?orderId=${ | |||
// that.data.orderId | |||
// }` | |||
// }); | |||
} | |||
} | |||
}) | |||
@@ -90,8 +90,6 @@ | |||
</view> | |||
<view class='game' bindtap="gotogame" wx-if="{{showIf}}"> | |||
<view class='game-entry'> | |||
<image src="{{staticGamedata.imgUrl}}" class='gameimg' mode='widthFix'></image> | |||
<text>用户专享神秘礼物</text> | |||
<text>独家福利,抢完即止</text> | |||
<image src="./../../assets/img/new.png" class='gameimg' mode='widthFix'></image> | |||
</view> | |||
</view> |
@@ -92,15 +92,7 @@ page { | |||
height: 350rpx; | |||
} | |||
/* .fl { | |||
float: left; | |||
} | |||
.fr { | |||
float: right; | |||
} */ | |||
..coupon_detail { | |||
.coupon_detail { | |||
position: relative; | |||
} | |||
@@ -353,47 +345,14 @@ page { | |||
text-align: right; | |||
} | |||
/* 小游戏入口 | |||
*/ | |||
.game-entry{ | |||
.game-entry{ | |||
width: 690rpx; | |||
height: 140rpx; | |||
margin: 0 auto; | |||
border-radius: 14rpx; | |||
box-shadow: 1px 4px 20px #C4C4C4; | |||
background: #fff; | |||
} | |||
.game { | |||
position: relative; | |||
width: 750rpx; | |||
height: 200rpx; | |||
margin: 0 auto; | |||
padding-top: 30rpx; | |||
box-sizing: border-box; | |||
margin: 10rpx auto 0; | |||
} | |||
.gameimg{ | |||
position: absolute; | |||
right: 25rpx; | |||
top: -14rpx; | |||
width: 250rpx; | |||
} | |||
.game text { | |||
display: block; | |||
position: relative; | |||
} | |||
.game text:nth-of-type(1) { | |||
display: inline-block; | |||
padding-top: 39rpx; | |||
padding-left: 70rpx; | |||
font-size: 32rpx; | |||
color: #333; | |||
line-height: 36rpx; | |||
width: 100%; | |||
height: 140rpx; | |||
} | |||
.game text:nth-of-type(2) { | |||
font-size: 24rpx; | |||
color: #999; | |||
line-height: 24rpx; | |||
padding-left: 70rpx; | |||
} |
@@ -159,7 +159,7 @@ Page({ | |||
}); | |||
} else { | |||
// 免费券 | |||
that.payOrderUpdate(orderId, "0", 1,'','fail') // 支付成功 | |||
that.payOrderUpdate(orderId, "0", 1,'','free') // 支付成功 | |||
wx.showToast({ | |||
title: "支付成功", | |||
duration: 2000, | |||
@@ -183,7 +183,7 @@ Page({ | |||
}) | |||
.then(res => { | |||
wx.hideLoading() | |||
if (!type) { | |||
if (!type&&type!='free') { | |||
wx.showToast({ | |||
title: "购买成功", | |||
duration: 2000, | |||
@@ -203,6 +203,10 @@ Page({ | |||
}, 1600); | |||
} | |||
}); | |||
} else if (type == 'free'){ | |||
wx.redirectTo({ | |||
url: `/pages/order/detail/index?orderId=${orderId}` | |||
}); | |||
} | |||
}) | |||
.catch(err => { | |||
@@ -215,19 +219,6 @@ Page({ | |||
}); | |||
}, | |||
/** | |||
* 生命周期函数--监听页面初次渲染完成 | |||
*/ | |||
onShow: function () { | |||
let that = this; | |||
// wx.getScreenBrightness({ | |||
// success: function (res) { | |||
// app.globalData.sight=res.value; | |||
// console.log(app.globalData.sight); | |||
// } | |||
// }); | |||
}, | |||
/** | |||
* 生命周期函数--监听页面隐藏 | |||
*/ | |||
@@ -74,14 +74,12 @@ | |||
</view> | |||
</view> | |||
<!-- 待付款 显示立即购买的按钮 --> | |||
<view wx:if="{{order.orderStatus==0}}" class="buy-view app-border-top"> | |||
<view wx:if="{{order.orderStatus==0&&order.salePrice!=0}}" class="buy-view app-border-top"> | |||
<button bindtap='orderFunc' hover-class='active' data-couponChannelId="{{order.id}}" class='buy'>立即支付</button> | |||
</view> | |||
<view class='game' bindtap="gotogame" wx-if="{{showIf}}"> | |||
<view class='game-entry'> | |||
<image src="{{staticGamedata.imgUrl}}" class='gameimg' mode='widthFix'></image> | |||
<text>用户专享神秘礼物</text> | |||
<text>独家福利,抢完即止</text> | |||
<view class='game-entry'> | |||
<image src="./../../../assets/img/new.png" class='gameimg' mode='widthFix'></image> | |||
</view> | |||
</view> | |||
</view> |
@@ -389,49 +389,18 @@ radio { | |||
opacity: .6; | |||
} | |||
/* 游戏入口样式修改 */ | |||
.game-entry{ | |||
width: 690rpx; | |||
height: 140rpx; | |||
margin: 0 auto; | |||
border-radius: 14rpx; | |||
box-shadow: 1px 4px 20px #C4C4C4; | |||
} | |||
.game { | |||
position: relative; | |||
width: 750rpx; | |||
height: 200rpx; | |||
margin: 0 auto; | |||
padding-top: 30rpx; | |||
margin-top: 50rpx; | |||
box-sizing: border-box; | |||
margin: 20rpx auto 0; | |||
} | |||
.gameimg{ | |||
position: absolute; | |||
right: 25rpx; | |||
top: -14rpx; | |||
width: 250rpx; | |||
} | |||
.game text { | |||
display: block; | |||
position: relative; | |||
} | |||
.game text:nth-of-type(1) { | |||
display: inline-block; | |||
padding-top: 39rpx; | |||
padding-left: 70rpx; | |||
font-size: 32rpx; | |||
color: #333; | |||
line-height: 36rpx; | |||
width: 100%; | |||
height: 140rpx; | |||
} | |||
.game text:nth-of-type(2) { | |||
font-size: 24rpx; | |||
color: #999; | |||
line-height: 24rpx; | |||
padding-left: 70rpx; | |||
} | |||
.merchantVoList{ | |||
width: 100%; | |||
@@ -84,7 +84,7 @@ | |||
<view class="margin"></view> | |||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | |||
<view bindlongtap='showVersion' class='version'> | |||
<view wx:if="{{flag=='show'}}">版本号:3.1.1</view> | |||
<view wx:if="{{flag=='show'}}">版本号:3.1.4</view> | |||
<view wx:if="{{flag=='hidden'}}"></view> | |||
</view> | |||
</view> | |||
@@ -4,7 +4,7 @@ | |||
"ignore": [] | |||
}, | |||
"setting": { | |||
"urlCheck": true, | |||
"urlCheck": false, | |||
"es6": true, | |||
"postcss": true, | |||
"minified": true, | |||