feat: 修改商城的url链接，及取数接口

jpress-web-admin/src/main/webapp/WEB-INF/admin/_inc/_layout.html

@@ -56,7 +56,7 @@
     <div class="pull-right hidden-xs">
       <b>Mall CMS</b> ${JPRESS_VERSION!}
     </div>
-    <strong>Copyright &copy; 2018-2019 <a href="https://mall.usoftchina.com" target="_blank">深圳市优软商城科技有限公司</a>.</strong> All rights
+    <strong>Copyright &copy; 2018-2019 <a href="https://mall2.usoftchina.com" target="_blank">深圳市优软商城科技有限公司</a>.</strong> All rights
     reserved.
   </footer>
 

jpress-web-core/src/main/java/io/jpress/ui/freemarker/tag/ApiDataTag.java

@@ -16,6 +16,7 @@
 package io.jpress.ui.freemarker.tag;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import io.jpress.core.render.freemarker.JTag;
 import io.jpress.utils.HttpUtils;
 import io.jpress.utils.StringUtils;
@@ -68,7 +69,7 @@ public class ApiDataTag extends JTag {
 	 */
 	public static void initCollection() {
 		// 商城最新询价
-		apiDataCollection.put("mall_inquiry_new", new ApiData("mall_inquiry_new", "http://api-inquiry.usoftchina.com/inquiry/public?pageNumber=1&pageSize=12"));
+		apiDataCollection.put("mall_inquiry_new", new ApiData("mall_inquiry_new", "https://malldemandrest.usoftchina.com/api/demand/index/get?pageSize=9&pageNumber=1"));
 		// 商城热卖店铺
 		apiDataCollection.put("mall_stores_hot", new ApiData("mall_stores_hot", "http://mall.usoftchina.com/api/store-service/stores?page=1&count=8&type=AGENCY-DISTRIBUTION&field=&op=similar"));
 		// 商城热卖产品
@@ -171,7 +172,7 @@ public class ApiDataTag extends JTag {
 				// responseData = responseData.replaceAll(":null", ":\"\"");
 				// 将字符串转json再转字符串，这样可以生产比较严格的json字符串，但如果字符串不是json格式或者是jsonArray格式，会抛异常
 				try {
-					Object jsonObject = JSON.parse(responseData);
+					JSONObject jsonObject = JSON.parseObject(responseData);
 					responseData = JSON.toJSONString(jsonObject);
 				} catch (Exception e) {
 					// 如果不是json格式，会跑异常，不处理

jpress-web-template-mallcms/src/main/webapp/templates/mallcms/_layout.html

@@ -60,7 +60,7 @@
             <div class="bottom">
                 <ul>
                     <li class="active"><a href="${CPATH}/">首页</a></li>
-                    <li><a href="https://mall.usoftchina.com/">U软商城</a></li>
+                    <li><a href="https://mall2.usoftchina.com/">U软商城</a></li>
                     <li><a href="https://made.usoftchina.com/">U制造</a></li>
                     <li><a href="https://fin.yitoa-fintech.com">U智融</a></li>
                     <li><a href="https://zb.usoftchina.com/">闯客网</a></li>
@@ -94,13 +94,13 @@
                         <li><a href="https://b2b.usoftchina.com/serve#/self/account_excetion">帐号无法登录</a></li>
                         <li><a href="https://b2b.usoftchina.com/serve#/self/modify_pwd/4.1">修改密码</a></li>
                     </ul>
-                    <ul>
+                    <!--<ul>
                         <li><span>U优商城</span></li>
                         <li><a href="https://mall.usoftchina.com/help/helpDetail/50">服务条例</a></li>
                         <li><a href="https://mall.usoftchina.com/help/helpDetail/88">买卖条例</a></li>
                         <li><a href="https://mall.usoftchina.com/help/helpDetail/87">代收代付协议</a></li>
                         <li><a href=" https://mall.usoftchina.com/help/helpDetail/7">合作模式</a></li>
-                    </ul>
+                    </ul>-->
                     <ul>
                         <li><span>闯客网</span></li>
                         <li><a href="https://www.uuzcc.com/article/detail/13260.html">需求发布流程</a></li>
@@ -109,10 +109,13 @@
                     </ul>
                     <ul>
                         <li><span>关于我们</span></li>
-                        <li><a class="no-link">优软云介绍</a></li>
-                        <li><a class="no-link">发展历程</a></li>
+                        <!--<li><a class="no-link">优软云介绍</a></li>
+                        <li><a class="no-link">发展历程</a></li>-->
                         <li><a href="https://www.usoftchina.com/contact">联系我们</a></li>
                     </ul>
+                    <ul>
+                        <li></li>
+                    </ul>
                 </div>
                 <div class="qr">
                     <div class="qr-top">

jpress-web-template-mallcms/src/main/webapp/templates/mallcms/index.html

@@ -36,29 +36,8 @@
 					<a href="">
 						<p>交易平台</p>
 						<div id="mall_count_inquiry">本月询价条数299</div>
-						<!--<@jp.apiData id="mall_count_inquiry">-->
-							<!--<#assign text >-->
-								<!--${data!}-->
-							<!--</#assign>-->
-							<!--<#assign json=text?eval />-->
-							<!--<div>本月询价条数${json.current}</div>-->
-						<!--</@jp.apiData>-->
 						<div id="mall_count_brands">品牌8808个</div>
-						<!--<@jp.apiData id="mall_count_thisYear">-->
-						<!--<#assign text >-->
-						<!--${data!}-->
-						<!--</#assign>-->
-						<!--<#assign json=text?eval />-->
-						<!--<div>交易金额${(json - json%100000000)/100000000}亿</div>-->
-						<!--</@jp.apiData>-->
 						<div id="mall_count_goods">产品库存数1193亿</div>
-						<!--<@jp.apiData id="mall_count_goods">-->
-							<!--<#assign text >-->
-								<!--${data!}-->
-							<!--</#assign>-->
-							<!--<#assign json=text?eval />-->
-							<!--<div>产品库存数${(json - json%100000000)/100000000}亿</div>-->
-						<!--</@jp.apiData>-->
 					</a>
 				</div>
 				<div class="adv-list">
@@ -67,15 +46,6 @@
 						<div id="uuzcc_count_platform">
 							<div>已发布需求307个</div><div>已上传方案159个</div><div>已对接项目12个</div>
 						</div>
-						<!--<@jp.apiData id="uuzcc_count_platform">-->
-							<!--<#assign text >-->
-								<!--${data!}-->
-							<!--</#assign>-->
-							<!--<#assign json=text?eval />-->
-							<!--<#list json.data as item>-->
-								<!--<div>${item!}</div>-->
-							<!--</#list>-->
-						<!--</@jp.apiData>-->
 					</a>
 				</div>
 				<div class="adv-list">
@@ -90,15 +60,6 @@
 					<a href="http://bbs.uuzcc.com/">
 						<p>技术交流社区</p>
 						<div id="uuzcc_count_bbs"><div>问题库1888个</div><div>资料库已存放1097份</div><div>已有16865位研发精英加入</div></div>
-						<!--<@jp.apiData id="uuzcc_count_bbs">-->
-							<!--<#assign text >-->
-								<!--${data!}-->
-							<!--</#assign>-->
-							<!--<#assign json=text?eval />-->
-							<!--<#list json.data as item>-->
-								<!--<div>${item!}</div>-->
-							<!--</#list>-->
-						<!--</@jp.apiData>-->
 					</a>
 				</div>
 			</div>
@@ -115,7 +76,7 @@
 			<div class="section-item">
 				<div class="section-top">
 					<div class="fl">
-						<a href="https://mall.usoftchina.com"><img class="logo" src="${CTPATH}/assets/images/logo_uas.png" alt=""/><span class="title">U软商城</span></a>
+						<a href="https://mall2.usoftchina.com"><img class="logo" src="${CTPATH}/assets/images/logo_uas.png" alt=""/><span class="title">U软商城</span></a>
 					</div>
 					<div class="fl fl-left">
 						<p class="des">共享询价、交易平台</p>
@@ -124,7 +85,7 @@
 					<div class="fl fl-for"><img src="${CTPATH}/assets/images/for-the-world.png" alt=""></div>
 				</div>
 				<div class="section-bottom section-bottom01">
-					<span class="tab active">U询价</span><span class="tab">U现货</span><span class="tab">U电商</span>
+					<span class="tab active">U询价</span><!--<span class="tab">U现货</span><span class="tab">U电商</span>-->
 				</div>
 			</div>
 		</div>
@@ -134,7 +95,7 @@
 			<!--U询价-->
 			<div class="section-toggle01 show">
 				<div class="buy_content">
-					<a class='link_img' href="https://mall.usoftchina.com/applyPurchase"><img src="${CTPATH}/assets/images/mall_xunjia.jpg" alt="" class="buy_now"></a>
+					<a class='link_img' href="https://mall2.usoftchina.com/applyPurchase"><img src="${CTPATH}/assets/images/mall_xunjia.jpg" alt="" class="buy_now"></a>
 					<div class="inquiry_item">
 						<div class="inquiry_title"><span class="tabs"></span>最新求购信息<span class="all">海量求购，一网打尽</span></div>
 						<div class="inquiry_content">
@@ -142,11 +103,11 @@
 								<table>
 									<thead>
 									<tr>
-										<td width="70">发布时间</td>
+										<!--<td width="70">发布时间</td>-->
 										<td width="140">买家名称</td>
-										<td width="110">品牌</td>
-										<td width="120">物料名称</td>
 										<td width="110">型号</td>
+										<td width="110">品牌</td>
+										<!--<td width="120">物料名称</td>-->
 										<td width="130">规格</td>
 										<td width="120">操作</td>
 									</tr>
@@ -157,22 +118,16 @@
 										${data!}
 									</#assign>
 									<#assign json=text?eval />
-									<#list json.content as item>
+									<#list json.demand as item>
 										<tr>
-											<td class="inquiry_red">
-												<#setting datetime_format="MM-dd"/>
-												${item.date?number_to_datetime!}
-											</td>
-											<td>${item.inquiry.enName!'个人用户'}</td>
-											<td>${item.product.brand!'-'}</td>
-											<td>${item.product.title!'-'}</td>
-											<td>${item.product.pCmpCode!'-'}</td>
-											<td>${item.product.spec!'-'}</td>
-											<td class="inquiry_btn"><a href="https://mall.usoftchina.com/">我要报价</a></td>
+											<td>${item.uuName!'个人用户'}</td>
+											<td>${item.model!'-'}</td>
+											<td>${item.brand!'-'}</td>
+											<td>${item.spec!'-'}</td>
+											<td class="inquiry_btn"><a href="https://mall2.usoftchina.com/">我要报价</a></td>
 										</tr>
 									</#list>
 									</@jp.apiData>
-
 									</tbody>
 								</table>
 							</div>
@@ -417,7 +372,7 @@
 							<!--<span>智能穿戴</span>-->
 							<@jp.apiData id="uuzcc_program_types">
 							<#assign text >
-								${data!}
+								${data!'{"data":[]}'}
 							</#assign>
 							<#assign json=text?eval />
 							<#list json.data as item>
@@ -504,7 +459,7 @@
 
                 <@jp.apiData id="uuzcc_program_types_list">
                 <#assign text >
-                    ${data!}
+                    ${data!'{"data":[]}'}
                 </#assign>
                 <#assign json=text?eval />
                 <#list json.data as item>