[退货相关跳转页面兼容处理]

pages/property/index.vue

@@ -37,7 +37,7 @@
 					</view>
 					<view class="group-flex group-flex-4">
 						<view class="item" @click="$Router.push({name:'Extract'})">
-							<view class="item-num">{{base.account.token}}</view>
+							<view class="item-num">{{base.account.coins}}</view>
 							<view class="item-title">原石</view>
 						</view>
 						<view class="item" @click="$Router.push({name:'Fragment'})">

pages/property/order/logistics.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="LogisticsIndex">
+	<view class="LogisticsIndex" v-if="loaded">
 		<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,12 +34,15 @@
 		data() {
 			return {
 				list: [],
+				loaded:false,
 				no: '', // 快递单号
 				express:{},// 地址信息
 			}
 		},
 		onLoad(e) {
-			this.no = this.$route.params.no
+			// this.no = this.$route.params.no
+			// this.getLogistic(this.no)
+			this.no = e.no
 			this.getLogistic(this.no)
 		},
 		methods: {
@@ -48,6 +51,7 @@
 					console.log(res)
 					this.list = res.logistics
 					this.express = res.express
+					this.loaded = true
 				}).catch(err => {
 					this.$refs.uToast.show({
 						title: err.message,

pages/property/order/mallRefundsInfo.vue

@@ -1,23 +1,13 @@
 <template>
-	<view class="OrderInfo">
+	<view class="OrderInfo" v-if="loaded">
 		<!-- 订单状态 -->
 		<view class="order-status">
 			<view class="info">
-				{{info.state.text}}
+				{{state.text}}
-				<span>{{info.state.remark}}</span>
+				<span>{{state.remark}}</span>
 			</view>
 			<image src="/static/imgs/fire.png" mode="widthFix"></image>
 		</view>
-		<!-- 收货人 -->
-		<view class="acceptInfo" v-if="type === '2'">
-			<block>
-				<view class="name">{{address.name}} <span>{{address.mobile}}</span> </view>
-				<view class="address">
-					<u-icon name="map" color="red"></u-icon>
-					<span>{{address.full_address}}</span>
-				</view>
-			</block>
-		</view>
 
 		<view class="goods-info1">
 			<view class="top">
@@ -41,7 +31,7 @@
 					<view class="sku">权证个数 <span>x {{info.qty}}</span> </view>
 				</view>
 			</view>
-			<navigator class="total" hover-class="none" :url='"/pages/goods/detail?id="+info.goods_sku.goods_id'>
+			<navigator class="total" hover-class="none" :url='"/pages/goods/details?id="+info.goods_sku.goods_id'>
 				<view class="total-btn">再次购买</view>
 			</navigator>
 			<view class="goods-type">创建退货时间 <span>{{info.created_at}}</span></view>
@@ -73,7 +63,7 @@
 						<view :class="['dian',index === 0 ?'dian-active':'']"></view>
 						<view :class="['content',index === 0?'content-active':'']">
 							<view class="title">{{item.state_text?item.state_text:'当前状态不明确，需后台返回'}}</view>
-							<view class="des">退货原因：{{item.title || '无理由'}} ； 退货备注：{{item.remark || '无备注'}}</view>
+							<view class="des">原因：{{item.title || '无理由'}} ； 备注：{{item.remark || '无备注'}}</view>
 							<view class="pictures">
 								<image @click="priveImg(index,idx)" v-for="(it,idx) in item.pictures" :key='idx' :src="it" mode="aspectFill"  />
 							</view>
@@ -101,16 +91,20 @@
 			return {
 				info: {},
 				qty: 1,
+				state:{},
 				refund_id: '', // 退货单no
 				company: '',
 				number: '',
 				logs: [],
+				loaded:false,
 				showLogs: false // 默认不显示记录信息
 			};
 		},
 		onLoad(e) {
-			this.refund_id = this.$route.params.no
+			// this.refund_id = this.$route.params.no
-			this.getInfo(this.refund_id)
+			// this.getInfo(this.refund_id)
+			this.refund_id = e.no
+			this.getInfo(e.no)
 		},
 		onShow() {
 			if (uni.getStorageSync('refresh')) {
@@ -123,6 +117,8 @@
 				mallRefundsInfo(refund_id).then(res => {
 					this.info = res
 					this.logs = res.log
+					this.state = res.state
+					this.loaded = true
 				}).catch(err => {
 					this.$refs.uToast.show({
 						title: err.message,

pages/property/order/mallShipments.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="NumberWeight">
+	<view class="mallShipments">
 		<!-- 订单分类 -->
 		<view class="nav">
 			<view :class="['nav-item' ,selectTypeId === item.id?'nav-item-selected':'']"
@@ -314,39 +314,51 @@
 
 			// 申请退货
 			nowRefund(no) {
-				this.$router.push({
+				// this.$Router.push({
-					name: 'MallShipmentsRefund',
+				// 	name: 'MallShipmentsRefund',
-					params: {
+				// 	params: {
-						no: no
+				// 		no: no
-					}
+				// 	}
+				// })
+				uni.navigateTo({
+					url:'/pages/property/order/mallShipmentsRefund?no='+no
 				})
 			},
 			// 查看物流
 			nowLogistics(no) {
-				this.$router.push({
+				// this.$Router.push({
-					name: 'Orderlogistics',
+				// 	name: 'Orderlogistics',
-					params: {
+				// 	params: {
-						no: no
+				// 		no: no
-					}
+				// 	}
+				// })
+				uni.navigateTo({
+					url:'/pages/property/order/logistics?no='+no
 				})
 			},
 			// 查看详情
 			goDetail(no) {
-				this.$router.push({
+				// this.$Router.push({
-					name: 'MallShipmentsInfo',
+				//   name: 'MallShipmentsInfo',
-					params: {
+				//   query:{
-						no: no
+				// 	  no:no
-					}
+				//   }
+				// })
+				uni.navigateTo({
+					url:'/pages/property/order/mallShipmentsInfo?no='+no
 				})
 			},
 			// 查看退货单详情
 			// 查看详情
 			goDetail1(no){
-				this.$router.push({
+				// this.$Router.push({
-				  name: 'MallRefundsInfo',
+				//   name: 'MallRefundsInfo',
-				  params:{
+				//   params:{
-					  no:no
+				// 	  no:no
-				  }
+				//   }
+				// })
+				uni.navigateTo({
+					url:'/pages/property/order/mallRefundsInfo?no='+no
 				})
 			}
 			
@@ -360,7 +372,7 @@
 		height: 100%;
 	}
 
-	.NumberWeight {
+	.mallShipments {
 		width: 100%;
 		min-height: 100vh;
 		box-sizing: border-box;

pages/property/order/mallShipmentsInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="OrderInfo">
+  <view class="OrderInfo" v-if="loaded">
     <!-- 订单状态 -->
     <view class="order-status">
       <view class="info">
@@ -41,7 +41,7 @@
           <view class="sku">权证个数 <span>x {{info.qty}}</span> </view>
         </view>
       </view>
-     <navigator class="total" hover-class="none" :url='"/pages/goods/detail?id="+info.goods_sku.goods_id'>
+     <navigator class="total" hover-class="none" :url='"/pages/goods/details?id="+info.goods_sku.goods_id'>
         <view class="total-btn">再次购买</view>
       </navigator>
       <view class="goods-type">创建提货单时间 <span>{{info.created_at}}</span></view>
@@ -106,11 +106,12 @@
 		store_Name:'',// 门店名称
 		qty :1,
 		shipment_no:'', // 提货单no
+		loaded:false
       };
     },
 	onLoad(e) {
-		this.shipment_no = this.$route.params.no
+		this.shipment_no = e.no
-		this.getInfo(this.$route.params.no)
+		this.getInfo(e.no)
 	},
 	onShow() {
 		if(uni.getStorageSync('refresh')){
@@ -123,6 +124,7 @@
 				this.info = res
 				this.address = res.express
 				this.type = res.type+''
+				this.loaded = true
 			}).catch(err=>{
 					this.$refs.uToast.show({
 					  title: err.message,

pages/property/order/mallShipmentsRefund.vue

@@ -78,8 +78,11 @@
 			};
 		},
 		onLoad(e) {
-			this.shipment_no = this.$route.params.no
+			
-			this.getInfo(this.shipment_no)
+			// this.shipment_no = this.$route.params.no
+			// this.getInfo(this.shipment_no)
+			this.shipment_no = e.no
+			this.getInfo(e.no)
 		},
 		methods: {
 			// 预览上传图片

pages/property/order/numberWeightInfo.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="OrderInfo">
+	<view class="OrderInfo" v-if="loaded">
 		<!-- 订单状态 -->
 		<view class="order-status">
 			<view class="info">
@@ -45,7 +45,7 @@
 					<view class="sku">可提个数 <span>x {{account.balance}}</span> </view>
 				</view>
 			</view>
-			<navigator class="total" hover-class="none" :url='"/pages/goods/detail?id="+goods.goods_id'>
+			<navigator class="total" hover-class="none" :url='"/pages/goods/details?id="+goods.goods_id'>
 				<view class="total-btn">再次购买</view>
 			</navigator>
 			<view class="goods-type" v-if="type === '1'">运费 <span>免邮</span></view>
@@ -147,7 +147,8 @@
 				store_Name: '', // 门店名称
 				qty: 1,
 				showCode:false,
-				showCodeImg:''
+				showCodeImg:'',
+				loaded:false
 			};
 		},
 		onLoad(e) {
@@ -176,6 +177,7 @@
 					this.stores = res.stores
 					this.qty = res.account.balance
 					this.type = res.logistic_type + ''
+					this.loaded = true
 				}).catch(err => {
 					this.$refs.uToast.show({
 						title: err.message,