From 8743432aa05081d5af668a33464dcfa7de1b577b Mon Sep 17 00:00:00 2001
From: iceling <iceling@meidd.com>
Date: Thu, 14 Nov 2019 23:30:32 +0800
Subject: [PATCH] 修改现有的跳转路径

---
 pages/user/my_service/appment_main.wxml     |  6 +++---
 pages/user/my_service/beauty_deta.wxss      |  3 ++-
 pages/user/my_service/cosmetology_list.js   | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 pages/user/my_service/cosmetology_list.wxml | 13 ++++++++++---
 pages/user/my_service/cosmetology_list.wxss | 14 +++++++++++++-
 pages/user/my_service/i_service.wxml        |  4 ++--
 pages/user/my_service/my_service.js         |  0
 pages/user/my_service/my_service.wxml       |  0
 pages/user/my_service/tment_order_list.wxml |  2 +-
 9 files changed, 85 insertions(+), 15 deletions(-)
 create mode 100644 pages/user/my_service/my_service.js
 create mode 100644 pages/user/my_service/my_service.wxml

diff --git a/pages/user/my_service/appment_main.wxml b/pages/user/my_service/appment_main.wxml
index 3c44785..84dc68c 100644
--- a/pages/user/my_service/appment_main.wxml
+++ b/pages/user/my_service/appment_main.wxml
@@ -41,7 +41,7 @@
           </view>
         </view>
       </view>
-      <navigator class="flex-center" url="/pages/user/Cosmetology_list/Cosmetology_list">
+      <navigator class="flex-center" url="/pages/user/my_service/cosmetology_list">
         <image class="user" src="{{iurl}}/miniapp/images/yyservice/user.png"></image>
       </navigator>
     </view>
@@ -54,7 +54,7 @@
       </view>
 
       <!-- 选择门店 -->
-      <view class="flex-vertical-between fs26 select" data-url="/pages/user/beauty_deta/beauty_deta" bindtap="goto">
+      <view class="flex-vertical-between fs26 select" data-url="/pages/user/my_service/beauty_deta" bindtap="goto">
         <view class="color">选择时间</view>
         <view class="angle angler">∟</view>
       </view>
@@ -83,7 +83,7 @@
     </view>
 
     <view class="submitMax flex-space-between fs30">
-      <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list/tment_order_list">
+      <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list">
         <view>我的预约</view>
       </navigator>
       <view class="sub_appment flex-center">
diff --git a/pages/user/my_service/beauty_deta.wxss b/pages/user/my_service/beauty_deta.wxss
index 656f90e..b7c3e88 100644
--- a/pages/user/my_service/beauty_deta.wxss
+++ b/pages/user/my_service/beauty_deta.wxss
@@ -63,6 +63,7 @@
 .scroll-h {
   white-space: nowrap;
   width: 704rpx;
+  /* width: 100%; */
   margin-bottom: 25rpx;
   overflow: visible;
   height: 125rpx;
@@ -95,7 +96,7 @@
 }
 
 .bd {
-  border: 2rpx solid rgb(238, 238, 238);
+  /* border: 2rpx solid rgb(238, 238, 238); */
   background-color: rgb(255, 255, 255);
   color: rgb(20, 20, 20);
 }
diff --git a/pages/user/my_service/cosmetology_list.js b/pages/user/my_service/cosmetology_list.js
index 9158b08..a2dabb0 100644
--- a/pages/user/my_service/cosmetology_list.js
+++ b/pages/user/my_service/cosmetology_list.js
@@ -9,9 +9,23 @@ Page({
    */
   data: {
     iurl: a.imghost,
-    cosmetology_list: null, //美容师列表
+    cosmetology_list: [], //美容师列表
+    is_cosmetology_read: 0,//是否有读过美容师接口,该属性用在没有美容师列表的排版
+    curpage: 1, //当前分页数
+    pageSize: 10, //页大小
+    total: 0,//总数量
+    ismore: 0, //是否加载完毕
   },
-  query_cosmetology: function() {
+  onReachBottom: function () {
+    var th = this;
+    if (this.data.total <= th.data.pageSize) return;
+    if (this.data.ismore) return;
+    wx.showLoading({
+      title: '加载中...',
+    })
+    th.query_cology();
+  },
+  query_cology: function() {
     var th = this;
     var url = "http://localhost:8022/api/weshop/yy_fuwu_meirongshi";
     wx.request({
@@ -23,8 +37,44 @@ Page({
           })
         }
       }
-
     })
+
+    // 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) {
+    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) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
   },
   /**
    * 生命周期函数--监听页面加载
@@ -43,7 +93,7 @@ Page({
    */
   onShow: function() {
     var th = this;
-    th.query_cosmetology();
+    th.query_cology();
   },
 
 })
