From 8436b89ce33abd3706e03c4e0d538109d155dbad Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Sat, 15 Dec 2018 17:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E4=BA=AB=E8=BF=9B=E5=85=A5=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E5=9C=A8=E9=A6=96=E9=A1=B5=E5=8F=96=E5=80=BC?=
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 22cc6ca..1a81017 100644
--- a/pages/homePage/homePage.js
+++ b/pages/homePage/homePage.js
@@ -19,6 +19,8 @@ Page({
 
   onLoad: function(options) {
     var that = this;
+    //由登录页面进入详情页变更值为0；分享直接进入为1
+    app.globalData.shareInState = 0;
     // 添加接口请求当前余额
     GetUserProfile(function(res) {
       if (res != null) {
@@ -28,7 +30,6 @@ Page({
       }
       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 d4ce37d..9d9bdbb 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -137,8 +137,6 @@ Page({
   // 页面生命周期函数
   onShow: function () {
     var that = this;
-    //由登录页面进入详情页变更值为0；分享直接进入为1
-    app.globalData.shareInState = 0;
     wx.login({
       success: function (res) {
         let code = res.code;