uu

components/tpx-text-dic/tpx-text-dic.vue

@@ -0,0 +1,44 @@
+<template>
+	<text>{{title}}</text>
+</template>
+
+<script>
+	export default {
+		computed: {
+			title() {
+				let title = this.value
+				!this.value && this.list && (title = '-');
+				if(this.value && this.list) {
+					title = this.list.filter(t=> t.val == this.value || this.value.indexOf(t.val) > -1).map(t=> t.title).join(",")
+				}
+				return title
+			}
+		},
+		props: {
+			value: {
+			},
+			list: {
+			},
+		},
+		data() {
+			return {
+
+			}
+		},
+		created() {
+
+		},
+		onHide() {
+
+		},
+		unmounted() {},
+		
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	
+</style>

pages/tabBar/order/order.vue

@@ -71,36 +71,41 @@
 					>
 						<view class="pgb-cont">
 							<!-- 列表数据 -->
-							<view v-for="(orItem) in resData.list" class="ord-list-item">
+							<view v-for="(item) in resData.list" class="ord-list-item">
 								<u-row justify="between">
-									<u-col span="11">
+									<view>
-										<u-row @click="handleDealItem(orItem, { type: 2 })">
+										<u-row @click="handleDealItem(item, { type: 2 })">
 											<view>
-												<u-text v-if="orItem.billCode" :text="'运单号：' + orItem.billCode" size="26"></u-text>
+												<u-text v-if="item.billCode" :text="'运单号：' + item.billCode" size="26"></u-text>
-												<u-text v-else :text="'订单号：'+ orItem.orderSn" size="26"></u-text>
+												<u-text v-else :text="'订单号：'+ item.orderSn" size="26"></u-text>
 											</view>
 											<view class="pl-10">
 												<u-icon name="file-text" size="32" custom-style=""></u-icon>
 											</view>
 										</u-row>
-									</u-col>
+									</view>
+									<view style="text-align: right;">
+										<tpx-text-dic :value="item.orderStatus" :list="dicData.emis_order_status" ></tpx-text-dic>
+									</view>
 								</u-row>
 						
-								<u-row @click="handleDealItem(orItem, { type: 1 })" custom-style="margin-top: 30rpx;" justify="center">
+								<u-row @click="handleDealItem(item, { type: 1 })" custom-style="margin-top: 30rpx;" justify="center">
 									<u-col span="4">
-										<u-text :text="'中国上海'" size="30" :bold="true" align="center"></u-text>
+										<u-text :text="item.sendCountryName + item.sendProvinceName" size="30" :bold="true" align="center"></u-text>
-										<u-text :text="'张三'" size="26" color="#999" margin="20rpx 0 0 0"
+										<u-text :text="item.sendName" size="26" color="#999" margin="20rpx 0 0 0"
 											align="center"></u-text>
 									</u-col>
 									<u-col span="4" justify="center" align="center" custom-style="text-align: center;">
-										<image style="width: 70rpx;height: 14rpx;" :src="getCdnUrl('search/toline.png')">
+										<image style="width: 70rpx;height: 14rpx;" :src="getCdnUrl('post/toline.png')">
 										</image>
-										<!-- getCdnUrl('search/toline-grey.png') -->
+										<!-- getCdnUrl('post/toline-grey.png') -->
-										<u-text :text="'待付款'" align="center" size="22" margin="10rpx 0 0 0"></u-text>
+										<view class="mt-10">
+											<tpx-text-dic :value="item.waybillStatus" :list="dicData.emis_waybill_status" ></tpx-text-dic>
+										</view>
 									</u-col>
 									<u-col span="4">
-										<u-text :text="'越南'" size="30" :bold="true" align="center"></u-text>
+										<u-text :text="item.receiveCountryName + item.receiveProvinceName" size="30" :bold="true" align="center"></u-text>
-										<u-text :text="'李四'" size="26" color="#999" margin="20rpx 0 0 0"
+										<u-text :text="item.receiveName" size="26" color="#999" margin="20rpx 0 0 0"
 											align="center"></u-text>
 									</u-col>
 								</u-row>
@@ -141,7 +146,9 @@
 			// }
 		},
 		computed: {
-			
+			dicData() {
+			  return this.$store.getters.dicData
+			},
 		},
 		data() {
 			return {
@@ -163,8 +170,8 @@
 				// path: 'TODO'
 			}
 		},
-		onLoad() {
+		onLoad(option) {
-			this.queryOption = queryOption
+			this.queryOption = option
 			this.initData();
 		},
 		onUnload() {