Просмотр исходного кода

개발퍼블리싱검토PPT내용 전시 수정

bin2107 5 лет назад
Родитель
Сommit
9e1e564dc9

+ 5 - 5
src/main/webapp/WEB-INF/views/mob/display/AllBrandFormMob.html

@@ -44,11 +44,11 @@
 				</div>
 			</div>
 			<div class="inner">
-				<form id="searchBrandForm" name="searchBrandForm">
+				<form id="searchBrandForm" name="searchBrandForm" onsubmit="return false;">
 				<div class="brand_title">
-					<input type="text" id="search" name="search" placeholder="브랜드명을 입력해주세요">
+					<input type="text" id="search" name="search" placeholder="브랜드명을 입력해주세요" onkeypress="if( window.event.keyCode==13 ){$('#btnSearch').trigger('click');}">
 					<!-- <button class="btn_x">X</button> -->
-					<button type="button" onclick="fnSearchBrand();"><img src="/images/mo/cs_search_btn.png" alt=""></button>
+					<button type="button" id="btnSearch" ><img src="/images/mo/cs_search_btn.png" alt=""></button>
 				</div>
 				</form>
 			</div>
@@ -80,10 +80,10 @@
 		fnCreateAllBrandList();
 	}
 
-	let fnSearchBrand = function(){
+	$('#btnSearch').on('click', function() {
 		var searchBrand = $("#searchBrandForm").find("input[name=search]").val();
 		fnCreateAllBrandList(searchBrand);
-	}
+	});
 
 	let fnCreateAllBrandList = function (brandGroupNm){
 		let actionUrl = '/display/all/brand/list'

+ 4 - 4
src/main/webapp/WEB-INF/views/mob/display/BrandMainFormMob.html

@@ -162,7 +162,7 @@
 															<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 															<div class="itemName"th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 															<p class="itemPrice">
-																<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
+																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																[[${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}]]
 																<span class="itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 															</p>
@@ -244,7 +244,7 @@
 															<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 															<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 															<p class="itemPrice">
-																<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
+																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																<span class="itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 															</p>
@@ -295,7 +295,7 @@
 																			<p class="itemBrand" th:text="${planningGoods.brandGroupNm}">BRAND NAME</p>
 																			<div class="itemName" th:text="${planningGoods.goodsNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 																			<p class="itemPrice">
-																				<span class="itemPrice_original" th:text="${#numbers.formatInteger(planningGoods.listPrice,1,'COMMA')}">89,000</span>
+																				<span class="itemPrice_original" th:if="${planningGoods.currPrice != planningGoods.listPrice}" th:text="${#numbers.formatInteger(planningGoods.listPrice,1,'COMMA')}">89,000</span>
 																				[[${#numbers.formatInteger(planningGoods.currPrice,0,'COMMA')}]]
 																				<span class="itemPercent" th:if="${planningGoods.currPrice != planningGoods.listPrice}" th:text="${(planningGoods.listPrice == 0 ? 0 : #numbers.formatDecimal((planningGoods.listPrice - planningGoods.currPrice) / (planningGoods.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																			</p>
@@ -334,7 +334,7 @@
 											<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 											<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 											<p class="itemPrice">
-												<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
+												<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 												[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 												<span class="itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 											</p>

Разница между файлами не показана из-за своего большого размера
+ 729 - 733
src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html


+ 3 - 2
src/main/webapp/WEB-INF/views/web/common/layout/BrandLayoutWeb.html

@@ -35,8 +35,9 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	$(document).ready(function() {
-		let brandGroupColor = [[${brandGroupInfo.rgbCd}]];
-		if(brandGroupColor != null){
+		let brandGroupInfo = [[${brandGroupInfo}]];
+
+		if(brandGroupInfo != null){
 			$("#container").css('backgroundColor',[[${brandGroupInfo.rgbCd}]]);
 		}else{
 			$("#container").css('backgroundColor','#fff');

+ 3 - 3
src/main/webapp/WEB-INF/views/web/display/BrandMainFormWeb.html

@@ -182,7 +182,7 @@
 														<div class="itemName" th:text="${goodsData.goodsFullNm}"></div>
 														<p class="itemPrice">
 															[[${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')} + 원]]
-															<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}"></span>
+															<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}"></span>
 															<span class="itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 														</p>
 														<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!!</div>
@@ -319,7 +319,7 @@
 																		</div>
 																		<div class="itemName" th:text="${planningGoods.goodsNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 																		<p class="itemPrice">[[${#numbers.formatInteger(planningGoods.currPrice,0,'COMMA')} + 원]]
-																			<span class="itemPrice_original" th:text="${#numbers.formatInteger(planningGoods.listPrice,1,'COMMA')}">89,000</span>
+																			<span class="itemPrice_original" th:if="${planningGoods.currPrice != planningGoods.listPrice}" th:text="${#numbers.formatInteger(planningGoods.listPrice,1,'COMMA')}">89,000</span>
 																			<span class="itemPercent" th:if="${planningGoods.currPrice != planningGoods.listPrice}" th:text="${(planningGoods.listPrice == 0 ? 0 : #numbers.formatDecimal((planningGoods.listPrice - planningGoods.currPrice) / (planningGoods.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																		</p>
 																	</a>
@@ -357,7 +357,7 @@
 												<p class=" itemBrand" th:text="${goodsData.brandGroupNm}"></p>
 												<div class="itemName" th:text="${goodsData.goodsFullNm}"></div>
 												<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
-													<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
+													<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 													<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>
 												<div class="itemcolorchip" th:if="${goodsData.colorArr != null}">

+ 4 - 4
src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -330,8 +330,8 @@
 															<div class="itemName" th:text="${goodsData.goodsNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
 															<p class="itemPrice">
 																[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
-																<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,0,'COMMA')} + '원'"></span>
-																<span class=" itemPercent" th:text="${#numbers.formatDecimal(goodsData.dcRate,1,0)} + '%'"></span>
+																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,0,'COMMA')} + '원'"></span>
+																<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatDecimal(goodsData.dcRate,1,0)} + '%'"></span>
 																<!--<span class="itemPercent" th:if="${planningGoods.currPrice != planningGoods.listPrice}" th:text="${(planningGoods.listPrice == 0 ? 0 : #numbers.formatDecimal((planningGoods.listPrice - planningGoods.currPrice) / (planningGoods.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>-->
 															</p>
 															<div class="itemComment" th:text="${goodsData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
@@ -407,7 +407,7 @@
 																</div>
 																<div class=" itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 																<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">80,100
-																	<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
+																	<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																	<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																</p>
 																<div class="itemComment" th:text="${goodsData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
@@ -497,7 +497,7 @@
 																		<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 																		<div class=" itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 																		<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
-																			<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
+																			<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																			<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																		</p>
 																		<div class="itemComment" th:text="${goodsData.goodsTnm}">#주문 폭주 상품</div>

Некоторые файлы не были показаны из-за большого количества измененных файлов