Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html

@@ -220,20 +220,26 @@
    function cancelOrder() {
        var id=myGrid.getSelectItemId();
        layer.confirm('确定取消此订单？', {
            btn: ['确认', '取消并删除', '取消'] //可以无限个按钮
            btn: ['确认', '取消'] //可以无限个按钮
        }, function(index, layero){
            $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
                if (data.status == '200') {
                parent.layer.msg(data.info,{icon: 1});
                } else {
                    parent.layer.msg(data.info,{icon: 2});
                }
                layer.closeAll();
                myGrid.serchData();
            });
        }, function(index){
            $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
                parent.layer.msg(data.info,{icon: 1});
                layer.closeAll();
                myGrid.serchData();
            });
        }, function(index){
        },
        //     function(index){
        //     $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
        //         parent.layer.msg(data.info,{icon: 1});
        //         layer.closeAll();
        //         myGrid.serchData();
        //     });
        // },
            function(index){
            //按钮【按钮二】的回调
        });
    }