From 2ac8d1df1407d785780183b241d9beae0f7fabc9 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Thu, 22 Apr 2021 11:34:17 +0800
Subject: [PATCH] 预约服务修改

---
 packageA/pages/my_service/appment_main.js | 41 ++++++++++++++++++++++++++---------------
 packageA/pages/my_service/i_service.wxml  |  2 +-
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js
index ee72b65..d04362b 100644
--- a/packageA/pages/my_service/appment_main.js
+++ b/packageA/pages/my_service/appment_main.js
@@ -563,21 +563,32 @@ Page({
     });
 		
 		// 获取当前默认导购信息及归属门店信息
-		getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', {
-		  data: {
-		    store_id: a.stoid,
-		    guide_id: e.globalData.guide_id,
-				UserCode: th.data.options.usercode,
-		  }
-		}).then(res => {
-		  console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode);
-			if(res.data.data.Tech) {
-				th.setData({
-					store_name: res.data.data.StorageName,
-					beautician_name: res.data.data.StaffName,
-				});
-			}
-		});
+		if(options.firstleader) {
+			getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+a.stoid+"/"+options.firstleader,{}).then(res=>{
+        if(res.data.code==0){
+          getApp().globalData.guide_id=res.data.data.id;
+
+					getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', {
+					  data: {
+					    store_id: a.stoid,
+					    guide_id: e.globalData.guide_id,
+							UserCode: th.data.options.usercode,
+					  }
+					}).then(res => {
+					  console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode);
+						if(res.data.data.Tech) {
+							th.setData({
+								store_name: res.data.data.StorageName,
+								beautician_name: res.data.data.StaffName,
+							});
+						}
+					});
+					
+					
+        };
+			});
+		};
+		
 		
   },
   //查询剩下可预约人数
diff --git a/packageA/pages/my_service/i_service.wxml b/packageA/pages/my_service/i_service.wxml
index 38a6872..0794377 100644
--- a/packageA/pages/my_service/i_service.wxml
+++ b/packageA/pages/my_service/i_service.wxml
@@ -50,7 +50,7 @@
 		  <!-- <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
 		    <view>帮你预约</view>
 		  </view> -->
-		  <view class="flex-level btn" data-url="/packageA/pages/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}&Validay={{item.Validay}}&userid={{options.UserId}}&usercode={{options.UserCode}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
+		  <view class="flex-level btn" data-url="/packageA/pages/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}&Validay={{item.Validay}}&userid={{options.UserId}}&usercode={{options.UserCode}}&firstleader={{options.first_leader}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
 		    <view>帮你预约</view>
 		  </view>
 		</view>
--
libgit2 0.21.4