Commit 14981844753fb239b03399c9265b175671e91588
1 parent
4f32735e
测肤优化
Showing
2 changed files
with
10 additions
and
2 deletions
packageD/pages/AI-test-skin/fail_result/fail_result.wxml
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | <text class="iconfont .icon-infofill" style="color:red;font-size: 40rpx;position:absolute;left: -8rpx;top: 0;"></text> | 6 | <text class="iconfont .icon-infofill" style="color:red;font-size: 40rpx;position:absolute;left: -8rpx;top: 0;"></text> |
7 | </view> | 7 | </view> |
8 | </view> | 8 | </view> |
9 | - <view style="font-size:32rpx;color: #333">上传图片符合要求</view> | 9 | + <view style="font-size:32rpx;color: #333">上传图片不符合要求</view> |
10 | <view style="font-size: 26rpx;color: #555">请重新更换图片获取相关检测</view> | 10 | <view style="font-size: 26rpx;color: #555">请重新更换图片获取相关检测</view> |
11 | <view style="border-bottom: 1rpx solid #eee; margin:0 40rpx;margin-top:40rpx;"></view> | 11 | <view style="border-bottom: 1rpx solid #eee; margin:0 40rpx;margin-top:40rpx;"></view> |
12 | </view> | 12 | </view> |
packageD/pages/AI-test-skin/history_record/history_record.js
@@ -250,6 +250,9 @@ Page({ | @@ -250,6 +250,9 @@ Page({ | ||
250 | arr.sort(_sort_by_history_time('history_time')); | 250 | arr.sort(_sort_by_history_time('history_time')); |
251 | return arr; | 251 | return arr; |
252 | }, | 252 | }, |
253 | + bindscrolltolower(){ | ||
254 | + console.log(111); | ||
255 | + }, | ||
253 | 256 | ||
254 | async getHistoryData() { | 257 | async getHistoryData() { |
255 | if (this.data.no_more) return false; | 258 | if (this.data.no_more) return false; |
@@ -263,14 +266,19 @@ Page({ | @@ -263,14 +266,19 @@ Page({ | ||
263 | store_id: setting.stoid, | 266 | store_id: setting.stoid, |
264 | user_id: os.user_id, | 267 | user_id: os.user_id, |
265 | page: this.data.page, | 268 | page: this.data.page, |
269 | + pageSize:20 | ||
266 | } | 270 | } |
267 | }); | 271 | }); |
268 | // initChart.setOption(option); | 272 | // initChart.setOption(option); |
269 | if (res.code == 0 && res.data.pageData.length > 0) { | 273 | if (res.code == 0 && res.data.pageData.length > 0) { |
270 | history = this.time_sort(res.data.pageData); | 274 | history = this.time_sort(res.data.pageData); |
275 | + if(res.data.pageData.length >= res.data.total){ | ||
276 | + this.setData({ | ||
277 | + no_more: 1, | ||
278 | + }) | ||
279 | + } | ||
271 | this.setData({ | 280 | this.setData({ |
272 | history, | 281 | history, |
273 | - no_more: 0, | ||
274 | isLoading: 0, | 282 | isLoading: 0, |
275 | is_get: 1, | 283 | is_get: 1, |
276 | }) | 284 | }) |