测肤历史档案

abson
1 parent deacd713
Showing 5 changed files with 116 additions and 70 deletions
packageD/pages/AI-test-skin/history_record/history_record.js
packageD/pages/AI-test-skin/history_record/history_record.json
packageD/pages/AI-test-skin/history_record/history_record.wxml
packageD/pages/AI-test-skin/history_record/history_record.wxss
packageD/pages/AI-test-skin/index/aiskin.wxml
@@ -177,69 +177,102 @@ Page({
                 return initChart;
             }
         },
+        history: [],
+        page: 1,
+        no_more: 0,
+        isLoading: 0,
+        is_get: 0,
     },
  
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+        
+    },
+
+    time_sort(data) {
+        let arr = this.data.history;
+        for (let i = 0; i < data.length; i++) {
+            let history = data[i];
+            let id = history.id;
+            let now = new Date(history['addtime'] * 1000);
+            let year = now.getFullYear(); //年
+            let month = (now.getMonth() + 1).toString().padStart(2, 0); //月
+            let day = (now.getDate()).toString().padStart(2, 0); //日
+            let hour = (now.getHours()).toString().padStart(2, 0); //时
+            let minute = (now.getMinutes()).toString().padStart(2, 0); //分
+            let history_time = `${year}年${month}月`;
+            let time = `${year}/${month}/${day} ${hour}:${minute}`;
+            let time_obj = {
+                history_time,
+                time_arr: new Array(),
+            };
+            if (arr.length > 0) {
+                let index = arr.findIndex(item => {
+                    return item['history_time'] === history_time;
+                })
+                if (index > -1) {
+                    let obj = {
+                        time,
+                        id,
+                    };
+                    arr[index]['time_arr'].push(obj);
+                } else {
+                    arr.push(time_obj);
+                }
+            } else {
+                arr.push(time_obj);
+            }
+        }
+        return arr;
+    },
+
+    async getHistoryData() {
+        if (this.data.no_more) return false;
+        if (this.data.isLoading) return false;
+        this.data.isLoading = 1;
+        let history = this.data.history;
         let url = `/api/weshop/face/storeSkinface/page`;
-        app.request.promiseGet(url, {
+        const { data: res } = await request.promiseGet(url, {
             isShowLoading: true,
             data: {
                 store_id: setting.stoid,
                 user_id: os.user_id,
+                page: this.data.page,
             }
-        }).then(res => {
-            console.log('111111111', res);
-            if (ut.ajax_ok(res)) {
-                let data = res.data.data.pageData;
-                let arr = [];
-                for (let i = 0; i < data.length; i++) {
-                    let history = data[i];
-                    let id = history.id;
-                    let now = new Date(history['addtime'] * 1000);
-                    let year = now.getFullYear(); //年
-                    let month = (now.getMonth() + 1).toString().padStart(2, 0); //月
-                    let day = (now.getDate()).toString().padStart(2, 0); //日
-                    let hour = (now.getHours()).toString().padStart(2, 0); //时
-                    let minute = (now.getMinutes()).toString().padStart(2, 0); //分
-                    let history_time = `${year}年${month}月`;
-                    let time = `${year}/${month}/${day} ${hour}:${minute}`;
-                    let time_obj = {
-                        history_time,
-                        time_arr: new Array(),
-                    };
-                    if (arr.length > 0) {
-                        let index = arr.findIndex(item => {
-                            return item['history_time'] === history_time;
-                        })
-                        if (index > -1) {
-                            let obj = {
-                                time,
-                                id,
-                            };
-                            arr[index]['time_arr'].push(obj);
-                        } else {
-                            arr.push(time_obj);
-                        }
-                    } else {
-                        arr.push(time_obj);
-                    }
-                }
+        });
+        // initChart.setOption(option);
+        if (res.code == 0 && res.data.pageData.length > 0) {
+            history = this.time_sort(res.data.pageData);
+            this.setData({
+                history,
+                no_more: 0,
+                isLoading: 0,
+                is_get: 1,
+            })
+        } else {
+            if (res.data.page > 1) {
+                this.setData({
+                    history,
+                    no_more: 1,
+                    isLoading: 0,
+                    is_get: 1,
+                })
+            } else {
                 this.setData({
-                    history: arr,
+                    history: [],
+                    is_get: 1,
                 })
-                initChart.setOption(option);
             }
-
-        })
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
+        }
  
     },
  
@@ -247,12 +280,12 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
-        setTimeout(() => {
-
-        }, 1000);
+        this.getHistoryData();
     },
     go_result(e) {
-
+        let id = e.currentTarget.dataset.id;
+        let url =`/packageD/pages/AI-test-skin/success_result/success_result?id=${id}`;
+        app.goto(url);
     },
  
     /**
@@ -280,7 +313,8 @@ Page({
      * 页面上拉触底事件的处理函数
      */
     onReachBottom: function () {
-
+        this.data.page++;
+        this.getHistoryData();
     },
  
     /**
 {
   "navigationBarTitleText": "历史变化",
   "usingComponents": {
-    "ec-canvas": "../../../components/ec-canvas/ec-canvas"
+    "ec-canvas": "../../../components/ec-canvas/ec-canvas",
+    "nodata": "/components/nodata/nodata"
   }
 }
 \ No newline at end of file
 <view class="content">
-    <view style="margin-bottom: 5%;">历史分析</view>
-    <view class="echarts" style="border-radius: 30rpx;">
-        <view class="tubiao">
-            <ec-canvas id="mychart" canvas-id="mychart-bar" ec="{{ec}}"></ec-canvas>
+    <view style="display: none;">
+        <view style="margin-bottom: 5%;">历史分析</view>
+        <view class="echarts" style="border-radius: 30rpx;">
+            <view class="tubiao">
+                <ec-canvas id="mychart" canvas-id="mychart-bar" ec="{{ec}}"></ec-canvas>
+            </view>
+            <text class="fs24" style="position:absolute;bottom:25px;color: #333;">
+                注：请确保多次拍摄姿态和环境光线一致。拍摄姿态的偏移、环境光线变化或者皮肤状态变化都可能导致分数较大波动。
+            </text>
         </view>
-        <text class="fs24" style="position:absolute;bottom:25px;color: #333;">
-            注：请确保多次拍摄姿态和环境光线一致。拍摄姿态的偏移、环境光线变化或者皮肤状态变化都可能导致分数较大波动。
-        </text>
     </view>
-    <view class="mgv5">历史报告</view>
-   
+    <view class="mgb5">历史报告</view>
     <view class="history_list">
         <view class="history_list_month" wx:for="{{history}}">
-            <view style="color:#333;font-size:26rpx;margin-top: 30rpx">{{item.time}}</view>
-            <view class="souce" wx:for="{{item.time_arr}}" wx:for-item="subitem" wx:for-index="subindex" wx:key="subindex"> 
-                <view style="font-weight: 600;">{{subitem}}</view>
-                <view style="color: #9b9b9b;" bindtap="go_result">去查看<text style="font-size: 24rpx;" class="iconfont icon-arrow_right"></text></view>
+            <view style="color:#333;font-size:26rpx;margin-top: 30rpx">{{item.history_time}}</view>
+            <view class="souce" wx:for="{{item.time_arr}}" wx:for-item="subitem" bindtap="go_result" data-id="{{subitem.id}}" wx:for-index="subindex" wx:key="subindex">
+                <view style="font-weight: 600;">{{subitem.time}}</view>
+                <view style="color: #9b9b9b;" >去查看<text style="font-size: 24rpx;" class="iconfont icon-arrow_right"></text></view>
             </view>
         </view>
     </view>
+    <view class="no-more txt-center" wx:if="{{history.length > 0 && no_more}}">- 没有更多了 -</view>
+    <nodata class="t-c" wx:if="{{history.length==0 && is_get}}"></nodata>
 </view>
 \ No newline at end of file
@@ -4,10 +4,18 @@ page {
     height: 100%;
 }
  
-.mgv5 {
+.mgb5 {
     margin-top: 5%;
     margin-bottom: 5%;
 }
+.txt-center {
+	text-align: center;
+}
+.no-more {
+	font-size: 24rpx;
+	line-height: 3;
+	color: #bbb;
+}
  
 .content {
     padding: 5%;
 <view class="container1">
     <view class="history">
-        <cover-view style="padding: 0 6rpx 0 25rpx;" bindtap="goto" data-url="/packageB/pages/AI-test-skin/history_record/history_record">历史档案</cover-view>
+        <cover-view style="padding: 0 6rpx 0 25rpx;" bindtap="goto" data-url="/packageD/pages/AI-test-skin/history_record/history_record">历史档案</cover-view>
         <text class="iconfont icon-arrow_right"></text>
     </view>
     <image src="{{iurl}}/miniapp/images/skinimg/shouye.jpeg"></image>
-    <view class="start_btn" bindtap="goto" data-url="/packageB/pages/AI-test-skin/shoot_notice/shoot_notice">
+    <view class="start_btn" bindtap="goto" data-url="/packageD/pages/AI-test-skin/shoot_notice/shoot_notice">
         <text>开始测肤</text>
     </view>
 </view>
 \ No newline at end of file