Merge branch 'master' of dq/kmall-pt into master

kmall-admin/src/main/webapp/js/shop/orderrefund.js

@@ -23,11 +23,10 @@ $(function () {
                     let htmlStr = '';
                     if (hasPermission('order:refund')) {
                         if (row.refundStatus == 1) {
-                            htmlStr = '<button class="btn btn-outline btn-danger" onclick="vm.refundUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;取消</button>&nbsp;';
+                            htmlStr = '<button class="btn btn-outline btn-danger" onclick="vm.refundUpdate(' + row.orderId + ')"><i class="fa fa-times-circle-o"></i>&nbsp;确认退款</button>&nbsp;';
                         }
                     }
-                    htmlStr += '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;' +
-                        '<button class="btn btn-outline btn-primary" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-print"></i>打印</button>';
+                    htmlStr += '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>';
                     return htmlStr;
                 }
             }],