数据填充及样式调整

iceling
1 parent 6fc930c7
Showing 21 changed files with 317 additions and 172 deletions
pages/user/index/index.wxml
pages/user/my_service/appment_main.js
pages/user/my_service/appment_main.wxml
pages/user/my_service/appment_main.wxss
pages/user/my_service/beauty_deta.js
pages/user/my_service/beauty_deta.wxml
pages/user/my_service/cosmetology_list.js
pages/user/my_service/cosmetology_list.wxml
pages/user/my_service/cosmetology_list.wxss
pages/user/my_service/hist_service.js
pages/user/my_service/hist_service.wxml
pages/user/my_service/hist_service.wxss
pages/user/my_service/i_service.js
pages/user/my_service/tment_details.js
pages/user/my_service/tment_details.wxml
pages/user/my_service/tment_eval.js
pages/user/my_service/tment_eval.json
pages/user/my_service/tment_eval.wxml
pages/user/my_service/tment_eval.wxss
pages/user/my_service/tment_order_list.wxml
@@ -192,7 +192,7 @@
 					<view class="four-level-word">我的地址</view>
 				</view>
-        	<view class="item t-c" data-url="/pages/user/my_service/my_service" bindtap="goto" >
+        	<view class="item t-c" data-url="/pages/user/my_service/i_service" bindtap="goto" >
 					<image class="xc-center-img " src="{{iurl}}/miniapp/images/yyservice/myservice.png"></image>
 					<view class="four-level-word">我的服务</view>
 				</view>
