Merge branch 'develop' of http://git.yoho.cn/fe/yoho-limited-sell-miniapp into develop

@@ -108,6 +108,7 @@ function wechatUserIsBind(unionID, nickName) {
       userInfo.uid = data.data.uid;
       userInfo.uid = data.data.uid;
       userInfo.sessionKey = data.data.session_key;
       userInfo.sessionKey = data.data.session_key;
       userInfo.wechat = app.globalData.userInfo.wechat || '';
       userInfo.wechat = app.globalData.userInfo.wechat || '';
+      console.log('wechatUserIsBind=>', userInfo);
 
 
       app._removeSync('disableAutoLogin');
       app._removeSync('disableAutoLogin');
       app.setUserInfo(userInfo);
       app.setUserInfo(userInfo);
@@ -285,6 +286,7 @@ function getPhoneNumber(e) {
         userInfo.ssouid = res.data.ssouid;
         userInfo.ssouid = res.data.ssouid;
         userInfo.sessionKey = res.data.session_key;
         userInfo.sessionKey = res.data.session_key;
         userInfo.wechat = app.globalData.userInfo.wechat || '';
         userInfo.wechat = app.globalData.userInfo.wechat || '';
+        console.log('getPhoneNumber => ', userInfo);
 
 
         app._removeSync('disableAutoLogin');
         app._removeSync('disableAutoLogin');
         app.setUserInfo(userInfo);
         app.setUserInfo(userInfo);
@@ -331,7 +333,7 @@ function getUserInfo(e) {
     });
     });
   } else {
   } else {
     console.log(e.detail);
     console.log(e.detail);
-    let userInfo = Object.assign(app.globalData.userInfo, { wechat: e.detail.userInfo});
+    let userInfo = Object.assign(app.globalData.userInfo || {}, { wechat: e.detail.userInfo});
 
 
     app.setUserInfo(userInfo);
     app.setUserInfo(userInfo);
   }
   }

@@ -43,8 +43,13 @@ Page({
   },
   },
   onLoad: function() {
   onLoad: function() {
     yas = new Yas(app);
     yas = new Yas(app);
+    let that = this;
+
+    setTimeout(function() {
+      that.getList(0, 1, 20, false);
+    }, 300);
 
 
-    this.getList(0, 1, 20, false);
+    // this.getList(0, 1, 20, false);
   },
   },
   onShow: function() {
   onShow: function() {
     yas.pageOpenReport();
     yas.pageOpenReport();
@@ -60,7 +65,6 @@ Page({
         refreshText: '下拉刷新'
         refreshText: '下拉刷新'
       });
       });
     });
     });
-
   },
   },
   onReachBottom: function() {
   onReachBottom: function() {
     let page = this.data.listData[this.data.tabSelected].page;
     let page = this.data.listData[this.data.tabSelected].page;

@@ -138,6 +138,7 @@ Page(Object.assign({
     this.productInfo().then(() => {
     this.productInfo().then(() => {
       this.getAssitInfo();
       this.getAssitInfo();
     });
     });
+
   },
   },
   onShareAppMessage: function(res) {
   onShareAppMessage: function(res) {
     let params = {
     let params = {