0

www/webapp/common/js/native.js

@@ -55,7 +55,8 @@ define(function (require) {
           //此处有一个循环引用
           require('api').getO2oUserInfo({
             request_from: 'weixin',
-            user_id: localStorage.getItem('wxUserID')
+            user_id: localStorage.getItem('wxUserID'),
+            user_xyh_id: localStorage.getItem('xyhwxUserID')
           }, function (res) {
             if (typeof(that.getUserInfoCallback) == 'function') {
               that.getUserInfoCallback(res);
@@ -249,6 +250,7 @@ define(function (require) {
         wx: function () {
           //目前加上参数，绕过验证，后面再加上相关的验证
           param['user_id'] = localStorage.getItem('wxUserID');
+          param['user_xyh_id'] = localStorage.getItem('xyhwxUserID');
           param['request_from'] = 'weixin';
           if (that.getSignCallback) {
             that.getSignCallback(param);

www/webapp/moonclub/js/model/user.js

@@ -15,6 +15,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		this.mobile = '';
 		this.balance = 0;
 		this.info = {};
+		this.userData = null;
 		this.orders = {
 			1: {
 				data: [],
@@ -115,7 +116,9 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 	//获取用户信息
 	User.prototype.getUserInfo = function (callback) {
 		var that = this;
+		console.log(that)
 		native.getUserInfo(function (res) {
+			this.userData = res;
 			loginWithData.call(that, res);//loginWithData-登录数据
 			if (typeof(callback) == 'function') {//判断callback是否为函数.
 				callback();//调用函数
@@ -185,8 +188,10 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		var that = this;
 		console.log(that);
 		this.getUserInfo(function (res) {//在获取用户信息
+			this.userData = res
 			if (that.id == '') {
 				native.login(function (resA) {//本地中读取是否存在登陆数据
+
 					loginWithData.call(that, resA);//调用登录数据
 
 					if (typeof(callback) == 'function') {//判断callback是否为函数，true让其回调

www/webapp/moonclub/js/page/userInfo.js

@@ -190,6 +190,7 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
   },
   beforeopen: function (pageData, dtd) {
     var $view = this;
+    console.log(user.userData)
     var $doc = $(document);
     $doc.trigger('spa:openloader');
     if ($doc) {