Commit 7a69600585637550e40b549540e85fa51081d37c
1 parent
e1f1be3e
优化1
Showing
1 changed file
with
0 additions
and
5 deletions
pages/user/index/index.js
| ... | ... | @@ -561,12 +561,7 @@ Page({ |
| 561 | 561 | onShareAppMessage: function () { |
| 562 | 562 | getApp().globalData.no_clear = 1; |
| 563 | 563 | var url = "/pages/user/index/index"; |
| 564 | -<<<<<<< HEAD | |
| 565 | - | |
| 566 | 564 | var userInfo = getApp().globalData.userInfo; |
| 567 | -======= | |
| 568 | - var userInfo = getApp().globalData.userInfo; | |
| 569 | ->>>>>>> dev_oa_lou1 | |
| 570 | 565 | if (userInfo) { |
| 571 | 566 | url += "?first_leader=" + getApp().globalData.user_id; |
| 572 | 567 | } | ... | ... |