From 63bdfdac76d59c4cf3d38128ab4f76226740aa58 Mon Sep 17 00:00:00 2001
From: iceling <iceling@meidd.com>
Date: Thu, 14 Nov 2019 15:38:18 +0800
Subject: [PATCH] 改目录

---
 app.json                                    |  10 ++++++++--
 pages/user/my_service/appment_main.js       | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/appment_main.json     |   6 ++++++
 pages/user/my_service/appment_main.wxml     | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/appment_main.wxss     | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/beauty_deta.js        |  66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/beauty_deta.json      |   3 +++
 pages/user/my_service/beauty_deta.wxml      |  62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/beauty_deta.wxss      | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/cosmetology_list.js   |  49 +++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/cosmetology_list.json |   3 +++
 pages/user/my_service/cosmetology_list.wxml |  71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/cosmetology_list.wxss | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/hist_service.js       | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/hist_service.json     |   7 +++++++
 pages/user/my_service/hist_service.wxml     |  57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/hist_service.wxss     |  97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/i_service.js          | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/i_service.json        |   7 +++++++
 pages/user/my_service/i_service.wxml        |  81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/i_service.wxss        | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/tment_details.js      |  26 ++++++++++++++++++++++++++
 pages/user/my_service/tment_details.json    |   3 +++
 pages/user/my_service/tment_details.wxml    |  97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/tment_details.wxss    | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/tment_eval.js         |  27 +++++++++++++++++++++++++++
 pages/user/my_service/tment_eval.json       |   3 +++
 pages/user/my_service/tment_eval.wxml       |  73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/tment_eval.wxss       | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/tment_order_list.js   |  55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/tment_order_list.json |   3 +++
 pages/user/my_service/tment_order_list.wxml |  89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/user/my_service/tment_order_list.wxss | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 33 files changed, 2397 insertions(+), 2 deletions(-)
 create mode 100644 pages/user/my_service/appment_main.js
 create mode 100644 pages/user/my_service/appment_main.json
 create mode 100644 pages/user/my_service/appment_main.wxml
 create mode 100644 pages/user/my_service/appment_main.wxss
 create mode 100644 pages/user/my_service/beauty_deta.js
 create mode 100644 pages/user/my_service/beauty_deta.json
 create mode 100644 pages/user/my_service/beauty_deta.wxml
 create mode 100644 pages/user/my_service/beauty_deta.wxss
 create mode 100644 pages/user/my_service/cosmetology_list.js
 create mode 100644 pages/user/my_service/cosmetology_list.json
 create mode 100644 pages/user/my_service/cosmetology_list.wxml
 create mode 100644 pages/user/my_service/cosmetology_list.wxss
 create mode 100644 pages/user/my_service/hist_service.js
 create mode 100644 pages/user/my_service/hist_service.json
 create mode 100644 pages/user/my_service/hist_service.wxml
 create mode 100644 pages/user/my_service/hist_service.wxss
 create mode 100644 pages/user/my_service/i_service.js
 create mode 100644 pages/user/my_service/i_service.json
 create mode 100644 pages/user/my_service/i_service.wxml
 create mode 100644 pages/user/my_service/i_service.wxss
 create mode 100644 pages/user/my_service/tment_details.js
 create mode 100644 pages/user/my_service/tment_details.json
 create mode 100644 pages/user/my_service/tment_details.wxml
 create mode 100644 pages/user/my_service/tment_details.wxss
 create mode 100644 pages/user/my_service/tment_eval.js
 create mode 100644 pages/user/my_service/tment_eval.json
 create mode 100644 pages/user/my_service/tment_eval.wxml
 create mode 100644 pages/user/my_service/tment_eval.wxss
 create mode 100644 pages/user/my_service/tment_order_list.js
 create mode 100644 pages/user/my_service/tment_order_list.json
 create mode 100644 pages/user/my_service/tment_order_list.wxml
 create mode 100644 pages/user/my_service/tment_order_list.wxss

