Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

 zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html

@@ -98,15 +98,16 @@
            layer.closeAll('loading');
            console.log(data)
            if (data.status == "200") {
                layer.open({
                    title: '导入快递单',
                    content: data.info
                });
                parent.layer.close(parent.layer.getFrameIndex(window.name));
                parent.myGrid.serchData();
            } else {
                layer.open({
                    title: '导入快递单',
                    title: '导入快递单,部分失败',
                    content: data.info
                });
                var url = basePath + "/admin/shopOrder/exportLogisticsImportExcel";
                window.open(url);
                parent.myGrid.serchData();
            }
            $("#showFileName").val('');
            var file = $("#chanceUploadId");
@@ -117,8 +118,7 @@


    function download() {
        //window.location.href=  "https://xcshop.csxuncong.com/uploadefile/image/logisticsImport.xls";
        window.location.href=  "http://xcshop.csxuncong.com/uploadfile/image/logisticsImport.xls";
        window.location.href=basePath + "/uploadfile/image/logisticsImport.xls";
    }
</script>
</body>