From efe731f925ba582adbf50d34d712345ba18c0e1d Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 18 Aug 2020 17:17:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E5=BD=A9=E8=AF=B4=E8=AF=B4=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/activity/activity.wxml                 | 2 +-
 project.config.json                               | 6 +++---
 subpages/heart/pages/heartDetail/heartDetail.wxml | 2 +-
 utils/config.js                                   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/activity/activity.wxml b/components/activity/activity.wxml
index 0f529da..491a76e 100644
--- a/components/activity/activity.wxml
+++ b/components/activity/activity.wxml
@@ -25,7 +25,7 @@
           <text>活动地点：{{item.actAddress}}</text>
         </view>
       </view>
-      <view class="infos_nums" wx:if="{{!(state==2&&item.actCurrentState=='4')}}">
+      <view class="infos_nums" wx:if="{{!(state==2)}}">
     
         <span wx:if="{{item.actQuotaCategory == 0}}" class="total">不限名额</span>
         <span wx:else class="total">活动名额 {{item.actQuota}}人</span>
diff --git a/project.config.json b/project.config.json
index beae865..97977e3 100644
--- a/project.config.json
+++ b/project.config.json
@@ -17,15 +17,15 @@
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useIsolateContext": true,
 		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"compileHotReLoad": false,
+		"useIsolateContext": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxml b/subpages/heart/pages/heartDetail/heartDetail.wxml
index 7158c50..0f3bef4 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.wxml
+++ b/subpages/heart/pages/heartDetail/heartDetail.wxml
@@ -118,7 +118,7 @@
         </view>
       </view>
     </block>
-    <block wx:else>
+    <block wx:elif="{{actNewsContent!=''}}">
       <!-- 新闻稿 -->
       <view class="require">  
         <view class="info-box-last-require">
diff --git a/utils/config.js b/utils/config.js
index 58acdf1..7bd1014 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -6,13 +6,13 @@ module.exports = {
 };
 
 function BASEURL() {
-  // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
+  return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
   // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
   // return "http://192.168.43.19:9094/epdc-api/api/"  // 测试环境 ip接口地址
   // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
   // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
   //  return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
-  return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
+  // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
   // return 'http://10.10.10.63:9094/epdc-api/api/'
 }