wxd / MShopWeApp

Commit 7a612a5b8a368e352d422ef5386789fb6fccc2cd

Authored by season
2 parents 6b25abbe 08b65a4a

Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

Inline Side-by-side
Showing 1 changed file with 3 additions and 45 deletions
packageC/pages/group_list/group_list.js
  View file @7a612a5
... ... @@ -26,29 +26,12 @@ Page({
26 26 * 生命周期函数--监听页面加载
27 27 */
28 28 onLoad: function (options) {
29   -<<<<<<< HEAD
30 29  
31 30 self = this;
32 31 //群id
33 32 if(options && options.groupchat_id){
34 33 getApp().globalData.groupchat_id=options.groupchat_id
35 34 }
36   - self = this;
37   - var first_leader = options.first_leader;
38   -
39   - if (first_leader) {
40   - getApp().globalData.first_leader = first_leader;
41   - //调用接口判断是不是会员
42   - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
43   - if (res.data.code == 0) {
44   - getApp().globalData.guide_id = res.data.data.id;
45   - getApp().globalData.guide_pick_id= res.data.data.pickup_id
46   - }
47   - })
48   - }
49   -=======
50   - self = this;
51   ->>>>>>> parent of 0a8ba509... 分享的时候，要取导购的门店的优化
52 35  
53 36 app.isLogin().then(function(data) {//进入页面前已经授权登录成功
54 37 self.setData({
... ... @@ -175,7 +158,7 @@ Page({
175 158 /**
176 159 * 用户点击右上角分享
177 160 */
178   -<<<<<<< HEAD
  161 +
179 162 onShareAppMessage: function () {
180 163 getApp().globalData.no_clear=1;
181 164 var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
... ... @@ -212,33 +195,8 @@ Page({
212 195 }
213 196 },
214 197  
215   - onShareAppMessage: function () {
216   - getApp().globalData.no_clear=1;
217   - var curPage = this;
218   - var pagePath = curPage.route; //当前页面url
219   - if (pagePath.indexOf('/') != 0) {
220   - pagePath = '/' + pagePath;
221   - }
222   - if (getApp().globalData.user_id) {
223   -
224   - if (pagePath.indexOf("?") > 0) {
225   - pagePath += "&first_leader=" + getApp().globalData.user_id;
226   - } else {
227   - pagePath += "?first_leader=" + getApp().globalData.user_id;
228   - }
229   - }
230   -
231   - console.log("11" + pagePath);
232   - return {
233   - title: "团购",
234   - path: pagePath,
235   - }
236   -
237   - },
238   -
239   -=======
240   - onShareAppMessage: function () { getApp().globalData.no_clear=1; },
241   ->>>>>>> parent of 0a8ba509... 分享的时候，要取导购的门店的优化
  198 +
  199 +
242 200  
243 201  
244 202 /**
... ...