Explorar o código

订单收货方式显示

gcz %!s(int64=2) %!d(string=hai) anos
pai
achega
b7e536d668
Modificáronse 2 ficheiros con 21 adicións e 4 borrados
  1. 12 3
      shopping/order.vue
  2. 9 1
      shopping/orderdetails.vue

+ 12 - 3
shopping/order.vue

@@ -24,9 +24,10 @@
 						:class="item.class"
 						@click="goOrderDetails(item.id)" :key="item.id">
 						<view class="top u-flex u-row-between">
-							<text>
+							<view class="u-flex">
+								<view class="logisticsType">{{item.logisticsType|filterLogisticsType}}</view>
 								<text v-if="item.orderType==2">[积分]</text>订单号:{{item.orderNum||''}}
-							</text>
+							</view>
 							<text class="status">{{item.status|filterOrderState}}</text>
 						</view>
 						<view class="center" :key="goodsKey">
@@ -58,7 +59,6 @@
 							</view>
 						</view>
 						<view class="bottom">
-							<view class="" style="margin-bottom: 10rpx;">{{item.logisticsType|filterLogisticsType}}</view>
 							<view v-if="item.detailList.length>2" class="more" @click.stop="toggleMore(item,index)">
 								<text v-if="!item.showMore">查看剩余{{item.moreData.length}}件商品</text>
 								<text v-else>收起</text>
@@ -442,6 +442,15 @@ page{
 		color: #999999;
 		border-bottom: 0.5px solid #eee;
 		.status{font-size: 24rpx;}
+		.logisticsType{
+			background: #00A447;
+			border-radius: 4rpx;
+			color: #fff;
+			font-size: 22rpx;
+			font-weight: 400;
+			margin-right: 16rpx;
+			padding: 4rpx 10rpx;
+		}
 	}
 	.center{
 		margin-bottom: 20rpx;

+ 9 - 1
shopping/orderdetails.vue

@@ -132,7 +132,7 @@
 						¥ {{orderDetails.realPrice}}
 					</view>
 				</view>
-				<view class="total-item u-flex u-row-between" v-if="orderDetails.logisticsType!=1">
+				<view class="total-item u-flex u-row-between u-border-bottom" v-if="orderDetails.logisticsType!=1">
 					<view class="left">
 						运费
 						<!-- <text class="gray">总重:{{totalWeight}}</text> -->
@@ -142,6 +142,14 @@
 						<text v-else>免运费</text>
 					</view>
 				</view>
+				<view class="total-item u-flex u-row-between u-border-bottom">
+					<view class="left">
+						收货方式
+					</view>
+					<view class="right red">
+						{{orderDetails.logisticsType|filterLogisticsType}}
+					</view>
+				</view>
 			</view>
 			<view class="box order-info page-wrap" v-if="orderDetails.status>0">
 				<view class="order-info-item" v-for="(item,index) in orderInfo[orderDetails.status]" :key="index">