From dc6c7156291e7f1b09d11ba83f3942c43fa2c84a Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 5 Jan 2025 13:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/order.js       |  24 ++++
 common/api/url.js         |   5 +
 common/custom.scss        |   3 +
 pages/user/bunsStatic.vue | 107 +++++++++++----
 pages/user/withdraw.vue   | 282 +++++++-------------------------------
 5 files changed, 159 insertions(+), 262 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index adf99fb..89d9e99 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -227,3 +227,27 @@ export const exportWarehouseInTpl = (data = {})=> {
 export const cusConfirmWsIn = (data = {})=> {
 	return coreRequest(url.cusConfirmWsIn, data, {})
 }
+
+
+// 计提明细统计(顶部统计)
+export const getMyProfitStat = (data = {})=> {
+	return coreRequest(url.getMyProfitStat, data, {}, "GET")
+}
+
+
+// 计提明细列表
+export const getMyProfitSimpleList = (data = {})=> {
+	return coreRequest(url.getMyProfitSimpleList, data, {}, "GET")
+}
+
+
+// 业务统计(顶部统计)
+export const getMyBizStatInfo = (data = {})=> {
+	return coreRequest(url.getMyBizStatInfo, data, {}, "GET")
+}
+
+
+// 业务统计明细(区分国家)
+export const getMyBizStatList = (data = {})=> {
+	return coreRequest(url.getMyBizStatList, data, {}, "GET")
+}
\ No newline at end of file
diff --git a/common/api/url.js b/common/api/url.js
index 37795a7..13bc841 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -68,5 +68,10 @@ export default {
   getWarehouseInList: `/emis/emisWarehouseIn/listSimple`, // 进仓单列表
   exportWarehouseInTpl: `/emis/common/exportWarehouseInTpl`, // 进仓单PDF下载连接
   cusConfirmWsIn: `/emis/emisWarehouseIn/cusConfirmWsIn`, // 确认进仓单
+  getMyProfitStat: `/emis/emisCommissionProfit/getMyProfitStat`, // 计提明细统计(顶部统计)
+  getMyProfitSimpleList: `/emis/emisCommissionProfit/getMyProfitSimpleList`, // 计提明细列表
+  getMyBizStatInfo: `/emis/emisWaybill/getMyBizStatInfo`, // 业务统计(顶部统计)
+  getMyBizStatList: `/emis/emisWaybill/getMyBizStatList`, // 业务统计明细(区分国家)
+  
 }
 
diff --git a/common/custom.scss b/common/custom.scss
index 0ed81e3..6f8f03c 100644
--- a/common/custom.scss
+++ b/common/custom.scss
@@ -141,6 +141,9 @@
 	background-color: #fff;
 	border-radius: 0;
 }
+.text-center{
+	text-align: center;
+}
 .com-radius {
 	border-radius: 20rpx;
 }
diff --git a/pages/user/bunsStatic.vue b/pages/user/bunsStatic.vue
index df0036f..3d75e03 100644
--- a/pages/user/bunsStatic.vue
+++ b/pages/user/bunsStatic.vue
@@ -5,13 +5,15 @@
 				<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;">
+						<tpx-select mode="drop" v-model:value="searchParam.queryDateType" :list="dateRangeList" 
+							v-model:text="searchParam._queryDateTypeTitle" @onChange="handleDateTypeChange"
+						>
+							<u-button :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 :style="'padding: 0 10rpx;white-space: nowrap;'">
+										{{searchParam._queryDateTypeTitle || '统计'}}
 									</view>
-									<u-icon :name="showSearchMore?'arrow-up-fill':'arrow-down-fill'" 
+									<u-icon :name="'arrow-down-fill'" 
 										color="#666" size="18" custom-style="margin-top: 2rpx;"
 									></u-icon>
 								</u-row>
@@ -23,47 +25,67 @@
 				
 				<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 :text="staticInfo.totalNum" 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 :text="staticInfo.totalParcelQty" 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 :text="staticInfo.totalBillWeight" 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 :text="staticInfo.totalVolume" 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>
+			<view class="pl-30 pr-30 pt-10 pb-10">
+				<view v-for="(item) in statList" class="sta-item radius-20">
+					<text class="font-30 font-weight">{{item.countryName}}</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 span="4" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
+							<view class="text-center">
+								<span class="clr-prm font-28">{{item.kdTotalNum}}</span>
+								<span class="clr-sub pl-10">票</span>
+							</view>
+							<view class="mt-10 text-center">
+								<span class="clr-prm font-28">{{item.kdTotalBillWeight}}</span>
+								<span class="clr-sub pl-10">KG</span>
+							</view>
+							<view class="mt-10 text-center">快递</view>
 						</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 span="4" :custom-style="`border-right: 2rpx solid  #E8E8E8;`">
