Commit eb822264 authored by 李智书's avatar 李智书

Merge branch 'develop'

parents 7dfce1ec 3076c800
......@@ -10,6 +10,10 @@
{
"launchtype" : "local"
},
"mp-weixin" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
}
]
......
......@@ -3286,6 +3286,37 @@
"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
"dev": true
},
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"default-gateway": {
"version": "5.0.5",
"resolved": "https://repo.huaweicloud.com/repository/npm/default-gateway/-/default-gateway-5.0.5.tgz",
......@@ -3338,6 +3369,13 @@
"slash": "^2.0.0"
}
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"hash-sum": {
"version": "2.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/hash-sum/-/hash-sum-2.0.0.tgz",
......@@ -3356,6 +3394,18 @@
"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
"dev": true
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"p-finally": {
"version": "2.0.1",
"resolved": "https://repo.huaweicloud.com/repository/npm/p-finally/-/p-finally-2.0.1.tgz",
......@@ -3367,6 +3417,28 @@
"resolved": "https://repo.huaweicloud.com/repository/npm/slash/-/slash-2.0.0.tgz",
"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
"dev": true
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -12235,6 +12307,11 @@
"sha.js": "^2.4.8"
}
},
"pdfh5": {
"version": "1.4.2",
"resolved": "https://registry.npmmirror.com/pdfh5/-/pdfh5-1.4.2.tgz",
"integrity": "sha512-1BL8HIx/EEZowRPBgas7/WokbGEv1gxKNRmmHSimG113178mKxIBH4pxWBc0tj6d25Sy+EwnlQwv9cUUmQa42w=="
},
"performance-now": {
"version": "2.1.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/performance-now/-/performance-now-2.1.0.tgz",
......@@ -15641,87 +15718,6 @@
"vue-style-loader": "^4.1.0"
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.1",
"resolved": "https://repo.huaweicloud.com/repository/npm/vue-loader/-/vue-loader-16.8.1.tgz",
"integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://repo.huaweicloud.com/repository/npm/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://repo.huaweicloud.com/repository/npm/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"hash-sum": {
"version": "2.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/hash-sum/-/hash-sum-2.0.0.tgz",
"integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-style-loader": {
"version": "4.1.3",
"resolved": "https://repo.huaweicloud.com/repository/npm/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
......
......@@ -11,15 +11,18 @@
<view class="cardNum">
<view class="cardNumleft"><span>账户:</span> **** **** ****
{{bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}}
<span>({{accountEnum[bankInfo_.accountType+'']}}III类户)</span>
<span>({{accountEnum[bankInfo_.accountType+'']}})</span>
</view>
<view class="cardNumright" id="cardNumright" @click="CopyCardNumber">复制</view>
</view>
<view class="HidenText">
<view class="userName" style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;">姓名:<span>{{PersonalInfo.name}}</span></view>
<view class="StudentCls" style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;" v-if="PersonalInfo.usertype=='1'">
<view class="userName" style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;">
姓名:<span>{{PersonalInfo.name}}</span></view>
<view class="StudentCls" style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;"
v-if="PersonalInfo.usertype=='1'">
班级:{{PersonalInfo.gradename}}({{PersonalInfo.classname}})</view>
<view class='TeacherCls' style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;" v-else>教职工</view>
<view class='TeacherCls' style="text-overflow: ellipsis;overflow: hidden; white-space: nowrap;"
v-else>教职工</view>
</view>
<view class="Balance">
<view class="cardBalanceTx">余额:¥<span>{{cardBalanceTx}}</span></view>
......@@ -57,7 +60,7 @@
<view class="depositbox">
<image mode='widthFix' class="depositImg" src="../../../static/img/depositIcon.png"></image>
<span style="vertical-align:middle;font-size: 28rpx;color: #333333;font-weight: 500;">最大可充值金额:<span
style="color:red;"><span class="canDepositTx">2000</span></span></span>
style="color:red;"><span class="canDepositTx">{{RechargeMax}}</span></span></span>
</view>
<!-- 充值其它金额 -->
<view class="OtherMoney" v-if="isOtherMoney">
......@@ -113,11 +116,18 @@
验证校园卡开卡手机号
</view>
<van-field label-class="openCardPhonTxt" label="手机号:" maxlength="11" v-model="openCardPhon"
placeholder="校园卡开卡手机号" center :border="false" />
placeholder="校园卡开卡手机号" center :border="false">
<view slot="right-icon" v-if="bankInfo_.accountType==4">
<view class="changPhone" style="display: flex;justify-content: center;"
@click="changePhone">变更手机号
<van-icon name="arrow" />
</view>
</view>
</van-field>
<view style="width: 520rpx;height: 1rpx;background: #EEEEEE;"></view>
<van-field v-model="openCardPhonSms" label-class="openCardPhonSmsTxt" maxlength="6" label="验证码:"
placeholder="输入短信验证码" center clearable :border="false">
<van-button slot="button" size="small" type="primary" @click="SendSms" >
<van-button slot="button" size="small" type="primary" @click="SendSms">
<div style="font-size:28rpx;">{{CodeMsg}}</div>
</van-button>
</van-field>
......@@ -259,9 +269,10 @@
accountType: '2',
// 银行账户类型名称枚举
accountEnum: {
'1': "平安银行",
'2': "工商银行",
'3': "交通银行",
'1': "平安银行III类户",
'2': "工商银行III类户",
'3': "交通银行III类户",
'4': "渤海银行II类户",
},
/**
* 20211129新增
......@@ -305,6 +316,13 @@
mask: true,
title: "请稍后...."
});
if (bankInfo.accountType == 4) {
jWeixin.miniProgram.navigateTo({
url: `/pages_subpack/pages/changeBindCard/main`,
});
uni.hideLoading()
return
}
this.BackToMini('AssignAddCard')
uni.hideLoading()
},
......@@ -340,6 +358,7 @@
MyTimer = null
this.CodeMsg = "获取验证码"
this.msCount = 60;
this.openCardPhonSms = '';
}
this.$refs.popup.open('top')
},
......@@ -423,8 +442,25 @@
loadingType: 'spinner',
duration: 0
});
// 20211230
let exchangeUrl = gHost;
switch (bankInfo.accountType) {
case 3:
exchangeUrl = exchangeUrl + '/bank-wechat/bocom/exchange/rechargeSms';
break;
case 4:
exchangeUrl = exchangeUrl + '/bank-wechat/bohai/comprehensive/otpSms';
break;
default:
Dialog({
title: '系统提示',
message: '银行账号类型错误!'
});
throw ("银行账号类型错误!")
break;
}
$.ajax({
url: gHost + '/bank-wechat/bocom/exchange/rechargeSms',
url: exchangeUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
......@@ -433,6 +469,9 @@
userId: userID, //用户id
sessionid: sessionID,
wechattype: 1,
// 20211230渤海
mobilePhone: this.openCardPhon,
msg: "充值"
},
headers: {
'sessionid': sessionID,
......@@ -489,12 +528,14 @@
});
return
}
if (!this.RechargeSmsorderNoInfo.orderNo) {
Dialog({
title: '系统提示',
message: '请获取验证码!'
});
return
if (bankInfo.accountType != 4) {
if (!this.RechargeSmsorderNoInfo.orderNo) {
Dialog({
title: '系统提示',
message: '请获取验证码!'
});
return
}
}
if (!this.openCardPhonSms) {
Dialog({
......@@ -507,8 +548,25 @@
mask: true,
title: "处理中......"
})
// 20211230
let exchangeUrl = gHost;
switch (bankInfo.accountType) {
case 3:
exchangeUrl = exchangeUrl + '/bank-wechat/bocom/exchange/recharge';
break;
case 4:
exchangeUrl = exchangeUrl + '/bank-wechat/bohai/exchange/recharge';
break;
default:
Dialog({
title: '系统提示',
message: '银行账号类型错误!'
});
throw ("银行账号类型错误!")
break;
}
$.ajax({
url: gHost + '/bank-wechat/bocom/exchange/recharge',
url: exchangeUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
......@@ -519,6 +577,9 @@
userId: userID, //用户id
sessionid: sessionID,
wechattype: 1,
// 21211230渤海银行
transAmount: (amount * 1).toFixed(2),
verifyNo: this.openCardPhonSms
},
headers: {
'sessionid': sessionID,
......@@ -530,29 +591,46 @@
setTimeout(() => {
this_.queryBankInfo();
}, 3000);
wx.showModal({
title: '充值申请已提交',
content: '银行处理需要1-5分钟时间,充值结果以余额查询为准。',
showCancel: false,
success: function() {
let accountNo = this_.bankInfo_.accountNo
accountNo = accountNo.slice(accountNo.length - 4, accountNo
.length);
let thiTime = new Date();
let str = ''
let thiTime = new Date();
let str = '';
let accountNo = this_.bankInfo_.bindCardNo
accountNo = accountNo.slice(accountNo.length - 4,
accountNo
.length);
let minutes_ = (thiTime.getMinutes().toString().length) < 2 ? (thiTime
.getMinutes().toString().padStart(2, "0")) : (thiTime.getMinutes()
.toString())
switch (bankInfo.accountType) {
case 3:
if (thiTime.getMinutes() + 20 >= 60) {
str = thiTime.getHours() + 1 + ':' + (60 - thiTime
str = thiTime.getHours() + 1 + ':' + (60 -
thiTime
.getMinutes())
} else {
str = thiTime.getHours() + ':' + thiTime.getMinutes()
str = thiTime.getHours() + ':' + (thiTime
.getMinutes() + 20)
}
wx.showModal({
title: '充值申请已提交',
content: '银行处理需要1-20分钟时间,充值结果以余额查询为准。',
showCancel: false,
success: function() {
uni.navigateTo({
url: `../../recharging/recharging?bankName=${this_.bankInfo_.bindCardName}&bankNumber=${accountNo}&time=${str}&money=${(amount * 1).toFixed(2)}`
})
}
})
break;
case 4:
str = (thiTime.getHours() + 2) + ':' + minutes_
uni.navigateTo({
url: `../../recharging/recharging?bankName=${this_.accountEnum[this_.bankInfo_.accountType+'']}&bankNumber=${accountNo}&time=${str}&money=${(amount * 1).toFixed(2)}`
url: `../../recharging/recharging?bankName=${this_.bankInfo_.bindCardName}&bankNumber=${accountNo}&time=${str}&money=${(amount * 1).toFixed(2)}`
})
}
})
break;
default:
break;
}
// 20211129
this_.RechargeSmsorderNoInfo = {}
} else {
......@@ -660,6 +738,17 @@
}
})
},
// 更换手机号码
changePhone() {
uni.showLoading({
mask: true,
title: "请稍后...."
});
jWeixin.miniProgram.navigateTo({
url: `/pages_subpack/pages/changePhone/main`,
});
uni.hideLoading()
},
//返回小程序 跳转指定页面
BackToMini(page) {
if (page == 'UserMain' || page == 'personalCenter') {
......@@ -738,9 +827,26 @@
//获取银行余额
queryBankInfo() {
let this_ = this;
let queryBankInfoUrl = gHost;
// 20211230
switch (bankInfo.accountType) {
case 3:
queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/bocom/balance/getBankBlanceAndSyncLocal';
break;
case 4:
queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/bohai/exchange/balanceQuery';
break;
default:
Dialog({
title: '系统提示',
message: '银行账号类型错误!'
});
throw ("银行账号类型错误!")
break;
}
// let loading = weui.loading('请稍后');
$.ajax({
url: gHost + '/bank-wechat/bocom/balance/getBankBlanceAndSyncLocal',
url: queryBankInfoUrl,
type: "POST",
timeout: 8000,
contentType: "application/x-www-form-urlencoded",
......@@ -754,6 +860,20 @@
success: function(res3) {
// loading.hide();
if (res3.code == "10000") {
if (bankInfo.accountType == 4) {
if (res3.results.eacTotalAmt == null) {
weui.topTips("账户信息为空,余额查询失败");
} else {
this_.cardBalanceTx = (res3.results.eacTotalAmt * 1).toFixed(2);
$('.TxClsTx').attr('placeholder',
`可提现金额${(res3.results.eacTotalAmt * 1).toFixed(2)}元`
)
this_.RechargeMax = ((2000 - ((res3.results.eacTotalAmt * 1).toFixed(
2) *
1)).toFixed(2));
}
return
}
if (res3.results.accountBalance == null) {
weui.topTips("账户信息为空,余额查询失败");
} else {
......@@ -764,6 +884,7 @@
this_.RechargeMax = ((2000 - ((res3.results.accountBalance * 1).toFixed(2) *
1)).toFixed(2));
}
} else {
weui.topTips(res3.message)
}
......@@ -872,6 +993,13 @@
}
.changPhone {
font-size: 14px;
color: #39F;
text-align: right;
}
.showBindCardList {
.choiceBox {
text-align: center;
......
<template>
<view class="container">
<view class="ReflectBox">
<view class="ReflectBox" v-if="bankInfo_.accountType==3">
<view class="left_">提现金额 </view>
<view class="right_">每日可提现一次</view>
</view>
<!-- 20211230渤海银行 -->
<view class="BankBohai" v-if="bankInfo_.accountType==4">
<view class="BankBHL">提现至</view>
<view class="BankBHR">
<view class="">{{bankInfo_.bindCardName}}
({{'**** '+bankInfo_.bindCardNo.slice(bankInfo_.bindCardNo.length-4)}})</view>
<view class="">预计2小时内到账</view>
</view>
</view>
<view class="OtherMoney" v-if="true">
<span></span>
<input class="TxClsTx" v-model="inputOtherM" @input="inputControl" @blur="ReturnToTop"
:placeholder="placeholder" placeholder-class="placeholderinputOtherM" type="text" maxlength="6" />
<span class="ALL" @click="TxAllFun" v-if="bankInfo_.accountType==3">全部</span>
</view>
<!-- 20211230渤海银行 -->
<view class="BankBHBalance">
<span>当前卡包余额{{cardBalanceTx}}元,</span>
<span class="ALL" @click="TxAllFun">全部</span>
</view>
<!-- 提现账户 -->
<view class="payType" @click="queryBindCardList">
<view class="payType" @click="queryBindCardList" v-if="bankInfo_.accountType==3">
<view>提现账户</view>
<view>{{bankInfo_.accountName}}({{bankInfo_.accountNo.slice(bankInfo_.accountNo.length-4)}}) <span
class="arrow"></span></view>
</view>
<view class="OtherMoney" v-if="false" style="color: #BFBFBF;font-weight: 500;">
每日仅可提现一次,请明日再来。
小提示:每天仅可提现一次
</view>
<view class="bottomdiv">
<view v-if="bankInfo_.accountType==4"
style="font-weight: 500;text-align: center;height: 27px;line-height: 27px;">
小提示:每天仅可提现一次
</view>
<view class="DepositID" @click="toDeposit(0)" v-bind:style="inputOtherM>0?'':'opacity: 0.5 !important;'">
<span>提现</span>
</view>
......@@ -37,7 +55,14 @@
验证校园卡开卡手机号
</view>
<van-field label-class="openCardPhonTxt" label="手机号:" maxlength="11" v-model="openCardPhon"
placeholder="校园卡开卡手机号" center :border="false" />
placeholder="校园卡开卡手机号" center :border="false">
<view slot="right-icon" v-if="bankInfo_.accountType==4">
<view class="changPhone" style="display: flex;justify-content: center;"
@click="changePhone">变更手机号
<van-icon name="arrow" />
</view>
</view>
</van-field>
<view style="width: 520rpx;height: 1rpx;background: #EEEEEE;"></view>
<van-field v-model="openCardPhonSms" label-class="openCardPhonSmsTxt" maxlength="6" label="验证码:"
placeholder="输入短信验证码" center clearable :border="false">
......@@ -102,7 +127,7 @@
inputOtherM: '',
ImgUrl: this.$ImgUrl,
ReflectMoney: 3,
cardBalanceTx: '',
cardBalanceTx: '0',
placeholder: "可提现金额0.00元",
bankInfo_: {
accountNo: '**** **** **** 1234'
......@@ -115,7 +140,8 @@
openCardPhonSms: "",
msCount: 60, //定时器
CodeMsg: "获取验证码",
RechargeSmsorderNoInfo: {} //第三方合作交易标识
RechargeSmsorderNoInfo: {}, //第三方合作交易标识
WithdrawInfo: null
}
},
onLoad: function(options) {
......@@ -154,8 +180,25 @@
loadingType: 'spinner',
duration: 0
});
// 20211230
let withdrawSmsUrl = gHost;
switch (bankInfo.accountType) {
case 3:
withdrawSmsUrl = withdrawSmsUrl + '/bank-wechat/bocom/exchange/withdrawSms';
break;
case 4:
withdrawSmsUrl = withdrawSmsUrl + '/bank-wechat/bohai/comprehensive/otpSms';
break;
default:
Dialog({
title: '系统提示',
message: '银行账号类型错误!'
});
throw ("银行账号类型错误!")
break;
}
$.ajax({
url: gHost + '/bank-wechat/bocom/exchange/withdrawSms',
url: withdrawSmsUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
......@@ -164,6 +207,9 @@
userId: userID, //用户id
sessionid: sessionID,
wechattype: 1,
// 21211230渤海银行
mobilePhone: this.openCardPhon,
msg: "提现"
},
headers: {
'sessionid': sessionID,
......@@ -261,14 +307,48 @@
weui.topTips(`提现金额不可大于账户余额`);
return
}
this.openCardPhonSms = '';
this.$refs.popup.open('top')
},
// 提现
async ExchangeWithdraw() {
let this_ = this;
if (bankInfo.accountType != 4) {
if (!this.RechargeSmsorderNoInfo.orderNo) {
Dialog({
title: '系统提示',
message: '请获取验证码!'
});
return
}
}
if (!this.openCardPhonSms) {
Dialog({
title: '系统提示',
message: '请收入验证码!'
});
return
}
let loading = weui.loading('请稍后');
// 20211230
let withdrawUrl = gHost;
switch (bankInfo.accountType) {
case 3:
withdrawUrl = withdrawUrl + '/bank-wechat/bocom/exchange/withdraw';
break;
case 4:
withdrawUrl = withdrawUrl + '/bank-wechat/bohai/exchange/withdraw';
break;
default:
Dialog({
title: '系统提示',
message: '银行账号类型错误!'
});
throw ("银行账号类型错误!")
break;
}
$.ajax({
url: gHost + '/bank-wechat/bocom/exchange/withdraw',
url: withdrawUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
......@@ -280,6 +360,9 @@
userId: userID,
sessionid: sessionID,
wechattype: 1,
// 21211230渤海银行
transAmount: (this.inputOtherM * 1).toFixed(2),
verifyNo: this_.openCardPhonSms,
},
headers: {
'sessionid': sessionID,
......@@ -287,14 +370,21 @@
success: function(res5) {
loading.hide();
if (res5.code == "10000") {
this.WithdrawInfo = res5.results || null
wx.showModal({
title: '提现申请已提交',
content: '银行处理需要1-5分钟时间,充值结果以余额查询为准。',
showCancel: false,
success: function() {
this_.ExchangeWithdrawQuery();
if (bankInfo.accountType != 4) {
this_.ExchangeWithdrawQuery();
}
if (bankInfo.accountType == 4) {
window.location.reload()
}
}
})
} else {
weui.topTips(res5.message)
}
......@@ -417,6 +507,12 @@
$('.' + dom).css('display', 'block');
}
},
// 更换手机号码
changePhone() {
jWeixin.miniProgram.navigateTo({
url: `/pages_subpack/pages/changePhone/main`,
});
},
//返回小程序 跳转指定页面
BackToMini(page) {
if (page == 'UserMain' || page == 'personalCenter') {
......@@ -466,8 +562,25 @@
queryBankInfo() {
let this_ = this;
let loading = weui.loading('请稍后');
let queryBankInfoUrl = gHost;
// 20211230
switch (bankInfo.accountType) {
case 3:
queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/bocom/balance/getBankBlanceAndSyncLocal';
break;
case 4:
queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/bohai/exchange/balanceQuery';
break;
default:
Dialog({
title: '系统提示',
message: '银行账号类型错误!'
});
throw ("银行账号类型错误!")
break;
}
$.ajax({
url: gHost + '/bank-wechat/bocom/balance/getBankBlanceAndSyncLocal',
url: queryBankInfoUrl,
type: "POST",
timeout: 8000,
contentType: "application/x-www-form-urlencoded",
......@@ -481,6 +594,21 @@
success: function(res3) {
loading.hide();
if (res3.code == "10000") {
if (bankInfo.accountType == 4) {
if (res3.results.eacTotalAmt == null) {
weui.topTips("账户信息为空,余额查询失败");
} else {
this_.ReflectMoney = res3.results.eacTotalAmt * 1
this_.cardBalanceTx = (res3.results.eacTotalAmt * 1).toFixed(2);
$('.TxClsTx').attr('placeholder',
`可提现金额${(res3.results.eacTotalAmt * 1).toFixed(2)}元`
)
this_.RechargeMax = ((2000 - ((res3.results.eacTotalAmt * 1).toFixed(2) *
1)).toFixed(2));
this_.placeholder = `可提现金额${(res3.results.eacTotalAmt * 1).toFixed(2)}元`
}
return
}
if (res3.results.accountBalance == null) {
weui.topTips("账户信息为空,余额查询失败");
} else {
......@@ -590,6 +718,43 @@
background: linear-gradient(180deg, #FFFFFF 0%, #FAFAFA 100%);
}
.changPhone {
font-size: 14px;
color: #39F;
text-align: right;
}
.BankBohai {
display: flex;
justify-content: space-between;
width: 680rpx;
margin: 0 auto;
padding-top: 30rpx;
.BankBHR view:nth-child(2) {
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 500;
color: #888888;
}
}
.BankBHBalance {
display: flex;
width: 680rpx;
margin: 0 auto;
padding-top: 30rpx;
align-items: center;
.ALL {
font-size: 14px;
font-family: PingFang SC;
font-weight: bold;
color: #129A5E;
margin-left: 20rpx;
}
}
.OtherMoney {
display: flex;
justify-content: flex-start;
......@@ -639,6 +804,7 @@
height: 100rpx;
line-height: 100rpx;
.left_ {
font-size: 36rpx;
font-family: PingFang SC;
......
......@@ -57,7 +57,7 @@
<view class="depositbox">
<image mode='widthFix' class="depositImg" src="../../../static/img/depositIcon.png"></image>
<span style="vertical-align:middle;font-size: 28rpx;color: #333333;font-weight: 500;">最大可充值金额:<span
style="color:red;"><span class="canDepositTx">2000</span></span></span>
style="color:red;"><span class="canDepositTx">{{RechargeMax}}</span></span></span>
</view>
<!-- 充值其它金额 -->
<view class="OtherMoney" v-if="isOtherMoney">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment