优化调整

center/center.vue

@@ -38,7 +38,13 @@
 			</view>
 		</view>
 		<view class="order-state">
-			<view class="title">我的订单</view>
+			<view class="title u-flex u-row-between">
+				<view class="left">订单中心</view>
+				<view class="right u-flex"  @click="$u.route('/shopping/order')">
+					全部订单
+					<u-icon name="arrow-right" color="#00A447" size="24rpx"></u-icon>
+				</view>
+			</view>
 			<view class="u-flex u-row-between">
 				<view class="state" @click="orderClick(item,index)" v-for="(item,index) in orderState" :key="index">
 					<view class="up">
@@ -90,9 +96,9 @@
 				payCodeImg:'https://cdn.uviewui.com/uview/album/1.jpg',
 				memberInfo:{},
 				orderState:[
-					{name:'全部订单',status:'',ico:this.$commonConfig.staticUrl+'/img/orderstateico-all.png'},
+					// {name:'全部订单',status:'',ico:this.$commonConfig.staticUrl+'/img/orderstateico-all.png'},
 					{name:'待付款',status:'0',ico:this.$commonConfig.staticUrl+'/img/orderstateico-01.png',badge:'noPayNum'},
-					// {name:'待发货',status:'1',ico:this.$commonConfig.staticUrl+'/img/orderstateico-01.png',badge:'noPayNum'},
+					{name:'待发货',status:'1',ico:this.$commonConfig.staticUrl+'/img/orderstateico-all.png',badge:'deliverNum'},
 					{name:'待收货',status:'2',ico:this.$commonConfig.staticUrl+'/img/orderstateico-02.png',badge:'collectNum'},
 					{name:'待评价',status:'3',ico:this.$commonConfig.staticUrl+'/img/orderstateico-03.png',badge:'commentNum'},
 					{name:'退款/售后',status:'7',ico:this.$commonConfig.staticUrl+'/img/orderstateico-04.png',badge:'refundNum'},
@@ -233,9 +239,15 @@ page{
 	}
 }
 .order-state{
-	.title{margin-bottom: 30rpx;}
+	.title{
+		margin-bottom: 30rpx;
+		.right{
+			font-size: 24rpx;
+			color: #00A447;
+		}
+	}
 	background-color: #fff;
-	padding: 30rpx;
+	padding: 20rpx;
 	margin: 0 20rpx 50rpx;
 	.state{
 		text-align: center;

shopping/order.vue

@@ -107,7 +107,7 @@
 				tabsList:[
 					{name:'全部',status:'',},
 					{name:'待付款',status:'0',badge:{isDot:false,value:null}},
-					{name:'待出库',status:'1',badge:{isDot:false,value:null}},
+					{name:'待发货',status:'1',badge:{isDot:false,value:null}},
 					{name:'待收货',status:'2',badge:{isDot:false,value:null}},
 					{name:'待评价',status:'3',badge:{isDot:false,value:null}},
 					{name:'退款/售后',status:'7',badge:{isDot:false,value:null}}

shopping/submitorder.vue

@@ -95,7 +95,7 @@
 			<view class="total-item u-flex u-row-between">
 				<view class="left">
 					运费
-					<text class="gray">总重：{{totalWeight}}</text>
+					<!-- <text class="gray">总重：{{totalWeight}}</text> -->
 				</view>
 				<view class="right red">
 					<text v-if="distribution.distributionPrice">+ ¥ {{distribution.distributionPrice}}</text>

utils/filter.js

@@ -38,7 +38,7 @@ Vue.filter("filterToFixed", function(val) {
 
 // 订单状态
 Vue.filter("filterOrderState", function(val) {	
-	let orderList = ['待支付', '待出库', '待收货', '待评论', '己取消', '己退款', '己完成', '退款中','退款失败']
+	let orderList = ['待支付', '待发货', '待收货', '待评论', '己取消', '己退款', '己完成', '退款中','退款失败']
 	return orderList[val]
 });