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

WXD-SEASON\season
2 parents 710302b4 33439a11
Showing 1 changed file with 3 additions and 45 deletions
packageC/pages/group_list/group_list.js
@@ -26,29 +26,12 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-<<<<<<< HEAD
 		self = this;
 		   //群id
        if(options && options.groupchat_id){
         getApp().globalData.groupchat_id=options.groupchat_id
       }
-	   self = this;
-	   var first_leader = options.first_leader;
-
-	   if (first_leader) {
-		  getApp().globalData.first_leader = first_leader;
-		  //调用接口判断是不是会员
-		  getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
-			  if (res.data.code == 0) {
-				  getApp().globalData.guide_id = res.data.data.id;
-				  getApp().globalData.guide_pick_id= res.data.data.pickup_id
-			  }
-		  })
-	   }
-=======
-		self = this;
->>>>>>> parent of 0a8ba509... 分享的时候，要取导购的门店的优化
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
@@ -175,7 +158,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-<<<<<<< HEAD
+
    onShareAppMessage: function () {  
       getApp().globalData.no_clear=1;  
       var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
@@ -212,33 +195,8 @@ Page({
       }
     },
-   onShareAppMessage: function () {
-	  getApp().globalData.no_clear=1;
-	  var curPage = this;
-	  var pagePath = curPage.route; //当前页面url
-	  if (pagePath.indexOf('/') != 0) {
-		  pagePath = '/' + pagePath;
-	  }
-	  if (getApp().globalData.user_id) {
-
-		  if (pagePath.indexOf("?") > 0) {
-			  pagePath += "&first_leader=" + getApp().globalData.user_id;
-		  } else {
-			  pagePath += "?first_leader=" + getApp().globalData.user_id;
-		  }
-	  }
-
-	  console.log("11" + pagePath);
-	  return {
-		  title: "团购",
-		  path: pagePath,
-	  }
-
-   },
-
-=======
-   onShareAppMessage: function () {   getApp().globalData.no_clear=1;  },
->>>>>>> parent of 0a8ba509... 分享的时候，要取导购的门店的优化
+
+
 	/**