From 684059d1972f07c48334c4878beec79b37b375f3 Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Sat, 15 Dec 2018 17:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=BF=9B=E5=85=A5=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/homePage/homePage.js | 3 ++-
 pages/login/login.js       | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pages/homePage/homePage.js b/pages/homePage/homePage.js
index 5c2be6f..ce321fc 100644
--- a/pages/homePage/homePage.js
+++ b/pages/homePage/homePage.js
@@ -25,10 +25,11 @@ Page({
   },
 
   onLoad: function (options) {
+    // 进入过首页 可以由分享进入页面
+    app.globalData.shareInState = 0;
     GetUserProfile(function (res) {
       var shareURL = app.globalData.shareInPath;
       if (shareURL) {
-        app.globalData.shareInState = 0,
           wx.navigateTo({
             url: "../../" + shareURL,
             complete: function (res) {
diff --git a/pages/login/login.js b/pages/login/login.js
index ed4fd8d..c71d2d0 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -121,8 +121,6 @@ Page({
   // 页面生命周期函数
   onShow: function() {
     var that = this;
-    //由登录页面进入详情页变更值为0；分享直接进入为1
-    app.globalData.shareInState = 0;
     wx.login({
       success: function(res) {
         let code = res.code;