From 2bb7c4b937b15dee7766bb106143d3d10d327e6e Mon Sep 17 00:00:00 2001
From: Aivs <aiva.gh@hotmail.com>
Date: Thu, 21 May 2020 16:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=B8=8D?=
 =?UTF-8?q?=E7=94=A8=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/auth/login/login.js | 33 ++++++++++++++++++++-------------
 pages/goods/goods.js      |  1 -
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pages/auth/login/login.js b/pages/auth/login/login.js
index 8af3d8a..a486184 100644
--- a/pages/auth/login/login.js
+++ b/pages/auth/login/login.js
@@ -43,18 +43,25 @@ Page({
       })
       user.loginByWeixin(e.detail.userInfo).then(res => {
         app.globalData.hasLogin = true;
-        this.setData({
-          hasLogin:true
-        })
-        // if (getCurrentPages().length>1) {
-        //   wx.navigateBack({
-        //     delta: 1
-        //   })
-        // } else {
-        //   wx.reLaunch({
-        //     url: '/pages/ucenter/index/index',
-        //   })
-        // }
+        if(wx.getStorageSync('userInfo').tel){
+          this.setData({
+            phoneshow:true
+          })
+          if (getCurrentPages().length>1) {
+            wx.navigateBack({
+              delta: 1
+            })
+          } else {
+            wx.reLaunch({
+              url: '/pages/ucenter/index/index',
+            })
+          }
+        }else{
+          this.setData({
+            hasLogin:true
+          })
+        }
+        
         wx.hideLoading();
       }).catch((err) => {
         console.log(err)
@@ -68,7 +75,7 @@ Page({
     let that = this;
     if (e.detail.errMsg !== "getPhoneNumber:ok") {
       // 拒绝授权
-      wx.clearStorageSync('token')
+     
       return;
     }
 
diff --git a/pages/goods/goods.js b/pages/goods/goods.js
index 88f7ac7..1da5936 100644
--- a/pages/goods/goods.js
+++ b/pages/goods/goods.js
@@ -474,7 +474,6 @@ Page({
       }
 
       let checkedProduct = checkedProductArray[0];
-      debugger
       if (checkedProduct.number > 0) {
         this.setData({
           checkedSpecPrice: checkedProduct.price,
-- 
2.18.1