king 4 lat temu
rodzic
commit
d56cc9ea28

+ 1 - 1
resources/js/lodop/LodopFuncs.js

@@ -40,7 +40,7 @@ if (needCLodop()) {
 	var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
 	var oscript = document.createElement("script");
 	var ishttps = 'https:' == document.location.protocol ? true: false;
-
+    ishttps = false;
 	if(ishttps){
 		oscript.src ="https://localhost:8443/CLodopfuncs.js?priority=1";
 		head.insertBefore( oscript,head.firstChild );

+ 5 - 2
resources/js/lodop/myPrintKit.js

@@ -27,7 +27,7 @@ var htmlTemplateObj = null;
 function lodopPrintTable(billList, wayNum){
     //获取打印模板
     htmlTemplateObj = $("#printContext");
-    //console.log("shipperName"+htmlTemplateObj.find("span.shipperName").text())
+    // console.log("shipperName"+htmlTemplateObj.find("span.shipperName").text())
     var LODOP = null;
     try{
         LODOP=getLodop();
@@ -265,7 +265,10 @@ function printEWaybill(data, serialNo, barcode, wayNum){
 
     //记录打印日志
     try {
-        printLogses(data);
+        //printLogses(data);
+        window.tempTip.postBasicRequest("changeExpressTag",{id:data.waybillNumber},res=>{
+
+        });
     } catch (e) {
     }
 }

+ 5 - 5
resources/views/transport/waybill/index.blade.php

@@ -539,11 +539,11 @@
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
 {{--    德邦物流--}}
-{{--    <script type="text/javascript" src="{{mix('js/lodop/jquery.js')}}"></script>--}}
-    <script type="text/javascript" src="{{URL::asset('js/lodop/jquery.PrintArea.js')}}"></script>
-    <script type="text/javascript" src="{{URL::asset('js/lodop/LodopFuncs.js')}}"></script>
-    <script type="text/javascript" src="{{URL::asset('js/lodop/myAlert.js')}}"></script>
-    <script type="text/javascript" src="{{URL::asset('js/lodop/myPrintKit.js')}}"></script>
+{{--    <script type="text/javascript" src="{{URL::asset('js/lodop/jquery.js')}}"></script>--}}
+    <script type="text/javascript" src="{{mix('js/lodop/myAlert.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/lodop/myPrintKit.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/lodop/jquery.PrintArea.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/lodop/LodopFuncs.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#list',

+ 1 - 1
webpack.mix.js

@@ -37,7 +37,7 @@ mix.js("resources/js/marked.js", "public/js/marked.js");
 
 //德邦快递
 mix.js('resources/js/lodop/jquery.PrintArea.js','public/js/lodop/jquery.PrintArea.js')
-mix.js('resources/js/lodop/LodopFuncs.js','public/js/lodop/LodopFuncs.js')
+mix.copy('resources/js/lodop/LodopFuncs.js','public/js/lodop/LodopFuncs.js')
 mix.js('resources/js/lodop/myAlert.js','public/js/lodop/myAlert.js')
 mix.copy('resources/js/lodop/myPrintKit.js','public/js/lodop/myPrintKit.js')
 mix.copy('resources/js/lodop/install_lodop32.exe','public/js/lodop/install_lodop32.exe')