diff --git a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js
index d04362b..0163b05 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 = 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
diff --git a/packageA/pages/my_service/appment_main.wxml b/packageA/pages/my_service/appment_main.wxml
index 756e539..ca38133 100644
--- a/packageA/pages/my_service/appment_main.wxml
+++ b/packageA/pages/my_service/appment_main.wxml
@@ -147,4 +147,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/packageA/pages/my_service/beauty_deta.js b/packageA/pages/my_service/beauty_deta.js
index eaf4fdb..020d9de 100644
--- a/packageA/pages/my_service/beauty_deta.js
+++ b/packageA/pages/my_service/beauty_deta.js
@@ -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"; //预约接口地址
diff --git a/packageA/pages/my_service/cosmetology_list.js b/packageA/pages/my_service/cosmetology_list.js
index 5d71119..3329fb7 100644
--- a/packageA/pages/my_service/cosmetology_list.js
+++ b/packageA/pages/my_service/cosmetology_list.js
@@ -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
diff --git a/packageA/pages/my_service/cosmetology_list.wxml b/packageA/pages/my_service/cosmetology_list.wxml
index 66049b0..9904ae3 100644
--- a/packageA/pages/my_service/cosmetology_list.wxml
+++ b/packageA/pages/my_service/cosmetology_list.wxml
@@ -27,7 +27,7 @@
-
+
预约
diff --git a/packageA/pages/my_service/hist_service.js b/packageA/pages/my_service/hist_service.js
index c6ceab4..32411ff 100644
--- a/packageA/pages/my_service/hist_service.js
+++ b/packageA/pages/my_service/hist_service.js
@@ -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,
diff --git a/packageA/pages/my_service/i_service.js b/packageA/pages/my_service/i_service.js
index 6f78f4b..fa3b060 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: 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 => {
diff --git a/packageA/pages/my_service/i_service.wxml b/packageA/pages/my_service/i_service.wxml
index 0794377..3fec6e8 100644
--- a/packageA/pages/my_service/i_service.wxml
+++ b/packageA/pages/my_service/i_service.wxml
@@ -1,8 +1,8 @@
- 服务记录
- 历史预约
+ 服务记录
+ 历史预约
@@ -50,7 +50,7 @@
-
+
帮你预约
diff --git a/packageA/pages/my_service/tment_details.js b/packageA/pages/my_service/tment_details.js
index 7cdc06b..808bd09 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": 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 => {
diff --git a/packageA/pages/my_service/tment_details.wxml b/packageA/pages/my_service/tment_details.wxml
index a6c137b..271c6dd 100644
--- a/packageA/pages/my_service/tment_details.wxml
+++ b/packageA/pages/my_service/tment_details.wxml
@@ -97,20 +97,20 @@
取消预约
-
+
我的服务
-
+
更改时间
-
+
发表评价
-
+
查看评价
-
+
重新预约
diff --git a/packageA/pages/my_service/tment_eval.js b/packageA/pages/my_service/tment_eval.js
index 3c60c6a..71b218a 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: 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) {
diff --git a/packageA/pages/my_service/tment_order_list.js b/packageA/pages/my_service/tment_order_list.js
index 8ad4b7f..a509524 100644
--- a/packageA/pages/my_service/tment_order_list.js
+++ b/packageA/pages/my_service/tment_order_list.js
@@ -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);
diff --git a/packageA/pages/my_service/tment_order_list.wxml b/packageA/pages/my_service/tment_order_list.wxml
index 43df4a9..221c18d 100644
--- a/packageA/pages/my_service/tment_order_list.wxml
+++ b/packageA/pages/my_service/tment_order_list.wxml
@@ -68,12 +68,12 @@
取消预约
- 查看详情
+ 查看详情
- 更改时间
- 发表评价
- 重新预约
- 评价详情
+ 更改时间
+ 发表评价
+ 重新预约
+ 评价详情
diff --git a/packageA/pages/service_record/service_record.js b/packageA/pages/service_record/service_record.js
index 8660dc8..e003aa1 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: app.globalData.setting.stoid,
+ storeId: this.data.options.storeid || app.globalData.setting.stoid,
};
if(this.data.options.userid) {