@@ -177,7 +177,11 @@ var config = { | |||||
/** | /** | ||||
* 卡券详情接口 | * 卡券详情接口 | ||||
*/ | */ | ||||
cardDetail: "/couponOrder/cardDetail" | |||||
cardDetail: "/couponOrder/cardDetail", | |||||
/** | |||||
* C端扫B端储值卡支付订单 | |||||
*/ | |||||
orderCreate:"/carday/order_create" | |||||
}, | }, | ||||
weapp: { | weapp: { | ||||
@@ -36,6 +36,20 @@ Page({ | |||||
index:2 | index:2 | ||||
}) | }) | ||||
}, | }, | ||||
// 扫一扫去支付 | |||||
gotoPay:function(e){ | |||||
console.log(e.currentTarget.dataset.cardid) | |||||
Http.post({ | |||||
url: config.api.orderCreate, | |||||
data: { | |||||
cardId: e.currentTarget.dataset.cardid, | |||||
merchantCode: "234567451101102080", | |||||
totalFee: "5" | |||||
} | |||||
}).then(res=>{ | |||||
console.log(res) | |||||
}) | |||||
}, | |||||
//点击跳转到券详情页面 | //点击跳转到券详情页面 | ||||
gotouse: function (e) { | gotouse: function (e) { | ||||
if (this.data.mystatus == '' || this.data.mystatus == 'undefined') { | if (this.data.mystatus == '' || this.data.mystatus == 'undefined') { | ||||
@@ -13,7 +13,7 @@ | |||||
</navigator> | </navigator> | ||||
</view> | </view> | ||||
<view class='section' wx:for='{{list}}' wx:key='{{index}}' bindtap="gotouse" data-quancode="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}"> | |||||
<view class='section' wx:for='{{list}}' wx:key='{{index}}' bindtap='gotoPay' data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}"> | |||||
<view class='mms'> | <view class='mms'> | ||||
<view class='detail_msg'> | <view class='detail_msg'> | ||||
<view class='logo'> | <view class='logo'> | ||||
@@ -26,8 +26,8 @@ | |||||
<view class='subtitle'> | <view class='subtitle'> | ||||
<text>{{item.subTitle}}</text> | <text>{{item.subTitle}}</text> | ||||
</view> | </view> | ||||
<view hover-class='active' wx:if="{{item.couponOrderStatus==0}}" class="btns">去使用</view> | |||||
<view hover-class='active' wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view> | |||||
<view hover-class='active' wx:if="{{item.couponOrderStatus==0}}" class="btns">扫一扫</view> | |||||
<!-- <view hover-class='active' wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view> --> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<image class="liness" src='./../../../assets/img/liness.png' mode="widthFix"></image> | <image class="liness" src='./../../../assets/img/liness.png' mode="widthFix"></image> | ||||
@@ -116,7 +116,6 @@ Page({ | |||||
score: res.data.score, | score: res.data.score, | ||||
levelName: res.data.levelName, | levelName: res.data.levelName, | ||||
}) | }) | ||||
if (res.data.nickName || res.data.phone){ | if (res.data.nickName || res.data.phone){ | ||||
that.setData({ | that.setData({ | ||||
ismember:true, | ismember:true, | ||||
@@ -21,7 +21,7 @@ | |||||
<image class='fr' class='edit' src="./../../assets/img/edit.png" mode='widthFix'></image> | <image class='fr' class='edit' src="./../../assets/img/edit.png" mode='widthFix'></image> | ||||
<text style="color:#01bffe;display:inline-block;margin-left:16rpx;">编辑</text> | <text style="color:#01bffe;display:inline-block;margin-left:16rpx;">编辑</text> | ||||
</view> | </view> | ||||
<image class='fr' wx:if="{{!showEdit}}" class='activeimg' src='./../../assets/img/active.gif' mode='widthFix'></image> | |||||
<image class='fr' wx:if="{{!showEdit}}" bindtap='gotoedit' class='activeimg' src='./../../assets/img/active.gif' mode='widthFix'></image> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class="user-btns"> | <view class="user-btns"> | ||||