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

1.合并代码 修复问题确认订单页面

Browse Source
yj-dev
杨杰 2 years ago
parent 00bfc75650
commit e40827dd2d
2 changed files with 124 additions and 126 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. 93
      pages/goods/refuel-confirm/refuel-confirm.vue
  2. 157
      pages/order/confirmation.vue

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

@ -81,7 +81,8 @@
<view class="width100 backcorfff mart10"> <view class="width100 backcorfff mart10">
<view class="width96 alijusstart height50 font14 fcor666"> <view class="width96 alijusstart height50 font14 fcor666">
<view class="width40 fcor333 fontwig6 font16">邀请码</view> <view class="width40 fcor333 fontwig6 font16">邀请码</view>
<input class="width60 fotrt font15" style="padding-right: 6%;" v-model="identificationCode" placeholder="请输入邀请码" /> <input class="width60 fotrt font15" style="padding-right: 6%;" v-model="identificationCode"
placeholder="请输入邀请码" />
</view> </view>
</view> </view>
@ -175,55 +176,52 @@
<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 fontwig6"> <view class="width60 flleft font14">
汇联通工会卡<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">
<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" /> <radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
</view> </view>
</view> </view>
</view> --> </view>
<view class="line1" v-if="oilUserCardlist"></view> <view class="line1" v-if="oilUserCardlist"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="oilUserCardlist" <view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="oilUserCardlist"
@tap="paytype='fleettruck'"> @tap="paytype='fleettruck'">
<view class="width60 flleft font14"> <view class="width60 flleft font14">
车队油卡<text class="font14 fcor666 margle">余额: {{oilUserNoPrice}}元</text> 车队油卡<text class="font14 fcor666 margle">余额: {{oilUserNoPrice}}元</text>
</view> </view>
<view class="flright width30 fotct" v-if="isUse"> <view class="flright width30 fotct" v-if="isUse">
<radio :checked="paytype=='fleettruck'" color="#0083f5" /> <radio :checked="paytype=='fleettruck'" color="#0083f5" />
</view>
</view> </view>
</view>
<view v-if="paytype=='fleettruck'"> <view v-if="paytype=='fleettruck'">
<view class="heightl60 paddleft10 fcor333 fontwig6 font16 width100 backcorfff">车队油卡列表</view> <view class="heightl60 paddleft10 fcor333 fontwig6 font16 width100 backcorfff">车队油卡列表</view>
<view class="line1"></view> <view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-for="(item,index) in oilUserCardlist" <view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-for="(item,index) in oilUserCardlist"
:key="index"> :key="index">
<view class="width60 flleft font14"> <view class="width60 flleft font14">
{{item.cardNo}}({{item.contactName}}) {{item.cardNo}}({{item.contactName}})
</view>
<view class="flright width30 fotct">
<radio :checked="oilUserno==item.cardNo" @click="changeRiado1(item)" color="#0083f5" />
</view>
</view> </view>
<view class="flright width30 fotct">
<view class="username"> <radio :checked="oilUserno==item.cardNo" @click="changeRiado1(item)" color="#0083f5" />
<view class="namecont font15">车牌号</view>
<input style="width: 70%;" placeholder="输入车牌号" class="font15" v-model="cardNoNumber">
<!-- <view class="date text1" >{{cardNoNumber}}</view> -->
<!-- </view> -->
<picker mode="selector" style="width: 20%;" :range="UserCard" range-key="carLicensePlate"
@change="bindUserCard">
<view class="date text1"
style="color: white;position: absolute;margin-top: -2px;min-width: 100px;">
11111{{cardNoNumber}}</view>
</picker>
<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png">
</image>
</view> </view>
</view> </view>
<view class="username">
<view class="namecont font15">车牌号</view>
<input style="width: 70%;" placeholder="输入车牌号" class="font15" v-model="cardNoNumber">
<!-- <view class="date text1" >{{cardNoNumber}}</view> -->
<!-- </view> -->
<picker mode="selector" style="width: 20%;" :range="UserCard" range-key="carLicensePlate"
@change="bindUserCard">
<view class="date text1" style="color: white;position: absolute;margin-top: -2px;min-width: 100px;">
11111{{cardNoNumber}}</view>
</picker>
<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png">
</image>
</view>
</view> </view>
<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view> <view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
@ -241,7 +239,6 @@
</view> </view>
<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
<view class="width92 height110 tccs mart10 alijus" v-for="(items, index) in OrderPreList" :key="index" <view class="width92 height110 tccs mart10 alijus" v-for="(items, index) in OrderPreList" :key="index"
@ -256,11 +253,9 @@
</view> </view>
<view class="width20 fotrt"> <view class="width20 fotrt">
<view> <view>
<radio <radio v-if="items.discountCondition && orderPrice >= items.discountCondition"
v-if="items.discountCondition && orderPrice >= items.discountCondition"
color="#c72a20" :checked="items.id == memDiscountId" /> color="#c72a20" :checked="items.id == memDiscountId" />
<radio <radio v-if="items.discountCondition && orderPrice < items.discountCondition"
v-if="items.discountCondition && orderPrice < items.discountCondition"
color="#c72a20" disabled="true" :checked="items.id == memDiscountId" /> color="#c72a20" disabled="true" :checked="items.id == memDiscountId" />
<radio v-if="!items.discountCondition" color="#c72a20" <radio v-if="!items.discountCondition" color="#c72a20"
@ -289,8 +284,7 @@
cancel, cancel,
oilPriceDiscountCompute, oilPriceDiscountCompute,
getRebateIntegral, getRebateIntegral,
getThirdPartyByDetail getThirdPartyByDetail,
getRebateIntegral,
getUserCardList, getUserCardList,
fleetOilCardPay, fleetOilCardPay,
getCardListByCardNo getCardListByCardNo
@ -335,7 +329,6 @@
Integrastu: 1, //返积分状态 Integrastu: 1, //返积分状态
paytypeList: [], //支付方式 paytypeList: [], //支付方式
identificationCode: '', //渠道商 identificationCode: '', //渠道商
Integrastu: 1, //返积分状态
oilUserCardlist: '', //油卡列表 oilUserCardlist: '', //油卡列表
oilUserno: '', //油卡卡号 oilUserno: '', //油卡卡号
contactName: '', //油卡联系人 contactName: '', //油卡联系人
@ -420,7 +413,7 @@
type: 3 type: 3
} }
getUserCardList(datas).then(res => { getUserCardList(datas).then(res => {
if (res.return_code == '000000' && res.return_data !='') { if (res.return_code == '000000' && res.return_data != '') {
this.oilUserCardlist = res.return_data; this.oilUserCardlist = res.return_data;
this.oilUserno = res.return_data[0].cardNo; this.oilUserno = res.return_data[0].cardNo;
this.contactName = res.return_data[0].contactName; this.contactName = res.return_data[0].contactName;
@ -911,8 +904,8 @@
}) })
return; return;
} }
if (this.orderNo) { // if (this.orderNo) {
this.wechatPay(); // this.wechatPay();
// if (this.orderNo) { // if (this.orderNo) {
// this.orderToPay(); // this.orderToPay();
// return; // return;
@ -951,7 +944,7 @@
"payGold": this.priceValue[1], "payGold": this.priceValue[1],
"promoteCode": this.identificationCode, "promoteCode": this.identificationCode,
"payPwd": this.PaymentPassword, "payPwd": this.PaymentPassword,
memDiscountId:this.memDiscountId memDiscountId: this.memDiscountId
} }
create(goods).then(res => { create(goods).then(res => {
@ -1301,4 +1294,4 @@
width: 28%; width: 28%;
} }
} }
</style> </style>