+							<view class="text-center">
+								<span class="clr-prm font-28">{{item.kyTotalNum}}</span>
+								<span class="clr-sub pl-10">票</span>
+							</view>
+							<view class="mt-10 text-center">
+								<span class="clr-prm font-28">{{item.kyTotalBillWeight}}</span>
+								<span class="clr-sub pl-10">KG</span>
+							</view>
+							<view class="mt-10 text-center">空运</view>
 						</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 span="4">
+							<view class="text-center">
+								<span class="clr-prm font-28">{{item.wlTotalNum}}</span>
+								<span class="clr-sub pl-10">票</span>
+							</view>
+							<view class="mt-10 text-center">
+								<span class="clr-prm font-28">{{item.wlTotalBillWeight}}</span>
+								<span class="clr-sub pl-10">KG</span>
+							</view>
+							<view class="mt-10 text-center">物流</view>
 						</u-col>
 					</u-row>
 				</view>
+				
+				<tpx-empty v-if="statList.length == 0"></tpx-empty>
+				
 			</view>
 			
 		</view>
@@ -71,8 +93,8 @@
 	
 </template>
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
 	import { dateRangeList } from "@/common/enum"
+	import * as apiService from "@/common/api"
 	export default {
 		props: {
 		},
@@ -80,16 +102,43 @@
 			return {
 				...JSON.parse(JSON.stringify({ dateRangeList })),
 				searchParam: {
-					keyword: ''
-				}
+					queryDateType: dateRangeList[0].val,
+					_queryDateTypeTitle: dateRangeList[0].title,
+				},
+				queryOption: {
+				},
+				staticInfo: {},
+				statList: [],
 			}
 		},
 		onShareAppMessage() {
 			return {
 			}
 		},
