Merge branch 'dev'

1a750064 · cocomilk2012 · 817fab6b · b8626e50 · 1a750064 · 1a750064
Commit 1a750064 authored Jul 15, 2020 by cocomilk2012
Showing with 252 additions and 47 deletions
README.md
package-lock.json
public/index.html
src/api/http.js
src/assets/js/bridge/birdge.js
src/main.js
src/router/index.js
src/views/Bill/index.vue
src/views/Bill/trusteeship.vue
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ appid=app_register_id
 authcode
 测试线账号及参数
+http://106.120.107.150:7773?appId=70770&authCode=001e6816b6324a92a681ac1a470f4715
 appId=70770
 userName=13522476236
 password=qqxb123456

--- a/package-lock.json
+++ b/package-lock.json
@@ -4769,7 +4769,7 @@
    },
    "fastclick": {
      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
      "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
    },
    "faye-websocket": {

--- a/public/index.html
+++ b/public/index.html
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+<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="<%= BASE_URL %>favicon.ico">
  <title>业务账单</title>
-  </head>
+  <style>
-  <body>
+    /* Absolute Center Spinner */
+    .loading {
+      position: fixed;
+      z-index: 999;
+      height: 2em;
+      width: 2em;
+      overflow: visible;
+      margin: auto;
+      top: 0;
+      left: 0;
+      bottom: 0;
+      right: 0;
+    }
+    /* Transparent Overlay */
+    .loading:before {
+      content: '';
+      display: block;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background-color: rgba(0, 0, 0, 0.3);
+    }
+    /* :not(:required) hides these rules from IE9 and below */
+    .loading:not(:required) {
+      /* hide "loading..." text */
+      font: 0/0 a;
+      color: transparent;
+      text-shadow: none;
+      background-color: transparent;
+      border: 0;
+    }
+    .loading:not(:required):after {
+      content: '';
+      display: block;
+      font-size: 10px;
+      width: 1em;
+      height: 1em;
+      margin-top: -0.5em;
+      -webkit-animation: spinner 1500ms infinite linear;
+      -moz-animation: spinner 1500ms infinite linear;
+      -ms-animation: spinner 1500ms infinite linear;
+      -o-animation: spinner 1500ms infinite linear;
+      animation: spinner 1500ms infinite linear;
+      border-radius: 0.5em;
+      -webkit-box-shadow: rgba(0, 0, 0, 0.75) 1.5em 0 0 0, rgba(0, 0, 0, 0.75) 1.1em 1.1em 0 0, rgba(0, 0, 0, 0.75) 0 1.5em 0 0, rgba(0, 0, 0, 0.75) -1.1em 1.1em 0 0, rgba(0, 0, 0, 0.5) -1.5em 0 0 0, rgba(0, 0, 0, 0.5) -1.1em -1.1em 0 0, rgba(0, 0, 0, 0.75) 0 -1.5em 0 0, rgba(0, 0, 0, 0.75) 1.1em -1.1em 0 0;
+      box-shadow: rgba(0, 0, 0, 0.75) 1.5em 0 0 0, rgba(0, 0, 0, 0.75) 1.1em 1.1em 0 0, rgba(0, 0, 0, 0.75) 0 1.5em 0 0, rgba(0, 0, 0, 0.75) -1.1em 1.1em 0 0, rgba(0, 0, 0, 0.75) -1.5em 0 0 0, rgba(0, 0, 0, 0.75) -1.1em -1.1em 0 0, rgba(0, 0, 0, 0.75) 0 -1.5em 0 0, rgba(0, 0, 0, 0.75) 1.1em -1.1em 0 0;
+    }
+    /* Animation */
+    @-webkit-keyframes spinner {
+      0% {
+        -webkit-transform: rotate(0deg);
+        -moz-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        -o-transform: rotate(0deg);
+        transform: rotate(0deg);
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        -moz-transform: rotate(360deg);
+        -ms-transform: rotate(360deg);
+        -o-transform: rotate(360deg);
+        transform: rotate(360deg);
+      }
+    }
+    @-moz-keyframes spinner {
+      0% {
+        -webkit-transform: rotate(0deg);
+        -moz-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        -o-transform: rotate(0deg);
+        transform: rotate(0deg);
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        -moz-transform: rotate(360deg);
+        -ms-transform: rotate(360deg);
+        -o-transform: rotate(360deg);
+        transform: rotate(360deg);
+      }
+    }
+    @-o-keyframes spinner {
+      0% {
+        -webkit-transform: rotate(0deg);
+        -moz-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        -o-transform: rotate(0deg);
+        transform: rotate(0deg);
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        -moz-transform: rotate(360deg);
+        -ms-transform: rotate(360deg);
+        -o-transform: rotate(360deg);
+        transform: rotate(360deg);
+      }
+    }
+    @keyframes spinner {
+      0% {
+        -webkit-transform: rotate(0deg);
+        -moz-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        -o-transform: rotate(0deg);
+        transform: rotate(0deg);
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        -moz-transform: rotate(360deg);
+        -ms-transform: rotate(360deg);
+        -o-transform: rotate(360deg);
+        transform: rotate(360deg);
+      }
+    }
+  </style>
+</head>
+<body>
  <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
+      Please enable it to continue.</strong>
  </noscript>
-    <div id="app"></div>
+  <div id="app">
+    <div class="loading">Loading&#8230;</div>
+  </div>
  <!-- built files will be auto injected -->
-  </body>
+</body>
 </html>
\ No newline at end of file
--- a/src/api/http.js
+++ b/src/api/http.js
@@ -26,7 +26,6 @@ http.interceptors.response.use(
        if (response.error == 400 || response.status == 400) {
            Toast.fail({
                message:'授权失效！请先退出。',
-                position:{top:200}
            });
        }
        let { data } = response;
@@ -55,7 +54,6 @@ http.interceptors.response.use(
            message: '授权失效！请先退出。',
            duration: 0,
            overlay: true,
-            position:{top:200}
        })
    }

