From 71d8574ead2e8abca0e3d2530007c88fe0ccaefa Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 14 Apr 2022 10:49:37 +0800
Subject: [PATCH] 1. 报警错误的优化 2. 测肤的优化

---
 components/serviceCard_list/serviceCard_list.js |  2 +-
 packageD/pages/AI-test-skin/analyse/analyse.js  | 17 +++++++++++++++--
 pages/user/index/index.js                       | 29 ++++++++++++++++-------------
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/components/serviceCard_list/serviceCard_list.js b/components/serviceCard_list/serviceCard_list.js
index 210b188..4098e2f 100644
--- a/components/serviceCard_list/serviceCard_list.js
+++ b/components/serviceCard_list/serviceCard_list.js
@@ -70,7 +70,7 @@ Component({
                       //--- 判断是等级会员，且在有效期范围内 ---
                       if (user.card_field && now < end) {
                         var card_name = ob.name_map.get(user.card_field);
-                        if (card_name.length > 4) card_name = card_name.substring(0, 8);
+                        if (card_name && card_name.length > 4) card_name = card_name.substring(0, 8);
                         th.setData({
                           card_field: user.card_field,
                           card_name: card_name,
diff --git a/packageD/pages/AI-test-skin/analyse/analyse.js b/packageD/pages/AI-test-skin/analyse/analyse.js
index f1957aa..7c3dba8 100644
--- a/packageD/pages/AI-test-skin/analyse/analyse.js
+++ b/packageD/pages/AI-test-skin/analyse/analyse.js
@@ -370,8 +370,21 @@ Page({
                 }
                 th.analyse_by_bd(data);
             } else {
-                var msg = th.data.err_map[res.data.code + ""];
-                th.go_error1(msg);
+                    var msg = th.data.err_map[res.data.code + ""];
+                    if(msg){
+                        th.go_error1(msg);
+                    }else{
+                        wx.showToast({
+                            title:res.data.msg,
+                            icon: 'none',
+                            duration: 3000
+                        })
+
+                        setTimeout(function () {
+                            ut.wx_back()
+                        },2000)
+
+                    }
             }
         })
     },
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 02b3f8c..0f3460c 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -560,19 +560,22 @@ Page({
 				pageSize: 10
 			},
 			success: function (ee) {
-				var recommend_list = ee.data.data.pageData;
-				if (recommend_list && recommend_list.length > 0) {
-					var dd = [...th_recommend_list, ...recommend_list];
-					e.setData({
-						recommend_list,
-						dd
-					});
-					e.data.currentPage++;
-				} else {
-					e.setData({
-						nomore: 1
-					});
-				}
+
+				if(ut.ajax_ok(ee)) {
+                    var recommend_list = ee.data.data.pageData;
+                    if (recommend_list && recommend_list.length > 0) {
+                        var dd = [...th_recommend_list, ...recommend_list];
+                        e.setData({
+                            recommend_list,
+                            dd
+                        });
+                        e.data.currentPage++;
+                    } else {
+                        e.setData({
+                            nomore: 1
+                        });
+                    }
+                }
 			}
 		})
 	},
--
libgit2 0.21.4