Merge branch 'XK_order_ship20210120'

src/views/user/orderDetail.vue

@@ -10,7 +10,7 @@
             </div>
             <template v-else-if="orderDetailInfo.status==7||orderDetailInfo.status==8||orderDetailInfo.status==10" >
                 <div v-if="wlInfoAll&&wlInfoAll.length>0">
-                     <a v-for="item in wlInfoAll" class="t1-box wl wlnobt" @click="toUrl('/h5/view/#/userShipping?order_shipping_id='+orderDetailInfo.order_shipping_id+'order_id='+orderDetailInfo.order_id+'&order_sn='+orderDetailInfo.order_sn)" >
+                     <a v-for="item in wlInfoAll" class="t1-box wl wlnobt" @click="toUrl('/h5/view/#/userShipping?order_shipping_id='+item.order_shipping_id+'&order_id='+orderDetailInfo.order_id+'&order_sn='+orderDetailInfo.order_sn)" >
                     <div class="ordersta" >{{item.shipping_name}}&nbsp;单号：{{item.shipping_no}}</div>
                     <span class="fhxh" @click.stop="fhxhfunc(item.goods_items)">发货型号</span>
                     <i class="icon iconfont">&#xe67c;</i>