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

1.调整积分充值 不能使用工会卡

Browse Source
yj-dev
杨杰 3 years ago
parent b7d781a326
commit e82b20e2c6
3 changed files with 22 additions and 13 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. 6
      pages/pay/payment/payment.vue
  2. 2
      pages/user/order_details/order_details.vue
  3. 27
      pages/user/order_list/order_list.vue

6
pages/pay/payment/payment.vue
Unescape View File

@ -29,7 +29,7 @@
<radio :checked="paytype=='jinbi'" color="#0083f5" /> <radio :checked="paytype=='jinbi'" color="#0083f5" />
</view> </view>
</view> </view>
<view class="row" @tap="paytype='gonghuika'"> <view class="row" @tap="paytype='gonghuika'" v-if="goodsType != 2">
<view class="left"> <view class="left">
<image style="border-radius: 50%;" src="../../../static/img/ghkpay.png"></image> <image style="border-radius: 50%;" src="../../../static/img/ghkpay.png"></image>
</view> </view>
@ -95,7 +95,8 @@
couponId: '', couponId: '',
jumpType: '', jumpType: '',
PaymentPassword: '', PaymentPassword: '',
tongCardPrice: 0 tongCardPrice: 0,
goodsType:''
}; };
}, },
onLoad(e) { onLoad(e) {
@ -103,6 +104,7 @@
this.orderNo = e.orderId; this.orderNo = e.orderId;
this.couponId = e.couponId; this.couponId = e.couponId;
this.jumpType = e.typeaout; this.jumpType = e.typeaout;
this.goodsType = e.goodsType;
if (this.pryType == 1) { if (this.pryType == 1) {
this.paytype = 'wxpay'; this.paytype = 'wxpay';
} else if (this.pryType == 2) { } else if (this.pryType == 2) {

2
pages/user/order_details/order_details.vue
Unescape View File

@ -350,7 +350,7 @@
uni.redirectTo({ uni.redirectTo({
url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice + url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo '&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
.highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1 .highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1+'&goodsType='+ this.recinfo.highChildOrderList[0].goodsType
}) })
}, },
} }

27
pages/user/order_list/order_list.vue
Unescape View File

@ -14,23 +14,28 @@
</view> </view>
<view class="row" v-for="(row,index) in orderList" :key="index"> <view class="row" v-for="(row,index) in orderList" :key="index">
<view class="width96 height40" @click="jumpDetails(row.id)"> <view class="width96 height40" @click="jumpDetails(row.id)">
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 1 || row.highChildOrderList[0].goodsType == 2"> <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 1 || row.highChildOrderList[0].goodsType == 2">
<image src="../../../static/img/order2.png" style="width: 50rpx;height: 50rpx;"></image> <image src="../../../static/img/order2.png" style="width: 50rpx;height: 50rpx;"></image>
卡券订单 卡券订单
</view> </view>
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 3"> <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 3">
<image src="../../../static/img/order4.png" style="width: 50rpx;height: 50rpx;"></image> <image src="../../../static/img/order4.png" style="width: 50rpx;height: 50rpx;"></image>
团油订单 团油订单
</view> </view>
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 5"> <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 5">
<image src="../../../static/img/order5.png" style="width: 50rpx;height: 50rpx;"></image> <image src="../../../static/img/order5.png" style="width: 50rpx;height: 50rpx;"></image>
电影票 电影票
</view> </view>
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 4"> <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 4">
<image src="../../../static/img/order3.png" style="width: 50rpx;height: 50rpx;"></image> <image src="../../../static/img/order3.png" style="width: 50rpx;height: 50rpx;"></image>
KFC KFC
</view> </view>
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 6"> <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 6">
<image src="../../../static/img/order1.png" style="width: 50rpx;height: 50rpx;"></image> <image src="../../../static/img/order1.png" style="width: 50rpx;height: 50rpx;"></image>
话费充值 话费充值
</view> </view>
@ -53,15 +58,17 @@
<view class="font16 fontwig6 text1 fcor333" v-if="row.payType != 3"> <view class="font16 fontwig6 text1 fcor333" v-if="row.payType != 3">
￥{{row.payPrice}} ￥{{row.payPrice}}
</view> </view>
<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;" v-else> <view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;"
<image style="width: 15px;height: 15px;" v-else>
src="../../../static/img/jfx.png"> <image style="width: 15px;height: 15px;" src="../../../static/img/jfx.png">
</image>{{row.payPrice*100}} </image>{{row.payPrice*100}}
</view> </view>
<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.orderStatus]}}</view> <view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.orderStatus]}}</view>
</view> </view>
</view> </view>
<view class="width96 line1 mart10 marb5" v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)"></view> <view class="width96 line1 mart10 marb5"
v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
</view>
<view class="btns" <view class="btns"
v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)"> v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
<block> <block>
@ -299,7 +306,7 @@
url: "/pages/pay/payment/payment?amount=" + row.payPrice + url: "/pages/pay/payment/payment?amount=" + row.payPrice +
'&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0] '&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0]
.highChildOrderList[0].goodsId + '&typeaout=' + this.orderList[0].highChildOrderList[0] .highChildOrderList[0].goodsId + '&typeaout=' + this.orderList[0].highChildOrderList[0]
.ext1 .ext1+ '&goodsType='+ row.highChildOrderList[0].goodsType
}) })
} }
} }

Write Preview
Loading…
Cancel
Save