From d24dbaf6c07a5d32bea3dc36d84f40b0c52cac17 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 12 Mar 2021 09:53:13 +0800
Subject: [PATCH] 快捷登录的修改

---
 pages/togoin/togoin.wxml | 6 ++++--
 pages/togoin/togoin.wxss | 5 ++++-
 utils/auth.js            | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pages/togoin/togoin.wxml b/pages/togoin/togoin.wxml
index 81a94df..f9e3e25 100644
--- a/pages/togoin/togoin.wxml
+++ b/pages/togoin/togoin.wxml
@@ -4,8 +4,10 @@
   <view >
     <view class="logins flex-center2 ali-c flex" style="position: relative;top: 120rpx;">
 	  <image mode="widthFix"  bindtap="go_index" class="login_img_back" src="{{imghots}}/miniapp/images/loginbg.jpg"></image>
-      <image bindtap="go_index" class="login_img" src="{{store_logo}}" binderror="bind_bnerr" lazy-load="true" data-errorimg="store_logo"></image>
-	  <view style="position: absolute; margin-top:140rpx">{{store.store_name}}</view>
+      <view class="middle_view">
+         <image bindtap="go_index" class="login_img" src="{{store_logo}}" binderror="bind_bnerr" lazy-load="true" data-errorimg="store_logo"></image>
+	        <view>{{store.store_name}}</view>
+      </view>
     </view>
   </view>
 
diff --git a/pages/togoin/togoin.wxss b/pages/togoin/togoin.wxss
index 9ee2fba..4563ed4 100644
--- a/pages/togoin/togoin.wxss
+++ b/pages/togoin/togoin.wxss
@@ -14,7 +14,6 @@ page{
   width: 192rpx;
   height: 192rpx;
   border-radius: 50%;
-  position: absolute;
 }
 .phones{
   margin-bottom: 48rpx;
@@ -62,3 +61,7 @@ button{
 .f2 {
 	flex: 2 0;
 }
+
+.middle_view{
+    position: absolute; left: 0; width: 100%; text-align: center;
+}
diff --git a/utils/auth.js b/utils/auth.js
index 5956baa..d29b134 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -213,7 +213,7 @@ module.exports = {
           var userInfo = a.userInfo;
           if (userInfo==undefined){ 
 			   //判断本地是数据是否正确
-			   n.goto("/pages/togoin/togoin");
+			   if(n.globalData.wxapp_buy_obj && n.globalData.wxapp_buy_obj.isbuy==1 && n.globalData.wxapp_buy_obj.isout==0 )  n.goto("/pages/togoin/togoin");
                                                     
             }else{
               a && void 0 != a ? (n.globalData.wechatUser = a, o.login(t, a, e)) : o.goGetUserInfo();
--
libgit2 0.21.4