diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js
index 78e5f2d..7a12427 100644
--- a/pages/user/my_service/beauty_deta.js
+++ b/pages/user/my_service/beauty_deta.js
@@ -15,6 +15,8 @@ Page({
name: "", //美容师姓名
comment: "", //美容师评价
head_img: "", //美容师头像
+ time: ["08:00", "09:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", "16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00"],
+ time_index: 0, //选择预约时间下标
},
/**
@@ -32,7 +34,7 @@ Page({
th.query_date();
},
//图片失败，默认图片
- bind_bnerr1: function (e) {
+ bind_bnerr1: function(e) {
var _errImg = e.target.dataset.errorimg;
var _Img = e.target.dataset.img;
if (_Img != undefined) {
@@ -68,6 +70,24 @@ Page({
}
})
},
+ //返回上个页面
+ navigateBack:function(){
+ wx.navigateBack({ changed: true });//返回上一页
+ },
+ //选择时间
+ Selection_time: function(e) {
+ var th = this;
+ var index = e.currentTarget.dataset.index;
+ var time_index = th.data.time_index;
+ if (index == time_index) {
+ return;
+ } else {
+ th.setData({
+ time_index: time_index
+ })
+ }
+ },
+
query_date: function() {
var th = this;
var url = "/api/weshop/marketing/reservation/staff/time/list";
@@ -82,8 +102,20 @@ Page({
}).then(res => {
if (res.data.code == 0) {
var data = res.data.data;
+ var time = th.data.time; //固定时间
+ var time_list = [];
+ for (var i = 0; i < time.length; i++) {
+ for (var ii = ii; ii < data.length; ii++) {
+ if (time[i] == data[ii]) {
+ time_list[i] = data[ii];
+ break;
+ } else {
+ time_list[i] = "";
+ }
+ }
+ }
th.setData({
- time_list: data
+ time_list: time_list
})
} else {
getApp().my_warnning(res.data.msg, 0, th);
diff --git a/pages/user/my_service/beauty_deta.wxml b/pages/user/my_service/beauty_deta.wxml
index c7f729d..4079c23 100644
--- a/pages/user/my_service/beauty_deta.wxml
+++ b/pages/user/my_service/beauty_deta.wxml
@@ -10,7 +10,7 @@
- {{comment}}
+ {{comment}}
暂无介绍
@@ -36,18 +36,27 @@
-
-
-
-
- {{item.GroupHour}}
-
- 约满
-
+
+
+
+
+
+ {{item}}
+
+ 约满
+
+
-
+
+
+
+
+ {{item}}
+
+
+
-
+
确定选择
diff --git a/pages/user/my_service/tment_details.js b/pages/user/my_service/tment_details.js
index 7fd3089..6facf10 100644
--- a/pages/user/my_service/tment_details.js
+++ b/pages/user/my_service/tment_details.js
@@ -1,7 +1,8 @@
var e = getApp(),
a = e.globalData.setting,
os = a,
- t = e.request;
+ t = e.request,
+ d = e.globalData;
Page({
/**
@@ -9,13 +10,25 @@ Page({
*/
data: {
iurl: a.imghost,
+ tment_details: [], //预约详情
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
-
+ var th = this;
+ var url = "http://localhost:8022/api/weshop/yy_fuwu_meirsxiangq";
+ wx.request({
+ url: url,
+ success: function(res) {
+ if (res.data.code == 0) {
+ th.setData({
+ tment_details:res.data.data
+ })
+ }
+ }
+ })
},
/**
* 生命周期函数--监听页面显示
diff --git a/pages/user/my_service/tment_details.json b/pages/user/my_service/tment_details.json
index dd9566f..3132bf0 100644
--- a/pages/user/my_service/tment_details.json
+++ b/pages/user/my_service/tment_details.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "预约详情"
+ "navigationBarTitleText": "预约详情",
+ "usingComponents": {
+ "warn": "/components/long_warn/long_warn"
+ }
}
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.wxml b/pages/user/my_service/tment_details.wxml
index 6acdce9..5350629 100644
--- a/pages/user/my_service/tment_details.wxml
+++ b/pages/user/my_service/tment_details.wxml
@@ -4,29 +4,30 @@
预约状态：
- 未服务
- 已服务
- 已过期
+ 未服务
+ 已服务
+ 已过期
+ 已取消
预约门店:
- 王者峡谷中路店
+ {{tment_details.store_name}}
预约项目:
- 王者峡谷中路店
+ {{tment_details.item}}
预约时间:
- 2018-08-16
- 10:00
+ {{tment_details.time}}
+ {{tment_details.time_interval}}
@@ -38,7 +39,7 @@
容
师:
- 王者峡谷中路店
+ {{tment_details.Beautician}}
@@ -48,7 +49,7 @@
约
人:
- 钱巧玲
+ {{tment_details.name}}
@@ -57,7 +58,7 @@
机
人:
- 18065336494
+ {{tment_details.phone}}
@@ -82,16 +83,16 @@
- 取消预约
- 删除订单
- 更改时间
+ 取消预约
+ 删除订单
- 更改时间
- 重新预约
- 发表评价
+ 更改时间
+ 发表评价
+ 重新预约
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/pages/user/my_service/tment_order_list.js b/pages/user/my_service/tment_order_list.js
index 8a35050..5ab56e2 100644
--- a/pages/user/my_service/tment_order_list.js
+++ b/pages/user/my_service/tment_order_list.js
@@ -49,6 +49,18 @@ Page({
return false;
}
},
+ //显示核销码
+ code_show: function (e) {
+ var th = this;
+ //--获取成功的时候--
+ var no = e.currentTarget.dataset.order_sn;
+ var qc_com = th.selectComponent("#qc_com"); //组件的id
+ var obj = {
+ val: no,
+ content: "请将二维码展示给核销员，使用更快捷"
+ };
+ qc_com.open(obj)
+ },
query_orderList: function() {
var th = this;
var url = "http://localhost:8022/api/weshop/yy_order_list";
diff --git a/pages/user/my_service/tment_order_list.json b/pages/user/my_service/tment_order_list.json
index 4562f44..8a0db23 100644
--- a/pages/user/my_service/tment_order_list.json
+++ b/pages/user/my_service/tment_order_list.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "我的预约"
+ "navigationBarTitleText": "我的预约",
+ "usingComponents": {
+ "qr_code": "/components/qr_code/qr_code"
+ }
}
\ 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 eedf0c8..b6c1823 100644
--- a/pages/user/my_service/tment_order_list.wxml
+++ b/pages/user/my_service/tment_order_list.wxml
@@ -9,19 +9,15 @@
-
+
订单编号：{{item.order_sn}}
-
-
-
+
+
未服务
已服务
已过期
-
-
-
-
+ 已取消
@@ -59,15 +55,16 @@
-
+
+
取消预约
- 查看详情
+ 查看详情
- 更改时间
- 发表评价
- 重新预约
+ 更改时间
+ 发表评价
+ 重新预约
@@ -90,4 +87,6 @@
立即预约
-
\ No newline at end of file
+
+
+
\ 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 7c46cde..cc8d994 100644
--- a/pages/user/my_service/tment_order_list.wxss
+++ b/pages/user/my_service/tment_order_list.wxss
@@ -46,15 +46,20 @@ page {
}
.order_number {
- max-width: 500rpx;
+ max-width: 550rpx;
+}
+.state{
+ color: rgb(216,63,82);
}
-
.items {
border-top: 4rpx solid rgb(245, 245, 245);
border-bottom: 4rpx solid rgb(245, 245, 245);
height: 260rpx;
}
-
+.code{
+ width: 55rpx;
+ height: 55rpx;
+}
.itemimage {
width: 190rpx;
height: 190rpx;