Merge remote-tracking branch 'origin/master'

public/assets/css/bootstrap.css

@@ -3040,6 +3040,7 @@ fieldset[disabled] .btn {
   filter: alpha(opacity=65);
   -webkit-box-shadow: none;
   box-shadow: none;
+  background-color: #a4a4a4;
 }
 a.btn.disabled,
 fieldset[disabled] a.btn {
@@ -6723,4 +6724,4 @@ button.close {
   .hidden-print {
     display: none !important;
   }
-}
+}

public/assets/js/require-backend.min.js

@@ -10552,7 +10552,45 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
 
                 events.switcher(form);
             },
-            custom: {}
+            custom: {},
+            guessLogistics(no,ele){
+                let log= {
+                    1: {"id": 1, "name": "顺丰速运", "no": "SF"},
+                    2: {"id": 2, "name": "百世快递", "no": "HTKY"},
+                    3: {"id": 3, "name": "中通快递", "no": "ZTO"},
+                    4: {"id": 4, "name": "申通快递", "no": "STO"},
+                    5: {"id": 5, "name": "圆通速递", "no": "YTO"},
+                    6: {"id": 6, "name": "韵达速递", "no": "YD"},
+                    8: {"id": 8, "name": "EMS", "no": "EMS"},
+                    9: {"id": 9, "name": "京东快递", "no": "JD"}
+                }
+
+                if(!no){
+                    return
+                }
+                if(window.sendLogistics){
+                    window.sendLogistics.abort()
+                }
+                window.sendLogistics=$.ajax('/admin.php/addon/guessLogistics',{
+                    type:'post',
+                    data:{no},
+                    complete(){},
+                    beforeSend(){},
+                    success:({code,msg,data})=>{
+                        if(code){
+                            if(data.id){
+                                $(ele).val(data.id)
+                                $(ele).selectPageRefresh()
+                            }
+                        }else{
+                            layer.msg(msg)
+                        }
+                    },
+                    error(){
+                        //layer.msg('请求失败')
+                    }
+                })
+            },
         },
     };
     return Form;

public/assets/js/require-frontend.min.js

@@ -10398,7 +10398,45 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
 
                 events.switcher(form);
             },
-            custom: {}
+            custom: {},
+            guessLogistics(no,ele){
+                let log= {
+                    1: {"id": 1, "name": "顺丰速运", "no": "SF"},
+                    2: {"id": 2, "name": "百世快递", "no": "HTKY"},
+                    3: {"id": 3, "name": "中通快递", "no": "ZTO"},
+                    4: {"id": 4, "name": "申通快递", "no": "STO"},
+                    5: {"id": 5, "name": "圆通速递", "no": "YTO"},
+                    6: {"id": 6, "name": "韵达速递", "no": "YD"},
+                    8: {"id": 8, "name": "EMS", "no": "EMS"},
+                    9: {"id": 9, "name": "京东快递", "no": "JD"}
+                }
+
+                if(!no){
+                    return
+                }
+                if(window.sendLogistics){
+                    window.sendLogistics.abort()
+                }
+                window.sendLogistics=$.ajax('/admin.php/addon/guessLogistics',{
+                    type:'post',
+                    data:{no},
+                    complete(){},
+                    beforeSend(){},
+                    success:({code,msg,data})=>{
+                        if(code){
+                            if(data.id){
+                                $(ele).val(data.id)
+                                $(ele).selectPageRefresh()
+                            }
+                        }else{
+                            layer.msg(msg)
+                        }
+                    },
+                    error(){
+                        //layer.msg('请求失败')
+                    }
+                })
+            },
         },
     };
     return Form;