From 06a92134c01bfe29024db8d5fbd1942302cd852d Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Wed, 21 Apr 2021 16:44:17 +0800
Subject: [PATCH] 协助预约修改

---
 packageA/pages/my_service/appment_main.json |  9 +++++----
 packageA/pages/my_service/appment_main.wxml | 10 ++++------
 packageA/pages/my_service/i_service.js      | 17 ++++++++++-------
 packageA/pages/my_service/i_service.json    |  1 +
 packageA/pages/my_service/i_service.wxml    |  2 +-
 packageA/pages/my_service/my_service.js     |  0
 packageA/pages/my_service/my_service.wxml   |  0
 7 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 packageA/pages/my_service/my_service.js
 delete mode 100644 packageA/pages/my_service/my_service.wxml

diff --git a/packageA/pages/my_service/appment_main.json b/packageA/pages/my_service/appment_main.json
index 104895a..d6e82a4 100644
--- a/packageA/pages/my_service/appment_main.json
+++ b/packageA/pages/my_service/appment_main.json
@@ -1,7 +1,8 @@
 {
   "navigationBarTitleText": "预约服务",
-    "usingComponents": {
-      "warn": "/components/long_warn/long_warn",
-      "nav_b": "/components/nav_b/nav_b"
-    }
+	"enablePullDownRefresh": false,
+	"usingComponents": {
+		"warn": "/components/long_warn/long_warn",
+		"nav_b": "/components/nav_b/nav_b"
+	}
 }
\ No newline at end of file
diff --git a/packageA/pages/my_service/appment_main.wxml b/packageA/pages/my_service/appment_main.wxml
index 788e683..756e539 100644
--- a/packageA/pages/my_service/appment_main.wxml
+++ b/packageA/pages/my_service/appment_main.wxml
@@ -83,14 +83,12 @@
       <view>注：剩余可预约人数{{tment_count}}人</view>
     </view>
 
-    <view class="submitMax flex-space-between fs32">
-      <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list">
+    <view class="submitMax flex-space-center fs32">
+      <!-- <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list">
         <view>我的预约</view>
-      </navigator>
+      </navigator> -->
       <form report-submit='true' bindtap="sub_success">
-        <button form-type="submit" class="sub_appment flex-center">
-          <view>提交预约</view>
-        </button>
+        <button form-type="submit" class="sub_appment flex-center">帮你预约</button>
         </form>
     </view>
   </view>
diff --git a/packageA/pages/my_service/i_service.js b/packageA/pages/my_service/i_service.js
index 20d4b62..00a3e8e 100644
--- a/packageA/pages/my_service/i_service.js
+++ b/packageA/pages/my_service/i_service.js
@@ -29,13 +29,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+		console.log('options==>', options);
     var userinfo = getApp().globalData.userInfo;
     if (userinfo == null) {
       //界面必须使用warn 做ID,并调用
-      return false;
-    }
+      // return false;
+    };
     this.setData({
-      userinfo: userinfo
+      userinfo: userinfo,
+			options,
     });
     var th = this;
     th.query_service();
@@ -48,6 +50,7 @@ Page({
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open_cancel(0);
   },
+	
   onReachBottom: function() {
     var th = this;
     if (this.data.total <= th.data.pageSize) return;
@@ -65,7 +68,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         storeId: a.stoid,
-        userId: d.user_id,
+        userId: th.data.options.UserId,
         page: th.data.curpage,
         pageSize: th.data.pageSize
       }
@@ -113,7 +116,7 @@ Page({
       data: {
         serviceId: service_id,
         storeId: a.stoid,
-        userId: d.user_id
+        userId: th.data.options.UserId,
       }
     }).then(res => {
       wx.hideLoading();
@@ -190,7 +193,7 @@ Page({
         data: {
           serviceId: service_id,
           storeId: a.stoid,
-          userId: d.user_id
+          userId: th.data.options.UserId,
         }
       }).then(res => {
         wx.hideLoading();
@@ -221,7 +224,7 @@ Page({
                     projectId: project_id,
                     serviceId: service_id,
                     storeId: a.stoid,
-                    userId: d.user_id
+                    userId:  th.data.options.UserId,
                   }
                 }).then(res => {
                   if (res.data.code == 0) {
diff --git a/packageA/pages/my_service/i_service.json b/packageA/pages/my_service/i_service.json
index 516d6e0..6d98624 100644
--- a/packageA/pages/my_service/i_service.json
+++ b/packageA/pages/my_service/i_service.json
@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "服务项目",
+	"enablePullDownRefresh": false,
   "usingComponents": {
     "qr_code": "/components/qr_code/qr_code",
     "warn": "/components/long_warn/long_warn",
diff --git a/packageA/pages/my_service/i_service.wxml b/packageA/pages/my_service/i_service.wxml
index 7191905..5aee021 100644
--- a/packageA/pages/my_service/i_service.wxml
+++ b/packageA/pages/my_service/i_service.wxml
@@ -2,7 +2,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="/pages/user/my_service/hist_service">历史预约</navigator>
+	<navigator class="History fs26" url="/packageA/pages/my_service/hist_service">历史预约</navigator>
 </view>
 
 <!-- 预约内容 -->
diff --git a/packageA/pages/my_service/my_service.js b/packageA/pages/my_service/my_service.js
deleted file mode 100644
index e69de29..0000000
--- a/packageA/pages/my_service/my_service.js
+++ /dev/null
diff --git a/packageA/pages/my_service/my_service.wxml b/packageA/pages/my_service/my_service.wxml
deleted file mode 100644
index e69de29..0000000
--- a/packageA/pages/my_service/my_service.wxml
+++ /dev/null
--
libgit2 0.21.4