From 62d5a19f6935ff98811a93322dfb237e8799de2c Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 15 Jan 2021 09:47:49 +0800
Subject: [PATCH] 脚本报错的~~

---
 pages/goods/goodsInfo/goodsInfo.js      | 20 +++++++++++---------
 pages/team/team_more/team_more.js       |  2 ++
 pages/team/team_show/team_show.js       | 43 +++++++++++++++++++++++++------------------
 pages/team/team_success/team_success.js |  2 ++
 4 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index b5a6041..48a21d4 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2782,15 +2782,17 @@ Page({
                           }
                         }).then(res => {
                           var now = ut.gettimestamp();
-                          var tgr = res.data.data.pageData[0];
-                          //如果团的时间已经到了
-                          if (now >= tgr.kt_end_time) {
-                            th.update_jiti(tgr.id);
-                          } else {
-                            th.setData({
-                              user_order_pt_state: 2
-                            });
-                          }
+						  if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+							   var tgr = res.data.data.pageData[0];
+							   //如果团的时间已经到了
+							   if (now >= tgr.kt_end_time) {
+							     th.update_jiti(tgr.id);
+							   } else {
+							     th.setData({
+							       user_order_pt_state: 2
+							     });
+							   }
+						  }                        
                         })
 
                       } else {
diff --git a/pages/team/team_more/team_more.js b/pages/team/team_more/team_more.js
index 826b83a..22b7c4d 100644
--- a/pages/team/team_more/team_more.js
+++ b/pages/team/team_more/team_more.js
@@ -112,6 +112,8 @@ Page({
     // 获取当前时间，同时得到活动结束时间数组
     var newTime = ut.gettimestamp();
     var List = this.data.teamgroup;
+	if(!List || List.length<=0) return false;
+
     for (var j = 0; j < List.length; j++) {
       // 对结束时间进行处理渲染到页面
       var endTime = List[j].kt_end_time;
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 2a8e884..49591fc 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -363,24 +363,31 @@ Page({
     //获取活动从表信息team_id,listno团编号（券号）
     await getApp().request.promiseGet("/api/weshop/teamgroup/get/"+os.stoid+"/"+tg_id, {
     }).then(res => {
-      teamgroup = res.data.data;
-      //获取当前时间,并且判断剩余时间
-      var nt = ut.gettimestamp();
-      var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
-      ee.setData({
-        pindGoods: teamgroup,
-        buy_start_date: buy_start_date
-      });
-
-      if(nt>teamgroup.kt_end_time) {
-        th.setData({is_group_end:1,end_text:"团期已经结束"})
-      }
-      if(teamgroup.state==1) {
-        th.setData({is_group_end:1,end_text:"团期已经结束"})
-      }
-      if(teamgroup.state==3 || teamgroup.state==4 || teamgroup.state==5 ) {
-        th.setData({is_group_end:2,end_text:"团期已满"})
-      }
+		
+		
+	  if(res.data.code==0 && res.data && res.data.data )	{
+		
+		  teamgroup = res.data.data;
+		   
+		  //获取当前时间,并且判断剩余时间
+		  var nt = ut.gettimestamp();
+		  var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
+		  ee.setData({
+			pindGoods: teamgroup,
+			buy_start_date: buy_start_date
+		  });
+
+		  if(nt>teamgroup.kt_end_time) {
+			th.setData({is_group_end:1,end_text:"团期已经结束"})
+		  }
+		  if(teamgroup.state==1) {
+			th.setData({is_group_end:1,end_text:"团期已经结束"})
+		  }
+		  if(teamgroup.state==3 || teamgroup.state==4 || teamgroup.state==5 ) {
+			th.setData({is_group_end:2,end_text:"团期已满"})
+		  }
+	  
+	  }
 
     })
 
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index 7fdc137..6aba271 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -328,6 +328,8 @@ Page({
         // 获取当前时间，同时得到活动结束时间数组
         var newTime = ut.gettimestamp();
         var o = this.data.teamgroup;
+		if(!o) return false;
+				
         var endTime = o.kt_end_time;
         if (o.status == 0) endTime = o.start_time;
 
--
libgit2 0.21.4