历史服务，我的门店，美容师，美容师预约数据填充

iceling
1 parent 8743432a
Showing 13 changed files with 281 additions and 129 deletions
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.wxml
pages/user/my_service/beauty_deta.wxss
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.wxml
pages/user/my_service/tment_order_list.js
pages/user/my_service/tment_order_list.wxml
pages/user/my_service/tment_order_list.wxss
 var e = getApp(),
   a = e.globalData.setting,
   os = a,
-  t = e.request;
+  t = e.request,
+  d = e.globalData;
 Page({
   /**
@@ -13,9 +14,14 @@ Page({
     beautician: 0, //是否显示美容师列表
     beautician_name: null, //选中的美容师名称
     placeholder: "填写备注", //备注为空的placeholder
-    store_list: null, //门店列表
-    store_name: null, //选择的服务门店
+    store_list: [], //门店列表
+    beautician_list: [], //美容师列表
+    store_name: "", //选择的服务门店
     fir_pick_index: 0, //选择的门店下标
+    curpage: 1, //当前分页数
+    pageSize: 5, //页大小
+    total: 0,
+    ismore: 0, //是否加载完毕
   },
   onclickstore: function() {
     var th = this;
@@ -32,37 +38,6 @@ Page({
       })
     }
   },
-  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) {
@@ -90,12 +65,95 @@ Page({
   choice_store: function() {
     var th = this;
     var index = th.data.fir_pick_index;
-    var pickup_name = th.data.store_list[index].pickup_name;
+    var pickup_name = th.data.store_list[index].StorageName;
     th.setData({
       store: 0,
       store_name: pickup_name
     })
   },
+  onReachBottom: function() {
+    var th = this;
+    if (this.data.total <= th.data.pageSize) return;
+    if (this.data.ismore) return;
+
+    wx.showLoading({
+      title: '加载中...',
+    })
+    th.query_store();
+  },
+  //分页查询门店信息
+  query_store: function() {
+    var th = this;
+    var itemid = "8f503b2e-f35f-4210-ba42-df4345526b93";
+    var url = "/api/weshop/marketing/reservation/storage/page";
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: d.user_id,
+        itemId: itemid,
+        page: th.data.curpage,
+        pageSize: th.data.pageSize
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        wx.hideLoading();
+        th.data.curpage++;
+        var arr1 = th.data.store_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({
+          store_list: arr3,
+          total: res.data.data.total,
+          ismore: ismore,
+          is_service_read: 1,
+        }), wx.stopPullDownRefresh(); //停止下拉刷新
+      }
+    })
+  },
+  //查询
+  query_beautician: function() {
+    var th = this;
+    if (th.data.store_name == "") {
+      getApp().my_warnning("请先选择服务门店", 0, th);
+    } else {
+      if (th.data.beautician == 0) {
+        th.setData({
+          beautician: 1
+        })
+      } else {
+        th.setData({
+          beautician: 0
+        })
+      }
+      var itemid = "8f503b2e-f35f-4210-ba42-df4345526b93";
+      var storageId = "FD8EC44A-6474-4BA1-A17C-A87306690E59";
+      var url = "/api/weshop/marketing/reservation/staff/page";
+      getApp().request.promiseGet(url, {
+        data: {
+          storeId: a.stoid,
+          userId: d.user_id,
+          itemId: itemid,
+          storageId: storageId
+        }
+      }).then(res => {
+        if (res.data.code == 0) {
+          th.setData({
+            beautician_list: res.data.data.pageData
+          }) //停止下拉刷新
+        }
+      })
+    }
+  },
+  choice_beautician: function(e) {
+    var th = this;
+    var bea_name = e.currentTarget.dataset.beaname;
+    th.setData({
+      beautician_name:bea_name
+    })
+ 
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -108,15 +166,6 @@ Page({
    */
   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
-          })
-        }
-      }
-    })
+    th.query_store();
   }
 })
 \ No newline at end of file
@@ -12,7 +12,7 @@
       <!-- 选择门店 -->
       <view class="flex-vertical-between fs26 select" bindtap="onclickstore">
-        <view class="color value ellipsis-1">{{store_name==null?'选择服务门店':store_name}}</view>
+        <view class="color value ellipsis-1">{{store_name==""?'选择服务门店':store_name}}</view>
         <view class="angle">∟</view>
       </view>
     </view>
@@ -27,15 +27,15 @@
       <!-- 选择门店 -->
       <view class="rel fs26">
-        <view class="flex-vertical-between Cosmetology" bindtap="query_bea">
+        <view class="flex-vertical-between Cosmetology" bindtap="query_beautician">
           <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 class="beautician flex-vertical fs26" wx:for="{{beautician_list}}" bindtap="choice_beautician" data-beaname="{{item.StaffName}}">
