Merge branch 'score_shop' into api_score_meger

jyy

2021-07-12 9b1860f14489c81a9dd581d29e83289a5e114ace

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html

@@ -84,6 +84,7 @@
        <div id="option-bar">
            <button   class="btn btn-info btn-sm mr-5" onClick="openLook()"  ><i class="fa fa-eye fa-trash-o"></i> 查看详情</button>
            <button matrix:btn="mddd-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
            <button  matrix:btn="mddd-del"  class="btn btn-danger btn-sm mr-5" onClick="cancelOrder()"  ><i class="fa fa-trash-o fa-fw"></i> 取消</button>

        </div>
        <!-- 数据表格部分 -->
@@ -142,7 +143,25 @@
        });

    });

    function cancelOrder() {
        var id=myGrid.getSelectItemId();
        layer.confirm('确定取消此订单？', {
                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){
                //按钮【按钮二】的回调
            });
    }

    /**
     * 跳转消费流水详情页面