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

src/assets/css/index.css

@@ -8,14 +8,14 @@ i {
   font-style: normal;
 }
 .iosStyle {
-  background-color: #077AEC;
+  background-color: #0978e7;
 }
 .container {
   padding-top: 46px;
 }
 /*未扣费*/
 .no_bill {
-  color: #077AEC;
+  color: #0978e7;
 }
 .mt0 {
   margin-top: 0 !important;

src/main.js

@@ -66,7 +66,7 @@ Vue.prototype.setPageNavState = function () {
 
       window.WebViewJavascriptBridge.callHandler(
         "setBarColor",
-        { "barColor": "#077aec" },
+        { "barColor": "#0978e7" },
         function (response) {
           console.log("main setBarColor的回传数据：", response);
         }

src/router/index.js

@@ -110,6 +110,5 @@ router.beforeEach((to, from, next) => {
 
 router.beforeEach(vuexOidcCreateRouterMiddleware(store));
 
-//TODO: 把callBack中的app_register_id逻辑替换到这里
 
 export default router

src/views/Bill/index.vue

@@ -234,16 +234,10 @@ export default {
       "loadPayUrl"
     ]),
     toPay() {
-      let payUrl =
-        this.payUrl +
-        "&accountType=1&payType=3&selected=1&failUrl=" +
-        encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail") +
-        "&successUrl=" +
-        encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success") +
-        "" +
-        "&periodId=" +
-        this.currentPerId;
-      window.open(payUrl);
+      const failUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail");
+      const successUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success");
+      let payUrl=`${this.payUrl}&accountType=1&periodId=${this.currentPerId}&selected=1&failUrl=${failUrl}&successUrl=${successUrl}`;
+      window.location.href=payUrl;
     },
     toPage(flag) {
       switch (flag) {
@@ -418,18 +412,25 @@ export default {
       }
     },
     setBarHeight() {
-      const barHeight = localStorage.getItem("barHeight");
-      const conHeight = 46 + parseInt(barHeight);
-      console.log("bill conHeight=", conHeight);
-      const dom = document.getElementsByClassName("iosStyle")[0];
-      if (dom) {
-        dom.setAttribute("style", "padding-top:" + barHeight + "px !important");
-      }
+      setTimeout(() => {
+        const barHeight = localStorage.getItem("barHeight");
+        const conHeight = 46 + parseInt(barHeight);
+        const dom = document.getElementsByClassName("iosStyle")[0];
+        if (dom) {
+          dom.setAttribute(
+            "style",
+            "padding-top:" + barHeight + "px !important"
+          );
+        }
 
-      const dom2 = document.getElementsByClassName("container")[0];
-      if (dom2) {
-        dom2.setAttribute("style","padding-top:" + conHeight + "px !important");
-      }
+        const dom2 = document.getElementsByClassName("container")[0];
+        if (dom2) {
+          dom2.setAttribute(
+            "style",
+            "padding-top:" + conHeight + "px !important"
+          );
+        }
+      }, 100);
     },
     closeWebView() {
       try {

src/views/Bill/record.vue

@@ -101,7 +101,7 @@ export default {
     this.setPageNavState();
     this.globalNavLeftArrowClick(this.navLeftArrowClick);
     this.accountId = this.$route.query.accountId;
-    const formType = this.$route.query.fromType;
+    const fromType = this.$route.query.fromType;
     console.log("fromType=", fromType);
     if (!fromType) {
       if (this.getBeginDate > "2020-04-30") {

src/views/More/index.vue

@@ -75,16 +75,10 @@ export default {
   methods: {
     ...mapActions(["loadMoreList", "loadMoreSummary", "loadPayUrl"]),
     toPay() {
-      let payUrl =
-        this.payUrl +
-        "&accountType=1&payType=3&selected=1&failUrl=" +
-        encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail") +
-        "&successUrl=" +
-        encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success") +
-        "" +
-        "&periodId=" +
-        this.currentPerId;
-      window.open(payUrl);
+      const failUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/fail");
+      const successUrl=encodeURIComponent("https://pay.qinqinxiaobao.com/callback/success");
+      let payUrl=`${this.payUrl}&accountType=19&selected=1&failUrl=${failUrl}&successUrl=${successUrl}`;
+      window.location.href=payUrl;
     },
     toPage() {
       this.$router.push({
@@ -123,7 +117,7 @@ export default {
     this.setPageNavState();
     this.globalNavLeftArrowClick(this.navLeftArrowClick);
     await this.getData();
-    //this.payUrl = await this.loadPayUrl();
+    this.payUrl = await this.loadPayUrl();
   }
 };
 </script>

src/views/OidcCallback.vue

@@ -46,6 +46,7 @@ export default {
           res => {
             console.log("res=", res);
             if (res.status == 200) {
+              
               const accessToken = res.data.access_token;
               //store.dispatch("changeToken", accessToken);
               localStorage.setItem("token", accessToken);