Merge branch 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen

* 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen:
  1

src/wx/pages/leaderRegister/leaderRegister.js

@@ -85,9 +85,19 @@ Page({
           this.userInfoReadyCallback(res)
         }
         wx.request({
+          url: app.url + 'ajax_get_unionid.php',
+          data: {
+            openid: config.openId,
+            iv: res.iv,
+            encryptedData: res.encryptedData
+
+          },
+          success(resp) {
+            if (resp.data.status == 'OK') {
+              wx.request({
                 url: 'https://www.koala-online.cn/compass/if/ajax_leader_user_register.php',
                 data: {
-            unionId: config.unionId,
+                  unionId: resp.data.result.unionId,
                   openId: config.openId,
                   headerImg: app.globalData.userInfo.avatarUrl,
                   qrId: this.data.qrId,
@@ -105,6 +115,9 @@ Page({
                 complete: function (res) { },
               })
             }
+          }
+          });
+      }
     })
 
 

src/wx/pages/socialUserRegister/socialUserRegister.js

@@ -198,9 +198,19 @@ Page({
             return
           } 
           wx.request({
+            url: app.url + 'ajax_get_unionid.php',
+            data: {
+              openid: config.openId,
+              iv: res.iv,
+              encryptedData: res.encryptedData
+
+            },
+            success(resp) {
+              if (resp.data.status == 'OK') {
+                wx.request({
                   url: app.url + 'ajax_social_user_register1.php',
                   data: {
-              unionId: config.unionId,
+                    unionId: resp.data.result.unionId,
                     openId: config.openId,
                     name: that.data.name,
                     mobile: that.data.mobile,
@@ -230,6 +240,9 @@ Page({
                   },
                   complete: function (res) { },
                 })
+              }
+            }
+          });
 
         }