From cdb19ff8081828ba626cbb2cbcea9d987173c223 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 7 May 2024 13:46:42 +0800
Subject: [PATCH] uu

---
 components/tpx-text-dic/tpx-text-dic.vue |  44 +++++++++++++++++++++++
 pages/tabBar/order/order.vue             |  41 ++++++++++++---------
 static/images/post/toline-grey.png       | Bin 0 -> 900 bytes
 static/images/post/toline.png            | Bin 0 -> 934 bytes
 4 files changed, 68 insertions(+), 17 deletions(-)
 create mode 100644 components/tpx-text-dic/tpx-text-dic.vue
 create mode 100644 static/images/post/toline-grey.png
 create mode 100644 static/images/post/toline.png

diff --git a/components/tpx-text-dic/tpx-text-dic.vue b/components/tpx-text-dic/tpx-text-dic.vue
new file mode 100644
index 0000000..14d2c21
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/pages/tabBar/order/order.vue b/pages/tabBar/order/order.vue
index 0c58714..95c234d 100644
--- a/pages/tabBar/order/order.vue
+++ b/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">
-										<u-row @click="handleDealItem(orItem, { type: 2 })">
+									<view>
+										<u-row @click="handleDealItem(item, { type: 2 })">
 											<view>
-												<u-text v-if="orItem.billCode" :text="'运单号：' + orItem.billCode" size="26"></u-text>
-												<u-text v-else :text="'订单号：'+ orItem.orderSn" size="26"></u-text>
+												<u-text v-if="item.billCode" :text="'运单号：' + item.billCode" 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="'张三'" size="26" color="#999" margin="20rpx 0 0 0"
+										<u-text :text="item.sendCountryName + item.sendProvinceName" size="30" :bold="true" align="center"></u-text>
+										<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') -->
-										<u-text :text="'待付款'" align="center" size="22" margin="10rpx 0 0 0"></u-text>
+										<!-- getCdnUrl('post/toline-grey.png') -->
+										<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="'李四'" size="26" color="#999" margin="20rpx 0 0 0"
+										<u-text :text="item.receiveCountryName + item.receiveProvinceName" size="30" :bold="true" align="center"></u-text>
+										<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() {
-			this.queryOption = queryOption
+		onLoad(option) {
+			this.queryOption = option
 			this.initData();
 		},
 		onUnload() {
diff --git a/static/images/post/toline-grey.png b/static/images/post/toline-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..a793232c593034af1b2f4c7f5d3399c41e1f8753
GIT binary patch
literal 900
zcmV-~1AF|5P)<h;3K|Lk000e1NJLTq004jh000^Y1^@s6f5TMn00001b5ch_0Itp)
z=>Px&K1oDDRA@u(T2E{YQ5^o>j4qKB7tsh8Aw=TjKsElfQGX64NJu0?o9?`)O)7Cw
zPTNT8PvYXRJ8vfIARKI>apF*f5+xi&LI@6mI1sx<(b}D#Oj9DwZs)a~-EQN}b-v&C
z`+nd1GV|u`GU%&p9f-wZ)2gbf+8JZb02TsxMntEC5EsG{&B7wmJmEVar92N{UmoTT
z&Uq}1jyeEgxL5=Z*L7EVp7&@J>LZ-<(-Up2129nsi&QVA<N)jd`a_)avlEe^127Ty
zidgG7&Tb;Q6wrc*C@O?Vj#r8fz<8Z2a$Pc+tjuP!uK~;rXq97(?YAuJ;&>$K0F1}A
z64kh_TjzP+H2@KX5bUum>+)Eo=>Uw?u@d7Q$Js_iT>#90)`LW}LkMwoEE079#^Tl_
zVI9XgKt$&N1g+N(B5Dvq+)$MoM5xN6aYc5(w(Y}=u`>#7z603IIlrrb4NQ~@hsKo1
z0o%4a8DmEk+VwHU>MhH97=+bNfFOs;?7oyT4&b1Itj~sF)JCJxC!=9?02G`oCrB!l
zGSlg_e?+`jLDxqB>p17n3t@Et6kIGfNGg?zq|@mu0JbV<duN(vZF6(;t9)1;00jrj
z5hA6W37{Lm8U=lCvf1p~*4EayBe6OF3htFFL`pduz#RZ96g2uz0RMIH;a{u{fP!=7
z3~^m|p67Y~C*NWPolh$&Dr%dWn*6=N(4_;Q;99vu;_>(*(==}bSfHTwaU>F{ZES4J
z{0)F@+e;W@Cjo36Cb&*S?Lvr`qY;+6&exJiBsLg^QNtLkR2cTZfe_Jh01b)*KNuJo
z*woh6_Jzgc@uj9|-Ul#eL~$mU%dKu{X?c;4wA6L}&Nq|Eq=;y{;*c6Px&uA^{ry{*
zl+ynNX=ed!7w3FezI&5UcLG4WUe!<?IPM3a55TMfwBI=Ac^|ctQ1>3d{7}c&WS^!|
z0Dc0PuGcJ72YyYZSHLX*>q8x1llAxkSO%as-zE@1b)j?QQr9ICi5kN&ZYumcMlY+H
z1B0ID)eW5k4DaYW0n`uIcIR@rV}-r|{_vN&PD;57fWH~61~5ZyPK_Gjz*i!=2cSa;
a(fb=*+G;WSbsj?i0000<MNUMnLSTaX$(4fu

literal 0
HcmV?d00001

diff --git a/static/images/post/toline.png b/static/images/post/toline.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f61875702c2bf0fa84d786c905f357e395d5044
GIT binary patch
literal 934
zcmV;X16lluP)<h;3K|Lk000e1NJLTq004jh000^Y1^@s6f5TMn00001b5ch_0Itp)
z=>Px&U`a$lRA@u(T1jYAQ4~G*MH>;PjR>L}Q8WG^bm4^BiZdj?Ra6i}7mBzN+*n;H
zf)luLA#QXby0D=3x1tN@0jnrjGqxHRq9Wpe6ArC;S6UPt(!AI9Cr0xA_MLm~x#u1J
ze=me!p0ah|a!t*k_pe_xFku}r#xsy6roDDDeatP<<Q9?Pao>TaNZ=?jR{zCJw8M_4
zx4Y5N1i%d!i@<T(@>dJc-2&8G>_leYKwFyt4Aj9Q)i+te4Fo<^h@P1?)g{vh1|q=(
zU?A=lv9>uJT*1UA6fKw->to5x;r>c70qC!DMXqyvzTv16j{uBTw8{ar#!jS<_eYWm
zK!02-QB89sG?!VP15l+30THi^#oJHzRhkJvUmYtk-id@_V0j9FN71^If%>{c=4@Xi
zngI00t$&1Vw)|@ubOeBEzdj41Xf&R_s4G=PsLNw;MRvfk{F?#VuhHfc30fGtpT41i
zRVGS@!(d9}fD;Ms0`pdlcJD}v`LR^$jtXnu04j&dY~2Y54uY^zC5wPJ%(B)_cEk%|
zO#oC*mf3paa(ITc2ahs%m4>vJ0=e1I#Dn(UuqFT+E|wdlF%+uu3fTl;v058Hh4j?g
zsZ=%})&xN9U|Awss;h^}&QIq7%uoqr!edC!th!|K$)8vg0F`@Xyxv$nVWhXydmVtK
zAv62!8)h%dWS;+uH386YuACuGI6MZF>%Q_$)X<q4JgBR7$-V5$pI8$B4cE#Ya>klG
zAqR04pm9pAgf=O>we@XnZ@aNQ0ce>Lm?S0kfHAL!fN((wG(_7n4+{~Nx~^Nx>9D_s
z1kD6vxN_JE0tluc6Gt^izCHMJ*McS4?0a$|J|9@z0x;^2;<q3<&5n0;<RdM0-H(%R
zBLG`-NCPYEz_qW#J}e?95;zIQ(!5y0DLbB7mOlWct!uV|yBXYIcGXn}c9LTS-T@fV
z3++cck;(h2{Ref=0E~5Y{7NTdy!xL4@CAUk()Y~e`Mds`Pk>_ut^k<hvH_J&ca2)C
z$$kk>YraFEKyG?(zay8r&I$QuLWoNm|Bk8jP1T*h6H?CYxd!%}=plB2G5^Ok@H`;5
z^>zdJ*`d^RO_AVK0(OIWI)EX%lN#J_4txO9O+j);G|}Gr9pn3LvyBR|qW}N^07*qo
IM6N<$g1s-SK>z>%

literal 0
HcmV?d00001