Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/views/sopmal/csc/BbscttRegistPopupC.jsp

@@ -361,7 +361,7 @@
                                                     <c:out value="${itm.itmCn}"/>
                                                 </option>
                                             </c:forEach>
-                                        </select>
+                                        </select><br/><br/><span style="color: #f03e3e;">(반품문의 시 이미지를 반드시 첨부해 주세요)</span>
                                     </div>
                                 </div>
                             </td>
@@ -531,7 +531,7 @@
                                         <div class="b-checkbox-container">
                                             <label class="b-checkbox checkbox">
                                                 <input type="checkbox" value="Y" name="secretBbscttAt" class="chkAt"
-                                                       checked<c:if test="${bbsInfo.bbsTyCd eq '05'}"> onclick="fn_prevent_click(event);"</c:if>>
+                                                       checked<c:if test="${bbsInfo.bbsTyCd eq '05' || bbsInfo.bbsTyCd eq '12'}"> onclick="fn_prevent_click(event);"</c:if>>
                                                 <span class="check"></span>
                                                 <span class="control-label">비밀글</span>
                                             </label>

src/main/webapp/WEB-INF/views/sopmal/mpage/act/MyM2mQaR.jsp

@@ -278,6 +278,7 @@
                                                                 </c:choose>
                                                             </div>
                                                         </div>
+                                                        <c:if test = "${empty resultList.answBbscttInnb}">
                                                         <div class="tr-foldable__btn-container">
                                                             <input type = "hidden" name = "answAt"
                                                                    value = <c:choose>
@@ -291,10 +292,9 @@
                                                             <input type = "hidden" name = "bbscttInnb" value = <c:out value="${resultList.bbscttInnb}"/>>
                                                             <input type = "hidden" name = "goodsInnb" value = <c:out value="${resultList.goodsInnb}"/>>
                                                                 <button type = "button" class="btn outline deleteBtn"><spring:message code="button.delete"/></button>
-                                                            <c:if test = "${empty resultList.answBbscttInnb}">
                                                                 <button type = "button" class="btn theme outline updateBtn"><spring:message code="button.update"/></button>
-                                                            </c:if>
                                                         </div>
+                                                        </c:if>
                                                     </div>
                                                 </td>
                                             </tr>

src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttRegistPopupC.jsp

@@ -329,8 +329,7 @@
                                     </c:if>
                                     <c:if test="${not empty itmList}">
                                         <div class="userForm__inputBox__item">
-                                            <div class="userForm__inputBox__itemTitle">문의 유형
+                                            <div class="userForm__inputBox__itemTitle">문의 유형<span class="required-asterisk">* (반품문의 시 이미지를 반드시 첨부해 주세요)</span></div>
-                                            </div>
                                             <div class="select-box">
                                                     <%--문항답변필수여부 --%>
                                                 <input type="hidden" name="qesitmEssntlAtArr[]" value="Y">
@@ -529,7 +528,7 @@
                                             <div class="b-checkbox-container">
                                                 <label class="b-checkbox checkbox">
                                                     <input type="checkbox" value="Y" name="secretBbscttAt" class="chkAt"
-                                                           checked <c:if test = "${bbsInfo.bbsTyCd eq '05'}"> onclick ="fn_prevent_click(event)"</c:if>>
+                                                           checked <c:if test = "${bbsInfo.bbsTyCd eq '05' || bbsInfo.bbsTyCd eq '12'}"> onclick ="fn_prevent_click(event)"</c:if>>
                                                     <span class="check"></span>
                                                     <span class="control-label">비밀글</span>
                                                 </label>

src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyM2mQaR.jsp

@@ -180,6 +180,7 @@
                let answSttus = ``;
                let answBbscttCn = ``;
                let updtAt= `` ;
+               let deleteAt = ``;
                if (item.answBbscttInnb !== null) {
                    answSttus = `<span class="text-complete">답변완료</span>`;
                    answBbscttCn = `<div class="ck-content">\${item.answBbscttCn}</div>`;
@@ -188,6 +189,7 @@
                    answSttus = `<span class="text-waiting">답변대기</span>`;
                    answBbscttCn = `답변 등록 중 입니다.`;
                    updtAt = `<button type="button" class="textBtns__btn updateBtn"><spring:message code="button.update"/></button>`;
+                   deleteAt = `<button type="button" class="textBtns__btn deleteBtn"><spring:message code="button.delete"/></button>`;
                }
 
                list += `<details class="myQnaList__item" bbsctt-innb = "\${item.bbscttInnb}">
@@ -233,7 +235,7 @@
                            <div class="textBtns">
                                <input type = "hidden" name = "bbscttInnb" value = "\${item.bbscttInnb}">
                                <input type = "hidden" name = "goodsInnb" value = "\${item.goodsInnb}">
-                               <button type="button" class="textBtns__btn deleteBtn"><spring:message code="button.delete"/></button>
+                               \${deleteAt}
                                \${updtAt}
                            </div>
                        </div>
@@ -349,8 +351,8 @@
                                                 <div class="textBtns">
                                                     <input type = "hidden" name = "bbscttInnb" value = "<c:out value="${resultList.bbscttInnb}"/>">
                                                     <input type = "hidden" name = "goodsInnb" value = "<c:out value="${resultList.goodsInnb}"/>">
-                                                    <button type="button" class="textBtns__btn deleteBtn"><spring:message code="button.delete"/></button>
                                                     <c:if test="${empty resultList.answBbscttInnb}">
+                                                    <button type="button" class="textBtns__btn deleteBtn"><spring:message code="button.delete"/></button>
                                                         <button type="button" class="textBtns__btn updateBtn"><spring:message code="button.update"/>
                                                         </button>
                                                     </c:if>