Merge remote-tracking branch 'origin/master'

src/main/resources/templates/partner_apply_info.html

@@ -78,8 +78,6 @@
         });
     </script>
 </head>
-##
-<div class="pp"></div>
 <div class="logo-box">
     <div class="row">
         <img src="/static/images/rp_logo.svg" id="buslogo" class="logo">

src/main/resources/templates/refund_review.html

@@ -7,7 +7,6 @@
     <link rel="stylesheet" type="text/css" href="/static/lib/weui/weui.min.css">
     <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
     <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
-    ##
     <script type="text/javascript"
             src="/static/templates/disable_wechat_menu.js?t=201607070231"></script>
     <link rel="stylesheet" type="text/css" href="/static/lib/bootstrap/css/bootstrap.min.css">
@@ -24,7 +23,7 @@
                 var wdiv = $('#wdiv');
                 wdiv.show();
                 var fee = /*[[*{review.amount}]]*/0;
-                var remark = /*[[*{review.remark}]]*/'';
+                var remark = /*[[*${review['remark']}]]*/'';
                 $.ajax({
                            url: '/api/payment/v1.0/refund/review/orders/' + '${review.order_id}',
                            method: 'POST',
@@ -156,7 +155,7 @@
             <div class="weui_cell_bd weui_cell_primary">
                 <p>Remark</p>
             </div>
-            <div class="weui_cell_ft" th:text="${review.remark}"></div>
+            <div class="weui_cell_ft" th:text="${review['remark']}"></div>
         </div>
     </div>
     <div class="weui_cell">
@@ -199,14 +198,14 @@
             <div class="weui_cell_bd weui_cell_primary">
                 <p>Status</p>
             </div>
-            <div class="weui_cell_ft" th:text="${review.last_update_by}+'审核未通过'"></div>
+            <div class="weui_cell_ft" th:text="${review['last_update_by']}+'审核未通过'"></div>
         </div>
         <div th:if="${review['description']!=null}">
             <div class="weui_cell">
                 <div class="weui_cell_bd weui_cell_primary">
                     <p>Remark</p>
                 </div>
-                <div class="weui_cell_ft" th:text="${review.description}"></div>
+                <div class="weui_cell_ft" th:text="${review[description]}"></div>
             </div>
         </div>
     </div>

src/main/resources/templates/refund_review_client.html

@@ -58,7 +58,7 @@
         <div class="weui_cell_bd weui_cell_primary">
             <p>Remark</p>
         </div>
-        <div class="weui_cell_ft" th:text="${review.remark}"></div>
+        <div class="weui_cell_ft" th:text="${review['remark']}"></div>
     </div>
     </div>
     <div class="weui_cell">