diff --git a/app.json b/app.json
index 12c6ef3..5cda179 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,13 @@
 {
   "pages": [
-    "pages/user/Appment_main/Appment_main",
-    "pages/user/my_service/my_service",
+    "pages/user/my_service/appment_main",
+    "pages/user/my_service/i_service",
+    "pages/user/my_service/cosmetology_list",
+    "pages/user/my_service/hist_service",
+    "pages/user/my_service/tment_details",
+    "pages/user/my_service/tment_eval",
+    "pages/user/my_service/tment_order_list",
+    "pages/user/my_service/beauty_deta",
     "pages/index/index/index",
     "pages/goods/categoryList/categoryList",
     "pages/cart/cart/cart",
diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
new file mode 100644
index 0000000..fb5c99b
--- /dev/null
+++ b/pages/user/my_service/appment_main.js
@@ -0,0 +1,122 @@
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    iurl: a.imghost, //服务器网址
+    store: 0, //是否显示服务门店列表
+    beautician: 0, //是否显示美容师列表
+    beautician_name: null, //选中的美容师名称
+    placeholder: "填写备注", //备注为空的placeholder
+    store_list: null, //门店列表
+    store_name: null, //选择的服务门店
+    fir_pick_index: 0, //选择的门店下标
+  },
+  onclickstore: function() {
+    var th = this;
+    var store = th.data.store;
+    if (store) {
+      th.setData({
+        store: 0,
+        placeholder: "填写备注"
+      })
+    } else {
+      th.setData({
+        store: 1,
+        placeholder: ""
+      })
+    }
+  },
+  query_bea: function(e) {
+    var th = this;
+    //获取选择美容师字段是不是为null，是的话就提示用户先选择门店
+    if (true) {
+      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: ""
+        })
+      }
+
+    } else {
+      getApp().my_warnning("请先选择服务门店", 0, th);
+    }
+  },
+  goto: function(e) {
+    var th = this;
+    if (th.data.beautician_name != null) {
+      var url = e.currentTarget.dataset.url;
+      getApp().goto(url);
+    } else {
+      getApp().my_warnning("请先选择美容师", 0, th);
+    }
+  },
+  //点击选择门店
+  choose_for_store: function(e) {
+    var th = this;
+    var index_c = e.currentTarget.dataset.ind;
+    var fir_pick_index = th.data.fir_pick_index;
+    //判断是否点击选中的门店，防止重复点击重复设置选中下标
+    if (index_c == fir_pick_index) {
+      return false;
+    } else {
+      th.setData({
+        fir_pick_index: index_c
+      })
+    }
+  },
+  //确认选择门店
+  choice_store: function() {
+    var th = this;
+    var index = th.data.fir_pick_index;
+    var pickup_name = th.data.store_list[index].pickup_name;
+    th.setData({
+      store: 0,
+      store_name: pickup_name
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+    var th = this;
+    wx.request({
+      url: 'http://localhost:8022/api/weshop/yy_fuwu_sto',
+      success: function(e) {
+        if (e.data.code == 0) {
+          th.setData({
+            store_list: e.data.data.pageData
+          })
+        }
+      }
+    })
+  }
+})
\ No newline at end of file
diff --git a/pages/user/my_service/appment_main.json b/pages/user/my_service/appment_main.json
new file mode 100644
index 0000000..fcc72b6
--- /dev/null
+++ b/pages/user/my_service/appment_main.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "预约服务",
+    "usingComponents": {
+      "warn": "/components/long_warn/long_warn"
+    }
+}
\ No newline at end of file
diff --git a/pages/user/my_service/appment_main.wxml b/pages/user/my_service/appment_main.wxml
new file mode 100644
index 0000000..3c44785
--- /dev/null
+++ b/pages/user/my_service/appment_main.wxml
@@ -0,0 +1,145 @@
+<view class="container">
+  <image class="main" src="{{iurl}}/miniapp/images/yyservice/main.png"></image>
+
+  <view class="Fram">
+    <!-- 选择门店 -->
+    <view class="flex-vertical mabot">
+      <!-- 门店 -->
+      <view class="flex-vertical-between head fs28">
+        <view>门</view>
+        <view>店</view>
+      </view>
+
+      <!-- 选择门店 -->
+      <view class="flex-vertical-between fs26 select" bindtap="onclickstore">
+        <view class="color value ellipsis-1">{{store_name==null?'选择服务门店':store_name}}</view>
+        <view class="angle">∟</view>
+      </view>
+    </view>
+    <!-- 选择美容师 -->
+    <view class="flex-vertical mabot">
+      <!-- 门店 -->
+      <view class="flex-vertical-between head fs28">
+        <view>美</view>
+        <view>容</view>
+        <view>师</view>
+      </view>
+
+      <!-- 选择门店 -->
+      <view class="rel fs26">
+        <view class="flex-vertical-between Cosmetology" bindtap="query_bea">
+          <view class="color value ellipsis-1">{{beautician_name==null?'选择美容师':beautician_name}}</view>
+          <view class="angle">∟</view>
+        </view>
+        <!-- 美容师下拉列表 -->
+        <view class="beauticians abs" wx:if="{{beautician}}">
+          <!-- 到时候要做判断如果是index==循环的最后一个则把下边线去掉:(beaclone去掉的css) -->
+          <view class="beautician flex-vertical fs26" wx:for="11" bindtap="query_bea" data-beaname="钱巧玲">
+            <view>钱巧玲</view>
+          </view>
+          <view>
+          </view>
+        </view>
+      </view>
+      <navigator class="flex-center" url="/pages/user/Cosmetology_list/Cosmetology_list">
+        <image class="user" src="{{iurl}}/miniapp/images/yyservice/user.png"></image>
+      </navigator>
+    </view>
+
+    <!-- 选择时间 -->
+    <view class="flex-vertical mabot">
+      <!-- 门店 -->
+      <view class="head fs28">
+        <view>预约时间</view>
+      </view>
+
+      <!-- 选择门店 -->
+      <view class="flex-vertical-between fs26 select" data-url="/pages/user/beauty_deta/beauty_deta" bindtap="goto">
+        <view class="color">选择时间</view>
+        <view class="angle angler">∟</view>
+      </view>
+    </view>
+
+    <!-- 备注 -->
+    <view class="flex Remarks">
+      <!-- 门店 -->
+      <view class="flex-space-between head fs28">
+        <view>备</view>
+        <view>注</view>
+      </view>
+      <view class="flex fs26">
+        <block wx:if="{{store==0 && beautician==0}}">
+          <textarea class="textarea" disabled="{{store || beautician}}" placeholder="{{placeholder}}" placeholder-class="fs26 color" value="">
+          </textarea>
+        </block>
+        <block wx:else>
+          <view class="textarea">填写备注
+          </view>
+        </block>
+      </view>
+    </view>
+    <view class="notes flex-level-right fs24 color">
+      <view>注：剩余可预约人数10人</view>
+    </view>
+
+    <view class="submitMax flex-space-between fs30">
+      <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list/tment_order_list">
+        <view>我的预约</view>
+      </navigator>
+      <view class="sub_appment flex-center">
+        <view>提交预约</view>
+      </view>
+    </view>
+
+    <block wx:if="{{false}}">
+      <view class="subSuccess fs36">
+        <image class="Success" src="{{iurl}}/miniapp/images/yyservice/Success.png"></image>
+        <view>预约成功</view>
+      </view>
+    </block>
+  </view>
+
+</view>
+
+<!-- 门店列表显示 -->
+<view wx:if="{{store}}" class="storeList fixed">
+  <view class="choice flex-vertical-between fs32 storeListpadd">
+    <view>选择服务门店</view>
+    <icon bindtap="onclickstore" color="black" size="22" type="cancel"></icon>
+  </view>
+  <view class="searchbar flex-vertical-between storeListpadd">
+    <input class="inputstore fs28" placeholder="输入要搜索的门店" placeholder-class="fs28" maxlength="16" />
+    <view class="search flex-center">
+      <view class="fs28">搜索</view>
+    </view>
+  </view>
+  <!-- 选择门店 -->
+  <view class="stores">
+    <view class="store flex-vertical" wx:for="{{store_list}}" bindtap="choose_for_store" data-ind="{{index}}">
+      <block wx:if="{{index==fir_pick_index}}">
+        <icon class="icon" type="success" color="red" size="20"></icon>
+      </block>
+      <block wx:else>
+        <view class="circular"></view>
+      </block>
+      <view class="store_name_dis">
+        <view class="name_dis flex-vertical-between">
+          <view class="store_name fs28 ellipsis-1">{{item.pickup_name}}</view>
+          <view class="store_dis flex fs22">
+            <view class="ellipsis-1">距您: 728m</view>
+          </view>
+        </view>
+        <view class="store_address fs24 ellipsis-2">地址:{{item.fulladdress}}</view>
+      </view>
+    </view>
+  </view>
+  <!-- sub -->
+  <view class="flex-center fs32" bindtap="choice_store">
+    <view class="determine flex-center">
+      <view>确定</view>
+    </view>
+  </view>
+</view>
+<!-- 蒙尘 -->
+<view wx:if="{{store}}" class="disgraceful" bindtap="onclickstore"></view>
+<warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/my_service/appment_main.wxss b/pages/user/my_service/appment_main.wxss
new file mode 100644
index 0000000..7f4a1a6
--- /dev/null
+++ b/pages/user/my_service/appment_main.wxss
@@ -0,0 +1,261 @@
+.container {
+  border-top: 7rpx solid rgb(245, 245, 245);
+}
+
+.main {
+  width: 100%;
+  height: 305rpx;
+}
+
+.angle {
+  transform: rotate(-45deg);
+  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: 40rpx;
+  margin-left: 15rpx;
+}
+
+.Fram {
+  padding: 0rpx 60rpx;
+  margin-top: 60rpx;
+}
+
+.subSuccess {
+  position: fixed;
+  z-index: 3;
+  top: 420rpx;
+  left: 110rpx;
+  width: 540rpx;
+  height: 315rpx;
+  background-color: #a6a6a6a4;
+  text-align: center;
+  border-radius: 20rpx;
+  color: rgb(255, 255, 255);
+  font-weight: bold;
+}
+
+.Success {
+  width: 110rpx;
+  height: 110rpx;
+  margin-top: 70rpx;
+  margin-bottom: 30rpx;
+}
+
+.appment, .sub_appment {
+  width: 270rpx;
+  height: 55rpx;
+  border-radius: 40rpx;
+}
+
+.appment {
+  background-color: rgb(238, 238, 238);
+}
+
+.sub_appment {
+  background-color: rgb(214, 1, 33);
+  color: rgb(255, 255, 255);
+}
+
+.head {
+  width: 112rpx;
+  margin-right: 40rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+}
+
+.textarea {
+  width: 420rpx;
+  background-color: rgb(238, 238, 238);
+  border-radius: 10rpx;
+  height: 130rpx;
+  padding-left: 40rpx;
+  padding-right: 15rpx;
+  padding-top: 15rpx;
+  padding-bottom: 15rpx;
+}
+
+.mabot {
+  margin-bottom: 35rpx;
+}
+
+.select {
+  width: 420rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  background-color: rgb(238, 238, 238);
+  border-radius: 10rpx;
+  padding-left: 40rpx;
+  padding-right: 15rpx;
+}
+
+.Cosmetology {
+  padding-left: 40rpx;
+  padding-right: 15rpx;
+  width: 365rpx;
+  background-color: rgb(238, 238, 238);
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 10rpx;
+}
+
+.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 {
+  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: 36rpx;
+  height: 36rpx;
+  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/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js
new file mode 100644
index 0000000..c6a154c
--- /dev/null
+++ b/pages/user/my_service/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/my_service/beauty_deta.json b/pages/user/my_service/beauty_deta.json
new file mode 100644
index 0000000..35448af
--- /dev/null
+++ b/pages/user/my_service/beauty_deta.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "美容师详情"
+}
\ No newline at end of file
diff --git a/pages/user/my_service/beauty_deta.wxml b/pages/user/my_service/beauty_deta.wxml
new file mode 100644
index 0000000..3b428c6
--- /dev/null
+++ b/pages/user/my_service/beauty_deta.wxml
@@ -0,0 +1,62 @@
+<view class="container">
+  <view class="backcolor"></view>
+
+
+  <view class="comments">
+    <!-- 个人信息 -->
+    <view class="Personal">
+      <view class="name fs36 ellipsis-1">兰陵王</view>
+      <image class="head" src="{{iurl}}/miniapp/images/yyservice/Cosm_appo.png"></image>
+
+      <view class="introduce fs26">
+        <block wx:if="{{true}}">
+          在职业培训、职业技能鉴定与企业用人要求之间建立一-个有效实用的联系,经研究决定,以《职业技能鉴定国家题库操作技能考试手册》的方式，向全社会公布国家题库扬权技能张甲成试题库的全部内容。
+        </block>
+        <block wx:else>
+          暂无介绍
+        </block>
+      </view>
+    </view>
+
+    <view>
+      <view class="fs36" style="margin-bottom:35rpx;">服务预约</view>
+      <scroll-view class="scroll-h fs26 " scroll-x>
+        <view class="rel" wx:for="111111" style="display: inline-block;">
+          <view class="scroll-item-h bd {{index==0?'chbd':''}}">
+            <view>今天</view>
+            <view>09月10日</view>
+          </view>
+          <block wx:if="{{index==0}}">
+            <view class="abs box"></view>
+          </block>
+        </view>
+
+      </scroll-view>
+
+      <!-- 选择时间 -->
+      <view class="Times">
+        <view class="flex-center" wx:for="111110000000" style="display:inline-block;">
+       
+          <view class="Time flex-center {{index==0?'chTime':'nochTime'}}">
+           <view>
+              <view class="fs26">09:00</view>
+              <block wx:if="{{flase}}">
+              <view class="fs24">约满</view>
+              </block>
+          </view>
+        </view>
+        </view>
+      </view>
+
+      <view class="choice flex-center fs32">
+        <view>确定选择</view>
+      </view>
+
+    </view>
+
+
+
+
+  </view>
+
+</view>
\ No newline at end of file
diff --git a/pages/user/my_service/beauty_deta.wxss b/pages/user/my_service/beauty_deta.wxss
new file mode 100644
index 0000000..656f90e
--- /dev/null
+++ b/pages/user/my_service/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/my_service/cosmetology_list.js b/pages/user/my_service/cosmetology_list.js
new file mode 100644
index 0000000..9158b08
--- /dev/null
+++ b/pages/user/my_service/cosmetology_list.js
@@ -0,0 +1,49 @@
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    iurl: a.imghost,
+    cosmetology_list: null, //美容师列表
+  },
+  query_cosmetology: function() {
+    var th = this;
+    var url = "http://localhost:8022/api/weshop/yy_fuwu_meirongshi";
+    wx.request({
+      url: url,
+      success: function(res) {
+        if (res.data.code == 0) {
+          th.setData({
+            cosmetology_list: res.data.data.pageData
+          })
+        }
+      }
+
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+    // var th = this;
+    // var label = "技术好|长得帅|很可爱";
+    // var split = label.split("|");//标签通过分割符
+    // for (var i = 0; i < split.length; i++) {
+    //      console.log("成功啦啦啦啦"+split[i]+i);
+    // }
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+    var th = this;
+    th.query_cosmetology();
+  },
+
+})
\ No newline at end of file
diff --git a/pages/user/my_service/cosmetology_list.json b/pages/user/my_service/cosmetology_list.json
new file mode 100644
index 0000000..33c4630
--- /dev/null
+++ b/pages/user/my_service/cosmetology_list.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "美容师列表"
+}
\ No newline at end of file
diff --git a/pages/user/my_service/cosmetology_list.wxml b/pages/user/my_service/cosmetology_list.wxml
new file mode 100644
index 0000000..4bc5937
--- /dev/null
+++ b/pages/user/my_service/cosmetology_list.wxml
@@ -0,0 +1,71 @@
+<view class="container">
+  <image class="appointment" src="{{iurl}}/miniapp/images/yyservice/Cosm_appo.png"></image>
+
+  <!-- 总预约 -->
+  <view wx:if="{{true}}">
+    <!-- 当个预约 -->
+    <view class="single" wx:for="{{cosmetology_list}}">
+      <!-- 个人属性 -->
+      <view class="flex-vertical-between">
+        <view class="flex-vertical">
+          <image class="portrait" src="{{item.img}}"></image>
+          <view>
+            <!-- 用户名 -->
+            <view class="UserName ellipsis-1 fs32">{{item.name}}</view>
+            <!-- 评价星数 -->
+            <view class="flex" style="margin-top:10rpx;">
+              <image class="Stars" src="{{iurl}}/miniapp/images/StarsredCk.png" wx:for="11111"></image>
+              <!-- images/StarswhiteUnCk.png//白色星星地址 -->
+            </view>
+            <!-- 个人标签 -->
+            <view class="Label fs22 flex" wx:if="{{true}}">
+              <view class="flex-center Labelitem itone">
+                <view>{{item.type_a}}</view>
+              </view>
+              <view class="flex-center Labelitem itwo">
+                <view>{{item.type_b}}</view>
+              </view>
+              <view class="flex-center Labelitem ith">
+                <view>{{item.type_c}}</view>
+              </view>
+
+            </view>
+          </view>
+        </view>
+
+        <!-- 预约状态 -->
+        <block wx:if="{{0}}">
+          <navigator class="flex-center gofu go" url="/pages/user/beauty_deta/beauty_deta">
+            <view class="fs24">预约</view>
+          </navigator>
+        </block>
+        <block wx:else>
+          <view class="flex-center gofu gofull">
+            <view class="fs24">已约满</view>
+          </view>
+        </block>
+      </view>
+      <view class="fs26 information">
+        <block wx:if="{{true}}">
+          <view class="ellipsis-3">在职业培训、职业技能鉴定与企业用人要求之间建立一个有效实用的联系，经研究 决定，以《职业技能鉴定国家题库操作技能考试手册》的方式，向全社会公布国家题库 操作技能考核试题库的全部内容。
+          </view>
+        </block>
+        <block wx:else>
+          <view>暂无对自己的介绍</view>
+        </block>
+      </view>
+    </view>
+  </view>
+</view>
+<!-- 无美容师 -->
+<view class="empty_order" wx:if="{{false}}">
+  <view class="flex-level">
+    <image src="{{iurl}}miniapp/images/yyservice/no_beauty.png"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">暂无美容师</view>
+  <view class="flex-level">
+    <navigator url="/pages/user/my_service/my_service" bindtap="goto">
+      <view class="flex-center fs28 white">其他项目</view>
+    </navigator>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/user/my_service/cosmetology_list.wxss b/pages/user/my_service/cosmetology_list.wxss
new file mode 100644
index 0000000..a7250dc
--- /dev/null
+++ b/pages/user/my_service/cosmetology_list.wxss
@@ -0,0 +1,107 @@
+page{
+  height: 100%;
+  background-color: rgb(238, 238, 238);
+}
+.container{
+   background-color: rgb(255,255,255);
+}
+.appointment {
+  width: 100%;
+  height: 305rpx;
+}
+
+.single {
+  margin-left: 10rpx;
+  border-bottom: 1rpx solid rgb(229, 229, 229);
+  padding-bottom: 30rpx;
+  padding-left: 20rpx;
+  padding-right: 35rpx;
+  padding-top: 30rpx;
+}
+
+.portrait {
+  width: 140rpx;
+  height: 140rpx;
+  border-radius: 50%;
+  margin-right: 30rpx;
+}
+.UserName{
+  max-width: 250rpx;
+}
+.Stars {
+  width: 25rpx;
+  height: 25rpx;
+  margin-right: 7rpx;
+}
+
+.Label {
+  margin-top: 25rpx;
+}
+
+.Labelitem {
+  width: 100rpx;
+  height: 30rpx;
+  border-radius: 20rpx;
+  line-height: 30rpx;
+  margin-right: 14rpx;
+}
+
+.itone {
+  border: 2rpx solid rgb(22, 232, 131);
+  color: rgb(22, 232, 131);
+}
+
+.itwo {
+  border: 2rpx solid rgb(92, 135, 248);
+  color: rgb(92, 135, 248);
+}
+
+.ith {
+  border: 2rpx solid rgb(244, 143, 55);
+  color: rgb(244, 143, 55);
+}
+
+.gofu {
+  width: 120rpx;
+  padding: 5rpx 0rpx;
+  border-radius: 25rpx;
+}
+
+.go {
+  border: 1rpx solid rgb(196, 26, 46);
+  color: rgb(196, 26, 46);
+}
+
+.gofull {
+  border: 1rpx solid rgb(185, 185, 185);
+  color: rgb(185, 185, 185);
+}
+
+.information {
+  margin-top: 25rpx;
+  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/my_service/hist_service.js b/pages/user/my_service/hist_service.js
new file mode 100644
index 0000000..f7b56a6
--- /dev/null
+++ b/pages/user/my_service/hist_service.js
@@ -0,0 +1,108 @@
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request;
+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) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  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/my_service/hist_service.json b/pages/user/my_service/hist_service.json
new file mode 100644
index 0000000..1bfb602
--- /dev/null
+++ b/pages/user/my_service/hist_service.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "历史服务",
+  "usingComponents": {
+    "timePicker": "/components/timePicker/timePicker",
+    "warn": "/components/long_warn/long_warn"
+  }
+}
\ No newline at end of file
diff --git a/pages/user/my_service/hist_service.wxml b/pages/user/my_service/hist_service.wxml
new file mode 100644
index 0000000..8f195b5
--- /dev/null
+++ b/pages/user/my_service/hist_service.wxml
@@ -0,0 +1,57 @@
+<view wx:if="{{true}}" class="{{isPickerRender==true?'container':''}}">
+  <!-- 点击方法 -->
+  <view class="exption flex-vertical-between fs28">
+    <view class="flex">
+      共使用
+      <view class="count">36</view>
+      次服务
+    </view>
+    <view class="flex">
+      <view class="Resetfram flex-center">
+        <view class="Reset">重置</view>
+        <image class="Resetsub" src="{{iurl}}/miniapp/images/reset.png"></image>
+      </view>
+      <view class="flex-center">
+        <view>筛选</view>
+        <view bindtap='pickerShow' wx:if="{{true}}" class="box"></view>
+        <!-- <view bindtap='pickerShow' wx:else class="box"></view> -->
+      </view>
+    </view>
+  </view>
+
+  <!-- 总的服务列表 -->
+  <view>
+    <!-- 单个 -->
+    <view class="item flex-vertical-between" wx:for="11111">
+      <!-- left -->
+      <view>
+        <view class="flex fs28">
+          <view class="itemName ellipsis-1">头部按摩</view>
+          <view>(美容师：</view>
+          <view class="itemUsna ellipsis-1">花木兰</view>
+          )
+        </view>
+        <view class="fs24">2019-07-02 23:25:45</view>
+      </view>
+      <!-- right -->
+      <view class="serState fs32">已服务</view>
+    </view>
+  </view>
+</view>
+<!-- 无历史服务 -->
+<view class="empty_order" wx:if="{{true}}">
+  <view class="flex-level">
+    <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">暂无服务记录</view>
+  <view class="flex-level">
+    <navigator url="/pages/user/my_service/my_service" bindtap="goto">
+      <view class="flex-center fs28 white">前往使用</view>
+    </navigator>
+  </view>
+</view>
+
+
+<!-- 引用时间主键 -->
+<timePicker pickerShow="{{isPickerShow}}" id="picker" wx:if="{{isPickerRender}}" bind:hidePicker="pickerHide" bind:setPickerTime="setPickerTime" config="{{pickerConfig}}"></timePicker>
+<warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/my_service/hist_service.wxss b/pages/user/my_service/hist_service.wxss
new file mode 100644
index 0000000..0611d43
--- /dev/null
+++ b/pages/user/my_service/hist_service.wxss
@@ -0,0 +1,97 @@
+page {
+  height: 100%;
+}
+
+.box {
+  width: 0px;
+  height: 0px;
+  margin-left: 15rpx;
+  border-top: 11rpx solid rgba(0, 0, 0, 0);
+  border-right: 10rpx solid rgba(0, 0, 0, 0);
+  border-left: 10rpx solid rgba(0, 0, 0, 0);
+  display: inline-block;
+  margin-bottom: 10rpx;
+  color: red;
+  transform: rotate(0deg);
+  border-bottom: 18rpx solid rgb(153, 153, 153);
+}
+
+.exption {
+  padding: 0rpx 45rpx;
+  background-color: rgb(238, 238, 238);
+  height: 70rpx;
+  color: rgb(153, 153, 153);
+}
+
+.count {
+  margin: 0rpx 5rpx;
+}
+
+.Resetfram {
+  margin-right: 40rpx;
+}
+
+.Reset {
+  margin-right: 5rpx;
+}
+
+.Resetsub {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.item {
+  margin: 0rpx 25rpx;
+  padding: 0rpx 20rpx;
+  height: 135rpx;
+  border-bottom: 1rpx solid rgb(242, 242, 242);
+}
+
+.itemName {
+  margin-right: 5rpx;
+  max-width: 200rpx;
+}
+
+.itemUsna {
+  max-width: 200rpx;
+}
+
+.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/my_service/i_service.js b/pages/user/my_service/i_service.js
new file mode 100644
index 0000000..8d3cd45
--- /dev/null
+++ b/pages/user/my_service/i_service.js
@@ -0,0 +1,123 @@
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    qr_code_object: {
+      val: "12121",
+      content: "请将二维码展示给核销员，服务更快捷！"
+    },
+    iurl: a.imghost,
+    defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg",
+    service_List: [], //服务项目列表
+    is_service_read: 0,
+    curpage: 1, //当前分页数
+    pageSize: 8, //页大小
+    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() {
+    var th = this;
+    if (this.data.total <= th.data.pageSize) return;
+    if (this.data.ismore) return;
+    this.query_service();
+  },
+  //查询服务项目列表
+  query_service: function() {
+    var th = this;
+    var url = "/api/weshop/marketing/reservation/sm/page";
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: d.user_id,
+        page: th.data.curpage,
+        pageSize: th.data.pageSize
+      }
+    }).then(res => {
+      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(); //停止下拉刷新
+      }
+    })
+  },
+  /*-- 打开服务项目 --*/
+  open_fw: function(e) {
+    var th = this;
+    var ind = e.currentTarget.dataset.ind;
+    var item = this.data.service_List[ind];
+
+    var ewm = "^" + th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|" + item.Validay + "|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;
+  },
+  //跳转到首页
+  goto: function(e) {
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+  }
+})
\ No newline at end of file
diff --git a/pages/user/my_service/i_service.json b/pages/user/my_service/i_service.json
new file mode 100644
index 0000000..88d15ea
--- /dev/null
+++ b/pages/user/my_service/i_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/i_service.wxml b/pages/user/my_service/i_service.wxml
new file mode 100644
index 0000000..6ef0a7b
--- /dev/null
+++ b/pages/user/my_service/i_service.wxml
@@ -0,0 +1,81 @@
+<!-- 背景图片 -->
+<view>
+  <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" mode="widthFix"></image>
+  <navigator class="History fs26" url="/pages/user/hist_service/hist_service">历史服务</navigator>
+</view>
+
+<!-- 预约内容 -->
+<!-- 项目框架 -->
+<view class="Serviceitems">
+  <!-- 单个项目 -->
+  <view class="rel" wx:for="{{service_List}}">
+    <view class="abs">
+      <!-- 皇冠log -->
+      <block wx:if="{{item.BuyTepy==4}}">
+        <image class="equity_money" src="{{iurl}}/miniapp/images//yyservice/equity.png" lazy-load="true"></image>
+      </block>
+      <!-- 金钱log -->
+      <block wx:if="{{item.BuyTepy==1}}">
+        <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/money.png" lazy-load="true"></image>
+      </block>
+      <!-- 礼包log -->
+      <block wx:if="{{item.BuyTepy==3}}">
+        <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/giftpackage.png" lazy-load="true"></image>
+      </block>
+    </view>
+    <view>
+      <view class="flex-center">
+        <image class="itemimage" src="{{item.ImageUrl==''?iurl+defimgurl:item.ImageUrl}}" lazy-load="true" data-errorimg="service_List[{{index}}].img" binderror="bind_bnerr1" data-img="{{item.img}}"></image>
+      </view>
+
+      <view class="flex-center itemName">
+        <view class="fs32 Name ellipsis-1">{{item.ProjectName}}</view>
+      </view>
+
+      <view class="flex-center fs24 itemCount">
+        <view>剩余次数：</view>
+        <view>{{item.ObtainTimes}}</view>
+      </view>
+
+      <view class="flex-center fs24 itemEffective">
+        <view>有效期至</view>
+        <view class="Date">{{item.Validay==""?"长期有效":item.Validay}}</view>
+      </view>
+
+    </view>
+
+    <view class="flex-center fs24 functionMax">
+      <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}">
+        <view>立即使用</view>
+      </view>
+      <!-- 可预约 -->
+        <navigator class="flex-level appointment" url="/pages/user/my_service/appment_main/appment_main">
+          <view>预约</view>
+      </navigator>
+    </view>
+  </view>
+
+</view>
+<!-- 无服务项目 -->
+<view wx:if="{{service_List.length<0 && ismore}}">
+  <!-- 遮住 -->
+  <view class="cover"></view>
+  <!-- 无历史服务 -->
+  <view class="empty_order" wx:if="{{true}}">
+    <view class="flex-level">
+      <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image>
+    </view>
+    <view class="flex-level fs30 xc-ash">暂无服务项目</view>
+    <view class="flex-level">
+      <navigator data-url="/pages/user/index/index" bindtap="goto">
+        <view class="flex-center fs28 white">回到首页</view>
+      </navigator>
+    </view>
+  </view>
+
+</view>
+
+
+<!-- 弹出框扫描 -->
+<qr_code id="qc_com"></qr_code>
+<warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/my_service/i_service.wxss b/pages/user/my_service/i_service.wxss
new file mode 100644
index 0000000..73ae327
--- /dev/null
+++ b/pages/user/my_service/i_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/my_service/tment_details.js b/pages/user/my_service/tment_details.js
new file mode 100644
index 0000000..7fd3089
--- /dev/null
+++ b/pages/user/my_service/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/my_service/tment_details.json b/pages/user/my_service/tment_details.json
new file mode 100644
index 0000000..dd9566f
--- /dev/null
+++ b/pages/user/my_service/tment_details.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "预约详情"
+}
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.wxml b/pages/user/my_service/tment_details.wxml
new file mode 100644
index 0000000..6acdce9
--- /dev/null
+++ b/pages/user/my_service/tment_details.wxml
@@ -0,0 +1,97 @@
+<view class="container">
+  <!-- 预约人的属性 -->
+  <view class="Subscriber">
+    <!-- 状态栏 -->
+    <view class="statusBar fs32 flex-vertical-between lf">
+      <view>预约状态：</view>
+      <view>未服务</view>
+      <view wx:if="{{false}}">已服务</view>
+      <view wx:if="{{false}}">已过期</view>
+    </view>
+    <view class="fs30">
+      <view class="items lf">
+        <!-- 预约门店 -->
+        <view class="flex-vertical bmt">
+          <view class="name">预约门店:</view>
+          <view class="ellipsis-1 value">王者峡谷中路店</view>
+        </view>
+
+        <!-- 预约项目 -->
+        <view class="flex-vertical bmt">
+          <view class="name">预约项目:</view>
+          <view class="ellipsis-1 value">王者峡谷中路店</view>
+        </view>
+
+        <!-- 预约时间 -->
+        <view class="flex-vertical bmt">
+          <view class="name">预约时间:</view>
+          <view class="date">2018-08-16</view>
+          <view>10:00</view>
+        </view>
+      </view>
+      <view class="bt">
+
+        <!-- 美容师 -->
+        <view class="flex-vertical bmt">
+          <view class="name flex-vertical-between">
+            <view>美</view>
+            <view>容</view>
+            <view>师:</view>
+          </view>
+          <view class="ellipsis-1 value">王者峡谷中路店</view>
+        </view>
+        <!-- 预约人及联系方式 -->
+        <!-- 姓名 -->
+        <view class="flex-vertical bmt">
+          <view class="name flex-vertical-between">
+            <view>预</view>
+            <view>约</view>
+            <view>人:</view>
+          </view>
+          <view class="ellipsis-1 value">钱巧玲</view>
+        </view>
+        <!-- 号码 -->
+        <view class="flex-vertical">
+          <view class="name flex-vertical-between">
+            <view>手</view>
+            <view>机</view>
+            <view>人:</view>
+          </view>
+          <view>18065336494</view>
+        </view>
+      </view>
+    </view>
+
+  </view>
+
+  <!-- 温馨提示内容 -->
+  <view class="Tips fs30 lf rel">
+    <!-- 棒槌 -->
+    <view class="Stickl abs"></view>
+    <view class="Stickl Stickr abs"></view>
+
+    <view class="Cozy flex-center" style="background-image: url({{iurl}}/miniapp/images/yyservice/icon.png);">
+      <view>温馨提示</view>
+    </view>
+    <view>1.预约成功后需在指定时间前到达;</view>
+    <view>2.如有任何问题可致电咨询;</view>
+    <view>3.如需退约，需提前取消。</view>
+  </view>
+
+  <!-- submit栏 -->
+  <view class="subs flex-vertical-between fs32">
+
+    <view class="sub lb flex-center">
+      <view>取消预约</view>
+      <view wx:if="{{false}}">删除订单</view>
+      <view wx:if="{{false}}">更改时间</view>
+    </view>
+
+    <view class="sub rb flex-center">
+      <view>更改时间</view>
+      <view wx:if="{{false}}">重新预约</view>
+      <view wx:if="{{false}}">发表评价</view>
+    </view>
+
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.wxss b/pages/user/my_service/tment_details.wxss
new file mode 100644
index 0000000..59f324b
--- /dev/null
+++ b/pages/user/my_service/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/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js
new file mode 100644
index 0000000..9678987
--- /dev/null
+++ b/pages/user/my_service/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/my_service/tment_eval.json b/pages/user/my_service/tment_eval.json
new file mode 100644
index 0000000..af0d2da
--- /dev/null
+++ b/pages/user/my_service/tment_eval.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "预约评价"
+}
\ No newline at end of file
diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml
new file mode 100644
index 0000000..8c5ed71
--- /dev/null
+++ b/pages/user/my_service/tment_eval.wxml
@@ -0,0 +1,73 @@
+<view class="container">
+
+  <!-- 头像 -->
+  <view class="flex-center head">
+    <image class="headimg" src="{{iurl}}/miniapp/images/yyservice/Cosm_appo.png"></image>
+  </view>
+
+  <!-- 姓名 -->
+  <view class="flex-level item">
+    <view class="itemlf fs32">美容师：</view>
+    <view class="itemlr fs30 ellipsis-1">钱巧玲</view>
+  </view>
+
+  <!-- 项目 -->
+  <view class="flex-center item">
+    <view class="itemlf fs32">服务项目：</view>
+    <view class="itemlr fs30 ellipsis-1">头部按摩</view>
+  </view>
+
+  <!-- 时间 -->
+  <view class="flex-center">
+    <view class="itemlf fs32">服务时间：</view>
+    <view class="itemlr fs30">2019-09-06</view>
+  </view>
+  <!-- 设置虚线 -->
+
+  <view class="flex-center">
+    <view class="starss">
+      <image class="stars" src="{{iurl}}/miniapp/images/StarsredCk.png" wx:for="11111"></image>
+    </view>
+  </view>
+  <view class="tea_labs">
+    <view class="flex-center fs26">
+      <textarea placeholder="写其他意见和建议" placeholder-class="fs24"></textarea>
+    </view>
+
+    <view class="labels flex fs26">
+      <view class="label checklabel">
+        <view>衣着整洁</view>
+      </view>
+      <view class="label">
+        <view>穿着专业</view>
+      </view>
+      <view class="label">
+        <view>准时到达</view>
+      </view>
+      <view class="label clonri">
+        <view>服务态度好</view>
+      </view>
+    </view>
+  </view>
+
+  <view class="feedback flex-center fs28">
+    <view>满意的话请打五星噢，谢谢您的支持!</view>
+  </view>
+
+  <navigator class="fs32 flex-center">
+    <view class="Submission flex-center">
+      <view>确认提交</view>
+    </view>
+  </navigator>
+
+  <block wx:if="{{false}}">
+    <view class="subSuccess">
+      <view class="flex-center">
+        <image class="Success" src="{{iurl}}/miniapp/images/yyservice/Success.png"></image>
+      </view>
+      <view class="fs36 flex-center">
+        <view>评论成功</view>
+      </view>
+    </view>
+  </block>
+</view>
\ No newline at end of file
diff --git a/pages/user/my_service/tment_eval.wxss b/pages/user/my_service/tment_eval.wxss
new file mode 100644
index 0000000..e8abea2
--- /dev/null
+++ b/pages/user/my_service/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/my_service/tment_order_list.js b/pages/user/my_service/tment_order_list.js
new file mode 100644
index 0000000..8f1374a
--- /dev/null
+++ b/pages/user/my_service/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/my_service/tment_order_list.json b/pages/user/my_service/tment_order_list.json
new file mode 100644
index 0000000..4562f44
--- /dev/null
+++ b/pages/user/my_service/tment_order_list.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的预约"
+}
\ 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
new file mode 100644
index 0000000..14f1bf7
--- /dev/null
+++ b/pages/user/my_service/tment_order_list.wxml
@@ -0,0 +1,89 @@
+<view class="container">
+  <!-- 导航栏 -->
+  <view class="type-navbar padding flex-vertical fs30">
+    <view class="type-box flex-center {{activeCategoryId==item.id?'chtypebox':''}}" wx:for="{{categories}}">
+      <view data-id="{{item.id}}" bindtap="changeTab">{{item.name}}</view>
+    </view>
+  </view>
+  <view wx:if="{{true}}">
+    <!-- 预约项目 -->
+    <view wx:for="1111">
+      <!-- 商品编号和状态 -->
+      <view class="Commodity_number flex-vertical-between fs24 padding">
+        <!--商品编号 -->
+        <text class="order_number ellipsis-1" selectable='true'>订单编号：MDDER2019061454879342468</text>
+        <!-- 商品评价状态 -->
+        <view class="flex-center xc-wc">
+          <!-- 订单状态 -->
+          <view>已过期</view>
+          <view class="flex-center">
+            <view class="lin"></view>
+            <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-order_id="{{item.order_id}}"></image>
+          </view>
+        </view>
+      </view>
+
+      <!-- 项目属性 -->
+      <navigator class="items padding flex-vertical" url="">
+
+        <view class="flex-center fs26">
+          <view class="itemimage">
+            <image class="itemimage" src="http://img4.imgtn.bdimg.com/it/u=3313840944,708309586&fm=26&gp=0.jpg"></image>
+          </view>
+          <!-- 项目内容 -->
+          <view class="details">
+            <view class="item flex-vertical">
+              <view class="itemname">预约门店:</view>
+              <view class="itemvalue ellipsis-1">王者峡谷中路店</view>
+            </view>
+            <view class="item flex-vertical">
+              <view class="itemname">预约项目:</view>
+              <view class="itemvalue ellipsis-1">头部按摩</view>
+            </view>
+            <view class="item flex-vertical">
+              <view class="itemname">美容师:</view>
+              <view class="itemvalue ellipsis-1">花木兰</view>
+            </view>
+            <view class="item flex-vertical">
+              <view class="itemname">预约时间:</view>
+              <view>2018-08-16 14:00</view>
+            </view>
+            <view class="item flex-vertical" wx:if="{{true}}">
+              <view class="itemname">服务时间:</view>
+              <view>2018-08-16 10:00</view>
+            </view>
+          </view>
+
+        </view>
+      </navigator>
+      <view class="Unim flex-right-vertical fs26 padding">
+
+        <navigator class="Unimportance flex-level">取消预约</navigator>
+        <navigator wx:if="{{false}}" class="Unimportance flex-level">查看详情</navigator>
+
+        <navigator class="important Unimportance flex-level">更改时间</navigator>
+        <navigator wx:if="{{false}}" class="important Unimportance flex-level">发表评价</navigator>
+        <navigator wx:if="{{false}}" class="important Unimportance flex-level">重新预约</navigator>
+
+      </view>
+    </view>
+    <view class="exactly flex-center fs26">
+      <view class="line"></view>
+      <view class="exactly_text">到底了</view>
+      <view class="line"></view>
+    </view>
+  </view>
+</view>
+
+<!-- 无预约订单 -->
+<view class="empty_order" wx:if="{{true}}">
+  <view class="flex-level">
+    <image src="{{iurl}}miniapp/images/order/empty_order.png"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">暂无预约记录</view>
+  <view class="flex-level">
+    <navigator url="/pages/user/my_service/my_service" bindtap="goto">
+      <view class="flex-center fs28 white">立即预约</view>
+    </navigator>
+  </view>
+</view>
\ 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
new file mode 100644
index 0000000..6e15189
--- /dev/null
+++ b/pages/user/my_service/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;
+}
--
libgit2 0.21.4