From 4edccb5c4268698889887edcee9228db2c9f0a61 Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Sat, 09 May 2020 09:24:32 +0800
Subject: [PATCH] js冲突

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

diff --git a/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml b/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
index c3fbc98..f10f487 100644
--- a/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
+++ b/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
@@ -8,7 +8,7 @@
 
 <view class="activityDetail-main">
 	<view class="headLineTitle">
-		{{activity.activityTitle}}
+		{{activity.activityTitle||'暂无'}}
 	</view>
 	<view class="headLineInfo">
 		{{activity.startTime}}

--
Gitblit v1.8.0