From 0ec802e93557b2b1422ddbd68aafa994fa68f455 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 27 May 2020 10:04:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

---
 SunshineLnsMinApp/pages/zhgh/zhgh.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.js b/SunshineLnsMinApp/pages/zhgh/zhgh.js
index f21e55c..4463b0a 100644
--- a/SunshineLnsMinApp/pages/zhgh/zhgh.js
+++ b/SunshineLnsMinApp/pages/zhgh/zhgh.js
@@ -42,7 +42,7 @@
             ...i,
             startTime: app.formatDate(startTime),
             endTime: app.formatDate(endTime),
-            status:status==0?'未开始':status==1?'进行中':status==2?'已结束':status==3?'结束':status==99?'':'(未知)'
+            status:status==0?'未开始':status==1?'进行中':status==2?'已结束':status==3?'结束':status==99?'暂停':'(未知)'
           }));
           that.setData({
             infoList: content

--
Gitblit v1.8.0