退款修改

kmall-admin/src/main/resources/mybatis/mapper/mk/MkDistSellStatisDao.xml

@@ -126,12 +126,12 @@
                 order by a.id desc
 			</otherwise>
         </choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
 		)a
 		GROUP BY
 		a.dist_id ,a.expend_dist_level
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
 	</select>
 	
  	<select id="queryTotal" resultType="int">

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

@@ -210,21 +210,22 @@ var vm = new Vue({
             let params = {};
             params.orderId = orderId;
             params.refundId = rowId;
-
-            $.ajax({
-                type: "POST",
-                url: '../order/refund',
-                data: params,
-                success: function (r) {
-                    if (r.code === 0) {
-                        alert('退款成功', function (index) {
-                            vm.reload();
-                        });
-                    } else {
-                        alert(r.msg);
+            confirm('是否确认退款？', function () {
+                $.ajax({
+                    type: "POST",
+                    url: '../order/refund',
+                    data: params,
+                    success: function (r) {
+                        if (r.code === 0) {
+                            alert('退款成功', function (index) {
+                                vm.reload();
+                            });
+                        } else {
+                            alert(r.msg);
+                        }
                     }
-                }
-            });
+                });
+            })
         },
         approval: function(rowId) {
             vm.showList = 2;