修改协助预约

taiyuan
1 parent 2ac8d1df
Showing 14 changed files with 85 additions and 61 deletions
packageA/pages/my_service/appment_main.js
packageA/pages/my_service/appment_main.wxml
packageA/pages/my_service/beauty_deta.js
packageA/pages/my_service/cosmetology_list.js
packageA/pages/my_service/cosmetology_list.wxml
packageA/pages/my_service/hist_service.js
packageA/pages/my_service/i_service.js
packageA/pages/my_service/i_service.wxml
packageA/pages/my_service/tment_details.js
packageA/pages/my_service/tment_details.wxml
packageA/pages/my_service/tment_eval.js
packageA/pages/my_service/tment_order_list.js
packageA/pages/my_service/tment_order_list.wxml
packageA/pages/service_record/service_record.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 = a.stoid; //商家id
+    var storeId = th.data.options.storeid; //商家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": a.stoid,
+            "storeId": th.data.options.storeid,
             "typeId": "1011",
             "userId": th.data.options.userid
           };
@@ -241,7 +241,7 @@ Page({
         //获取模版id
         getApp().request.promiseGet(temp_url, {
           data: {
-            store_id: a.stoid,
+            store_id: th.data.options.storeid,
             typeid: "1011"
           }
         }).then(res => {
@@ -374,7 +374,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
 				userId: th.data.options.userid,  
-        storeId: a.stoid,
+        storeId: th.data.options.storeid,
         serviceId: itemId,
         latitude: th.data.lat,
         longitude: th.data.lon,
@@ -413,7 +413,8 @@ Page({
     var th = this;
     th.setData({
       is_textea: 0
-    })
+    });
+		
     if (th.data.store_name == "") {
       getApp().my_warnning("请选择服务门店", 0, th);
       th.settime();
@@ -427,7 +428,7 @@ Page({
 	  getApp().request.promiseGet(url, {
         data: {
-          storeId: a.stoid,
+          storeId: th.data.options.storeid,
           userId: th.data.options.userid,
           serviceId: itemid,
           storageId: storageId
@@ -459,6 +460,7 @@ Page({
       })
     }
   },
+	
   choice_beautician: function(e) {
     var th = this;
     var bea_index = e.currentTarget.dataset.baaindex;
@@ -515,8 +517,10 @@ Page({
       th.setData({
         is_textea: 1
       })
+			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: "/pages/user/my_service/cosmetology_list?" + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id
+        url: "/packageA/pages/my_service/cosmetology_list?storeid=" + this.data.options.storeid + '&userid=' + this.data.options.userid + '&storageId=' + storageId + '&itemId=' + itemId + "&projectId=" + project_id
       });
     }
@@ -570,7 +574,7 @@ Page({
 					getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', {
 					  data: {
-					    store_id: a.stoid,
+					    store_id: th.data.options.storeid,
 					    guide_id: e.globalData.guide_id,
 							UserCode: th.data.options.usercode,
 					  }
@@ -599,7 +603,7 @@ Page({
     var projectID = th.data.itemId; //服务id
     var seekTime = th.data.time; //预约日期
     var storageId = th.data.storageId; //门店id
-    var storeId = a.stoid; //商家id
+    var storeId = th.data.options.storeid; //商家id
     getApp().request.promiseGet(url, {
       data: {
         beauticianId: beauticianID,
@@ -643,7 +647,7 @@ Page({
     var project_id = th.data.project_id; //服务项目id
     getApp().request.promiseGet(url, {
       data: {
-        storeId: a.stoid,
+        storeId: th.data.options.storeid,
         userId: th.data.options.userid,
         projectId: project_id
       }
@@ -659,9 +663,9 @@ Page({
     })
   },
   //关闭导航
-  close: function() {
-    var th = this;
-    var nav_b = th.selectComponent("#nav_b"); //组件的id
-    nav_b.close_box();
-  }
+  // close: function() {
+  //   var th = this;
+  //   var nav_b = th.selectComponent("#nav_b"); //组件的id
+  //   nav_b.close_box();
+  // }
 })
 \ No newline at end of file
@@ -147,4 +147,4 @@
 <view wx:if="{{store}}" class="disgraceful" bindtap="onclickstore"></view>
 <warn id="warn"></warn>
 <!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
 \ No newline at end of file
+<!-- <nav_b id="nav_b"></nav_b> -->
 \ No newline at end of file
@@ -46,6 +46,8 @@ Page({
     th.setData({
+			options,
+			storeid: options.storeid,
       beautician_id: beautician_id,
       itemId: options.itemId,
       modify: options.modify,
@@ -122,7 +124,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         beauticianId: beautician_id,
-        storeId: a.stoid,
+        storeId: th.data.storeid,
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -162,7 +164,7 @@ Page({
         "number": th.data.number,
         "remark": "更改时间",
         "states": 0,
-        "storeId": a.stoid
+        "storeId": th.data.storeid,
       };
       var data = JSON.stringify(json);
       var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
@@ -244,8 +246,8 @@ Page({
         projectId: projectId,
         beauticianId: beautician_id,
         serviceId: itemId,
-        storeId: a.stoid,
-		storageId:storageId
+        storeId: th.data.storeid,
+				storageId:storageId
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -300,7 +302,7 @@ Page({
 		storageId:th.data.storageId,
         serviceId: th.data.itemId,
         seekTime: SeekTime,
-        storeId: a.stoid,
+        storeId: th.data.storeid,
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -363,7 +365,7 @@ Page({
       "number": number,
       "remark": "更改预约时间",
       "states": 0,
-      "storeId": a.stoid
+      "storeId": th.data.storeid,
     };
     var data = JSON.stringify(json);
     var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
@@ -3,6 +3,8 @@ var e = getApp(),
   os = a,
   t = e.request,
   d = e.globalData;
+	
+	
 Page({
   /**
@@ -21,6 +23,7 @@ Page({
     storageId: 0, //线下门店id
     projectId:"",//项目id
   },
+	
   onReachBottom: function() {
     var th = this;
     if (this.data.total <= th.data.pageSize) return;
@@ -30,6 +33,8 @@ Page({
     })
     th.query_cology();
   },
+	
+	
   query_cology: function() {
     var th = this;
     var url = "/api/weshop/marketing/reservation/staff/pagenew";
@@ -37,8 +42,8 @@ Page({
     var storageId = th.data.storageId;
     getApp().request.promiseGet(url, {
       data: {
-        storeId: a.stoid,
-        userId: d.user_id,
+        storeId: th.data.options.storeid,
+        userId: th.data.options.userid,
         serviceId: itemId,
         storageId: storageId,
         page: th.data.curpage,
@@ -67,6 +72,8 @@ Page({
       }
     })
   },
+	
+	
   //图片失败，默认图片
   bind_bnerr1: function(e) {
     var _errImg = e.target.dataset.errorimg;
@@ -78,12 +85,17 @@ Page({
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
     }
   },
+	
+	
+	
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+		console.log('options--->', options);
     var th = this;
-    th.setData({
+    this.setData({
+			options,
       projectId: options.projectId,
       itemId: options.itemId,
       storageId: options.storageId
@@ -105,4 +117,5 @@ Page({
     th.query_cology();
   },
+
 })
 \ No newline at end of file
@@ -27,7 +27,7 @@
         </view>
         <!-- 预约状态 -->
-        <navigator class="flex-center gofu go" url="/pages/user/my_service/beauty_deta?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?storeid={{options.storeid}}&StorageId={{item.StorageId}}&BeauticianID={{item.staffid}}&itemId={{itemId}}&iscos=1&modify=0&projectId={{projectId}}&StaffName={{item.StaffName}}">
           <view class="fs24">预约</view>
         </navigator>
       </view>
@@ -69,7 +69,7 @@ Page({
    */
   onLoad: function(options) {
     var th = this;
-		// console.log('xxoptions==>', options);
+		console.log('xxoptions==>', options);
 		this.setData({
 			options,
 		});
@@ -119,7 +119,7 @@ Page({
     var url = "/api/weshop/marketing/reservation/history/reservation/page";
     getApp().request.promiseGet(url, {
       data: {
-        storeId: a.stoid,
+        storeId: th.data.options.storeid,
         userId: th.data.options.userid,
         beginDate: startTime,
         endDate: endTime,
@@ -70,7 +70,7 @@ Page({
     var url = "/api/weshop/marketing/reservation/sm/page?State=1";
     getApp().request.promiseGet(url, {
       data: {
-        storeId: a.stoid,
+        storeId: th.data.options.storeid,
         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: a.stoid,
+        storeId: th.data.options.storeid,
         userId: th.data.options.UserId,
       }
     }).then(res => {
@@ -135,7 +135,7 @@ Page({
           "继续使用",
           function() {
             my_confirm.open_cancel(0);
-            var deta_url = "/pages/user/my_service/tment_details?number=" + res.data.data.Number;
+            var deta_url = "/packageA/pages/my_service/tment_details?userid="+ th.data.options.UserId + "&number=" + res.data.data.Number + "&storeid=" + th.data.options.storeid;
             wx.navigateTo({
               url: deta_url
             })
@@ -195,7 +195,7 @@ Page({
       getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
         data: {
           serviceId: service_id,
-          storeId: a.stoid,
+          storeId: th.data.options.storeid,
           userId: th.data.options.UserId,
         }
       }).then(res => {
@@ -215,7 +215,7 @@ Page({
                "继续预约",
               function() {
                 my_confirm.open_cancel(0);
-                var deta_url = "/pages/user/my_service/tment_details?number=" + number;
+                var deta_url = "/packageA/pages/my_service/tment_details?number=" + number + "&userid="+ th.data.options.UserId + "&storeid=" + th.data.options.storeid;
                 wx.navigateTo({
                   url: deta_url
                 })
@@ -226,7 +226,7 @@ Page({
                   data: {
                     projectId: project_id,
                     serviceId: service_id,
-                    storeId: a.stoid,
+                    storeId: th.data.options.storeid,
                     userId:  th.data.options.UserId,
                   }
                 }).then(res => {
 <!-- 背景图片 -->
 <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}}" style="left:10px;right:auto;">服务记录</navigator>
-	<navigator class="History fs26" url="/packageA/pages/my_service/hist_service?userid={{options.UserId}}">历史预约</navigator>
+	<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>
 </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}}" 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}}&storeid={{options.storeid}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
 		    <view>帮你预约</view>
 		  </view>
 		</view>
@@ -35,7 +35,7 @@ Page({
         var number = th.data.number;
         var json = {
           "number": number,
-          "storeId": a.stoid,
+          "storeId": th.data.options.storeid,
           "states": states
         };
         var data = JSON.stringify(json);
@@ -71,6 +71,7 @@ Page({
   onLoad: function(options) {
     var th = this;
     th.setData({
+			options,
       number: options.number
     })
   },
@@ -81,8 +82,8 @@ Page({
     var url = "/api/weshop/marketing/reservation/reservation/page";
     getApp().request.promiseGet(url, {
       data: {
-        storeId: a.stoid,
-        userId: d.user_id,
+        storeId: th.data.options.storeid,
+        userId: th.data.options.userid,
         number: number
       }
     }).then(res => {
@@ -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="/pages/user/my_service/tment_order_list">
+    <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}}">
       <view class="yellow-b">我的服务</view>
     </navigator>
     <!-- 右边栏 -->
-    <navigator wx:if="{{item.State==0}}" class="sub rb flex-center" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">
+    <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="/pages/user/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}}">
       <view>发表评价</view>
     </navigator>
-    <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/pages/user/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}}">
       <view>查看评价</view>
     </navigator>
-    <navigator wx:if="{{item.State==2 || item.State==3}}" class="sub rb flex-center" url="/pages/user/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}">
+    <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}}">
       <view>重新预约</view>
     </navigator>
@@ -40,7 +40,7 @@ Page({
         getApp().request.promiseGet(url, {
           data: {
             Star: index + 1,
-            storeId: a.stoid
+            storeId: th.data.options.storeid,
           }
         }).then(res => {
           if (res.data.code == 0) {
@@ -102,8 +102,8 @@ Page({
     var number = th.data.number; //订单编号
     getApp().request.promiseGet(url, {
       data: {
-        storeId: a.stoid,
-        userId: d.user_id,
+        storeId: th.data.options.storeid,
+        userId: th.data.options.userid,
         number: number
       }
     }).then(res => {
@@ -126,7 +126,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         number: th.data.number,
-        storeId: a.stoid
+        storeId: th.data.options.storeid,
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -175,7 +175,7 @@ Page({
       "number": posNo,
       "remark": proposal,
       "star": stars + 1,
-      "storeId": a.stoid
+      "storeId": th.data.options.storeid,
     };
     var data = JSON.stringify(json); //转换成json格式
     wx.request({
@@ -220,6 +220,7 @@ Page({
   onLoad: function(options) {
     var th = this;
     th.setData({
+			options,
       number: options.Number,
       is_evaluate: options.evaluate
     })
@@ -264,8 +265,8 @@ Page({
       data: {
         orderNumber: th.data.number,
         orderType: 2,
-        storeId: a.stoid,
-        userId: d.user_id
+        storeId: th.data.options.storeid,
+        userId: th.data.options.userid,
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -39,6 +39,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+		this.setData({
+			options,
+		});
     var state=options.state;
     if (state != null && state != undefined && state!=""){
       this.setData({ activeCategoryId: state });
@@ -92,8 +95,8 @@ Page({
     })
     getApp().request.promiseGet(url, {
       data: {
-        storeId: a.stoid,
-        userId: d.user_id,
+        storeId: th.data.options.storeid,
+        userId: th.data.options.userid,
         state: state_index,
         page: th.data.curpage,
         pageSize: th.data.pageSize
@@ -146,7 +149,7 @@ Page({
         var number = order_list[index].Number;
         var json = {
           "number": number,
-          "storeId": a.stoid,
+          "storeId": th.data.options.storeid,
           "states": 3
         };
         var data = JSON.stringify(json);
@@ -68,12 +68,12 @@
           <view class="Unimportance flex-level" data-index="{{index}}" bindtap="cancel_tment">取消预约</view>
         </block>
         <block wx:else>
-          <navigator url="/pages/user/my_service/tment_details?number={{item.Number}}" class="Unimportance flex-level">查看详情</navigator>
+          <navigator url="/packageA/pages/my_service/tment_details?number={{item.Number}}&userid={{options.userid}}&storeid={{options.storeid}}" class="Unimportance flex-level">查看详情</navigator>
         </block>
-        <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">更改时间</navigator>
-        <navigator wx:if="{{item.State==1}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}" class="important Unimportance flex-level">发表评价</navigator>
-        <navigator wx:if="{{item.State==2 || item.State==3}}" url="/pages/user/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}" class="important Unimportance flex-level">重新预约</navigator>
-        <navigator wx:if="{{item.State==4}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}" 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}}&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>
       </view>
     </view>
     <view class="exactly flex-center fs26" wx:if="{{ismore && tm_order_list.length>=3}}">
@@ -30,7 +30,7 @@ Page({
   onShow: function() {
 		reqData.url = '/api/weshop/marketing/servicewrite/page';
 		reqData.data = {
-			storeId: app.globalData.setting.stoid,
+			storeId: this.data.options.storeid || app.globalData.setting.stoid,
 		};
 		if(this.data.options.userid) {