From 5f3893fe77867bfa27150514caffdef76ec21157 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 16 Sep 2021 15:48:07 +0800
Subject: [PATCH] =?UTF-8?q?['=E6=88=91=E7=9A=84=E6=8F=90=E8=B4=A7=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=B9=B6=E9=80=80=E8=B4=A7=E5=8D=95=E5=BF=AB?=
 =?UTF-8?q?=E9=80=92=E5=8D=95=E8=87=AA=E6=8F=90=E5=8D=95']?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall-refunds-template.vue                 | 175 ++++
 .../mall-shipments-template.vue               | 171 ++++
 pages.json                                    |  36 +-
 pages/property/index.vue                      |   6 +-
 pages/property/order/logistics.vue            |   6 +-
 pages/property/order/mallRefundsInfo.vue      |   8 +-
 pages/property/order/mallShipments.vue        | 798 ++++++++++--------
 pages/property/order/mallShipmentsInfo.vue    |   9 +-
 pages/property/order/mallShipmentsRefund.vue  |  21 +-
 9 files changed, 861 insertions(+), 369 deletions(-)
 create mode 100644 components/mall-refunds-template/mall-refunds-template.vue
 create mode 100644 components/mall-shipments-template/mall-shipments-template.vue

diff --git a/components/mall-refunds-template/mall-refunds-template.vue b/components/mall-refunds-template/mall-refunds-template.vue
new file mode 100644
index 0000000..9b623c2
--- /dev/null
+++ b/components/mall-refunds-template/mall-refunds-template.vue
@@ -0,0 +1,175 @@
+<template>
+	<view class="MallRefundsTemplate">
+		<view class="top">
+			<view class="company">
+				<view class="company-logo">
+					<image :src="item.shop.cover" mode="aspectFill" />
+					<view class="name ellipsis">{{item.shop.name}}</view>
+				</view>
+				<view class="no ellipsis">退货单号： {{item.refund_no}}</view>
+			</view>
+			<view class="status" style="color:#ff5500;">{{item.state.text}}</view>
+		</view>
+		<view class="goods-info" @click="goDetail(item.goods_sku.goods_id)">
+			<image class="goods-img" :src="item.goods_sku.cover" mode="aspectFill" />
+			<view class="goods">
+				<view class="name">
+					<view class="name1 ellipsis-2">{{item.goods_sku.goods_name}}</view>
+					<!-- <span>￥{{item.account.balance}}</span> -->
+				</view>
+				<view class="sku">数权个数 <span>x {{item.qty}}</span> </view>
+				<!-- <view class="sku">提货方式 <span> {{item.type_text}}</span> </view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "MallRefundsTemplate",
+		data() {
+			return {
+
+			};
+		},
+		props: {
+			item: Object
+		},
+		methods: {
+			// 跳转到商品详情页面
+			goDetail(id) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?id=' + id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.MallRefundsTemplate{
+		position: relative;
+		z-index: 0;
+	}
+	// 顶部信息
+	.top {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding-bottom: 20rpx;
+		border-bottom: solid 1rpx #f7f7f7;
+		position: relative;
+		z-index: 0;
+
+		.company-logo {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			box-sizing: border-box;
+
+			image {
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 50%;
+				margin-right: 20rpx;
+			}
+
+			.name {
+				width: 460rpx;
+				font-size: 30rpx;
+				color: #484848;
+				font-weight: bold;
+			}
+		}
+
+
+		.no {
+			margin-top: 10rpx;
+			font-size: $title-size*0.8;
+			color: #999;
+			width: 500rpx;
+		}
+
+		.status {
+			color: #999;
+			font-size: $title-size*.9;
+			position: absolute;
+			top: 0;
+			right: 0;
+		}
+	}
+
+	// 商品信息
+	.goods-info {
+		display: flex;
+		flex-direction: row;
+		align-items: flex-start;
+		justify-content: flex-start;
+		box-sizing: border-box;
+		margin-top: 36rpx;
+
+		.goods-img {
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 10rpx;
+		}
+
+		.goods {
+			flex: 1;
+			margin-left: 20rpx;
+			margin-bottom: 10rpx;
+
+			.name {
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				align-items: flex-start;
+				justify-content: space-between;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				// font-weight: bold;
+
+				.name1 {
+					// width: 340rpx;
+
+				}
+
+				span {
+					font-size: 32rpx;
+					font-weight: normal;
+				}
+			}
+
+			.sku {
+				flex: 1;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				margin-top: 10rpx;
+				font-size: 28rpx;
+				color: #999;
+			}
+		}
+	}
+
+	.flexrow {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		width: 100%;
+
+		.copy {
+			color: $main-color;
+			font-size: $title-size*0.8;
+			font-weight: 400;
+			padding: 0 30rpx;
+		}
+	}
+</style>
diff --git a/components/mall-shipments-template/mall-shipments-template.vue b/components/mall-shipments-template/mall-shipments-template.vue
new file mode 100644
index 0000000..d8cfe95
--- /dev/null
+++ b/components/mall-shipments-template/mall-shipments-template.vue
@@ -0,0 +1,171 @@
+<template>
+  <view class="MallShipmentTemplate" >
+    <view class="top" >
+      <view class="company">
+        <view class="company-logo">
+          <image :src="item.shop.cover" mode="aspectFill" />
+          <view class="name ellipsis">{{item.shop.name}}</view>
+        </view>
+		 <view class="no ellipsis">发货单号： {{item.shipment_no}}</view>
+		 <!-- <view class="no ellipsis">创建时间： {{item.created_at}}</view> -->
+      </view>
+	  <view class="status" style="color:#DD524D;">{{item.state_text}}</view>
+    </view>
+    <view class="goods-info" @click="goDetail(item.goods_sku.goods_id)">
+      <image class="goods-img" :src="item.goods_sku.cover" mode="aspectFill" />
+      <view class="goods">
+        <view class="name">
+          <view class="name1 ellipsis-2">{{item.goods_sku.goods_name}}</view> 
+		  <!-- <span>￥{{item.account.balance}}</span> -->
+        </view>
+        <view class="sku">数权个数 <span>x {{item.qty}}</span> </view>
+        <view class="sku">提货方式 <span>  {{item.type_text}}</span> </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: "MallShipmentTemplate",
+    data() {
+      return {
+
+      };
+    },
+	props:{
+		item:Object
+	},
+    methods: {
+      // 跳转到商品详情页面
+      goDetail(id) {
+        uni.navigateTo({
+          url: '/pages/goods/detail?id='+id
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  // 顶部信息
+  .top {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding-bottom: 20rpx;
+    border-bottom: solid 1rpx #f7f7f7;
+	position: relative;
+	z-index: 0;
+	
+
+    .company-logo {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: flex-start;
+      box-sizing: border-box;
+
+      image {
+        width: 40rpx;
+        height: 40rpx;
+        border-radius: 50%;
+        margin-right: 20rpx;
+      }
+
+      .name {
+		width: 460rpx;
+        font-size: 30rpx;
+        color: #484848;
+        font-weight: bold;
+      }
+    }
+
+
+    .no {
+      margin-top: 10rpx;
+      font-size: $title-size*0.8;
+      color: #999;
+	  width: 530rpx;
+    }
+
+    .status {
+      color: #999;
+      font-size: $title-size*.9;
+	  position: absolute;
+	  top: 0;
+	  right: 0;
+    }
+  }
+
+  // 商品信息
+  .goods-info {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    justify-content: flex-start;
+    box-sizing: border-box;
+    margin-top: 36rpx;
+
+    .goods-img {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 10rpx;
+    }
+
+    .goods {
+      flex: 1;
+      margin-left: 20rpx;
+	margin-bottom: 10rpx;
+
+      .name {
+        width: 100%;
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+        justify-content: space-between;
+        box-sizing: border-box;
+        font-size: 30rpx;
+        // font-weight: bold;
+
+        .name1 {
+          // width: 340rpx;
+		  
+        }
+
+        span {
+          font-size: 32rpx;
+          font-weight: normal;
+        }
+      }
+
+      .sku {
+        flex: 1;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        margin-top: 10rpx;
+        font-size: 28rpx;
+        color: #999;
+      }
+    }
+  }
+  .flexrow{
+	  display: flex;
+	  flex-direction: row;
+	  align-items: center;
+	  justify-content: space-between;
+	  box-sizing: border-box;
+	  width: 100%;
+	  .copy{
+		  color: $main-color;
+			font-size: $title-size*0.8;
+		  font-weight: 400;
+		  padding: 0 30rpx;
+	  }
+  }
+</style>
diff --git a/pages.json b/pages.json
index 5f28bb9..c4bb810 100644
--- a/pages.json
+++ b/pages.json
@@ -67,7 +67,7 @@
 			"path": "pages/property/order/numberWeightInfo",
 			"name": "NumberWeightInfo",
 			"style": {
-				"navigationBarTitleText": "我的详情",
+				"navigationBarTitleText": "权证详情",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#e93340"
 			}
@@ -75,7 +75,39 @@
 			"path": "pages/property/order/mallShipments",
 			"name": "MallShipments",
 			"style": {
-				"navigationBarTitleText": "已提货列表",
+				"navigationBarTitleText": "已经提货",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		},{
+			"path": "pages/property/order/logistics",
+			"name": "Orderlogistics",
+			"style": {
+				"navigationBarTitleText": "查看物流",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		},{
+			"path": "pages/property/order/mallShipmentsInfo",
+			"name": "MallShipmentsInfo",
+			"style": {
+				"navigationBarTitleText": "提货单详情页面",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		},{
+			"path": "pages/property/order/mallRefundsInfo",
+			"name": "MallRefundsInfo",
+			"style": {
+				"navigationBarTitleText": "退货单详情",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		},{
+			"path": "pages/property/order/mallShipmentsRefund",
+			"name": "MallShipmentsRefund",
+			"style": {
+				"navigationBarTitleText": "申请退货",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#e93340"
 			}
diff --git a/pages/property/index.vue b/pages/property/index.vue
index c24c245..10f0b87 100644
--- a/pages/property/index.vue
+++ b/pages/property/index.vue
@@ -66,15 +66,15 @@
 						<view class="item-num">0</view>
 						<view class="item-title">权证持有</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'33'})">
 						<view class="item-num">0</view>
 						<view class="item-title">权证转让</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'334'})">
 						<view class="item-num">0</view>
 						<view class="item-title">已使用</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'MallShipments'})">
 						<view class="item-num">0</view>
 						<view class="item-title">已提货</view>
 					</view>
diff --git a/pages/property/order/logistics.vue b/pages/property/order/logistics.vue
index bdab6f9..67b4833 100644
--- a/pages/property/order/logistics.vue
+++ b/pages/property/order/logistics.vue
@@ -39,7 +39,7 @@
 			}
 		},
 		onLoad(e) {
-			this.no = e.no
+			this.no = this.$route.params.no
 			this.getLogistic(this.no)
 		},
 		methods: {
@@ -78,7 +78,7 @@
 
 	.LogisticsIndex {
 		font-size: $title-size;
-		color: $text-color-333;
+		color: #333;
 		margin-top: 20rpx;
 
 		// 物流名称
@@ -155,7 +155,7 @@
 						margin-left: 60rpx;
 						// padding: 10rpx 0;
 						font-size: $title-size * 0.9;
-						color: $text-color-666;
+						color: #666;
 						position: relative;
 						top: -10rpx;
 
diff --git a/pages/property/order/mallRefundsInfo.vue b/pages/property/order/mallRefundsInfo.vue
index 4b7f8f5..5155638 100644
--- a/pages/property/order/mallRefundsInfo.vue
+++ b/pages/property/order/mallRefundsInfo.vue
@@ -6,7 +6,7 @@
 				{{info.state.text}}
 				<span>{{info.state.remark}}</span>
 			</view>
-			<image src="/static/images/fire.png" mode="widthFix"></image>
+			<image src="/static/imgs/fire.png" mode="widthFix"></image>
 		</view>
 		<!-- 收货人 -->
 		<view class="acceptInfo" v-if="type === '2'">
@@ -109,8 +109,8 @@
 			};
 		},
 		onLoad(e) {
-			this.refund_id = e.no
-			this.getInfo(e.no)
+			this.refund_id = this.$route.params.no
+			this.getInfo(this.refund_id)
 		},
 		onShow() {
 			if (uni.getStorageSync('refresh')) {
@@ -693,7 +693,7 @@
 				margin-left: 60rpx;
 				// padding: 10rpx 0;
 				font-size: $title-size * 0.9;
-				color: $text-color-666;
+				color: #666;
 				position: relative;
 				top: -10rpx;
 
diff --git a/pages/property/order/mallShipments.vue b/pages/property/order/mallShipments.vue
index 37d865c..818b807 100644
--- a/pages/property/order/mallShipments.vue
+++ b/pages/property/order/mallShipments.vue
@@ -1,372 +1,486 @@
 <template>
-  <view class="NumberWeight">
-	  <!-- 订单分类 -->
-	  <view class="nav" >
-	    <view :class="['nav-item' ,selectNavId === item.id?'nav-item-selected':'']" v-for="(item,index) in navList"
-	      :key="index" @click="selectNav(item.id)">
-		  {{item.name}} 
-		  {{item.id ==='signed' && count.signed >0 ? '('+count.signed + ')':''}} 
-		  {{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
-		  {{item.id ==='init' && count.init >0 ?'('+count.init + ')':''}}
-		  {{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+	<view class="NumberWeight">
+		<!-- 订单分类 -->
+		<view class="nav">
+			<view :class="['nav-item' ,selectTypeId === item.id?'nav-item-selected':'']"
+				v-for="(item,index) in typeList" :key="index" @click="selectType(item.id,index)">
+				{{item.name}}
+				{{item.id ==='signed' && count.signed >0 ? '('+count.signed + ')':''}}
+				{{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+				{{item.id ==='init' && count.init >0 ?'('+count.init + ')':''}}
+				{{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+			</view>
 		</view>
-	  </view>
-	  
-    <!-- 有订单列表 -->
-    <block v-if="lists.length > 0">
-      <!-- 订单列表 -->
-      <view class="order-list" v-for="(item,index) in lists" :key="index">
-        <MallShipmentsTemplate :item="item" />
-        <view class="actions">
-          <view class="nowPay" @click="goDetail(item.shipment_no)" >查看详情</view>
-          <view v-if="item.can.cancel" @click="nowCancel(index,item.shipment_no)" class="nowPay">取消订单</view>
-          <view v-if="item.can.sign && type==='1'" @click="nowSign(index,item.shipment_no)" class="nowPay">确认签收</view>
-          <view v-if="item.can.refund" @click="nowRefund(item.shipment_no)" class="nowPay">申请退货</view>
-          <view v-if="item.can.logistic" @click="nowLogistics(item.shipment_no)" class="nowPay">查看物流</view>
-        </view>
-      </view>
-    </block>
-    <!-- 没有订单列表 -->
-    <no-list v-if="lists.length === 0" name='no-order' txt="暂无数据~" />
+		<!-- 快递点  自提单显示 -->
+		<scroll-view class="nav1" v-if='selectTypeIndex === 0 || selectTypeIndex === 1' scroll-x="true"	scroll-with-animation="true">
+			<view :class="['nav-item' ,state === it.id?'nav-item-selected':'']" v-for="(it,idx) in typeList[selectTypeIndex].categrery"
+				:key="idx" @click="selectNav(it.id)">
+				{{it.name}}
+				{{it.id ==='signed' && count.signed >0 ? '('+count.signed + ')':''}}
+				{{it.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+				{{it.id ==='init' && count.init >0 ?'('+count.init + ')':''}}
+				{{it.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+			</view>
+		</scroll-view>
+		<!--退货单 -->
+		<scroll-view class="nav1" v-else scroll-x="true" scroll-with-animation="true">
+			<view :class="['nav-item' ,state === it.id?'nav-item-selected':'']" v-for="(it,idx) in typeList[selectTypeIndex].categrery"
+				:key="idx" @click="selectNav(it.id)">
+				{{it.name}}
+				{{it.id ==='apply' && count.apply >0 ? '('+count.apply + ')':''}}
+				{{it.id ==='deliver' && count.deliver >0 ?'('+count.deliver + ')':''}}
+				{{it.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+				{{it.id ==='signed' && count.signed >0 ?'('+count.signed + ')':''}}
+				{{it.id ==='process' && count.process >0 ?'('+count.process + ')':''}}
+				{{it.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+			</view>
+		</scroll-view>
+
+		<!-- 有订单列表 -->
+		<block v-if="lists.length > 0">
+			<!-- 订单列表 -->
+			<view class="order-list" v-for="(item,index) in lists" :key="index" v-if='selectTypeIndex === 0 || selectTypeIndex === 1'>
+				<MallShipmentsTemplate :item="item" />
+				<view class="actions">
+					<view class="nowPay" @click="goDetail(item.shipment_no)">查看详情</view>
+					<view v-if="item.can.cancel" @click="nowCancel(index,item.shipment_no)" class="nowPay">取消订单</view>
+					<view v-if="item.can.sign" @click="nowSign(index,item.shipment_no)" class="nowPay">确认签收</view>
+					<view v-if="item.can.refund" @click="nowRefund(item.shipment_no)" class="nowPay">申请退货</view>
+					<view v-if="item.can.logistic" @click="nowLogistics(item.shipment_no)" class="nowPay">查看物流</view>
+				</view>
+			</view>
+			<!-- 有订单列表 -->
+			<view class="" v-if="selectTypeIndex === 2">
+			  <!-- 订单列表 -->
+			  <view class="order-list" v-for="(item,index) in lists" :key="index">
+			    <MallRefundsTemplate :item="item" />
+			    <view class="actions">
+			      <view @click="goDetail1(item.refund_id)" class="nowPay">查看详情</view>
+			    </view>
+			  </view>
+			</view>
+		</block>
 	
-	<!-- <u-toast ref="uToast" /> -->
-	<u-toast ref="uToast" />
-  </view>
+		<!-- 没有订单列表 -->
+		<no-list v-if="lists.length === 0" name='no-order' txt="暂无数据~" />
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
 </template>
 
 <script>
-  import { MallShipmentsTemplate } from '@/components/mall-shipments-template/mall-shipments-template'
-  import { mallShipmentsPostShop , mallShipmentsSign , mallShipmentsCancel } from '@/apis/interfaces/numberWeight'
-  export default {
-    components: {
-      MallShipmentsTemplate
-    },
-    data() {
-      return {
-        lists: [],
-		page:1,
-		total:0,
-		navList: [],
-		type:'',// post 快递单  空为自提单
-		selectNavId: 'init',
-		count:{},// 订单数量
-      };
-    },
-	onLoad(e) {
-		console.log(e.type)
-		this.type = e.type
-		if(e.type === 'post'){
-			this.navList = [
-				{
-				    name: '待发货',
-				    id: 'init'
-				  },
-				  {
-				    name: '已发货',
-				    id: 'delivered'
-				  },
-				  {
-				    name: '已签收',
-				    id: 'signed'
-				  },
-				  {
-				    name: '已完成',
-				    id: 'completed'
-				  }
-			]
-			uni.setNavigationBarTitle({
-				title:'我的快递单'
-			})
-			this.selectNavId = 'init'
-		}else{
-			this.navList = [
-				// {
-				// 	name: '待提货',
-				// 	id: 'init'
-				// },
-				{
-					name: '已提货',
-					id: 'signed'
-				},
-				{
-					name: '已完成',
-					id: 'completed'
-				}
-			]
-			this.selectNavId = 'signed'
-			uni.setNavigationBarTitle({
-				title:'我的提货单'
-			})
-		}
-		this.getList()
-	},
-	onShow(){
-		console.log(uni.getStorageSync('refresh'),'getStorageSync')
-		if(uni.getStorageSync('refresh')){
-			this.reset()
-		}
-	},
-	onUnload() {
-		uni.setStorageSync('refresh',false)
-	},
-	onReachBottom() {
-		if(this.total>this.lists.length){
-			this.page = this.page + 1
-			this.getList()
-		}else{
-			this.$refs.uToast.show({
-			  title: '吼吼吼~我是有底的~',
-			  type: 'error',icon:false,
-			  duration: 3000
-			})
-		}
-	},
-    methods: {
-		reset(){
-			this.page =1
-			this.total = 0
-			this.lists = []
-			this.getList()
-			uni.setStorageSync('refresh',false)
+	import MallShipmentsTemplate from '@/components/mall-shipments-template/mall-shipments-template'
+	import MallRefundsTemplate from '@/components/mall-refunds-template/mall-refunds-template'
+	import {
+		mallShipmentsPostShop,
+		mallShipmentsSign,
+		mallShipmentsCancel
+	} from '@/apis/interfaces/numberWeight'
+	export default {
+		components: {
+			MallShipmentsTemplate,MallRefundsTemplate
 		},
-		// 选择订单
-		selectNav(id) {
-		  if (this.selectNavId !== id) {
-		    this.selectNavId = id
-			this.reset()
-		  }
+		data() {
+			return {
+				lists: [],
+				page: 1,
+				total: 0,
+				navList: [],
+				count: {}, // 订单数量
+				typeList: [{
+						name: '快递单',
+						id: 'post',
+						categrery: [{
+								name: '待发货',
+								id: 'init'
+							},
+							{
+								name: '已发货',
+								id: 'delivered'
+							},
+							{
+								name: '已签收',
+								id: 'signed'
+							},
+							{
+								name: '已完成',
+								id: 'completed'
+							}
+						]
+					},
+					{
+						name: '自提单',
+						id: 'take',
+						categrery: [{
+								name: '已提货',
+								id: 'signed'
+							},
+							{
+								name: '已完成',
+								id: 'completed'
+							}
+						]
+					},
+					{
+						name: '退货单',
+						id: 'refund',
+						categrery: [{
+								name: '待审核',
+								id: 'apply'
+							}, {
+								name: '待返货',
+								id: 'deliver'
+							}, {
+								name: '待签收',
+								id: 'delivered'
+							}, {
+								name: '已签收',
+								id: 'signed'
+							},
+							{
+								name: '待退数权',
+								id: 'process'
+							},
+							{
+								name: '完成退货',
+								id: 'completed'
+							}
+						]
+					},
+				],
+				selectTypeId: 'post',
+				state: 'init',
+				selectTypeIndex: 0
+			};
 		},
-		// 获取订单列表
-		getList(){
-			let data = {
-				pageSize:4,
-				page:this.page,
-				state:this.selectNavId
+		onLoad(e) {
+			this.getList()
+		},
+		onShow() {
+			console.log(uni.getStorageSync('refresh'), 'getStorageSync')
+			if (uni.getStorageSync('refresh')) {
+				this.reset()
 			}
-			let apiUrl = ''
-			if(this.type === 'post'){
-				apiUrl = 'mall/shipments/post'
-			}else{
-				apiUrl = 'mall/shipments/shop'
-			}
-			mallShipmentsPostShop(apiUrl,data).then(res=>{
-				console.log(res.count)
-				this.count = res.count
-				this.lists = this.lists.concat(res.lists.data)
-				this.total = res.lists.page.total
-			}).catch(err=>{
+		},
+		onUnload() {
+			uni.setStorageSync('refresh', false)
+		},
+		onReachBottom() {
+			if (this.total > this.lists.length) {
+				this.page = this.page + 1
+				this.getList()
+			} else {
 				this.$refs.uToast.show({
-				  title: err.message,
-				  type: 'error',icon:false,
-				  duration: 3000
+					title: '吼吼吼~我是有底的~',
+					type: 'error',
+					icon: false,
+					duration: 3000
 				})
-			})
+			}
 		},
-		// 取消提货单
-		nowCancel(index,no){
-			console.log(index,no)
-			uni.showModal({
-			    title: '哎呦，提醒你',
-			    content: '是否确认要取消订单啊，取消后请去我的数权中查看',
-			    success:  (res) =>{
-			        if (res.confirm) {
-			            mallShipmentsCancel(no).then(res=>{
-			            	console.log(res)
-							this.$refs.uToast.show({
-							  title:res,
-							  type: 'error',icon:false,
-							  duration: 3000
+		methods: {
+			reset() {
+				this.page = 1
+				this.total = 0
+				this.lists = []
+				this.getList()
+				uni.setStorageSync('refresh', false)
+			},
+			// 选择状态
+			selectNav(id) {
+				if (this.state !== id) {
+					this.state = id
+					this.reset()
+				}
+			},
+			// 快递单post 提货单 take 退货单refund
+			selectType(id,index) {
+				console.log('id：' + id)
+				if (this.selectTypeId !== id) {
+					this.state = this.typeList[index].categrery[0].id
+					this.selectTypeId = id
+					this.selectTypeIndex = index
+					this.reset()
+				}
+			},
+			// 获取订单列表
+			getList() {
+				let data = {
+					pageSize: 4,
+					page: this.page,
+					state: this.state
+				}
+				let apiUrl = ''
+				if (this.selectTypeId === 'post') {
+					apiUrl = 'mall/shipments/post'
+				} else if(this.selectTypeId === 'take') {
+					apiUrl = 'mall/shipments/shop'
+				} else if(this.selectTypeId === 'refund') {
+					apiUrl = 'mall/refunds'
+				}
+				mallShipmentsPostShop(apiUrl, data).then(res => {
+					console.log(res.count)
+					this.count = res.count
+					this.lists = this.lists.concat(res.lists.data)
+					this.total = res.lists.page.total
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon: false,
+						duration: 3000
+					})
+				})
+			},
+			// 取消提货单
+			nowCancel(index, no) {
+				console.log(index, no)
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+					success: (res) => {
+						if (res.confirm) {
+							mallShipmentsCancel(no).then(res => {
+								console.log(res)
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+								this.lists.splice(index, 1)
+								this.total = this.total - 1
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
 							})
-			            	this.lists.splice(index,1)
-			            	this.total = this.total - 1
-			            }).catch(err=>{
-			            	this.$refs.uToast.show({
-			            	  title: err.message,
-			            	  type: 'error',icon:false,
-			            	  duration: 3000
-			            	})
-			            })
-			        } else if (res.cancel) {
-						this.$refs.uToast.show({
-						  title:'放弃了~',
-						  type: 'error',icon:false,
-						  duration: 3000
-						})
-			        }
-			    }
-			});
-		
-		},
-		// 签收提货单
-		nowSign(index,no){
-			console.log(index,no)
-			uni.showModal({
-			    title: '哎呦，提醒你',
-			    content: '是否确认已经收到商品了呀',
-			    success:  (res) =>{
-			        if (res.confirm) {
-						console.log(no)
-			            mallShipmentsSign(no).then(res=>{
-			            	console.log(res)
+						} else if (res.cancel) {
 							this.$refs.uToast.show({
-							  title:res,
-							  type: 'error',icon:false,
-							  duration: 3000
+								title: '放弃了~',
+								type: 'error',
+								icon: false,
+								duration: 3000
 							})
-			            	this.lists.splice(index,1)
-			            	this.total = this.total - 1
-			            }).catch(err=>{
-			            	this.$refs.uToast.show({
-			            	  title: err.message,
-			            	  type: 'error',icon:false,
-			            	  duration: 3000
-			            	})
-			            })
-			        
-					} else if (res.cancel) {
-						this.$refs.uToast.show({
-						  title:'放弃了~',
-						  type: 'error',icon:false,
-						  duration: 3000
-						})
-			        }
-			    }
-			});
-		},
-		
-		// 申请退货
-		nowRefund(no){
-			this.$Router.push({
-			  name: 'MallShipmentsRefund',
-			  params:{
-				  no:no
-			  }
-			})
-		},
-		// 查看物流
-		nowLogistics(no){
-			this.$Router.push({
-			  name: 'Orderlogistics',
-			  params:{
-				  no:no
-			  }
-			})
-		},
-		// 查看详情
-		goDetail(no){
-			this.$Router.push({
-			  name: 'MallShipmentsInfo',
-			  params:{
-				  no:no
-			  }
-			})
+						}
+					}
+				});
+
+			},
+			// 签收提货单
+			nowSign(index, no) {
+				console.log(index, no)
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '是否确认已经收到商品了呀',
+					success: (res) => {
+						if (res.confirm) {
+							console.log(no)
+							mallShipmentsSign(no).then(res => {
+								console.log(res)
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+								this.lists.splice(index, 1)
+								this.total = this.total - 1
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+							})
+
+						} else if (res.cancel) {
+							this.$refs.uToast.show({
+								title: '放弃了~',
+								type: 'error',
+								icon: false,
+								duration: 3000
+							})
+						}
+					}
+				});
+			},
+
+			// 申请退货
+			nowRefund(no) {
+				this.$Router.push({
+					name: 'MallShipmentsRefund',
+					params: {
+						no: no
+					}
+				})
+			},
+			// 查看物流
+			nowLogistics(no) {
+				this.$Router.push({
+					name: 'Orderlogistics',
+					params: {
+						no: no
+					}
+				})
+			},
+			// 查看详情
+			goDetail(no) {
+				this.$Router.push({
+					name: 'MallShipmentsInfo',
+					params: {
+						no: no
+					}
+				})
+			},
+			// 查看退货单详情
+			// 查看详情
+			goDetail1(no){
+				this.$Router.push({
+				  name: 'MallRefundsInfo',
+				  params:{
+					  no:no
+				  }
+				})
+			}
+			
 		}
-    }
-  }
+	}
 </script>
 
 <style lang="scss" scoped>
-  page {
-    width: 100%;
-    height: 100%;
-  }
+	page {
+		width: 100%;
+		height: 100%;
+	}
 
-  .NumberWeight {
-    width: 100%;
-    min-height: 100vh;
-    box-sizing: border-box;
-    background-color: #F7F7F7;
+	.NumberWeight {
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		background-color: #F7F7F7;
 
-    // 订单nav
-    .nav {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: space-around;
-      box-sizing: border-box;
-      font-size: $title-size*0.95;
-      padding: 0 30rpx;
-      background-color: #fff;
-      color: #666;
-      border-top: solid 20rpx #f7f7f7;
-	  position: sticky;
-	  top: 0rpx;
-	  z-index: 10000;
+		// 订单nav
+		.nav {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-around;
+			box-sizing: border-box;
+			font-size: $title-size*0.95;
+			padding: 0 30rpx;
+			background-color: #fff;
+			color: #666;
+			border-top: solid 20rpx #f7f7f7;
+			position: sticky;
+			top: 0rpx;
+			z-index: 10000;
 
-      .nav-item {
-        border-bottom: solid 4rpx #fff;
-        padding: 30rpx 10rpx;
-      }
+			.nav-item {
+				border-bottom: solid 4rpx #fff;
+				padding: 30rpx 10rpx;
+			}
 
-      .nav-item-selected {
-        border-bottom: solid 4rpx $main-color;
-        color: $main-color;
-      }
-    }
+			.nav-item-selected {
+				border-bottom: solid 4rpx $main-color;
+				color: $main-color;
+			}
+		}
+		
+		.nav1 {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			box-sizing: border-box;
+			white-space: nowrap;
+			font-size: $title-size*0.95;
+			padding:30rpx 30rpx 20rpx 30rpx;
+			color: #666;
+			position: sticky;
+			top: 120rpx;
+			z-index: 10000;
+			background-color: #f7f7f7;
+		
+			.nav-item {
+				display: inline-block;
+				padding-right: 30rpx;
+			}
+		
+			.nav-item-selected {
+				color: $main-color;
+			}
+		}
 
-    // 订单列表
-    .order-list {
-      background-color: #fff;
-      border-radius: 20rpx;
-      min-height: 300rpx;
-      margin: 30rpx 20rpx 0 20rpx;
-      padding:30rpx 30rpx 20rpx 30rpx ;
-	  // border-top: solid 4rpx #cacaca;
+		// 订单列表
+		.order-list {
+			background-color: #fff;
+			border-radius: 20rpx;
+			min-height: 300rpx;
+			margin: 30rpx 20rpx 0 20rpx;
+			padding: 30rpx 30rpx 20rpx 30rpx;
+			// border-top: solid 4rpx #cacaca;
 
-      // 操作信息
-      .actions {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: flex-end;
-        box-sizing: border-box;
-        flex-wrap: wrap;
-        flex: 1;
-        font-size: 28rpx;
-        color: #fff;
-		border-top: solid 1rpx #EFF4F2;
-        .nowPay {
-          padding: 4rpx 20rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-          // background-color: $main-color;
-		  color: #999;
-		  border:solid 1rpx #cacaca;
-        }
+			// 操作信息
+			.actions {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-end;
+				box-sizing: border-box;
+				flex-wrap: wrap;
+				flex: 1;
+				font-size: 28rpx;
+				color: #fff;
+				border-top: solid 1rpx #EFF4F2;
 
-        .cancelOrder {
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-          background-color: #DD524D;
-        }
+				.nowPay {
+					padding: 4rpx 20rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+					// background-color: $main-color;
+					color: #999;
+					border: solid 1rpx #cacaca;
+				}
 
-        .logistics {
-          background-color: $main-color;
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-        }
+				.cancelOrder {
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+					background-color: #DD524D;
+				}
 
-        .sign {
-          background-color: #DD524D;
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-        }
+				.logistics {
+					background-color: $main-color;
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+				}
 
-        .evaluate {
-          background-color: $main-color;
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-        }
-      }
-    }
-  }
+				.sign {
+					background-color: #DD524D;
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+				}
+
+				.evaluate {
+					background-color: $main-color;
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+				}
+			}
+		}
+	}
 </style>
diff --git a/pages/property/order/mallShipmentsInfo.vue b/pages/property/order/mallShipmentsInfo.vue
index 309582c..a7fbf2d 100644
--- a/pages/property/order/mallShipmentsInfo.vue
+++ b/pages/property/order/mallShipmentsInfo.vue
@@ -6,7 +6,7 @@
         {{info.state_text}}
         <span>您的快递正在坐着火箭朝您飞来</span>
       </view>
-      <image src="/static/images/fire.png" mode="widthFix"></image>
+      <image src="/static/imgs/fire.png" mode="widthFix"></image>
     </view>
     <!-- 收货人 -->
     <view class="acceptInfo" v-if="type === '1'" >
@@ -109,11 +109,8 @@
       };
     },
 	onLoad(e) {
-		console.log(e)
-		this.shipment_no = e.no
-		this.getInfo(e.no)
-		console.log(this.shipment_no)
-		// this.getInfo('2021081817410747800300000004')
+		this.shipment_no = this.$route.params.no
+		this.getInfo(this.$route.params.no)
 	},
 	onShow() {
 		if(uni.getStorageSync('refresh')){
diff --git a/pages/property/order/mallShipmentsRefund.vue b/pages/property/order/mallShipmentsRefund.vue
index 9962d78..0a5cafe 100644
--- a/pages/property/order/mallShipmentsRefund.vue
+++ b/pages/property/order/mallShipmentsRefund.vue
@@ -25,7 +25,7 @@
 			<view class="list-right-img">
 				<view class="upImg" v-for="(item,index) in pictures.showpath">
 					<image @click="priviewImg(index)" mode="aspectFill" :src="item" />
-					<u-icon name="close" @click='closeImg(index)' />
+					<u-icon name="close" @click='closeImg(index)' class='closeImg' />
 				</view>
 				<view class="addImg" @click="updImgs">
 					<u-icon name="plus" label='上传图片' label-pos='bottom' size='50' margin-bottom='10' color='#606266'
@@ -78,8 +78,8 @@
 			};
 		},
 		onLoad(e) {
-			this.shipment_no = e.no
-			this.getInfo(e.no)
+			this.shipment_no = this.$route.params.no
+			this.getInfo(this.shipment_no)
 		},
 		methods: {
 			// 预览上传图片
@@ -215,13 +215,13 @@
 	page {
 		width: 100%;
 		height: 100%;
-		background-color: #f7f7f7;
+		background-color: #fff;
 	}
 
 	// 
 	.mes-des {
-		background-color: rgba($color: #00aaff, $alpha: .2);
-		color: #5555ff;
+		background-color: rgba($color: #ff0000, $alpha: .1);
+		color: #ff0000;
 		text-shadow: 0 0 6rpx rgba($color: #000000, $alpha:.1);
 		padding: 32rpx;
 		text-align: center;
@@ -267,6 +267,10 @@
 			width: 100%;
 			margin-top: 30rpx;
 		}
+		.list-right {
+			width: 100%;
+			margin-top: 30rpx;
+		}
 	}
 
 	.list {
@@ -313,12 +317,11 @@
 					height: 100%;
 				}
 
-				u-icon {
+				.closeImg {
 					position: absolute;
 					top: 0;
 					right: 0;
-					z-index: 1000;
-					background-color: red;
+					z-index: 1;
 					padding: 20rpx;
 				}
 			}