Merge branch 'master' of http://123.60.98.226:3000/chenkainan/flavorOfTimeSz

pages.json

@@ -29,7 +29,7 @@
 		{
 			"path": "pages/coupon/coupon",
 			"style": {
-				"navigationBarTitleText": "领取中心"
+				"navigationBarTitleText": "领券中心"
 			}
 		},
 		{

subPackages/line/index.vue

@@ -4,7 +4,7 @@
 			<image :src="showImg(item.headimg)" mode="aspectFill	"></image>
 			<view class="content flex-column">
 				<view>
-					<view class="title">{{item.title}}</view>
+					<view class="title text-overflowRows">{{item.title}}</view>
 					<view class="tags" v-if="item.display_tags">
 						<view class="tag" v-for="(tagItem,tagIndex) in item.display_tags.split(',').slice(0,2)" :key="tagIndex">
 							{{tagItem}}
@@ -68,14 +68,14 @@
 		
 		image {
 			width: 241rpx;
-			height: 295rpx;
+			height: 241rpx;
 			border-radius: 20rpx;
 			margin-right: 20rpx;
 			flex-shrink: 0;
 		}
 		
 		.content {
-			height: 295rpx;
+			height: 241rpx;
 			padding-top: 12rpx;
 			justify-content: space-between;
 			flex: 1;

subPackages/order/orderDetail.vue

@@ -83,6 +83,8 @@
 						</view>
 					</view>
 					
+					<view class="childStatus">{{item.state_text}}</view>
+					
 					<!-- 景点出行人 -->
 					<view style="margin-top: 30rpx;padding-top: 30rpx;border-top: 1rpx solid #D8D8D8;" v-if="item.product_model == 'ticket' && item.phone">
 						<view class="title">出行人</view>
@@ -107,6 +109,8 @@
 						</view>
 					</view>
 					
+					<view class="childStatus">{{item.state_text}}</view>
+					
 					<!-- 收货地址 -->
 					<view style="margin-top: 30rpx;padding-top: 30rpx;border-top: 1rpx solid #D8D8D8;" v-if="item.product_model == 'post' && !Array.isArray(item.consignee_info)">
 						<view class="title">收货信息</view>
@@ -115,7 +119,7 @@
 						</view>
 						<view class="subtitle"><span>{{item.consignee_info.address}}</span></view>
 						
-						<view class="mask-btn" @click="openMask(item)">快递查询</view>
+						<view class="mask-btn" @click="openMask(item)" v-if="item.state == 'WAIT_DELIVERY'">快递查询</view>
 					</view>
 					
 					<!-- 自提信息 -->
@@ -206,6 +210,8 @@
 						</view>
 					</view>
 					
+					<view class="childStatus">{{item.state_text}}</view>
+					
 					<!-- 酒店预订信息 -->
 					<view style="margin-top: 30rpx;padding-top: 30rpx;border-top: 1rpx solid #D8D8D8;" v-if="item.product_model == 'hotel'">
 						<view class="title">预订信息</view>
@@ -1246,4 +1252,11 @@
 	.express-item-icons {
 		background: #D3E8A7;
 	}
+	
+	.childStatus {
+		text-align: right;
+		font-size: 27rpx;
+		color: #6A8A27;
+		margin-top: 10rpx;
+	}
 </style>