From 14981844753fb239b03399c9265b175671e91588 Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Sat, 5 Mar 2022 11:55:18 +0800
Subject: [PATCH] 测肤优化

---
 packageD/pages/AI-test-skin/fail_result/fail_result.wxml     |  2 +-
 packageD/pages/AI-test-skin/history_record/history_record.js | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packageD/pages/AI-test-skin/fail_result/fail_result.wxml b/packageD/pages/AI-test-skin/fail_result/fail_result.wxml
index 6ccabff..efdd6a4 100644
--- a/packageD/pages/AI-test-skin/fail_result/fail_result.wxml
+++ b/packageD/pages/AI-test-skin/fail_result/fail_result.wxml
@@ -6,7 +6,7 @@
                 <text class="iconfont .icon-infofill" style="color:red;font-size: 40rpx;position:absolute;left: -8rpx;top: 0;"></text>
             </view>
         </view>
-        <view style="font-size:32rpx;color: #333">上传图片符合要求</view>
+        <view style="font-size:32rpx;color: #333">上传图片不符合要求</view>
         <view style="font-size: 26rpx;color: #555">请重新更换图片获取相关检测</view>
         <view style="border-bottom: 1rpx solid #eee; margin:0 40rpx;margin-top:40rpx;"></view>
     </view>
diff --git a/packageD/pages/AI-test-skin/history_record/history_record.js b/packageD/pages/AI-test-skin/history_record/history_record.js
index a1f954d..598d574 100644
--- a/packageD/pages/AI-test-skin/history_record/history_record.js
+++ b/packageD/pages/AI-test-skin/history_record/history_record.js
@@ -250,6 +250,9 @@ Page({
         arr.sort(_sort_by_history_time('history_time'));
         return arr;
     },
+    bindscrolltolower(){
+        console.log(111);
+    },
 
     async getHistoryData() {
         if (this.data.no_more) return false;
@@ -263,14 +266,19 @@ Page({
                 store_id: setting.stoid,
                 user_id: os.user_id,
                 page: this.data.page,
+                pageSize:20
             }
         });
         // initChart.setOption(option);
         if (res.code == 0 && res.data.pageData.length > 0) {
             history = this.time_sort(res.data.pageData);
+            if(res.data.pageData.length >= res.data.total){
+                this.setData({
+                    no_more: 1,
+                })
+            }
             this.setData({
                 history,
-                no_more: 0,
                 isLoading: 0,
                 is_get: 1,
             })
--
libgit2 0.21.4