Commit 28609a3db53516bfebcb1344759d45a69f8f3ecc
1 parent
9aa50e7f
我的项目数据填充完毕
Showing
3 changed files
with
47 additions
and
22 deletions
pages/user/my_service/i_service.js
@@ -49,6 +49,10 @@ Page({ | @@ -49,6 +49,10 @@ Page({ | ||
49 | var th = this; | 49 | var th = this; |
50 | if (this.data.total <= th.data.pageSize) return; | 50 | if (this.data.total <= th.data.pageSize) return; |
51 | if (this.data.ismore) return; | 51 | if (this.data.ismore) return; |
52 | + | ||
53 | + wx.showLoading({ | ||
54 | + title: '加载中...', | ||
55 | + }) | ||
52 | this.query_service(); | 56 | this.query_service(); |
53 | }, | 57 | }, |
54 | //查询服务项目列表 | 58 | //查询服务项目列表 |
@@ -64,7 +68,8 @@ Page({ | @@ -64,7 +68,8 @@ Page({ | ||
64 | } | 68 | } |
65 | }).then(res => { | 69 | }).then(res => { |
66 | if (res.data.code == 0) { | 70 | if (res.data.code == 0) { |
67 | - th.data.curpage++; | 71 | + wx.hideLoading(); |
72 | + th.data.curpage++; | ||
68 | var arr1 = th.data.service_List; | 73 | var arr1 = th.data.service_List; |
69 | var arr2 = res.data.data.pageData; | 74 | var arr2 = res.data.data.pageData; |
70 | var arr3 = [...arr1, ...arr2]; | 75 | var arr3 = [...arr1, ...arr2]; |
@@ -74,7 +79,7 @@ Page({ | @@ -74,7 +79,7 @@ Page({ | ||
74 | service_List: arr3, | 79 | service_List: arr3, |
75 | total: res.data.data.total, | 80 | total: res.data.data.total, |
76 | ismore: ismore, | 81 | ismore: ismore, |
77 | - is_service_read: 1 | 82 | + is_service_read: 1, |
78 | }), wx.stopPullDownRefresh(); //停止下拉刷新 | 83 | }), wx.stopPullDownRefresh(); //停止下拉刷新 |
79 | } | 84 | } |
80 | }) | 85 | }) |
@@ -84,7 +89,6 @@ Page({ | @@ -84,7 +89,6 @@ Page({ | ||
84 | var th = this; | 89 | var th = this; |
85 | var ind = e.currentTarget.dataset.ind; | 90 | var ind = e.currentTarget.dataset.ind; |
86 | var item = this.data.service_List[ind]; | 91 | var item = this.data.service_List[ind]; |
87 | - | ||
88 | var ewm = "^" + th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|" + item.Validay + "|TY01|"; | 92 | var ewm = "^" + th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|" + item.Validay + "|TY01|"; |
89 | var tt = th.format_time(1); | 93 | var tt = th.format_time(1); |
90 | ewm = ewm + tt; | 94 | ewm = ewm + tt; |
pages/user/my_service/i_service.wxml
@@ -11,15 +11,15 @@ | @@ -11,15 +11,15 @@ | ||
11 | <view class="rel" wx:for="{{service_List}}"> | 11 | <view class="rel" wx:for="{{service_List}}"> |
12 | <view class="abs"> | 12 | <view class="abs"> |
13 | <!-- 皇冠log --> | 13 | <!-- 皇冠log --> |
14 | - <block wx:if="{{item.BuyTepy==4}}"> | 14 | + <block wx:if="{{item.BuyType==4}}"> |
15 | <image class="equity_money" src="{{iurl}}/miniapp/images//yyservice/equity.png" lazy-load="true"></image> | 15 | <image class="equity_money" src="{{iurl}}/miniapp/images//yyservice/equity.png" lazy-load="true"></image> |
16 | </block> | 16 | </block> |
17 | <!-- 金钱log --> | 17 | <!-- 金钱log --> |
18 | - <block wx:if="{{item.BuyTepy==1}}"> | 18 | + <block wx:if="{{item.BuyType==1}}"> |
19 | <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/money.png" lazy-load="true"></image> | 19 | <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/money.png" lazy-load="true"></image> |
20 | </block> | 20 | </block> |
21 | <!-- 礼包log --> | 21 | <!-- 礼包log --> |
22 | - <block wx:if="{{item.BuyTepy==3}}"> | 22 | + <block wx:if="{{item.BuyType==3}}"> |
23 | <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/giftpackage.png" lazy-load="true"></image> | 23 | <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/giftpackage.png" lazy-load="true"></image> |
24 | </block> | 24 | </block> |
25 | </view> | 25 | </view> |
@@ -49,12 +49,18 @@ | @@ -49,12 +49,18 @@ | ||
49 | <view>立即使用</view> | 49 | <view>立即使用</view> |
50 | </view> | 50 | </view> |
51 | <!-- 可预约 --> | 51 | <!-- 可预约 --> |
52 | - <navigator class="flex-level appointment" url="/pages/user/my_service/appment_main/appment_main"> | ||
53 | - <view>预约</view> | 52 | + <navigator class="flex-level appointment" url="/pages/user/my_service/appment_main"> |
53 | + <view>预约</view> | ||
54 | </navigator> | 54 | </navigator> |
55 | </view> | 55 | </view> |
56 | </view> | 56 | </view> |
57 | - | 57 | + <!-- 没有数据 --> |
58 | + <!-- 加载完毕并且数据大于=页大小 --> | ||
59 | + <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=pageSize}}"> | ||
60 | + <view class="Line"></view> | ||
61 | + <view class="end fs26 xc-black">到底了</view> | ||
62 | + <view class="Line"></view> | ||
63 | + </view> | ||
58 | </view> | 64 | </view> |
59 | <!-- 无服务项目 --> | 65 | <!-- 无服务项目 --> |
60 | <view wx:if="{{service_List.length<0 && ismore}}"> | 66 | <view wx:if="{{service_List.length<0 && ismore}}"> |
@@ -72,10 +78,8 @@ | @@ -72,10 +78,8 @@ | ||
72 | </navigator> | 78 | </navigator> |
73 | </view> | 79 | </view> |
74 | </view> | 80 | </view> |
75 | - | ||
76 | </view> | 81 | </view> |
77 | 82 | ||
78 | - | ||
79 | <!-- 弹出框扫描 --> | 83 | <!-- 弹出框扫描 --> |
80 | <qr_code id="qc_com"></qr_code> | 84 | <qr_code id="qc_com"></qr_code> |
81 | <warn id="warn"></warn> | 85 | <warn id="warn"></warn> |
82 | \ No newline at end of file | 86 | \ No newline at end of file |
pages/user/my_service/i_service.wxss
@@ -31,7 +31,7 @@ page { | @@ -31,7 +31,7 @@ page { | ||
31 | display: inline-block; | 31 | display: inline-block; |
32 | margin-right: 15rpx; | 32 | margin-right: 15rpx; |
33 | margin-bottom: 20rpx; | 33 | margin-bottom: 20rpx; |
34 | - box-shadow: 0rpx 3rpx 3rpx 3rpx rgb(233, 233, 233); | 34 | + box-shadow: 0rpx 2rpx 3rpx 3rpx rgb(233, 233, 233); |
35 | } | 35 | } |
36 | 36 | ||
37 | .abs { | 37 | .abs { |
@@ -105,18 +105,22 @@ page { | @@ -105,18 +105,22 @@ page { | ||
105 | .Date { | 105 | .Date { |
106 | margin-left: 10rpx; | 106 | margin-left: 10rpx; |
107 | } | 107 | } |
108 | + | ||
108 | /* 无服务项目 */ | 109 | /* 无服务项目 */ |
109 | -.cover{ | ||
110 | - position: fixed; | ||
111 | - z-index: 1; | ||
112 | - left: 0rpx; | ||
113 | - top: 390rpx; | ||
114 | - width: 100%; | ||
115 | - height: 200rpx; | ||
116 | - background-color: rgb(255, 255, 255); | 110 | + |
111 | +.cover { | ||
112 | + position: fixed; | ||
113 | + z-index: 1; | ||
114 | + left: 0rpx; | ||
115 | + top: 390rpx; | ||
116 | + width: 100%; | ||
117 | + height: 200rpx; | ||
118 | + background-color: rgb(255, 255, 255); | ||
117 | } | 119 | } |
120 | + | ||
118 | /* 无历史服务 */ | 121 | /* 无历史服务 */ |
119 | -.empty_order{ | 122 | + |
123 | +.empty_order { | ||
120 | position: fixed; | 124 | position: fixed; |
121 | left: 0rpx; | 125 | left: 0rpx; |
122 | top: 500rpx; | 126 | top: 500rpx; |
@@ -145,4 +149,17 @@ page { | @@ -145,4 +149,17 @@ page { | ||
145 | height: 56rpx; | 149 | height: 56rpx; |
146 | background-color: rgb(255, 72, 72); | 150 | background-color: rgb(255, 72, 72); |
147 | border-radius: 40rpx; | 151 | border-radius: 40rpx; |
148 | -} | ||
149 | \ No newline at end of file | 152 | \ No newline at end of file |
153 | +} | ||
154 | + | ||
155 | +.After_all { | ||
156 | + height: 80rpx; | ||
157 | +} | ||
158 | + | ||
159 | +.After_all .Line { | ||
160 | + border-top: 3rpx solid rgb(0, 0, 0); | ||
161 | + width: 130rpx; | ||
162 | +} | ||
163 | + | ||
164 | +.After_all .end { | ||
165 | + margin: 0rpx 15rpx; | ||
166 | +} |