历史档案也排序问题

abson
1 parent cecbd747
Showing 4 changed files with 42 additions and 6 deletions
packageD/pages/AI-test-skin/history_record/history_record.js
packageD/pages/AI-test-skin/success_result/success_result.js
packageD/pages/AI-test-skin/success_result/success_result.wxml
packageD/pages/AI-test-skin/success_result/success_result.wxss
@@ -234,6 +234,20 @@ Page({
                 arr.push(time_obj);
             }
         }
+        function _sort_by_history_time (property){
+            return function(a,b){
+                let val1 = a[property];
+                let val2 = b[property];
+                if(val2 > val1){
+                    return 1
+                }else if(val2 < val1){
+                    return -1
+                }else{
+                    return 0
+                }
+            }
+        }
+        arr.sort(_sort_by_history_time('history_time'));
         return arr;
     },
 /*
  * @Author: abson
  * @Date: 2022-02-16 15:36:47
- * @LastEditTime: 2022-02-25 11:30:33
+ * @LastEditTime: 2022-02-28 10:44:27
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js
@@ -24,7 +24,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-        tab: [{ id: 'zong_he', name: '综合肤质' }, { id: 'mao_kong', name: '毛孔' }, { id: 'hei_tou', name: '黑头' }, { id: 'se_ban', name: '色斑' }, { id: 'zhou_wen', name: '皱纹' }, { id: 'hei_yan_quan', name: '黑眼圈' }, { id: 'cuo_chuang', name: '痤疮' }, { id: 'min_gan_du', name: '敏感度' }],
+        // tab: [{ id: 'zong_he', name: '综合肤质' }, { id: 'mao_kong', name: '毛孔' }, { id: 'hei_tou', name: '黑头' }, { id: 'se_ban', name: '色斑' }, { id: 'zhou_wen', name: '皱纹' }, { id: 'hei_yan_quan', name: '黑眼圈' }, { id: 'cuo_chuang', name: '痤疮' }, { id: 'min_gan_du', name: '敏感度' }],
         zhouwen_arr: [{ id: 1, name: '全部皱纹' }, { id: 2, name: '抬头纹' }, { id: 3, name: '川字纹' }, { id: 4, name: '眼周细纹' }, { id: 5, name: '鱼尾纹' }, { id: 6, name: '法令纹' }, { id: 7, name: '口周纹' }],
         cuochuang_arr: [{ id: 1, name: '全部痤疮' }, { id: 2, name: '粉刺 ' }, { id: 3, name: '痘印 ' }, { id: 4, name: '脓包' }, { id: 5, name: '结节' }],
         zhouwen_arr1: [{ id: 1, name: '皱纹/细纹',des:'是指皮肤受到外界环境影响，形成游离自由基，自由基破坏正常细胞膜组织内的胶原蛋白、活性物质，氧化细胞，或缺水而形成的小细纹，继而严重形成皱纹',sign: 'zhou1',sign1: 'zhou2' }, { id: 2, name: '抬头皱纹/抬头细纹',des:'位于额头的皱纹、细纹。形成原因因人而异，后天因素是比较少的。-般多为横纹， 竖纹较少见。' ,sign: 'zhou3',sign1:'zhou4'}, { id: 3, name: '眼部皱纹/眼部细纹',des:'眼部皱纹、细纹一般位于下眼睑部位，多见于下脸内1/3处。',sign:'zhou5',sign1:'zhou6' }, { id: 4, name: '鱼尾纹',des:'眼部皱纹的一种，是在人两侧外眼角和登角之间出现的皱纹，其纹路与鱼尾巴上的纹路很相似，故被形象地称为鱼尾纹。',sign:'zhou7',sign1:'zhou8' }, { id: 5, name: '眉间纹',des:'又叫川字纹，皱眉纹，是面部的一种正常的表情纹，随着年龄的增长，面部的皱纹会逐渐加深，双眉之间逐渐形成了较深的皱折，会使人看起来总是愁眉不展。',sign:'zhou9',sign1:'zhou10'}, { id: 6, name: '泪沟',des:'泪沟是指由内眼角开始出现在下眼睑靠鼻侧的两条凹沟，是由于眼眶隔膜下缘的软组织萎缩、下垂而生成的。',sign:'zhou11',sign1:'zhou12' }, { id: 7, name: '法令纹',des:'法令纹是位于鼻翼边延伸而下的两道纹路，是典型的皮肤组织老化、造成肌肤表面凹陷的现象。',sign:'zhou15',sign1:'zhou16' }, { id: 8, name: '口角纹',des:'口角纹又称木偶纹、括号纹，位于嘴角延伸而下的两道纹路，是表情肌、重力和遗传基因等几方面因素综合形成的。',sign:'zhou13',sign1:'zhou14' }],
@@ -199,7 +199,26 @@ Page({
                         return e.type==3;
                     })
                     th.data.acne_num4=a_arr.length;
-
+                    let tab_arr = [{ id: 'zong_he', name: '综合肤质' }];
+                    if(pore_num) {
+                        tab_arr.push({ id: 'mao_kong', name: '毛孔' });
+                    }
+                    if(blackhead_num){
+                        tab_arr.push({ id: 'hei_tou', name: '黑头' });
+                    }
+                    if(speckle_num){
+                        tab_arr.push({ id: 'se_ban', name: '色斑' });
+                    }
+                    if(wrinkle_num){
+                        tab_arr.push({ id: 'zhou_wen', name: '皱纹' });
+                    }
+                    if(dark_type > -1) {
+                        tab_arr.push( { id: 'hei_yan_quan', name: '黑眼圈' });
+                    }
+                    if(acne_num){
+                        tab_arr.push({ id: 'cuo_chuang', name: '痤疮' });
+                    }
+                    tab_arr.push( { id: 'min_gan_du', name: '敏感度' });
                     th.setData({
                         acne_num: acne_num,
                         speckle_num: speckle_num,
@@ -219,6 +238,7 @@ Page({
                         bili: bili,
                         bili_eye:bili_eye,
                         sex:sex,
+                        tab:tab_arr,
                         skin_dryoil_check_type:skin_dryoil_check_type,
                         eye_top:eye_top* bili_eye,
                         eye_left1:eye_left1* bili_eye,
@@ -401,8 +401,8 @@
             <view class="fs28 mt10" style="color: #666;">
                 {{item.des}}
             </view>
-            <image class="yiwen_img" src="{{iurl}}/miniapp/images/skinimg/{{item.sign}}.png"></image>
-            <image class="yiwen_img" src="{{iurl}}/miniapp/images/skinimg/{{item.sign1}}.png"></image>
+            <image class="yiwen_img" mode="widthFix" src="{{iurl}}/miniapp/images/skinimg/{{item.sign}}.png"></image>
+            <image class="yiwen_img" mode="widthFix" src="{{iurl}}/miniapp/images/skinimg/{{item.sign1}}.png"></image>
         </view>
     </scroll-view>
     <view style="position:fixed;bottom:0;width: 100%;">
@@ -415,7 +415,7 @@
         </scroll-view>
     </view>
     <view class="close_icon" bindtap="close_yiwen">
-        <text class="iconfont icon-close"></text>
+        <text class="iconfont icon-guan"></text>
     </view>
 </view>
 <!-- 提示 -->
@@ -11,6 +11,7 @@ page {
     z-index: 99;
     display: flex;
     height: 100rpx;
+    background-color: #fff;
 }
 .share {
@@ -844,6 +845,7 @@ page {
 }
 .yiwen_img {
+    width: 100%;
     margin-top: 40rpx;
     /* width: 600rpx;
     height: 600rpx; */