From 9a82179d24ec670ba1aefef6906b8acadf58da6e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期六, 03 八月 2019 12:13:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
index 13bb299..3d7491b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -252,13 +252,17 @@
// 涓嶈兘鍖呭惈璇︽儏椤�
String skuId = JDUtil.parseJDSkuIdByUrl(url);
if (StringUtil.isNullOrEmpty(skuId))// 涓嶈兘鎷︽埅璇︽儏椤甸潰锛岄槻姝㈠墠绔繘鍏ユ寰幆
- data.put("goodsDetail", true);
+ if (url.startsWith("https://union-click.jd.com/jdc?"))
+ data.put("goodsDetail", false);
+ else
+ data.put("goodsDetail", true);
else
data.put("goodsDetail", false);
data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
- } else if (url != null && (url.contains("yangkeduo.com")) && !url.contains("yangkeduo.com/goods.html?")) {
+ } else if (url != null && ((url.contains("yangkeduo.com") && !url.contains("yangkeduo.com/goods.html?"))
+ || (url.startsWith("https://p.pinduoduo.com/")))) {
data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
data.put("goodsDetail", true);// 涓嶉渶瑕佹嫤鎴晢鍝佽鎯�
} else {
--
Gitblit v1.8.0