157
pages/order/confirmation.vue
Unescape View File

@ -93,96 +93,104 @@
¥{{priceValue[1] / 100}} ¥{{priceValue[1] / 100}}
</view> </view>
</view> </view>
<view class="width94 line1 mart5 marb5"></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%;"> <!-- <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> <image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text> <text>下单返积分</text>
<view class="height50 width100 backcorfff" @tap="paytype='weixin'" <view class="height50 width100 backcorfff" @tap="paytype='weixin'"
v-if="couponList.payType == 1 || couponList.payType==3 "> v-if="couponList.payType == 1 || couponList.payType==3 ">
<view class="width50 flleft fcor333 font16" style="padding-left: 4%;"> <view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
微信支付 微信支付
</view> </view>
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun" <view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
style="align-items: center;"> style="align-items: center;">
<radio :checked="paytype=='weixin'" color="#0083f5" /> <radio :checked="paytype=='weixin'" color="#0083f5" />
</view> </view>
</view> </view>
<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3"></view> <view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3">
<view class="height50 width100 backcorfff" </view>
v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3" <view class="height50 width100 backcorfff"
@tap="paytype='jinbi'"> v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;"> @tap="paytype='jinbi'">
积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text> <view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
</view> 积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1" </view>
style="align-items: center;"> <view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
返{{rebateIntegral}}积分 style="align-items: center;">
</view> 返{{rebateIntegral}}积分
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2" </view>
style="align-items: center;"> <view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
{{rebateIntegral}} style="align-items: center;">
</view> {{rebateIntegral}}
</view> </view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;"> </view>
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image> <view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text> <image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
</view> <text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
</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%;">
支付方式 支付方式 -->
<!-- : <text class="jfrecharge" @click="jumpdeposits" <!-- : <text class="jfrecharge" @click="jumpdeposits"
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="width94 line1 mart5 marb5" <view class="width94 line1 mart5 marb5"
v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"></view> 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="height50 width100 backcorfff" @tap="paytype='gonghuika'" v-if="couponList.payType== 4">
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;"> <view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text> 汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
</view> </view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun" <view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
style="align-items: center;"> style="align-items: center;">
<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" /> <radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
</view> </view>
</view> </view>
</view> </view> -->
<!-- <view class="width94 comorder mart10"> <!-- <view class="width94 comorder mart10">
<view class="height50 width100 backcorfff"> <view class="height50 width100 backcorfff">
<view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;"> <view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;">
<text style="color: #0083F5;">《条约协议》</text>点击立即支付，即代表同意 <text style="color: #0083F5;">《条约协议》</text>点击立即支付，即代表同意
<!-- <view class="width94 line1 mart5 marb5"></view> --> <view class="width94 line1 mart5 marb5"></view> -->
<view class="width100" v-for="(item,index) in paytypeList" :key="index"> <view class="height50 width100 backcorfff">
<view class="width94 line1 mart5 marb5" v-if="item == 2"></view> <view class="width100 flleft fcor333 fontwig6 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%;"> <!-- : <text class="jfrecharge" @click="jumpdeposits"
微信支付 v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text> -->
</view>
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
style="align-items: center;" v-if="isUse">
<radio :checked="paytype=='2'" color="#0083f5" />
</view> </view>
</view> </view>
<view class="width94 line1 mart5 marb5" v-if="item == 3"></view> <view class="width100" v-for="(item,index) in paytypeList" :key="index">
<view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3"> <view class="width94 line1 mart5 marb5" v-if="item == 2"></view>
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;"> <view class="height50 width100 backcorfff" @tap="paytype='2'" v-if="item == 2">
汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text> <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;" v-if="isUse">
<radio :checked="paytype=='2'" color="#0083f5" />
</view>
</view> </view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun" <view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
style="align-items: center;" v-if="isUse"> <view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3">
<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" /> <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;" v-if="isUse">
<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="width100 height60"></view> <view class="width100 height60"></view>
<view class="footer"> <view class="footer">
<view class="settlement"> <view class="settlement">
@ -200,7 +208,6 @@
</view> </view>
</view> </view>
<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
<view class="width92 height110 tccs mart10" v-for="(items, index) in UserNormalDiscountList" :key="items" <view class="width92 height110 tccs mart10" v-for="(items, index) in UserNormalDiscountList" :key="items"
@ -277,8 +284,7 @@
isUse: true, // 是否禁用状态 isUse: true, // 是否禁用状态
rechargeDes: '', // 支付详情 rechargeDes: '', // 支付详情
rebateIntegral: '', //返回积分 rebateIntegral: '', //返回积分
Integrastu: 1 //返积分状态 Integrastu: 1, //返积分状态
identificationCode: '', //渠道商
contactPepole: '', //联系人 contactPepole: '', //联系人
contactPhone: '', //联系电话 contactPhone: '', //联系电话
contactAddress: '' //联系地址 contactAddress: '' //联系地址
@ -610,9 +616,8 @@
}], }],
"payGold": this.priceValue[1], "payGold": this.priceValue[1],
"promoteCode": this.identificationCode, "promoteCode": this.identificationCode,
memDiscountId: this.memDiscountId memDiscountId: this.memDiscountId,
"storeId": this.storeId "storeId": this.storeId,
}],
"postData": { "postData": {
"address": this.contactAddress, "address": this.contactAddress,
"user": this.contactPepole, "user": this.contactPepole,
@ -1290,4 +1295,4 @@
} }
} }
} }
</style> </style>

Write Preview
Loading…
Cancel
Save