diff --git a/components/nav_b/nav_b.js b/components/nav_b/nav_b.js
index 3c068b2..f6c5c8d 100644
--- a/components/nav_b/nav_b.js
+++ b/components/nav_b/nav_b.js
@@ -28,6 +28,7 @@ Component({
goto: function (e) {
var url = e.currentTarget.dataset.url;
getApp().goto(url);
+ this.close_box();
}
}
diff --git a/components/nav_b/nav_b.wxss b/components/nav_b/nav_b.wxss
index 6e0e00f..b71a95c 100644
--- a/components/nav_b/nav_b.wxss
+++ b/components/nav_b/nav_b.wxss
@@ -9,7 +9,7 @@
border-radius: 50rpx;
position: fixed;
right: 10rpx;
- bottom: 570rpx;
+ bottom: 350rpx;
overflow: hidden;
z-index: 4;
}
diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
index bc7ff27..6916ba4 100644
--- a/pages/user/my_service/appment_main.js
+++ b/pages/user/my_service/appment_main.js
@@ -146,7 +146,7 @@ Page({
is_sub: 0
})
if (res.data.code == 0) {
- getApp().my_warnning("预约成功", 0, th);
+ getApp().my_warnning("预约成功", 1, th);
var store_name = th.data.store_name; //预约门店
var number = res.data.data.Number;
var temp_url = "/api/wx/open/app/user/templatMessageSend"; //模版接口
diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js
index 6a392fe..6903b70 100644
--- a/pages/user/my_service/beauty_deta.js
+++ b/pages/user/my_service/beauty_deta.js
@@ -165,7 +165,7 @@ Page({
}, // 设置请求的 header
success: function(res) {
if (res.data.code == 0) {
- getApp().my_warnning(res.data.data, 0, th);
+ getApp().my_warnning(res.data.data, 1, th);
setTimeout(function() {
wx.navigateBack({
//返回
diff --git a/pages/user/my_service/hist_service.json b/pages/user/my_service/hist_service.json
index 1bfb602..b81e3be 100644
--- a/pages/user/my_service/hist_service.json
+++ b/pages/user/my_service/hist_service.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "历史服务",
+ "navigationBarTitleText": "历史预约",
"usingComponents": {
"timePicker": "/components/timePicker/timePicker",
"warn": "/components/long_warn/long_warn"
diff --git a/pages/user/my_service/hist_service.wxml b/pages/user/my_service/hist_service.wxml
index 1c312ab..5d290d0 100644
--- a/pages/user/my_service/hist_service.wxml
+++ b/pages/user/my_service/hist_service.wxml
@@ -26,15 +26,19 @@
{{item.ServiceName==''?'匿名':item.ServiceName}}
- (美容师：
+
+ (服务美容师：
+
+
+ (预约美容师：
+
{{item.BeauticianName}}
)
- {{item.BillDate!=''?item.BillDate:item.ArrangeTime}}
+ {{item.ArrangeTime}}
- 未服务
已服务
已过期
已取消
@@ -51,7 +55,7 @@
-该时间段无预约记录
+ 该时间段无预约记录
diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml
index f53dfd9..5c0be86 100644
--- a/pages/user/my_service/i_service.wxml
+++ b/pages/user/my_service/i_service.wxml
@@ -1,7 +1,7 @@
- 历史服务
+ 历史预约
diff --git a/pages/user/my_service/tment_details.js b/pages/user/my_service/tment_details.js
index 12d18a6..2802f6e 100644
--- a/pages/user/my_service/tment_details.js
+++ b/pages/user/my_service/tment_details.js
@@ -50,7 +50,7 @@ Page({
success: function(res) {
my_confirm.open_cancel(0);
if (res.data.code == 0) {
- getApp().my_warnning("取消成功", 0, th);
+ getApp().my_warnning("取消成功", 1, th);
var start = 'tment_details[' + 0 + '].State';
th.setData({
[start]: 3
diff --git a/pages/user/my_service/tment_details.wxml b/pages/user/my_service/tment_details.wxml
index e630c13..a6c137b 100644
--- a/pages/user/my_service/tment_details.wxml
+++ b/pages/user/my_service/tment_details.wxml
@@ -45,9 +45,12 @@
- 美
- 容
- 师:
+
+ 服务美容师:
+
+
+ 预约美容师:
+
{{item.BeauticianName}}
@@ -88,7 +91,7 @@
2.如有任何问题可致电咨询;
3.如需退约，需提前取消。
-
+
@@ -114,10 +117,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.wxss b/pages/user/my_service/tment_details.wxss
index 2147702..d525a6a 100644
--- a/pages/user/my_service/tment_details.wxss
+++ b/pages/user/my_service/tment_details.wxss
@@ -22,12 +22,12 @@ page {
}
.name {
- width: 130rpx;
+ width: 160rpx;
margin-right: 25rpx;
}
.value {
- max-width: 400rpx;
+ max-width: 390rpx;
}
/* 公用 */
diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml
index 84489b9..d3b7bee 100644
--- a/pages/user/my_service/tment_eval.wxml
+++ b/pages/user/my_service/tment_eval.wxml
@@ -8,26 +8,26 @@
- 美容师：
+ 服务美容师：
{{beautician.BeauticianName}}
- 服务项目：
+ 服务项目：
{{beautician.StorageName}}
- 服务时间：
+ 服务时间：
{{arrangeTime}}
- 评价时间：
+ 评价时间：
{{EvaluateDatetime}}
diff --git a/pages/user/my_service/tment_eval.wxss b/pages/user/my_service/tment_eval.wxss
index cfd9318..2606dc7 100644
--- a/pages/user/my_service/tment_eval.wxss
+++ b/pages/user/my_service/tment_eval.wxss
@@ -19,7 +19,7 @@
}
.itemlf {
- width: 160rpx;
+ width: 195rpx;
}
.itemlr {
diff --git a/pages/user/my_service/tment_order_list.js b/pages/user/my_service/tment_order_list.js
index 8b7a2b7..f246ffc 100644
--- a/pages/user/my_service/tment_order_list.js
+++ b/pages/user/my_service/tment_order_list.js
@@ -39,7 +39,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
-
+
},
changeTab: function(e) {
var th = this;
@@ -122,45 +122,57 @@ Page({
//取消预约
cancel_tment: function(e) {
var th = this;
- var index = e.currentTarget.dataset.index;
- var states = th.data.states;
- var order_list = th.data.tm_order_list;
- var number = order_list[index].Number;
- var json = {
- "number": number,
- "storeId": a.stoid,
- "states": 3
- };
- var data = JSON.stringify(json);
- var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
- wx.request({
- url: url,
- data: data,
- method: 'put',
- header: {
- 'content-type': 'application/json'
- }, // 设置请求的 header
- success: function(res) {
- if (res.data.code == 0) {
- getApp().my_warnning("取消成功", 0, th);
- var id = th.data.activeCategoryId;
- if (id == 1) {
- order_list.splice(index, 1);
- th.setData({
- tm_order_list: order_list
- })
- } else {
- var start = 'tm_order_list[' + index + '].State';
- th.setData({
- [start]: 3
- })
+ var th = this;
+ var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+ my_confirm.open(
+ "确定取消？",
+ "取消",
+ "确定",
+ function() {
+ my_confirm.open_cancel(0);
+ },
+ function() {
+ my_confirm.open_cancel(0);
+ var index = e.currentTarget.dataset.index;
+ var states = th.data.states;
+ var order_list = th.data.tm_order_list;
+ var number = order_list[index].Number;
+ var json = {
+ "number": number,
+ "storeId": a.stoid,
+ "states": 3
+ };
+ var data = JSON.stringify(json);
+ var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
+ wx.request({
+ url: url,
+ data: data,
+ method: 'put',
+ header: {
+ 'content-type': 'application/json'
+ }, // 设置请求的 header
+ success: function(res) {
+ if (res.data.code == 0) {
+ getApp().my_warnning("取消成功", 1, th);
+ var id = th.data.activeCategoryId;
+ if (id == 1) {
+ order_list.splice(index, 1);
+ th.setData({
+ tm_order_list: order_list
+ })
+ } else {
+ var start = 'tm_order_list[' + index + '].State';
+ th.setData({
+ [start]: 3
+ })
+ }
+ wx.stopPullDownRefresh(); //停止下拉刷新
+ } else {
+ getApp().my_warnning(res.data.msg, 0, th);
+ }
}
- wx.stopPullDownRefresh(); //停止下拉刷新
- } else {
- getApp().my_warnning(res.data.msg, 0, th);
- }
- }
- })
+ })
+ })
},
//图片失败，默认图片
@@ -179,11 +191,11 @@ Page({
onShow: function() {
var th = this;
th.setData({
- curpage:1,
- total:0,
- ismore:0,
- is_read:0,
- tm_order_list:[]
+ curpage: 1,
+ total: 0,
+ ismore: 0,
+ is_read: 0,
+ tm_order_list: []
})
th.query_orderList();
},
@@ -201,5 +213,11 @@ Page({
})
th.query_orderList();
},
+ //关闭导航
+ 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/pages/user/my_service/tment_order_list.json b/pages/user/my_service/tment_order_list.json
index 054a4f7..2dcefce 100644
--- a/pages/user/my_service/tment_order_list.json
+++ b/pages/user/my_service/tment_order_list.json
@@ -2,6 +2,8 @@
"navigationBarTitleText": "我的预约",
"usingComponents": {
"qr_code": "/components/qr_code/qr_code",
- "warn": "/components/long_warn/long_warn"
+ "warn": "/components/long_warn/long_warn",
+ "my_confirm": "/components/my_confirm/my_confirm",
+ "nav_b": "/components/nav_b/nav_b"
}
}
\ No newline at end of file
diff --git a/pages/user/my_service/tment_order_list.wxml b/pages/user/my_service/tment_order_list.wxml
index 7e1ad28..0d0534e 100644
--- a/pages/user/my_service/tment_order_list.wxml
+++ b/pages/user/my_service/tment_order_list.wxml
@@ -1,4 +1,4 @@
-
+
@@ -32,23 +32,30 @@
- 预约门店:
+ 预约门店:
{{item.StorageName}}
- 预约项目:
+ 预约项目:
{{item.ServiceName}}
- 美容师:
+
+ 服务美容师:
+
+
+
+ 预约美容师:
+
+
{{item.BeauticianName}}
- 预约时间:
+ 预约时间:
{{item.ArrangeTime}}
- 服务时间:
+ 服务时间:
{{item.WriteTime}}
@@ -78,7 +85,7 @@
-
+
@@ -89,6 +96,9 @@
+
+
+
\ No newline at end of file
diff --git a/pages/user/my_service/tment_order_list.wxss b/pages/user/my_service/tment_order_list.wxss
index 5df61fc..43094a5 100644
--- a/pages/user/my_service/tment_order_list.wxss
+++ b/pages/user/my_service/tment_order_list.wxss
@@ -76,7 +76,8 @@ page {
}
.itemname {
- width: 130rpx;
+ width: 150rpx;
+ margin-right: 20rpx;
}
.itemvalue {