From 8901f59d59eb58924d46fedc568218ccf8bd57ec Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Thu, 22 Apr 2021 16:29:01 +0800
Subject: [PATCH] 协助预约stoid取a.stoid

---
 packageA/pages/my_service/appment_main.js       | 18 +++++++++---------
 packageA/pages/my_service/beauty_deta.js        | 10 +++++-----
 packageA/pages/my_service/cosmetology_list.js   |  2 +-
 packageA/pages/my_service/cosmetology_list.wxml |  2 +-
 packageA/pages/my_service/hist_service.js       |  2 +-
 packageA/pages/my_service/i_service.js          | 12 ++++++------
 packageA/pages/my_service/i_service.wxml        |  6 +++---
 packageA/pages/my_service/tment_details.js      |  4 ++--
 packageA/pages/my_service/tment_details.wxml    |  8 ++++----
 packageA/pages/my_service/tment_eval.js         | 10 +++++-----
 packageA/pages/my_service/tment_order_list.js   |  4 ++--
 packageA/pages/my_service/tment_order_list.wxml | 10 +++++-----
 packageA/pages/service_record/service_record.js |  2 +-
 13 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js
index 0163b05..99122fb 100644
--- a/packageA/pages/my_service/appment_main.js
+++ b/packageA/pages/my_service/appment_main.js
@@ -94,7 +94,7 @@ Page({
     var serviceId = th.data.itemId; //服务id
     var beauticianID = th.data.beauticianID; //美容师id
     var buyType = th.data.buyType; //服务项目类型
-    var storeId = th.data.options.storeid; //商家id
+    var storeId = a.stoid; //商家id
     var storageId = th.data.storageId; //门店id
     var userId = th.data.options.userid; //用户id
     var remarks = th.data.remarks; //用户备注
@@ -151,7 +151,7 @@ Page({
               }
             ],
             "page": "/pages/user/my_service/tment_details?number=" + number,
-            "storeId": th.data.options.storeid,
+            "storeId": a.stoid,
             "typeId": "1011",
             "userId": th.data.options.userid
           };
@@ -241,7 +241,7 @@ Page({
         //获取模版id
         getApp().request.promiseGet(temp_url, {
           data: {
-            store_id: th.data.options.storeid,
+            store_id: a.stoid,
             typeid: "1011"
           }
         }).then(res => {
@@ -374,7 +374,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
 				userId: th.data.options.userid,  
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         serviceId: itemId,
         latitude: th.data.lat,
         longitude: th.data.lon,
@@ -428,7 +428,7 @@ Page({
       
 	  getApp().request.promiseGet(url, {
         data: {
-          storeId: th.data.options.storeid,
+          storeId: a.stoid,
           userId: th.data.options.userid,
           serviceId: itemid,
           storageId: storageId
@@ -520,7 +520,7 @@ Page({
 			console.log('optionsxxx===>', this.data.options);
 			// console.log('1-->', "/pages/user/my_service/cosmetology_list?userid=" + th.data.options.userid + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id);
       wx.navigateTo({
-        url: "/packageA/pages/my_service/cosmetology_list?storeid=" + this.data.options.storeid + '&userid=' + this.data.options.userid + '&storageId=' + storageId + '&itemId=' + itemId + "&projectId=" + project_id
+        url: "/packageA/pages/my_service/cosmetology_list?userid=" + this.data.options.userid + '&storageId=' + storageId + '&itemId=' + itemId + "&projectId=" + project_id
       });
 
     }
@@ -574,7 +574,7 @@ Page({
 
 					getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', {
 					  data: {
-					    store_id: th.data.options.storeid,
+					    store_id: a.stoid,
 					    guide_id: e.globalData.guide_id,
 							UserCode: th.data.options.usercode,
 					  }
@@ -603,7 +603,7 @@ Page({
     var projectID = th.data.itemId; //服务id
     var seekTime = th.data.time; //预约日期
     var storageId = th.data.storageId; //门店id
-    var storeId = th.data.options.storeid; //商家id
+    var storeId = a.stoid; //商家id
     getApp().request.promiseGet(url, {
       data: {
         beauticianId: beauticianID,
@@ -647,7 +647,7 @@ Page({
     var project_id = th.data.project_id; //服务项目id
     getApp().request.promiseGet(url, {
       data: {
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         userId: th.data.options.userid,
         projectId: project_id
       }
diff --git a/packageA/pages/my_service/beauty_deta.js b/packageA/pages/my_service/beauty_deta.js
index 020d9de..16359e8 100644
--- a/packageA/pages/my_service/beauty_deta.js
+++ b/packageA/pages/my_service/beauty_deta.js
@@ -124,7 +124,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         beauticianId: beautician_id,
-        storeId: th.data.storeid,
+        storeId: a.stoid,
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -164,7 +164,7 @@ Page({
         "number": th.data.number,
         "remark": "更改时间",
         "states": 0,
-        "storeId": th.data.storeid,
+        "storeId": a.stoid,
       };
       var data = JSON.stringify(json);
       var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
@@ -246,7 +246,7 @@ Page({
         projectId: projectId,
         beauticianId: beautician_id,
         serviceId: itemId,
-        storeId: th.data.storeid,
+        storeId: a.stoid,
 				storageId:storageId
       }
     }).then(res => {
@@ -302,7 +302,7 @@ Page({
 		storageId:th.data.storageId,
         serviceId: th.data.itemId,
         seekTime: SeekTime,
-        storeId: th.data.storeid,
+        storeId: a.stoid,
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -365,7 +365,7 @@ Page({
       "number": number,
       "remark": "更改预约时间",
       "states": 0,
-      "storeId": th.data.storeid,
+      "storeId": a.stoid,
     };
     var data = JSON.stringify(json);
     var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
diff --git a/packageA/pages/my_service/cosmetology_list.js b/packageA/pages/my_service/cosmetology_list.js
index 3329fb7..1e6c4fb 100644
--- a/packageA/pages/my_service/cosmetology_list.js
+++ b/packageA/pages/my_service/cosmetology_list.js
@@ -42,7 +42,7 @@ Page({
     var storageId = th.data.storageId;
     getApp().request.promiseGet(url, {
       data: {
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         userId: th.data.options.userid,
         serviceId: itemId,
         storageId: storageId,
diff --git a/packageA/pages/my_service/cosmetology_list.wxml b/packageA/pages/my_service/cosmetology_list.wxml
index 9904ae3..00a22ca 100644
--- a/packageA/pages/my_service/cosmetology_list.wxml
+++ b/packageA/pages/my_service/cosmetology_list.wxml
@@ -27,7 +27,7 @@
         </view>
 
         <!-- 预约状态 -->
-        <navigator class="flex-center gofu go" url="/packageA/pages/my_service/beauty_deta?storeid={{options.storeid}}&StorageId={{item.StorageId}}&BeauticianID={{item.staffid}}&itemId={{itemId}}&iscos=1&modify=0&projectId={{projectId}}&StaffName={{item.StaffName}}">
+        <navigator class="flex-center gofu go" url="/packageA/pages/my_service/beauty_deta?StorageId={{item.StorageId}}&BeauticianID={{item.staffid}}&itemId={{itemId}}&iscos=1&modify=0&projectId={{projectId}}&StaffName={{item.StaffName}}">
           <view class="fs24">预约</view>
         </navigator>
       </view>
diff --git a/packageA/pages/my_service/hist_service.js b/packageA/pages/my_service/hist_service.js
index 32411ff..8bad05a 100644
--- a/packageA/pages/my_service/hist_service.js
+++ b/packageA/pages/my_service/hist_service.js
@@ -119,7 +119,7 @@ Page({
     var url = "/api/weshop/marketing/reservation/history/reservation/page";
     getApp().request.promiseGet(url, {
       data: {
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         userId: th.data.options.userid,
         beginDate: startTime,
         endDate: endTime,
diff --git a/packageA/pages/my_service/i_service.js b/packageA/pages/my_service/i_service.js
index fa3b060..e820f39 100644
--- a/packageA/pages/my_service/i_service.js
+++ b/packageA/pages/my_service/i_service.js
@@ -70,7 +70,7 @@ Page({
     var url = "/api/weshop/marketing/reservation/sm/page?State=1";
     getApp().request.promiseGet(url, {
       data: {
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         userId: th.data.options.UserId,
         page: th.data.curpage,
         pageSize: th.data.pageSize
@@ -118,7 +118,7 @@ Page({
     getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
       data: {
         serviceId: service_id,
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         userId: th.data.options.UserId,
       }
     }).then(res => {
@@ -135,7 +135,7 @@ Page({
           "继续使用",
           function() {
             my_confirm.open_cancel(0);
-            var deta_url = "/packageA/pages/my_service/tment_details?userid="+ th.data.options.UserId + "&number=" + res.data.data.Number + "&storeid=" + th.data.options.storeid;
+            var deta_url = "/packageA/pages/my_service/tment_details?userid="+ th.data.options.UserId + "&number=" + res.data.data.Number;
             wx.navigateTo({
               url: deta_url
             })
@@ -195,7 +195,7 @@ Page({
       getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
         data: {
           serviceId: service_id,
-          storeId: th.data.options.storeid,
+          storeId: a.stoid,
           userId: th.data.options.UserId,
         }
       }).then(res => {
@@ -215,7 +215,7 @@ Page({
                "继续预约",
               function() {
                 my_confirm.open_cancel(0);
-                var deta_url = "/packageA/pages/my_service/tment_details?number=" + number + "&userid="+ th.data.options.UserId + "&storeid=" + th.data.options.storeid;
+                var deta_url = "/packageA/pages/my_service/tment_details?number=" + number + "&userid="+ th.data.options.UserId;
                 wx.navigateTo({
                   url: deta_url
                 })
@@ -226,7 +226,7 @@ Page({
                   data: {
                     projectId: project_id,
                     serviceId: service_id,
-                    storeId: th.data.options.storeid,
+                    storeId: a.stoid,
                     userId:  th.data.options.UserId,
                   }
                 }).then(res => {
diff --git a/packageA/pages/my_service/i_service.wxml b/packageA/pages/my_service/i_service.wxml
index 3fec6e8..0794377 100644
--- a/packageA/pages/my_service/i_service.wxml
+++ b/packageA/pages/my_service/i_service.wxml
@@ -1,8 +1,8 @@
 <!-- 背景图片 -->
 <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?userid={{options.UserId}}&storeid={{options.storeid}}" style="left:10px;right:auto;">服务记录</navigator>
-	<navigator class="History fs26" url="/packageA/pages/my_service/hist_service?userid={{options.UserId}}&storeid={{options.storeid}}">历史预约</navigator>
+	<navigator class="History fs26" url="/packageA/pages/service_record/service_record?userid={{options.UserId}}" style="left:10px;right:auto;">服务记录</navigator>
+	<navigator class="History fs26" url="/packageA/pages/my_service/hist_service?userid={{options.UserId}}">历史预约</navigator>
 </view>
 
 <!-- 预约内容 -->
@@ -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}}&firstleader={{options.first_leader}}&storeid={{options.storeid}}" 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>
diff --git a/packageA/pages/my_service/tment_details.js b/packageA/pages/my_service/tment_details.js
index 808bd09..441aa7b 100644
--- a/packageA/pages/my_service/tment_details.js
+++ b/packageA/pages/my_service/tment_details.js
@@ -35,7 +35,7 @@ Page({
         var number = th.data.number;
         var json = {
           "number": number,
-          "storeId": th.data.options.storeid,
+          "storeId": a.stoid,
           "states": states
         };
         var data = JSON.stringify(json);
@@ -82,7 +82,7 @@ Page({
     var url = "/api/weshop/marketing/reservation/reservation/page";
     getApp().request.promiseGet(url, {
       data: {
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         userId: th.data.options.userid,
         number: number
       }
diff --git a/packageA/pages/my_service/tment_details.wxml b/packageA/pages/my_service/tment_details.wxml
index 271c6dd..6a4baec 100644
--- a/packageA/pages/my_service/tment_details.wxml
+++ b/packageA/pages/my_service/tment_details.wxml
@@ -97,20 +97,20 @@
     <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}" bindtap="cancel_tment">
       <view class="yellow-b" data-index="{{index}}">取消预约</view>
     </view>
-    <navigator wx:if="{{item.State>0}}" class="sub flex-center yellow-b" url="/packageA/pages/my_service/tment_order_list?userid={{options.userid}}&storeid={{options.storeid}}">
+    <navigator wx:if="{{item.State>0}}" class="sub flex-center yellow-b" url="/packageA/pages/my_service/tment_order_list?userid={{options.userid}}">
       <view class="yellow-b">我的服务</view>
     </navigator>
     <!-- 右边栏 -->
     <navigator wx:if="{{item.State==0}}" class="sub rb flex-center" url="/packageA/pages/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">
       <view>更改时间</view>
     </navigator>
-    <navigator wx:if="{{item.State==1}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}">
+    <navigator wx:if="{{item.State==1}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}&userid={{options.userid}}">
       <view>发表评价</view>
     </navigator>
-    <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}">
+    <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}&userid={{options.userid}}">
       <view>查看评价</view>
     </navigator>
-    <navigator wx:if="{{item.State==2 || item.State==3}}" class="sub rb flex-center" url="/packageA/pages/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}&userid={{options.userid}}&storeid={{options.storeid}}">
+    <navigator wx:if="{{item.State==2 || item.State==3}}" class="sub rb flex-center" url="/packageA/pages/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}&userid={{options.userid}}">
       <view>重新预约</view>
     </navigator>
 
diff --git a/packageA/pages/my_service/tment_eval.js b/packageA/pages/my_service/tment_eval.js
index 71b218a..35595f5 100644
--- a/packageA/pages/my_service/tment_eval.js
+++ b/packageA/pages/my_service/tment_eval.js
@@ -40,7 +40,7 @@ Page({
         getApp().request.promiseGet(url, {
           data: {
             Star: index + 1,
-            storeId: th.data.options.storeid,
+            storeId: a.stoid,
           }
         }).then(res => {
           if (res.data.code == 0) {
@@ -102,7 +102,7 @@ Page({
     var number = th.data.number; //订单编号
     getApp().request.promiseGet(url, {
       data: {
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         userId: th.data.options.userid,
         number: number
       }
@@ -126,7 +126,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         number: th.data.number,
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -175,7 +175,7 @@ Page({
       "number": posNo,
       "remark": proposal,
       "star": stars + 1,
-      "storeId": th.data.options.storeid,
+      "storeId": a.stoid,
     };
     var data = JSON.stringify(json); //转换成json格式
     wx.request({
@@ -265,7 +265,7 @@ Page({
       data: {
         orderNumber: th.data.number,
         orderType: 2,
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         userId: th.data.options.userid,
       }
     }).then(res => {
diff --git a/packageA/pages/my_service/tment_order_list.js b/packageA/pages/my_service/tment_order_list.js
index a509524..7e0b0a7 100644
--- a/packageA/pages/my_service/tment_order_list.js
+++ b/packageA/pages/my_service/tment_order_list.js
@@ -95,7 +95,7 @@ Page({
     })
     getApp().request.promiseGet(url, {
       data: {
-        storeId: th.data.options.storeid,
+        storeId: a.stoid,
         userId: th.data.options.userid,
         state: state_index,
         page: th.data.curpage,
@@ -149,7 +149,7 @@ Page({
         var number = order_list[index].Number;
         var json = {
           "number": number,
-          "storeId": th.data.options.storeid,
+          "storeId": a.stoid,
           "states": 3
         };
         var data = JSON.stringify(json);
diff --git a/packageA/pages/my_service/tment_order_list.wxml b/packageA/pages/my_service/tment_order_list.wxml
index 221c18d..c3d41aa 100644
--- a/packageA/pages/my_service/tment_order_list.wxml
+++ b/packageA/pages/my_service/tment_order_list.wxml
@@ -68,12 +68,12 @@
           <view class="Unimportance flex-level" data-index="{{index}}" bindtap="cancel_tment">取消预约</view>
         </block>
         <block wx:else>
-          <navigator url="/packageA/pages/my_service/tment_details?number={{item.Number}}&userid={{options.userid}}&storeid={{options.storeid}}" class="Unimportance flex-level">查看详情</navigator>
+          <navigator url="/packageA/pages/my_service/tment_details?number={{item.Number}}&userid={{options.userid}}" class="Unimportance flex-level">查看详情</navigator>
         </block>
-        <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/packageA/pages/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}&userid={{options.userid}}&storeid={{options.storeid}}">更改时间</navigator>
-        <navigator wx:if="{{item.State==1}}" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}&userid={{options.userid}}&storeid={{options.storeid}}" class="important Unimportance flex-level">发表评价</navigator>
-        <navigator wx:if="{{item.State==2 || item.State==3}}" url="/packageA/pages/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}&userid={{options.userid}}&storeid={{options.storeid}}" class="important Unimportance flex-level">重新预约</navigator>
-        <navigator wx:if="{{item.State==4}}" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}&userid={{options.userid}}&storeid={{options.storeid}}" class="important Unimportance flex-level">评价详情</navigator>
+        <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/packageA/pages/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}&userid={{options.userid}}">更改时间</navigator>
+        <navigator wx:if="{{item.State==1}}" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}&userid={{options.userid}}" class="important Unimportance flex-level">发表评价</navigator>
+        <navigator wx:if="{{item.State==2 || item.State==3}}" url="/packageA/pages/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}&userid={{options.userid}}" class="important Unimportance flex-level">重新预约</navigator>
+        <navigator wx:if="{{item.State==4}}" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}&userid={{options.userid}}" class="important Unimportance flex-level">评价详情</navigator>
       </view>
     </view>
     <view class="exactly flex-center fs26" wx:if="{{ismore && tm_order_list.length>=3}}">
diff --git a/packageA/pages/service_record/service_record.js b/packageA/pages/service_record/service_record.js
index e003aa1..8660dc8 100644
--- a/packageA/pages/service_record/service_record.js
+++ b/packageA/pages/service_record/service_record.js
@@ -30,7 +30,7 @@ Page({
   onShow: function() {
 		reqData.url = '/api/weshop/marketing/servicewrite/page';
 		reqData.data = {
-			storeId: this.data.options.storeid || app.globalData.setting.stoid,
+			storeId: app.globalData.setting.stoid,
 		};
 		
 		if(this.data.options.userid) {
--
libgit2 0.21.4