Explorar el Código

Merge remote-tracking branch 'origin/jsh77b' into order

card007 hace 5 años
padre
commit
d684520784

+ 19 - 0
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -1976,5 +1976,24 @@ public class TsfMypageController extends TsfBaseController {
 
 		return super.ok("알림 기한을 15일로 연장하였습니다.");
 	}
+	
+	/**
+	 * 마이페이지 주문목록 조회 (모바일)
+	 * 
+	 * @param Order
+	 * @return ModelAndView
+	 * @author jsh77b
+	 * @since 2021. 04. 19
+	 */
+	@ResponseBody
+	@PostMapping("/order/listInfo")
+	public ModelAndView getOrderListInfo(@RequestBody Order order) {
+		// 주문목록조회
+		ModelAndView mav = new ModelAndView();
+		mav.addObject("orderList", orderService.getOrderListForMypage(order));
+		mav.setViewName(super.getDeviceViewName("mypage/MypageOrderListInfo"));
+
+		return mav;
+	}
 
 }

+ 101 - 0
src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderListFormMob.html

@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="mob/common/layout/MypageLayoutMob">
+<!--
+ *******************************************************************************
+ * @source  : MypageOrderListFormMob.html
+ * @desc    : 마이페이지 > 주문확인/배송조회 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.19   jsh77b     최초 작성
+ *******************************************************************************
+ -->
+<body>
+
+<th:block layout:fragment="content">
+<main role="" id="" class="container my">
+	<section class="content my_order">
+		<div class="inner">
+			<div class="order_sort">
+				<a href="javascript:;" class="od_date_btn">최근 1개월</a>
+				<a href="javascript:;" class="od_status_btn">전체</a>
+			</div>
+		</div>
+		
+		<!-- 주문목록 -->
+		<div class="area_list" id="orderList">
+		</div>
+		<!-- //주문목록 -->
+		
+		
+	</section>
+</main>
+<!-- 210408_분류 팝업 추가 -->
+
+<script src="/ux/plugins/gaga/gaga.paging.js"></script>
+<script th:inline="javascript">
+// 변수설정
+var custNo 			= [[${customerInfo.custNo}]];
+var jsonObj 		= {};
+
+// 초기설정
+$(document).ready(function() {
+	
+	// AJAX 로드를 위한 변수 설정
+	jsonObj = {
+		"pageNo" 			: 1
+		, "pageSize" 		: 5
+		, "pageUnit" 		: 10
+		, "ordDtlStat" 		: ""
+		, "stDate" 			: ""
+		, "edDate" 			: ""
+		, "custNo"			: custNo
+	}
+	// AJAX 변수 설정
+	jsonData = JSON.stringify(jsonObj);
+
+	// 초기주문목로조회
+	fnSearchOrderList(1);
+	
+});
+
+//주문 목록 조회
+var fnSearchOrderList = function(pageNo) {
+	alert(pageNo);
+	
+	if (pageNo == null) {
+		pageNo = 1;
+	}
+	
+	jsonObj.pageNo = pageNo;
+	
+	$.ajax( {
+		type		: "POST",
+		url 		: '/mypage/order/listInfo',
+		data		: JSON.stringify(jsonObj),
+		dataType 	: 'html',
+		beforeSend : function(xhr, settings) {
+			xhr.setRequestHeader("AJAX"			, "true");
+			xhr.setRequestHeader('Accept'		, 'application/json');
+			xhr.setRequestHeader('Content-Type'	, 'application/json');
+			gagajf.showProgressbar(true);
+		},
+		success 	: function(result) {
+			if (result != null) {
+				$("#orderList").css("display", "block");
+				$("#orderList").append(result);
+			}
+		}
+	});
+}
+
+
+
+
+</script>
+</th:block>
+</body>
+</html>

+ 59 - 0
src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderListInfoMob.html

@@ -0,0 +1,59 @@
+<div class="inner">
+	<div class="part_goods">
+		<div class="goods_top">
+			<div class="goods_date">주문일<span class="date">2020.10.25</span></div>
+			<a href="javascript:;" class="detail_btn">상세보기</a>
+		</div>
+		
+		<!-- 주문 접수 -->
+		<div class="goods_section">
+			<div class="goods_status">
+				<p class="dlvr_staus">주문 접수</p>
+			</div>
+			<div class="goods_detail">
+				<a href="">
+					<div class="thumb_box">
+						<img src="/images/mo/thumb/tmp_pdClickother1.jpg" alt="tmp_pdClickother1">
+					</div>
+					<div class="info_box">
+						<div class="od_name">
+							<div class="brand">
+								<span>Mollimelli 몰리멜리</span>
+								<div class="badge_wrap">
+									<em class="order_badge">STYLE24 일반배송</em>
+									<em class="order_badge order_bullet_badge">총알배송</em>
+								</div>
+							</div>
+							<div class="name">몰리겨울상하복 균일가 택1 유아동/상하복/기모상하복/상하의세트 몰리겨울상하복 균일가 택1</div>
+						</div>
+						<div class="od_opt">
+							<div class="option">
+								<em>Black</em><em>XXL</em>
+							</div>
+						</div>
+						<div class="od_calc">
+							<p class="sale_price"><del><em>95,000</em>원</del></p>
+							<p class="price">
+								<span class="selling_price"><em>61,200</em>원</span>
+								<span class="count"><em>99</em>개</span>
+							</p>
+						</div>
+					</div>
+				</a>
+			</div>
+			<div class="goods_btn_wrap btn_group_flex">
+				<div><button type="button" class="btn btn_default"><span>주문 취소</span></button></div>
+			</div>
+			<div class="goods_txt">
+				<p class="cf_txt cf_desc">주문 완료 / 결제를 기다리고 있습니다.</p>
+			</div>
+		</div>
+		<!-- //주문 접수 -->
+	</div>
+</div>
+
+<script th:inline="javascript">
+</script>
+
+</th:block>
+