Merge branch 'develop' into test

miniprogram/pages/index/index.ts

@@ -9,6 +9,8 @@ Page({
   onLoad() {
     if (app.globalData.token) {
       this.tokenLoagin();
+    } else {
+      this.codeLogin();
     }
   },
   data: {

miniprogram/pages/index/index.wxml

@@ -11,8 +11,8 @@
       </div>
     </view>
     <button class="login-btn" bindtap="loginHandle">登录</button>
-    <view class="wx-login" bind:tap="codeLogin">
+    <!-- <view class="wx-login" bind:tap="codeLogin">
       <image class="wx-login-icon" src="../../images/ic_wechat@2x.png"></image>
-    </view>
+    </view> -->
   </view>
 </view>
\ No newline at end of file