From 28609a3db53516bfebcb1344759d45a69f8f3ecc Mon Sep 17 00:00:00 2001
From: iceling <iceling@meidd.com>
Date: Thu, 14 Nov 2019 17:14:49 +0800
Subject: [PATCH] 我的项目数据填充完毕

---
 pages/user/my_service/i_service.js   | 10 +++++++---
 pages/user/my_service/i_service.wxml | 20 ++++++++++++--------
 pages/user/my_service/i_service.wxss | 39 ++++++++++++++++++++++++++++-----------
 3 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/pages/user/my_service/i_service.js b/pages/user/my_service/i_service.js
index 8d3cd45..acbb37d 100644
--- a/pages/user/my_service/i_service.js
+++ b/pages/user/my_service/i_service.js
@@ -49,6 +49,10 @@ Page({
     var th = this;
     if (this.data.total <= th.data.pageSize) return;
     if (this.data.ismore) return;
+
+    wx.showLoading({
+      title: '加载中...',
+    })
     this.query_service();
   },
   //查询服务项目列表
@@ -64,7 +68,8 @@ Page({
       }
     }).then(res => {
       if (res.data.code == 0) {
-        th.data.curpage++;
+        wx.hideLoading();
+         th.data.curpage++;
         var arr1 = th.data.service_List;
         var arr2 = res.data.data.pageData;
         var arr3 = [...arr1, ...arr2];
@@ -74,7 +79,7 @@ Page({
           service_List: arr3,
           total: res.data.data.total,
           ismore: ismore,
-          is_service_read: 1
+          is_service_read: 1,
         }), wx.stopPullDownRefresh(); //停止下拉刷新
       }
     })
@@ -84,7 +89,6 @@ Page({
     var th = this;
     var ind = e.currentTarget.dataset.ind;
     var item = this.data.service_List[ind];
-
     var ewm = "^" + th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|" + item.Validay + "|TY01|";
     var tt = th.format_time(1);
     ewm = ewm + tt;
diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml
index 6ef0a7b..611b56b 100644
--- a/pages/user/my_service/i_service.wxml
+++ b/pages/user/my_service/i_service.wxml
@@ -11,15 +11,15 @@
   <view class="rel" wx:for="{{service_List}}">
     <view class="abs">
       <!-- 皇冠log -->
-      <block wx:if="{{item.BuyTepy==4}}">
+      <block wx:if="{{item.BuyType==4}}">
         <image class="equity_money" src="{{iurl}}/miniapp/images//yyservice/equity.png" lazy-load="true"></image>
       </block>
       <!-- 金钱log -->
-      <block wx:if="{{item.BuyTepy==1}}">
+      <block wx:if="{{item.BuyType==1}}">
         <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/money.png" lazy-load="true"></image>
       </block>
       <!-- 礼包log -->
-      <block wx:if="{{item.BuyTepy==3}}">
+      <block wx:if="{{item.BuyType==3}}">
         <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/giftpackage.png" lazy-load="true"></image>
       </block>
     </view>
@@ -49,12 +49,18 @@
         <view>立即使用</view>
       </view>
       <!-- 可预约 -->
-        <navigator class="flex-level appointment" url="/pages/user/my_service/appment_main/appment_main">
-          <view>预约</view>
+      <navigator class="flex-level appointment" url="/pages/user/my_service/appment_main">
+        <view>预约</view>
       </navigator>
     </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 wx:if="{{service_List.length<0 && ismore}}">
@@ -72,10 +78,8 @@
       </navigator>
     </view>
   </view>
-
 </view>
 
-
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
 <warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/my_service/i_service.wxss b/pages/user/my_service/i_service.wxss
index 73ae327..b9ac455 100644
--- a/pages/user/my_service/i_service.wxss
+++ b/pages/user/my_service/i_service.wxss
@@ -31,7 +31,7 @@ page {
   display: inline-block;
   margin-right: 15rpx;
   margin-bottom: 20rpx;
-  box-shadow: 0rpx 3rpx 3rpx 3rpx rgb(233, 233, 233);
+  box-shadow: 0rpx 2rpx 3rpx 3rpx rgb(233, 233, 233);
 }
 
 .abs {
@@ -105,18 +105,22 @@ page {
 .Date {
   margin-left: 10rpx;
 }
+
 /* 无服务项目 */
-.cover{
-   position: fixed;
-   z-index: 1;
-   left: 0rpx;
-   top: 390rpx;
-   width: 100%;
-   height: 200rpx;
-   background-color: rgb(255, 255, 255);
+
+.cover {
+  position: fixed;
+  z-index: 1;
+  left: 0rpx;
+  top: 390rpx;
+  width: 100%;
+  height: 200rpx;
+  background-color: rgb(255, 255, 255);
 }
+
 /* 无历史服务 */
-.empty_order{
+
+.empty_order {
   position: fixed;
   left: 0rpx;
   top: 500rpx;
@@ -145,4 +149,17 @@ 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;
+}
--
libgit2 0.21.4