Merge branch 'master' of zcb/kmall-pt-general into master

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -453,35 +453,39 @@ let vm = new Vue({
                 alert("购物车中没有商品");
                 return;
             }
-            console.log(this.goodsList);
-            if(vm.pendingOrderMap.size > 3){
-                alter("订单挂起最多支持3单");
-                return
+            console.log(vm.pendingOrderMap.size);
+            if(vm.pendingOrderMap.size >= 3){
+                alert("订单挂起最多支持3单");
+                return;
             }
             vm.pendingOrderMap.set(vm.pendingIndex,this.goodsList);
             vm.pendingOrderKeys.push(vm.pendingIndex);
             var newIndex = ++vm.pendingIndex;
-            vm.pendingIndex = newIndex >= 3?1: newIndex;
+            vm.pendingIndex = newIndex > 3?1: newIndex;
             vm.clearGoodsList();
         },
+        toResumePending:function(){
+            if(vm.pendingOrderMap.size == 0){
+                alert("当前没有挂起的订单");
+                return ;
+            }
+            $('#pendignOrderModal').modal('show')
+        },
         resumePending:function(key){
             if(vm.pendingOrderMap.size == 0){
                 alert("当前没有挂起的订单");
                 return ;
             }
+            if(vm.goodsList.length > 0){
+                alert("购物车中已有商品，不允许恢复！")
+                return ;
+            }
             vm.goodsList = vm.pendingOrderMap.get(key);
             // 清除恢复的数据
             vm.pendingOrderMap.delete(key);
             removeByValue(vm.pendingOrderKeys,key);
             $('#pendignOrderModal').modal('hide')
         },
-        toResumePending:function(){
-            if(vm.pendingOrderMap.size == 0){
-                alert("当前没有挂起的订单");
-                return ;
-            }
-            $('#pendignOrderModal').modal('show')
-        },
         toOrderSubmit:function(){
 
             if(this.goodsList.length == 0){