Skip to content

W
wx-boss
Commit bb1b5191 by 姜雷
Options

Merge branch 'develop' into test

parents e5b30463 b767d38b
Showing with 5 additions and 2 deletions
miniprogram/pages/index/index.ts
...@@ -9,6 +9,8 @@ Page({ ...@@ -9,6 +9,8 @@ Page({
onLoad() { onLoad() {
if (app.globalData.token) { if (app.globalData.token) {
this.tokenLoagin(); this.tokenLoagin();
} else {
this.codeLogin();
} }
}, },
data: { data: {
......
miniprogram/pages/index/index.wxml
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
</div> </div>
</view> </view>
<button class="login-btn" bindtap="loginHandle">登录</button> <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> <image class="wx-login-icon" src="../../images/ic_wechat@2x.png"></image>
</view> </view> -->
</view> </view>
</view> </view>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment