Главная Обзор Помощь
Вход
style24
/
style24.admin
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

전시 임시커밋

bin2107 5 лет назад
Родитель
ee87b5a670
Сommit
0b992bea41
6 измененных файлов с 122 добавлено и 2 удалено
Разделённый вид Показать статистику Diff
  1. 16 0
      src/main/java/com/style24/admin/biz/web/TsaDisplayController.java
  2. 2 0
      src/main/java/com/style24/persistence/domain/CategoryGoods.java
  3. 25 2
      src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html
  4. 54 0
      src/main/webapp/WEB-INF/views/display/GoodsDispOrdChangePopupForm.html
  5. 8 0
      src/main/webapp/WEB-INF/views/marketing/CouponPopupForm.html
  6. 17 0
      src/main/webapp/ux/js/admin.popup.js

+ 16 - 0
src/main/java/com/style24/admin/biz/web/TsaDisplayController.java
Просмотреть файл 

@@ -21,6 +21,8 @@ import lombok.extern.slf4j.Slf4j;
 
 
 import com.gagaframework.web.rest.server.GagaResponse;
 
 
+import javax.servlet.http.HttpServletRequest;
 
+
 
 /**
 
  * 전시 Controller
 
  *
 
@@ -387,4 +389,18 @@ public class TsaDisplayController extends TsaBaseController {
 
 		return super.ok(message.getMessage("SUCC_0001"));
 
 	}
 
 
+	/**
 
+	 * 전시 상품 순서변경 팝업
 
+	 * @return
 
+	 * @author bin2107
 
+	 * @since 2021. 2. 18
 
+	 */
 
+	@GetMapping("/goods/dispord/change/popup/form")
 
+	public ModelAndView goodsDispOrdChangePopupForm(CategoryGoods categoryGoods) {
 
+		ModelAndView mav = new ModelAndView();
 
+
 
+		mav.addObject("params", categoryGoods);
 
+		mav.setViewName("display/GoodsDispOrdChangePopupForm");
 
+		return mav;
 
+	}
 
 }

+ 2 - 0
src/main/java/com/style24/persistence/domain/CategoryGoods.java
Просмотреть файл 

@@ -53,6 +53,8 @@ public class CategoryGoods extends TscBaseDomain {
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 
 	private String[] multiGoods;
 
 
+	private String callBackFun;	// 콜백함수
 
+
 
 	// Pagination
 
 	private TscPageRequest pageable;
 
 	private int pageNo = 1;

+ 25 - 2
src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html
Просмотреть файл 

@@ -102,8 +102,8 @@
 
 		<ul class="panelBar">
 
 			<li class="aR" id="btnGoodsEdit" style="display:none">
 
 				<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnAddGoods" style="display:none">상품추가</button>
 
-				<!--<button type="button" class="btn btn-primary btn-lg" id="btnDispChange">순서변경</button>
 
-                <button type="button" class="btn btn-primary btn-lg" id="btnSelectTop">선택최상위로</button>-->
 
+				<button type="button" class="btn btn-primary btn-lg" id="btnDispChange">순서변경</button>
 
+				<!--<button type="button" class="btn btn-primary btn-lg" id="btnSelectTop">선택최상위로</button>-->
 
 				<button type="button" class="btn btn-danger btn-lg" id="btnSelectDel">선택삭제</button>
 
 			</li>
 
 		</ul>
 
@@ -228,6 +228,27 @@
 
 		fnCategoryGoodsListSearch();
 
 	}
 
 
+	/**
 
+	 * 순서변경 버튼 클릭 시
 
+	 */
 
+	$("#btnDispChange").bind('click', function(){
 
+		//console.log('selLvl>>>'+$('#searchForm input[name=selLvl]').val());
 
+		var params = 'siteCd=G000_10';
 
+		params += '&selLvl='+ $('#searchForm input[name=selLvl]').val();
 
+		params += '&cateGb=' + $('#searchForm select[name=addCateGb]').val();
 
+		params += '&cate1No=' + $('#searchForm select[name=cate1No]').val();
 
+		params += '&cate2No=' + $('#searchForm select[name=cate2No]').val();
 
+		params += '&cate3No=' + $('#searchForm select[name=cate3No]').val();
 
+		params += '&cate4No=' + $('#searchForm select[name=cate4No]').val();
 
+		params += '&searchGb=' + $('#searchForm select[name=searchGb]').val();
 
+
 
+		cfnOpenGoodsDispOrdChangePopup('fnSaveCallback', params);
 
+	});
 
+
 
+	var fnSaveCallback = function (){
 
+		console.log('yaaaaaaaaaaa');
 
+	}
 
+
 
 	/**
 
 	 * 상품조회 버튼 클릭시
 
 	 */
 
@@ -507,9 +528,11 @@
 
 		if($("#cateLeafYn").val()=='Y'){
 
 			$("#addCategory").show();	// 상품이동/복사 show
 
 			$("#btnAddGoods").show();	// [상품추가] show
 
+			$("#btnDispChange").show();	// [순서변경] show
 
 		}else{
 
 			$("#addCategory").hide();	// 상품이동/복사 hide
 
 			$("#btnAddGoods").hide();	// [상품추가] hide
 
+			$("#btnDispChange").hide();	// [순서변경] hide
 
 		}
 
 	}

+ 54 - 0
src/main/webapp/WEB-INF/views/display/GoodsDispOrdChangePopupForm.html
Просмотреть файл 

@@ -0,0 +1,54 @@
 
+<!DOCTYPE html>
 
