wxd / MShopWeApp

Commit 8901f59d59eb58924d46fedc568218ccf8bd57ec

Authored by taiyuan
1 parent cd73661c

协助预约stoid取a.stoid

Inline Side-by-side
Showing 13 changed files with 45 additions and 45 deletions
packageA/pages/my_service/appment_main.js
  View file @8901f59
... ... @@ -94,7 +94,7 @@ Page({
94 94 var serviceId = th.data.itemId; //服务id
95 95 var beauticianID = th.data.beauticianID; //美容师id
96 96 var buyType = th.data.buyType; //服务项目类型
97   - var storeId = th.data.options.storeid; //商家id
  97 + var storeId = a.stoid; //商家id
98 98 var storageId = th.data.storageId; //门店id
99 99 var userId = th.data.options.userid; //用户id
100 100 var remarks = th.data.remarks; //用户备注
... ... @@ -151,7 +151,7 @@ Page({
151 151 }
152 152 ],
153 153 "page": "/pages/user/my_service/tment_details?number=" + number,
154   - "storeId": th.data.options.storeid,
  154 + "storeId": a.stoid,
155 155 "typeId": "1011",
156 156 "userId": th.data.options.userid
157 157 };
... ... @@ -241,7 +241,7 @@ Page({
241 241 //获取模版id
242 242 getApp().request.promiseGet(temp_url, {
243 243 data: {
244   - store_id: th.data.options.storeid,
  244 + store_id: a.stoid,
245 245 typeid: "1011"
246 246 }
247 247 }).then(res => {
... ... @@ -374,7 +374,7 @@ Page({
374 374 getApp().request.promiseGet(url, {
375 375 data: {
376 376 userId: th.data.options.userid,
377   - storeId: th.data.options.storeid,
  377 + storeId: a.stoid,
378 378 serviceId: itemId,
379 379 latitude: th.data.lat,
380 380 longitude: th.data.lon,
... ... @@ -428,7 +428,7 @@ Page({
428 428  
429 429 getApp().request.promiseGet(url, {
430 430 data: {
431   - storeId: th.data.options.storeid,
  431 + storeId: a.stoid,
432 432 userId: th.data.options.userid,
433 433 serviceId: itemid,
434 434 storageId: storageId
... ... @@ -520,7 +520,7 @@ Page({
520 520 console.log('optionsxxx===>', this.data.options);
521 521 // console.log('1-->', "/pages/user/my_service/cosmetology_list?userid=" + th.data.options.userid + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id);
522 522 wx.navigateTo({
523   - url: "/packageA/pages/my_service/cosmetology_list?storeid=" + this.data.options.storeid + '&userid=' + this.data.options.userid + '&storageId=' + storageId + '&itemId=' + itemId + "&projectId=" + project_id
  523 + url: "/packageA/pages/my_service/cosmetology_list?userid=" + this.data.options.userid + '&storageId=' + storageId + '&itemId=' + itemId + "&projectId=" + project_id
524 524 });
525 525  
526 526 }
... ... @@ -574,7 +574,7 @@ Page({
574 574  
575 575 getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', {
576 576 data: {
577   - store_id: th.data.options.storeid,
  577 + store_id: a.stoid,
578 578 guide_id: e.globalData.guide_id,
579 579 UserCode: th.data.options.usercode,
580 580 }
... ... @@ -603,7 +603,7 @@ Page({
603 603 var projectID = th.data.itemId; //服务id
604 604 var seekTime = th.data.time; //预约日期
605 605 var storageId = th.data.storageId; //门店id
606   - var storeId = th.data.options.storeid; //商家id
  606 + var storeId = a.stoid; //商家id
607 607 getApp().request.promiseGet(url, {
608 608 data: {
609 609 beauticianId: beauticianID,
... ... @@ -647,7 +647,7 @@ Page({
647 647 var project_id = th.data.project_id; //服务项目id
648 648 getApp().request.promiseGet(url, {
649 649 data: {
650   - storeId: th.data.options.storeid,
  650 + storeId: a.stoid,
651 651 userId: th.data.options.userid,
652 652 projectId: project_id
653 653 }
... ...
packageA/pages/my_service/beauty_deta.js
  View file @8901f59
... ... @@ -124,7 +124,7 @@ Page({
124 124 getApp().request.promiseGet(url, {
125 125 data: {
126 126 beauticianId: beautician_id,
127   - storeId: th.data.storeid,
  127 + storeId: a.stoid,
128 128 }
129 129 }).then(res => {
130 130 if (res.data.code == 0) {
... ... @@ -164,7 +164,7 @@ Page({
164 164 "number": th.data.number,
165 165 "remark": "更改时间",
166 166 "states": 0,
167   - "storeId": th.data.storeid,
  167 + "storeId": a.stoid,
168 168 };
169 169 var data = JSON.stringify(json);
170 170 var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
... ... @@ -246,7 +246,7 @@ Page({
246 246 projectId: projectId,
247 247 beauticianId: beautician_id,
248 248 serviceId: itemId,
249   - storeId: th.data.storeid,
  249 + storeId: a.stoid,
250 250 storageId:storageId
251 251 }
252 252 }).then(res => {
... ... @@ -302,7 +302,7 @@ Page({
302 302 storageId:th.data.storageId,
303 303 serviceId: th.data.itemId,
304 304 seekTime: SeekTime,
305   - storeId: th.data.storeid,
  305 + storeId: a.stoid,
306 306 }
307 307 }).then(res => {
308 308 if (res.data.code == 0) {
... ... @@ -365,7 +365,7 @@ Page({
365 365 "number": number,
366 366 "remark": "更改预约时间",
367 367 "states": 0,
368   - "storeId": th.data.storeid,
  368 + "storeId": a.stoid,
369 369 };
370 370 var data = JSON.stringify(json);
371 371 var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
... ...
packageA/pages/my_service/cosmetology_list.js
  View file @8901f59
... ... @@ -42,7 +42,7 @@ Page({
42 42 var storageId = th.data.storageId;
43 43 getApp().request.promiseGet(url, {
44 44 data: {
45   - storeId: th.data.options.storeid,
  45 + storeId: a.stoid,
46 46 userId: th.data.options.userid,
47 47 serviceId: itemId,
48 48 storageId: storageId,
... ...
packageA/pages/my_service/cosmetology_list.wxml
  View file @8901f59
... ... @@ -27,7 +27,7 @@
27 27 </view>
28 28  
29 29 <!-- 预约状态 -->
30   - <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}}">
  30 + <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}}">
31 31 <view class="fs24">预约</view>
32 32 </navigator>
33 33 </view>
... ...
packageA/pages/my_service/hist_service.js
  View file @8901f59
... ... @@ -119,7 +119,7 @@ Page({
119 119 var url = "/api/weshop/marketing/reservation/history/reservation/page";
120 120 getApp().request.promiseGet(url, {
121 121 data: {
122   - storeId: th.data.options.storeid,
  122 + storeId: a.stoid,
123 123 userId: th.data.options.userid,
124 124 beginDate: startTime,
125 125 endDate: endTime,
... ...
packageA/pages/my_service/i_service.js
  View file @8901f59
... ... @@ -70,7 +70,7 @@ Page({
70 70 var url = "/api/weshop/marketing/reservation/sm/page?State=1";
71 71 getApp().request.promiseGet(url, {
72 72 data: {
73   - storeId: th.data.options.storeid,
  73 + storeId: a.stoid,
74 74 userId: th.data.options.UserId,
75 75 page: th.data.curpage,
76 76 pageSize: th.data.pageSize
... ... @@ -118,7 +118,7 @@ Page({
118 118 getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
119 119 data: {
120 120 serviceId: service_id,
121   - storeId: th.data.options.storeid,
  121 + storeId: a.stoid,
122 122 userId: th.data.options.UserId,
123 123 }
124 124 }).then(res => {
... ... @@ -135,7 +135,7 @@ Page({
135 135 "继续使用",
136 136 function() {
137 137 my_confirm.open_cancel(0);
138   - var deta_url = "/packageA/pages/my_service/tment_details?userid="+ th.data.options.UserId + "&number=" + res.data.data.Number + "&storeid=" + th.data.options.storeid;
  138 + var deta_url = "/packageA/pages/my_service/tment_details?userid="+ th.data.options.UserId + "&number=" + res.data.data.Number;
139 139 wx.navigateTo({
140 140 url: deta_url
141 141 })
... ... @@ -195,7 +195,7 @@ Page({
195 195 getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
196 196 data: {
197 197 serviceId: service_id,
198   - storeId: th.data.options.storeid,
  198 + storeId: a.stoid,
199 199 userId: th.data.options.UserId,
200 200 }
201 201 }).then(res => {
... ... @@ -215,7 +215,7 @@ Page({
215 215 "继续预约",
216 216 function() {
217 217 my_confirm.open_cancel(0);
218   - var deta_url = "/packageA/pages/my_service/tment_details?number=" + number + "&userid="+ th.data.options.UserId + "&storeid=" + th.data.options.storeid;
  218 + var deta_url = "/packageA/pages/my_service/tment_details?number=" + number + "&userid="+ th.data.options.UserId;
219 219 wx.navigateTo({
220 220 url: deta_url
221 221 })
... ... @@ -226,7 +226,7 @@ Page({
226 226 data: {
227 227 projectId: project_id,
228 228 serviceId: service_id,
229   - storeId: th.data.options.storeid,
  229 + storeId: a.stoid,
230 230 userId: th.data.options.UserId,
231 231 }
232 232 }).then(res => {
... ...
packageA/pages/my_service/i_service.wxml
  View file @8901f59
1 1 <!-- 背景图片 -->
2 2 <view catchtap="close">
3 3 <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image>
4   - <navigator class="History fs26" url="/packageA/pages/service_record/service_record?userid={{options.UserId}}&storeid={{options.storeid}}" style="left:10px;right:auto;">服务记录</navigator>
5   - <navigator class="History fs26" url="/packageA/pages/my_service/hist_service?userid={{options.UserId}}&storeid={{options.storeid}}">历史预约</navigator>
  4 + <navigator class="History fs26" url="/packageA/pages/service_record/service_record?userid={{options.UserId}}" style="left:10px;right:auto;">服务记录</navigator>
  5 + <navigator class="History fs26" url="/packageA/pages/my_service/hist_service?userid={{options.UserId}}">历史预约</navigator>
6 6 </view>
7 7  
8 8 <!-- 预约内容 -->
... ... @@ -50,7 +50,7 @@
50 50 <!-- <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
51 51 <view>帮你预约</view>
52 52 </view> -->
53   - <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}}">
  53 + <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}}">
54 54 <view>帮你预约</view>
55 55 </view>
56 56 </view>
... ...
packageA/pages/my_service/tment_details.js
  View file @8901f59
... ... @@ -35,7 +35,7 @@ Page({
35 35 var number = th.data.number;
36 36 var json = {
37 37 "number": number,
38   - "storeId": th.data.options.storeid,
  38 + "storeId": a.stoid,
39 39 "states": states
40 40 };
41 41 var data = JSON.stringify(json);
... ... @@ -82,7 +82,7 @@ Page({
82 82 var url = "/api/weshop/marketing/reservation/reservation/page";
83 83 getApp().request.promiseGet(url, {
84 84 data: {
85   - storeId: th.data.options.storeid,
  85 + storeId: a.stoid,
86 86 userId: th.data.options.userid,
87 87 number: number
88 88 }
... ...
packageA/pages/my_service/tment_details.wxml
  View file @8901f59
... ... @@ -97,20 +97,20 @@
97 97 <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}" bindtap="cancel_tment">
98 98 <view class="yellow-b" data-index="{{index}}">取消预约</view>
99 99 </view>
100   - <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}}">
  100 + <navigator wx:if="{{item.State>0}}" class="sub flex-center yellow-b" url="/packageA/pages/my_service/tment_order_list?userid={{options.userid}}">
101 101 <view class="yellow-b">我的服务</view>
102 102 </navigator>
103 103 <!-- 右边栏 -->
104 104 <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}}">
105 105 <view>更改时间</view>
106 106 </navigator>
107   - <navigator wx:if="{{item.State==1}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}">
  107 + <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}}">
108 108 <view>发表评价</view>
109 109 </navigator>
110   - <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}">
  110 + <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}}">
111 111 <view>查看评价</view>
112 112 </navigator>
113   - <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}}">
  113 + <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}}">
114 114 <view>重新预约</view>
115 115 </navigator>
116 116  
... ...
packageA/pages/my_service/tment_eval.js
  View file @8901f59
... ... @@ -40,7 +40,7 @@ Page({
40 40 getApp().request.promiseGet(url, {
41 41 data: {
42 42 Star: index + 1,
43   - storeId: th.data.options.storeid,
  43 + storeId: a.stoid,
44 44 }
45 45 }).then(res => {
46 46 if (res.data.code == 0) {
... ... @@ -102,7 +102,7 @@ Page({
102 102 var number = th.data.number; //订单编号
103 103 getApp().request.promiseGet(url, {
104 104 data: {
105   - storeId: th.data.options.storeid,
  105 + storeId: a.stoid,
106 106 userId: th.data.options.userid,
107 107 number: number
108 108 }
... ... @@ -126,7 +126,7 @@ Page({
126 126 getApp().request.promiseGet(url, {
127 127 data: {
128 128 number: th.data.number,
129   - storeId: th.data.options.storeid,
  129 + storeId: a.stoid,
130 130 }
131 131 }).then(res => {
132 132 if (res.data.code == 0) {
... ... @@ -175,7 +175,7 @@ Page({
175 175 "number": posNo,
176 176 "remark": proposal,
177 177 "star": stars + 1,
178   - "storeId": th.data.options.storeid,
  178 + "storeId": a.stoid,
179 179 };
180 180 var data = JSON.stringify(json); //转换成json格式
181 181 wx.request({
... ... @@ -265,7 +265,7 @@ Page({
265 265 data: {
266 266 orderNumber: th.data.number,
267 267 orderType: 2,
268   - storeId: th.data.options.storeid,
  268 + storeId: a.stoid,
269 269 userId: th.data.options.userid,
270 270 }
271 271 }).then(res => {
... ...
packageA/pages/my_service/tment_order_list.js
  View file @8901f59
... ... @@ -95,7 +95,7 @@ Page({
95 95 })
96 96 getApp().request.promiseGet(url, {
97 97 data: {
98   - storeId: th.data.options.storeid,
  98 + storeId: a.stoid,
99 99 userId: th.data.options.userid,
100 100 state: state_index,
101 101 page: th.data.curpage,
... ... @@ -149,7 +149,7 @@ Page({
149 149 var number = order_list[index].Number;
150 150 var json = {
151 151 "number": number,
152   - "storeId": th.data.options.storeid,
  152 + "storeId": a.stoid,
153 153 "states": 3
154 154 };
155 155 var data = JSON.stringify(json);
... ...
packageA/pages/my_service/tment_order_list.wxml
  View file @8901f59
... ... @@ -68,12 +68,12 @@
68 68 <view class="Unimportance flex-level" data-index="{{index}}" bindtap="cancel_tment">取消预约</view>
69 69 </block>
70 70 <block wx:else>
71   - <navigator url="/packageA/pages/my_service/tment_details?number={{item.Number}}&userid={{options.userid}}&storeid={{options.storeid}}" class="Unimportance flex-level">查看详情</navigator>
  71 + <navigator url="/packageA/pages/my_service/tment_details?number={{item.Number}}&userid={{options.userid}}" class="Unimportance flex-level">查看详情</navigator>
72 72 </block>
73   - <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>
74   - <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>
75   - <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>
76   - <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>
  73 + <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>
  74 + <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>
  75 + <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>
  76 + <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>
77 77 </view>
78 78 </view>
79 79 <view class="exactly flex-center fs26" wx:if="{{ismore && tm_order_list.length>=3}}">
... ...
packageA/pages/service_record/service_record.js
  View file @8901f59
... ... @@ -30,7 +30,7 @@ Page({
30 30 onShow: function() {
31 31 reqData.url = '/api/weshop/marketing/servicewrite/page';
32 32 reqData.data = {
33   - storeId: this.data.options.storeid || app.globalData.setting.stoid,
  33 + storeId: app.globalData.setting.stoid,
34 34 };
35 35  
36 36 if(this.data.options.userid) {
... ...