Merge branch 'dev' into test

components/modules/shareBox/index.vue

@@ -39,12 +39,16 @@ export default {
   },
   },
   mounted() {
   mounted() {
     this.$Bus.$on('bus-showShare', this._toggleShare);
     this.$Bus.$on('bus-showShare', this._toggleShare);
-    if (UserAgent.isWx()) {
-      this._InitWXShare();
-      this._getWxJsapiPackage();
-    }
+    this.$Bus.$on('bus-initWX', this._initWXAll);
+    this._initWXAll()
   },
   },
   methods: {
   methods: {
+    _initWXAll() {
+      if (UserAgent.isWx()) {
+        this._InitWXShare();
+        this._getWxJsapiPackage();
+      }
+    },
     updateQueryStringParameter(uri, key, value) {
     updateQueryStringParameter(uri, key, value) {
       if (!value) {
       if (!value) {
         return uri;
         return uri;
@@ -131,6 +135,7 @@ export default {
   },
   },
   beforeDestroy() {
   beforeDestroy() {
     this.$Bus.$off('bus-showShare', this._toggleShare);
     this.$Bus.$off('bus-showShare', this._toggleShare);
+    this.$Bus.$off('bus-initWX', this._initWXAll);
   }
   }
 };
 };
 </script>
 </script>

components/view/index.vue

@@ -73,6 +73,7 @@ export default {
     }
     }
     this.$Bus.$on('bus-showLogin', this._toggleLogin);
     this.$Bus.$on('bus-showLogin', this._toggleLogin);
     await this.get_userInfo({ refererId: this.$route.query.refererId });
     await this.get_userInfo({ refererId: this.$route.query.refererId });
+    this.$Bus.$emit('bus-initWX');
     this.set_nowDate();
     this.set_nowDate();
     if (!process.env.private) {
     if (!process.env.private) {
       this.timer = websocketHeartbeat.call(this)
       this.timer = websocketHeartbeat.call(this)