BUG0012会员信息中的保养订单信息和保养订单查询中同一个订单，订单状态不一致

member/src/main/resources/template/js/member/memberInfo.js

@@ -93,10 +93,14 @@ layui.config({
             AjaxPostUtil.request({url: shopBasePath + "keepFitOrder001", params: params, type: 'json', method: "POST", callback: function(json){
                 if(json.returnCode == 0){
                     $.each(json.rows, function (i, item){
-                        if(item.state == '1'){
-                            item.state = "待支付";
-                        }else if(item.state == '2' || item.state == '3'){
-                            item.state = "已支付";
+                        if(item.cancleState == 1){
+                            if(item.state == '1'){
+                                item.state = "待支付";
+                            }else if(item.state == '2' || item.state == '3'){
+                                item.state = "已支付";
+                            }
+                        } else {
+                            item.state = '已取消';
                         }
                     });
                     $("#showForm").append(getDataUseHandlebars($("#memberKeepFitOrderTemplate").html(), json));

shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js

@@ -57,7 +57,7 @@ layui.config({
                     }else if(d.state == 3){
                         return "<span class='state-up'>已支付(已核销)</span>";
                     }
-                }else{
+                } else {
                     return '已取消';
                 }
             }},