+            <view>{{item.StaffName}}</view>
           </view>
           <view>
           </view>
@@ -69,7 +69,7 @@
       </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 class="textarea" disabled="{{store || beautician}}" placeholder="填写备注" placeholder-class="fs26 color" value="">
           </textarea>
         </block>
         <block wx:else>
@@ -124,14 +124,18 @@
       </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_name fs28 ellipsis-1">{{item.StorageName}}</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 class="store_address fs24 ellipsis-2">地址:{{item.Address}}</view>
       </view>
     </view>
+    <!-- 通过搜索的时候没有找到的提示语 -->
+    <view wx:if="{{false}}" class="flex-center fs28 notstore">
+      <view>没有找到这个门店</view>
+    </view>
   </view>
   <!-- sub -->
   <view class="flex-center fs32" bindtap="choice_store">
@@ -28,6 +28,7 @@
 .Fram {
   padding: 0rpx 60rpx;
   margin-top: 60rpx;
+  background-color: rgb(255, 255, 255);
 }
 .subSuccess {
@@ -258,4 +259,8 @@
 }
 .value{
   max-width: 300rpx;
+}
+.notstore{
+  margin-top: 30rpx;
+  color: rgb(159, 159, 159);
 }
 \ No newline at end of file
@@ -35,28 +35,26 @@
       <!-- 选择时间 -->
       <view class="Times">
-        <view class="flex-center" wx:for="111110000000" style="display:inline-block;">
-       
+
+        <view class="flex-center" wx:for="1111100000" style="display:inline-block;">
+
           <view class="Time flex-center {{index==0?'chTime':'nochTime'}}">
-           <view>
+            <view>
               <view class="fs26">09:00</view>
               <block wx:if="{{flase}}">
-              <view class="fs24">约满</view>
+                <view class="fs24">约满</view>
               </block>
+            </view>
           </view>
         </view>
+        <view class="choice flex-center fs32">
+          <view>确定选择</view>
         </view>
-      </view>
-      <view class="choice flex-center fs32">
-        <view>确定选择</view>
       </view>
     </view>
-
-
-
   </view>
 </view>
 \ No newline at end of file
