Merge branch '1.2.0_dev' into 'master'

1.2.0 dev



See merge request !8

+# Windows
+[Dd]esktop.ini
+Thumbs.db
+$RECYCLE.BIN/
+
+# macOS
+.DS_Store
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+
+# Node.js
+node_modules/

@@ -114,6 +114,13 @@ App({
       yas.report('YB_REGISTER_SUCCESS', params);
       yas.report('YB_REGISTER_SUCCESS', params);
     });
     });
 
 
+    let shareParams = {};
+    if (options && options.query) {
+      for (var Key in options.query) {
+        shareParams[Key] = options.query[Key];
+      }
+    }
+    yas.report('YB_SHARE_UNION_TYPE', shareParams)
 
 
     yas.report('YB_ENTER_FOREGROUND'); // 系统-程序切换置前台上报
     yas.report('YB_ENTER_FOREGROUND'); // 系统-程序切换置前台上报
     if (this.reportData.awakeReported === false) {
     if (this.reportData.awakeReported === false) {
@@ -222,8 +229,12 @@ App({
       key: 'userInfo',
       key: 'userInfo',
       data: this.globalData.userInfo
       data: this.globalData.userInfo
     });
     });
+    setTimeout(() => {
+      let uid = user.uid;
+      this.setUserUnionType(uid);
+    }, 1000);
 
 
-    this.setUserUnionType(this.globalData.userInfo.uid);
+    
   },
   },
   getUserUnionType() {
   getUserUnionType() {
     return this.globalData.userUnionType;
     return this.globalData.userUnionType;

@@ -2,6 +2,7 @@
 import Promise from '../vendors/es6-promise';
 import Promise from '../vendors/es6-promise';
 import config from './config';
 import config from './config';
 import api from './api';
 import api from './api';
+import Yas from './yas';
 
 
 export function getQRCodeSource(code) {
 export function getQRCodeSource(code) {
   let param = {
   let param = {
@@ -15,7 +16,13 @@ export function getQRCodeSource(code) {
   }).then(data => {
   }).then(data => {
     if (data.code === 200) {
     if (data.code === 200) {
       if (data.data) {
       if (data.data) {
-        return JSON.parse(data.data);
+        let resultJson = JSON.parse(data.data);
+        if (resultJson) {
+          let app = getApp();
+          let yas = new Yas(app);
+          yas.report('YB_SHARE_UNION_TYPE', resultJson);
+        }
+        return resultJson;
       }
       }
     } else {
     } else {
       return {};
       return {};

 import api from '../../common/api';
 import api from '../../common/api';
 
 
 import config from '../../common/config';
 import config from '../../common/config';
+import Yas from '../../common/yas';
 
 
 export default {
 export default {
   /**
   /**
@@ -130,7 +131,13 @@ export default {
     }).then(result => {
     }).then(result => {
       if (result.code === 200) {
       if (result.code === 200) {
         if (result.data) {
         if (result.data) {
-          return JSON.parse(result.data);
+          let resultJson = JSON.parse(result.data);
+          if(resultJson){
+            let app = getApp();
+            let yas = new Yas(app);
+            yas.report('YB_SHARE_UNION_TYPE', resultJson);
+          }
+          return resultJson;
         }
         }
       }
       }
     }).catch(e => {
     }).catch(e => {