wxd / MShopWeApp

Commit 69cb3adcc23d9d5d41f2bb60e23eb50c068e6f43

Authored by taiyuan
1 parent 2ac8d1df

修改协助预约

Inline Side-by-side
Showing 14 changed files with 85 additions and 61 deletions
packageA/pages/my_service/appment_main.js
  View file @69cb3ad
... ... @@ -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 = a.stoid; //商家id
  97 + var storeId = th.data.options.storeid; //商家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": a.stoid,
  154 + "storeId": th.data.options.storeid,
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: a.stoid,
  244 + store_id: th.data.options.storeid,
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: a.stoid,
  377 + storeId: th.data.options.storeid,
378 378 serviceId: itemId,
379 379 latitude: th.data.lat,
380 380 longitude: th.data.lon,
... ... @@ -413,7 +413,8 @@ Page({
413 413 var th = this;
414 414 th.setData({
415 415 is_textea: 0
416   - })
  416 + });
  417 +
417 418 if (th.data.store_name == "") {
418 419 getApp().my_warnning("请选择服务门店", 0, th);
419 420 th.settime();
... ... @@ -427,7 +428,7 @@ Page({
427 428  
428 429 getApp().request.promiseGet(url, {
429 430 data: {
430   - storeId: a.stoid,
  431 + storeId: th.data.options.storeid,
431 432 userId: th.data.options.userid,
432 433 serviceId: itemid,
433 434 storageId: storageId
... ... @@ -459,6 +460,7 @@ Page({
459 460 })
460 461 }
461 462 },
  463 +
462 464 choice_beautician: function(e) {
463 465 var th = this;
464 466 var bea_index = e.currentTarget.dataset.baaindex;
... ... @@ -515,8 +517,10 @@ Page({
515 517 th.setData({
516 518 is_textea: 1
517 519 })
  520 + console.log('optionsxxx===>', this.data.options);
  521 + // console.log('1-->', "/pages/user/my_service/cosmetology_list?userid=" + th.data.options.userid + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id);
518 522 wx.navigateTo({
519   - url: "/pages/user/my_service/cosmetology_list?" + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id
  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
520 524 });
521 525  
522 526 }
... ... @@ -570,7 +574,7 @@ Page({
570 574  
571 575 getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', {
572 576 data: {
573   - store_id: a.stoid,
  577 + store_id: th.data.options.storeid,
574 578 guide_id: e.globalData.guide_id,
575 579 UserCode: th.data.options.usercode,
576 580 }
... ... @@ -599,7 +603,7 @@ Page({
599 603 var projectID = th.data.itemId; //服务id
600 604 var seekTime = th.data.time; //预约日期
601 605 var storageId = th.data.storageId; //门店id
602   - var storeId = a.stoid; //商家id
  606 + var storeId = th.data.options.storeid; //商家id
603 607 getApp().request.promiseGet(url, {
604 608 data: {
605 609 beauticianId: beauticianID,
... ... @@ -643,7 +647,7 @@ Page({
643 647 var project_id = th.data.project_id; //服务项目id
644 648 getApp().request.promiseGet(url, {
645 649 data: {
646   - storeId: a.stoid,
  650 + storeId: th.data.options.storeid,
647 651 userId: th.data.options.userid,
648 652 projectId: project_id
649 653 }
... ... @@ -659,9 +663,9 @@ Page({
659 663 })
660 664 },
661 665 //关闭导航
662   - close: function() {
663   - var th = this;
664   - var nav_b = th.selectComponent("#nav_b"); //组件的id
665   - nav_b.close_box();
666   - }
  666 + // close: function() {
  667 + // var th = this;
  668 + // var nav_b = th.selectComponent("#nav_b"); //组件的id
  669 + // nav_b.close_box();
  670 + // }
667 671 })
668 672 \ No newline at end of file
... ...
packageA/pages/my_service/appment_main.wxml
  View file @69cb3ad
... ... @@ -147,4 +147,4 @@
147 147 <view wx:if="{{store}}" class="disgraceful" bindtap="onclickstore"></view>
148 148 <warn id="warn"></warn>
149 149 <!-- 制作一个圆球导航 -->
150   -<nav_b id="nav_b"></nav_b>
151 150 \ No newline at end of file
  151 +<!-- <nav_b id="nav_b"></nav_b> -->
152 152 \ No newline at end of file
... ...
packageA/pages/my_service/beauty_deta.js
  View file @69cb3ad
... ... @@ -46,6 +46,8 @@ Page({
46 46  
47 47  
48 48 th.setData({
  49 + options,
  50 + storeid: options.storeid,
49 51 beautician_id: beautician_id,
50 52 itemId: options.itemId,
51 53 modify: options.modify,
... ... @@ -122,7 +124,7 @@ Page({
122 124 getApp().request.promiseGet(url, {
123 125 data: {
124 126 beauticianId: beautician_id,
125   - storeId: a.stoid,
  127 + storeId: th.data.storeid,
126 128 }
127 129 }).then(res => {
128 130 if (res.data.code == 0) {
... ... @@ -162,7 +164,7 @@ Page({
162 164 "number": th.data.number,
163 165 "remark": "更改时间",
164 166 "states": 0,
165   - "storeId": a.stoid
  167 + "storeId": th.data.storeid,
166 168 };
167 169 var data = JSON.stringify(json);
168 170 var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
... ... @@ -244,8 +246,8 @@ Page({
244 246 projectId: projectId,
245 247 beauticianId: beautician_id,
246 248 serviceId: itemId,
247   - storeId: a.stoid,
248   - storageId:storageId
  249 + storeId: th.data.storeid,
  250 + storageId:storageId
249 251 }
250 252 }).then(res => {
251 253 if (res.data.code == 0) {
... ... @@ -300,7 +302,7 @@ Page({
300 302 storageId:th.data.storageId,
301 303 serviceId: th.data.itemId,
302 304 seekTime: SeekTime,
303   - storeId: a.stoid,
  305 + storeId: th.data.storeid,
304 306 }
305 307 }).then(res => {
306 308 if (res.data.code == 0) {
... ... @@ -363,7 +365,7 @@ Page({
363 365 "number": number,
364 366 "remark": "更改预约时间",
365 367 "states": 0,
366   - "storeId": a.stoid
  368 + "storeId": th.data.storeid,
367 369 };
368 370 var data = JSON.stringify(json);
369 371 var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
... ...
packageA/pages/my_service/cosmetology_list.js
  View file @69cb3ad
... ... @@ -3,6 +3,8 @@ var e = getApp(),
3 3 os = a,
4 4 t = e.request,
5 5 d = e.globalData;
  6 +
  7 +
6 8 Page({
7 9  
8 10 /**
... ... @@ -21,6 +23,7 @@ Page({
21 23 storageId: 0, //线下门店id
22 24 projectId:"",//项目id
23 25 },
  26 +
24 27 onReachBottom: function() {
25 28 var th = this;
26 29 if (this.data.total <= th.data.pageSize) return;
... ... @@ -30,6 +33,8 @@ Page({
30 33 })
31 34 th.query_cology();
32 35 },
  36 +
  37 +
33 38 query_cology: function() {
34 39 var th = this;
35 40 var url = "/api/weshop/marketing/reservation/staff/pagenew";
... ... @@ -37,8 +42,8 @@ Page({
37 42 var storageId = th.data.storageId;
38 43 getApp().request.promiseGet(url, {
39 44 data: {
40   - storeId: a.stoid,
41   - userId: d.user_id,
  45 + storeId: th.data.options.storeid,
  46 + userId: th.data.options.userid,
42 47 serviceId: itemId,
43 48 storageId: storageId,
44 49 page: th.data.curpage,
... ... @@ -67,6 +72,8 @@ Page({
67 72 }
68 73 })
69 74 },
  75 +
  76 +
70 77 //图片失败，默认图片
71 78 bind_bnerr1: function(e) {
72 79 var _errImg = e.target.dataset.errorimg;
... ... @@ -78,12 +85,17 @@ Page({
78 85 this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
79 86 }
80 87 },
  88 +
  89 +
  90 +
81 91 /**
82 92 * 生命周期函数--监听页面加载
83 93 */
84 94 onLoad: function(options) {
  95 + console.log('options--->', options);
85 96 var th = this;
86   - th.setData({
  97 + this.setData({
  98 + options,
87 99 projectId: options.projectId,
88 100 itemId: options.itemId,
89 101 storageId: options.storageId
... ... @@ -105,4 +117,5 @@ Page({
105 117 th.query_cology();
106 118 },
107 119  
  120 +
108 121 })
109 122 \ No newline at end of file
... ...
packageA/pages/my_service/cosmetology_list.wxml
  View file @69cb3ad
... ... @@ -27,7 +27,7 @@
27 27 </view>
28 28  
29 29 <!-- 预约状态 -->
30   - <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}}">
  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}}">
31 31 <view class="fs24">预约</view>
32 32 </navigator>
33 33 </view>
... ...
packageA/pages/my_service/hist_service.js
  View file @69cb3ad
... ... @@ -69,7 +69,7 @@ Page({
69 69 */
70 70 onLoad: function(options) {
71 71 var th = this;
72   - // console.log('xxoptions==>', options);
  72 + console.log('xxoptions==>', options);
73 73 this.setData({
74 74 options,
75 75 });
... ... @@ -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: a.stoid,
  122 + storeId: th.data.options.storeid,
123 123 userId: th.data.options.userid,
124 124 beginDate: startTime,
125 125 endDate: endTime,
... ...
packageA/pages/my_service/i_service.js
  View file @69cb3ad
... ... @@ -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: a.stoid,
  73 + storeId: th.data.options.storeid,
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: a.stoid,
  121 + storeId: th.data.options.storeid,
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 = "/pages/user/my_service/tment_details?number=" + res.data.data.Number;
  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;
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: a.stoid,
  198 + storeId: th.data.options.storeid,
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 = "/pages/user/my_service/tment_details?number=" + number;
  218 + var deta_url = "/packageA/pages/my_service/tment_details?number=" + number + "&userid="+ th.data.options.UserId + "&storeid=" + th.data.options.storeid;
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: a.stoid,
  229 + storeId: th.data.options.storeid,
230 230 userId: th.data.options.UserId,
231 231 }
232 232 }).then(res => {
... ...
packageA/pages/my_service/i_service.wxml
  View file @69cb3ad
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}}" style="left:10px;right:auto;">服务记录</navigator>
5   - <navigator class="History fs26" url="/packageA/pages/my_service/hist_service?userid={{options.UserId}}">历史预约</navigator>
  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>
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}}" 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}}&storeid={{options.storeid}}" 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 @69cb3ad
... ... @@ -35,7 +35,7 @@ Page({
35 35 var number = th.data.number;
36 36 var json = {
37 37 "number": number,
38   - "storeId": a.stoid,
  38 + "storeId": th.data.options.storeid,
39 39 "states": states
40 40 };
41 41 var data = JSON.stringify(json);
... ... @@ -71,6 +71,7 @@ Page({
71 71 onLoad: function(options) {
72 72 var th = this;
73 73 th.setData({
  74 + options,
74 75 number: options.number
75 76 })
76 77 },
... ... @@ -81,8 +82,8 @@ Page({
81 82 var url = "/api/weshop/marketing/reservation/reservation/page";
82 83 getApp().request.promiseGet(url, {
83 84 data: {
84   - storeId: a.stoid,
85   - userId: d.user_id,
  85 + storeId: th.data.options.storeid,
  86 + userId: th.data.options.userid,
86 87 number: number
87 88 }
88 89 }).then(res => {
... ...
packageA/pages/my_service/tment_details.wxml
  View file @69cb3ad
... ... @@ -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="/pages/user/my_service/tment_order_list">
  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}}">
101 101 <view class="yellow-b">我的服务</view>
102 102 </navigator>
103 103 <!-- 右边栏 -->
104   - <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}}">
  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="/pages/user/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}}">
108 108 <view>发表评价</view>
109 109 </navigator>
110   - <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/pages/user/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}}">
111 111 <view>查看评价</view>
112 112 </navigator>
113   - <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}}">
  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}}">
114 114 <view>重新预约</view>
115 115 </navigator>
116 116  
... ...
packageA/pages/my_service/tment_eval.js
  View file @69cb3ad
... ... @@ -40,7 +40,7 @@ Page({
40 40 getApp().request.promiseGet(url, {
41 41 data: {
42 42 Star: index + 1,
43   - storeId: a.stoid
  43 + storeId: th.data.options.storeid,
44 44 }
45 45 }).then(res => {
46 46 if (res.data.code == 0) {
... ... @@ -102,8 +102,8 @@ Page({
102 102 var number = th.data.number; //订单编号
103 103 getApp().request.promiseGet(url, {
104 104 data: {
105   - storeId: a.stoid,
106   - userId: d.user_id,
  105 + storeId: th.data.options.storeid,
  106 + userId: th.data.options.userid,
107 107 number: number
108 108 }
109 109 }).then(res => {
... ... @@ -126,7 +126,7 @@ Page({
126 126 getApp().request.promiseGet(url, {
127 127 data: {
128 128 number: th.data.number,
129   - storeId: a.stoid
  129 + storeId: th.data.options.storeid,
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": a.stoid
  178 + "storeId": th.data.options.storeid,
179 179 };
180 180 var data = JSON.stringify(json); //转换成json格式
181 181 wx.request({
... ... @@ -220,6 +220,7 @@ Page({
220 220 onLoad: function(options) {
221 221 var th = this;
222 222 th.setData({
  223 + options,
223 224 number: options.Number,
224 225 is_evaluate: options.evaluate
225 226 })
... ... @@ -264,8 +265,8 @@ Page({
264 265 data: {
265 266 orderNumber: th.data.number,
266 267 orderType: 2,
267   - storeId: a.stoid,
268   - userId: d.user_id
  268 + storeId: th.data.options.storeid,
  269 + userId: th.data.options.userid,
269 270 }
270 271 }).then(res => {
271 272 if (res.data.code == 0) {
... ...
packageA/pages/my_service/tment_order_list.js
  View file @69cb3ad
... ... @@ -39,6 +39,9 @@ Page({
39 39 * 生命周期函数--监听页面加载
40 40 */
41 41 onLoad: function(options) {
  42 + this.setData({
  43 + options,
  44 + });
42 45 var state=options.state;
43 46 if (state != null && state != undefined && state!=""){
44 47 this.setData({ activeCategoryId: state });
... ... @@ -92,8 +95,8 @@ Page({
92 95 })
93 96 getApp().request.promiseGet(url, {
94 97 data: {
95   - storeId: a.stoid,
96   - userId: d.user_id,
  98 + storeId: th.data.options.storeid,
  99 + userId: th.data.options.userid,
97 100 state: state_index,
98 101 page: th.data.curpage,
99 102 pageSize: th.data.pageSize
... ... @@ -146,7 +149,7 @@ Page({
146 149 var number = order_list[index].Number;
147 150 var json = {
148 151 "number": number,
149   - "storeId": a.stoid,
  152 + "storeId": th.data.options.storeid,
150 153 "states": 3
151 154 };
152 155 var data = JSON.stringify(json);
... ...
packageA/pages/my_service/tment_order_list.wxml
  View file @69cb3ad
... ... @@ -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="/pages/user/my_service/tment_details?number={{item.Number}}" class="Unimportance flex-level">查看详情</navigator>
  71 + <navigator url="/packageA/pages/my_service/tment_details?number={{item.Number}}&userid={{options.userid}}&storeid={{options.storeid}}" class="Unimportance flex-level">查看详情</navigator>
72 72 </block>
73   - <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>
74   - <navigator wx:if="{{item.State==1}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}" class="important Unimportance flex-level">发表评价</navigator>
75   - <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>
76   - <navigator wx:if="{{item.State==4}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}" 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}}&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>
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 @69cb3ad
... ... @@ -30,7 +30,7 @@ Page({
30 30 onShow: function() {
31 31 reqData.url = '/api/weshop/marketing/servicewrite/page';
32 32 reqData.data = {
33   - storeId: app.globalData.setting.stoid,
  33 + storeId: this.data.options.storeid || app.globalData.setting.stoid,
34 34 };
35 35  
36 36 if(this.data.options.userid) {
... ...