+<html lang="ko"
 
+	  xmlns:th="http://www.thymeleaf.org">
 
+<!--
 
+ *******************************************************************************
 
+ * @source  : GoodsDispOrdChangePopupForm.html
 
+ * @desc    : 전시 상품 순서변경 팝업
 
+ *============================================================================
 
+ * STYLE24
 
+ * Copyright(C) 2020 TSIT, All rights reserved.
 
+ *============================================================================
 
+ * VER  DATE         AUTHOR      DESCRIPTION
 
+ * ===  ===========  ==========  =============================================
 
+ * 1.0  2021.02.18   bin2107     최초 작성
 
+ *******************************************************************************
 
+ -->
 
+<div class="modalPopup" data-width="full" data-height="800">
 
+	<div class="panelStyle">
 
+		<div class="panelTitle">
 
+			<h2>상품 순서변경</h2>
 
+			<button type="button" class="close" onclick="uifnPopupClose('popupGoodsDispOrdChange')"><i class="fa fa-times"></i></button>
 
+		</div>
 
+		<div class="panelContent">
 
+			<!-- 상단 영역 START -->
 
+			<ul class="lrStyle">
 
+				<li class="aL"><font color="#1e90ff">* 상품은 왼쪽에서 오른쪽 순서대로 전시 됩니다.</font></li>
 
+				<li class="aR">
 
+					<button type="button" class="btn btn btn-info btn-sm">원 위치로</button>
 
+					<button type="button" class="btn btn btn-primary btn-sm">전시순서 초기화</button>
 
+					<button type="button" class="btn btn btn-dark btn-sm">저장</button>
 
+				</li>
 
+			</ul>
 
+			<!-- 상단 영역 END -->
 
+
 
+			<!-- 상품 영역 START -->
 
+			<div class="sortableWrap" data-unit="7">
 
+				<div class="itemWrap" id="sortable">
 
+
 
+				</div>
 
+			</div>
 
+			<!-- 상품 영역 END -->
 
+
 
+			<!-- 페이징 영역 START -->
 
+			<ul class="panelBar">
 
+				<li class="center">
 
+					<div class="tablePaging" id="goodsDispOrdChangePopupPagination"></div>
 
+				</li>
 
+			</ul>
 
+			<!-- 페이징 영역 END -->
 
+		</div>
 
+	</div>
 
+</div>
 
+
 
+</html>

+ 8 - 0
src/main/webapp/WEB-INF/views/marketing/CouponPopupForm.html
Просмотреть файл 

@@ -64,6 +64,12 @@
 
 												<input type="text" name="cpnNm" id="cpnNm" style="width: 70%;" required="required" data-valid-name="쿠폰명">
 
 											</td>
 
 										</tr>
 
+										<tr>
 
+											<th>쿠폰설명</th>
 
+											<td colspan="5">
 
+												<input type="text" name="cpnDesc" id="cpnDesc" style="width: 70%;" data-valid-name="쿠폰설명">
 
+											</td>
 
+										</tr>
 
 										<tr>
 
 											<th>쿠폰유형<em class="required" title="필수"></em></th>
 
 											<td>
 
@@ -877,6 +883,7 @@
 
 				var data = {
 
 						cpnId : $('#CouponForm input[name=cpnId]').val()
 
 						,cpnNm : $('#CouponForm input[name=cpnNm]').val()
 
+						,cpnDesc : $('#CouponForm input[name=cpnDesc]').val()
 
 						,siteCd : $('#CouponForm select[name=siteCd]').val()
 
 						,afLinkCd : $('#CouponForm select[name=afLinkCd]').val()
 
 						,cpnType : $('input:radio[name="rdoCpnType"]:checked').val()
 
@@ -1904,6 +1911,7 @@
 
 			$("#CouponForm #downAblYn").val(cpnDetail.downAblYn);
 
 			$("#CouponForm #buyLimitAmt").val(cpnDetail.buyLimitAmt);
 
 			$("#CouponForm #cpnId").val(cpnDetail.cpnId);
 
+			$("#CouponForm #cpnDesc").val(cpnDetail.cpnDesc);
 
 
 			if(limitedTimeCpnList.length>0 && cpnDetail.cpnType == "G230_11"){  //상품쿠폰이고 선착순쿠폰일때
 
 				$("#CouponForm #limitedTimeCpnYn").val("Y");

+ 17 - 0
src/main/webapp/ux/js/admin.popup.js
Просмотреть файл 

@@ -839,3 +839,20 @@ var cfnOpenCardListPopup = function(callBackFun, arrCard) {
 
 
 	cfnOpenModalPopup(actionUrl, 'popupCardList');
 
 }
 
+
 
+/**
 
+ * @type   : function
 
+ * @access : public
 
+ * @desc   : 전시 상품 순서변경 팝업
 
+ * <pre>
 
+ *     cfnOpenGoodsDispOrdChangePopup('goosCallbackFun');
 
+ * </pre>
 
+ * @since  : 2021/02/18
 
+ * @author : bin2107
 
+ */
 
+var cfnOpenGoodsDispOrdChangePopup = function(callbackfun, params) {
 
+	var actionUrl = "/display/goods/dispord/change/popup/form";
 
+	if (typeof(callbackfun) != 'undefined') actionUrl += "?callBackFun=" + callbackfun;
 
+	if (typeof(params) != 'undefined') actionUrl += "&" + params;
 
+	cfnOpenModalPopup(actionUrl,'popupGoodsDispOrdChange');
 
+}