bugfix

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -2894,6 +2894,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         return null;
     }
 
+    @Transactional(readOnly = false)
     public void cancelShopOrder(NewShopOrder shopOrder) {
         //余额退回原账户
         CmUser user = cmUserDao.get(shopOrder.getUserID().toString());

src/main/java/com/caimei/modules/order/web/CmShopOrderController.java

@@ -84,19 +84,6 @@ public class CmShopOrderController extends BaseController {
         if (null != orderInvoice) {
             newShopOrder.setOrderInvoice(orderInvoice);
         }
-        CmOrderRemark cmOrderRemark = new CmOrderRemark();
-        cmOrderRemark.setShopOrderID(newShopOrder.getShopOrderID());
-        List<CmOrderRemark> remarksList = cmOrderRemarkService.findList(cmOrderRemark);
-        if (!org.springframework.util.CollectionUtils.isEmpty(remarksList)) {
-            for (CmOrderRemark cor : remarksList) {
-                String id = cor.getId();
-                List<CmOrderRemarkImage> remarkImgList = cmOrderRemarkService.findRemarkImgList(id);
-                cor.setCmOrderRemarkImageList(remarkImgList);
-                List<CmOrderRemarkFile> remarkFileList = cmOrderRemarkService.findRemarkFile(id);
-                cor.setRemarkFileList(remarkFileList);
-            }
-        }
-        model.addAttribute("remarksList", remarksList);
         return "modules/order/shopOrderDetail";
     }
 

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -749,7 +749,7 @@ public class NewOrderController extends BaseController {
     @RequiresPermissions("order:order:edit")
     @RequestMapping("cancelShopOrder")
     public String cancelShopOrder(Integer shopOrderId, RedirectAttributes redirectAttributes) {
-        NewShopOrder shopOrder = newShopOrderDao.get(shopOrderId.toString());
+        NewShopOrder shopOrder = newShopOrderService.get(shopOrderId.toString());
         boolean cancelFlag = (null != shopOrder && (0 == shopOrder.getStatus() || (1 == shopOrder.getStatus() && "1".equals(shopOrder.getReceiptStatus()))));
         if (!cancelFlag) {
             // 非待确认(或待收待发)订单

src/main/webapp/WEB-INF/views/modules/order/shopOrderDetail.jsp

@@ -139,11 +139,11 @@
                         <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}">发货记录</a>
                         <a href="${ctx}/bulkpurchase/cmRefundsProduct/toShopOrderRefundRecord.rpc?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}&from=2">收付款记录</a>
                         <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByShopOrder.rpc?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}">退款（退货）记录</a>
-                        <c:if test="${order.status == 0}">
-                            <a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"
+                        <c:if test="${order.status != 4 and order.payStatus eq 1 and order.receiptStatus eq 1 and order.sendOutStatus eq 1}">
+                            <a href="${ctx}/order/cancelShopOrder?shopOrderId=${order.shopOrderID}"
                                onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
                         </c:if>
-<%--                        <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2&shopOrderID=${order.shopOrderID}">订单备注</a>--%>
+                        <%--                        <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2&shopOrderID=${order.shopOrderID}">订单备注</a>--%>
                     </shiro:hasPermission>
                 </div>
             </div>
@@ -153,76 +153,74 @@
 
 </table>
 <textarea id="copyValue" style="display: none"></textarea>
-<div class="remarks">
-    <div class="remarkButton">
-        订单备注
-        <a onclick="hideRemarks();">收起</a>
-    </div>
-    <button id="addButton" class="btn btn-primary" onclick="">
-        添加备注
-        <%--        <a class="jumpRemark"--%>
-        <%--           href="${ctx}/order/cmOrderRemark/toAddRemarksViewNew.rpc?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}&orderType=${order.orderType}">添加备注</a>--%>
-    </button>
-    <c:if test="${not empty remarksList}">
-        <div style="overflow-x: hidden;word-break:break-all">
-            <c:forEach items="${remarksList}" var="list" varStatus="remark">
-                <div class="td clear">
-                    <div style="font-weight: bold;width: 100%;float: left;">
-                        <span style="float: left;">${list.sysUserName}[${list.no}]</span>
-                        <span style="float: left;margin-left:10px;"><fmt:formatDate value="${list.createDate}"
-                                                                                    pattern="yyyy-MM-dd HH:mm"/></span>
-                    </div>
-                    <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-                            备注内容:
-                        </div>
-                        <div style="width: 1000px;float: left;margin: 10px 0;">
-                                ${list.remarks}
-                        </div>
-                    </div>
-                    <div class="td-text"
-                         style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">
-                        <c:if test="${not empty list.cmOrderRemarkImageList}">
-                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-                                图片:
-                            </div>
-                            <div style="width: 1000px;float: left;">
-                                <c:forEach items="${list.cmOrderRemarkImageList}" var="remarkImageList"
-                                           varStatus="remarkImage">
-                                    <a href="${remarkImageList.remarkImage}" target="_blank">
-                                        <img class="enlarge-pic" style="height: 150px;width: 150px;margin-top: 10px"
-                                             src="${remarkImageList.remarkImage}">&nbsp;
-                                    </a>
-                                </c:forEach>
-                            </div>
-                        </c:if>
-                    </div>
-                    <div class="td-text"
-                         style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">
-                        <c:if test="${not empty list.remarkFileList}">
-                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-                                文件:
-                            </div>
-                            <div style="width: 1000px;float: left;margin: 10px 0;">
-                                <c:forEach items="${list.remarkFileList}" var="item" varStatus="remarkFile">
-                                    <p>${item.name}&nbsp;&nbsp;&nbsp;&nbsp;<a
-                                            href="${ctx}/order/cmOrderRemark/downFile?fileId=${item.id}">下载</a></p>
-                                </c:forEach>
-                            </div>
-                        </c:if>
-                    </div>
-                </div>
-            </c:forEach>
-        </div>
-    </c:if>
-    <c:if test="${empty remarksList}">
-        <font size="3" style="text-align: center;display: block;line-height: 80px;" color="#0066CC">暂无备注信息,有需要请您前往添加订单备注。</font>
-    </c:if>
-</div>
+<%--<div class="remarks">--%>
+<%--    <div class="remarkButton">--%>
+<%--        订单备注--%>
+<%--        <a onclick="hideRemarks();">收起</a>--%>
+<%--    </div>--%>
+<%--    <button id="addButton" class="btn btn-primary" onclick="">--%>
+<%--        添加备注--%>
+<%--        &lt;%&ndash;        <a class="jumpRemark"&ndash;%&gt;--%>
+<%--        &lt;%&ndash;           href="${ctx}/order/cmOrderRemark/toAddRemarksViewNew.rpc?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}&orderType=${order.orderType}">添加备注</a>&ndash;%&gt;--%>
+<%--    </button>--%>
+<%--    <c:if test="${not empty remarksList}">--%>
+<%--        <div style="overflow-x: hidden;word-break:break-all">--%>
+<%--            <c:forEach items="${remarksList}" var="list" varStatus="remark">--%>
+<%--                <div class="td clear">--%>
+<%--                    <div style="font-weight: bold;width: 100%;float: left;">--%>
+<%--                        <span style="float: left;">${list.sysUserName}[${list.no}]</span>--%>
+<%--                        <span style="float: left;margin-left:10px;"><fmt:formatDate value="${list.createDate}"--%>
+<%--                                                                                    pattern="yyyy-MM-dd HH:mm"/></span>--%>
+<%--                    </div>--%>
+<%--                    <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">--%>
+<%--                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">--%>
+<%--                            备注内容:--%>
+<%--                        </div>--%>
+<%--                        <div style="width: 1000px;float: left;margin: 10px 0;">--%>
+<%--                                ${list.remarks}--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                    <div class="td-text"--%>
+<%--                         style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">--%>
+<%--                        <c:if test="${not empty list.cmOrderRemarkImageList}">--%>
+<%--                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">--%>
+<%--                                图片:--%>
+<%--                            </div>--%>
+<%--                            <div style="width: 1000px;float: left;">--%>
+<%--                                <c:forEach items="${list.cmOrderRemarkImageList}" var="remarkImageList"--%>
+<%--                                           varStatus="remarkImage">--%>
+<%--                                    <a href="${remarkImageList.remarkImage}" target="_blank">--%>
+<%--                                        <img class="enlarge-pic" style="height: 150px;width: 150px;margin-top: 10px"--%>
+<%--                                             src="${remarkImageList.remarkImage}">&nbsp;--%>
+<%--                                    </a>--%>
+<%--                                </c:forEach>--%>
+<%--                            </div>--%>
+<%--                        </c:if>--%>
+<%--                    </div>--%>
+<%--                    <div class="td-text"--%>
+<%--                         style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">--%>
+<%--                        <c:if test="${not empty list.remarkFileList}">--%>
+<%--                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">--%>
+<%--                                文件:--%>
+<%--                            </div>--%>
+<%--                            <div style="width: 1000px;float: left;margin: 10px 0;">--%>
+<%--                                <c:forEach items="${list.remarkFileList}" var="item" varStatus="remarkFile">--%>
+<%--                                    <p>${item.name}&nbsp;&nbsp;&nbsp;&nbsp;<a--%>
+<%--                                            href="${ctx}/order/cmOrderRemark/downFile?fileId=${item.id}">下载</a></p>--%>
+<%--                                </c:forEach>--%>
+<%--                            </div>--%>
+<%--                        </c:if>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--            </c:forEach>--%>
+<%--        </div>--%>
+<%--    </c:if>--%>
+<%--    <c:if test="${empty remarksList}">--%>
+<%--        <font size="3" style="text-align: center;display: block;line-height: 80px;" color="#0066CC">暂无备注信息,有需要请您前往添加订单备注。</font>--%>
+<%--    </c:if>--%>
+<%--</div>--%>
 <div class="remarkShow">
-    订单备注
-<%--    <a onclick="showRemark();">展开</a>--%>
-    <a onclick="openRemarks(${order.orderID},${order.shopOrderID})">展开</a>
+    <b>订单备注<a onclick="openRemarks(${order.orderID},${order.shopOrderID})" style="color: white">展开</a></b>
 </div>
 <div class="order-rows">
     <tr>
@@ -616,115 +614,115 @@
     </div>
 </c:if>
 <%-- 订单备注抽屉 --%>
-<div class="remarks-drawer-content">
-    <div class="drawer-btn-main">
-        <p>订单备注</p >
-        <p class="drawer-close">收起》</p>
-        <p class="drawer-opens">展开《</p>
-    </div>
-    <div class="drawer-content">
-        <div class="drawer-content-btn">
-           <input id="btnSubmit" class="btn btn-primary" type="submit" value="添加备注">
-        </div>
-        <div class="drawer-content-none">
-            <p>暂无备注信息,有需要请您前往添加订单备注~</p>
-        </div>
-        <div class="drawer-content-mains">
-            <div class="drawer-list">
-                <div class="drawer-list-title">
-                    <span>赵智捷：2023-07-05 14:59</span>
-                </div>
-                <div class="drawer-list-text">
-                    <span>备注内容：</span>
-                    申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63
-                </div>
-                <div class="drawer-list-title">
-                    <span>图片</span>
-                </div>
-                <div class="drawer-list-image">
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a >
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a >
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a >
-                </div>
-                <div class="drawer-list-title">
-                    <span>文件</span>
-                </div>
-                <div class="drawer-list-file">
-                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                </div>
-            </div>
-            <div class="drawer-list">
-                <div class="drawer-list-title">
-                    <span>赵智捷：2023-07-05 14:59</span>
-                </div>
-                <div class="drawer-list-text">
-                    <span>备注内容：</span>
-                    申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63
-                </div>
-                <div class="drawer-list-title">
-                    <span>图片</span>
-                </div>
-                <div class="drawer-list-image">
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a >
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a >
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a >
-                </div>
-                <div class="drawer-list-title">
-                    <span>文件</span>
-                </div>
-                <div class="drawer-list-file">
-                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                </div>
-            </div>
-            <div class="drawer-list">
-                <div class="drawer-list-title">
-                    <span>赵智捷：2023-07-05 14:59</span>
-                </div>
-                <div class="drawer-list-text">
-                    <span>备注内容：</span>
-                    申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63
-                </div>
-                <div class="drawer-list-title">
-                    <span>图片</span>
-                </div>
-                <div class="drawer-list-image">
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a >
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a >
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a >
-                </div>
-                <div class="drawer-list-title">
-                    <span>文件</span>
-                </div>
-                <div class="drawer-list-file">
-                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                </div>
-            </div>
-    </div>
-</div>
+<%--<div class="remarks-drawer-content">--%>
+<%--    <div class="drawer-btn-main">--%>
+<%--        <p>订单备注</p >--%>
+<%--        <p class="drawer-close">收起》</p>--%>
+<%--        <p class="drawer-opens">展开《</p>--%>
+<%--    </div>--%>
+<%--    <div class="drawer-content">--%>
+<%--        <div class="drawer-content-btn">--%>
+<%--           <input id="btnSubmit" class="btn btn-primary" type="submit" value="添加备注">--%>
+<%--        </div>--%>
+<%--        <div class="drawer-content-none">--%>
+<%--            <p>暂无备注信息,有需要请您前往添加订单备注~</p>--%>
+<%--        </div>--%>
+<%--        <div class="drawer-content-mains">--%>
+<%--            <div class="drawer-list">--%>
+<%--                <div class="drawer-list-title">--%>
+<%--                    <span>赵智捷：2023-07-05 14:59</span>--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-text">--%>
+<%--                    <span>备注内容：</span>--%>
+<%--                    申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-title">--%>
+<%--                    <span>图片</span>--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-image">--%>
+<%--                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">--%>
+<%--                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">--%>
+<%--                    </a >--%>
+<%--                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">--%>
+<%--                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">--%>
+<%--                    </a >--%>
+<%--                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">--%>
+<%--                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">--%>
+<%--                    </a >--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-title">--%>
+<%--                    <span>文件</span>--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-file">--%>
+<%--                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>--%>
+<%--                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>--%>
+<%--                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>--%>
+<%--                </div>--%>
+<%--            </div>--%>
+<%--            <div class="drawer-list">--%>
+<%--                <div class="drawer-list-title">--%>
+<%--                    <span>赵智捷：2023-07-05 14:59</span>--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-text">--%>
+<%--                    <span>备注内容：</span>--%>
+<%--                    申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-title">--%>
+<%--                    <span>图片</span>--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-image">--%>
+<%--                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">--%>
+<%--                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">--%>
+<%--                    </a >--%>
+<%--                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">--%>
+<%--                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">--%>
+<%--                    </a >--%>
+<%--                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">--%>
+<%--                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">--%>
+<%--                    </a >--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-title">--%>
+<%--                    <span>文件</span>--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-file">--%>
+<%--                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>--%>
+<%--                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>--%>
+<%--                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>--%>
+<%--                </div>--%>
+<%--            </div>--%>
+<%--            <div class="drawer-list">--%>
+<%--                <div class="drawer-list-title">--%>
+<%--                    <span>赵智捷：2023-07-05 14:59</span>--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-text">--%>
+<%--                    <span>备注内容：</span>--%>
+<%--                    申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-title">--%>
+<%--                    <span>图片</span>--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-image">--%>
+<%--                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">--%>
+<%--                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">--%>
+<%--                    </a >--%>
+<%--                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">--%>
+<%--                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">--%>
+<%--                    </a >--%>
+<%--                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">--%>
+<%--                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">--%>
+<%--                    </a >--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-title">--%>
+<%--                    <span>文件</span>--%>
+<%--                </div>--%>
+<%--                <div class="drawer-list-file">--%>
+<%--                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>--%>
+<%--                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>--%>
+<%--                    <p>奥斯卡级大叔大叔极度恐慌.pdf</p>--%>
+<%--                </div>--%>
+<%--            </div>--%>
+<%--    </div>--%>
+<%--</div>--%>
 <script type="text/javascript">
 
     function openRemarks(orderId, shopOrderId) {
@@ -741,7 +739,8 @@
                 var $jboxFrame = top.$('#jbox-iframe');
                 var $mainFrame = top.$('#mainFrame');
                 return true;
-            }, closed: function () {/* 窗口关闭后执行的函数 */}
+            }, closed: function () {/* 窗口关闭后执行的函数 */
+            }
         });
     }
 
@@ -766,14 +765,14 @@
             }
         })
         // 订单备注抽屉显隐
-        $('.drawer-opens').click(function() {
+        $('.drawer-opens').click(function () {
             $('.remarks-drawer-content').animate({
                 'right': '0px'
             }, 300);
             $(this).hide()
             $('.drawer-close').show()
         });
-        $('.drawer-close').click(function() {
+        $('.drawer-close').click(function () {
             $('.remarks-drawer-content').animate({
                 'right': '-580px'
             }, 300);

src/main/webapp/static/modules/order/order-details.css

@@ -140,6 +140,22 @@ h3 {
     margin-right: 10px
 }
 
+.remarkShow {
+    width: 60px;
+    height: 80px;
+    top: 45%;
+    right: 0;
+    box-sizing: border-box;
+    background: #45aeea;
+    border-radius: 10px 0 0 10px;
+    padding: 15px 0;
+    color: #FFFFFF;
+    cursor: pointer;
+    position: absolute;
+    transform: scale(1.5);
+    font-family: SimSun, sans-serif;
+}
+
 .item-div textarea {
     border: 1px solid #CCCCCC;
     margin-top: 20px;