--- a/src/assets/js/bridge/birdge.js
+++ b/src/assets/js/bridge/birdge.js
@@ -11,7 +11,7 @@ class Bridge {
   * @param {Object=} args  请求数据 
   * @param {String} args.barColor 栏颜色  #0978e7
   */
-    setBarColor(args = {}) {
+  setBarColor (args = {}) {
    return new Promise((resolve, reject) => {
      try {
        jsBridge.callHandler('setBarColor', args, function (response) {
@@ -28,7 +28,7 @@ class Bridge {
   * 
   * @param {Object=} args 请求参数
   */
-    getBarHeight(args = {}) {
+  getBarHeight (args = {}) {
    return new Promise((resolve, reject) => {
      try {
        jsBridge.callHandler("getBarHeight", args, function (response) {
@@ -51,7 +51,7 @@ class Bridge {
   * @param {Boolean} args.isShowNav 是否显示导航栏
   * @param {Boolean} args.isCloseWebView 是否关闭WebView
   */
-    setPageNavState(args = {}) {
+  setPageNavState (args = {}) {
    return new Promise((resolve, reject) => {
      try {
        jsBridge.callHandler("setPageNavState", args, function (response) {
@@ -69,7 +69,7 @@ class Bridge {
   * 
   * @param {Object=} args 请求对象
   */
-    closeWebView(args = {}) {
+  closeWebView (args = {}) {
    return new Promise((resolve, reject) => {
      try {
        jsBridge.callHandler("closeWebView", args, function (response) {
@@ -80,6 +80,25 @@ class Bridge {
      }
    })
  }
+  /**
+   * 使APP调用URL
+   * 
+   * @param {Object=} args 请求对象
+   */
+  getActionUrl (args = {}) {
+    console.log('bridge.getActionUrl');
+    return new Promise((resolve, reject) => {
+      try {
+        console.log('try bridge.getActionUrl');
+        jsBridge.callHandler("getActionUrl", args, function (response) {
+          resolve(response);
+        });
+      } catch (err) {
+        reject(err);
+      }
+    })
+  }
 }
 export default new Bridge();

--- a/src/main.js
+++ b/src/main.js
@@ -53,10 +53,10 @@ Vue.prototype.setPageNavState = function () {
 Vue.prototype.$bridge = bridge;
-// if (process.env.NODE_ENV === 'development'||process.env.NODE_ENV === 'staging') {
+if (process.env.NODE_ENV === 'development'||process.env.NODE_ENV === 'staging') {
-//   const VConsole = require('vconsole')
+  const VConsole = require('vconsole')
-//   const my_console = new VConsole();
+  const my_console = new VConsole();
-// }
+}
 new Vue({

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,6 +34,7 @@ const router = new VueRouter({
 })
 function getAccessToken(authcode) {
+  console.log('getAccessToken');
  return new Promise((resolve, reject) => {
    let commonPms = GetCommonPms();
    let url = `${oidc_config.authority}/connect/token?${commonPms}`;
@@ -69,7 +70,7 @@ async function getToken(access_token, appid, redirectPath) {
  };
  let commonPms = GetCommonPms();
  let url = `${oidc_config.authority}/connect/token?${commonPms}`;
-  console.log('url=', url);
+  console.log('pms=', JSON.stringify(pms));
  await axios
    .post(url, qs.stringify(pms))
    .then(

--- a/src/views/Bill/index.vue
+++ b/src/views/Bill/index.vue
@@ -7,17 +7,29 @@
      <div class="header">
        <div class="header_date_time">
          <div class="choose-month">
-            <div class="arrow-l" :class="hideL?'hideDiv':''" @click="chooseMonth('left')">
+            <div
+              class="arrow-l"
+              :class="hideL ? 'hideDiv' : ''"
+              @click="chooseMonth('left')"
+            >
              <img src="../../assets/images/triangle-arrow-l.png" alt />
            </div>
-            <div class="month">{{period[currentPerIndex].name}}</div>
+            <div class="month">{{ period[currentPerIndex].name }}</div>
-            <div class="arrow-r" :class="hideR?'hideDiv':''" @click="chooseMonth('right')">
+            <div
+              class="arrow-r"
+              :class="hideR ? 'hideDiv' : ''"
+              @click="chooseMonth('right')"
+            >
              <img src="../../assets/images/triangle-arrow-r.png" alt />
            </div>
          </div>
          <div class="cycle">
            <span>入账周期：</span>
-            <span>{{period[currentPerIndex].beginDate | periodMoment}}-{{period[currentPerIndex].endDate | periodMoment}}</span>
+            <span
+              >{{ period[currentPerIndex].beginDate | periodMoment }}-{{
+                period[currentPerIndex].endDate | periodMoment
+              }}</span
+            >
          </div>
        </div>
        <div class="header_box">
@@ -25,18 +37,19 @@
          <div class="header_content">
            <div class="fund">
              <span>账户余额</span>
-              <i>{{data.balance|moneyNum}}</i>
+              <i>{{ data.balance | moneyNum }}</i>
            </div>
            <div class="paid">
              <span>待付金额</span>
-              <i class="paid_color">{{data.waitPay|moneyNum}}</i>
+              <i class="paid_color">{{ data.waitPay | moneyNum }}</i>
            </div>
          </div>
          <div class="header_info">
-            <div class="left" @click="toPay()">
+            <div class="left" @click="toPay_old()">
              <img src="../../assets/images/icon01.png" alt />
              <span>充值</span>
            </div>
            <div class="right" @click="toPage(2)">
              <img src="../../assets/images/icon02.png" alt />
              <span>资金记录</span>
@@ -53,7 +66,7 @@
          </div>
          <p>
            <span>托收金额</span>
-            <i>{{data.hosting.amount|moneyNum}}</i>
+            <i>{{ data.hosting.amount | moneyNum }}</i>
          </p>
        </div>
@@ -66,11 +79,11 @@
            </div>
            <p>
              <span>应付金额</span>
-              <i>{{data.socical.total|moneyNum}}</i>
+              <i>{{ data.socical.total | moneyNum }}</i>
            </p>
            <p>
              <span>待付金额</span>
-              <i>{{data.socical.waitPay|moneyNum}}</i>
+              <i>{{ data.socical.waitPay | moneyNum }}</i>
            </p>
          </div>
          <!--公积金代理 accumulation-->
@@ -81,11 +94,11 @@
            </div>
            <p>
              <span>应付金额</span>
-              <i>{{data.fund.total|moneyNum}}</i>
+              <i>{{ data.fund.total | moneyNum }}</i>
            </p>
            <p>
              <span>待付金额</span>
-              <i>{{data.fund.waitPay|moneyNum}}</i>
+              <i>{{ data.fund.waitPay | moneyNum }}</i>
            </p>
          </div>
          <!--个税代理 income-->
@@ -96,11 +109,11 @@
            </div>
            <p>
              <span>应付金额</span>
-              <i>{{data.tax.total|moneyNum}}</i>
+              <i>{{ data.tax.total | moneyNum }}</i>
            </p>
            <p>
              <span>待付金额</span>
-              <i>{{data.tax.waitPay|moneyNum}}</i>
+              <i>{{ data.tax.waitPay | moneyNum }}</i>
            </p>
          </div>
          <!--服务费 service-->
@@ -111,11 +124,11 @@
            </div>
            <p>
              <span>应付金额</span>
-              <i>{{data.service.total|moneyNum}}</i>
+              <i>{{ data.service.total | moneyNum }}</i>
            </p>
            <p>
              <span>待付金额</span>
-              <i>{{data.service.waitPay|moneyNum}}</i>
+              <i>{{ data.service.waitPay | moneyNum }}</i>
            </p>
          </div>
          <!--会员年费 vip-->
@@ -126,11 +139,11 @@
            </div>
            <p>
              <span>应付金额</span>
-              <i>{{data.annual.total|moneyNum}}</i>
+              <i>{{ data.annual.total | moneyNum }}</i>
            </p>
            <p>
              <span>待付金额</span>
-              <i>{{data.annual.waitPay|moneyNum}}</i>
+              <i>{{ data.annual.waitPay | moneyNum }}</i>
            </p>
          </div>
          <!--其他事务办理 general-->
@@ -141,11 +154,11 @@
            </div>
            <p>
              <span>应付金额</span>
-              <i>{{data.other.total|moneyNum}}</i>
+              <i>{{ data.other.total | moneyNum }}</i>
            </p>
            <p>
              <span>待付金额</span>
-              <i>{{data.other.waitPay|moneyNum}}</i>
+              <i>{{ data.other.waitPay | moneyNum }}</i>
            </p>
          </div>
        </div>
@@ -155,7 +168,7 @@
 </template>
 <script>
-import { Icon, Loading } from "vant";
+import { Icon, Loading, Toast } from "vant";
 import { TabHeader } from "@/components";
 import * as utils from "../../utils/common";
 import { mapGetters, mapActions } from "vuex";
@@ -175,6 +188,7 @@ export default {
      currentPerName: "",
      period: [{ name: "" }],
      payUrl: "",
+      nativePayUrl: "",
      data: {
        balance: 0,
        waitPay: 0,
@@ -234,6 +248,39 @@ export default {
      "loadPayUrl"
    ]),
    toPay() {
+      window.onpageshow = null;
+      window.onpageshow = function(event) {
+        //event.persisted是否是缓存
+        location.reload();
+      };
+      //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
        .setPageNavState({
          headerColor: "#fff",
@@ -253,7 +300,7 @@ export default {
          barColor: "#ffffff"
        })
        .then(res => {});
+      console.log("setBarColor");
      const failUrl = encodeURIComponent(
        "https://pay.qinqinxiaobao.com/callback/fail"
      );
@@ -265,11 +312,12 @@ export default {
      const selected = 0;
      const fee = this.data.waitPay;
      let payUrl = `${this.payUrl}&accountId=${this.currentPerId}&payMethod=${payMethod}&payType=${payType}&fee=${fee}&selected=0&failUrl=${failUrl}&successUrl=${successUrl}`;
-      window.onpageshow=null;
+      console.log("old_pay_url=", payUrl);
-      window.onpageshow=function(event){
-        location.reload();
+      console.log("window.onpageshow ");
-      }
+      Toast.loading({ duration: 0, message: "正在跳转到支付页面，请等待..." });
      window.location.href = payUrl;
+      console.log("页面跳转走了");
    },
    toPage(flag) {
      switch (flag) {
@@ -385,6 +433,8 @@ export default {
        data => {
          this.data.balance = data.balance;
          this.data.waitPay = data.waitPay;
+          this.nativePayUrl = `hrs100://native/SelectRechargeMode?periodId=${this.currentPerId}&fee=${this.data.waitPay}`;
+          console.log("this.nativePayUrl=", this.nativePayUrl);
        },
        err => {
          console.log(err);
@@ -447,7 +497,7 @@ export default {
    setBarHeightLowBee() {
      setTimeout(() => {
        const barHeight = localStorage.getItem("barHeight");
-        console.log('barHeight=',barHeight);
+        console.log("barHeight=", barHeight);
        const conHeight = 46 + parseInt(barHeight);
        const dom = document.getElementsByClassName("iosStyle")[0];
        if (dom) {
@@ -514,11 +564,10 @@ export default {
    this.setBarHeightLowBee();
    this.globalNavLeftArrowClick(this.navLeftArrowClick);
    await this.loadPeriodData();
  },
  async created() {
    this.payUrl = localStorage.getItem("payUrl");
-    console.log('this.payUrl=',this.payUrl);
+    console.log("this.payUrl=", this.payUrl);
    if (!this.payUrl) {
      this.payUrl = await this.loadPayUrl();
      localStorage.setItem("payUrl", this.payUrl);
@@ -546,6 +595,7 @@ export default {
        display: grid;
        grid-template-columns: 5% 90% 5%;
        justify-items: center;
+        align-items: center;
        .arrow-l,
        .arrow_right {
          widows: 16px;

--- a/src/views/Bill/trusteeship.vue
+++ b/src/views/Bill/trusteeship.vue
@@ -248,6 +248,7 @@ export default {
        display: grid;
        grid-template-columns: 5% 90% 5%;
        justify-items: center;
+        align-items: center;
        .arrow-l,
        .arrow_right {
          widows: 16px;