From 7a69600585637550e40b549540e85fa51081d37c Mon Sep 17 00:00:00 2001 From: WXD-SEASON\season Date: Tue, 28 Mar 2023 09:43:07 +0800 Subject: [PATCH] 优化1 --- pages/user/index/index.js | 5 ----- 1 file changed, 0 insertions(+), 5 deletions(-) diff --git a/pages/user/index/index.js b/pages/user/index/index.js index da4798e..f5da6b3 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -561,12 +561,7 @@ Page({ onShareAppMessage: function () { getApp().globalData.no_clear = 1; var url = "/pages/user/index/index"; -<<<<<<< HEAD - var userInfo = getApp().globalData.userInfo; -======= - var userInfo = getApp().globalData.userInfo; ->>>>>>> dev_oa_lou1 if (userInfo) { url += "?first_leader=" + getApp().globalData.user_id; } -- libgit2 0.21.4