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

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

Browse Source 
2.优化2.0ios订单详情页面显示问题
yj-dev
杨杰 2 years ago
parent d2047af37f
commit 7838027718
7 changed files with 227 additions and 130 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. 2
      pages/tabBar/home/home.vue
  2. 4
      pages/tabBar/user/user.vue
  3. 43
      pages/user/deposit/deposit.vue
  4. 50
      pages/user/order_details/order_details.vue
  5. 52
      qianzhu-KFC/order-details/order-details.vue
  6. 49
      subPages/coupon-comfirmation/coupon-comfirmation.vue
  7. 35
      subPages/trade-union-recharge/trade-union-recharge.vue

2
pages/tabBar/home/home.vue
Unescape View File

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

4
pages/tabBar/user/user.vue
Unescape View File

@ -89,7 +89,7 @@
</image> </image>
<view class="width50 margle10"> <view class="width50 margle10">
<view class="font15 fcor333 fontspec">等待付款</view> <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>
<view class="topay"> <view class="topay">
去支付 去支付
@ -451,7 +451,7 @@
lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime / 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 * (1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
24), //计算小时数 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), //计算分钟数 Math.floor(lefttime / (1000 * 60) % 60), //计算分钟数
lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor( lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
lefttime / 1000 % 60); //计算秒数 lefttime / 1000 % 60); //计算秒数

43
pages/user/deposit/deposit.vue
Unescape View File

