Skip to content

hrs_app_h5 / bill

Go to a project
Commit e3a75976 by 张建朝
Options

Merge branch 'master' of gitlab.corp.qinqinxiaobao.com:hrs_app_h5/bill

parents a6deadd1 331d2945
Inline Side-by-side
Showing with 24 additions and 29 deletions
src/assets/css/index.css
...@@ -8,14 +8,14 @@ i { ...@@ -8,14 +8,14 @@ i {
font-style: normal; font-style: normal;
} }
.iosStyle { .iosStyle {
background-color: #077AEC; background-color: #0978e7;
} }
.container { .container {
padding-top: 46px; padding-top: 46px;
} }
/*未扣费*/ /*未扣费*/
.no_bill { .no_bill {
color: #077AEC; color: #0978e7;
} }
.mt0 { .mt0 {
margin-top: 0 !important; margin-top: 0 !important;
......
src/main.js
...@@ -66,7 +66,7 @@ Vue.prototype.setPageNavState = function () { ...@@ -66,7 +66,7 @@ Vue.prototype.setPageNavState = function () {
window.WebViewJavascriptBridge.callHandler( window.WebViewJavascriptBridge.callHandler(
"setBarColor", "setBarColor",
{ "barColor": "#077aec" }, { "barColor": "#0978e7" },
function (response) { function (response) {
console.log("main setBarColor的回传数据：", response); console.log("main setBarColor的回传数据：", response);
} }
......
src/router/index.js
...@@ -110,6 +110,5 @@ router.beforeEach((to, from, next) => { ...@@ -110,6 +110,5 @@ router.beforeEach((to, from, next) => {
router.beforeEach(vuexOidcCreateRouterMiddleware(store)); router.beforeEach(vuexOidcCreateRouterMiddleware(store));
//TODO: 把callBack中的app_register_id逻辑替换到这里
export default router export default router
src/views/Bill/index.vue
...@@ -234,16 +234,10 @@ export default { ...@@ -234,16 +234,10 @@ export default {
"loadPayUrl" "loadPayUrl"
]), ]),
toPay() { toPay() {
let payUrl = const failUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail");
this.payUrl + const successUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success");
"&accountType=1&payType=3&selected=1&failUrl=" + let payUrl=`${this.payUrl}&accountType=1&periodId=${this.currentPerId}&selected=1&failUrl=${failUrl}&successUrl=${successUrl}`;
encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail") + window.location.href=payUrl;
"&successUrl=" +
encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success") +
"" +
"&periodId=" +
this.currentPerId;
window.open(payUrl);
}, },
toPage(flag) { toPage(flag) {
switch (flag) { switch (flag) {
...@@ -418,18 +412,25 @@ export default { ...@@ -418,18 +412,25 @@ export default {
} }
}, },
setBarHeight() { setBarHeight() {
setTimeout(() => {
const barHeight = localStorage.getItem("barHeight"); const barHeight = localStorage.getItem("barHeight");
const conHeight = 46 + parseInt(barHeight); const conHeight = 46 + parseInt(barHeight);
console.log("bill conHeight=", conHeight);
const dom = document.getElementsByClassName("iosStyle")[0]; const dom = document.getElementsByClassName("iosStyle")[0];
if (dom) { if (dom) {
dom.setAttribute("style", "padding-top:" + barHeight + "px !important"); dom.setAttribute(
"style",
"padding-top:" + barHeight + "px !important"
);
} }
const dom2 = document.getElementsByClassName("container")[0]; const dom2 = document.getElementsByClassName("container")[0];
if (dom2) { if (dom2) {
dom2.setAttribute("style","padding-top:" + conHeight + "px !important"); dom2.setAttribute(
"style",
"padding-top:" + conHeight + "px !important"
);
} }
}, 100);
}, },
closeWebView() { closeWebView() {
try { try {
......
src/views/Bill/record.vue
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
this.setPageNavState(); this.setPageNavState();
this.globalNavLeftArrowClick(this.navLeftArrowClick); this.globalNavLeftArrowClick(this.navLeftArrowClick);
this.accountId = this.$route.query.accountId; this.accountId = this.$route.query.accountId;
const formType = this.$route.query.fromType; const fromType = this.$route.query.fromType;
console.log("fromType=", fromType); console.log("fromType=", fromType);
if (!fromType) { if (!fromType) {
if (this.getBeginDate > "2020-04-30") { if (this.getBeginDate > "2020-04-30") {
......
src/views/More/index.vue
...@@ -75,16 +75,10 @@ export default { ...@@ -75,16 +75,10 @@ export default {
methods: { methods: {
...mapActions(["loadMoreList", "loadMoreSummary", "loadPayUrl"]), ...mapActions(["loadMoreList", "loadMoreSummary", "loadPayUrl"]),
toPay() { toPay() {
let payUrl = const failUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail");
this.payUrl + const successUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success");
"&accountType=1&payType=3&selected=1&failUrl=" + let payUrl=`${this.payUrl}&accountType=19&selected=1&failUrl=${failUrl}&successUrl=${successUrl}`;
encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail") + window.location.href=payUrl;
"&successUrl=" +
encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success") +
"" +
"&periodId=" +
this.currentPerId;
window.open(payUrl);
}, },
toPage() { toPage() {
this.$router.push({ this.$router.push({
...@@ -123,7 +117,7 @@ export default { ...@@ -123,7 +117,7 @@ export default {
this.setPageNavState(); this.setPageNavState();
this.globalNavLeftArrowClick(this.navLeftArrowClick); this.globalNavLeftArrowClick(this.navLeftArrowClick);
await this.getData(); await this.getData();
//this.payUrl = await this.loadPayUrl(); this.payUrl = await this.loadPayUrl();
} }
}; };
</script> </script>
......
src/views/OidcCallback.vue
...@@ -46,6 +46,7 @@ export default { ...@@ -46,6 +46,7 @@ export default {
res => { res => {
console.log("res=", res); console.log("res=", res);
if (res.status == 200) { if (res.status == 200) {
const accessToken = res.data.access_token; const accessToken = res.data.access_token;
//store.dispatch("changeToken", accessToken); //store.dispatch("changeToken", accessToken);
localStorage.setItem("token", accessToken); localStorage.setItem("token", accessToken);
......
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