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

1.修改问题 上线2.0 解决问题

Browse Source
master
杨杰 2 years ago
parent 9ee48ca779
commit f22223f812
4 changed files with 109 additions and 136 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. 21
      high-unionPay/pages/tabBar/home/home.vue
  2. 112
      high-unionPay/pages/user/coupon/coupon.vue
  3. 14
      high-unionPay/pages/user/order_details/order_details.vue
  4. 98
      high-unionPay/qianzhu-KFC/payment-method/payment-method.vue

21
high-unionPay/pages/tabBar/home/home.vue
Unescape View File

@ -381,26 +381,7 @@
url: e + id url: e + id
}); });
}, },
//积分卡券列表
getCouponListgold() {
let params = {
regionId: app.globalData.cityId,
pageNum: this.pageNum,
pageSize: this.pageSize,
displayArea: 2
}
getCouponList(params).then(res => {
if (res.return_code == '000000' && res.return_data.list) {
this.goldproductList = res.return_data.list;
this.goldproductListleg = res.return_data.total;
if (res.return_data.total > 4) {
this.goldproductListleg = 4;
return;
}
this.goldproductListleg = res.return_data.total;
}
})
},
//拨打客服电话 //拨打客服电话
playPhone() { playPhone() {
uni.showModal({ uni.showModal({

112
high-unionPay/pages/user/coupon/coupon.vue
Unescape View File

@ -214,7 +214,7 @@
couponnoinvalidList: [], couponnoinvalidList: [],
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
imgadres: 'noorder.png', imgadres: 'noorder.png',
headerTop: 0, headerTop: 0,
headerswiperTop: '45px', headerswiperTop: '45px',
//控制滑动效果 //控制滑动效果
typeClass: 'valid', typeClass: 'valid',
@ -254,7 +254,7 @@
clearInterval(Timer); //清除定时器 clearInterval(Timer); //清除定时器
} }
}, 1); }, 1);
// #endif // #endif
this.getDictionaryByCodeType(); this.getDictionaryByCodeType();
}, },
filters: { filters: {
@ -295,46 +295,46 @@
}, },
methods: { methods: {
//查询我的优惠券 //查询我的优惠券
getUserDiscountList(item) { getUserDiscountList(item) {
this.statusid = item; this.statusid = item;
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}) })
if (this.isNoMoreData) { if (this.isNoMoreData) {
uni.hideLoading() uni.hideLoading()
this.loadingText = '到底了'; this.loadingText = '到底了';
return false; return false;
} }
let pagenum = this.pageNum; let pagenum = this.pageNum;
let params = { let params = {
pageNum: pagenum, pageNum: pagenum,
status: item, status: item,
pageSize: this.pageSize, pageSize: this.pageSize,
useScope: this.ordertypeid useScope: this.ordertypeid
} }
getUserDiscountList(params).then(res => { getUserDiscountList(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.hideLoading(); uni.hideLoading();
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true; this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
if (res.return_data.total == (this.pageNum * this.pageSize)) { if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true; this.isNoMoreData = true;
} }
if (this.typeClass == 'valid') { if (this.typeClass == 'valid') {
this.couponValidList = this.couponValidList.concat(res.return_data.list); this.couponValidList = this.couponValidList.concat(res.return_data.list);
this.couponcout = res.return_data.total; this.couponcout = res.return_data.total;
} else if (this.typeClass == 'invalid') { } else if (this.typeClass == 'invalid') {
this.couponinvalidList = this.couponinvalidList.concat(res.return_data.list); this.couponinvalidList = this.couponinvalidList.concat(res.return_data.list);
} else { } else {
this.couponnoinvalidList = this.couponnoinvalidList.concat(res.return_data.list); this.couponnoinvalidList = this.couponnoinvalidList.concat(res.return_data.list);
} }
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum; this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else { } else {
this.couponValidList = []; this.couponValidList = [];
this.couponinvalidList = []; this.couponinvalidList = [];
this.couponnoinvalidList = []; this.couponnoinvalidList = [];
uni.hideLoading() uni.hideLoading()
} }
}) })
}, },
//分类类型 //分类类型
@ -349,29 +349,29 @@
this.getUserDiscountList(1); this.getUserDiscountList(1);
} }
}) })
}, },
//筛选类型 //筛选类型
selectlist(item) { selectlist(item) {
this.ordertypeid = item.codeValue; this.ordertypeid = item.codeValue;
this.pageNum = 1; this.pageNum = 1;
this.couponValidList = []; this.couponValidList = [];
this.couponinvalidList = []; this.couponinvalidList = [];
this.couponnoinvalidList = []; this.couponnoinvalidList = [];
this.isNoMoreData = false; this.isNoMoreData = false;
this.getUserDiscountList(this.statusid); this.getUserDiscountList(this.statusid);
}, },
//跳转详情 //跳转详情
jumpcoupons(e) { jumpcoupons(e) {
if (e.useScope == 3) { if (e.discountUseScope == 3) {
uni.navigateTo({ uni.navigateTo({
url: '../../unionPay/recharge/recharge' url: '../../unionPay/recharge/recharge'
}) })
} else if (e.useScope == 4) { } else if (e.discountUseScope == 4) {
app.globalData.distinguishid = 1; app.globalData.distinguishid = 1;
uni.navigateTo({ uni.navigateTo({
url: '/qianzhu-KFC/buffet-order/buffet-order' url: '/qianzhu-KFC/buffet-order/buffet-order'
}) })
} else if (e.useScope == 5) { } else if (e.discountUseScope == 5) {
app.globalData.distinguishid = 2; app.globalData.distinguishid = 2;
uni.navigateTo({ uni.navigateTo({
url: '/qianzhu-KFC/buffet-order/buffet-order' url: '/qianzhu-KFC/buffet-order/buffet-order'
@ -380,7 +380,7 @@
uni.navigateTo({ uni.navigateTo({
url: '/member-Recharge/choicepage/choicepage' url: '/member-Recharge/choicepage/choicepage'
}) })
} else if (e.useScope == 7) { } else if (e.discountUseScope == 7) {
uni.navigateTo({ uni.navigateTo({
url: '../../goods/refuel/refuel' url: '../../goods/refuel/refuel'
}) })

14
high-unionPay/pages/user/order_details/order_details.vue
Unescape View File

@ -7,7 +7,8 @@
{{countdownm}}:{{countdowns}} {{countdownm}}:{{countdowns}}
</view> </view>
<view class="width100 font13 fcor666 mart10">若超时未支付,订单将自动取消</view> <view class="width100 font13 fcor666 mart10">若超时未支付,订单将自动取消</view>
<view class="stubtn mart15" style="background-color: #0F8FE8;" @click="toPay()">立即支付 <view class="stubtn mart15" style="background-color: #0F8FE8;"
@click="toPay(recinfo.highChildOrderList[0].goodsId)">立即支付
</view> </view>
</view> </view>
<view class="width100 headsbg paddbotm15" v-if="recinfo.orderStatus != 1"> <view class="width100 headsbg paddbotm15" v-if="recinfo.orderStatus != 1">
@ -127,9 +128,9 @@
<view class="width50 fcor777">积分抵扣</view> <view class="width50 fcor777">积分抵扣</view>
<view class="width50 fotrt fcoreb5">-¥{{recinfo.payGold / 100}}</view> <view class="width50 fotrt fcoreb5">-¥{{recinfo.payGold / 100}}</view>
</view> </view>
<view class="width95 height20 alijusnostart"> <view class="width100" style="height: 10px;">
<view style="width: 5%;"></view> <view class="cro_left_bottom flleft"></view>
<view class="width95" style="border-bottom: 1px dashed #bebcbc;"></view> <view class="cro_right_bottom flright"></view>
</view> </view>
</view> </view>
<view class="width95 alijusnostart"> <view class="width95 alijusnostart">
@ -476,7 +477,8 @@
</view> </view>
</view> </view>
<view class="btn" @tap="cancel" style="border: 1px solid #0083f5;color: #0083f5;">取消订单</view> <view class="btn" @tap="cancel" style="border: 1px solid #0083f5;color: #0083f5;">取消订单</view>
<view class="btn" @tap="toPay" style="background-color: #0083f5;color: #fff;">去支付</view> <view class="btn" @tap="toPay(recinfo.highChildOrderList[0].goodsId)"
style="background-color: #0083f5;color: #fff;">去支付</view>
</view> </view>
</view> </view>
@ -734,7 +736,7 @@
} }
}); });
}, },
toPay() { toPay(item) {
let payTypes; let payTypes;
if (this.recinfo.payType == 1 || this.recinfo.payType == null) { if (this.recinfo.payType == 1 || this.recinfo.payType == null) {
payTypes = 3; payTypes = 3;

98
high-unionPay/qianzhu-KFC/payment-method/payment-method.vue
Unescape View File

@ -27,7 +27,7 @@
<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" /> <radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
</view> </view>
</view> </view>
<!-- <view class="row" @tap="paytype='oilcard'"> <view class="row" @tap="paytype='6'" v-if="item == 6">
<view class="left"> <view class="left">
<image :src="imagewxUrl+imgadres1"></image> <image :src="imagewxUrl+imgadres1"></image>
</view> </view>
@ -35,9 +35,9 @@
油卡支付(余额:{{oilPirce}}元) 油卡支付(余额:{{oilPirce}}元)
</view> </view>
<view class="right"> <view class="right">
<radio :checked="paytype=='oilcard'" @click="changeRiado1()" color="#0083f5" /> <radio :checked="paytype=='6'" @click="changeRiado1()" color="#0083f5" />
</view> </view>
</view> --> </view>
<view class="row" @tap="paytype='4'" v-if="item == 4"> <view class="row" @tap="paytype='4'" v-if="item == 4">
<view class="left"> <view class="left">
<image src="../../static/img/unionpay.png"></image> <image src="../../static/img/unionpay.png"></image>
@ -68,10 +68,9 @@
<script> <script>
import { import {
getHuiLianTongCardBalance, getHuiLianTongCardBalance,
oilCardPay,
findUser, findUser,
qianzhuorderToUnionPay, unionPay,
czhltUnionCardPay, cardPay,
getThirdPartyByDetail getThirdPartyByDetail
} from '../../Utils/Api.js' } from '../../Utils/Api.js'
import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue'; import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue';
@ -95,12 +94,12 @@
oilPirce: 0, //油卡金额 oilPirce: 0, //油卡金额
showType: 3, //支付方式 showType: 3, //支付方式
paytypeList: [], //支付选择 paytypeList: [], //支付选择
productType: '' //分类 星巴克 ，肯德基 productType: '' ,//分类 星巴克 ，肯德基
}; };
}, },
onLoad(e) { onLoad(e) {
this.orderNo = e.orderId; this.orderNo = e.orderId;
this.productType = e.productType; this.productType = e.productType;
this.amount = e.amount; this.amount = e.amount;
if (!app.globalData.userInfo) { if (!app.globalData.userInfo) {
this.findUser() this.findUser()
@ -119,8 +118,9 @@
let datas = { let datas = {
platformId: this.showType, platformId: this.showType,
regionId: app.globalData.cityId, "companyId": app.globalData.companyId,
productType: this.productType productType: this.productType,
productId: this.goodsid,
} }
getThirdPartyByDetail(datas).then(res => { getThirdPartyByDetail(datas).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -203,9 +203,9 @@
let that = this; let that = this;
if (that.paytype == '4') { if (that.paytype == '4') {
let params = { let params = {
"orderId": that.orderNo "orderNo": that.orderNo
} }
qianzhuorderToUnionPay(params).then(res => { unionPay(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
that.uniontopay(res.return_data.prepayid); that.uniontopay(res.return_data.prepayid);
} else { } else {
@ -247,7 +247,7 @@
return; return;
} }
that.$refs.paymentPassword.modalFun('show'); that.$refs.paymentPassword.modalFun('show');
} else if (that.paytype == 'oilcard') { } else if (that.paytype == '6') {
if (!that.user.isSetPayPwd) { if (!that.user.isSetPayPwd) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/login/updatePas/updatePas' url: '/pages/login/updatePas/updatePas'
@ -288,9 +288,15 @@
uni.showToast({ uni.showToast({
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ if (that.productType == 1 || that.productType == 2 || that.productType == 3) {
url: '/qianzhu-KFC/order-details/order-details?id=' + that.orderNo uni.reLaunch({
}) url: '/qianzhu-KFC/order-details/order-details?id=' + that.orderNo
})
} else {
uni.reLaunch({
url: '/pages/user/order_details/order_details?id=' + that.orderNo
})
}
}, },
fail: function(err) { fail: function(err) {
uni.showToast({ uni.showToast({
@ -308,51 +314,35 @@
uni.showLoading({ uni.showLoading({
title: '支付中...' title: '支付中...'
}) })
if (this.paytype == '3') { if (this.paytype == '3' || this.paytype == '6') {
let params = { let cardNo;
"orderId": this.orderNo, if (this.paytype == 3) {
"cardNo": this.user.hltCardNo.cardNo, cardNo = this.user.hltCardNo.cardNo;
"password": this.PaymentPassword }
if (this.paytype == 6) {
cardNo = this.user.oilCard.cardNo;
} }
czhltUnionCardPay(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
url: '/qianzhu-KFC/order-details/order-details?id=' + this.orderNo
})
return;
}
if (res.return_code == '102130') {
uni.navigateTo({
url: '/pages/login/updatePas/updatePas'
})
return;
}
uni.showToast({
title: res.return_msg,
icon: 'none'
})
})
return;
}
if (this.paytype == 'oilcard') {
let params = { let params = {
"orderId": this.orderNo, "orderNo": this.orderNo,
"cardNo": this.user.oilCard.cardNo, "cardNo": cardNo,
"password": this.PaymentPassword "password": this.PaymentPassword,
"carLicensePlate": this.cardNoNumber
} }
oilCardPay(params).then(res => { cardPay(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.showToast({ uni.showToast({
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ if (this.productType == 1 || this.productType == 2 || this.productType == 3) {
url: '/qianzhu-KFC/order-details/order-details?id=' + this.orderNo uni.reLaunch({
}) url: '/qianzhu-KFC/order-details/order-details?id=' + this.orderNo
})
} else {
uni.reLaunch({
url: '/pages/user/order_details/order_details?id=' + this.orderNo
})
}
return; return;
} }
if (res.return_code == '102130') { if (res.return_code == '102130') {

Write Preview
Loading…
Cancel
Save