@@ -54,17 +54,15 @@
 }
 .choice {
-  width: 704rpx;
   height: 70rpx;
   background-color: rgb(214, 1, 33);
   color: rgb(255, 255, 255);
+  margin-top: 30rpx;
 }
 .scroll-h {
   white-space: nowrap;
   width: 704rpx;
-  /* width: 100%; */
-  margin-bottom: 25rpx;
   overflow: visible;
   height: 125rpx;
   color: transparent;
@@ -110,12 +108,12 @@
 .Times {
   background-color: rgb(238, 243, 247);
   margin-bottom: 30rpx;
-  width: 704rpx;
+  padding:34rpx 27rpx;
 }
 .Time {
   border: 2rpx solid rgb(238, 238, 238);
-  width: 172rpx;
+  width: 160rpx;
   height: 70rpx;
   background-color: rgb(255, 255, 255);
   text-align: center;
@@ -34,20 +34,20 @@
         </view>
         <!-- 预约状态 -->
-        <block wx:if="{{0}}">
+        <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>
-          <view class="flex-center gofu gofull">
+          <navigator class="flex-center gofu gofull" url="/pages/user/my_service/beauty_deta">
             <view class="fs24">已约满</view>
-          </view>
+          </navigator>
         </block>
       </view>
       <view class="fs26 information">
         <block wx:if="{{true}}">
-          <view class="ellipsis-3">在职业培训、职业技能鉴定与企业用人要求之间建立一个有效实用的联系，经研究 决定，以《职业技能鉴定国家题库操作技能考试手册》的方式，向全社会公布国家题库 操作技能考核试题库的全部内容。
+          <view class="ellipsis-3">{{item.remark1}}
           </view>
         </block>
         <block wx:else>
@@ -65,7 +65,7 @@
   </view>
 </view>
 <!-- 无美容师 -->
-<view class="empty_order" wx:if="{{false}}">
+<view class="empty_order" wx:if="{{cosmetology_list.length<1 && is_cosmetology_read}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/yyservice/no_beauty.png"></image>
   </view>
 var e = getApp(),
   a = e.globalData.setting,
   os = a,
-  t = e.request;
+  t = e.request,
+  d = e.globalData;
 Page({
   /**
@@ -22,6 +23,12 @@ Page({
       limitStartTime: "1917-05-06 12:32:44",
       limitEndTime: "2055-05-06 12:32:44"
     },
+    hist_List: [], //服务项目列表
+    is_service_read: 0,
+    curpage: 1, //当前分页数
+    pageSize: 10, //页大小
+    total: 0,
+    ismore: 0, //是否加载完毕
   },
   pickerShow: function() {
     this.setData({
@@ -68,37 +75,65 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function() {
-
+    var th = this;
+    th.query_hist();
   },
   /**
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function() {
+    var th = this;
+    if (th.data.total <= th.data.pageSize) return;
+    if (th.data.ismore) return;
+    wx.showLoading({
+      title: '加载中...',
+    })
+    th.query_service();
+  },
+  query_hist: function() {
+    var th = this;
+    var url = "http://localhost:8022/api/weshop/yy_fuwu_lishi";
+    wx.request({
+      url: url,
+      success: function(res) {
+        if (res.data.code == 0) {
+          th.setData({
+            hist_List: res.data.data.pageData,
+            total: res.data.data.total
+          })
+        }
+      }
+    })
+
+    // 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) {
+    //     wx.hideLoading();
+    //     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(); //停止下拉刷新
+    //   }
+    // })
   },
-
   /**
    * 用户点击右上角分享
    */
@@ -3,7 +3,7 @@
   <view class="exption flex-vertical-between fs28">
     <view class="flex">
       共使用
-      <view class="count">36</view>
+      <view class="count">{{total}}</view>
       次服务
     </view>
     <view class="flex">
@@ -22,24 +22,35 @@
   <!-- 总的服务列表 -->
   <view>
     <!-- 单个 -->
-    <view class="item flex-vertical-between" wx:for="11111">
+    <view class="item flex-vertical-between" wx:for="{{hist_List}}">
       <!-- left -->
       <view>
         <view class="flex fs28">
-          <view class="itemName ellipsis-1">头部按摩</view>
+          <view class="itemName ellipsis-1">{{item.xm}}</view>
           <view>(美容师：</view>
-          <view class="itemUsna ellipsis-1">花木兰</view>
+          <view class="itemUsna ellipsis-1">{{item.name}}</view>
           )
         </view>
-        <view class="fs24">2019-07-02 23:25:45</view>
+        <view class="fs24">{{item.type_a}}</view>
       </view>
       <!-- right -->
-      <view class="serState fs32">已服务</view>
+      <view class="serState fs32">
+        <view wx:if="{{item.type==1}}">未服务</view>
+        <view wx:if="{{item.type==2}}">已服务</view>
+        <view wx:if="{{item.type==3}}">已过期</view>
+      </view>
+    </view>
+    <!-- 没有数据 -->
+    <!-- 加载完毕并且数据大于=页大小 -->
+    <view class="After_all flex-center" wx:if="{{ismore && hist_List.length>=pageSize}}">
+      <view class="Line"></view>
+      <view class="end fs26 xc-black">到底了</view>
+      <view class="Line"></view>
     </view>
   </view>
 </view>
 <!-- 无历史服务 -->
-<view class="empty_order" wx:if="{{true}}">
+<view class="empty_order" wx:if="{{hist_List.length<1 && is_service_read}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image>
   </view>
@@ -95,3 +95,16 @@ page {
   background-color: rgb(255, 72, 72);
   border-radius: 40rpx;
 }
+
+.After_all {
+  height: 80rpx;
+}
+
+.After_all .Line {
+  border-top: 3rpx solid rgb(0, 0, 0);
+  width: 130rpx;
+}
+
+.After_all .end {
+  margin: 0rpx 15rpx;
+}
@@ -63,7 +63,7 @@
   </view>
 </view>
 <!-- 无服务项目 -->
-<view wx:if="{{service_List.length<0 && is_service_read}}">
+<view wx:if="{{service_List.length<1 && is_service_read}}">
   <!-- 遮住 -->
   <view class="cover"></view>
   <!-- 无历史服务 -->
@@ -23,6 +23,12 @@ Page({
       name: "已过期",
       id: 3
     }],
+    tm_order_list: [], //我的预约订单列表
+    is_service_read: 0,
+    curpage: 1, //当前分页数
+    pageSize: 10, //页大小
+    total: 0,
+    ismore: 0, //是否加载完毕
   },
   /**
@@ -34,16 +40,45 @@ Page({
   changeTab: function(e) {
     var th = this;
     var id = e.currentTarget.dataset.id;
+    var activeCategoryId = th.data.activeCategoryId;
+    if (id != activeCategoryId) {
+      th.setData({
+        activeCategoryId: id
+      })
+    } else {
+      return false;
+    }
+  },
+  query_orderList: function() {
+    var th = this;
+    var url = "http://localhost:8022/api/weshop/yy_order_list";
+    wx.request({
+      url: url,
+      success: function(res) {
+        if (res.data.code == 0) {
+          th.setData({
+            tm_order_list: res.data.data.pageData
+          })
+        }
+      }
+    })
+  },
+  //删除预约记录
+  deleteOrderData: function(e) {
+    var th = this;
+    var index = e.currentTarget.dataset.order_id;
+    var arr = th.data.tm_order_list;
+    arr.splice(index, 1);
     th.setData({
-      activeCategoryId: id
+      tm_order_list: arr
     })
   },
-
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-
+    var th = this;
+    th.query_orderList();
   },
   /**
@@ -7,67 +7,71 @@
   </view>
   <view wx:if="{{true}}">
     <!-- 预约项目 -->
-    <view wx:for="1111">
+    <view wx:for="{{tm_order_list}}">
       <!-- 商品编号和状态 -->
       <view class="Commodity_number flex-vertical-between fs24 padding">
         <!--商品编号 -->
-        <text class="order_number ellipsis-1" selectable='true'>订单编号：MDDER2019061454879342468</text>
+        <text class="order_number ellipsis-1" selectable='true'>订单编号：{{item.order_sn}}</text>
         <!-- 商品评价状态 -->
         <view class="flex-center xc-wc">
           <!-- 订单状态 -->
-          <view>已过期</view>
+          <view wx:if="{{item.is_prom==1}}">未服务</view>
+          <view wx:if="{{item.is_prom==2}}">已服务</view>
+          <view wx:if="{{item.is_prom==3}}">已过期</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>
+            <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-order_id="{{index}}"></image>
           </view>
         </view>
       </view>
       <!-- 项目属性 -->
-      <navigator class="items padding flex-vertical" url="">
+      <navigator class="items padding flex-vertical" url="/pages/user/my_service/tment_details">
         <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>
+            <image class="itemimage" src="{{item.img}}"></image>
           </view>
           <!-- 项目内容 -->
           <view class="details">
             <view class="item flex-vertical">
               <view class="itemname">预约门店:</view>
-              <view class="itemvalue ellipsis-1">王者峡谷中路店</view>
+              <view class="itemvalue ellipsis-1">{{item.store}}</view>
             </view>
             <view class="item flex-vertical">
               <view class="itemname">预约项目:</view>
-              <view class="itemvalue ellipsis-1">头部按摩</view>
+              <view class="itemvalue ellipsis-1">{{item.goods_name}}</view>
             </view>
             <view class="item flex-vertical">
               <view class="itemname">美容师:</view>
-              <view class="itemvalue ellipsis-1">花木兰</view>
+              <view class="itemvalue ellipsis-1">{{item.meirongshi}}</view>
             </view>
             <view class="item flex-vertical">
               <view class="itemname">预约时间:</view>
-              <view>2018-08-16 14:00</view>
+              <view>{{item.time}}</view>
             </view>
-            <view class="item flex-vertical" wx:if="{{true}}">
+            <view class="item flex-vertical" wx:if="{{item.endtime==undefined?false:true}}">
               <view class="itemname">服务时间:</view>
-              <view>2018-08-16 10:00</view>
+              <view>{{item.endtime}}</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>
+        <block wx:if="{{item.order_status==1}}">
+          <navigator url="/pages/user/my_service/tment_details" class="Unimportance flex-level">取消预约</navigator>
+        </block>
+        <block wx:else>
+          <navigator url="/pages/user/my_service/tment_details" class="Unimportance flex-level">查看详情</navigator>
+        </block>
+        <navigator class="important Unimportance flex-level" url="/pages/user/my_service/tment_details">更改时间</navigator>
+        <navigator url="/pages/user/my_service/tment_eval" wx:if="{{false}}" class="important Unimportance flex-level">发表评价</navigator>
+        <navigator url="/pages/user/my_service/appment_main" wx:if="{{false}}" class="important Unimportance flex-level">重新预约</navigator>
       </view>
     </view>
-    <view class="exactly flex-center fs26">
+    <view class="exactly flex-center fs26" wx:if="{{ismore && service_List.length>=pageSize}}">
       <view class="line"></view>
       <view class="exactly_text">到底了</view>
       <view class="line"></view>
@@ -76,7 +80,7 @@
 </view>
 <!-- 无预约订单 -->
-<view class="empty_order" wx:if="{{true}}">
+<view class="empty_order" wx:if="{{tm_order_list.length<1 && is_service_read}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/order/empty_order.png"></image>
   </view>
@@ -46,7 +46,7 @@ page {
 }
 .order_number {
-  width: 500rpx;
+  max-width: 500rpx;
 }
 .items {