From ce01d1cfbd84f4da0bb6f68767f0fb6f8914e89f Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Wed, 21 Apr 2021 17:29:49 +0800
Subject: [PATCH] 卡项列表 和 服务项目 修改

---
 packageA/pages/my_service/hist_service.js       |  2 +-
 packageA/pages/my_service/i_service.wxml        |  2 +-
 packageA/pages/service_record/service_record.js | 29 +++++++++++++++++++----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/packageA/pages/my_service/hist_service.js b/packageA/pages/my_service/hist_service.js
index a26d14b..724d21f 100644
--- a/packageA/pages/my_service/hist_service.js
+++ b/packageA/pages/my_service/hist_service.js
@@ -120,7 +120,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         storeId: a.stoid,
-        userId: this.data.options.UserId,
+        userId: this.data.options.userid,
         beginDate: startTime,
         endDate: endTime,
         page: th.data.curpage,
diff --git a/packageA/pages/my_service/i_service.wxml b/packageA/pages/my_service/i_service.wxml
index 4d87cb3..81b5351 100644
--- a/packageA/pages/my_service/i_service.wxml
+++ b/packageA/pages/my_service/i_service.wxml
@@ -1,7 +1,7 @@
 <!-- 背景图片 -->
 <view catchtap="close">
   <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image>
-	<navigator class="History fs26" url="/packageA/pages/service_record/service_record" style="left:10px;right:auto;">服务记录</navigator>
+	<navigator class="History fs26" url="/packageA/pages/service_record/service_record" style="left:10px;right:auto;" data-userid="{{options.UserId}}">服务记录</navigator>
 	<navigator class="History fs26" url="/packageA/pages/my_service/hist_service" data-userid="{{options.UserId}}">历史预约</navigator>
 </view>
 
diff --git a/packageA/pages/service_record/service_record.js b/packageA/pages/service_record/service_record.js
index 7d083f1..ada8828 100644
--- a/packageA/pages/service_record/service_record.js
+++ b/packageA/pages/service_record/service_record.js
@@ -14,10 +14,11 @@ Page({
 		endDate: '结束日期',
   },
 	
-  onLoad: function(t) {
+  onLoad: function(options) {
 		_this = this;
 		
 		this.setData({
+			options,
 			currentDate: this.currentDate(),	
 		});
 		
@@ -27,15 +28,23 @@ Page({
   },
 	
   onShow: function() {
-    this.isLogin()
-    .then(function(data) {
-    	reqData.url = '/api/weshop/marketing/servicewrite/page';
-    	reqData.data = {
-    		storeId: app.globalData.setting.stoid,
-    		userId: app.globalData.user_id,
-    	};
-    	_this.getData(true, reqData.url, reqData.data);
-    });
+		reqData.data = {
+			storeId: app.globalData.setting.stoid,
+		};
+		
+		if(this.data.options.userid) {
+			reqData.data.userId = this.data.options.userid;
+			_this.getData(true, reqData.url, reqData.data);
+		} else {
+			reqData.data.userId = app.globalData.user_id;
+			this.isLogin()
+			.then(function(data) {
+				reqData.url = '/api/weshop/marketing/servicewrite/page';
+				
+				_this.getData(true, reqData.url, reqData.data);
+			});
+		};
+    
   },
 
 
--
libgit2 0.21.4