From 3f0340dfb0674a29ae5858c2c9f38fdcb96be543 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 23 May 2024 16:37:07 +0800
Subject: [PATCH] uu

---
 .../bpd-send-reciever-tmp.vue                 | 106 +++++++
 pages/post/locus.vue                          |  41 +--
 pages/tabBar/mine/mine.vue                    |   7 +-
 pages/tabBar/order/order.vue                  |  45 +--
 pages/user/bunsStatic.vue                     | 103 +++----
 pages/user/exclusiveQrcode.vue                |   6 +-
 pages/user/withdraw.vue                       | 270 +++++++++---------
 store/modules/user.js                         |   4 +
 8 files changed, 314 insertions(+), 268 deletions(-)
 create mode 100644 components/buns-post-detail-templates/bpd-send-reciever-tmp.vue

diff --git a/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue b/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue
new file mode 100644
index 0000000..0a3da12
--- /dev/null
+++ b/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue
@@ -0,0 +1,106 @@
+<template>
+	<u-row justify="between">
+		<u-row @click="setClipboardData(modelInfo.billCode)">
+			<view>
+				<u-text :text="`运单号：${modelInfo.billCode}` " size="26"></u-text>
+			</view>
+			<view class="pl-10">
+				<u-icon name="file-text" size="32" custom-style=""></u-icon>
+			</view>
+		</u-row>
+		<view>
+			<view v-if="showInfoBtn" @click="goto(`post/detail?billCode=${modelInfo.billCode}`)" class="com-tag-grey">
+				运单信息
+			</view>
+			<tpx-text-dic v-if="!showInfoBtn" :value="modelInfo.orderStatus" :list="dicData.emis_order_status" ></tpx-text-dic>
+		</view>
+	</u-row>
+	
+	<view @click="goto(`post/detail?billCode=${modelInfo.billCode}`)">
+		<u-row custom-style="margin-top: 30rpx;" justify="center">
+			<u-col span="4">
+				<u-text :text="(sender.countryName + sender.provinceName)||'-'" size="30" :bold="true" align="center"></u-text>
+				<u-text :text="sender.name" 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('post/toline.png')">
+				</image>
+				<!-- getCdnUrl('post/toline-grey.png') -->
+				<view>
+					<tpx-text-dic :value="modelInfo.waybillStatus" :list="dicData.emis_waybill_status" ></tpx-text-dic>
+				</view>
+			</u-col>
+			<u-col span="4">
+				<u-text :text="(reciever.countryName + reciever.provinceName)||'-'" size="30" :bold="true" align="center"></u-text>
+				<u-text :text="reciever.name" size="26" color="#999" margin="20rpx 0 0 0"
+					align="center"></u-text>
+			</u-col>
+		</u-row>
+						
+		<u-text :text="`下单时间：${modelInfo.sendDate}`" color="#999" size="24"
+			margin="30rpx 0 0 0"></u-text>
+	</view>				
+	
+</template>
+
+<script>
+	export default {
+		computed: {
+			modelInfo: {
+				get() {
+					return this.value
+				}
+			},
+			sender() {
+				let obj = JSON.parse(JSON.stringify(this.value?.sender || this.value || {}))
+				obj.countryName = obj.sendCountryName || obj.countryName
+				obj.provinceName = obj.sendProvinceName ||  obj.provinceName
+				obj.name = obj.sendName || obj.name
+				return obj
+			},
+			reciever() {
+				let obj = JSON.parse(JSON.stringify(this.value?.reciever || this.value || {}))
+				obj.countryName = obj.receiveCountryName || obj.countryName
+				obj.provinceName =  obj.receiveProvinceName || obj.provinceName
+				obj.name = obj.receiveName || obj.name
+				return obj
+			},
+			dicData() {
+				return this.$store.getters.dicData
+			}
+		},
+		props: {
+			value: {
+				default () {
+					return {}
+				}
+			},
+			showInfoBtn: {
+				default () {
+					return true
+				}
+			},
+		},
+		data() {
+			return {}
+		},
+		created() {
+
+		},
+		onHide() {
+
+		},
+		unmounted() {
+
+		},
+
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	
+</style>
\ No newline at end of file
diff --git a/pages/post/locus.vue b/pages/post/locus.vue
index e65081a..c44edba 100644
--- a/pages/post/locus.vue
+++ b/pages/post/locus.vue
@@ -10,43 +10,7 @@
 						></map>
 						 
 						<view class="mp-address-mask">
-							<u-row justify="between">
-								<u-row @click="setClipboardData(modelInfo.billCode)">
-									<view>
-										<u-text :text="`运单号：${modelInfo.billCode}` " size="26"></u-text>
-									</view>
-									<view class="pl-10">
-										<u-icon name="file-text" size="32" custom-style=""></u-icon>
-									</view>
-								</u-row>
-								<view @click="goto(`post/detail?billCode=${modelInfo.billCode}`)" class="com-tag-grey">
-									运单信息
-								</view>
-							</u-row>
-											
-							<u-row v-if="modelInfo.reciever" custom-style="margin-top: 30rpx;" justify="center">
-								<u-col span="4">
-									<u-text :text="(modelInfo.sender.countryName + modelInfo.sender.provinceName)||'-'" size="30" :bold="true" align="center"></u-text>
-									<u-text :text="modelInfo.sender.name" 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('post/toline.png')">
-									</image>
-									<!-- getCdnUrl('post/toline-grey.png') -->
-									<view>
-										<tpx-text-dic :value="modelInfo.waybillStatus" :list="dicData.emis_waybill_status" ></tpx-text-dic>
-									</view>
-								</u-col>
-								<u-col span="4">
-									<u-text :text="(modelInfo.reciever.countryName + modelInfo.reciever.provinceName)||'-'" size="30" :bold="true" align="center"></u-text>
-									<u-text :text="modelInfo.reciever.name" size="26" color="#999" margin="20rpx 0 0 0"
-										align="center"></u-text>
-								</u-col>
-							</u-row>
-											
-							<u-text :text="`下单时间：${modelInfo.sendDate}`" color="#999" size="24"
-								margin="30rpx 0 0 0"></u-text>
+							<bpd-send-reciever-tmp :value="modelInfo"></bpd-send-reciever-tmp>
 						</view>
 						<view class="mp-kuadiyuan-mask" @click="makePhoneCall(modelInfo.takePieceEmployeePhone)">
 							<u-row justify="between">
@@ -86,6 +50,8 @@
 
 <script>
 	import * as apiService from "@/common/api"
+	import BpdSendRecieverTmp from "@/components/buns-post-detail-templates/bpd-send-reciever-tmp"
+	
 	export default {
 		props: {
 			
@@ -95,6 +61,7 @@
 			  return this.$store.getters.dicData
 			},
 		},
+		components: { BpdSendRecieverTmp },
 		data() {
 			return {
 				queryOption: {
diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue
index f58bb29..6904be3 100644
--- a/pages/tabBar/mine/mine.vue
+++ b/pages/tabBar/mine/mine.vue
@@ -9,7 +9,6 @@
 			<view class="pg-container">
 				
 				<view class="com-jianju" style="margin-top: 10rpx;">
-					<view class="pt-30 pb-40 clr-wht font-32 font-weight">我的</view>
 					<u-row align="center" justify="between">
 						<view>
 							<u-row>
@@ -26,7 +25,7 @@
 							</u-row>
 						</view>
 						<view>
-							<u-image height="140" width="140" radius="10"></u-image>
+							<u-image @click="goto('user/exclusiveQrcode')" height="140" width="140" :src="userInfo.qrCodeImgUrl" radius="10"></u-image>
 						</view>
 					</u-row>
 					
@@ -139,10 +138,10 @@
 				},
 				saomiao: true,
 				mainBtnlist: [
-					{  title: '服务客户',  icon: this.getCdnUrl(`mine/kehu.png`), url: '' },
+					{  title: '我的任务',  icon: this.getCdnUrl(`mine/kehu.png`), url: 'tabBar/order/order' },
 					{  title: '计提明细',  icon: this.getCdnUrl(`mine/jitmx.png`), url: 'user/withdraw' },
 					{...dealBtnMap.woDeErWeiMa},
-					{  title: '我的收件',  icon: this.getCdnUrl(`mine/shj.png`), url: 'user/bunsStatic' }
+					{  title: '业务统计',  icon: this.getCdnUrl(`mine/shj.png`), url: 'user/bunsStatic' }
 				],
 				
 			}
diff --git a/pages/tabBar/order/order.vue b/pages/tabBar/order/order.vue
index c84ddba..a22bbf6 100644
--- a/pages/tabBar/order/order.vue
+++ b/pages/tabBar/order/order.vue
@@ -73,46 +73,9 @@
 						<view class="pgb-cont">
 							<!-- 列表数据 -->
 							<view v-for="(item) in resData.list" class="ord-list-item">
-								<u-row justify="between">
-									<view>
-										<u-row @click="handleDealItem(item, { type: 2 })">
-											<view>
-												<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>
-									</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(item, { type: 1 })" custom-style="margin-top: 30rpx;" justify="center">
-									<u-col span="4">
-										<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('post/toline.png')">
-										</image>
-										<!-- 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="(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>
-						
-								<u-text :text="'签收时间：TODO' + '2022-04-30 15:25'" color="#999" size="24"
-									margin="30rpx 0 0 0"></u-text>
+								<view class="mt-10">
+									<bpd-send-reciever-tmp :value="item" :showInfoBtn="false"></bpd-send-reciever-tmp>
+								</view>
 						
 								<u-line color="#DEDEDE" margin="30rpx 0 0 0"></u-line>
 						
@@ -141,6 +104,7 @@
 <script>
 	import { dateRangeList } from "@/common/enum"
 	import * as apiService from "@/common/api"
+	import BpdSendRecieverTmp from "@/components/buns-post-detail-templates/bpd-send-reciever-tmp"
 	
 	export default {
 		props: {
@@ -153,6 +117,7 @@
 			  return this.$store.getters.dicData
 			},
 		},
+		components: { BpdSendRecieverTmp },
 		data() {
 			let { dicData } = this.$store.getters
 			return {
diff --git a/pages/user/bunsStatic.vue b/pages/user/bunsStatic.vue
index e83ef7d..df0036f 100644
--- a/pages/user/bunsStatic.vue
+++ b/pages/user/bunsStatic.vue
@@ -1,71 +1,74 @@
 <template>
-	<view class="">
-		<view class="sta-item">
-			<u-row justify="between">
-				<text class="font-30 font-weight">业务统计</text>
-				<view style="width: 146rpx;;">
-					<tpx-select mode="drop" v-model:value="searchParam.keyword" :list="dateRangeList" >
-						<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
-							<u-row justify="between" custom-style="width: 100%;">
-								<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
-									统计
-								</view>
-								<u-icon :name="showSearchMore?'arrow-up-fill':'arrow-down-fill'" 
-									color="#666" size="18" custom-style="margin-top: 2rpx;"
-								></u-icon>
-							</u-row>
-						</u-button>
-					</tpx-select>
-				
-				</view>
-			</u-row>
-			
-			<u-row custom-style="margin: 20rpx 0 0 0;">
-				<u-col span="3" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
-					<u-text text="5" bold="true" size="32" align="center" color="#B12D29"></u-text>
-					<u-text margin="10rpx 0 0 0" text="总票数" size="28" color="#999" align="center"></u-text>
-				</u-col>
-				<u-col span="3" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
-					<u-text text="30" bold="true" size="32" align="center" color="#B12D29"></u-text>
-					<u-text margin="10rpx 0 0 0" text="总件数" size="28" color="#999" align="center"></u-text>
-				</u-col>
-				<u-col span="3" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
-					<u-text text="40kg" bold="true" size="32" align="center" color="#B12D29"></u-text>
-					<u-text margin="10rpx 0 0 0" text="总重量" size="28" color="#999" align="center"></u-text>
-				</u-col>
-				<u-col span="3">
-					<u-text text="1.5" bold="true" size="32" align="center" color="#B12D29"></u-text>
-					<u-text margin="10rpx 0 0 0" text="总体积" size="28" color="#999" align="center"></u-text>
-				</u-col>
-			</u-row>
-		</view>
-		
-		<view class="pl-30 pr-30 pt-10">
-			<view v-for="(item) in [{},{},{}]" class="sta-item radius-20">
-				<text class="font-30 font-weight">柬埔寨</text>
+	<tpx-page>
+		<view class="">
+			<view class="sta-item">
+				<u-row justify="between">
+					<text class="font-30 font-weight">业务统计</text>
+					<view style="width: 146rpx;;">
+						<tpx-select mode="drop" v-model:value="searchParam.keyword" :list="dateRangeList" >
+							<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
+								<u-row justify="between" custom-style="width: 100%;">
+									<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
+										统计
+									</view>
+									<u-icon :name="showSearchMore?'arrow-up-fill':'arrow-down-fill'" 
+										color="#666" size="18" custom-style="margin-top: 2rpx;"
+									></u-icon>
+								</u-row>
+							</u-button>
+						</tpx-select>
+					
+					</view>
+				</u-row>
 				
 				<u-row custom-style="margin: 20rpx 0 0 0;">
 					<u-col span="3" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
 						<u-text text="5" bold="true" size="32" align="center" color="#B12D29"></u-text>
-						<u-text margin="10rpx 0 0 0" text="票数" size="28" color="#999" align="center"></u-text>
+						<u-text margin="10rpx 0 0 0" text="总票数" size="28" color="#999" align="center"></u-text>
 					</u-col>
 					<u-col span="3" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
 						<u-text text="30" bold="true" size="32" align="center" color="#B12D29"></u-text>
-						<u-text margin="10rpx 0 0 0" text="件数" size="28" color="#999" align="center"></u-text>
+						<u-text margin="10rpx 0 0 0" text="总件数" size="28" color="#999" align="center"></u-text>
 					</u-col>
 					<u-col span="3" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
 						<u-text text="40kg" bold="true" size="32" align="center" color="#B12D29"></u-text>
-						<u-text margin="10rpx 0 0 0" text="重量" size="28" color="#999" align="center"></u-text>
+						<u-text margin="10rpx 0 0 0" text="总重量" size="28" color="#999" align="center"></u-text>
 					</u-col>
 					<u-col span="3">
 						<u-text text="1.5" bold="true" size="32" align="center" color="#B12D29"></u-text>
-						<u-text margin="10rpx 0 0 0" text="体积" size="28" color="#999" align="center"></u-text>
+						<u-text margin="10rpx 0 0 0" text="总体积" size="28" color="#999" align="center"></u-text>
 					</u-col>
 				</u-row>
 			</view>
+			
+			<view class="pl-30 pr-30 pt-10">
+				<view v-for="(item) in [{},{},{}]" class="sta-item radius-20">
+					<text class="font-30 font-weight">柬埔寨</text>
+					
+					<u-row custom-style="margin: 20rpx 0 0 0;">
+						<u-col span="3" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
+							<u-text text="5" bold="true" size="32" align="center" color="#B12D29"></u-text>
+							<u-text margin="10rpx 0 0 0" text="票数" size="28" color="#999" align="center"></u-text>
+						</u-col>
+						<u-col span="3" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
+							<u-text text="30" bold="true" size="32" align="center" color="#B12D29"></u-text>
+							<u-text margin="10rpx 0 0 0" text="件数" size="28" color="#999" align="center"></u-text>
+						</u-col>
+						<u-col span="3" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
+							<u-text text="40kg" bold="true" size="32" align="center" color="#B12D29"></u-text>
+							<u-text margin="10rpx 0 0 0" text="重量" size="28" color="#999" align="center"></u-text>
+						</u-col>
+						<u-col span="3">
+							<u-text text="1.5" bold="true" size="32" align="center" color="#B12D29"></u-text>
+							<u-text margin="10rpx 0 0 0" text="体积" size="28" color="#999" align="center"></u-text>
+						</u-col>
+					</u-row>
+				</view>
+			</view>
+			
 		</view>
-		
-	</view>
+	</tpx-page>
+	
 </template>
 <script>
 	import getCdnUrl from "@/common/getCdnUrl"
diff --git a/pages/user/exclusiveQrcode.vue b/pages/user/exclusiveQrcode.vue
index 3a3c0c4..6cc078e 100644
--- a/pages/user/exclusiveQrcode.vue
+++ b/pages/user/exclusiveQrcode.vue
@@ -50,8 +50,9 @@
 		props: {
 		},
 		data() {
+			let { userInfo } = this.$store.getters
 			return {
-				qrCodeImgUrl: ''
+				qrCodeImgUrl: userInfo.qrCodeImgUrl
 			}
 		},
 		onShareAppMessage() {
@@ -63,8 +64,7 @@
 		},
 		methods: {
 			async initData(){
-				let res = await apiService.getStaffQRCodePng({ _loading: true })
-				this.qrCodeImgUrl = res?.data?.fileUrl
+				
 			},
 			async handleSave(){
 				this.saveNetFile(this.qrCodeImgUrl)
diff --git a/pages/user/withdraw.vue b/pages/user/withdraw.vue
index 3afdf21..f20563d 100644
--- a/pages/user/withdraw.vue
+++ b/pages/user/withdraw.vue
@@ -1,150 +1,152 @@
 <template>
-	<tpx-layout>
-		<template v-slot:header>
-			
-			<view class="pt-30">
-				<view class="com-jianju" style="padding: 30rpx;background-color:#B12D29;border-radius: 30rpx;">
-					<u-row justify="between">
-						<view class="clr-wht font-32 font-weight">计提概况</view>
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:header>
+				
+				<view class="pt-30">
+					<view class="com-jianju" style="padding: 30rpx;background-color:#B12D29;border-radius: 30rpx;">
+						<u-row justify="between">
+							<view class="clr-wht font-32 font-weight">计提概况</view>
+						</u-row>
+						
+						<u-row justify="between" custom-style="margin-top:20rpx;">
+							<view style="flex: 1;text-align: center;">
+								<view class="font-40 clr-wht font-weight">
+									<text class="font-26 pr-10">¥</text>
+									<text>5</text>
+								</view>
+								<view class="pt-20 clr-wht font-26" style="opacity: 0.8;">
+									<u-row justify="center">
+										<u-icon name="order" color="#fff" custom-style="opacity: 0.8;" size="30"></u-icon>
+										<text class="pl-10">待计提</text>
+									</u-row>
+								</view>
+							</view>
+							<view>
+								<u-line direction="col" color="#fff" length="80"></u-line>
+							</view>
+							<view style="flex: 1;text-align: center;">
+								<view class="font-40 clr-wht font-weight">
+									<text class="font-26 pr-10">¥</text>
+									<text>118</text>
+								</view>
+								<view class="pt-20 clr-wht font-26" style="opacity: 0.8;">
+									<u-row justify="center">
+										<u-icon name="order" color="#fff" custom-style="opacity: 0.8;" size="30"></u-icon>
+										<text class="pl-10">已计提</text>
+									</u-row>
+								</view>
+							</view>
+						</u-row>
+					</view>
+				</view>
+				
+				<view class="com-jianju" style="padding-top: 30rpx;">
+					<u-row justify="between" align="top">
+						<u-col span="9">
+							<!-- 订单状态 -->
+							<tpx-tabs :list="ordStatusList" v-model:value="searchParam.ordStatus"
+								@tabchange="(val)=> { handleSearchParamChange() }"  v-slot="curOrdTab"
+							>
+								<text slot>
+									(<text>{{curOrdTab.item.val}}</text>)
+								</text>
+							</tpx-tabs>
+						</u-col>
+						<u-col span="2">
+							<!-- 更多查询条件 -->
+							<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
+								<u-row justify="center">
+									<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
+										{{hasExtSchParam?'已':''}}筛选
+									</view>
+									<u-icon :name="showSearchMore?'arrow-up-fill':'arrow-down-fill'" 
+										:color="(hasExtSchParam?'#B12D29':'#666')" size="18" custom-style="margin-top: 2rpx;"
+									></u-icon>
+								</u-row>
+							</u-button>
+						</u-col>
 					</u-row>
 					
-					<u-row justify="between" custom-style="margin-top:20rpx;">
-						<view style="flex: 1;text-align: center;">
-							<view class="font-40 clr-wht font-weight">
-								<text class="font-26 pr-10">¥</text>
-								<text>5</text>
+					<!-- 状态搜索 -->
+					<view v-if="showSearchMore" class="search-more-panel">
+						<view class="smp-body slideInDown animated fast">
+							<view class="smp-content">
+								<view class="pos-abt-all" style="overflow-y: auto;">
+									<view style="padding: 0 0 30rpx 0">
+										<view>
+											<u-text text="快递状态" size="28" :bold="true" margin="0 0 20rpx 0"></u-text>
+											<tpx-tags :list="dlvTypeList" v-model:value="tmpSearchParam.postStatus" ></tpx-tags>
+										</view>
+										
+										<view>
+											<u-text text="付款方式" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>	
+											<tpx-tags :list="payTypeList" v-model:value="tmpSearchParam.payType" ></tpx-tags>
+										</view>
+										
+										<view>
+											<u-text text="时间范围" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>
+											<tpx-tags type="single" :list="dateTypeList" v-model:value="tmpSearchParam.dateType" @onItemClick="handleCheckDate"></tpx-tags>
+											<tpx-tags v-if="tmpSearchParam.date" type='' :list="[{title: tmpSearchParam.date}]" @onItemClick="handleSwitchCladar()" mode="primary"></tpx-tags>
+										</view>
+									</view>
+								</view>
 							</view>
-							<view class="pt-20 clr-wht font-26" style="opacity: 0.8;">
-								<u-row justify="center">
-									<u-icon name="order" color="#fff" custom-style="opacity: 0.8;" size="30"></u-icon>
-									<text class="pl-10">待计提</text>
+							<view class="smp-foot">
+								<u-row gutter="20" justify="between">
+									<u-button @click="handleResetTempSearch()" shape="circle">重置</u-button>
+									<view style="width: 40rpx;"></view>
+									<u-button @click="handleConfirmTempSearch()" shape="circle" type="primary">确认</u-button>
 								</u-row>
 							</view>
 						</view>
-						<view>
-							<u-line direction="col" color="#fff" length="80"></u-line>
-						</view>
-						<view style="flex: 1;text-align: center;">
-							<view class="font-40 clr-wht font-weight">
-								<text class="font-26 pr-10">¥</text>
-								<text>118</text>
-							</view>
-							<view class="pt-20 clr-wht font-26" style="opacity: 0.8;">
-								<u-row justify="center">
-									<u-icon name="order" color="#fff" custom-style="opacity: 0.8;" size="30"></u-icon>
-									<text class="pl-10">已计提</text>
-								</u-row>
-							</view>
-						</view>
-					</u-row>
-				</view>
-			</view>
-			
-			<view class="com-jianju" style="padding-top: 30rpx;">
-				<u-row justify="between" align="top">
-					<u-col span="9">
-						<!-- 订单状态 -->
-						<tpx-tabs :list="ordStatusList" v-model:value="searchParam.ordStatus"
-							@tabchange="(val)=> { handleSearchParamChange() }"  v-slot="curOrdTab"
-						>
-							<text slot>
-								(<text>{{curOrdTab.item.val}}</text>)
-							</text>
-						</tpx-tabs>
-					</u-col>
-					<u-col span="2">
-						<!-- 更多查询条件 -->
-						<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
-							<u-row justify="center">
-								<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
-									{{hasExtSchParam?'已':''}}筛选
-								</view>
-								<u-icon :name="showSearchMore?'arrow-up-fill':'arrow-down-fill'" 
-									:color="(hasExtSchParam?'#B12D29':'#666')" size="18" custom-style="margin-top: 2rpx;"
-								></u-icon>
-							</u-row>
-						</u-button>
-					</u-col>
-				</u-row>
-				
-				<!-- 状态搜索 -->
-				<view v-if="showSearchMore" class="search-more-panel">
-					<view class="smp-body slideInDown animated fast">
-						<view class="smp-content">
-							<view class="pos-abt-all" style="overflow-y: auto;">
-								<view style="padding: 0 0 30rpx 0">
-									<view>
-										<u-text text="快递状态" size="28" :bold="true" margin="0 0 20rpx 0"></u-text>
-										<tpx-tags :list="dlvTypeList" v-model:value="tmpSearchParam.postStatus" ></tpx-tags>
-									</view>
-									
-									<view>
-										<u-text text="付款方式" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>	
-										<tpx-tags :list="payTypeList" v-model:value="tmpSearchParam.payType" ></tpx-tags>
-									</view>
-									
-									<view>
-										<u-text text="时间范围" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>
-										<tpx-tags type="single" :list="dateTypeList" v-model:value="tmpSearchParam.dateType" @onItemClick="handleCheckDate"></tpx-tags>
-										<tpx-tags v-if="tmpSearchParam.date" type='' :list="[{title: tmpSearchParam.date}]" @onItemClick="handleSwitchCladar()" mode="primary"></tpx-tags>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="smp-foot">
-							<u-row gutter="20" justify="between">
-								<u-button @click="handleResetTempSearch()" shape="circle">重置</u-button>
-								<view style="width: 40rpx;"></view>
-								<u-button @click="handleConfirmTempSearch()" shape="circle" type="primary">确认</u-button>
-							</u-row>
-						</view>
 					</view>
 				</view>
-			</view>
-		</template>
-		<template v-slot:body>
-			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" class="pos-abt-all"
-			>
-				<view class="pgb-cont">
-					<!-- 列表数据 -->
-					<view class="pgbc-list">
-						<view v-for="(orItem, index) in ordList" class="ord-list-item" :style="`${index+1==ordList.length?'border-bottom: 0;':''};`">
-							<u-row justify="between">
-								<view>
-									<view class="clr-sub pb-20">订单号</view>
-									<view>T7080123982301</view>
-								</view>
-								<view style="text-align: right;">
-									<view class="clr-sub pb-20">金额</view>
+			</template>
+			<template v-slot:body>
+				<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" class="pos-abt-all"
+				>
+					<view class="pgb-cont">
+						<!-- 列表数据 -->
+						<view class="pgbc-list">
+							<view v-for="(orItem, index) in ordList" class="ord-list-item" :style="`${index+1==ordList.length?'border-bottom: 0;':''};`">
+								<u-row justify="between">
 									<view>
-										<text class="clr-prm">+</text>
-										<text class="pl-10 clr-prm">25</text>
-										<!-- <text class="clr-sub">-</text>
-										<text class="pl-10 clr-sub">25</text> -->
+										<view class="clr-sub pb-20">订单号</view>
+										<view>T7080123982301</view>
 									</view>
-								</view>
-							</u-row>		
+									<view style="text-align: right;">
+										<view class="clr-sub pb-20">金额</view>
+										<view>
+											<text class="clr-prm">+</text>
+											<text class="pl-10 clr-prm">25</text>
+											<!-- <text class="clr-sub">-</text>
+											<text class="pl-10 clr-sub">25</text> -->
+										</view>
+									</view>
+								</u-row>		
+							</view>
+						</view>
+					
+						<!-- 加载更多 -->
+						<u-loadmore icon-size="28" font-size="28" margin-top="30" v-if="showLoadMore || loadedAll"
+							:status="loadedAll ? 'nomore' : 'loading'" />
+					
+						<!-- 空数据页 -->
+						<view v-if="ordList.length == 0" style="padding-top: 100rpx;">
+							<u-empty text="无数据" :icon="getCdnUrl('kong.png')" textSize="28" width="86" height="97">
+							</u-empty>
 						</view>
 					</view>
-				
-					<!-- 加载更多 -->
-					<u-loadmore icon-size="28" font-size="28" margin-top="30" v-if="showLoadMore || loadedAll"
-						:status="loadedAll ? 'nomore' : 'loading'" />
-				
-					<!-- 空数据页 -->
-					<view v-if="ordList.length == 0" style="padding-top: 100rpx;">
-						<u-empty text="无数据" :icon="getCdnUrl('kong.png')" textSize="28" width="86" height="97">
-						</u-empty>
-					</view>
-				</view>
-			</scroll-view>
-		</template>
-	</tpx-layout>
-	
-	<!-- 日历 -->
-	<!-- @close="handleSwitchCladar()" -->
-	<u-calendar title="请选择日期范围" color="#B12D29" mode="range" rowHeight="90" closeOnClickOverlay :show="showCladar" :defaultDate="tmpSearchParam.date.split('~')" @confirm="handleClaOk" @close="handleSwitchCladar"
-	></u-calendar>
+				</scroll-view>
+			</template>
+		</tpx-layout>
+		
+		<!-- 日历 -->
+		<!-- @close="handleSwitchCladar()" -->
+		<u-calendar title="请选择日期范围" color="#B12D29" mode="range" rowHeight="90" closeOnClickOverlay :show="showCladar" :defaultDate="tmpSearchParam.date.split('~')" @confirm="handleClaOk" @close="handleSwitchCladar"
+		></u-calendar>
+	</tpx-page>
 	
 </template>
 <script>
diff --git a/store/modules/user.js b/store/modules/user.js
index 28c4b8d..25bc630 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -80,6 +80,10 @@ export default {
 				roles: resInfo.user,
 				permissions: resInfo.permissions
 			}
+			
+			let resQr = await apiService.getStaffQRCodePng()
+			info.qrCodeImgUrl = resQr?.data?.fileUrl
+			
 			commit(USERKEY.GETUSERINFO, info)
 		},