Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

rk

3 天以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 bicycle/App.vue

@@ -6,6 +6,7 @@
      },
      onLaunch: function() {
         var that = this;
         console.log(JSON.stringify(this.userInfo))
         if (JSON.stringify(this.userInfo) == '{}') {
            uni.login({
               provider: 'weixin',
@@ -19,6 +20,8 @@
                  }
               }
            });
         } else {
            that.$isResolve()
         }
      },
      onShow: function() {