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

taiyuan
2 parents 6a3c2d96 e4079878
Showing 4 changed files with 87 additions and 7 deletions
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/my_service/appment_main.js
packageA/pages/my_service/tment_details.js
packageA/pages/service_share/service_share.js
@@ -198,6 +198,9 @@ Page({
  
   //------初始化加载----------
   onLoad: function(t) {
+	 
+	console.log("--服务卡项--");  
+	console.log(t);  
  
     var ee = this,
         that = ee,
@@ -150,7 +150,7 @@ Page({
                 "keyword": res.data.data.Address
               }
             ],
-            "page": "/packageA/pages/my_service/tment_details?number=" + number,
+            "page": "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid,
             "storeId": a.stoid,
             "typeId": "1011",
             "userId": th.data.options.userid
@@ -168,7 +168,7 @@ Page({
           })
           setTimeout(function() {
             wx.redirectTo({
-              url: "/packageA/pages/my_service/tment_details?number=" + number
+              url: "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid,
             });
           }, 1000);
         } else {
@@ -579,14 +579,16 @@ Page({
 							UserCode: th.data.options.usercode,
 					  }
 					}).then(res => {
-					  console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode);
+					    console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode);
 						if(res.data.data.Tech) {
-							th.setData({
+							
+							var data={
 								store_name: res.data.data.StorageName,
 								beautician_name: res.data.data.StaffName,
 								beauticianID: res.data.data.StaffId,
 								StorageId: res.data.data.StorageId,
-							});
+							}
+							th.check_firleader(data);							
 						}
 					});
  
@@ -670,4 +672,75 @@ Page({
   //   var nav_b = th.selectComponent("#nav_b"); //组件的id
   //   nav_b.close_box();
   // }
+ 
+  //判断分享的导购是不是有门店，是不是该门店下又该会员 
+  check_firleader(data){
+	  var th=this;
+	  var itemId = this.data.itemId; //服务id
+	  var url = "/api/weshop/marketing/reservation/storage/pagenew";
+	  var key_word = data.store_name;
+	  key_word = key_word.replace(/\s+/g, "");
+	  getApp().request.promiseGet(url, {
+	    data: {
+	  	  userId: th.data.options.userid,  
+	      storeId: os.stoid,
+	      serviceId: itemId,
+	      latitude: th.data.lat,
+	      longitude: th.data.lon,
+	      page: 1,
+	      pageSize: 1000,
+	      keyWord: key_word
+	    }
+	  }).then(res => {
+		    //-- 如果是门店的话 --
+		    if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+				var store_data=null;
+				for(var i in res.data.data.pageData){
+					var it=res.data.data.pageData[i];
+					if(it.Id==data.StorageId){
+						store_data={
+							store_name: data.store_name,
+							StorageId: data.StorageId,
+						};
+						break;
+					}
+				}	
+				if(!store_data) return false;
+				th.setData(store_data)
+											
+			}else{
+				return false;
+			}
+			
+		   //导购接口地址	
+		   var url = "/api/weshop/marketing/reservation/staff/pagenew"; 	
+		   return  getApp().request.promiseGet(url, {
+			    isShowLoading:1,
+				data: {
+				  storeId: os.stoid,
+				  userId: th.data.options.userid,
+				  serviceId: itemId,
+				  storageId: data.StorageId
+				}
+			  })
+	  }).then(res=>{
+		  if (res && res.data && res.data.code == 0) {
+			  var beautician_list=res.data.data;
+			  for(var i in beautician_list){
+				  var item=beautician_list[i];
+				  if(item.staffid==data.beauticianID){
+					  th.setData({
+						 beautician_name:data.beautician_name,
+						 beauticianID:data.beauticianID, 
+					  })
+					  break;
+				  }
+			  }
+			  
+		  }
+	  })
+  }
+  
+  
+  
 })
 \ No newline at end of file
@@ -69,6 +69,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+	  
+	 console.log("预约详情"); 
+	 console.log(options); 
+	  
     var th = this;
     th.setData({
 			options,
@@ -147,7 +147,7 @@ Page({
 	  var title= item.serviceName;		
 	  var img=this.data.url+item.original_img;
  
-	  var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+	  var url="/packageA/pages/goodsInfo/goodsInfo?goods_id=" + item.id;
 	  if(getApp().globalData.user_id){
 	    url+="&first_leader="+getApp().globalData.user_id;
 	  }	  
@@ -837,7 +837,7 @@ Page({
 	 go_goods:function(e){
 		 var index=e.currentTarget.dataset.index;
 		 var item=this.data.list[index];
-		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+		 var url="/packageA/pages/goodsInfo/goodsInfo?goods_id=" + item.id;
 		 getApp().goto(url); 
 	 },