+		onLoad(queryOption) {
+			this.queryOption = queryOption
+			this.initData();
+		},
 		methods: {
-			getCdnUrl,
+			async initData(opt = {}){
+				let params = {
+					params:{
+						...this.searchParam,
+						...opt,
+					},
+					_loading: true,
+				}
+				const statRes = await apiService.getMyBizStatInfo(params)
+				this.staticInfo = statRes.data || {}
+				
+				const statListRes = await apiService.getMyBizStatList(params)
+				this.statList = statListRes.data || []
+			},
+			handleDateTypeChange(val){
+				this.initData({
+					queryDateType: val
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/user/withdraw.vue b/pages/user/withdraw.vue
index 2e31fa2..3579ad9 100644
--- a/pages/user/withdraw.vue
+++ b/pages/user/withdraw.vue
@@ -13,12 +13,12 @@
 							<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>
+									<text>{{staticInfo.money}}</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>
+										<text class="pl-10">预估计提</text>
 									</u-row>
 								</view>
 							</view>
@@ -28,7 +28,7 @@
 							<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>
+									<text>{{staticInfo.payedMoney}}</text>
 								</view>
 								<view class="pt-20 clr-wht font-26" style="opacity: 0.8;">
 									<u-row justify="center">
@@ -41,117 +41,51 @@
 					</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">
+			</template>
+			
+			<template v-slot:body>
+				<view class="pos-abt-all">
+					<tpx-scroll-view v-model:resObject="resData" :searchParam="searchParam" :getListFun="getListFun"
+						ref="listRef"
+					>
+						<view class="pgb-cont">
+							<!-- 列表数据 -->
+							<view class="pgbc-list">
+								<view v-for="(orItem, index) in resData.list" class="ord-list-item" :style="`${index+1==resData.list.length?'border-bottom: 0;':''};`">
+									<u-row justify="between">
 										<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 class="clr-sub pb-20">订单号</view>
+											<view>{{orItem.billCode}}</view>
 										</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 style="text-align: right;">
+											<view class="clr-sub pb-20">
+												<tpx-text-dic :value="orItem.feeType" :list="dicData.emis_commission_fee_type"></tpx-text-dic>
+											</view>
+											<view>
+												<text class="clr-prm">+</text>
+												<!-- <text v-if="orItem.feeType != 1" class="clr-sub">-</text> -->
+												<text class="pl-10 clr-prm">{{orItem.money}}</text>
+											</view>
 										</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>
+									</u-row>		
 								</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>
+					</tpx-scroll-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>
-										<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>
-				</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>
+		<!-- 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>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto, setClipboardData, confirmModal, showLoading } from "@/common/untool"
+	import { setClipboardData, confirmModal, showLoading } from "@/common/untool"
+	import * as apiService from "@/common/api"
 	export default {
 		props: {
 			// hasLeftWin: {
@@ -159,142 +93,45 @@
 			// }
 		},
 		computed: {
-			hasExtSchParam() {
-				let hasExt = false
-				const searchParam = this.searchParam
-				if(
-					(searchParam.postStatus && searchParam.postStatus.length > 0)
-					|| (searchParam.payType && searchParam.payType.length > 0)
-					|| (searchParam.date || (searchParam.dateType && searchParam.dateType != dateTypeEnum.custom) )
-				) {
-					hasExt = true
-				}
-				return hasExt
+			dicData() {
+			  return this.$store.getters.dicData
 			},
 		},
 		data() {
 			return {
-				searchParam: {
-					keyword: '',
-					ordStatus: '' // 订单状态， 1：寄件； 2：收件； 3：待付款；
-				},
 				showSearchMore: false,
 				showCladar: false,
 				tmpSearchParam: {
 					
 				},
-				ordList: [
-					{}
-					,{},{},{},{},{},{},{}
-				],
-				showLoadMore: false,
-				loadedAll: false
+				searchParam: {
+					
+				},
+				queryOption: {
+				},
+				staticInfo: {},
+				resData: {
+					list: []
+				}
 			}
 		},
 		onShareAppMessage() {
 			return {
 				// title: '',
-				// path: 'TODO'
 			}
 		},
-		onLoad() {
-			this.initTmpSrchParam()
+		onLoad(queryOption) {
+			this.queryOption = queryOption
 			this.initData();
 		},
 		onUnload() {
 		},
 		methods: {
-			getCdnUrl,
-			goto,
-			initData(){
-				// showLoading()
-				setTimeout(() => {
-					uni.stopPullDownRefresh();
-				}, 300);
+			async initData(){
+				const comProRes = await apiService.getMyProfitStat()
+				this.staticInfo = comProRes.data || {}
 			},
-			initTmpSrchParam(){
-				this.tmpSearchParam = {
-					postStatus: [], // 快递状态
-					payType: [], // 支付类型
-					dateType: '', // 日期类型
-					date: '' // 日期
-				}
-			},
-			loadListData() {
-				// 请求列表数据 TODO
-				console.log('====this.searchParam===', this.searchParam)
-			},
-			
-			onScrollBottom() {
-				console.log("onScrollBottom");
-				if (this.loadedAll) {
-					return;
-				}
-				this.showLoadMore = true;
-				this.handleSearchParamChange();
-			},
-			handleSearchMoreBtn(){
-				if(!this.showLoadMore) {
-					// 回显更多条件
-					Object.keys(this.tmpSearchParam).map(t=> {
-						const val = this.searchParam[t]
-						typeof val != 'undefined' && (this.tmpSearchParam[t] = val)
-					})
-				}
-				this.showSearchMore = !this.showSearchMore
-			},
-			handleSearchParamChange(key, val) {
-				if(key) {
-					this.searchParam[key] = val
-				}
-				this.loadListData()
-			},
-			async handleDealItem(item, deal = { type: '1' }) {
-				switch (deal.type){
-					case 1: // 跳转
-						goto(`post/detail?id=${item.id || ''}`)
-						break;
-					case 2: // 复制订单号
-						setClipboardData('xxxxxxx')
-						break;
-					case 3: // 删除
-						await confirmModal('确认要删除吗?')
-						break;
-					case 4: // 取消
-						await confirmModal('确认要取消吗?')
-						break;
-					default:
-						break;
-				}
-			},
-			handleResetTempSearch(){
-				this.initTmpSrchParam()
-			},
-			handleConfirmTempSearch(){
-				Object.assign(this.searchParam, this.tmpSearchParam)
-				this.showSearchMore = false
-				this.handleSearchParamChange();
-			},
-			handleCheckDate(item) {
-				let newVal = item.val
-				if(newVal == dateTypeEnum.custom) {
-					this.handleSwitchCladar()
-				} else {
-					this.tmpSearchParam.date = ''
-				}
-			},
-			handleClaOk(res){
-				const ary = Object.values(res)
-				const val = [ary[0], ary[ary.length-1]].join("~")
-				this.handleSwitchCladar()
-				this.tmpSearchParam.date = val 
-			},
-			handleSwitchCladar() {
-				this.showCladar = !this.showCladar
-				if(!this.showCladar) {
-					!this.tmpSearchParam.date && (this.tmpSearchParam.dateType = '')
-				}
-			}
+			getListFun: apiService.getMyProfitSimpleList,
 		}
 	}
 </script>
@@ -319,25 +156,4 @@
 		padding: 22rpx 30rpx;
 		border-bottom: 2rpx solid rgb(214, 215, 217);
 	}
-	.search-more-panel{
-		overflow: hidden;
-		position: absolute;
-		left: 0;
-		right: 0;
-		height: calc(70vh);
-		z-index: 200;
-	}
-	.smp-body{
-		padding: 30rpx;
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-		background-color: #FFF;
-		border-radius: 0 0 30rpx 30rpx;
-		box-sizing: border-box;
-	}
-	.smp-content{
-		flex: 1;
-		position: relative;
-	}
 </style>
\ No newline at end of file