Merge branch 'feature/act-code' into dev

src/views/login/login-more.vue

@@ -77,7 +77,11 @@ export default {
      */
     toLogin() {
       const that = this;
-      const href = `${window.location.origin}/haoban-manage3-web/gic-login?wxEnterpriseId=${that.enterpriseList[that.active].wxEnterpriseId}&random=${that.$route.query.random}`;
+      const { random, hbPage } = this.$route.query;
+      let href = `${window.location.origin}/haoban-manage3-web/gic-login?wxEnterpriseId=${that.enterpriseList[that.active].wxEnterpriseId}&random=${random}`;
+      if (hbPage) {
+        href = `${window.location.origin}/haoban-manage3-web/gic-login?wxEnterpriseId=${that.enterpriseList[that.active].wxEnterpriseId}&random=${random}&staffActCode=${hbPage}`;
+      }
       window.location.href = href;
     },
     changeEnterprise(val) {