diff --git a/pages/user/Appment_main/Appment_main.js b/pages/user/Appment_main/Appment_main.js
index 4c85287..e1791ed 100644
--- a/pages/user/Appment_main/Appment_main.js
+++ b/pages/user/Appment_main/Appment_main.js
@@ -1,24 +1,69 @@
-var e = getApp(), a = e.globalData.setting, os = a, t = e.request;
+var e = getApp(),
+ a = e.globalData.setting,
+ os = a,
+ t = e.request;
Page({
/**
* 页面的初始数据
*/
data: {
- iurl: a.imghost,
+ iurl: a.imghost, //服务器网址
+ store: 0, //是否显示服务门店列表
+ beautician: 0, //是否显示美容师列表
+ beautician_name: "", //选中的美容师名称
+ placeholder: "填写备注",//备注为空的placeholder
+ },
+ onclickstore: function() {
+ var th = this;
+ var store = th.data.store;
+ if (store) {
+ th.setData({
+ store: 0
+ })
+ } else {
+ th.setData({
+ store: 1,
+ placeholder:""
+ })
+ }
+ },
+ onclickbea: function(e) {
+ var th = this;
+ var beautician = th.data.beautician;
+ var beaname = e.currentTarget.dataset.beaname;
+ if (beautician) {
+ // 判断是否选择美容师没有的话就把美容师列表收起来
+ if (beaname != undefined) {
+ th.setData({
+ beautician: 0,
+ beautician_name: beaname,
+ placeholder: "填写备注"
+ })
+ } else {
+ th.setData({
+ beautician: 0,
+ placeholder: "填写备注"
+ })
+ }
+ } else {
+ th.setData({
+ beautician: 1,
+ placeholder: ""
+ })
+ }
},
-
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
+ onLoad: function(options) {
},
/**
* 生命周期函数--监听页面显示
*/
- onShow: function () {
+ onShow: function() {
}
})
\ No newline at end of file
diff --git a/pages/user/Appment_main/Appment_main.wxml b/pages/user/Appment_main/Appment_main.wxml
index b585a86..fa10a7c 100644
--- a/pages/user/Appment_main/Appment_main.wxml
+++ b/pages/user/Appment_main/Appment_main.wxml
@@ -11,12 +11,11 @@
-
-
+
+ 选择服务门店
∟
-
@@ -27,11 +26,24 @@
-
-
- ∟
+
+
+ {{beautician_name==''?'选择美容师':beautician_name}}
+ ∟
+
+
+
+
+
+ 钱巧玲
+
+
+
+
-
+
+
+
@@ -42,10 +54,10 @@
-
-
- ∟
-
+
+ 选择时间
+ ∟
+
@@ -55,16 +67,19 @@
备
注
-
-
+
+ 注：剩余可预约人数10人
+
-
+
我的预约
-
+
提交预约
@@ -76,26 +91,48 @@
预约成功
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+ 选择服务门店
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 泉州开元盛世广场店
+
+ 距您: 728m
+
+
+ 地址:福建省泉州市鲤城区开元盛世广场248-257店面
+
+
+
+
+
+
+ 确定
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/Appment_main/Appment_main.wxss b/pages/user/Appment_main/Appment_main.wxss
index f62f4d1..f99285f 100644
--- a/pages/user/Appment_main/Appment_main.wxss
+++ b/pages/user/Appment_main/Appment_main.wxss
@@ -1,6 +1,7 @@
-.container{
+.container {
border-top: 7rpx solid rgb(245, 245, 245);
}
+
.main {
width: 100%;
height: 305rpx;
@@ -11,11 +12,17 @@
margin-right: 15rpx;
margin-bottom: 10rpx;
font-size: 26rpx;
+ color: rgb(142,142,142);
+}
+.angler{
+ transform: rotate(227deg);
+ margin-bottom: 0rpx;
}
.user {
width: 40rpx;
height: 45rpx;
+ margin-left: 15rpx;
}
.Fram {
@@ -47,7 +54,7 @@
.appment, .sub_appment {
width: 270rpx;
height: 55rpx;
- border-radius: 25rpx;
+ border-radius: 40rpx;
}
.appment {
@@ -56,22 +63,25 @@
.sub_appment {
background-color: rgb(214, 1, 33);
- color: rgb(255, 255, 255);
+ color: rgb(255, 255, 255);
}
.head {
- width: 115rpx;
+ width: 112rpx;
margin-right: 40rpx;
+ height: 50rpx;
+ line-height: 50rpx;
}
textarea {
- width: 435rpx;
+ width: 420rpx;
background-color: rgb(238, 238, 238);
border-radius: 10rpx;
- height: 115rpx;
+ height: 130rpx;
padding-left: 40rpx;
- padding-top: 20rpx;
- margin-bottom: 60rpx;
+ padding-right: 15rpx;
+ padding-top: 15rpx;
+ padding-bottom: 15rpx;
}
.mabot {
@@ -89,19 +99,163 @@ textarea {
}
.Cosmetology {
- padding-left: 40rpx;
+ padding-left: 40rpx;
padding-right: 15rpx;
width: 365rpx;
background-color: rgb(238, 238, 238);
height: 50rpx;
line-height: 50rpx;
border-radius: 10rpx;
- margin-right: 15rpx;
}
+
+.beauticians{
+ width: 407rpx;
+ z-index: 3;
+ top: 45rpx;
+ left: 0rpx;
+ padding: 0rpx 5rpx;
+ border: 2rpx solid rgb(238, 238, 238);
+ background-color: rgb(255, 255, 255);
+}
+
+.beautician {
+ height: 60rpx;
+ border-bottom: 2rpx solid rgb(238, 238, 238);
+ padding-left: 25rpx;
+}
+.beaclone{
+ border-bottom: 0rpx;
+}
+.notes {
+ margin-top: 15rpx;
+ margin-bottom: 60rpx;
+ margin-right: 8rpx;
+}
+
+.color {
+ color: rgb(172, 172, 172);
+}
+
.submitMax {
margin-top: 50rpx;
padding: 0rpx 15rpx;
}
-.Remarks{
+
+.Remarks {
margin-top: 15rpx;
+}
+
+/* 蒙尘 */
+
+.disgraceful {
+ position: fixed;
+ z-index: 3;
+ width: 100%;
+ height: 100%;
+ top: 0rpx;
+ left: 0rpx;
+ background-color: rgba(0, 0, 0, 0.4);
+}
+
+.storeList {
+ z-index: 4;
+ left: 0rpx;
+ border-top-left-radius: 25rpx;
+ border-top-right-radius: 25rpx;
+ background-color: rgb(255, 255, 255);
+ width: 100%;
+ padding: 45rpx 0rpx;
+}
+
+.storeListpadd {
+ padding: 0rpx 31rpx;
+}
+
+.choice {
+ margin-bottom: 5rpx;
+}
+
+.inputstore {
+ width: 510rpx;
+ height: 43rpx;
+ line-height: 43rpx;
+ border-radius: 30rpx;
+ border: 2rpx solid rgb(238, 238, 238);
+ padding-left: 30rpx;
+}
+
+.searchbar {
+ height: 95rpx;
+ border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+
+.search {
+ width: 125rpx;
+ height: 45rpx;
+ line-height: 45rpx;
+ background-color: rgb(219, 27, 52);
+ border-radius: 30rpx;
+ color: rgb(255, 255, 255);
+}
+
+.stores {
+ height: 468rpx;
+ overflow-y: scroll;
+}
+
+.store {
+ margin: 0rpx 16rpx;
+ padding-right: 15rpx;
+ border-bottom: 2rpx solid rgb(238, 238, 238);
+ padding: 20rpx 0rpx;
+}
+
+.icon {
+ padding: 0rpx 15rpx;
+}
+
+.circular {
+ width: 38rpx;
+ height: 38rpx;
+ border-radius: 50%;
+ border: 2rpx solid rgb(52, 52, 52);
+ margin: 0rpx 15rpx;
+}
+
+.store_name_dis {
+ width: 90%;
+}
+
+.name_dis {
+ margin-bottom: 5rpx;
+}
+
+.store_name {
+ max-width: 420rpx;
+}
+
+.store_dis {
+ height: 30rpx;
+ padding: 5rpx 15rpx;
+ background-color: rgb(227, 227, 227);
+ border-radius: 25rpx;
+ margin-right: 20rpx;
+ color: rgb(159, 159, 159);
+ max-width: 150rpx;
+}
+
+.store_address {
+ color: rgb(159, 159, 159);
+}
+
+.determine {
+ background-color: rgb(196, 24, 26);
+ width: 500rpx;
+ border-radius: 35rpx;
+ height: 60rpx;
+ color: rgb(255, 255, 255);
+ margin: 20rpx 0rpx;
+}
+.value{
+ max-width: 300rpx;
}
\ No newline at end of file
diff --git a/pages/user/Cosmetology_list/Cosmetology_list.js b/pages/user/Cosmetology_list/Cosmetology_list.js
index c6a154c..f8fd284 100644
--- a/pages/user/Cosmetology_list/Cosmetology_list.js
+++ b/pages/user/Cosmetology_list/Cosmetology_list.js
@@ -1,4 +1,7 @@
-var e = getApp(), a = e.globalData.setting, os = a, t = e.request;
+var e = getApp(),
+ a = e.globalData.setting,
+ os = a,
+ t = e.request;
Page({
/**
@@ -11,56 +14,15 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
+ onLoad: function(options) {
},
/**
* 生命周期函数--监听页面显示
*/
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
+ onShow: function() {
},
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
})
\ No newline at end of file
diff --git a/pages/user/Cosmetology_list/Cosmetology_list.wxml b/pages/user/Cosmetology_list/Cosmetology_list.wxml
index 8b9c3da..fcec03a 100644
--- a/pages/user/Cosmetology_list/Cosmetology_list.wxml
+++ b/pages/user/Cosmetology_list/Cosmetology_list.wxml
@@ -2,7 +2,7 @@
-
+
@@ -15,6 +15,7 @@
+
@@ -33,10 +34,10 @@
-
-
+
+
预约
-
+
@@ -55,10 +56,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+ 暂无美容师
+
+
+ 其他项目
+
+
\ No newline at end of file
diff --git a/pages/user/Cosmetology_list/Cosmetology_list.wxss b/pages/user/Cosmetology_list/Cosmetology_list.wxss
index d5172a8..c0c9f3f 100644
--- a/pages/user/Cosmetology_list/Cosmetology_list.wxss
+++ b/pages/user/Cosmetology_list/Cosmetology_list.wxss
@@ -1,3 +1,10 @@
+page{
+ height: 100%;
+ background-color: rgb(238, 238, 238);
+}
+.container{
+ background-color: rgb(255,255,255);
+}
.appointment {
width: 100%;
height: 305rpx;
@@ -75,3 +82,26 @@
text-indent: 2em;
color: rgb(103, 103, 103);
}
+/* 无订单 */
+.empty_order image {
+ width: 330rpx;
+ height: 280rpx;
+ margin-top: 120rpx;
+}
+
+.empty_order .xc-ash {
+ margin-top: 10rpx;
+ font-weight: 600px;
+}
+
+.empty_order navigator {
+ margin-top: 60rpx;
+ border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+ width: 247rpx;
+ height: 56rpx;
+ background-color: rgb(255, 72, 72);
+ border-radius: 40rpx;
+}
\ No newline at end of file
diff --git a/pages/user/beauty_deta/beauty_deta.js b/pages/user/beauty_deta/beauty_deta.js
new file mode 100644
index 0000000..c6a154c
--- /dev/null
+++ b/pages/user/beauty_deta/beauty_deta.js
@@ -0,0 +1,66 @@
+var e = getApp(), a = e.globalData.setting, os = a, t = e.request;
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ iurl: a.imghost,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/user/beauty_deta/beauty_deta.json b/pages/user/beauty_deta/beauty_deta.json
new file mode 100644
index 0000000..35448af
--- /dev/null
+++ b/pages/user/beauty_deta/beauty_deta.json
@@ -0,0 +1,3 @@
+{
+ "navigationBarTitleText": "美容师详情"
+}
\ No newline at end of file
diff --git a/pages/user/beauty_deta/beauty_deta.wxml b/pages/user/beauty_deta/beauty_deta.wxml
new file mode 100644
index 0000000..3b428c6
--- /dev/null
+++ b/pages/user/beauty_deta/beauty_deta.wxml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/beauty_deta/beauty_deta.wxss b/pages/user/beauty_deta/beauty_deta.wxss
new file mode 100644
index 0000000..656f90e
--- /dev/null
+++ b/pages/user/beauty_deta/beauty_deta.wxss
@@ -0,0 +1,134 @@
+.container {
+ border-top: 7rpx solid rgb(245, 245, 245);
+}
+
+.backcolor {
+ position: absolute;
+ top: 0rpx;
+ left: 0rpx;
+ z-index: 0;
+ width: 100%;
+ height: 270rpx;
+ background-color: rgb(214, 1, 33);
+}
+
+.comments {
+ position: absolute;
+ top: 45rpx;
+ left: 0rpx;
+ z-index: 1;
+ padding: 0rpx 23rpx;
+}
+
+.name {
+ font-weight: bold;
+ float: left;
+ width: 250rpx;
+}
+
+.head {
+ width: 130rpx;
+ height: 130rpx;
+ border-radius: 50%;
+ float: right;
+ margin: 0rpx 15rpx;
+ border: 2rpx solid red;
+}
+
+.introduce {
+ margin-top: 90rpx;
+ text-indent: 2em;
+ color: rgb(102, 102, 102);
+}
+
+.Personal {
+ width: 640rpx;
+ height: 300rpx;
+ background-color: rgb(255, 255, 255);
+ border-radius: 5rpx;
+ box-shadow: 0rpx 2rpx 2rpx 2rpx rgb(250, 228, 230);
+ margin-bottom: 65rpx;
+ padding-top: 40rpx;
+ padding-left: 35rpx;
+ padding-right: 35rpx;
+}
+
+.choice {
+ width: 704rpx;
+ height: 70rpx;
+ background-color: rgb(214, 1, 33);
+ color: rgb(255, 255, 255);
+}
+
+.scroll-h {
+ white-space: nowrap;
+ width: 704rpx;
+ margin-bottom: 25rpx;
+ overflow: visible;
+ height: 125rpx;
+ color: transparent;
+}
+
+.scroll-item-h {
+ display: inline-block;
+ width: 172rpx;
+ text-align: center;
+ overflow: visible;
+ height: 70rpx;
+ padding: 15rpx 0rpx;
+}
+::-webkit-scrollbar{
+ width: 0;
+ height: 0;
+ color: transparent;
+}
+.box {
+ width: 0px;
+ height: 0px;
+ margin-left: 15rpx;
+ border-top: 21rpx solid transparent;
+ border-right: 21rpx solid transparent;
+ border-left: 21rpx solid transparent;
+ display: inline-block;
+ transform: rotate(180deg);
+ border-bottom: 21rpx solid rgb(214, 1, 33);
+}
+
+.bd {
+ border: 2rpx solid rgb(238, 238, 238);
+ background-color: rgb(255, 255, 255);
+ color: rgb(20, 20, 20);
+}
+
+.chbd {
+ border: 2rpx solid rgb(214, 1, 33);
+ background-color: rgb(214, 1, 33);
+ color: rgb(255, 255, 255);
+}
+
+.Times {
+ background-color: rgb(238, 243, 247);
+ margin-bottom: 30rpx;
+ width: 704rpx;
+}
+
+.Time {
+ border: 2rpx solid rgb(238, 238, 238);
+ width: 172rpx;
+ height: 70rpx;
+ background-color: rgb(255, 255, 255);
+ text-align: center;
+ padding-top: 15rpx;
+ padding-bottom: 15rpx;
+}
+.chTime{
+ border-color: rgb(214, 1, 33);
+}
+.nochTime{
+ color: rgb(174,177,177);
+ background-color: rgb(250,250,250);
+}
+.abs {
+ left: 55rpx;
+ bottom: -39rpx;
+}
diff --git a/pages/user/hist_service/hist_service.js b/pages/user/hist_service/hist_service.js
index c6a154c..f7b56a6 100644
--- a/pages/user/hist_service/hist_service.js
+++ b/pages/user/hist_service/hist_service.js
@@ -1,4 +1,7 @@
-var e = getApp(), a = e.globalData.setting, os = a, t = e.request;
+var e = getApp(),
+ a = e.globalData.setting,
+ os = a,
+ t = e.request;
Page({
/**
@@ -6,61 +9,100 @@ Page({
*/
data: {
iurl: a.imghost,
+ isPickerShow: false,
+ isPickerRender: false,
+ startTime: 0,
+ endTime: 0,
+ pickerConfig: {
+ endDate: true,
+ column: "",
+ dateLimit: true,
+ initStartTime: "2019-01-01 12:32:44",
+ initEndTime: "2019-12-01 12:32:44",
+ limitStartTime: "1917-05-06 12:32:44",
+ limitEndTime: "2055-05-06 12:32:44"
+ },
+ },
+ pickerShow: function() {
+ this.setData({
+ isPickerShow: true,
+ isPickerRender: true,
+ chartHide: true
+ });
+ },
+ pickerHide: function() {
+ var th = this;
+ th.setData({
+ isPickerShow: false,
+ chartHide: false
+ });
+ },
+ //--选择时间--
+ setPickerTime: function(val) {
+ let data = val.detail,
+ gl_data = getApp().globalData,
+ th = this;
+ th.setData({
+ startTime: data.startTime,
+ endTime: data.endTime,
+ val: 0,
+ distance: 0,
+ });
+ console.log("开始" + data.startTime + "结束" + data.endTime, );
},
-
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
+ onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
- onReady: function () {
+ onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
- onShow: function () {
+ onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
- onHide: function () {
+ onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
- onUnload: function () {
+ onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
- onPullDownRefresh: function () {
+ onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
- onReachBottom: function () {
+ onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
- onShareAppMessage: function () {
+ onShareAppMessage: function() {
}
})
\ No newline at end of file
diff --git a/pages/user/hist_service/hist_service.json b/pages/user/hist_service/hist_service.json
index 8c9f8ad..1bfb602 100644
--- a/pages/user/hist_service/hist_service.json
+++ b/pages/user/hist_service/hist_service.json
@@ -1,3 +1,7 @@
{
- "navigationBarTitleText": "历史服务"
+ "navigationBarTitleText": "历史服务",
+ "usingComponents": {
+ "timePicker": "/components/timePicker/timePicker",
+ "warn": "/components/long_warn/long_warn"
+ }
}
\ No newline at end of file
diff --git a/pages/user/hist_service/hist_service.wxml b/pages/user/hist_service/hist_service.wxml
index 3c2696d..8f195b5 100644
--- a/pages/user/hist_service/hist_service.wxml
+++ b/pages/user/hist_service/hist_service.wxml
@@ -1,4 +1,4 @@
-
+
@@ -13,8 +13,8 @@
筛选
-
-
+
+
@@ -37,5 +37,21 @@
已服务
+
+
+
+
+
+
+ 暂无服务记录
+
+
+ 前往使用
+
+
+
+
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/pages/user/hist_service/hist_service.wxss b/pages/user/hist_service/hist_service.wxss
index 66b07d0..0611d43 100644
--- a/pages/user/hist_service/hist_service.wxss
+++ b/pages/user/hist_service/hist_service.wxss
@@ -1,3 +1,7 @@
+page {
+ height: 100%;
+}
+
.box {
width: 0px;
height: 0px;
@@ -55,3 +59,39 @@
.serState {
color: rgb(255, 82, 125);
}
+
+.container {
+ position: fixed;
+ width: 100%;
+ top: 0rpx;
+}
+
+/* 无历史服务 */
+
+.empty_order {
+ height: 100%;
+ background-color: rgb(238, 238, 238);
+}
+
+.empty_order image {
+ width: 329rpx;
+ height: 229rpx;
+ margin-top: 202rpx;
+}
+
+.empty_order .xc-ash {
+ margin-top: 10rpx;
+ font-weight: 600px;
+}
+
+.empty_order navigator {
+ margin-top: 60rpx;
+ border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+ width: 247rpx;
+ height: 56rpx;
+ background-color: rgb(255, 72, 72);
+ border-radius: 40rpx;
+}
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index bb47691..dcaffa9 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -191,11 +191,12 @@
我的地址
-
+
+
+
+ 我的服务
+
-
-
-
diff --git a/pages/user/my_service/my_service.js b/pages/user/my_service/my_service.js
new file mode 100644
index 0000000..e29f7bd
--- /dev/null
+++ b/pages/user/my_service/my_service.js
@@ -0,0 +1,126 @@
+var e = getApp(),
+ a = e.globalData.setting,
+ os = a,
+ t = e.request;
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ qr_code_object: {
+ val: "12121",
+ content: "请将二维码展示给核销员，服务更快捷！"
+ },
+ iurl: a.imghost,
+ service_List: null, //服务项目列表
+ is_service_read: 0,
+ curpage: 1,
+ total: 0,
+ ismore: 0,
+ userinfo: null
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+ var userinfo = getApp().globalData.userInfo;
+ if (userinfo == null) {
+ //界面必须使用warn 做ID,并调用
+ getApp().my_warnning("会员为空", 0, this);
+ return false;
+ }
+ this.setData({
+ userinfo: userinfo
+ });
+ },
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+ var th = this;
+ th.query_service();
+ },
+ onReachBottom: function() {
+ if (this.data.total <= 8) return;
+ if (this.data.ismore) return;
+ this.query_service();
+ },
+ //查询服务项目列表
+ query_service: function() {
+ var th = this;
+ var url = "http://localhost:8022/api/weshop/users/grade/wechat/cash/page";
+ // //获取服务项目
+ // getApp().request.promiseGet("/api/weshop/users/grade/wechat/cash/page", {
+
+ // }).then(res => {
+ // console.log("11111111111"+res);
+ // })
+ wx.request({
+ url: "http://localhost:8022/api/weshop/yy_fuwu_list",
+ success: function(res) {
+
+ console.log("11111111111" + res.data.data.pageData);
+ if (res.data.code == 0) {
+
+ // th.data.curpage++;
+ // var arr1 = th.data.service_List;
+ // var arr2 = res.data.data.pageData;
+ // var arr3 = [...arr1, ...arr2];
+
+ // var ismore = 0;
+ // if (arr3.length == res.data.data.total) ismore = 1
+
+ // th.setData({
+ // service_List: arr3,
+ // total: res.data.data.total,
+ // ismore: ismore,
+ // is_service_read: 1
+ // }), wx.stopPullDownRefresh(); //停止下拉刷新
+
+ th.setData({
+ service_List: res.data.data.pageData
+ })
+ console.log(th.data.service_List.name + "111");
+ }
+ }
+ })
+ },
+ /*-- 打开服务项目 --*/
+ open_fw: function(e) {
+ var th = this;
+ var ind = e.currentTarget.dataset.ind;
+ var item = this.data.service_List[ind];
+
+ var ewm = "^" + this.data.userinfo.erpvipid + "|" + item.id + "|" + item.type_b + "|" + item.time+ "|TY01|";
+ var tt = th.format_time(1);
+ ewm = ewm + tt;
+ th.data.qr_code_object.val = ewm;
+ th.data.qr_code_object.is_fw = 1;
+ console.log(ewm);
+ var qc_com = th.selectComponent("#qc_com"); //组件的id
+ qc_com.open(th.data.qr_code_object)
+ },
+ //图片失败，默认图片
+ bind_bnerr1: function(e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _Img = e.target.dataset.img;
+ if (_Img != undefined) {
+ var _errObj = {};
+ _errObj[_errImg] = "/miniapp/images/no_cate_def.png";
+ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ }
+ },
+ format_time: function(isFull) {
+ var d = new Date();
+ var m = d.getMonth() + 1;
+ if (m < 10) m = "0" + m;
+ var dd = d.getDate();
+ if (dd < 10) dd = "0" + dd;
+ var fm = [d.getFullYear(), m, dd].join('-');
+ if (isFull == 1)
+ fm = fm + ' ' + [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
+ return fm;
+ },
+})
\ No newline at end of file
diff --git a/pages/user/my_service/my_service.json b/pages/user/my_service/my_service.json
new file mode 100644
index 0000000..88d15ea
--- /dev/null
+++ b/pages/user/my_service/my_service.json
@@ -0,0 +1,7 @@
+{
+ "navigationBarTitleText": "服务项目",
+ "usingComponents": {
+ "qr_code": "/components/qr_code/qr_code",
+ "warn": "/components/long_warn/long_warn"
+ }
+}
\ No newline at end of file
diff --git a/pages/user/my_service/my_service.wxml b/pages/user/my_service/my_service.wxml
new file mode 100644
index 0000000..e789d41
--- /dev/null
+++ b/pages/user/my_service/my_service.wxml
@@ -0,0 +1,83 @@
+
+
+
+ 历史服务
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+ 剩余次数：
+ {{item.chishu}}
+
+
+
+ 有效期至
+ {{item.time}}
+
+
+
+
+
+
+ 立即使用
+
+
+
+
+ 预约
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无服务项目
+
+
+ 回到首页
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/my_service/my_service.wxss b/pages/user/my_service/my_service.wxss
new file mode 100644
index 0000000..73ae327
--- /dev/null
+++ b/pages/user/my_service/my_service.wxss
@@ -0,0 +1,148 @@
+page {
+ overflow-x: scroll;
+}
+
+/* 背景定位 */
+
+.backimage {
+ position: absolute;
+ top: 0rpx;
+ left: 0rpx;
+ z-index: 0;
+ width: 100%;
+ height: 100%;
+}
+
+/* 历史服务定位 */
+
+.History {
+ position: absolute;
+ top: 30rpx;
+ right: 20rpx;
+ z-index: 1;
+ color: rgb(255, 255, 255);
+}
+
+.rel {
+ background-color: rgb(255, 255, 255);
+ width: 350rpx;
+ height: 420rpx;
+ border-radius: 20rpx;
+ display: inline-block;
+ margin-right: 15rpx;
+ margin-bottom: 20rpx;
+ box-shadow: 0rpx 3rpx 3rpx 3rpx rgb(233, 233, 233);
+}
+
+.abs {
+ left: 10rpx;
+ top: 10rpx;
+}
+
+.equity_money {
+ width: 50rpx;
+ height: 55rpx;
+}
+
+.Serviceitems {
+ position: relative;
+ top: 370rpx;
+ left: 0rpx;
+ z-index: 2;
+ padding-left: 18rpx;
+}
+
+.itemimage {
+ width: 120rpx;
+ height: 120rpx;
+ border-radius: 50%;
+ margin-top: 30rpx;
+ margin-bottom: 20rpx;
+}
+
+.itemName {
+ margin-bottom: 25rpx;
+ color: rgb(48, 48, 48);
+}
+
+.itemName .Name {
+ max-width: 250rpx;
+ text-align: center;
+}
+
+.itemCount {
+ margin-bottom: 5rpx;
+ color: rgb(177, 177, 177);
+}
+
+.itemEffective {
+ margin-bottom: 30rpx;
+ color: rgb(177, 177, 177);
+}
+
+.functionMax {
+ padding: 0rpx 25rpx;
+ color: rgb(254, 255, 255);
+}
+
+.Use {
+ width: 170rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ border-radius: 25rpx;
+ background-color: red;
+}
+
+.appointment {
+ width: 115rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ border-radius: 25rpx;
+ background-color: #ff9c00;
+ margin-left: 20rpx;
+}
+
+.Date {
+ margin-left: 10rpx;
+}
+/* 无服务项目 */
+.cover{
+ position: fixed;
+ z-index: 1;
+ left: 0rpx;
+ top: 390rpx;
+ width: 100%;
+ height: 200rpx;
+ background-color: rgb(255, 255, 255);
+}
+/* 无历史服务 */
+.empty_order{
+ position: fixed;
+ left: 0rpx;
+ top: 500rpx;
+ z-index: 2;
+ width: 100%;
+}
+
+.empty_order image {
+ width: 329rpx;
+ height: 229rpx;
+ margin-top: 80rpx;
+}
+
+.empty_order .xc-ash {
+ margin-top: 10rpx;
+ font-weight: 600px;
+}
+
+.empty_order navigator {
+ margin-top: 60rpx;
+ border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+ width: 247rpx;
+ height: 56rpx;
+ background-color: rgb(255, 72, 72);
+ border-radius: 40rpx;
+}
\ No newline at end of file
diff --git a/pages/user/tment_details/tment_details.js b/pages/user/tment_details/tment_details.js
new file mode 100644
index 0000000..7fd3089
--- /dev/null
+++ b/pages/user/tment_details/tment_details.js
@@ -0,0 +1,26 @@
+var e = getApp(),
+ a = e.globalData.setting,
+ os = a,
+ t = e.request;
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ iurl: a.imghost,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+
+ },
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+
+ },
+})
\ No newline at end of file
diff --git a/pages/user/tment_details/tment_details.json b/pages/user/tment_details/tment_details.json
new file mode 100644
index 0000000..dd9566f
--- /dev/null
+++ b/pages/user/tment_details/tment_details.json
@@ -0,0 +1,3 @@
+{
+ "navigationBarTitleText": "预约详情"
+}
\ No newline at end of file
diff --git a/pages/user/tment_details/tment_details.wxml b/pages/user/tment_details/tment_details.wxml
new file mode 100644
index 0000000..6acdce9
--- /dev/null
+++ b/pages/user/tment_details/tment_details.wxml
@@ -0,0 +1,97 @@
+
+
+
+
+
+ 预约状态：
+ 未服务
+ 已服务
+ 已过期
+
+
+
+
+
+ 预约门店:
+ 王者峡谷中路店
+
+
+
+
+ 预约项目:
+ 王者峡谷中路店
+
+
+
+
+ 预约时间:
+ 2018-08-16
+ 10:00
+
+
+
+
+
+
+
+ 美
+ 容
+ 师:
+
+ 王者峡谷中路店
+
+
+
+
+
+ 预
+ 约
+ 人:
+
+ 钱巧玲
+
+
+
+
+ 手
+ 机
+ 人:
+
+ 18065336494
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 温馨提示
+
+ 1.预约成功后需在指定时间前到达;
+ 2.如有任何问题可致电咨询;
+ 3.如需退约，需提前取消。
+
+
+
+
+
+
+ 取消预约
+ 删除订单
+ 更改时间
+
+
+
+ 更改时间
+ 重新预约
+ 发表评价
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/tment_details/tment_details.wxss b/pages/user/tment_details/tment_details.wxss
new file mode 100644
index 0000000..59f324b
--- /dev/null
+++ b/pages/user/tment_details/tment_details.wxss
@@ -0,0 +1,112 @@
+page {
+ width: 100%;
+ height: 100%;
+ background-color: rgb(238, 238, 238);
+}
+
+/* 公用 */
+
+.lf {
+ padding: 0rpx 40rpx;
+}
+
+.bt {
+ margin: 0rpx 15rpx;
+ padding: 0rpx 25rpx;
+ border-top: 2rpx dashed rgb(238, 238, 238);
+ padding-top: 50rpx;
+ padding-bottom: 50rpx;
+}
+
+.bmt {
+ margin-bottom: 45rpx;
+}
+
+.name {
+ width: 130rpx;
+ margin-right: 25rpx;
+}
+
+.value {
+ max-width: 450rpx;
+}
+
+/* 公用 */
+
+.container {
+ padding: 0rpx 20rpx;
+}
+
+.Subscriber {
+ overflow: hidden;
+ width: 100%;
+ margin-top: 25rpx;
+ background-color: rgb(255, 255, 255);
+ border-radius: 10rpx;
+}
+
+.statusBar {
+ height: 80rpx;
+ background-color: rgb(214, 1, 33);
+ color: rgb(255, 255, 255);
+}
+
+.date {
+ margin-right: 25rpx;
+}
+
+.items {
+ margin: 55rpx 0rpx;
+}
+
+.Tips {
+ margin-top: 20rpx;
+ padding-top: 35rpx;
+ height: 255rpx;
+ border-radius: 10rpx;
+ background-color: rgb(255, 255, 255);
+ margin-bottom: 50rpx;
+}
+
+.Cozy {
+ width: 165rpx;
+ height: 43rpx;
+ margin-bottom: 20rpx;
+ color: rgb(255, 255, 255);
+ background-size: 100%;
+}
+
+.subs {
+ padding: 0rpx 5rpx;
+}
+
+.sub {
+ width: 325rpx;
+ height: 65rpx;
+ border-radius: 30rpx;
+ color: rgb(255, 255, 255);
+}
+
+.lb {
+ background-color: rgb(153, 153, 153);
+}
+
+.rb {
+ background-color: rgb(214, 1, 33);
+}
+
+/* 棒槌 */
+
+.Stickl {
+ width: 39rpx;
+ height: 8rpx;
+ background-color: rgb(153, 153, 153);
+ transform: rotate(270deg);
+ border-radius: 8rpx;
+ left: 95rpx;
+ top: -15rpx;
+}
+
+.Stickr {
+ left: 590rpx;
+}
diff --git a/pages/user/tment_eval/tment_eval.js b/pages/user/tment_eval/tment_eval.js
new file mode 100644
index 0000000..9678987
--- /dev/null
+++ b/pages/user/tment_eval/tment_eval.js
@@ -0,0 +1,27 @@
+var e = getApp(),
+ a = e.globalData.setting,
+ os = a,
+ t = e.request;
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ iurl: a.imghost,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+
+ },
+})
\ No newline at end of file
diff --git a/pages/user/tment_eval/tment_eval.json b/pages/user/tment_eval/tment_eval.json
new file mode 100644
index 0000000..af0d2da
--- /dev/null
+++ b/pages/user/tment_eval/tment_eval.json
@@ -0,0 +1,3 @@
+{
+ "navigationBarTitleText": "预约评价"
+}
\ No newline at end of file
diff --git a/pages/user/tment_eval/tment_eval.wxml b/pages/user/tment_eval/tment_eval.wxml
new file mode 100644
index 0000000..8c5ed71
--- /dev/null
+++ b/pages/user/tment_eval/tment_eval.wxml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+ 美容师：
+ 钱巧玲
+
+
+
+
+ 服务项目：
+ 头部按摩
+
+
+
+
+ 服务时间：
+ 2019-09-06
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 衣着整洁
+
+
+ 穿着专业
+
+
+ 准时到达
+
+
+ 服务态度好
+
+
+
+
+
+ 满意的话请打五星噢，谢谢您的支持!
+
+
+
+
+ 确认提交
+
+
+
+
+
+
+
+
+
+ 评论成功
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/tment_eval/tment_eval.wxss b/pages/user/tment_eval/tment_eval.wxss
new file mode 100644
index 0000000..e8abea2
--- /dev/null
+++ b/pages/user/tment_eval/tment_eval.wxss
@@ -0,0 +1,111 @@
+.container {
+ border-top: 7rpx solid rgb(245, 245, 245);
+}
+
+.head {
+ height: 270rpx;
+}
+
+.headimg {
+ width: 190rpx;
+ height: 190rpx;
+ border-radius: 50%;
+}
+
+.item {
+ margin-bottom: 20rpx;
+}
+
+.itemlf {
+ width: 160rpx;
+}
+
+.itemlr {
+ width: 190rpx;
+}
+
+.starss {
+ margin-top: 15rpx;
+ border-top: 3rpx dashed rgb(203, 203, 203);
+ padding-top: 25rpx;
+ padding-left: 15rpx;
+}
+
+.stars {
+ width: 50rpx;
+ height: 50rpx;
+ margin-right: 20rpx;
+}
+
+.tea_labs {
+ padding: 0rpx 56rpx;
+}
+
+textarea {
+ width: 100%;
+ height: 280rpx;
+ margin-top: 70rpx;
+ border: 2rpx solid rgb(203, 203, 203);
+ border-radius: 15rpx;
+ padding-top: 25rpx;
+ padding-left: 30rpx;
+ margin-bottom: 32rpx;
+ padding-right: 15rpx;
+}
+
+.labels {
+ margin-bottom: 55rpx;
+}
+
+.label {
+ padding: 0rpx 15rpx;
+ height: 48rpx;
+ line-height: 48rpx;
+ border: 2rpx solid rgb(218, 218, 218);
+ color: rgb(152, 152, 152);
+ margin-right: 22rpx;
+ border-radius: 5rpx;
+}
+
+/* 选择标签的样式 */
+
+.checklabel {
+ border: 2rpx solid rgb(214, 1, 33);
+ color: rgb(214, 1, 33);
+}
+
+.feedback {
+ color: rgb(152, 152, 152);
+ margin-bottom: 90rpx;
+}
+
+.Submission {
+ width: 400rpx;
+ height: 65rpx;
+ border-radius: 30rpx;
+ background-color: rgb(214, 1, 33);
+ color: rgb(255, 255, 255);
+}
+
+.clonri {
+ margin: 0rpx;
+}
+
+.subSuccess {
+ position: fixed;
+ z-index: 3;
+ top: 435rpx;
+ left: 66rpx;
+ background-color: #a6a6a6a4;
+ width: 615rpx;
+ height: 315rpx;
+ border-radius: 20rpx;
+ color: rgb(255, 255, 255);
+}
+
+.Success {
+ width: 110rpx;
+ height: 110rpx;
+ margin-top: 50rpx;
+ margin-bottom: 45rpx;
+}
diff --git a/pages/user/tment_order_list/tment_order_list.js b/pages/user/tment_order_list/tment_order_list.js
new file mode 100644
index 0000000..8f1374a
--- /dev/null
+++ b/pages/user/tment_order_list/tment_order_list.js
@@ -0,0 +1,55 @@
+var e = getApp(),
+ a = e.globalData.setting,
+ os = a,
+ t = e.request;
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ iurl: a.imghost,
+ activeCategoryId: 0, //类别选中下标
+ categories: [{
+ name: "全部",
+ id: 0
+ }, {
+ name: "未服务",
+ id: 1
+ }, {
+ name: "已服务",
+ id: 2
+ }, {
+ name: "已过期",
+ id: 3
+ }],
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+
+ },
+ changeTab: function(e) {
+ var th = this;
+ var id = e.currentTarget.dataset.id;
+ th.setData({
+ activeCategoryId: id
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/user/tment_order_list/tment_order_list.json b/pages/user/tment_order_list/tment_order_list.json
new file mode 100644
index 0000000..4562f44
--- /dev/null
+++ b/pages/user/tment_order_list/tment_order_list.json
@@ -0,0 +1,3 @@
+{
+ "navigationBarTitleText": "我的预约"
+}
\ No newline at end of file
diff --git a/pages/user/tment_order_list/tment_order_list.wxml b/pages/user/tment_order_list/tment_order_list.wxml
new file mode 100644
index 0000000..14f1bf7
--- /dev/null
+++ b/pages/user/tment_order_list/tment_order_list.wxml
@@ -0,0 +1,89 @@
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+ 订单编号：MDDER2019061454879342468
+
+
+
+ 已过期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 预约门店:
+ 王者峡谷中路店
+
+
+ 预约项目:
+ 头部按摩
+
+
+ 美容师:
+ 花木兰
+
+
+ 预约时间:
+ 2018-08-16 14:00
+
+
+ 服务时间:
+ 2018-08-16 10:00
+
+
+
+
+
+
+
+ 取消预约
+ 查看详情
+
+ 更改时间
+ 发表评价
+ 重新预约
+
+
+
+
+
+ 到底了
+
+
+
+
+
+
+
+
+
+
+ 暂无预约记录
+
+
+ 立即预约
+
+
+
\ No newline at end of file
diff --git a/pages/user/tment_order_list/tment_order_list.wxss b/pages/user/tment_order_list/tment_order_list.wxss
new file mode 100644
index 0000000..6e15189
--- /dev/null
+++ b/pages/user/tment_order_list/tment_order_list.wxss
@@ -0,0 +1,133 @@
+page {
+ height: 100%;
+ background-color: rgb(238, 238, 238);
+}
+
+.container {
+ background-color: rgb(255, 255, 255);
+}
+
+.type-navbar {
+ border-top: 3rpx solid rgb(221, 221, 221);
+ display: flex;
+ justify-content: space-between;
+}
+
+.type-box {
+ height: 88rpx;
+ line-height: 88rpx;
+ padding: 0rpx 15rpx;
+ border-bottom: 5rpx solid rgb(255, 255, 255);
+}
+
+.chtypebox {
+ border-bottom: 5rpx solid rgb(224, 18, 18);
+}
+
+.Commodity_number {
+ height: 80rpx;
+ border-top: 13rpx solid rgb(245, 245, 245);
+}
+
+.Commodity_number image {
+ width: 30rpx;
+ height: 32rpx;
+}
+
+.padding {
+ padding: 0rpx 27rpx;
+}
+
+.lin {
+ border-left: 2rpx solid rgb(211, 29, 54);
+ margin-left: 17rpx;
+ margin-right: 14rpx;
+ height: 40rpx;
+}
+
+.order_number {
+ width: 500rpx;
+}
+
+.items {
+ border-top: 4rpx solid rgb(245, 245, 245);
+ border-bottom: 4rpx solid rgb(245, 245, 245);
+ height: 260rpx;
+}
+
+.itemimage {
+ width: 190rpx;
+ height: 190rpx;
+ margin-right: 20rpx;
+}
+
+.details {
+ height: 190rpx;
+}
+
+.itemname {
+ width: 130rpx;
+}
+
+.itemvalue {
+ max-width: 300rpx;
+}
+
+.Unimportance {
+ width: 140rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ border-radius: 8rpx;
+ background-color: rgb(255, 255, 255);
+ margin-left: 20rpx;
+ border: 2rpx solid rgb(191, 191, 191);
+}
+
+.important {
+ background-color: rgb(212, 28, 52);
+ border: 2rpx solid rgb(212, 28, 52);
+ color: rgb(255, 255, 255);
+}
+
+.Unim {
+ height: 110rpx;
+}
+
+.exactly {
+ height: 80rpx;
+ background-color: rgb(245, 245, 245);
+}
+
+.exactly_text {
+ margin: 0rpx 15rpx;
+}
+
+.line {
+ border-top: 2rpx solid rgb(0, 0, 0);
+ width: 130rpx;
+}
+
+/* 无预约 */
+
+.empty_order image {
+ width: 300rpx;
+ height: 300rpx;
+ margin-top: 202rpx;
+}
+
+.empty_order .xc-ash {
+ margin-top: 10rpx;
+ font-weight: 600px;
+}
+
+.empty_order navigator {
+ margin-top: 60rpx;
+ border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+ width: 247rpx;
+ height: 56rpx;
+ background-color: rgb(255, 72, 72);
+ border-radius: 40rpx;
+}