1.优化2.0积分充值、工会卡充值、优惠券包的支付方式配置

2.优化2.0ios订单详情页面显示问题
yj-dev
杨杰 2 years ago
parent d2047af37f
commit 7838027718
  1. 4
      pages/tabBar/home/home.vue
  2. 4
      pages/tabBar/user/user.vue
  3. 67
      pages/user/deposit/deposit.vue
  4. 84
      pages/user/order_details/order_details.vue
  5. 54
      qianzhu-KFC/order-details/order-details.vue
  6. 107
      subPages/coupon-comfirmation/coupon-comfirmation.vue
  7. 37
      subPages/trade-union-recharge/trade-union-recharge.vue

@ -305,9 +305,9 @@
})
that.city = '重庆市';
app.globalData.cityName = '重庆市';
app.globalData.cityId = '500000';
that.getCmsAactibity();
app.globalData.cityId = '500000';
that.getCmsContentcmsContent();
that.getCmsAactibity();
}
);
// #endif

@ -89,7 +89,7 @@
</image>
<view class="width50 margle10">
<view class="font15 fcor333 fontspec">等待付款</view>
<view class="font12 fcor666 fontspec mart5">剩余时间: {{countdownm}}:{{countdowns}}</view>
<view class="font12 fcor666 fontspec mart5">剩余时间: {{countdownm}}分钟</view>
</view>
<view class="topay">
去支付
@ -451,7 +451,7 @@
lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
24), //
leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? "0" + Math.floor(lefttime / (1000 * 60) % 60) :
leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? + Math.floor(lefttime / (1000 * 60) % 60) :
Math.floor(lefttime / (1000 * 60) % 60), //
lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
lefttime / 1000 % 60); //

