Merge branch 'XK_order_ship20210120'

src/store/modules/user/shipping.js

@@ -26,13 +26,15 @@ const actions = {
         Services.shipping(qs.stringify(params)).then((res) => {
         Services.shipping(qs.stringify(params)).then((res) => {
             state.loading = false;
             state.loading = false;
             if (res.data.err_code == 0) {
             if (res.data.err_code == 0) {
-                let arr_=res.data.data||[]
+                let arr_=res.data.data||[];
+                state.wlInfoAll=res.data.data;
+                if(!payload.order_shipping_id){return}
                 arr_.forEach((item)=>{
                 arr_.forEach((item)=>{
                     if(item.order_shipping_id==payload.order_shipping_id){
                     if(item.order_shipping_id==payload.order_shipping_id){
                         state.wlInfo=item
                         state.wlInfo=item
                     }
                     }
                 })
                 })
-                state.wlInfoAll=res.data.data
+                
             }else{
             }else{
                 Toast(res.data.err_msg)
                 Toast(res.data.err_msg)
             }
             }