From 4fe5f879c1b2919099a6e193ab4db8d25725ca40 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 10:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
index 6097f38..b55fc2a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
@@ -54,13 +54,18 @@
AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST)
appHomeFloatImg = null;
- JSONObject data = new JSONObject();
+ JSONObject data =new JSONObject();
if (appHomeFloatImg != null)
data.put("floatImg", appHomeFloatImg);
String notifyImg = configService.getAppHomeFloatNotifyImg();
if (!StringUtil.isNullOrEmpty(notifyImg)) {
data.put("floatNotifyImg", notifyImg);
}
+ //
+ String config = configService.get("home_float_img_new");
+ if (!StringUtil.isNullOrEmpty(config)) {
+ data.put("floatImgDetail", config);
+ }
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0