@@ -22,7 +22,7 @@ Page({
     pageSize: 8, //页大小
     total: 0,
     ismore: 0, //是否加载完毕
-    itemId: "", //项目id
+    itemId: "08AD49D5-BAFD-4B5E-ABBA-B180EB64EED6", //项目id
     isScroll: true, //scroll-y是否可以滑动
     key_word: "", //是否按门店文字查询
     is_service_read: 0, //是否调用过门店接口
@@ -30,6 +30,7 @@ Page({
     is_success: 0, //是否提交成功
     remarks: "", //备注
     storageId: "", //线下门店id
+    url:"/pages/user/my_service/appment_main",//本页面地址路径用于选择时间页面跳转回来
   },
   onclickstore: function() {
     var th = this;
@@ -75,31 +76,36 @@ Page({
     // return false;
     // }
-    var url = "/api/weshop/marketing/reservation/reservation/insert";
-    getApp().request.post(url, {
-      data: {
-        projectID: "",
-        beauticianID: "",
-        buyType: "",
-        storeId: a.stoid,
-        storageID: "",
-        arrangeTime: "",
-        userId: d.user_id,
-        remark: "",
-        states: ""
-      }
-    }).then(res => {
-      if (res.data.code == 0) {
-        th.setData({
-          is_success: 1
-        })
-        wx.navigateTo({
+    // var url = "/api/weshop/marketing/reservation/reservation/insert";
+    // getApp().request.post(url, {
+    //   data: {
+    //     projectID: "",
+    //     beauticianID: "",
+    //     buyType: "",
+    //     storeId: a.stoid,
+    //     storageID: "",
+    //     arrangeTime: "",
+    //     userId: d.user_id,
+    //     remark: "",
+    //     states: ""
+    //   }
+    // }).then(res => {
+    //   if (res.data.code == 0) {
+    //     th.setData({
+    //       is_success: 1
+    //     })
+    //     wx.navigateTo({
+    //       url: "/pages/user/my_service/tment_details"
+    //     });
+    //   } else {
+    //     getApp().my_warnning(res.data.msg, 0, th);
+    //   }
+    // })
+
+    //测试
+    wx.navigateTo({
           url: "/pages/user/my_service/tment_details"
         });
-      } else {
-        getApp().my_warnning(res.data.msg, 0, th);
-      }
-    })
   },
   goto: function(e) {
     var th = this;
@@ -260,11 +266,12 @@ Page({
   nav_bea: function() {
     var th = this;
     var storageId = th.data.storageId; //线下门店id
+    var itemId = th.data.itemId;
     if (storageId == "") {
       getApp().my_warnning("请选择服务门店", 0, th);
     } else {
       wx.navigateTo({
-        url: "/pages/user/my_service/cosmetology_list"
+        url: "/pages/user/my_service/cosmetology_list?" + 'storageId=' + storageId + '&' + 'itemId=' + itemId
       });
     }
   },
@@ -54,7 +54,7 @@
       </view>
       <!-- 选择门店 -->
-      <view class="flex-vertical-between fs26 select" data-url="/pages/user/my_service/beauty_deta" bindtap="goto">
+      <view class="flex-vertical-between fs26 select" data-url="/pages/user/my_service/beauty_deta?url+{{url}}" bindtap="goto">
         <view class="color">选择时间</view>
         <view class="angle angler">∟</view>
       </view>
@@ -108,7 +108,7 @@
     <icon bindtap="onclickstore" color="black" size="22" type="cancel"></icon>
   </view>
   <view class="searchbar flex-vertical-between storeListpadd">
-    <input class="inputstore fs28" placeholder="{{key_word==''?'输入要搜索的门店':key_word}}" placeholder-class="fs28" maxlength="16" bindinput="input_store"/>
+    <input class="inputstore fs28" placeholder="{{key_word==''?'输入要搜索的门店':key_word}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" />
     <view class="search flex-center" bindtap="search_store">
       <view class="fs28">搜索</view>
     </view>
@@ -12,15 +12,18 @@
   margin-right: 15rpx;
   margin-bottom: 10rpx;
   font-size: 26rpx;
-  color: rgb(142,142,142);
+  color: rgb(142, 142, 142);
 }
-.angler{
-   transform: rotate(227deg);
-   margin-bottom: 0rpx;
+
+.angler {
+  transform: rotate(227deg);
+  margin-bottom: 0rpx;
 }
-.users{
-  background-color: rgb(255,255,255);
+
+.users {
+  background-color: rgb(255, 255, 255);
 }
+
 .user {
   width: 40rpx;
   height: 40rpx;
@@ -111,7 +114,7 @@
   border-radius: 10rpx;
 }
-.beauticians{
+.beauticians {
   width: 407rpx;
   z-index: 3;
   top: 45rpx;
@@ -126,9 +129,11 @@
   border-bottom: 2rpx solid rgb(238, 238, 238);
   padding-left: 25rpx;
 }
-.beaclone{
+
+.beaclone {
   border-bottom: 0rpx;
 }
+
 .notes {
   margin-top: 15rpx;
   margin-bottom: 60rpx;
@@ -259,10 +264,12 @@
   color: rgb(255, 255, 255);
   margin: 20rpx 0rpx;
 }
-.value{
+
+.value {
   max-width: 300rpx;
 }
-.notstore{
+
+.notstore {
   height: 80rpx;
   color: rgb(159, 159, 159);
-}
 \ No newline at end of file
+}
@@ -10,6 +10,7 @@ Page({
    */
   data: {
     iurl: a.imghost,
+    url:"",//选择选择时间后返回的页面
     defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg",
     seekTime: "2019-11-18", //当前服务预约选择的时间
     time_list: [], //可预约时间
@@ -18,21 +19,54 @@ Page({
     head_img: "", //美容师头像
     time: ["08:00:00", "09:00:00  ", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", "16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00"],
     time_index: 0, //选择预约时间下标
+    date: [{
+      date_name: "今天",
+      id: 0,
+      date_value: "09月10日"
+    }, {
+      date_name: "星期四",
+      id: 1,
+      date_value: "09月11日"
+    }, {
+      date_name: "星期五",
+      id: 2,
+      date_value: "09月12日"
+    }, {
+      date_name: "星期六",
+      id: 3,
+      date_value: "09月13日"
+    }, {
+      date_name: "星期天",
+      id: 4,
+      date_value: "09月14日"
+    }, {
+      date_name: "下礼拜一",
+      id: 5,
+      date_value: "09月15日"
+    }, {
+      date_name: "下礼拜二",
+      id: 6,
+      date_value: "09月16日"
+    }, ],
+    date_id: 0, //选择日期的id
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+      var th = this;
+      th.setData({
+        url:options.url
+      })
+    th.query_beatea();
+    th.query_date();
   },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-    var th = this;
-    th.query_beatea();
-    th.query_date();
+  
   },
   //图片失败，默认图片
   bind_bnerr1: function(e) {
@@ -44,6 +78,14 @@ Page({
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
     }
   },
+  //选择服务日期
+  check_date: function(e) {
+    var th = this;
+    var id = e.currentTarget.dataset.dateid;
+    th.setData({
+      date_id: id
+    })
+  },
   //获取美容师信息
   query_beatea: function() {
     var th = this;
@@ -72,8 +114,10 @@ Page({
     })
   },
   //返回上个页面
-  navigateBack:function(){
-    wx.navigateBack({ changed: true });//返回上一页  
+  navigateBack: function() {
+    wx.navigateBack({
+      changed: true
+    }); //返回上一页  
   },
   //选择时间
   Selection_time: function(e) {
@@ -86,7 +130,7 @@ Page({
       th.setData({
         time_index: index
       })
-    }
+    } 
   },
   query_date: function() {
@@ -115,7 +159,7 @@ Page({
             }
           }
         }
-        console.log("1111111111"+time_list.length);
+        console.log("1111111111" + time_list.length);
         th.setData({
           time_list: time_list
         })
@@ -20,12 +20,12 @@
     <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 class="rel" wx:for="{{date}}" style="display: inline-block;">
+          <view class="scroll-item-h bd {{index==date_id?'chbd':''}}" bindtap="check_date" data-dateid="{{index}}">
+            <view>{{item.date_name}}</view>
+            <view>{{item.date_value}}</view>
           </view>
-          <block wx:if="{{index==0}}">
+          <block wx:if="{{index==date_id}}">
             <view class="abs box"></view>
           </block>
         </view>
@@ -36,7 +36,7 @@
       <view class="Times">
         <view class="flex-center" wx:for="{{time}}" style="display:inline-block;">
-          <block wx:if="{{item==time_list[index]}}">
+          <block wx:if="{{item!=time_list[index]}}">
           <!-- {{item==time_list[index]}} -->
             <view class="Time flex-center {{time_index==index?'chTime':''}}" bindtap="Selection_time" data-index="{{index}}">
               <view>
 var e = getApp(),
   a = e.globalData.setting,
   os = a,
-  t = e.request;
+  t = e.request,
+  d = e.globalData;
 Page({
   /**
@@ -10,13 +11,15 @@ Page({
   data: {
     iurl: a.imghost,
     cosmetology_list: [], //美容师列表
-    is_cosmetology_read: 0,//是否有读过美容师接口,该属性用在没有美容师列表的排版
+    is_cosmetology_read: 0, //是否有读过美容师接口,该属性用在没有美容师列表的排版
     curpage: 1, //当前分页数
     pageSize: 10, //页大小
-    total: 0,//总数量
+    total: 0, //总数量
     ismore: 0, //是否加载完毕
+    itemId: 0, //项目id,
+    storageId: 0, //线下门店id
   },
-  onReachBottom: function () {
+  onReachBottom: function() {
     var th = this;
     if (this.data.total <= th.data.pageSize) return;
     if (this.data.ismore) return;
@@ -27,52 +30,41 @@ Page({
   },
   query_cology: 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
-          })
-        }
+     var url = "/api/weshop/marketing/reservation/staff/page";
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: 5682130, //5682130 d.user_id
+        itemId:"08AD49D5-BAFD-4B5E-ABBA-B180EB64EED6",
+        storageId: "FD8EC44A-6474-4BA1-A17C-A87306690E59",
+        page: th.data.curpage,
+        pageSize: th.data.pageSize
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        wx.hideLoading();
+        th.data.curpage++;
+        var arr1 = th.data.cosmetology_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({
+          cosmetology_list: arr3,
+          total: res.data.data.total,
+          ismore: ismore,
+          is_service_read: 1,
+        }), wx.stopPullDownRefresh(); //停止下拉刷新
       }
     })
-
-    // var th = this;
-    // var url = "http://localhost:8022/api/weshop/yy_fuwu_meirongshi";
-    // 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) {
-    //     wx.hideLoading();
-    //     th.data.curpage++;
-    //     var arr1 = th.data.cosmetology_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({
-    //       cosmetology_list: arr3,
-    //       total: res.data.data.total,
-    //       ismore: ismore,
-    //       is_service_read: 1,
-    //     }), wx.stopPullDownRefresh(); //停止下拉刷新
-    //   }
-    // })
   },
   //图片失败，默认图片
-  bind_bnerr1: function (e) {
+  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";
+      _errObj[_errImg] = "/miniapp/images/no-head.jpg";
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
     }
   },
@@ -86,6 +78,11 @@ Page({
     // for (var i = 0; i < split.length; i++) {
     //      console.log("成功啦啦啦啦"+split[i]+i);
     // }
+    var th = this;
+    th.setData({
+      itemId: options.itemId,
+      storageId: options.storageId
+    })
   },
   /**
@@ -8,24 +8,24 @@
       <!-- 个人属性 -->
       <view class="flex-vertical-between">
         <view class="flex-vertical">
-          <image class="portrait" src="{{item.img}}" lazy-load="true" data-errorimg="cosmetology_list[{{index}}].img" binderror="bind_bnerr1" data-img="{{item.img}}"></image>
+          <image class="portrait" src="{{iurl+item.PhotoUrl}}" lazy-load="true" data-errorimg="cosmetology_list[{{index}}].PhotoUrl" binderror="bind_bnerr1" data-img="{{item.PhotoUrl}}"></image>
           <view>
             <!-- 用户名 -->
-            <view class="UserName ellipsis-1 fs32">{{item.name}}</view>
+            <view class="UserName ellipsis-1 fs32">{{item.StaffName}}</view>
             <!-- 评价星数 -->
             <view class="flex" style="margin-top:10rpx;">
-              <image class="Stars" src="{{iurl}}/miniapp/images/StarsredCk.png" wx:for="11111"></image>
+              <image class="Stars" src="{{iurl}}{{key<item.Star || item.Star==''?'/miniapp/images/StarsredCk.png':'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{item.Star==''?5:it.Star}}" wx:for-index="key" wx:for-item="it"></image>
               <!-- images/StarswhiteUnCk.png//白色星星地址 -->
             </view>
             <!-- 个人标签 -->
-            <view class="Label fs22 flex" wx:if="{{true}}">
-              <view class="flex-center Labelitem itone">
+            <view class="Label fs22 flex" wx:if="{{item.EvaluationLabel!=''?true:false}} " wx:for="{{item.EvaluationLabel.split('|')}}">
+              <view wx:if="{{index==0}}" class="flex-center Labelitem itone">
                 <view>{{item.type_a}}</view>
               </view>
-              <view class="flex-center Labelitem itwo">
+              <view wx:if="{{index==1}}" class="flex-center Labelitem itwo">
                 <view>{{item.type_b}}</view>
               </view>
-              <view class="flex-center Labelitem ith">
+              <view wx:if="{{index==2}}" class="flex-center Labelitem ith">
                 <view>{{item.type_c}}</view>
               </view>
@@ -34,20 +34,18 @@
         </view>
         <!-- 预约状态 -->
-        <block wx:if="{{item.type}}">
-          <navigator class="flex-center gofu go" url="/pages/user/my_service/beauty_deta">
-            <view class="fs24">预约</view>
-          </navigator>
-        </block>
-        <block wx:else>
+        <navigator class="flex-center gofu go" url="/pages/user/my_service/beauty_deta">
+          <view class="fs24">预约</view>
+        </navigator>
+        <!-- <block wx:else>
           <navigator class="flex-center gofu gofull" url="/pages/user/my_service/beauty_deta">
             <view class="fs24">已约满</view>
           </navigator>
-        </block>
+        </block> -->
       </view>
       <view class="fs26 information">
         <block wx:if="{{true}}">
-          <view class="ellipsis-3">{{item.remark1}}
+          <view class="ellipsis-3">{{item.Remark1}}
           </view>
         </block>
         <block wx:else>
 page{
   height: 100%;
-  background-color: rgb(238, 238, 238);
 }
 .container{
    background-color: rgb(255,255,255);
@@ -70,11 +69,13 @@ page{
 .go {
   border: 1rpx solid rgb(196, 26, 46);
   color: rgb(196, 26, 46);
+  background-color: rgb(255,255,255);
 }
 .gofull {
   border: 1rpx solid rgb(185, 185, 185);
   color: rgb(185, 185, 185);
+  background-color: rgb(255,255,255);
 }
 .information {
@@ -65,22 +65,13 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function() {
-
+    var th = this;
+    th.query_hist();
   },
-
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-    var th = this;
-    th.query_hist();
   },
   /**
@@ -127,9 +118,12 @@ Page({
           is_service_read: 1,
         }), wx.stopPullDownRefresh(); //停止下拉刷新
       } else {
-        th.setData({
-          is_service_read: 1
-        })
+        getApp().my_warnning(res.data.msg, 0, this);
+
+        //  else {
+        //   th.setData({
+        //     is_service_read: 1
+        //   })
       }
     })
   },
@@ -11,9 +11,9 @@
         <view class="Reset">重置</view>
         <image class="Resetsub" src="{{iurl}}/miniapp/images/reset.png"></image>
       </view>
-      <view class="flex-center">
+      <view class="flex-center" bindtap='pickerShow'>
         <view>筛选</view>
-        <view bindtap='pickerShow' wx:if="{{true}}" class="box"></view>
+        <view wx:if="{{true}}" class="box"></view>
         <!-- <view bindtap='pickerShow' wx:else class="box"></view> -->
       </view>
     </view>
@@ -57,8 +57,8 @@
   </view>
   <view class="flex-level fs30 xc-ash">暂无服务记录</view>
   <view class="flex-level">
-    <navigator url="/pages/user/my_service/i_service" bindtap="goto">
-      <view class="flex-center fs28 white">前往使用</view>
+    <navigator url="/pages/user/my_service/i_service">
+      <view class="flex-center fs32 white">前往使用</view>
     </navigator>
   </view>
 </view>
@@ -85,13 +85,13 @@ page {
 }
 .empty_order navigator {
-  margin-top: 60rpx;
+  margin-top: 65rpx;
   border-radius: 40rpx;
 }
 .empty_order navigator view {
   width: 247rpx;
-  height: 56rpx;
+  height: 65rpx;
   background-color: rgb(255, 72, 72);
   border-radius: 40rpx;
 }
@@ -37,13 +37,14 @@ Page({
     this.setData({
       userinfo: userinfo
     });
+    var th = this;
+    th.query_service();
   },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-    var th = this;
-    th.query_service();
+
   },
   onReachBottom: function() {
     var th = this;
@@ -81,6 +82,8 @@ Page({
           ismore: ismore,
           is_service_read: 1,
         }), wx.stopPullDownRefresh(); //停止下拉刷新
+      }else{
+        getApp().my_warnning(res.data.msg,0,th);
       }
     })
   },
@@ -29,6 +29,22 @@ Page({
         }
       }
     })
+    /*
+    var url = "/api/weshop/marketing/reservation/reservation/page";
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: 1,
+        userId: 5682130
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        var data = res.data.data.pageData;
+        th.setData({
+          tment_details: data
+        })
+      }
+    })
+    */
   },
   /**
    * 生命周期函数--监听页面显示
@@ -81,16 +81,24 @@
   <!-- submit栏 -->
   <view class="subs flex-vertical-between fs32">
-
-    <view class="sub flex-center yellow-b">
-      <view wx:if="{{tment_details.state==1}}">取消预约</view>
-      <navigator wx:if="{{tment_details.state!=1}}" url="/pages/user/my_service/tment_order_list">我的服务</navigator>
-    </view>
-    <view class="sub rb flex-center">
-      <navigator wx:if="{{tment_details.state==1}}" url="/pages/user/my_service/beauty_deta">更改时间</navigator>
-      <navigator wx:if="{{tment_details.state==2}}" url="/pages/user/my_service/tment_eval">发表评价</navigator>
-      <navigator wx:if="{{tment_details.state==3}}" url="/pages/user/my_service/appment_main">重新预约</navigator>
+    <!-- 左边栏 -->
+    <view class="sub flex-center yellow-b" wx:if="{{tment_details.state==1}}">
+      <view class="yellow-b" wx:if="{{tment_details.state==1}}">取消预约</view>
     </view>
+    <navigator wx:if="{{tment_details.state!=1}}" class="sub flex-center yellow-b"  url="/pages/user/my_service/tment_order_list">
+      <view class="yellow-b">我的服务</view>
+    </navigator>
+    <!-- 右边栏 -->
+    <navigator wx:if="{{tment_details.state==1}}" class="sub rb flex-center" url="/pages/user/my_service/beauty_deta">
+      <view>更改时间</view>
+    </navigator>
+    <navigator wx:if="{{tment_details.state==2}}" class="sub rb flex-center" url="/pages/user/my_service/tment_eval">
+      <view>发表评价</view>
+    </navigator>
+    <navigator wx:if="{{tment_details.state==3}}" class="sub rb flex-center" url="/pages/user/my_service/appment_main">
+      <view>重新预约</view>
+    </navigator>
+
   </view>
 </view>
 <warn id="warn"></warn>
 \ No newline at end of file
 var e = getApp(),
   a = e.globalData.setting,
   os = a,
-  t = e.request;
+  t = e.request,
+  d = e.globalData;
 Page({
   /**
@@ -9,8 +10,72 @@ Page({
    */
   data: {
     iurl: a.imghost,
+    stars_index: -1,
+    labels: [],
+    sub_evaluate:0
+  },
+  //点击星级
+  check_stars: function(e) {
+    var th = this;
+    var index = e.currentTarget.dataset.index;
+    var stars_index = th.data.stars_index;
+    if (index != stars_index) {
+      var url = "/api/weshop/marketing/reservation/star/label/list";
+      getApp().request.promiseGet(url, {
+        data: {
+          Star: index,
+          storeId: a.stoid
+        }
+      }).then(res => {
+        if (res.data.code == 0) {
+          th.setData({
+            labels: res.data.data
+          })
+        } else {
+          getApp().my_warnning(res.data.msg, 0, th);
+          return;
+        }
+      })
+      th.setData({
+        stars_index: index
+      })
+    }
+  },
+  //提交评价
+  Subs: function() {
+      var th = this;
+      th.setData({
+        sub_evaluate:1
+      })
+    wx.navigateTo({
+      url: "/pages/user/my_service/tment_order_list"
+    });
+  },
+  //图片失败，默认图片
+  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-head.jpg";
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
+  },
+  //选择标签
+  check_label: function(e) {
+    var th = this;
+    var index = e.currentTarget.dataset.index;
+    var label_id = th.data.labels[index].check;
+    var labels = 'labels[' + index + '].check';
+    if (label_id) {
+      label_id = 0
+    } else {
+      label_id = 1
+    }
+    th.setData({
+      [labels]: label_id
+    })
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
 {
-  "navigationBarTitleText": "预约评价"
+  "navigationBarTitleText": "预约评价",
+  "usingComponents": {
+    "warn": "/components/long_warn/long_warn"
+  }
 }
 \ No newline at end of file
@@ -26,26 +26,17 @@
   <view class="flex-center">
     <view class="starss">
-      <image class="stars" src="{{iurl}}/miniapp/images/StarsredCk.png" wx:for="11111"></image>
+      <image class="stars" src="{{iurl}}{{stars_index>=index?'/miniapp/images/StarsredCk.png':'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{5}}" bindtap="check_stars" data-index="{{index}}"></image>
     </view>
   </view>
   <view class="tea_labs">
     <view class="flex-center fs26">
-      <textarea placeholder="写其他意见和建议" placeholder-class="fs24"></textarea>
+      <textarea placeholder="写其他意见和建议" placeholder-class="fs24" maxlength="270"></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 wx:if="{{labels.length>0}}" class="labels flex fs26 ellipsis-3">
+      <view class="label {{item.check==1?'checklabel':''}} flex-center" wx:for="{{labels}}" bindtap="check_label" data-index="{{key}}" wx:for-index="key">
+        <view class="ellipsis-1">{{item.LabelName}}</view>
       </view>
     </view>
   </view>
@@ -54,13 +45,13 @@
     <view>满意的话请打五星噢，谢谢您的支持!</view>
   </view>
-  <navigator class="fs32 flex-center">
+  <navigator class="Subs fs32 flex-center" bindtap="Subs">
     <view class="Submission flex-center">
       <view>确认提交</view>
     </view>
   </navigator>
-  <block wx:if="{{false}}">
+  <block wx:if="{{sub_evaluate}}">
     <view class="subSuccess">
       <view class="flex-center">
         <image class="Success" src="{{iurl}}/miniapp/images/yyservice/Success.png"></image>
@@ -70,4 +61,5 @@
       </view>
     </view>
   </block>
-</view>
 \ No newline at end of file
+</view>
+<warn id="warn"></warn>
 \ No newline at end of file
@@ -43,18 +43,21 @@
 textarea {
   width: 100%;
-  height: 280rpx;
+  height: 240rpx;
   margin-top: 70rpx;
   border: 2rpx solid rgb(203, 203, 203);
-  border-radius: 15rpx;
+  border-radius: 13rpx;
   padding-top: 25rpx;
   padding-left: 30rpx;
-  margin-bottom: 32rpx;
+  margin-bottom: 30rpx;
   padding-right: 15rpx;
+  padding-bottom: 20rpx;
 }
 .labels {
-  margin-bottom: 55rpx;
+  margin-bottom: 35rpx;
+  display: inline-block;
+  max-height: 240rxp;
 }
 .label {
@@ -63,26 +66,33 @@ textarea {
   line-height: 48rpx;
   border: 2rpx solid rgb(218, 218, 218);
   color: rgb(152, 152, 152);
-  margin-right: 22rpx;
   border-radius: 5rpx;
+  margin-right: 15rpx;
+  max-width: 165rpx;
+  display: inline-block;
 }
 /* 选择标签的样式 */
 .checklabel {
   border: 2rpx solid rgb(214, 1, 33);
+  background-color: rgb(255, 231, 235);
   color: rgb(214, 1, 33);
 }
 .feedback {
   color: rgb(152, 152, 152);
-  margin-bottom: 90rpx;
+  margin-bottom: 70rpx;
+}
+
+.Subs{
+  background-color: rgb(255,255,255);
 }
 .Submission {
   width: 400rpx;
   height: 65rpx;
-  border-radius: 30rpx;
+  border-radius: 40rpx;
   background-color: rgb(214, 1, 33);
   color: rgb(255, 255, 255);
 }
@@ -60,7 +60,7 @@
           <navigator url="/pages/user/my_service/tment_details" class="Unimportance flex-level">取消预约</navigator>
         </block>
         <block wx:else>
-          <navigator wx:if="{{item.State!=1}}" url="/pages/user/my_service/tment_details" class="Unimportance flex-level">查看详情</navigator>
+          <navigator url="/pages/user/my_service/tment_details" class="Unimportance flex-level">查看详情</navigator>
         </block>
         <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/pages/user/my_service/beauty_deta">更改时间</navigator>
         <navigator wx:if="{{item.State==1}}" url="/pages/user/my_service/tment_eval" class="important Unimportance flex-level">发表评价</navigator>
@@ -84,7 +84,7 @@
   <view class="flex-level fs30 xc-ash">暂无预约记录</view>
   <view class="flex-level">
     <navigator url="/pages/user/my_service/i_service" bindtap="goto">
-      <view class="flex-center fs28 white">立即预约</view>
+      <view class="flex-center fs32 white">立即预约</view>
     </navigator>
   </view>
 </view>
@@ -131,7 +131,7 @@ page {
 .empty_order navigator view {
   width: 247rpx;
-  height: 56rpx;
+  height: 65rpx;
   background-color: rgb(255, 72, 72);
   border-radius: 40rpx;
 }