@ -36,8 +36,8 @@
选择支付方式 选择支付方式
</view> </view>
<view class="content"> <view class="content">
<view class="pay-list"> <view class="pay-list" v-for="(item,index) in paytypeList" :key="index">
<view class="row" @tap="paytype='wxpay'"> <view class="row" @tap="paytype='2'" v-if="item == 2">
<view class="left"> <view class="left">
<image :src="imagewxUrl+imgadres"></image> <image :src="imagewxUrl+imgadres"></image>
</view> </view>
@ -45,7 +45,7 @@
微信支付 微信支付
</view> </view>
<view class="right"> <view class="right">
<radio :checked="paytype=='wxpay'" color="#0083f5" /> <radio :checked="paytype=='2'" color="#0083f5" />
</view> </view>
</view> </view>
</view> </view>
@ -66,7 +66,8 @@
let app = getApp() let app = getApp()
import { import {
create, create,
wechatPay wechatPay,
getThirdPartyByDetail
} from "../../../Utils/Api.js"; } from "../../../Utils/Api.js";
// #ifdef H5 // #ifdef H5
var jweixin = require('jweixin-module'); var jweixin = require('jweixin-module');
@ -76,17 +77,40 @@
return { return {
inputAmount: '', //金额 inputAmount: '', //金额
amountList: [100, 200, 300, 500, 800, 1000], //预设3个可选快捷金额 amountList: [100, 200, 300, 500, 800, 1000], //预设3个可选快捷金额
paytype: 'wxpay', //支付类型 paytype: '2', //支付类型
user: "", user: "",
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
imgadres: 'wxpay.png' imgadres: 'wxpay.png',
paytypeList: [] //支付方式
}; };
}, },
onLoad() { onLoad() {
this.user = app.globalData.userInfo this.user = app.globalData.userInfo
}, },
onShow() {
this.getThirdPartyByDetail();
},
methods: { 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) { select(amount) {
this.inputAmount = amount; this.inputAmount = amount;
}, },
@ -188,8 +212,8 @@
} else { } else {
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
duration:2000, duration: 2000,
icon:'none' icon: 'none'
}); });
} }
}) })
@ -297,6 +321,7 @@
font-size: 36upx; font-size: 36upx;
color: #089bf5; color: #089bf5;
background-color: #f1f1f1; background-color: #f1f1f1;
&.on { &.on {
background-color: #089bf5; background-color: #089bf5;
color: #ffffff; color: #ffffff;

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

@ -109,11 +109,10 @@
<view class="width50 fcor777">联系地址</view> <view class="width50 fcor777">联系地址</view>
<view class="width50 fotrt fcor333">¥{{materialData.address}}</view> <view class="width50 fotrt fcor333">¥{{materialData.address}}</view>
</view> </view>
</view> </view>
<!-- 支付信息 --> <!-- 支付信息 -->
<view class="width90 backcorfff mart10 concont"> <view class="width90 backcorfff mart10 ">
<view class="paddtop20 font22 width94 fcor333">优惠信息</view> <view class="paddtop20 font22 width94 fcor333">优惠信息</view>
<view class="mart15 alijusstart font14 width94"> <view class="mart15 alijusstart font14 width94">
<view class="width50 fcor777">商品优惠</view> <view class="width50 fcor777">商品优惠</view>
@ -127,17 +126,21 @@
<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 borderleft 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="gooddes width90 backcorfff marb20"> <view class="width95 alijusnostart">
<view class="width90w height20 bordertopleft 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>
<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="!recinfo.payRealPrice"> <view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="!recinfo.payRealPrice">
</view> </view>
<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-else> <view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-else>
加油实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text> 加油实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text>
@ -740,7 +743,8 @@
// '&goodsType=' + this.recinfo.highChildOrderList[0].goodsType // '&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
// }) // })
uni.redirectTo({ uni.redirectTo({
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.orderNo + '&amount=' + this.recinfo url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.orderNo +
'&amount=' + this.recinfo
.payPrice + '&productType=' + this.recinfo.productType .payPrice + '&productType=' + this.recinfo.productType
}) })
}, },
@ -1051,22 +1055,28 @@
border-radius: 25px; border-radius: 25px;
} }
.cro_left_top,
.cro_right_top,
.cro_left_bottom,
.cro_right_bottom {
width: 20rpx;
height: 20rpx;
background: #f0f0f0;
}
.borderleft { .cro_left_top {
background-image: -webkit-radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff); border-radius: 0px 0px 20rpx 0px;
} }
.bordertopleft { .cro_right_top {
background-image: -webkit-radial-gradient(10px at top left, #f0f0f0 10px, #ffffff); border-radius: 0px 0px 0px 20rpx;
} }
.concont { .cro_left_bottom {
border-radius: 8px 8px 0 0; border-radius: 0px 20rpx 0px 0px;
background-image: -webkit-radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
} }
.gooddes { .cro_right_bottom {
border-radius: 0 0 8px 8px; border-radius: 20rpx 0px 0px 0px;
background-image: -webkit-radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
} }
</style> </style>

52
qianzhu-KFC/order-details/order-details.vue
Unescape View File

@ -72,7 +72,7 @@
</view> </view>
</view> </view>
<view class="concont width94 mart10 backcorfff"> <view class="width94 mart10 backcorfff">
<view class="width94 paddtop15 font16 fontwig6" v-if="typeid == 10"> <view class="width94 paddtop15 font16 fontwig6" v-if="typeid == 10">
充值明细 充值明细
</view> </view>
@ -101,15 +101,20 @@
</view> </view>
</view> </view>
</view> </view>
<view class="width95 height20 borderleft alijusnostart">
<view style="width: 5%;"></view> <view class="width100" style="height: 10px;">
<view class="width95" style="border-bottom: 1px dashed #bebcbc;"></view> <view class="cro_left_bottom flleft"></view>
<view class="cro_right_bottom flright"></view>
</view>
</view> </view>
<!-- <view class="width96" style="border:1px dashed #f4f4f4;"></view> --> <view class="width95 alijusnostart">
<view style="width: 6%;"></view>
<view style="border-bottom: 1px dashed #bebcbc;width: 93%;"></view>
</view> </view>
<view class="gooddes width94 backcorfff marb20"> <view class="width94 backcorfff marb20">
<view class="width90w height20 bordertopleft alijusnostart"> <view class="width100" style="height: 10px;">
<view class="width10"></view> <view class=".cro_left_top flleft"></view>
<view class=".cro_right_top flright"></view>
</view> </view>
<view class="width94 alijusstart paddtop10 "> <view class="width94 alijusstart paddtop10 ">
<view class="font15 fcor333 fontwig6 width50">商品小计</view> <view class="font15 fcor333 fontwig6 width50">商品小计</view>
@ -344,7 +349,8 @@
//跳转支付 //跳转支付
jumppay() { jumppay() {
uni.redirectTo({ 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 this.orderList.payPrice + '&productType=' + this.orderList.productType
}) })
}, },
@ -449,24 +455,32 @@
background: linear-gradient(to bottom, #3da7e7, #e8eff4); background: linear-gradient(to bottom, #3da7e7, #e8eff4);
} }
.borderleft { .cro_left_top,
background-image: radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff); .cro_right_top,
.cro_left_bottom,
.cro_right_bottom {
width: 20rpx;
height: 20rpx;
background: #f0f0f0;
} }
.bordertopleft { .cro_left_top {
background-image: radial-gradient(10px at top left, #f0f0f0 10px, #ffffff); border-radius: 0px 0px 20rpx 0px;
} }
.concont { .cro_right_top {
border-radius: 12px 12px 0 0; border-radius: 0px 0px 0px 20rpx;
background-image: radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
} }
.gooddes { .cro_left_bottom {
border-radius: 0 0 12px 12px; border-radius: 0px 20rpx 0px 0px;
background-image: radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
} }
.cro_right_bottom {
border-radius: 20rpx 0px 0px 0px;
}
.footbtn { .footbtn {
bottom: 0px; bottom: 0px;
position: fixed; position: fixed;

49
subPages/coupon-comfirmation/coupon-comfirmation.vue
Unescape View File

@ -47,24 +47,26 @@
<radio :checked="paytype=='jinbi'" color="#0083f5" /> <radio :checked="paytype=='jinbi'" color="#0083f5" />
</view> </view>
</view> --> </view> -->
<view class="width94 line1 mart5 marb5"></view> <view class="width100" v-for="(item,index) in paytypeList" :key="index">
<view class="height50 width100 backcorfff" @tap="paytype='weixin'"> <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 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=='2'" color="#0083f5" />
</view> </view>
</view> </view>
<view class="width94 line1 mart5 marb5"></view> <view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'"> <view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3">
<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=='3'" @click="changeRiado()" color="#0083f5" />
</view>
</view> </view>
</view> </view>
</view> </view>
@ -102,7 +104,8 @@
orderToGoldPay, orderToGoldPay,
findUser, findUser,
cardPay, cardPay,
getHuiLianTongCardBalance getHuiLianTongCardBalance,
getThirdPartyByDetail
} from '../../Utils/Api.js'; } from '../../Utils/Api.js';
import ssPaymentPassword from '../../components/sanshui-payment-password' import ssPaymentPassword from '../../components/sanshui-payment-password'
let app = getApp(); let app = getApp();
@ -125,13 +128,14 @@
radioStatus: true, radioStatus: true,
memDiscountId: '', memDiscountId: '',
user: '', user: '',
paytype: '', paytype: '2',
PaymentPassword: '', PaymentPassword: '',
orderId: '', orderId: '',
tongCardPrice: 0, tongCardPrice: 0,
storeId: '', storeId: '',
isDiscont: false, isDiscont: false,
identificationCode: '' //渠道商 identificationCode: '', //渠道商
paytypeList: [] //支付方式
}; };
}, },
@ -150,6 +154,7 @@
that.paytype = ''; that.paytype = '';
that.user = app.globalData.userInfo; that.user = app.globalData.userInfo;
that.findUser(); that.findUser();
that.getThirdPartyByDetail();
}, },
onHide() { onHide() {
@ -179,6 +184,26 @@
} }
}, },
methods: { 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() { findUser() {
let params; let params;
@ -186,7 +211,7 @@
if (res.return_code == '000000') { if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data; app.globalData.userInfo = res.return_data;
this.user = res.return_data; this.user = res.return_data;
if(res.return_data.hltCardNo != undefined){ if (res.return_data.hltCardNo != undefined) {
this.getHuiLianTongCardBalance(); this.getHuiLianTongCardBalance();
} }
uni.setStorage({ uni.setStorage({
@ -333,7 +358,7 @@
//获取订单数据 //获取订单数据
wechatPay(item) { wechatPay(item) {
let that = this; let that = this;
if (that.paytype == 'weixin') { if (that.paytype == '2') {
// #ifdef H5 // #ifdef H5
let params = { let params = {
"orderNo": item.orderNo, "orderNo": item.orderNo,
@ -392,7 +417,7 @@
}) })
} }
}) })
} else if (that.paytype == 'gonghuika') { } else if (that.paytype == '3') {
if (that.tongCardPrice < that.paytheprice) { if (that.tongCardPrice < that.paytheprice) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',

35
subPages/trade-union-recharge/trade-union-recharge.vue
Unescape View File

@ -37,8 +37,8 @@
选择支付方式 选择支付方式
</view> </view>
<view class="content"> <view class="content">
<view class="pay-list"> <view class="pay-list" v-for="(item,index) in paytypeList" :key="index">
<view class="row" @tap="paytype='wxpay'"> <view class="row" @tap="paytype='2'" v-if="item == 2">
<view class="left"> <view class="left">
<image :src="imagewxUrl+imgadres"></image> <image :src="imagewxUrl+imgadres"></image>
</view> </view>
@ -46,7 +46,7 @@
微信支付 微信支付
</view> </view>
<view class="right"> <view class="right">
<radio :checked="paytype=='wxpay'" color="#0083f5" /> <radio :checked="paytype=='2'" color="#0083f5" />
</view> </view>
</view> </view>
</view> </view>
@ -68,7 +68,8 @@
import { import {
create, create,
wechatPay, wechatPay,
getHuiLianTongCardBalance getHuiLianTongCardBalance,
getThirdPartyByDetail
} from "../../Utils/Api.js"; } from "../../Utils/Api.js";
// #ifdef H5 // #ifdef H5
var jweixin = require('jweixin-module'); var jweixin = require('jweixin-module');
@ -78,13 +79,14 @@
return { return {
inputAmount: '', //金额 inputAmount: '', //金额
amountList: [50, 100, 150], //预设3个可选快捷金额 amountList: [50, 100, 150], //预设3个可选快捷金额
paytype: 'wxpay', //支付类型 paytype: '2', //支付类型
user: "", user: "",
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
imgadres: 'wxpay.png', imgadres: 'wxpay.png',
tongCardPrice: 0, tongCardPrice: 0,
cardId: '', //工会卡号 cardId: '', //工会卡号
typevas: '' typevas: '',
paytypeList: [] //支付方式
}; };
}, },
onLoad(options) { onLoad(options) {
@ -93,11 +95,32 @@
}, },
onShow() { onShow() {
this.user = app.globalData.userInfo; this.user = app.globalData.userInfo;
this.getThirdPartyByDetail();
}, },
methods: { methods: {
select(amount) { select(amount) {
this.inputAmount = 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() { doDeposit() {
if (!this.cardId) { if (!this.cardId) {
uni.showToast({ uni.showToast({

Write Preview
Loading…
Cancel
Save