查询剩余可预约人数参数修改，界面调整与bug修改

DESKTOP-QHAFKU5\iceling
1 parent 8710c85a
Showing 11 changed files with 77 additions and 67 deletions
pages/user/my_service/appment_main.js
pages/user/my_service/appment_main.wxml
pages/user/my_service/beauty_deta.js
pages/user/my_service/beauty_deta.wxss
pages/user/my_service/hist_service.js
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_order_list.wxml
@@ -49,12 +49,11 @@ Page({
   check_text: function() {
     var th = this;
     var is_textea = th.data.is_textea;
-    if (is_textea == 0) {
-      th.setData({
-        is_textea: 1,
-        beautician: 0
-      })
-    }
+    th.setData({
+      is_textea: 1,
+      beautician: 0
+    })
+
   },
   onclickstore: function() {
     var th = this;
@@ -140,11 +139,11 @@ Page({
             'content-type': 'application/json'
           }, // 设置请求的 header
           success: function(res) {
+            th.setData({
+              is_sub: 0
+            })
             if (res.data.code == 0) {
-              th.setData({
-                is_success: 1,
-                is_sub: 0
-              })
+              getApp().my_warnning("预约成功", 0, th);
               var store_name = th.data.store_name; //预约门店
               var number = res.data.data.Number;
               var temp_url = "/api/wx/open/app/user/templatMessageSend"; //模版接口     
@@ -443,7 +442,7 @@ Page({
     var url = "/api/weshop/marketing/reservation/can/reservation/count";
     var beauticianID = th.data.beauticianID; //美容师id
     var projectID = th.data.itemId; //服务id
-    var seekTime = th.data.time.substring(0, 10); //预约日期
+    var seekTime = th.data.time; //预约日期
     var storageId = th.data.storageId; //门店id
     var storeId = a.stoid; //商家id
     getApp().request.promiseGet(url, {
@@ -478,24 +477,24 @@ Page({
     th.query_project();
   },
   //获取单个服务项目信息
-  query_project:function(){
+  query_project: function() {
     var th = this;
-    var url = "/api/weshop/marketing/reservation/sm/page";//获取服务项目接口
-    var project_id = th.data.project_id;//服务项目id
-    getApp().request.promiseGet(url,{
-       data:{
-         storeId:a.stoid,
-         userId:d.user_id,
-         projectId: project_id
-       }
-    }).then(res=>{
-         if(res.data.code==0){
-              th.setData({
-                validay: res.data.data.pageData[0].Validay
-              })
-         }else{
-           getApp().my_warnning(res.data.msg,0,th);
-         }
+    var url = "/api/weshop/marketing/reservation/sm/page"; //获取服务项目接口
+    var project_id = th.data.project_id; //服务项目id
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: d.user_id,
+        projectId: project_id
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        th.setData({
+          validay: res.data.data.pageData[0].Validay
+        })
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
     })
   }
 })
 \ No newline at end of file
@@ -69,7 +69,7 @@
         <view>注</view>
       </view>
       <view class="flex fs26" bindtap="">
-        <block wx:if="{{is_textea && store==0}}">
+        <block wx:if="{{is_textea==1 && store==0}}">
           <textarea class="textarea color" placeholder="{{remarks==''?'填写备注':remarks}}" placeholder-class="fs26 color" value="{{remarks}}" bindinput="input_remarks" maxlength="100">
           </textarea>
         </block>
@@ -93,12 +93,12 @@
         </button>
         </form>
     </view>
-    <block wx:if="{{is_success}}">
+    <!-- <block wx:if="{{false}}">
       <view class="subSuccess fs36">
         <image class="Success" src="{{iurl}}/miniapp/images/yyservice/Success.png"></image>
         <view>预约成功</view>
       </view>
-    </block>
+    </block> -->
   </view>
  
 </view>
@@ -165,7 +165,7 @@ Page({
         }, // 设置请求的 header
         success: function(res) {
           if (res.data.code == 0) {
-            getApp().my_warnning(res.data.msg, 0, th);
+            getApp().my_warnning(res.data.data, 0, th);
             setTimeout(function() {
               wx.navigateBack({
                 //返回
@@ -290,9 +290,11 @@ Page({
       }
     }).then(res => {
       if (res.data.code == 0) {
+        if (res.data.data[0].GroupHour!=undefined){
         if (res.data.data[0].GroupHour.length > 11) {
           getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
         }
+        }
         var hours = th.data.hours;
  
         var time_list = res.data.data;
@@ -323,6 +325,10 @@ Page({
               }
             }
           }
+        }else{
+          for(var i = 0 ;i<time.length;i++){
+            new_time[i]="";
+          }
         }
         th.setData({
           time_list: new_time,
@@ -32,7 +32,7 @@
   border-radius: 50%;
   float: right;
   margin: 0rpx 15rpx;
-  border: 2rpx solid red;
+  /* border: 2rpx solid red; */
 }
  
 .introduce {
@@ -147,11 +147,5 @@ Page({
           })
       }
     })
-  },
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function() {
-
   }
 })
 \ No newline at end of file
@@ -45,6 +45,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
+    var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
 <view class="container" wx:for="{{tment_details}}" wx:if="{{index<1}}">
   <!-- 预约人的属性 -->
-  <view class="Subscriber">
+  <view class="Subscriber padding">
     <!-- 状态栏 -->
     <view class="statusBar fs32 flex-vertical-between lf">
       <view>预约状态：</view>
@@ -76,7 +76,7 @@
   </view>
  
   <!-- 温馨提示内容 -->
-  <view class="Tips fs30 lf rel">
+  <view class="Tips fs30 lf rel padding">
     <!-- 棒槌 -->
     <view class="Stickl abs"></view>
     <view class="Stickl Stickr abs"></view>
@@ -88,8 +88,7 @@
     <view>2.如有任何问题可致电咨询;</view>
     <view>3.如需退约，需提前取消。</view>
   </view>
-
-  <!-- submit栏 -->
+   <!-- submit栏 -->
   <view class="subs flex-vertical-between fs32">
     <!-- 左边栏 -->
     <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}">
@@ -113,9 +112,11 @@
     </navigator>
  
   </view>
+
 </view>
+ 
 <!--  制作一个圆球导航  -->
 <nav_b></nav_b>
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
-<warn id="warn"></warn>
 \ No newline at end of file
+<warn id="warn"></warn>
 page {
   width: 100%;
-  height: 100%;
   background-color: rgb(238, 238, 238);
 }
  
@@ -34,13 +33,15 @@ page {
 /* 公用 */
  
 .container {
-  padding: 0rpx 20rpx;
   padding-bottom:40rpx;
 }
  
+.padding{
+  margin: 0rpx 20rpx;
+}
+
 .Subscriber {
   overflow: hidden;
-  width: 100%;
   margin-top: 25rpx;
   background-color: rgb(255, 255, 255);
   border-radius: 10rpx;
@@ -78,11 +79,12 @@ page {
 }
  
 .subs {
-  padding: 0rpx 5rpx;
-  margin-bottom: 20rpx;
+  width: 710rpx;
+  padding: 0rpx 20rpx;
   position: fixed;
-  width: 705rpx;
-  bottom:85rpx;
+  bottom:0rpx;
+  background-color: rgb(255,255,255);
+  height: 140rpx;
 }
  
 .sub {
@@ -104,7 +104,7 @@ Page({
     }).then(res => {
       if (res.data.code == 0) {
         var data = res.data.data.pageData;
-        var arrangeTime = data[0].ArrangeTime.substring(0, 11);
+        var arrangeTime = data[0].ArrangeTime;
         th.setData({
           beautician: data[0],
           arrangeTime: arrangeTime
@@ -140,10 +140,14 @@ Page({
   evaluate_save: function() {
     var th = this;
     var stars = th.data.stars_index; //评价星级
+    var proposal = th.data.proposal;
     //判断是否评级
     if (stars < 0) {
       getApp().my_warnning("请进行评分", 0, th);
       return false;
+    } else if (proposal==""){ 
+      getApp().my_warnning("给点建议呗", 0, th);
+      return false;
     }
     var labels = th.data.labels; //星级标签数组
     var evaLabList = []; //用户选择的评价标签
@@ -182,7 +186,7 @@ Page({
             wx.redirectTo({
               url: "/pages/user/my_service/tment_order_list"
             });
-          }, 800);
+          }, 1500);
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
         }
@@ -7,7 +7,10 @@
  
   <!-- 姓名 -->
   <view class="flex-level item">
-    <view class="itemlf fs32">美容师：</view>
+    <view class="itemlf flex-vertical-between">
+      <view class="fs32">美容师</view>
+      <view> ：</view>
+    </view>
     <view class="itemlr fs30 ellipsis-1 {{is_evaluate==0?'datetime':''}}">{{beautician.BeauticianName}}</view>
   </view>
  
@@ -38,16 +41,16 @@
   </view>
   <view class="tea_labs">
     <view class="flex-center fs26">
-    <block wx:if="{{is_evaluate==0}}">
-      <textarea class="rel textarea" placeholder="写其他意见和建议" placeholder-class="fs24" maxlength="{{proposal_size}}" bindinput="input_proposal" value="{{proposal}}">
-        <!-- 提示已输入多少数字 -->
-        <view if="{{is_evaluate==0}}" class="proposal abs">{{proposal.length}}/{{proposal_size}}</view>
-      </textarea>
+      <block wx:if="{{is_evaluate==0}}">
+        <textarea class="rel textarea" placeholder="写其他意见和建议" placeholder-class="fs24" maxlength="{{proposal_size}}" bindinput="input_proposal" value="{{proposal}}">
+          <!-- 提示已输入多少数字 -->
+          <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>
+        <view wx:if="{{proposal!=''}}" class="textarea">
+          {{proposal}}
+        </view>
       </block>
     </view>
  
@@ -59,11 +62,11 @@
     </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 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>
@@ -69,7 +69,7 @@
         <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}}">
+    <view class="exactly flex-center fs26" wx:if="{{ismore && tm_order_list.length>=3}}">
       <view class="line"></view>
       <view class="exactly_text">到底了</view>
       <view class="line"></view>