1

src/wx/pages/index/index.js

@@ -32,9 +32,7 @@ Page({
     var location = wx.getStorageSync('location');
     var latitude = location.latitude;
     var longitude = location.longitude;
-    wx.showToast({
-      title: location,
-    })
+    
     wx.request({
       url: app.url + 'ajax_get_user_role.php',
       data: {

src/wx/pages/register/register.js

@@ -70,40 +70,53 @@ Page({
         }
         
         wx.request({
-          url: app.url + 'ajax_user_register.php',
-          data: {
-            unionId: config.unionId,
-            openId: config.openId,
-            role: that.data.role,
-            name: app.globalData.userInfo.nickName,
-            headerImg: app.globalData.userInfo.avatarUrl,
-            schoolNo: that.data.schoolNo,
-            classNo: that.data.classNo,
-            schoolOwner: that.data.schoolOwner,
-            classOwner: that.data.classOwner
-          },
-          header: { 'content-type': 'application/json' },
-          method: 'GET',
-          dataType: 'json',
-          success: function (res) {
-            //跳转到首页
-            wx.switchTab({
-              url: '../index/index',
-            });
+          url: app.url +'ajax_get_unionid.php',
+          data:{
+            openid:config.openId,
+            iv:res.iv,
+            encryptedData: res.encryptedData
 
           },
-          fail: function (res) {
-            wx.showToast({
-              title: res.data.result.message,
-              icon: 'success',
-              duration: 2000
-            });
-            //跳转到首页
-            wx.switchTab({
-              url: '../index/index',
-            });
-          },
-          complete: function (res) { },
+          success(resp){
+            if(resp.data.status=='OK'){
+              wx.request({
+                url: app.url + 'ajax_user_register.php',
+                data: {
+                  unionId: resp.data.result.unionId,
+                  openId: config.openId,
+                  role: that.data.role,
+                  name: app.globalData.userInfo.nickName,
+                  headerImg: app.globalData.userInfo.avatarUrl,
+                  schoolNo: that.data.schoolNo,
+                  classNo: that.data.classNo,
+                  schoolOwner: that.data.schoolOwner,
+                  classOwner: that.data.classOwner
+                },
+                header: { 'content-type': 'application/json' },
+                method: 'GET',
+                dataType: 'json',
+                success: function (res) {
+                  //跳转到首页
+                  wx.switchTab({
+                    url: '../index/index',
+                  });
+
+                },
+                fail: function (res) {
+                  wx.showToast({
+                    title: res.data.result.message,
+                    icon: 'success',
+                    duration: 2000
+                  });
+                  //跳转到首页
+                  wx.switchTab({
+                    url: '../index/index',
+                  });
+                },
+                complete: function (res) { },
+              })
+            }
+          }
         })
       }
     })