yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.优化2.0 在线加油确认订单

Browse Source
yj-dev
杨杰 2 years ago
parent 7838027718
commit f294dcc67f
2 changed files with 42 additions and 101 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 32
      pages/goods/refuel-confirm/refuel-confirm.vue
  2. 111
      pages/order/confirmation.vue

32
pages/goods/refuel-confirm/refuel-confirm.vue
Unescape View File

@ -156,7 +156,7 @@
<view class="line1" v-if="item == 2"></view> <view class="line1" v-if="item == 2"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 2" @tap="paytype='2'"> <view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 2" @tap="paytype='2'">
<view class="width60 flleft font14"> <view class="width60 flleft font16">
微信支付 微信支付
</view> </view>
<view class="flright width30 fotct" v-if="isUse"> <view class="flright width30 fotct" v-if="isUse">
@ -166,7 +166,7 @@
<view class="line1" v-if="item == 6"></view> <view class="line1" v-if="item == 6"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 6" @tap="paytype='6'"> <view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 6" @tap="paytype='6'">
<view class="width60 flleft font14"> <view class="width60 flleft font16">
油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}元</text> 油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}元</text>
</view> </view>
<view class="flright width30 fotct" v-if="isUse"> <view class="flright width30 fotct" v-if="isUse">
@ -176,7 +176,7 @@
<view class="line1" v-if="item == 3"></view> <view class="line1" v-if="item == 3"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 3" @tap="paytype='3'"> <view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 3" @tap="paytype='3'">
<view class="width60 flleft font14"> <view class="width60 flleft font16">
汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text> 汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text>
</view> </view>
<view class="flright width30 fotct" v-if="isUse"> <view class="flright width30 fotct" v-if="isUse">
@ -658,10 +658,14 @@
} }
this.orderNo = res.return_data.orderNo; this.orderNo = res.return_data.orderNo;
uni.reLaunch({ // uni.reLaunch({
url: '/pages/goods/refuel-succes/refuel-succes?id=' + // url: '/pages/goods/refuel-succes/refuel-succes?id=' +
this.orderNo // this.orderNo
}); // });
uni.reLaunch({
url: '../../user/order_details/order_details?id=' +
this.orderNo
})
return; return;
} }
if (res.return_code == '102130') { if (res.return_code == '102130') {
@ -693,9 +697,10 @@
uni.showToast({ uni.showToast({
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ uni.reLaunch({
url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo url: '../../user/order_details/order_details?id=' +
}); this.orderNo
})
return; return;
} }
if (res.return_code == '102130') { if (res.return_code == '102130') {
@ -754,9 +759,10 @@
uni.showToast({ uni.showToast({
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ uni.reLaunch({
url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo url: '../../user/order_details/order_details?id=' +
}); this.orderNo
})
return; return;
} }
if (res.return_code == '102130') { if (res.return_code == '102130') {

111
pages/order/confirmation.vue
Unescape View File

@ -93,73 +93,8 @@
¥{{priceValue[1] / 100}} ¥{{priceValue[1] / 100}}
</view> </view>
</view> </view>
<!-- <view class="width94 line1 mart5 marb5"></view> -->
<view class="height40 width100 backcorfff"> <view class="height40 width100 backcorfff">
<!-- <view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;">
<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text>
<view class="height50 width100 backcorfff" @tap="paytype='weixin'"
v-if="couponList.payType == 1 || couponList.payType==3 ">
<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
微信支付
</view>
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
style="align-items: center;">
<radio :checked="paytype=='weixin'" color="#0083f5" />
</view>
</view>
<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3">
</view>
<view class="height50 width100 backcorfff"
v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"
@tap="paytype='jinbi'">
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
style="align-items: center;">
返{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
style="align-items: center;">
{{rebateIntegral}}
</view>
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
</view>
<view class="height50 width100 backcorfff">
<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式 -->
<!-- : <text class="jfrecharge" @click="jumpdeposits"
v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text> -->
<!-- </view>
</view>
<view class="width94 line1 mart5 marb5"
v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"></view>
<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'" v-if="couponList.payType== 4">
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
</view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
style="align-items: center;">
<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
</view>
</view>
</view> -->
<!-- <view class="width94 comorder mart10">
<view class="height50 width100 backcorfff">
<view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;">
<text style="color: #0083F5;">《条约协议》</text>点击立即支付，即代表同意
<view class="width94 line1 mart5 marb5"></view> -->
<view class="height50 width100 backcorfff"> <view class="height50 width100 backcorfff">
<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;"> <view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式 支付方式
@ -167,31 +102,31 @@
v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text> --> v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text> -->
</view> </view>
</view> </view>
<view class="width100" v-for="(item,index) in paytypeList" :key="index"> </view>
<view class="width94 line1 mart5 marb5" v-if="item == 2"></view> <view class="width100" v-for="(item,index) in paytypeList" :key="index">
<view class="height50 width100 backcorfff" @tap="paytype='2'" v-if="item == 2"> <view class="width94 line1 mart5 marb5" v-if="item == 2"></view>
<view class="width50 flleft fcor333 font16" style="padding-left: 4%;"> <view class="height50 width100 backcorfff" @tap="paytype='2'" v-if="item == 2">
微信支付 <view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
</view> 微信支付
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun" </view>
style="align-items: center;" v-if="isUse"> <view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
<radio :checked="paytype=='2'" color="#0083f5" /> style="align-items: center;" v-if="isUse">
</view> <radio :checked="paytype=='2'" color="#0083f5" />
</view> </view>
<view class="width94 line1 mart5 marb5" v-if="item == 3"></view> </view>
<view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3"> <view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;"> <view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3">
汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text> <view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
</view> 汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun" </view>
style="align-items: center;" v-if="isUse"> <view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" /> style="align-items: center;" v-if="isUse">
</view> <radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="width100 height60"></view> <view class="width100 height110"></view>
<view class="footer"> <view class="footer">
<view class="settlement"> <view class="settlement">
<view class="sum">实付:<view class="money">￥{{paytheprice}}</view> <view class="sum">实付:<view class="money">￥{{paytheprice}}</view>

Write Preview
Loading…
Cancel
Save