merge

pages/user/order/logistics.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="LogisticsIndex" v-if="loaded">
+	<view class="LogisticsIndex">
 		<block v-if="list.length>0">
 			<view class="logistics-top">
 				<view>{{express.express_name}} <span class="copy" @click='copy(express.express_no)'>复制单号</span></view>
@@ -34,7 +34,6 @@
 		data() {
 			return {
 				list: [],
-				loaded:false,
 				no: '', // 快递单号
 				express:{},// 地址信息
 			}
@@ -50,12 +49,11 @@
 				mallShipmentsLogistic(no).then(res => {
 					this.list = res.logistics
 					this.express = res.express
-					this.loaded = true
 				}).catch(err => {
-					this.$refs.uToast.show({
+					console.log(err)
+					uni.showToast({
 						title: err.message,
-						type: 'error',icon:false,
-						duration: 3000
+						icon:'none'
 					})
 				})
 			},

pages/user/order/mallShipmentsInfo.vue

@@ -245,6 +245,11 @@
 					longitude: Number(info.longitude),
 					success: function() {}
 				});
+			},
+			nowLogistics(no){
+				uni.navigateTo({
+					url:'/pages/user/order/logistics?no='+no
+				})
 			}
 
 		}