修改选择时间当天小于当前时间不可选，历史服务bug修改，新增查看评价

DESKTOP-QHAFKU5\iceling
1 parent da1876a7
Showing 15 changed files with 173 additions and 73 deletions
pages/user/my_service/appment_main.js
pages/user/my_service/beauty_deta.js
pages/user/my_service/cosmetology_list.js
pages/user/my_service/cosmetology_list.wxml
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.wxml
pages/user/my_service/tment_details.wxss
pages/user/my_service/tment_eval.js
pages/user/my_service/tment_eval.wxml
pages/user/my_service/tment_eval.wxss
pages/user/my_service/tment_order_list.js
pages/user/my_service/tment_order_list.wxml
@@ -382,8 +382,12 @@ Page({
   //美容师预约跳转页面
   nav_bea: function() {
     var th = this;
+    th.setData({
+      is_textea: 0
+    })
     var storageId = th.data.storageId; //线下门店id
     var itemId = th.data.itemId; //服务id
+    var project_id = th.data.project_id;
     if (storageId == "") {
       getApp().my_warnning("请选择服务门店", 0, th);
     } else {
@@ -12,7 +12,7 @@ Page({
     inurl: a.url, //接口网址
     iurl: a.imghost,
     url: "", //选择选择时间后返回的页面
-    defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg",
+    defimgurl: "/miniapp/images/no-head.jpg",
     seekTime: "", //当前服务预约选择的时间
     time_list: [], //可预约时间
     name: "", //美容师姓名
@@ -30,6 +30,7 @@ Page({
     iscos: 0, //是否是从美容师列表过来的
     hours: "", //获取当前时分秒
     projectId: "", //项目id
+    StaffName: "", //美容师名称
   },
  
   /**
@@ -38,14 +39,16 @@ Page({
   onLoad: function(options) {
     var th = this;
     var myDate = new Date();
-    var date = myDate.getHours() + ":00"; //获取当前小时数(0-23)
+    var minutes = myDate.getMinutes(); //获取当前分钟数(0-59)
+    var hours = myDate.getHours() + ":" + minutes; //获取当前小时数(0-23)
     var beautician_id = options.BeauticianID;
     th.setData({
       beautician_id: beautician_id,
       itemId: options.itemId,
       modify: options.modify,
-      hours: date,
-      projectId: options.projectId
+      hours: hours,
+      projectId: options.projectId,
+      StaffName: options.StaffName
     })
     if (options.url != undefined) {
       th.setData({
@@ -69,7 +72,17 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
+    var th = this;
+    //获取当前时间
+    var myDate = new Date();
+    // var date = myDate.getHours(); //获取当前小时数(0-23);
+    let str = myDate.toTimeString(); //"10:55:24 GMT+0800 (中国标准时间)"
+    let date = str.substring(0, 8); //  '10:55:24'
  
+    // console.log("当前时间", date);
+    th.setData({
+      hours: date
+    });
   },
  
   //图片失败，默认图片
@@ -78,7 +91,7 @@ Page({
     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) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
     }
   },
@@ -174,6 +187,8 @@ Page({
         prevPage.setData({
           //直接给上一个页面赋值
           time: time,
+          beautician_name: th.data.StaffName,
+          beauticianID: th.data.beautician_id
         });
         wx.navigateBack({
           //返回
@@ -183,7 +198,7 @@ Page({
         var prevPage = pages[pages.length - 2]; //上一页面
         prevPage.setData({
           //直接给上一个页面赋值
-          time: time,
+          time: time
         });
         wx.navigateBack({
           //返回
@@ -264,44 +279,59 @@ Page({
     var SeekTime = th.data.aweeks[date_id].time;
     var val = th.data.aweeks[date_id].val;
  
-      var url = "/api/weshop/marketing/reservation/staff/time/list";
-      getApp().request.promiseGet(url, {
-        data: {
-          projectId: projectId,
-          beauticianId: th.data.beautician_id,
-          serviceId: th.data.itemId,
-          seekTime: SeekTime,
-          storeId: a.stoid,
+    var url = "/api/weshop/marketing/reservation/staff/time/list";
+    getApp().request.promiseGet(url, {
+      data: {
+        projectId: projectId,
+        beauticianId: th.data.beautician_id,
+        serviceId: th.data.itemId,
+        seekTime: SeekTime,
+        storeId: a.stoid,
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        if (res.data.data[0].GroupHour.length > 11) {
+          getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
         }
-      }).then(res => {
-        if (res.data.code == 0) {
-          console.log("也饿饿饿饿饿饿" + res.data.data[0].GroupHour);
-          if (res.data.data[0].GroupHour.length > 11) {
-            getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
-          }
-            var time_list = res.data.data;
-            var time = th.data.time;
-            var new_time = [];
-            if (time_list != null) {
-              for (var i = 0; i < time.length; i++) {
-                for (var ii = 0; ii < time_list.length; ii++) {
-                  if (time[i] == time_list[ii].GroupHour.substring(0, 5)) {
-                    new_time[i] = time_list[ii].GroupHour.substring(0, 5);
-                    break;
-                  } else {
-                    new_time[i] = "";
-                  }
+        var hours = th.data.hours;
+
+        var time_list = res.data.data;
+        var time = th.data.time;
+        var date_id = th
+        var new_time = [];
+        var date = th.data.hours;
+
+        //不等于空就是有可以预约的时间
+        if (time_list != null) {
+          //循环固定和可预约的时间
+          for (var i = 0; i < time.length; i++) {
+            for (var ii = 0; ii < time_list.length; ii++) {
+              //判断固定的时间和可以预约的时间
+              if (time[i] == time_list[ii].GroupHour.substring(0, 5)) {
+                var date_id = th.data.date_id;
+                if (date >= time_list[ii].GroupHour.substring(0, 2) && date_id == 0) {
+                  new_time[i] = "";
+                  break;
+                } else {
+                  new_time[i] = time_list[ii].GroupHour.substring(0, 5);
+                  break;
                 }
+
+
+              } else {
+                new_time[i] = "";
               }
             }
-          th.setData({
-            time_list: new_time
-          })
-        } else {
-          getApp().my_warnning(res.data.msg, 0, th);
+          }
         }
-      })
-    
+        th.setData({
+          time_list: new_time,
+        })
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+
   },
   //更改预约时间
   change_time: function() {
@@ -9,7 +9,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg",
+    defimgurl: "/miniapp/images/no-head.jpg",
     iurl: a.imghost,
     cosmetology_list: [], //美容师列表
     is_cosmetology_read: 0, //是否有读过美容师接口,该属性用在没有美容师列表的排版
@@ -34,7 +34,7 @@
         </view>
  
         <!-- 预约状态 -->
-        <navigator class="flex-center gofu go" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.Id}}&itemId={{itemId}}&iscos=1&modify=0">
+        <navigator class="flex-center gofu go" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.Id}}&itemId={{itemId}}&iscos=1&modify=0&projectId={{projectId}}&StaffName={{item.StaffName}}">
           <view class="fs24">预约</view>
         </navigator>
       </view>
@@ -92,6 +92,7 @@ Page({
   his_reset: function() {
     var th = this;
     var is_reset = th.data.is_reset;
+    console.log("22"+is_reset);
     if (is_reset==0){
       th.setData({
         hist_List: [],
@@ -99,8 +100,8 @@ Page({
         is_service_read: 0,
         is_screen: 1,
         is_reset:1,
-        beginDate: "",
-        endDate: "",
+        startTime: "",
+        endTime: "",
       })
       th.query_hist();
     }
@@ -25,7 +25,7 @@
       <!-- left -->
       <view>
         <view class="flex fs28">
-          <view class="itemName ellipsis-1">{{item.ServiceName==''?'匿名':item.ServiceName}}</view>
+          <view class="itemName ellipsis-1">{{item.StorageName==''?'匿名':item.StorageName}}</view>
           <view>(美容师：</view>
           <view class="itemUsna ellipsis-1">{{item.BeauticianName}}</view>
           )
@@ -48,12 +48,12 @@ page {
 }
  
 .itemName {
-  margin-right: 5rpx;
-  max-width: 200rpx;
+  margin-right: 10rpx;
+  width: 130rpx;
 }
  
 .itemUsna {
-  max-width: 200rpx;
+  max-width: 150rpx;
 }
  
 .serState {
@@ -98,7 +98,7 @@ Page({
     var project_id = e.currentTarget.dataset.project_id;
     var ind = e.currentTarget.dataset.ind;
     var item = this.data.service_List[ind];
-    var ewm = th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|TY01|";
+    var ewm = "^"+th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|TY01|";
     var tt = th.format_time(1);
     ewm = ewm + tt;
     th.data.qr_code_object.val = ewm;
@@ -13,12 +13,12 @@
     <view class="fs30">
       <view class="items lf">
         <!-- 预约订单 -->
-        <view class="flex-vertical bmt">
+        <view class="flex-vertical bmt" bindtap="code_show" data-order_sn="{{number}}">
           <view class="flex-vertical">
             <view class="name">预约订单:</view>
             <view class="ellipsis-1 value">{{number}}</view>
           </view>
-          <image wx:if="{{item.State==0}}" src="{{iurl}}miniapp/images/order/code.png" class="code" bindtap="code_show" data-order_sn="{{number}}"></image>
+          <image wx:if="{{item.State==0}}" src="{{iurl}}miniapp/images/order/code.png" class="code"></image>
         </view>
  
         <!-- 预约门店 -->
@@ -35,7 +35,7 @@ page {
  
 .container {
   padding: 0rpx 20rpx;
-  padding-bottom:85rpx;
+  padding-bottom:15rpx;
 }
  
 .Subscriber {
@@ -82,7 +82,7 @@ page {
   margin-bottom: 20rpx;
   position: fixed;
   width: 705rpx;
-  bottom:20rpx;
+  bottom:60rpx;
 }
  
 .sub {
@@ -11,7 +11,7 @@ Page({
   data: {
     url: a.url, //接口网址
     iurl: a.imghost,
-    defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg",
+    defimgurl: "/miniapp/images/no-head.jpg",
     stars_index: -1, //当前点击的星星下标
     labels: [], //星级标签数组
     sub_evaluate: 0, //是否评价成功
@@ -21,10 +21,14 @@ Page({
     beautician: "", //美容师信息
     fromType: "服务评价", //评价来源
     arrangeTime: "", //服务日期
+    is_evaluate:0,//是否评价
+    EvaluateDatetime:"",//评价时间
   },
   //点击星级
   check_stars: function(e) {
     var th = this;
+    var is_evaluate = th.data.is_evaluate;//0可点击
+    if (is_evaluate==0){
     var index = e.currentTarget.dataset.index;
     var stars_index = th.data.stars_index;
     if (index != stars_index) {
@@ -48,6 +52,7 @@ Page({
         stars_index: index
       })
     }
+    }
   },
   //输入评价意见和建议
   input_proposal: function(e) {
@@ -70,6 +75,8 @@ Page({
   //选择标签
   check_label: function(e) {
     var th = this;
+    var evaluate = th.data.is_evaluate;//0为未评价，未评价才可点击标签
+    if (evaluate==0){
     var index = e.currentTarget.dataset.index;
     var label_id = th.data.labels[index].check;
     var labels = 'labels[' + index + '].check';
@@ -81,6 +88,7 @@ Page({
     th.setData({
       [labels]: label_id
     })
+    }
   },
   //查询美容师信息
   query_bea: function() {
@@ -106,6 +114,28 @@ Page({
       }
     })
   },
+  //获取预约评价
+  evaluate_get: function() {
+    var th = this;
+    var url = "/api/weshop/evaluation/evaluate/get";
+    getApp().request.promiseGet(url,{
+      data: {
+        number: th.data.number,
+        storeId: a.stoid
+      }
+    }).then(res => {
+           if(res.data.code == 0){
+             th.setData({
+               stars_index: res.data.data.Star,
+               labels: res.data.data.EvaluationList,
+               proposal: res.data.data.Remark,
+               EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0,19)
+             })
+           }else{
+             getApp().my_warnning(res.data.msg,0,th);
+           }
+    })
+  },
   //提交评价
   evaluate_save: function() {
     var th = this;
@@ -123,7 +153,7 @@ Page({
         evaLabList.push(labels[i].LabelName);
       }
     }
-    var url = th.data.url + "/api/weshop/evaluation/evaluate/save";
+    var url = th.data.url + "/api/weshop/evaluation/evaluate/insert";
     var posNo = th.data.number; //收银单号
     var proposal = th.data.proposal; //用户建议内容
     var fromType = th.data.fromType; //评价来源
@@ -161,12 +191,12 @@ Page({
  
   },
   //图片失败，默认图片
-  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) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
     }
   },
@@ -174,9 +204,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+    console.log("为呃呃呃" + options.evaluate);
     var th = this;
     th.setData({
-      number: options.Number
+      number: options.Number,
+      is_evaluate: options.evaluate
     })
     th.query_bea();
   },
@@ -185,6 +217,10 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-
+    var th = this;
+    var is_evaluate = th.data.is_evaluate;
+    if (is_evaluate==1){
+      th.evaluate_get();
+      }
   },
 })
 \ No newline at end of file
@@ -8,20 +8,27 @@
   <!-- 姓名 -->
   <view class="flex-level item">
     <view class="itemlf fs32">美容师：</view>
-    <view class="itemlr fs30 ellipsis-1">{{beautician.BeauticianName}}</view>
+    <view class="itemlr fs30 ellipsis-1 {{is_evaluate==0?'datetime':''}}">{{beautician.BeauticianName}}</view>
   </view>
  
   <!-- 项目 -->
   <view class="flex-center item">
     <view class="itemlf fs32">服务项目：</view>
-    <view class="itemlr fs30 ellipsis-1">{{beautician.StorageName}}</view>
+    <view class="itemlr fs30 ellipsis-1 {{is_evaluate==0?'datetime':''}}">{{beautician.StorageName}}</view>
   </view>
  
   <!-- 时间 -->
-  <view class="flex-center">
+  <view class="flex-center item">
     <view class="itemlf fs32">服务时间：</view>
-    <view class="itemlr fs30">{{arrangeTime}}</view>
+    <view class="itemlr fs30 {{is_evaluate==0?'datetime':''}}">{{arrangeTime}}</view>
+  </view>
+
+  <!-- 评价时间 -->
+  <view class="flex-center" wx:if="{{is_evaluate==1}}">
+    <view class="itemlf fs32">评价时间：</view>
+    <view class="itemlr fs30">{{EvaluateDatetime}}</view>
   </view>
+
   <!-- 设置虚线 -->
  
   <view class="flex-center">
@@ -31,25 +38,41 @@
   </view>
   <view class="tea_labs">
     <view class="flex-center fs26">
-      <textarea class="rel" placeholder="写其他意见和建议" placeholder-class="fs24" maxlength="{{proposal_size}}" bindinput="input_proposal" value="{{proposal}}">
+    <block wx:if="{{is_evaluate==0}}">
+      <textarea class="rel textarea" placeholder="写其他意见和建议" placeholder-class="fs24" maxlength="{{proposal_size}}" bindinput="input_proposal" value="{{proposal}}">
         <!-- 提示已输入多少数字 -->
-        <view class="proposal abs">{{proposal.length}}/{{proposal_size}}</view>
+        <view if="{{is_evaluate==0}}" class="proposal abs">{{proposal.length}}/{{proposal_size}}</view>
       </textarea>
+      </block>
+      <block wx:else>
+      <view wx:if="{{proposal!=''}}" class="textarea">
+            {{proposal}}
+      </view>
+      </block>
     </view>
  
-    <view wx:if="{{labels.length>0}}" class="labels flex fs24 ellipsis-3">
+    <view wx:if="{{labels.length>0 && is_evaluate==0}}" class="labels flex fs24 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 wx:if="{{labels.length>0 && is_evaluate==1}}" class="{{labels.length==1 || labels.length==2?'flex-center':''}}" style="width:100%;">
+      <view class="labels flex fs24 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>
+
   </view>
  
-  <view class="feedback flex-center fs28">
+  <view wx:if="{{is_evaluate==0}}" class="feedback flex-center fs28">
     <view>满意的话请打五星噢，谢谢您的支持!</view>
   </view>
  
-  <navigator class="Subs fs32 flex-center" bindtap="evaluate_save">
+  <navigator wx:if="{{is_evaluate==0}}" class="Subs fs32 flex-center" bindtap="evaluate_save">
     <view class="Submission flex-center">
       <view>确认提交</view>
     </view>
@@ -22,9 +22,8 @@
 }
  
 .itemlr {
-  width: 190rpx;
+  width: 360rpx;
 }
-
 .starss {
   margin-top: 15rpx;
   border-top: 3rpx dashed rgb(203, 203, 203);
@@ -37,9 +36,12 @@
   height: 50rpx;
   margin-right: 20rpx;
 }
-
+.datetime{
+  width:190rpx;
+}
 .tea_labs {
   padding: 0rpx 56rpx;
+  margin-top:20rpx;
 }
  
 .proposal {
@@ -48,7 +50,7 @@
   color: rgb(152, 152, 152);
 }
  
-textarea {
+.textarea {
   width: 100%;
   height: 200rpx;
   margin-top: 70rpx;
@@ -71,6 +71,9 @@ Page({
     qc_com.open(obj)
   },
   query_orderList: function() {
+    wx.showLoading({
+      title: '加载中',
+    })
     var th = this;
     var url = "/api/weshop/marketing/reservation/reservation/page";
  
@@ -64,8 +64,9 @@
           <navigator url="/pages/user/my_service/tment_details?number={{item.Number}}" class="Unimportance flex-level">查看详情</navigator>
         </block>
         <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">更改时间</navigator>
-        <navigator wx:if="{{item.State==1}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}" class="important Unimportance flex-level">发表评价</navigator>
-        <navigator wx:if="{{item.State==2 || item.State==3 || item.State==4}}" url="/pages/user/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}" class="important Unimportance flex-level">重新预约</navigator>
+        <navigator wx:if="{{item.State==1}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}" class="important Unimportance flex-level">发表评价</navigator>
+        <navigator wx:if="{{item.State==2 || item.State==3}}" url="/pages/user/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}" class="important Unimportance flex-level">重新预约</navigator>
+        <navigator wx:if="{{item.State==4}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}" class="important Unimportance flex-level">查看评价</navigator>
       </view>
     </view>
     <view class="exactly flex-center fs26" wx:if="{{ismore & tm_order_list.length>3}}">