Skip to content

X
xzf_uniapp-wechat-web
Commit 1a330f5f authored by 李智书's avatar 李智书
Browse files
Options

Merge branch 'develop' into uat

parents 9cd7b8d2 df904460
Show whitespace changes
Inline Side-by-side
Showing with 2186 additions and 1841 deletions
package-lock.json
View file @ 1a330f5f
This source diff could not be displayed because it is too large. You can view the blob instead.
src/pages.json
View file @ 1a330f5f
......@@ -312,7 +312,7 @@
"path": "pages/UserAgreement/UserAgreement",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "消费用户协议",
"navigationBarTitleText": "用户服务协议",
"enablePullDownRefresh": false
}
......
src/pages/BankModule/Recharge/Recharge.vue
View file @ 1a330f5f
......@@ -21,7 +21,8 @@
</view>
<view class="right">
<van-popover v-model="showPopover" trigger="click" placement="bottom-end">
<view class="popoverItem" v-for="(item, index) in actions" @click="onSelect(item)" :id="item.id ? item.id : '#item'+index">
<view class="popoverItem" v-for="(item, index) in actions" @click="onSelect(item)"
:id="item.id ? item.id : '#item'+index" >
{{item.text}}
</view>
<template #reference>
......@@ -104,7 +105,8 @@
<view> {{ item.lable }}</view>
</view>
<view class="other">
<input v-model="inputOtherM" @input="inputControl" @blur="ReturnToTop" placeholder="其他金额，最低3元"
<input v-model="inputOtherM" @input="inputControl" @blur="ReturnToTop"
:placeholder="typeCode == 'SPDB' ? '其他金额，最低100元' : '其他金额，最低3元'"
placeholder-class="placeholderinputOtherM" type="text" maxlength="6" />
</view>
</view>
......@@ -177,7 +179,7 @@
v-bind:style="Money != '' ? '' : 'background: #e6e6e6 !important;'">
<span>充值生活费</span>
</view>
<view class="service">{{bankInfo_.accountName}}Ⅲ类户为您提供服务</view>
<view class="service">{{bankInfo_.accountName}}{{typeCode != 'BOHAI' ? 'Ⅲ' :'Ⅱ'}}类户为您提供服务</view>
<!-- -->
<!-- <view class="switchbankCard" @click="ChangeBankPay">我要换银行卡支付</view> -->
</view>
......@@ -200,7 +202,7 @@
</view>
<!-- 弹出层 -->
<uni-popup ref="popup" :mask-click="false">
<!-- 充值确认 -->
<!-- 充值，解绑银行卡（浦发银行）确认 -->
<view class="RechargeConfirmationBox">
<view class="RechargeInfo">
<view class="closePhoneBox" @click="close()">
......@@ -226,7 +228,8 @@
<view style="width: 520rpx; height: 1rpx; background: #eeeeee"></view>
<!-- 取消 确认充值按钮 -->
<view class="BtngGoup">
<view class="" @click="ExchangeRecharge"> 充值 </view>
<view class="" @click="unattachedCard" v-if="unbindFlag">去解绑</view>
<view class="" @click="ExchangeRecharge" v-else> 充值 </view>
</view>
</view>
</view>
......@@ -239,15 +242,29 @@
<!-- 切换绑定的一类卡列表 -->
<view class="showBindCardList">
<view class="choiceBox">选择付款账户</view>
<view class="cardsList">
<view class="ListItem" @click="ChangeCardPay(item)" v-for="(item, index) in bindcardList"
:key="index">
<span style="padding-right: 10px">{{ item.bindCardName }}
<view class="cardsList" v-if="typeCode == 'SPDB'">
<view class="ListItem" v-for="(item, index) in bindcardList" :key="index">
<span class="BankListImgSpan" @click="ChangeCardPay(item)">
<image class="BankListImg" src="../../../static/img/choiceBank.png"
v-if="item.bindCardNo == bankInfo_.bindCardNo"></image>
</span>
<span>尾号：{{
item.bindCardNo.slice(item.bindCardNo.length - 4)
}}</span>
<span style="padding-right: 10px" @click="ChangeCardPay(item)">{{ item.bindCardName }}
</span>
<span @click="ChangeCardPay(item)">尾号：{{item.bindCardNo.slice(item.bindCardNo.length - 4)}}</span>
<!-- <image class="BankListImg" src="../../../static/img/choiceBank.png"></image> -->
<van-icon name="delete" class="delete" @click="unattachedCardBefore(item)" />
</view>
</view>
<view class="cardsList" v-else>
<view class="ListItem" v-for="(item, index) in bindcardList" :key="index"
@click="ChangeCardPay(item)">
<span class="BankListImgSpan">
<image class="BankListImg" src="../../../static/img/choiceBank.png"
v-if="item.bindCardNo == bankInfo_.bindCardNo"></image>
</span>
<span style="padding-right: 10px">{{ item.bindCardName }}
</span>
<span>尾号：{{item.bindCardNo.slice(item.bindCardNo.length - 4)}}</span>
</view>
</view>
<view class="changeCard" @click="ChangeBankPay">我要换卡支付</view>
......@@ -346,14 +363,17 @@
actions: [{
text: "复制卡号",
id: "cardNumright"
}, {
text: "账户明细"
}, {
text: "常见问题"
},
{
text: "账户明细",
text: "证件更新"
},
{
text: "常见问题",
},
],
text: "在线销户"
}],
popshow: false,
// 输入其它金额
isOtherMoney: false,
......@@ -413,6 +433,7 @@
2: "工商银行III类户",
3: "交通银行III类户",
4: "渤海银行II类户",
5: "浦发银行III类户",
},
/**
* 20211129新增
......@@ -422,6 +443,9 @@
openCardPhonSms: "",
msCount: 60, //定时器
RechargeSmsorderNoInfo: {}, //第三方合作交易标识
typeCode: "",
unbindFlag: false, // 解绑标志
unattachedCardItem: {}
};
},
onLoad: function(options) {
......@@ -450,6 +474,14 @@
uni.navigateTo({
url: `../../commonProblem/commonProblem`,
});
} else if (action.text == "在线销户") {
jWeixin.miniProgram.redirectTo({
url: `/pages/AssignCancelUserPhone/main`
});
} else if (action.text == "证件更新") {
jWeixin.miniProgram.redirectTo({
url: `/pages_subpackB/pages/certificateBohaiUpdate/main`
});
}
},
async beforeQuerySignStatus() {
......@@ -459,6 +491,71 @@
await this.signStatusQuery();
}
},
// 解绑银行卡提示 浦发银行
unattachedCardBefore(item) {
this.unattachedCardItem = item;
console.log(item, 'itemm')
// this.$refs.popup.open("top");
const self = this;
let bankno = item.bindCardNo.slice(item.bindCardNo.length - 4);
Dialog.confirm({
title: "提示",
message: `确定解绑${item.bindCardName}${bankno}吗？`,
confirmButtonText: "去解绑",
cancelButtonText: "取消",
})
.then(() => {
self.popshow = false;
self.$refs.popup.open("top");
self.unbindFlag = true;
})
.catch(() => {
// on cancel
});
},
// 解绑银行卡
unattachedCard() {
const self = this;
let loading = Toast.loading({
message: "解绑中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
});
$.ajax({
url: gHost + "/bank-wechat/spdb/unattachedCard",
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
schoolId: bankInfo.schoolId, //学校id
userId: userID, //用户id
sessionid: sessionID,
wechattype: 1,
cardNum: this.unattachedCardItem.bindCardNo,
mobileNum: this.unattachedCardItem.mobileNo,
randomPassword: this.openCardPhonSms, //短信验证码
},
headers: {
sessionid: sessionID,
},
success: function(respes) {
loading.clear();
if (respes.code == "10000") {
console.log(respes, "respes");
Toast('解绑成功');
self.$refs.popup.close();
} else {
Toast(respes.message || "解绑银行卡失败,请重试！");
throw new Error("解绑银行卡失败,请重试！");
}
},
error: function(err) {
loading.clear();
Toast(err || "解绑银行卡失败,请重试！");
throw new Error("解绑银行卡失败,请重试！");
},
});
},
// 更换银行卡
async ChangeBankPay() {
// uni.showModal({
......@@ -470,7 +567,7 @@
mask: true,
title: "请稍后....",
});
if (bankInfo.accountType == 4) {
if (bankInfo.accountType == 4 || bankInfo.accountType == 5) {
jWeixin.miniProgram.navigateTo({
url: `/pages_subpack/pages/changeBindCard/main`,
});
......@@ -515,7 +612,11 @@
this.msCount = 60;
this.openCardPhonSms = "";
}
if (bankInfo.typeCode != 'SPDB') {
this.$refs.popup.open("top");
} else {
this.ExchangeRecharge();
}
},
// 验证码弹出框关闭
close() {
......@@ -558,7 +659,11 @@
obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3"); //只能输入两个小数
obj.value =
obj.value * 1 > this_.RechargeMax ? this_.RechargeMax : obj.value;
if (obj.value == "" || obj.value * 1 < 3) {
let limitMoney = 3;
if (this_.typeCode == 'SPDB') {
limitMoney = 100;
}
if (obj.value == "" || obj.value * 1 < limitMoney) {
$(".DepositID").attr(
"style",
"background: rgb(230, 230, 230) !important;"
......@@ -608,7 +713,7 @@
schoolId: bankInfo.schoolId, //学校id
userId: userID, //用户id
sessionid: sessionID,
wechattype: 1,
wechattype: 1
},
headers: {
sessionid: sessionID,
......@@ -623,7 +728,7 @@
title: "使用说明",
message: "您暂未进行银行代扣签约，将影响电子校园卡的正常使用，请尽快前往签约",
theme: "round-button",
confirmButtonText: "确认签约",
confirmButtonText: "前往签约",
confirmButtonColor: "#2ddbb6",
className: "signAlert",
})
......@@ -678,6 +783,9 @@
case 4:
exchangeUrl = exchangeUrl + "/bank-wechat/bohai/comprehensive/otpSms";
break;
case 5:
exchangeUrl = exchangeUrl + "/bank-wechat/spdb/passcodes";
break;
default:
Dialog({
title: "系统提示",
......@@ -686,11 +794,7 @@
throw "银行账号类型错误!";
break;
}
$.ajax({
url: exchangeUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
let params = {
amount: ((this.Money || this.inputOtherM) * 1).toFixed(2), //充值金额，单位元
schoolId: bankInfo.schoolId, //学校id
userId: userID, //用户id
......@@ -699,7 +803,20 @@
// 20211230渤海
mobilePhone: this.openCardPhon,
msg: "充值",
},
}
let params1 = {
bizScene: '105322',
mobileNum: this.openCardPhon,
schoolId: bankInfo.schoolId, //学校id
userId: userID, //用户id
sessionid: sessionID,
wechattype: 1
}
$.ajax({
url: exchangeUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: bankInfo.accountType == 5 ? params1 : params,
headers: {
sessionid: sessionID,
},
......@@ -752,7 +869,7 @@
});
return;
}
if (bankInfo.accountType != 4) {
if (bankInfo.accountType != 4 && bankInfo.accountType != 5) {
if (!this.RechargeSmsorderNoInfo.orderNo) {
Dialog({
title: "系统提示",
......@@ -761,7 +878,7 @@
return;
}
}
if (!this.openCardPhonSms) {
if (!this.openCardPhonSms && bankInfo.accountType != 5) {
Dialog({
title: "系统提示",
message: "请收入验证码！",
......@@ -781,6 +898,9 @@
case 4:
exchangeUrl = exchangeUrl + "/bank-wechat/bohai/exchange/recharge";
break;
case 5:
exchangeUrl = exchangeUrl + "/bank-wechat/spdb/deposits";
break;
default:
Dialog({
title: "系统提示",
......@@ -789,11 +909,7 @@
throw "银行账号类型错误!";
break;
}
$.ajax({
url: exchangeUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
let params = {
amount: (amount * 1).toFixed(2), //充值金额，单位元
mobileCode: this.openCardPhonSms, //短信验证码
orderNo: this_.RechargeSmsorderNoInfo.orderNo, //第三方合作交易标识，取充值短信返回的orderNo值
......@@ -804,7 +920,31 @@
// 21211230渤海银行
transAmount: (amount * 1).toFixed(2),
verifyNo: this.openCardPhonSms,
},
};
let bindingCardId = "";
console.log(bankInfo.bindCardNo, 'bindCardNobindCardNobindCardNobindCardNo')
if (this.bindcardList.length) {
let arr = this.bindcardList.filter(x => x.bindCardNo == bankInfo.bindCardNo);
console.log(arr[0], '绑定卡绑定卡')
if (arr.length) {
bindingCardId = arr[0].bindCardId;
}
}
let params1 = {
// 浦发银行
amount: (amount * 1).toFixed(2), //充值金额，单位元
schoolId: bankInfo.schoolId, //学校id
userId: userID, //用户id
sessionid: sessionID,
wechattype: 1,
bindingCardId: bindingCardId,
// ipAdress: '110.53.253.164'
};
$.ajax({
url: exchangeUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: this_.typeCode == 'SPDB' ? params1 : params,
headers: {
sessionid: sessionID,
},
......@@ -1023,6 +1163,10 @@
},
//查询一类卡绑定列表
queryBindCardList() {
this.queryBindCardListBefore();
this.popshow = true;
},
queryBindCardListBefore() {
let this_ = this;
let loading = weui.loading("请稍后");
$.ajax({
......@@ -1040,7 +1184,6 @@
loading.hide();
if (res4.code == "10000") {
this_.bindcardList = res4.results;
this_.popshow = true;
} else {
weui.topTips(res4.message);
}
......@@ -1054,6 +1197,9 @@
queryBankInfo() {
let this_ = this;
let queryBankInfoUrl = gHost;
if (bankInfo.accountType == 5) {
this.queryBindCardListBefore();
}
// 20211230
switch (bankInfo.accountType) {
case 3:
......@@ -1065,6 +1211,10 @@
queryBankInfoUrl =
queryBankInfoUrl + "/bank-wechat/bohai/exchange/balanceQuery";
break;
case 5:
queryBankInfoUrl =
queryBankInfoUrl + "/bank-wechat/spdb/balancesQuery";
break;
default:
Dialog({
title: "系统提示",
......@@ -1074,18 +1224,24 @@
break;
}
// let loading = weui.loading('请稍后');
$.ajax({
url: queryBankInfoUrl,
type: "POST",
timeout: 8000,
contentType: "application/x-www-form-urlencoded",
data: {
let params = {
mediumId: bankInfo.accountNo || "",
schoolId: bankInfo.schoolId || "",
userId: bankInfo.userId || "",
sessionid: sessionID,
wechattype: 1,
},
};
if (bankInfo.accountType == 5) {
Object.assign(params, {
accountId: bankInfo.thirdId
})
}
$.ajax({
url: queryBankInfoUrl,
type: "POST",
timeout: 8000,
contentType: "application/x-www-form-urlencoded",
data: params,
success: function(res3) {
// loading.hide();
if (res3.code == "10000") {
......@@ -1157,6 +1313,10 @@
return;
}
bankInfo = res2.results;
this_.typeCode = res2.results.typeCode;
if(this_.typeCode != 'BOHAI'){
this_.actions = this_.actions.filter(x => x.text != '证件更新' );
}
bankInfo.sessionid = sessionID;
this_.queryBankInfo(); //查余额
this_.bankInfo_ = bankInfo;
......@@ -1229,6 +1389,33 @@
background: linear-gradient(180deg, #ffffff 0%, #fafafa 100%);
}
.BankListImgSpan {
width: 30rpx;
height: 30rpx;
position: relative;
margin-right: 20rpx;
display: inline-block;
}
.delete {
position: absolute;
top: 0;
right: 120rpx;
font-size: 38rpx;
color: #04b871;
padding: 25rpx 0;
padding-top: 28rpx;
z-index: 1;
}
.BankListImg {
width: 30rpx;
height: 30rpx;
position: absolute;
left: 0;
top: 0;
}
.userInfoBox {
display: flex;
flex-direction: column;
......@@ -1421,6 +1608,13 @@
background: #fff;
position: relative;
text-align: center;
display: flex;
justify-content: center;
span {
display: inline-block;
align-self: center;
}
}
.changeCard {
......@@ -1587,6 +1781,7 @@
font-family: PingFangSC-Medium, PingFang SC;
margin-bottom: 24rpx;
border: 3rpx solid transparent;
view {
align-self: center;
color: #333333;
......@@ -1622,6 +1817,7 @@
background: #f8f8f8;
border-radius: 12rpx;
border: 3rpx solid transparent;
/deep/.uni-input-wrapper {
position: absolute;
width: 444rpx;
......@@ -2223,6 +2419,7 @@
line-height: 120rpx;
font-weight: 600;
}
.popoverItem {
width: 225rpx;
margin: 0 20rpx;
......@@ -2234,6 +2431,7 @@
color: #000000;
border-bottom: 1rpx solid #dddddd;
}
.popoverItem:last-child {
border-bottom: 0;
}
......
src/pages/BankModule/Reflect/Reflect.vue
View file @ 1a330f5f
......@@ -4,8 +4,8 @@
<view class="left_">提现金额 </view>
<view class="right_">每日可提现一次</view>
</view>
<!-- 20211230渤海银行 -->
<view class="BankBohai" v-if="bankInfo_.accountType==4">
<!-- 20211230渤海银行 浦发银行 -->
<view class="BankBohai" v-if="bankInfo_.accountType==4 || bankInfo_.accountType==5">
<view class="BankBHL">提现至</view>
<view class="BankBHR">
<view class="">{{bankInfo_.bindCardName}}
......@@ -141,7 +141,9 @@
msCount: 60, //定时器
CodeMsg: "获取验证码",
RechargeSmsorderNoInfo: {}, //第三方合作交易标识
WithdrawInfo: null
WithdrawInfo: null,
bindcardList: [],
bindCardNo: "",
}
},
onLoad: function(options) {
......@@ -189,6 +191,9 @@
case 4:
withdrawSmsUrl = withdrawSmsUrl + '/bank-wechat/bohai/comprehensive/otpSms';
break;
case 5:
withdrawSmsUrl = withdrawSmsUrl + '/bank-wechat/spdb/passcodes';
break;
default:
Dialog({
title: '系统提示',
......@@ -197,11 +202,7 @@
throw ("银行账号类型错误!")
break;
}
$.ajax({
url: withdrawSmsUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
let params = {
amount: (this.inputOtherM * 1).toFixed(2), //充值金额，单位元
schoolId: bankInfo.schoolId, //学校id
userId: userID, //用户id
......@@ -210,7 +211,29 @@
// 21211230渤海银行
mobilePhone: this.openCardPhon,
msg: "提现"
},
}
let params1 = {
mobileNum: this.openCardPhon,
schoolId: bankInfo.schoolId, //学校id
userId: userID, //用户id
sessionid: sessionID,
wechattype: 1
}
$.ajax({
url: withdrawSmsUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
// data: {
// amount: (this.inputOtherM * 1).toFixed(2), //充值金额，单位元
// schoolId: bankInfo.schoolId, //学校id
// userId: userID, //用户id
// sessionid: sessionID,
// wechattype: 1,
// // 21211230渤海银行
// mobilePhone: this.openCardPhon,
// msg: "提现"
// },
data: bankInfo.accountType == 5 ? params1 : params,
headers: {
'sessionid': sessionID,
},
......@@ -308,12 +331,16 @@
return
}
this.openCardPhonSms = '';
if(bankInfo.accountType != 5) {
this.$refs.popup.open('top')
}else {
this.ExchangeWithdraw();
}
},
// 提现
async ExchangeWithdraw() {
let this_ = this;
if (bankInfo.accountType != 4) {
if (bankInfo.accountType != 4 && bankInfo.accountType != 5) {
if (!this.RechargeSmsorderNoInfo.orderNo) {
Dialog({
title: '系统提示',
......@@ -322,7 +349,7 @@
return
}
}
if (!this.openCardPhonSms) {
if (!this.openCardPhonSms && bankInfo.accountType != 5) {
Dialog({
title: '系统提示',
message: '请收入验证码！'
......@@ -332,6 +359,9 @@
let loading = weui.loading('请稍后');
// 20211230
let withdrawUrl = gHost;
if(bankInfo.accountType == 5){
await this.queryBindCardListBefore();
}
switch (bankInfo.accountType) {
case 3:
withdrawUrl = withdrawUrl + '/bank-wechat/bocom/exchange/withdraw';
......@@ -339,6 +369,9 @@
case 4:
withdrawUrl = withdrawUrl + '/bank-wechat/bohai/exchange/withdraw';
break;
case 5:
withdrawUrl = withdrawUrl + '/bank-wechat/spdb/withdrawals';
break;
default:
Dialog({
title: '系统提示',
......@@ -347,11 +380,7 @@
throw ("银行账号类型错误!")
break;
}
$.ajax({
url: withdrawUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
let params = {
amount: (this.inputOtherM * 1).toFixed(2), //充值金额，单位元
orderNo: this_.RechargeSmsorderNoInfo.orderNo,
msgCodeSeq: this_.RechargeSmsorderNoInfo.msgCodeSeq,
......@@ -363,7 +392,30 @@
// 21211230渤海银行
transAmount: (this.inputOtherM * 1).toFixed(2),
verifyNo: this_.openCardPhonSms,
},
};
let bindingCardId = "";
if(this.bindcardList.length){
let arr = this.bindcardList.filter(x => x.bindCardNo == this_.bindCardNo);
if(arr.length){
bindingCardId = arr[0].bindCardId;
}
}
if (bankInfo.accountType == 5) {
params = {
amount: (this.inputOtherM * 1).toFixed(2), //充值金额，单位元
schoolId: bankInfo.schoolId,
bindingCardId: bindingCardId,
userId: userID,
sessionid: sessionID,
wechattype: 1,
};
}
$.ajax({
url: withdrawUrl,
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: params,
headers: {
'sessionid': sessionID,
},
......@@ -376,10 +428,10 @@
content: '银行处理需要1-5分钟时间，充值结果以余额查询为准。',
showCancel: false,
success: function() {
if (bankInfo.accountType != 4) {
if (bankInfo.accountType != 4 && bankInfo.accountType != 5) {
this_.ExchangeWithdrawQuery();
}
if (bankInfo.accountType == 4) {
if (bankInfo.accountType == 4 && bankInfo.accountType != 5) {
window.location.reload()
}
}
......@@ -465,7 +517,7 @@
ReturnToTop() {
// 若最后一位为小数点则去掉
let str = this.inputOtherM + "";
if(str.lastIndexOf('.') == str.length - 1) {
if (str.lastIndexOf('.') == str.length - 1) {
this.inputOtherM = str.substring(0, str.length - 1)
}
this.$nextTick(function() {
......@@ -576,6 +628,9 @@
case 4:
queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/bohai/exchange/balanceQuery';
break;
case 5:
queryBankInfoUrl = queryBankInfoUrl + '/bank-wechat/spdb/balancesQuery';
break;
default:
Dialog({
title: '系统提示',
......@@ -584,18 +639,24 @@
throw ("银行账号类型错误!")
break;
}
let params = {
mediumId: bankInfo.accountNo || "",
schoolId: bankInfo.schoolId || "",
userId: bankInfo.userId || "",
sessionid: sessionID,
wechattype: 1,
};
if (bankInfo.accountType == 5) {
Object.assign(params, {
accountId: bankInfo.thirdId
})
}
$.ajax({
url: queryBankInfoUrl,
type: "POST",
timeout: 8000,
contentType: "application/x-www-form-urlencoded",
data: {
mediumId: bankInfo.accountNo || '',
schoolId: bankInfo.schoolId || '',
userId: bankInfo.userId || '',
sessionid: sessionID,
wechattype: 1,
},
data: params,
success: function(res3) {
loading.hide();
if (res3.code == "10000") {
......@@ -658,8 +719,10 @@
success: function(res2) {
if (res2.code == "10000") {
bankInfo = res2.results;
console.log(bankInfo, 'bankInfobankInfobankInfobankInfo')
bankInfo.sessionid = sessionID;
this_.bankInfo_ = bankInfo
this_.bindCardNo = res2.results.bindCardNo;
// 20211129
this_.openCardPhon = bankInfo.mobileNo
this_.queryBankInfo();
......@@ -672,6 +735,34 @@
},
});
},
async queryBindCardListBefore() {
let this_ = this;
let loading = weui.loading("请稍后");
await $.ajax({
url: gHost + "/bank-wechat/user/bank/bindingList",
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
cardNo: bankInfo.accountNo,
schoolId: bankInfo.schoolId,
userId: userID,
sessionid: sessionID,
wechattype: 1,
},
success: function(res4) {
loading.hide();
if (res4.code == "10000") {
this_.bindcardList = res4.results;
console.log(this_.bindcardList, 'bindcardListbindcardListbindcardList')
} else {
weui.topTips(res4.message);
}
},
error: function(err) {
loading.hide();
},
});
},
//查询用户信息
QueryUserInfo() {
let this_ = this;
......
src/pages/SchoolReport/SchoolReport.vue
View file @ 1a330f5f
......@@ -79,7 +79,7 @@
</view>
<view class="school-report-context-card">
<view class="school-report-context-card-one"
:style="{height:[804,256,pubTalkSummaryHeight][tabIndex-1]+'rpx'}">
:style="{height:[612,256,pubTalkSummaryHeight][tabIndex-1]+'rpx'}">
<view :class="['consumer-report-img','attendance-report-img','pubTalk-report-img'][tabIndex-1]">
</view>
<!-- 消费报告 -->
......@@ -132,7 +132,7 @@
<text v-else>每日消费金额较稳定，继续保持哦</text>
</view>
</view>
<view class="school-report-context-card-one-context-item">
<!-- <view class="school-report-context-card-one-context-item">
<view class="school-report-context-card-one-context-dot">
<view class="school-report-context-card-one-context-dot-item">
</view>
......@@ -160,7 +160,7 @@
<view v-else class="school-report-context-card-one-context-txt">
最佳干饭组合，赶快叫上<text class="txt-important">{{mealPalStr}}</text>一起吃饭吧</text>
</view>
</view>
</view> -->
</view>
<!-- 出入校报告 -->
<view v-show="tabIndex==2" class="attendance-report-context-card-one-context">
......@@ -400,7 +400,7 @@
</view>
</view>
</view>
<view v-show="tabIndex==1&&isOpen" class="school-report-context-card-six">
<!-- <view v-show="tabIndex==1&&isOpen" class="school-report-context-card-six">
<view class="school-report-context-card-title">
<view class="school-report-context-card-title-img">
<text>就餐时间趋势</text>
......@@ -555,7 +555,7 @@
</view>
<view id="meal-pal-bar">
</view>
</view>
</view> -->
<!-- 出入校报告 -->
<view v-show="tabIndex==2" class="attendance-report-context-card-two">
<view class="school-report-context-card-title">
......@@ -794,7 +794,7 @@
</view>
</view>
<view v-if="tabIndex&&flag==tabIndex" class="no-open"
:style="{height:[992,845,891][tabIndex-1]+'rpx',top:[1620,1099,pubTalkNoopenHeight][tabIndex-1]+'rpx'}">
:style="{height:[860,845,891][tabIndex-1]+'rpx',top:[1620,1099,pubTalkNoopenHeight][tabIndex-1]+'rpx'}">
<view class="no-open-solution" @tap="equityPay">
<view class="no-open-solution-txt">
<text>最低{{memberInfo.leastAmount}}元/天开通，查看完整{{['消费','出入校','公话'][tabIndex-1]}}报告</text>
......@@ -839,6 +839,18 @@
</view>
</view>
<view class="details-item-left">
<view class="details-item-up">
<text>担心孩子被迫高额消费？</text>
</view>
<view class="details-item-down">
<view class="consumer-trend-img">
</view>
<view class="details-item-down-txt">
<text>【消费趋势】告诉你</text>
</view>
</view>
</view>
<!-- <view class="details-item-left">
<view class="details-item-up">
<text>孩子在校交友了？</text>
</view>
......@@ -849,7 +861,7 @@
<text>【饭友分析】告诉你</text>
</view>
</view>
</view>
</view> -->
</view>
<view class="consume-open-results-items-details-item">
<view class="details-item-left">
......@@ -877,7 +889,7 @@
</view>
</view>
</view>
<view class="consume-open-results-items-details-item">
<!-- <view class="consume-open-results-items-details-item">
<view class="details-item-left">
<view class="details-item-up">
<text>担心孩子被迫高额消费？</text>
......@@ -902,7 +914,7 @@
</view>
</view>
</view>
</view>
</view> -->
</view>
<view v-else class="open-results-items-details">
<!-- 出入校报告 -->
......@@ -1199,24 +1211,24 @@
this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this
.reportTypeIndex));
this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
this.queryRepastTimeTrend().then(() => {
if (this.mealtypeArr.indexOf(1) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'breakfast-time-line',
1);
}
if (this.mealtypeArr.indexOf(2) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'lunch-time-line',
2);
}
if (this.mealtypeArr.indexOf(3) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'dinner-time-line',
3);
}
})
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => {
// if (this.mealtypeArr.indexOf(1) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'breakfast-time-line',
// 1);
// }
// if (this.mealtypeArr.indexOf(2) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'lunch-time-line',
// 2);
// }
// if (this.mealtypeArr.indexOf(3) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'dinner-time-line',
// 3);
// }
// })
} else {
this.tabIndex = 1;
this.queryIsDredgeMember(1002, 1).then(() => {
......@@ -1224,25 +1236,25 @@
.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this
.reportTypeIndex));
this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
this.queryRepastTimeTrend().then(() => {
if (this.mealtypeArr.indexOf(1) != -1) {
this.breakfastTimeLinechart(this
.reportTypeIndex,
'breakfast-time-line',
1);
}
if (this.mealtypeArr.indexOf(2) != -1) {
this.breakfastTimeLinechart(this
.reportTypeIndex, 'lunch-time-line',
2);
}
if (this.mealtypeArr.indexOf(3) != -1) {
this.breakfastTimeLinechart(this
.reportTypeIndex, 'dinner-time-line',
3);
}
})
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => {
// if (this.mealtypeArr.indexOf(1) != -1) {
// this.breakfastTimeLinechart(this
// .reportTypeIndex,
// 'breakfast-time-line',
// 1);
// }
// if (this.mealtypeArr.indexOf(2) != -1) {
// this.breakfastTimeLinechart(this
// .reportTypeIndex, 'lunch-time-line',
// 2);
// }
// if (this.mealtypeArr.indexOf(3) != -1) {
// this.breakfastTimeLinechart(this
// .reportTypeIndex, 'dinner-time-line',
// 3);
// }
// })
});
}
})
......@@ -1256,29 +1268,29 @@
this.containerHeight = 4200;
this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex));
this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
this.queryRepastTimeTrend().then(() => {
if (this.mealtypeArr.indexOf(1) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'breakfast-time-line',
1);
}
if (this.mealtypeArr.indexOf(2) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex, 'lunch-time-line',
2);
}
if (this.mealtypeArr.indexOf(3) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex, 'dinner-time-line',
3);
}
})
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => {
// if (this.mealtypeArr.indexOf(1) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'breakfast-time-line',
// 1);
// }
// if (this.mealtypeArr.indexOf(2) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex, 'lunch-time-line',
// 2);
// }
// if (this.mealtypeArr.indexOf(3) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex, 'dinner-time-line',
// 3);
// }
// })
} else {
this.tabIndex = 1;
this.queryIsDredgeMember(1002, 1).then(() => {
this.queryConsumerSummaryAmount();
this.queryDayConsumerTrend();
this.queryMealPalAnalyse();
this.queryRepastTimeTrend();
// this.queryMealPalAnalyse();
// this.queryRepastTimeTrend();
})
}
}
......@@ -1363,29 +1375,29 @@
}
});
this.queryConsumerSummaryAmount();
this.$nextTick(() => {
this.queryIsDredgeMember(1002, 1).then(() => {
if (this.isOpen) {
this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this
.reportTypeIndex));
this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
this.queryRepastTimeTrend().then(() => {
if (this.mealtypeArr.indexOf(1) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'breakfast-time-line',
1);
}
if (this.mealtypeArr.indexOf(2) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'lunch-time-line',
2);
}
if (this.mealtypeArr.indexOf(3) != -1) {
this.breakfastTimeLinechart(this.reportTypeIndex,
'dinner-time-line',
3);
}
})
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => {
// if (this.mealtypeArr.indexOf(1) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'breakfast-time-line',
// 1);
// }
// if (this.mealtypeArr.indexOf(2) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'lunch-time-line',
// 2);
// }
// if (this.mealtypeArr.indexOf(3) != -1) {
// this.breakfastTimeLinechart(this.reportTypeIndex,
// 'dinner-time-line',
// 3);
// }
// })
} else {
this.queryConsumerSummaryAmount();
this.queryDayConsumerTrend();
......@@ -2620,9 +2632,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
return
}
this.mealPalData = data.obj || [];
this.mealPalArr = this.mealPalData.map(v => v.mealpalname.slice(0, 1) +
'**');
this.mealPalStr = this.mealPalArr.join('、');
this.mealPalArr = this.mealPalData.length ? this.mealPalData.map(v => v.mealpalname.slice(0, 1) +
'**') : [];
this.mealPalStr = this.mealPalArr.length ? this.mealPalArr.join('、') : '';
} catch (e) {
//TODO handle the exception
console.log(e);
......@@ -2638,7 +2650,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
var breakfastArr = this.mealtimeTrendsData.filter(e => e.mealtype == mealtype);
var breakfastAbnormalArr = [];
var breakfastAbnormalStr = '';
if (breakfastArr && breakfastArr[0].cateringList) {
if (breakfastArr.length && breakfastArr[0].cateringList) {
breakfastAbnormalArr = breakfastArr[0].cateringList.filter(e => e.repastType == 2 || e.repastType == 3)
.map(e => e.repasttime.slice(8, 9) ? e.repasttime.slice(8) : e.repasttime.slice(8, 9))
if (breakfastAbnormalArr.length > 1) {
......@@ -2676,16 +2688,18 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
if (data.obj) {
this.mealtimeTrendsData = data.obj
}
if (data.obj && data.obj.filter(e => e.mealtype == 1) && data.obj.filter(e => e.mealtype == 1)[0]
.cateringList) {
if (data.obj && data.obj.filter(e => e.mealtype == 1).length && data.obj.filter(e => e.mealtype ==
1)[0].cateringList) {
this.mealtypeArr.push(1)
}
if (data.obj && data.obj.filter(e => e.mealtype == 2 && data.obj.filter(e => e.mealtype == 2)[0]
.cateringList)) {
if (data.obj && data.obj.filter(e => e.mealtype == 2).length && data.obj.filter(e => e.mealtype ==
2)[0]
.cateringList) {
this.mealtypeArr.push(2)
}
if (data.obj && data.obj.filter(e => e.mealtype == 3 && data.obj.filter(e => e.mealtype == 3)[0]
.cateringList)) {
if (data.obj && data.obj.filter(e => e.mealtype == 3).length && data.obj.filter(e => e.mealtype ==
3)[0]
.cateringList) {
this.mealtypeArr.push(3)
}
} catch (e) {
......@@ -2893,7 +2907,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
} else {
this.queryMemberConsumerAmount(
serviceItemCode);
this.containerHeight = 2340;
this.containerHeight = 2207;
}
}
} catch (e) {
......@@ -4668,7 +4682,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
&.consume-open-results-items {
padding: 44rpx 0 0 34rpx;
box-sizing: border-box;
height: 473rpx;
// height: 473rpx;
height: 340rpx;
}
.open-results-items-summary {
......
src/pages/StudentPayment/PayOrderDetails/PayOrderDetails.vue
View file @ 1a330f5f
......@@ -107,6 +107,7 @@
</view>
</view>
</view>
<view class="masking" v-if="mask"></view>
</view>
</template>
......@@ -151,7 +152,8 @@
remarks: "",
remarksType: ["备注", "邮箱", "手机号码", "身份证"],
// 费用id
chargeItemIds: []
chargeItemIds: [],
mask: false
}
},
onLoad: function(options) {
......@@ -335,6 +337,24 @@
})
}
},
// 倒计时5秒
culDown() {
const self = this;
let second = 5;
const timer = setInterval(() => {
second--;
if (second) {
self.mask = true;
uni.showLoading({
title: '加载中'
});
} else {
clearInterval(timer);
uni.hideLoading();
self.mask = false;
}
}, 1000);
},
// 点击缴费下单接口
async clickPay() {
try {
......@@ -358,6 +378,7 @@
return
}
}
this.culDown();
let data = await this.$http.post({
url: orderApi + '/order-charge/app/charge/project/createOrder'
}, {
......@@ -375,6 +396,7 @@
schoolId: this.allData.schoolId,
userId: this.allData.userId
})
if (data.code != 200) {
uni.showToast({
icon: "none",
......@@ -389,6 +411,8 @@
} catch (e) {
//TODO handle the exception
console.log(e);
this.mask = false;
uni.hideLoading()
uni.showToast({
icon: "none",
mask: true,
......@@ -418,6 +442,8 @@
});
} catch (e) {
//TODO handle the exception
this.mask = false;
uni.hideLoading();
console.log(e);
uni.showToast({
icon: "none",
......@@ -465,7 +491,15 @@
page {
background: #F3F5F6;
}
.masking {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0,0,0,0.4);
z-index: 10;
}
.PaymentRsults {
width: 580rpx;
height: 480rpx;
......
src/pages/StudentPayment/PayProgress/PayProgress.vue
View file @ 1a330f5f
......@@ -64,7 +64,7 @@
</view>
<!-- 没有数据 -->
<view class="noData" v-else>
<image style="width: 301rpx;height: 258rpx;" :src="ImgUrl+'StudentPayment/NoRecord.png'"
<image style="width: 474rpx;height: 235rpx;" :src="ImgUrl+'xzf/noData-06.png'"
mode='widthFix'></image>
<view>暂无数据</view>
</view>
......@@ -99,9 +99,8 @@
</view>
<!-- 没有数据 -->
<view class="noData" v-else>
<image style="width: 290rpx;height: 242rpx;" :src="ImgUrl+'StudentPayment/development.png'"
<image style="width: 474rpx;height: 235rpx;" :src="ImgUrl+'xzf/noData-06.png'"
mode='widthFix'></image>
<view>程序员正在玩命加载</view>
<view class="bottomtxt">暂无数据</view>
</view>
</view>
......
src/pages/StudentPayment/PayProject/PayProject.vue
View file @ 1a330f5f
......@@ -30,9 +30,9 @@
</view>
<!-- 没有数据 -->
<view class="noData" v-else>
<image style="width: 301rpx;height: 258rpx;" :src="ImgUrl+'StudentPayment/NoRecord.png'"
<image style="width: 474rpx;height: 235rpx;" :src="ImgUrl+'xzf/noData-06.png'"
mode='widthFix'></image>
<view>暂无收费项目</view>
<view>暂无数据</view>
</view>
</view>
</van-tab>
......@@ -73,10 +73,9 @@
</view>
<!-- 没有数据 -->
<view class="noData" v-else>
<image style="width: 290rpx;height: 242rpx;" :src="ImgUrl+'StudentPayment/development.png'"
<image style="width: 474rpx;height: 235rpx;" :src="ImgUrl+'xzf/noData-06.png'"
mode='widthFix'></image>
<view>正在玩命加载</view>
<view class="bottomtxt">暂无历交费项目</view>
<view class="bottomtxt">暂无数据</view>
</view>
</view>
</van-tab>
......
src/pages/assignDeposit/assignDeposit.vue
View file @ 1a330f5f
......@@ -1066,7 +1066,7 @@
let this_ = this;
let loading = weui.loading("请稍后");
$.ajax({
url: gHost + "/bank-wechat/user/bank/get",
url: gHost + "/bank-wechat/user/bank/get/v2",
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
......
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