\ No newline at end of file
diff --git a/pages/user/my_service/cosmetology_list.wxml b/pages/user/my_service/cosmetology_list.wxml
index 4bc5937..4987464 100644
--- a/pages/user/my_service/cosmetology_list.wxml
+++ b/pages/user/my_service/cosmetology_list.wxml
@@ -8,7 +8,7 @@
       <!-- 个人属性 -->
       <view class="flex-vertical-between">
         <view class="flex-vertical">
-          <image class="portrait" src="{{item.img}}"></image>
+          <image class="portrait" src="{{item.img}}" lazy-load="true" data-errorimg="cosmetology_list[{{index}}].img" binderror="bind_bnerr1" data-img="{{item.img}}"></image>
           <view>
             <!-- 用户名 -->
             <view class="UserName ellipsis-1 fs32">{{item.name}}</view>
@@ -35,7 +35,7 @@
 
         <!-- 预约状态 -->
         <block wx:if="{{0}}">
-          <navigator class="flex-center gofu go" url="/pages/user/beauty_deta/beauty_deta">
+          <navigator class="flex-center gofu go" url="/pages/user/my_service/beauty_deta">
             <view class="fs24">预约</view>
           </navigator>
         </block>
@@ -55,6 +55,13 @@
         </block>
       </view>
     </view>
+    <!-- 没有数据 -->
+    <!-- 加载完毕并且数据大于=页大小 -->
+    <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=pageSize}}">
+      <view class="Line"></view>
+      <view class="end fs26 xc-black">到底了</view>
+      <view class="Line"></view>
+    </view>
   </view>
 </view>
 <!-- 无美容师 -->
@@ -64,7 +71,7 @@
   </view>
   <view class="flex-level fs30 xc-ash">暂无美容师</view>
   <view class="flex-level">
-    <navigator url="/pages/user/my_service/my_service" bindtap="goto">
+    <navigator url="/pages/user/my_service/i_service" bindtap="goto">
       <view class="flex-center fs28 white">其他项目</view>
     </navigator>
   </view>
diff --git a/pages/user/my_service/cosmetology_list.wxss b/pages/user/my_service/cosmetology_list.wxss
index a7250dc..a772857 100644
--- a/pages/user/my_service/cosmetology_list.wxss
+++ b/pages/user/my_service/cosmetology_list.wxss
@@ -104,4 +104,16 @@ page{
   height: 56rpx;
   background-color: rgb(255, 72, 72);
   border-radius: 40rpx;
-}
\ No newline at end of file
+}
+.After_all {
+  height: 80rpx;
+}
+
+.After_all .Line {
+  border-top: 3rpx solid rgb(0, 0, 0);
+  width: 130rpx;
+}
+
+.After_all .end {
+  margin: 0rpx 15rpx;
+}
diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml
index 611b56b..44e3019 100644
--- a/pages/user/my_service/i_service.wxml
+++ b/pages/user/my_service/i_service.wxml
@@ -25,7 +25,7 @@
     </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>
+        <image class="itemimage" src="{{item.ImageUrl==''?iurl+defimgurl:item.ImageUrl}}" lazy-load="true" data-errorimg="service_List[{{index}}].ImageUrl" binderror="bind_bnerr1" data-img="{{item.ImageUrl}}"></image>
       </view>
 
       <view class="flex-center itemName">
@@ -63,7 +63,7 @@
   </view>
 </view>
 <!-- 无服务项目 -->
-<view wx:if="{{service_List.length<0 && ismore}}">
+<view wx:if="{{service_List.length<0 && is_service_read}}">
   <!-- 遮住 -->
   <view class="cover"></view>
   <!-- 无历史服务 -->
diff --git a/pages/user/my_service/my_service.js b/pages/user/my_service/my_service.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/pages/user/my_service/my_service.js
diff --git a/pages/user/my_service/my_service.wxml b/pages/user/my_service/my_service.wxml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/pages/user/my_service/my_service.wxml
diff --git a/pages/user/my_service/tment_order_list.wxml b/pages/user/my_service/tment_order_list.wxml
index 14f1bf7..901443b 100644
--- a/pages/user/my_service/tment_order_list.wxml
+++ b/pages/user/my_service/tment_order_list.wxml
@@ -82,7 +82,7 @@
   </view>
   <view class="flex-level fs30 xc-ash">暂无预约记录</view>
   <view class="flex-level">
-    <navigator url="/pages/user/my_service/my_service" bindtap="goto">
+    <navigator url="/pages/user/my_service/i_service" bindtap="goto">
       <view class="flex-center fs28 white">立即预约</view>
     </navigator>
   </view>
--
libgit2 0.21.4