Skip to content

hrs_app_h5 / bill

Go to a project
Commit 86d9336b by 展昭
Options

Merge branch 'dev'

parents 94e2e7d5 ac333fce
Expand all
Inline Side-by-side
Showing with 104 additions and 93 deletions
dist/css/chunk-30ba13fe.a9014ccd.css 0 → 100644
.contener .header[data-v-651fc18a]{height:3.626667rem;padding:0 .426667rem;background:#0978e7}.contener .header .header_date_time[data-v-651fc18a]{height:2rem;color:#fff;font-size:.373333rem;display:grid;grid-template-columns:100%;grid-template-rows:50% 50%;align-items:center;justify-items:center}.contener .header .header_date_time .choose-month[data-v-651fc18a]{display:grid;grid-template-columns:5% 90% 5%;justify-items:center}.contener .header .header_date_time .choose-month .arrow-l[data-v-651fc18a],.contener .header .header_date_time .choose-month .arrow_right[data-v-651fc18a]{widows:.426667rem;height:.426667rem}.contener .header .header_date_time .choose-month .hideDiv[data-v-651fc18a]{visibility:hidden}.contener .header .header_date_time .cycle[data-v-651fc18a]{color:#8ec9fd;font-size:.32rem}.contener .header .header_box[data-v-651fc18a]{height:4.64rem;background:#fff;box-shadow:0 .053333rem .266667rem 0 rgba(0,0,0,.1);border-radius:0 0 .106667rem .106667rem}.contener .header .header_box .title[data-v-651fc18a]{height:.053333rem;box-shadow:0 .026667rem .16rem 0 rgba(6,105,204,.6)}.contener .header .header_box .header_content[data-v-651fc18a]{height:3.253333rem}.contener .header .header_box .header_content .fund[data-v-651fc18a],.contener .header .header_box .header_content .paid[data-v-651fc18a]{width:50%;float:left}.contener .header .header_box .header_content .paid .paid_color[data-v-651fc18a]{color:#ff9100}.contener .header .header_box .header_content span[data-v-651fc18a]{height:.533333rem;font-size:.373333rem;color:#95989e;line-height:.533333rem;display:block;margin:.533333rem 0 0 .533333rem}.contener .header .header_box .header_content i[data-v-651fc18a]{height:.853333rem;font-size:.746667rem;font-weight:700;color:#3d4047;line-height:.853333rem;margin-top:.32rem;display:block;margin-left:.533333rem}.contener .header .header_box .header_info[data-v-651fc18a]{height:1.386667rem;background:#f5f7fa;border-radius:0 0 .213333rem .213333rem;display:flex;align-items:center;justify-content:center;text-align:center}.contener .header .header_box .header_info .left[data-v-651fc18a],.contener .header .header_box .header_info .right[data-v-651fc18a]{width:50%}.contener .header .header_box .header_info span[data-v-651fc18a]{height:.533333rem;font-size:.373333rem;font-weight:500;color:#077aec;line-height:.533333rem;letter-spacing:.026667rem}.contener .header .header_box .header_info img[data-v-651fc18a]{width:.426667rem;height:.426667rem;margin-right:.16rem;vertical-align:middle}.contener .box[data-v-651fc18a]{padding:0 .426667rem}.contener .box .list[data-v-651fc18a]{background:#fff;box-shadow:0 .053333rem .266667rem 0 rgba(0,0,0,.1);border-radius:.106667rem;margin-top:.426667rem;padding:.426667rem}.contener .box .list[data-v-651fc18a]:first-child{margin-top:3.44rem}.contener .box .list .list_title[data-v-651fc18a]{display:flex;align-items:center}.contener .box .list .list_title .title[data-v-651fc18a]{height:.586667rem;font-size:.426667rem;font-weight:500;color:#3d4047;line-height:.586667rem}.contener .box .list .list_title .arrow_right[data-v-651fc18a]{margin-left:auto;color:#e4e4e6}.contener .box .list p[data-v-651fc18a]{display:flex;align-items:center;margin-top:.16rem;height:.48rem;font-size:.346667rem;color:#95989e;line-height:.48rem}.contener .box .list p i[data-v-651fc18a]{font-style:normal;margin-left:auto}.contener .box .list_contenter[data-v-651fc18a]{background:#fff;box-shadow:0 .053333rem .266667rem 0 rgba(0,0,0,.1);border-radius:.106667rem;margin:.426667rem 0 .8rem}.contener .box .list_contenter .list[data-v-651fc18a]{box-shadow:none;margin:0;border-bottom:.026667rem solid #ececee;border-radius:0}
\ No newline at end of file
dist/index.html
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover"><link rel=icon href=/favicon.ico><title>业务账单</title><link href=/css/chunk-0a22a154.28f69852.css rel=prefetch><link href=/css/chunk-104c6ae2.3217bf3a.css rel=prefetch><link href=/css/chunk-19e02068.03935e91.css rel=prefetch><link href=/css/chunk-2a9b6233.ca92c2c1.css rel=prefetch><link href=/css/chunk-449da765.d7ce0b46.css rel=prefetch><link href=/css/chunk-48bde4ae.5f182672.css rel=prefetch><link href=/css/chunk-4ebffe6e.c85571e4.css rel=prefetch><link href=/css/chunk-52b9c751.a44cecf9.css rel=prefetch><link href=/css/chunk-5939606f.8991dcc5.css rel=prefetch><link href=/css/chunk-64aa1e27.63f31147.css rel=prefetch><link href=/css/chunk-79b212f1.3d1b0ff0.css rel=prefetch><link href=/css/chunk-a221a6bc.785a16e6.css rel=prefetch><link href=/css/chunk-b6aa981e.ecd163ae.css rel=prefetch><link href=/css/chunk-c0811eaa.8e51b280.css rel=prefetch><link href=/css/chunk-c9557cb2.dd4bfa54.css rel=prefetch><link href=/css/chunk-e0752f7a.8a632669.css rel=prefetch><link href=/js/chunk-0a22a154.d361770a.js rel=prefetch><link href=/js/chunk-104c6ae2.3ef7b9d7.js rel=prefetch><link href=/js/chunk-19e02068.c8d374a7.js rel=prefetch><link href=/js/chunk-2a9b6233.a47d92ce.js rel=prefetch><link href=/js/chunk-449da765.3ee2671b.js rel=prefetch><link href=/js/chunk-48bde4ae.58044824.js rel=prefetch><link href=/js/chunk-4ebffe6e.c5b2dce1.js rel=prefetch><link href=/js/chunk-52b9c751.27bb1fab.js rel=prefetch><link href=/js/chunk-5939606f.b45ddde4.js rel=prefetch><link href=/js/chunk-64aa1e27.0bb0a854.js rel=prefetch><link href=/js/chunk-79b212f1.0e0918c0.js rel=prefetch><link href=/js/chunk-a221a6bc.78167293.js rel=prefetch><link href=/js/chunk-b6aa981e.5e7e8b49.js rel=prefetch><link href=/js/chunk-c0811eaa.d5a49b0a.js rel=prefetch><link href=/js/chunk-c9557cb2.a0260e10.js rel=prefetch><link href=/js/chunk-e0752f7a.3a94fb49.js rel=prefetch><link href=/css/app.ce4e3706.css rel=preload as=style><link href=/css/chunk-vendors.42c0385d.css rel=preload as=style><link href=/js/app.62780f9f.js rel=preload as=script><link href=/js/chunk-vendors.4f55f207.js rel=preload as=script><link href=/css/chunk-vendors.42c0385d.css rel=stylesheet><link href=/css/app.ce4e3706.css rel=stylesheet></head><body><noscript><strong>We're sorry but qqxb-person-service doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.4f55f207.js></script><script src=/js/app.62780f9f.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover"><link rel=icon href=/favicon.ico><title>业务账单</title><link href=/css/chunk-0a22a154.28f69852.css rel=prefetch><link href=/css/chunk-104c6ae2.3217bf3a.css rel=prefetch><link href=/css/chunk-19e02068.03935e91.css rel=prefetch><link href=/css/chunk-2a9b6233.ca92c2c1.css rel=prefetch><link href=/css/chunk-449da765.d7ce0b46.css rel=prefetch><link href=/css/chunk-48bde4ae.5f182672.css rel=prefetch><link href=/css/chunk-4ebffe6e.c85571e4.css rel=prefetch><link href=/css/chunk-52b9c751.a44cecf9.css rel=prefetch><link href=/css/chunk-5939606f.8991dcc5.css rel=prefetch><link href=/css/chunk-64aa1e27.63f31147.css rel=prefetch><link href=/css/chunk-79b212f1.3d1b0ff0.css rel=prefetch><link href=/css/chunk-a221a6bc.785a16e6.css rel=prefetch><link href=/css/chunk-b6aa981e.ecd163ae.css rel=prefetch><link href=/css/chunk-c0811eaa.8e51b280.css rel=prefetch><link href=/css/chunk-c9557cb2.dd4bfa54.css rel=prefetch><link href=/css/chunk-e0752f7a.8a632669.css rel=prefetch><link href=/js/chunk-0a22a154.d361770a.js rel=prefetch><link href=/js/chunk-104c6ae2.3ef7b9d7.js rel=prefetch><link href=/js/chunk-19e02068.c8d374a7.js rel=prefetch><link href=/js/chunk-2a9b6233.a47d92ce.js rel=prefetch><link href=/js/chunk-449da765.3ee2671b.js rel=prefetch><link href=/js/chunk-48bde4ae.58044824.js rel=prefetch><link href=/js/chunk-4ebffe6e.c5b2dce1.js rel=prefetch><link href=/js/chunk-52b9c751.27bb1fab.js rel=prefetch><link href=/js/chunk-5939606f.b45ddde4.js rel=prefetch><link href=/js/chunk-64aa1e27.0bb0a854.js rel=prefetch><link href=/js/chunk-79b212f1.0e0918c0.js rel=prefetch><link href=/js/chunk-a221a6bc.78167293.js rel=prefetch><link href=/js/chunk-b6aa981e.5e7e8b49.js rel=prefetch><link href=/js/chunk-c0811eaa.d5a49b0a.js rel=prefetch><link href=/js/chunk-c9557cb2.a0260e10.js rel=prefetch><link href=/js/chunk-e0752f7a.3a94fb49.js rel=prefetch><link href=/css/app.ce4e3706.css rel=preload as=style><link href=/css/chunk-vendors.42c0385d.css rel=preload as=style><link href=/js/app.62780f9f.js rel=preload as=script><link href=/js/chunk-vendors.4f55f207.js rel=preload as=script><link href=/css/chunk-vendors.42c0385d.css rel=stylesheet><link href=/css/app.ce4e3706.css rel=stylesheet></head><body><noscript><strong>We're sorry but qqxb-person-service doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.4f55f207.js></script><script src=/js/app.62780f9f.js></script></body></html>
=======
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover"><link rel=icon href=/favicon.ico><title>业务账单</title><link href=/css/chunk-0a22a154.28f69852.css rel=prefetch><link href=/css/chunk-104c6ae2.3217bf3a.css rel=prefetch><link href=/css/chunk-19e02068.03935e91.css rel=prefetch><link href=/css/chunk-2a9b6233.ca92c2c1.css rel=prefetch><link href=/css/chunk-30ba13fe.a9014ccd.css rel=prefetch><link href=/css/chunk-449da765.d7ce0b46.css rel=prefetch><link href=/css/chunk-48bde4ae.5f182672.css rel=prefetch><link href=/css/chunk-4ebffe6e.c85571e4.css rel=prefetch><link href=/css/chunk-52b9c751.a44cecf9.css rel=prefetch><link href=/css/chunk-5939606f.8991dcc5.css rel=prefetch><link href=/css/chunk-64aa1e27.63f31147.css rel=prefetch><link href=/css/chunk-79b212f1.3d1b0ff0.css rel=prefetch><link href=/css/chunk-b6aa981e.ecd163ae.css rel=prefetch><link href=/css/chunk-c0811eaa.8e51b280.css rel=prefetch><link href=/css/chunk-c9557cb2.dd4bfa54.css rel=prefetch><link href=/css/chunk-e0752f7a.8a632669.css rel=prefetch><link href=/js/chunk-0a22a154.0e33ffac.js rel=prefetch><link href=/js/chunk-104c6ae2.b7056b8f.js rel=prefetch><link href=/js/chunk-19e02068.d4478a50.js rel=prefetch><link href=/js/chunk-2a9b6233.afc2a0f8.js rel=prefetch><link href=/js/chunk-30ba13fe.8917dca8.js rel=prefetch><link href=/js/chunk-449da765.c094dd14.js rel=prefetch><link href=/js/chunk-48bde4ae.838a4e9c.js rel=prefetch><link href=/js/chunk-4ebffe6e.cffdc4a1.js rel=prefetch><link href=/js/chunk-52b9c751.ae0c8e20.js rel=prefetch><link href=/js/chunk-5939606f.e5c08b7b.js rel=prefetch><link href=/js/chunk-64aa1e27.592d8f8c.js rel=prefetch><link href=/js/chunk-79b212f1.3f63a0ee.js rel=prefetch><link href=/js/chunk-b6aa981e.33c10a2e.js rel=prefetch><link href=/js/chunk-c0811eaa.bcc186a6.js rel=prefetch><link href=/js/chunk-c9557cb2.ff477a28.js rel=prefetch><link href=/js/chunk-e0752f7a.a2f3c967.js rel=prefetch><link href=/css/app.ce4e3706.css rel=preload as=style><link href=/css/chunk-vendors.86719e27.css rel=preload as=style><link href=/js/app.f783ab98.js rel=preload as=script><link href=/js/chunk-vendors.2079b34b.js rel=preload as=script><link href=/css/chunk-vendors.86719e27.css rel=stylesheet><link href=/css/app.ce4e3706.css rel=stylesheet></head><body><noscript><strong>We're sorry but qqxb-person-service doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.2079b34b.js></script><script src=/js/app.f783ab98.js></script></body></html>
>>>>>>> dev
dist/js/chunk-vendors.2079b34b.js 0 → 100644
This diff could not be displayed because it is too large.
dist/js/chunk-vendors.2079b34b.js.map 0 → 100644
This diff could not be displayed because it is too large.
package-lock.json
......@@ -10868,6 +10868,11 @@
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
"dev": true
},
"vconsole": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.3.4.tgz",
"integrity": "sha512-9yihsic96NPoMLQx/lCQwH9d89H0bbMW3LZPzo/t4yGQcS1X+vTCe9OHm1XSH7WNxzGDmcSwBiKLsFGwvJpQBg=="
},
"vendors": {
"version": "1.0.4",
"resolved": "https://registry.npm.taobao.org/vendors/download/vendors-1.0.4.tgz?cache=0&sync_timestamp=1579857106626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvendors%2Fdownload%2Fvendors-1.0.4.tgz",
......
package.json
......@@ -19,6 +19,7 @@
"oidc-client": "^1.10.1",
"postcss-px2rem": "^0.3.0",
"vant": "^2.6.0",
"vconsole": "^3.3.4",
"vue": "^2.6.11",
"vue-router": "^3.1.6",
"vuex": "^3.1.3",
......
src/main.js
......@@ -53,7 +53,7 @@ Vue.prototype.setPageNavState = function () {
Vue.prototype.$bridge = bridge;
// if (process.env.NODE_ENV === 'development') {
// if (process.env.NODE_ENV === 'development'||process.env.NODE_ENV === 'staging') {
// const VConsole = require('vconsole')
// const my_console = new VConsole();
// }
......
src/router/index.js
......@@ -28,90 +28,90 @@ const router = new VueRouter({
}
})
// //自动登录
// function autoLogin(payload = { autoCode, redirectPath }) {
// store.dispatch("authenticateOidc", {
// options: {
// extraQueryParams: {
// authcode: payload.autoCode
// },
// redirectPath: payload.redirectPath
// }
// });
// }
//自动登录
function autoLogin(payload = { autoCode, redirectPath }) {
store.dispatch("authenticateOidc", {
options: {
extraQueryParams: {
authcode: payload.autoCode
},
redirectPath: payload.redirectPath
}
});
}
// const loginStorage = localStorage;
// const autoLoginParamsKey = "autoLoginParams";
// function setAutoLogin(payload = { autoCode, redirectPath }) {
// loginStorage.setItem(autoLoginParamsKey, JSON.stringify(payload))
// }
// function getAutoLoginParams() {
// const paramStr = loginStorage.getItem(autoLoginParamsKey);
// if (!!paramStr) {
// loginStorage.removeItem(autoLoginParamsKey);
// return JSON.parse(paramStr);
// }
// return null;
// }
const loginStorage = localStorage;
const autoLoginParamsKey = "autoLoginParams";
function setAutoLogin(payload = { autoCode, redirectPath }) {
loginStorage.setItem(autoLoginParamsKey, JSON.stringify(payload))
}
function getAutoLoginParams() {
const paramStr = loginStorage.getItem(autoLoginParamsKey);
if (!!paramStr) {
loginStorage.removeItem(autoLoginParamsKey);
return JSON.parse(paramStr);
}
return null;
}
// //如果有登录参数则优先登录
// router.beforeEach((to, from, next) => {
// const autoLoginParams = getAutoLoginParams();
// if (autoLoginParams) {
// autoLogin(autoLoginParams);
// } else {
// next();
// }
// })
//如果有登录参数则优先登录
router.beforeEach((to, from, next) => {
const autoLoginParams = getAutoLoginParams();
if (autoLoginParams) {
autoLogin(autoLoginParams);
} else {
next();
}
})
// router.beforeEach((to, from, next) => {
// const authcode = to.query.authCode || to.query.authcode;
// const appid = to.query.appId || to.query.appid;
// const userId = to.query.userid || to.query.userId||0;
// if (!!authcode && !!appid) {
router.beforeEach((to, from, next) => {
const authcode = to.query.authCode || to.query.authcode;
const appid = to.query.appId || to.query.appid;
const userId = to.query.userid || to.query.userId||0;
if (!!authcode && !!appid) {
// var toPath = to.path || "/";
// for (let key in to.query) {
// if (key == 'authcode'||key == 'authCode') {
// continue;
// }
// toPath += toPath.indexOf("?") > -1 ? "&" : "?";
// toPath += `${key}=${to.query[key]}`;
// }
// const storeAppId = localStorage.getItem('appid');
// store.dispatch("getOidcUser").then(oidcUser => {
// if (oidcUser) {
// if(storeAppId!= appid){
// localStorage.setItem('appid',appid);
// setAutoLogin({ autoCode: authcode, redirectPath: toPath })
// store.dispatch("signOutOidc")
// }else{
// //如果登录用户与当前登录用户不匹配，则保存登录参数，退出
// console.log('userId=',userId);
// console.log('oidcUser.profile.sub=',oidcUser.profile.sub);
// console.log('oidcUser.profile.sub==userId:',oidcUser.profile.sub==userId);
// if (userId > 0 && oidcUser.profile.sub != userId) {
// setAutoLogin({ autoCode: authcode, redirectPath: toPath })
// store.dispatch("signOutOidc")
// } else {
// next()
// }
// }
// } else {
// localStorage.setItem('appid',appid);
// autoLogin({ autoCode: authcode, redirectPath: toPath })
// }
// }).catch(() => {
// localStorage.setItem('appid',appid);
// autoLogin({ autoCode: authcode, redirectPath: toPath })
// });
// } else {
// next()
// }
var toPath = to.path || "/";
for (let key in to.query) {
if (key == 'authcode'||key == 'authCode') {
continue;
}
toPath += toPath.indexOf("?") > -1 ? "&" : "?";
toPath += `${key}=${to.query[key]}`;
}
const storeAppId = localStorage.getItem('appid');
store.dispatch("getOidcUser").then(oidcUser => {
if (oidcUser) {
if(storeAppId!= appid){
localStorage.setItem('appid',appid);
setAutoLogin({ autoCode: authcode, redirectPath: toPath })
store.dispatch("signOutOidc")
}else{
//如果登录用户与当前登录用户不匹配，则保存登录参数，退出
console.log('userId=',userId);
console.log('oidcUser.profile.sub=',oidcUser.profile.sub);
console.log('oidcUser.profile.sub==userId:',oidcUser.profile.sub==userId);
if (userId > 0 && oidcUser.profile.sub != userId) {
setAutoLogin({ autoCode: authcode, redirectPath: toPath })
store.dispatch("signOutOidc")
} else {
next()
}
}
} else {
localStorage.setItem('appid',appid);
autoLogin({ autoCode: authcode, redirectPath: toPath })
}
}).catch(() => {
localStorage.setItem('appid',appid);
autoLogin({ autoCode: authcode, redirectPath: toPath })
});
} else {
next()
}
// })
})
// router.beforeEach(vuexOidcCreateRouterMiddleware(store));
router.beforeEach(vuexOidcCreateRouterMiddleware(store));
export default router
src/store/index.js
......@@ -55,16 +55,16 @@ export default new Vuex.Store({
token,
any,
more,
// oidc: vuexOidcCreateStoreModule(oidcSettings,
// {
// isAuthenticatedBy: 'access_token',
// dispatchEventsOnWindow: true
// }, {
// userLoaded: async (user) => {
// const appid = localStorage.getItem('appid');
// console.log('user.access_token=',user.access_token);
// await getToken(user.access_token, appid);
// }
// })
oidc: vuexOidcCreateStoreModule(oidcSettings,
{
isAuthenticatedBy: 'access_token',
dispatchEventsOnWindow: true
}, {
userLoaded: async (user) => {
const appid = localStorage.getItem('appid');
console.log('user.access_token=',user.access_token);
await getToken(user.access_token, appid);
}
})
}
});
src/views/Bill/index.vue
......@@ -264,7 +264,7 @@ export default {
const payType = 4;
const selected = 0;
const fee = this.data.waitPay;
let payUrl = `${this.payUrl}&accountType=1&periodId=${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}`;
window.onpageshow=null;
window.onpageshow=function(event){
location.reload();
......
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