Merge branch 'XK_order_ship20210120'

# Conflicts:
#	view/23.js
#	view/app.js

src/views/user/shipping.vue

@@ -20,7 +20,7 @@
             </div>
             </div>
             <div class="wuliudanhao" v-if="wlInfo">快递单号：{{wlInfo.shipping_no}} <span @click="copy(wlInfo.shipping_no)">复制</span></div>
             <div class="wuliudanhao" v-if="wlInfo">快递单号：{{wlInfo.shipping_no}} <span @click="copy(wlInfo.shipping_no)">复制</span></div>
         </div>
         </div>
-        <div class="ship-box" v-if="wlInfo">
+        <div class="ship-box" v-if="wlInfo&&wlInfo.info.isArray">
             <div class="wu-group  " :class="{'act':index==0}" v-for="(item,index) in wlInfo.info">
             <div class="wu-group  " :class="{'act':index==0}" v-for="(item,index) in wlInfo.info">
                 <div class="time-gh">{{item.AcceptTime.substring(5,10)}}<span>{{item.AcceptTime.substring(11,16)}}</span></div>
                 <div class="time-gh">{{item.AcceptTime.substring(5,10)}}<span>{{item.AcceptTime.substring(11,16)}}</span></div>
                 <div class="g-te">
                 <div class="g-te">