Skip to content

hrs_app_h5 / bill

Go to a project
Commit cc93afe4 by cocomilk2012
Options

update

parent 31b546b1
Inline Side-by-side
Showing with 33 additions and 75 deletions
src/views/Bill/index.vue
...@@ -7,29 +7,17 @@ ...@@ -7,29 +7,17 @@
<div class="header"> <div class="header">
<div class="header_date_time"> <div class="header_date_time">
<div class="choose-month"> <div class="choose-month">
<div <div class="arrow-l" :class="hideL?'hideDiv':''" @click="chooseMonth('left')">
class="arrow-l"
:class="hideL ? 'hideDiv' : ''"
@click="chooseMonth('left')"
>
<img src="../../assets/images/triangle-arrow-l.png" alt /> <img src="../../assets/images/triangle-arrow-l.png" alt />
</div> </div>
<div class="month">{{ period[currentPerIndex].name }}</div> <div class="month">{{period[currentPerIndex].name}}</div>
<div <div class="arrow-r" :class="hideR?'hideDiv':''" @click="chooseMonth('right')">
class="arrow-r"
:class="hideR ? 'hideDiv' : ''"
@click="chooseMonth('right')"
>
<img src="../../assets/images/triangle-arrow-r.png" alt /> <img src="../../assets/images/triangle-arrow-r.png" alt />
</div> </div>
</div> </div>
<div class="cycle"> <div class="cycle">
<span>入账周期：</span> <span>入账周期：</span>
<span <span>{{period[currentPerIndex].beginDate | periodMoment}}-{{period[currentPerIndex].endDate | periodMoment}}</span>
>{{ period[currentPerIndex].beginDate | periodMoment }}-{{
period[currentPerIndex].endDate | periodMoment
}}</span
>
</div> </div>
</div> </div>
<div class="header_box"> <div class="header_box">
...@@ -37,19 +25,18 @@ ...@@ -37,19 +25,18 @@
<div class="header_content"> <div class="header_content">
<div class="fund"> <div class="fund">
<span>账户余额</span> <span>账户余额</span>
<i>{{ data.balance | moneyNum }}</i> <i>{{data.balance|moneyNum}}</i>
</div> </div>
<div class="paid"> <div class="paid">
<span>待付金额</span> <span>待付金额</span>
<i class="paid_color">{{ data.waitPay | moneyNum }}</i> <i class="paid_color">{{data.waitPay|moneyNum}}</i>
</div> </div>
</div> </div>
<div class="header_info"> <div class="header_info">
<div class="left" @click="toPay_old()"> <div class="left" @click="toPay()">
<img src="../../assets/images/icon01.png" alt /> <img src="../../assets/images/icon01.png" alt />
<span>充值</span> <span>充值</span>
</div> </div>
<div class="right" @click="toPage(2)"> <div class="right" @click="toPage(2)">
<img src="../../assets/images/icon02.png" alt /> <img src="../../assets/images/icon02.png" alt />
<span>资金记录</span> <span>资金记录</span>
...@@ -66,7 +53,7 @@ ...@@ -66,7 +53,7 @@
</div> </div>
<p> <p>
<span>托收金额</span> <span>托收金额</span>
<i>{{ data.hosting.amount | moneyNum }}</i> <i>{{data.hosting.amount|moneyNum}}</i>
</p> </p>
</div> </div>
...@@ -79,11 +66,11 @@ ...@@ -79,11 +66,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{ data.socical.total | moneyNum }}</i> <i>{{data.socical.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{ data.socical.waitPay | moneyNum }}</i> <i>{{data.socical.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--公积金代理 accumulation--> <!--公积金代理 accumulation-->
...@@ -94,11 +81,11 @@ ...@@ -94,11 +81,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{ data.fund.total | moneyNum }}</i> <i>{{data.fund.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{ data.fund.waitPay | moneyNum }}</i> <i>{{data.fund.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--个税代理 income--> <!--个税代理 income-->
...@@ -109,11 +96,11 @@ ...@@ -109,11 +96,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{ data.tax.total | moneyNum }}</i> <i>{{data.tax.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{ data.tax.waitPay | moneyNum }}</i> <i>{{data.tax.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--服务费 service--> <!--服务费 service-->
...@@ -124,11 +111,11 @@ ...@@ -124,11 +111,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{ data.service.total | moneyNum }}</i> <i>{{data.service.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{ data.service.waitPay | moneyNum }}</i> <i>{{data.service.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--会员年费 vip--> <!--会员年费 vip-->
...@@ -139,11 +126,11 @@ ...@@ -139,11 +126,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{ data.annual.total | moneyNum }}</i> <i>{{data.annual.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{ data.annual.waitPay | moneyNum }}</i> <i>{{data.annual.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--其他事务办理 general--> <!--其他事务办理 general-->
...@@ -154,11 +141,11 @@ ...@@ -154,11 +141,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{ data.other.total | moneyNum }}</i> <i>{{data.other.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{ data.other.waitPay | moneyNum }}</i> <i>{{data.other.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
</div> </div>
...@@ -188,7 +175,6 @@ export default { ...@@ -188,7 +175,6 @@ export default {
currentPerName: "", currentPerName: "",
period: [{ name: "" }], period: [{ name: "" }],
payUrl: "", payUrl: "",
nativePayUrl: "",
data: { data: {
balance: 0, balance: 0,
waitPay: 0, waitPay: 0,
...@@ -248,34 +234,6 @@ export default { ...@@ -248,34 +234,6 @@ export default {
"loadPayUrl" "loadPayUrl"
]), ]),
toPay() { toPay() {
//TODO:根据UA判断：如果App版本<2.1.9就走原来的充值逻辑；如果App版本>=2.1.9就走新的充值逻辑；
const userAgent = navigator.userAgent.toLowerCase();
if (userAgent.indexOf("qqxbua") != -1) {
let tempArr = userAgent.split("qqxbua:");
if (tempArr.length > 1) {
const tempStr = tempArr[1];
const QQXBUA = JSON.parse(tempStr);
let version = QQXBUA.version;
console.log("version=", version);
if (version < "2.1.9") {
this.toPay_old();
} else {
this.toPay_new();
}
}
} else {
this.toPay_old();
}
},
toPay_new() {
console.log("topay_new");
//TODO:先弹出一个遮罩层，点击任意按钮刷新页面
this.$bridge.getActionUrl(this.nativePayUrl).then(res => {
console.log("getActionUrl in bill index");
});
},
toPay_old() {
console.log("topay_old");
this.$bridge this.$bridge
.setPageNavState({ .setPageNavState({
headerColor: "#fff", headerColor: "#fff",
...@@ -295,21 +253,22 @@ export default { ...@@ -295,21 +253,22 @@ export default {
barColor: "#ffffff" barColor: "#ffffff"
}) })
.then(res => {}); .then(res => {});
console.log("setBarColor");
const failUrl = encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail"); const failUrl = encodeURIComponent(
const successUrl = encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success"); "https://pay.qinqinxiaobao.com/callback/fail"
);
const successUrl = encodeURIComponent(
"https://pay.qinqinxiaobao.com/callback/success"
);
const payMethod = 0; const payMethod = 0;
const payType = 4; const payType = 4;
const selected = 0; const selected = 0;
const fee = this.data.waitPay; const fee = this.data.waitPay;
let payUrl = `${this.payUrl}&accountId=${this.currentPerId}&payMethod=${payMethod}&payType=${payType}&fee=${fee}&selected=0&failUrl=${failUrl}&successUrl=${successUrl}`; let payUrl = `${this.payUrl}&accountId=${this.currentPerId}&payMethod=${payMethod}&payType=${payType}&fee=${fee}&selected=0&failUrl=${failUrl}&successUrl=${successUrl}`;
console.log("old_pay_url=", payUrl); window.onpageshow=null;
window.onpageshow = null; window.onpageshow=function(event){
window.onpageshow = function(event) {
//event.persisted是否是缓存
location.reload(); location.reload();
}; }
console.log('window.onpageshow ');
window.location.href = payUrl; window.location.href = payUrl;
}, },
toPage(flag) { toPage(flag) {
...@@ -426,8 +385,6 @@ export default { ...@@ -426,8 +385,6 @@ export default {
data => { data => {
this.data.balance = data.balance; this.data.balance = data.balance;
this.data.waitPay = data.waitPay; this.data.waitPay = data.waitPay;
this.nativePayUrl = `hrs100://native/SelectRechargeMode?periodId=${this.currentPerId}&fee=${this.data.waitPay}`;
console.log("this.nativePayUrl=", this.nativePayUrl);
}, },
err => { err => {
console.log(err); console.log(err);
...@@ -490,7 +447,7 @@ export default { ...@@ -490,7 +447,7 @@ export default {
setBarHeightLowBee() { setBarHeightLowBee() {
setTimeout(() => { setTimeout(() => {
const barHeight = localStorage.getItem("barHeight"); const barHeight = localStorage.getItem("barHeight");
console.log("barHeight=", barHeight); console.log('barHeight=',barHeight);
const conHeight = 46 + parseInt(barHeight); const conHeight = 46 + parseInt(barHeight);
const dom = document.getElementsByClassName("iosStyle")[0]; const dom = document.getElementsByClassName("iosStyle")[0];
if (dom) { if (dom) {
...@@ -557,10 +514,11 @@ export default { ...@@ -557,10 +514,11 @@ export default {
this.setBarHeightLowBee(); this.setBarHeightLowBee();
this.globalNavLeftArrowClick(this.navLeftArrowClick); this.globalNavLeftArrowClick(this.navLeftArrowClick);
await this.loadPeriodData(); await this.loadPeriodData();
}, },
async created() { async created() {
this.payUrl = localStorage.getItem("payUrl"); this.payUrl = localStorage.getItem("payUrl");
console.log("this.payUrl=", this.payUrl); console.log('this.payUrl=',this.payUrl);
if (!this.payUrl) { if (!this.payUrl) {
this.payUrl = await this.loadPayUrl(); this.payUrl = await this.loadPayUrl();
localStorage.setItem("payUrl", this.payUrl); localStorage.setItem("payUrl", this.payUrl);
......
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 sign in to comment