Browse Source

Merge branch 'sowon' into develop

sowon4187 5 years ago
parent
commit
0f3d319f83

+ 1 - 3
src/main/java/com/style24/persistence/mybatis/shop/TsfReview.xml

@@ -570,7 +570,6 @@
 			 , Z.CONFIRM_UNO      
 			 , Z.CONFIRM_DT       
 			 , Z.REG_NO           
-			 , Z.REG_DT           
 			 , Z.UPD_NO           
 			 , Z.UPD_DT           
 			 , Z.ADM_RPL          
@@ -647,7 +646,6 @@
 				     , R.CONFIRM_UNO      
 				     , R.CONFIRM_DT       
 				     , R.REG_NO           
-				     , R.REG_DT           
 				     , R.UPD_NO           
 				     , R.UPD_DT           
 				     , R.ADM_RPL          
@@ -715,7 +713,7 @@
 				 <if test="reviewStat == 'u'.toString()">
 				, Z.REVIEW_SQ , Z.REVIEW_SQ , Z.REVIEW_GB , Z.REVIEW_TITLE , Z.REVIEW_CONTENT , Z.SCORE , Z.HEIGHT           
 				, Z.WEIGHT  , Z.SCORE_SIZE , Z.SCORE_COLOR , Z.SCORE_FIT , Z.SCORE_THICK , Z.SCORE_WEIGHT , Z.SCORE_BALL , Z.GIVE_DUE_PNT , Z.PNT_GIVE_STAT    
-			    , Z.BEST_YN, Z.GIVE_DUE_BPNT , Z.BPNT_GIVE_YN , Z.DISP_YN , Z.DEL_YN, Z.CONFIRM_YN, Z.CONFIRM_UNO, Z.CONFIRM_DT, Z.REG_NO, Z.REG_DT      
+			    , Z.BEST_YN, Z.GIVE_DUE_BPNT , Z.BPNT_GIVE_YN , Z.DISP_YN , Z.DEL_YN, Z.CONFIRM_YN, Z.CONFIRM_UNO, Z.CONFIRM_DT, Z.REG_NO
 			    , Z.UPD_NO, Z.UPD_DT, Z.ADM_RPL, Z.ADM_RPL_REG_NO, Z.ADM_RPL_DT  
 			    </if>          
 		ORDER BY Z.ORD_NO DESC, Z.ORD_DTL_STAT, Z.SELF_GOODS_YN DESC, Z.SHOT_DELV_YN DESC, Z.SUPPLY_COMP_CD

+ 17 - 4
src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewFormMob.html

@@ -58,14 +58,23 @@
 									</div>
 								</div>
 								<!-- tab_cont Start -->
-								<div class="inner" id="reviewList">
+								<div id="reviewList">
 
 								</div>
-								<div class="ui_foot" style="display:none;">
+								<!-- <div class="btn_group" style="display:none;">
 									<button class="btn btnM btnIcon_more" id="btnMore"  style="width: 100%;">더보기</button>
+								</div> -->
+								
+								<div class="btn_group">
+									<div><button class="btn btnIcon_more" id="btnMore">더보기</button></div>
 								</div>
-								<div class="ui_foot" style="display:none;">
+									
+								<!-- <div class="ui_foot" style="display:none;">
 									<button class="btn btnM btnIcon_more" id="btnMore2"  style="width: 100%;">더보기</button>
+								</div> -->
+								
+								<div class="btn_group">
+									<div><button class="btn btnIcon_more" id="btnMore2">더보기</button></div>
 								</div>
 							<!-- // tab_cont End -->
 							</div>
@@ -105,6 +114,7 @@
 				}	
 				var html = '';
 				$.each(result.dataList2, function(idx, item) {
+					html += '<div class="inner">\n'
 					html += '	<div class="part_goods">\n';
 					html += '		<div class="goods_section">\n';
 					html += '			<div class="goods_detail">\n';
@@ -245,6 +255,7 @@
 					html += '			<div><button type="button" id="btn_review_delete" class="btn btn_default" onclick="fnDeleteReview('+item.reviewSq+')"><span>리뷰 삭제</span></button></div>\n';
 					html += '		</div>\n';
 					html += '	</div>\n';
+					html += '</div>\n'
 				});
 				
 				$('#reviewList').append(html);
@@ -278,7 +289,8 @@
 			if (result.paging1.pageable.pageNo == 1){
 				$('#reviewList').html('');
 			}	
-			var html = '	<div class="part_goods">\n';
+			var html =  '<div class="inner">\n';
+			html += '	<div class="part_goods">\n';
 			$.each(result.dataList1, function(idx, item) {
 				html += '		<div class="goods_section">\n';
 				html += '			<div class="goods_detail">\n';
@@ -314,6 +326,7 @@
 				html += '		</div>\n';
 			});
 			html += '	</div>\n';
+			html += '</div>\n';
 			$('#reviewList').append(html);
 			if (result.paging1.pageable.totalPage > result.paging1.pageable.pageNo) {
 				$('#btnMore').parent().show();