@ -36,8 +36,8 @@
选择支付方式
</view>
<view class="content">
<view class="pay-list">
<view class="row" @tap="paytype='wxpay'">
<view class="pay-list" v-for="(item,index) in paytypeList" :key="index">
<view class="row" @tap="paytype='2'" v-if="item == 2">
<view class="left">
<image :src="imagewxUrl+imgadres"></image>
</view>
@ -45,7 +45,7 @@
微信支付
</view>
<view class="right">
<radio :checked="paytype=='wxpay'" color="#0083f5" />
<radio :checked="paytype=='2'" color="#0083f5" />
</view>
</view>
</view>
@ -66,7 +66,8 @@
let app = getApp()
import {
create,
wechatPay
wechatPay,
getThirdPartyByDetail
} from "../../../Utils/Api.js";
// #ifdef H5
var jweixin = require('jweixin-module');
@ -76,17 +77,40 @@
return {
inputAmount: '', //
amountList: [100, 200, 300, 500, 800, 1000], //3
paytype: 'wxpay', //
paytype: '2', //
user: "",
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'wxpay.png'
imgadres: 'wxpay.png',
paytypeList: [] //
};
},
onLoad() {
this.user = app.globalData.userInfo
},
onShow() {
this.getThirdPartyByDetail();
},
methods: {
//
getThirdPartyByDetail() {
// #ifdef H5
this.showType = 2;
// #endif
// #ifdef MP
this.showType = 1;
// #endif
let datas = {
platformId: this.showType,
"companyId": app.globalData.companyId,
productType: 4
}
getThirdPartyByDetail(datas).then(res => {
if (res.return_code == '000000') {
this.paytypeList = res.return_data.productPayType.split(',');
this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
}
});
},
select(amount) {
this.inputAmount = amount;
},
@ -115,16 +139,16 @@
uni.showLoading({
title: '正在提交订单...'
})
let goods = {
"childOrderList": [{
"goodsId": app.globalData.userInfo.id,
"goodsPrice": this.inputAmount,
"goodsType": 2,
"saleCount": 1,
}],
"promoteCode": app.globalData.identificationCode
}
let goods = {
"childOrderList": [{
"goodsId": app.globalData.userInfo.id,
"goodsPrice": this.inputAmount,
"goodsType": 2,
"saleCount": 1,
}],
"promoteCode": app.globalData.identificationCode
}
create(goods).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
@ -139,7 +163,7 @@
// #ifdef MP
let params = {
"orderNo": res.return_data.orderNo,
"openId": app.globalData.openId,
"openId": app.globalData.openId,
"openIdType": 1
}
// #endif
@ -187,9 +211,9 @@
} else {
uni.showToast({
title: res.return_msg,
duration:2000,
icon:'none'
title: res.return_msg,
duration: 2000,
icon: 'none'
});
}
})
@ -297,6 +321,7 @@
font-size: 36upx;
color: #089bf5;
background-color: #f1f1f1;
&.on {
background-color: #089bf5;
color: #ffffff;

@ -96,24 +96,23 @@
<view class="mart15 alijusstart font14 width94" v-if="recinfo.productType == 6">
<view class="width50 fcor777">加油金额</view>
<view class="width50 fotrt fcor333">¥{{oilList.gasRefuelPrice}}</view>
</view>
<view class="mart15 alijusstart font14 width94" v-if="materialData">
<view class="width50 fcor777">联系人</view>
<view class="width50 fotrt fcor333">¥{{materialData.user}}</view>
</view>
<view class="mart15 alijusstart font14 width94" v-if="materialData">
<view class="width50 fcor777">联系电话</view>
<view class="width50 fotrt fcor333">¥{{materialData.phone}}</view>
</view>
<view class="mart15 alijusstart font14 width94" v-if="materialData">
<view class="width50 fcor777">联系地址</view>
<view class="width50 fotrt fcor333">¥{{materialData.address}}</view>
</view>
</view>
<view class="mart15 alijusstart font14 width94" v-if="materialData">
<view class="width50 fcor777">联系人</view>
<view class="width50 fotrt fcor333">¥{{materialData.user}}</view>
</view>
<view class="mart15 alijusstart font14 width94" v-if="materialData">
<view class="width50 fcor777">联系电话</view>
<view class="width50 fotrt fcor333">¥{{materialData.phone}}</view>
</view>
<view class="mart15 alijusstart font14 width94" v-if="materialData">
<view class="width50 fcor777">联系地址</view>
<view class="width50 fotrt fcor333">¥{{materialData.address}}</view>
</view>
</view>
<!-- 支付信息 -->
<view class="width90 backcorfff mart10 concont">
<view class="width90 backcorfff mart10 ">
<view class="paddtop20 font22 width94 fcor333">优惠信息</view>
<view class="mart15 alijusstart font14 width94">
<view class="width50 fcor777">商品优惠</view>
@ -127,17 +126,21 @@
<view class="width50 fcor777">积分抵扣</view>
<view class="width50 fotrt fcoreb5">-¥{{recinfo.payGold / 100}}</view>
</view>
<view class="width95 height20 borderleft alijusnostart">
<view style="width: 5%;"></view>
<view class="width95" style="border-bottom: 1px dashed #bebcbc;"></view>
<view class="width100" style="height: 10px;">
<view class="cro_left_bottom flleft"></view>
<view class="cro_right_bottom flright"></view>
</view>
</view>
<view class="gooddes width90 backcorfff marb20">
<view class="width90w height20 bordertopleft alijusnostart">
<view class="width95 alijusnostart">
<view style="width: 9%;"></view>
<view style="border-bottom: 1px dashed #bebcbc;width: 88%;"></view>
</view>
<view class="width90 backcorfff marb20">
<view class="width100" style="height: 10px;">
<view class=".cro_left_top flleft"></view>
<view class=".cro_right_top flright"></view>
</view>
<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="!recinfo.payRealPrice">
</view>
<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-else>
加油实付 <text class="font24 fcor333 margle">{{recinfo.payRealPrice}}</text>
@ -738,10 +741,11 @@
// '&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
// .highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
// '&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
// })
uni.redirectTo({
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.orderNo + '&amount=' + this.recinfo
.payPrice + '&productType=' + this.recinfo.productType
// })
uni.redirectTo({
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.orderNo +
'&amount=' + this.recinfo
.payPrice + '&productType=' + this.recinfo.productType
})
},
}
@ -1051,22 +1055,28 @@
border-radius: 25px;
}
.cro_left_top,
.cro_right_top,
.cro_left_bottom,
.cro_right_bottom {
width: 20rpx;
height: 20rpx;
background: #f0f0f0;
}
.borderleft {
background-image: -webkit-radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
.cro_left_top {
border-radius: 0px 0px 20rpx 0px;
}
.bordertopleft {
background-image: -webkit-radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
.cro_right_top {
border-radius: 0px 0px 0px 20rpx;
}
.concont {
border-radius: 8px 8px 0 0;
background-image: -webkit-radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
.cro_left_bottom {
border-radius: 0px 20rpx 0px 0px;
}
.gooddes {
border-radius: 0 0 8px 8px;
background-image: -webkit-radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
.cro_right_bottom {
border-radius: 20rpx 0px 0px 0px;
}
</style>
</style>

@ -64,7 +64,7 @@
v-for="(item,index) in recinfo.object.orderItems" :key='index'>{{item.code}}</view>
</view>
<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !recinfo.list">
<!-- {{recinfo.statusDesc}} -->
<!-- {{recinfo.statusDesc}} -->
{{typeText[orderList.orderStatus]}}
</view>
<view class="fotct font20 width100 mart10 color2f6f43"
@ -72,7 +72,7 @@
</view>
</view>
<view class="concont width94 mart10 backcorfff">
<view class="width94 mart10 backcorfff">
<view class="width94 paddtop15 font16 fontwig6" v-if="typeid == 10">
充值明细
</view>
@ -101,15 +101,20 @@
</view>
</view>
</view>
<view class="width95 height20 borderleft alijusnostart">
<view style="width: 5%;"></view>
<view class="width95" style="border-bottom: 1px dashed #bebcbc;"></view>
<view class="width100" style="height: 10px;">
<view class="cro_left_bottom flleft"></view>
<view class="cro_right_bottom flright"></view>
</view>
<!-- <view class="width96" style="border:1px dashed #f4f4f4;"></view> -->
</view>
<view class="gooddes width94 backcorfff marb20">
<view class="width90w height20 bordertopleft alijusnostart">
<view class="width10"></view>
<view class="width95 alijusnostart">
<view style="width: 6%;"></view>
<view style="border-bottom: 1px dashed #bebcbc;width: 93%;"></view>
</view>
<view class="width94 backcorfff marb20">
<view class="width100" style="height: 10px;">
<view class=".cro_left_top flleft"></view>
<view class=".cro_right_top flright"></view>
</view>
<view class="width94 alijusstart paddtop10 ">
<view class="font15 fcor333 fontwig6 width50">商品小计</view>
@ -344,7 +349,8 @@
//
jumppay() {
uni.redirectTo({
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList. orderNo+ '&amount=' +
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList.orderNo +
'&amount=' +
this.orderList.payPrice + '&productType=' + this.orderList.productType
})
},
@ -449,24 +455,32 @@
background: linear-gradient(to bottom, #3da7e7, #e8eff4);
}
.borderleft {
background-image: radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
.cro_left_top,
.cro_right_top,
.cro_left_bottom,
.cro_right_bottom {
width: 20rpx;
height: 20rpx;
background: #f0f0f0;
}
.bordertopleft {
background-image: radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
.cro_left_top {
border-radius: 0px 0px 20rpx 0px;
}
.concont {
border-radius: 12px 12px 0 0;
background-image: radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
.cro_right_top {
border-radius: 0px 0px 0px 20rpx;
}
.gooddes {
border-radius: 0 0 12px 12px;
background-image: radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
.cro_left_bottom {
border-radius: 0px 20rpx 0px 0px;
}
.cro_right_bottom {
border-radius: 20rpx 0px 0px 0px;
}
.footbtn {
bottom: 0px;
position: fixed;

@ -23,13 +23,13 @@
</view>
</view>
</view>
<view class="width94 backcorfff mart10">
<view class="width94 alijusstart height50 font14 fcor666">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view>
<input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" />
</view>
</view>
<view class="width94 backcorfff mart10">
<view class="width94 alijusstart height50 font14 fcor666">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view>
<input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" />
</view>
</view>
<view class="width94 comorder mart10">
<view class="height50 width100 backcorfff">
@ -47,24 +47,26 @@
<radio :checked="paytype=='jinbi'" color="#0083f5" />
</view>
</view> -->
<view class="width94 line1 mart5 marb5"></view>
<view class="height50 width100 backcorfff" @tap="paytype='weixin'">
<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"></view>
<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'">
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}</text>
<view class="width100" v-for="(item,index) in paytypeList" :key="index">
<view class="width94 line1 mart5 marb5" v-if="item == 2"></view>
<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"
style="align-items: center;">
<radio :checked="paytype=='2'" color="#0083f5" />
</view>
</view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
style="align-items: center;">
<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
<view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
<view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3">
<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=='3'" @click="changeRiado()" color="#0083f5" />
</view>
</view>
</view>
</view>
@ -102,7 +104,8 @@
orderToGoldPay,
findUser,
cardPay,
getHuiLianTongCardBalance
getHuiLianTongCardBalance,
getThirdPartyByDetail
} from '../../Utils/Api.js';
import ssPaymentPassword from '../../components/sanshui-payment-password'
let app = getApp();
@ -125,23 +128,24 @@
radioStatus: true,
memDiscountId: '',
user: '',
paytype: '',
paytype: '2',
PaymentPassword: '',
orderId: '',
tongCardPrice: 0,
storeId: '',
isDiscont: false,
identificationCode: '' //
isDiscont: false,
identificationCode: '', //
paytypeList: [] //
};
},
onLoad(option) {
this.couponId = option.id;
// #ifdef H5
this.identificationCode = app.globalData.staffCode;
// #endif
// #ifdef MP
this.identificationCode = app.globalData.identificationCode;
this.couponId = option.id;
// #ifdef H5
this.identificationCode = app.globalData.staffCode;
// #endif
// #ifdef MP
this.identificationCode = app.globalData.identificationCode;
// #endif
this.getDiscountPackageDetail();
},
@ -149,7 +153,8 @@
let that = this;
that.paytype = '';
that.user = app.globalData.userInfo;
that.findUser();
that.findUser();
that.getThirdPartyByDetail();
},
onHide() {
@ -179,15 +184,35 @@
}
},
methods: {
//
getThirdPartyByDetail() {
// #ifdef H5
this.showType = 2;
// #endif
// #ifdef MP
this.showType = 1;
// #endif
let datas = {
platformId: this.showType,
"companyId": app.globalData.companyId,
productType: 7
}
getThirdPartyByDetail(datas).then(res => {
if (res.return_code == '000000') {
this.paytypeList = res.return_data.productPayType.split(',');
this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
}
});
},
//
findUser() {
let params;
findUser(params).then(res => {
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data;
this.user = res.return_data;
if(res.return_data.hltCardNo != undefined){
this.getHuiLianTongCardBalance();
this.user = res.return_data;
if (res.return_data.hltCardNo != undefined) {
this.getHuiLianTongCardBalance();
}
uni.setStorage({
key: "user",
@ -333,7 +358,7 @@
//
wechatPay(item) {
let that = this;
if (that.paytype == 'weixin') {
if (that.paytype == '2') {
// #ifdef H5
let params = {
"orderNo": item.orderNo,
@ -392,7 +417,7 @@
})
}
})
} else if (that.paytype == 'gonghuika') {
} else if (that.paytype == '3') {
if (that.tongCardPrice < that.paytheprice) {
uni.showToast({
icon: 'none',
@ -444,7 +469,7 @@
uni.showLoading({
title: '支付中...'
})
let params = {
"orderNo": this.orderId,
"cardNo": this.user.hltCardNo.cardNo,

@ -37,8 +37,8 @@
选择支付方式
</view>
<view class="content">
<view class="pay-list">
<view class="row" @tap="paytype='wxpay'">
<view class="pay-list" v-for="(item,index) in paytypeList" :key="index">
<view class="row" @tap="paytype='2'" v-if="item == 2">
<view class="left">
<image :src="imagewxUrl+imgadres"></image>
</view>
@ -46,7 +46,7 @@
微信支付
</view>
<view class="right">
<radio :checked="paytype=='wxpay'" color="#0083f5" />
<radio :checked="paytype=='2'" color="#0083f5" />
</view>
</view>
</view>
@ -68,7 +68,8 @@
import {
create,
wechatPay,
getHuiLianTongCardBalance
getHuiLianTongCardBalance,
getThirdPartyByDetail
} from "../../Utils/Api.js";
// #ifdef H5
var jweixin = require('jweixin-module');
@ -78,13 +79,14 @@
return {
inputAmount: '', //
amountList: [50, 100, 150], //3
paytype: 'wxpay', //
paytype: '2', //
user: "",
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'wxpay.png',
tongCardPrice: 0,
cardId: '', //
typevas: ''
typevas: '',
paytypeList: [] //
};
},
onLoad(options) {
@ -92,11 +94,32 @@
this.typevas = options.RechargeType;
},
onShow() {
this.user = app.globalData.userInfo;
this.user = app.globalData.userInfo;
this.getThirdPartyByDetail();
},
methods: {
select(amount) {
this.inputAmount = amount;
},
//
getThirdPartyByDetail() {
// #ifdef H5
this.showType = 2;
// #endif
// #ifdef MP
this.showType = 1;
// #endif
let datas = {
platformId: this.showType,
"companyId": app.globalData.companyId,
productType: 8
}
getThirdPartyByDetail(datas).then(res => {
if (res.return_code == '000000') {
this.paytypeList = res.return_data.productPayType.split(',');
this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
}
});
},
doDeposit() {
if (!this.cardId) {

Loading…
Cancel
Save