From ef8c7e685a5518d55c35ad08afa041710d02b0a1 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Tue, 29 Oct 2024 23:25:30 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91:=20?=
 =?UTF-8?q?=E5=88=86=E9=94=80/=E4=BB=A3=E7=90=86=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/pages/share/jump/jump.vue        |  1 -
 .../pages/subpackage/agency/order/index.scss  |  4 ++-
 .../pages/subpackage/agency/order/index.vue   | 33 ++++++++++++------
 .../pages/subpackage/agency/store/index.vue   |  7 ++--
 .../subpackage/distribution/order/index.scss  | 16 +++++----
 .../subpackage/distribution/order/index.vue   | 34 +++++++++++++------
 .../subpackage/distribution/store/index.vue   |  7 ++--
 7 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
index 36de045e..39d0e68d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
@@ -22,7 +22,6 @@
 
 	const handleShare = async (code : string | number) => {
 		const shareData : Response<any> = await queryDeshare({ code, });
-		console.log('123',shareData)
 		
 		if (shareData.status) {
 			uni.setStorageSync(Invitecode, shareData.data?.userShareCode);
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.scss
index 553c6260..53ac7aa3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.scss
@@ -1,10 +1,12 @@
 .content-box {
-	padding: 25rpx;
+	padding: 1rpx 25rpx;
 	.content {
 		position: fixed;
+		margin-top: -2rpx;
 		left: 25rpx;
 		width: calc(100% - 50rpx);
 		background-color: #eef2f6;
+		z-index: 9;
 	}
 
 	.header {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.vue
index ffa912b6..3ebe6221 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<coreshop-page title="分销订单" mode="left">
+	<coreshop-page title="代理订单" mode="left">
 		<view class="content-box">
 			<view class="content">
 				<view class="header">
@@ -7,32 +7,41 @@
 						<view class="order">
 							<view class="team_order">
 								<view class="label">团队订单数量(单)</view>
-								<view class="value">{{state.orderInfo?.allOrder | 0}}</view>
+								<view class="value">{{state.orderInfo?.allOrder ? state.orderInfo?.allOrder :  0}}
+								</view>
 							</view>
 							<view class="order_level">
 								<view>
 									<view class="label">代购订单</view>
-									<view class="value">{{state.orderInfo?.procurementServiceOrder | 0}}</view>
+									<view class="value">
+										{{state.orderInfo?.procurementServiceOrder ? state.orderInfo?.procurementServiceOrder :  0}}
+									</view>
 								</view>
 								<view>
 									<view class="label">客户订单</view>
-									<view class="value">{{state.orderInfo?.customerOrder | 0}}</view>
+									<view class="value">
+										{{state.orderInfo?.customerOrder ? state.orderInfo?.customerOrder :  0}}</view>
 								</view>
 							</view>
 						</view>
 						<view class="order_price">
 							<view class="team_price">
 								<view class="label">总订单金额（元）</view>
-								<view class="value">{{state.orderInfo?.allOrderMoney | 0}}</view>
+								<view class="value">
+									{{state.orderInfo?.allOrderMoney ? state.orderInfo?.allOrderMoney :  0}}</view>
 							</view>
 							<view class="order_level">
 								<view>
 									<view class="label">代购订单</view>
-									<view class="value">{{state.orderInfo?.procurementServiceOrderMoney | 0}}</view>
+									<view class="value">
+										{{state.orderInfo?.procurementServiceOrderMoney ? state.orderInfo?.procurementServiceOrderMoney :  0}}
+									</view>
 								</view>
 								<view>
 									<view class="label">客户订单</view>
-									<view class="value">{{state.orderInfo?.customerOrderMoney | 0}}</view>
+									<view class="value">
+										{{state.orderInfo?.customerOrderMoney ? state.orderInfo?.customerOrderMoney :  0}}
+									</view>
 								</view>
 							</view>
 						</view>
@@ -40,11 +49,13 @@
 					<view class="statistics">
 						<view class="statistics_order">
 							<view class="label">本月订单总数（单）</view>
-							<view class="value">{{state.orderInfo?.monthOrder | 0}}</view>
+							<view class="value">{{state.orderInfo?.monthOrder ? state.orderInfo?.monthOrder :  0}}
+							</view>
 						</view>
 						<view class="statistics_price">
 							<view class="label">本月订单金额（元）</view>
-							<view class="value">{{state.orderInfo?.monthOrderMoney | 0}}</view>
+							<view class="value">
+								{{state.orderInfo?.monthOrderMoney ? state.orderInfo?.monthOrderMoney :  0}}</view>
 						</view>
 					</view>
 				</view>
@@ -57,7 +68,7 @@
 			    	}" :inactiveStyle="{
 						color: '#606266',
 						transform: 'scale(1)'
-					}" itemStyle="height: 34px;flex:1"></uv-tabs>
+					}" itemStyle="height: 34px;flex:1;min-width:100rpx"></uv-tabs>
 				</view>
 			</view>
 			<view class="list" v-if="state.list.length > 0">
@@ -77,7 +88,7 @@
 						</view>
 					</view>
 					<view class="goods-box">
-						<view class="goods" v-for="goods in item.distributionOrderDetails" :key="goods.id">
+						<view class="goods" v-for="goods in item.agentOrderDetails" :key="goods.id">
 							<image class="img" :src="goods.imageUrl"></image>
 							<view class="goods-msg">
 								<view class="name">{{goods.name}}</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store/index.vue
index 36fdc422..35444aa7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store/index.vue
@@ -17,7 +17,7 @@
 					</image>
 				</view>
 				<view class="item line">
-					<view class="value">{{state.storeInfo?.totalGoods}}</view>
+					<view class="value">{{state?.totalCount}}</view>
 					<view class="label">全部宝贝</view>
 				</view>
 				<view class="item line">
@@ -58,8 +58,6 @@
 											</view>
 											<view class="buyCount">已售{{ item.buyCount }}{{ item.unit }}</view>
 										</view>
-										<Point :data="item" :flex="false" @hanldeClickGoods="hanldeClickGoods(item)">
-										</Point>
 									</view>
 								</template>
 							</coreshop-goods-card>
@@ -96,6 +94,7 @@
 		page : number;
 		limit : number;
 		totalPages : number;
+		totalCount : number;
 		goodsList : any;
 		storeId : number;
 		storeInfo : any;
@@ -105,6 +104,7 @@
 		page: 1,
 		limit: 20,
 		totalPages: 1,
+		totalCount: 0,
 		goodsList: [[], []],
 		storeId: 0,
 		storeInfo: {},
@@ -143,6 +143,7 @@
 		})
 		if (goodsPage.status) {
 			state.totalPages = goodsPage.data?.totalPages;
+			state.totalCount = goodsPage.data?.totalCount;
 			state.goodsList[0] = state.goodsList[0].concat(splitArrayByStep(goodsPage.data?.list, 2)[0])
 			state.goodsList[1] = state.goodsList[1].concat(splitArrayByStep(goodsPage.data?.list, 2)[1])
 		}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.scss
index 553c6260..633b027d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.scss
@@ -1,10 +1,12 @@
 .content-box {
-	padding: 25rpx;
+	padding: 1rpx 25rpx;
 	.content {
 		position: fixed;
 		left: 25rpx;
+		margin-top: -2rpx;
 		width: calc(100% - 50rpx);
 		background-color: #eef2f6;
+		z-index: 9;
 	}
 
 	.header {
@@ -26,11 +28,11 @@
 		.team {
 			display: flex;
 			justify-content: space-between;
-			align-items: center; 
-			.order{
+			align-items: center;
+			.order {
 				margin-right: 10rpx;
 			}
-			.order_price{
+			.order_price {
 				margin-left: 10rpx;
 			}
 			.order_price,
@@ -52,11 +54,11 @@
 		.statistics {
 			display: flex;
 			justify-content: space-between;
-			margin-top: 20rpx; 
-			.statistics_order{
+			margin-top: 20rpx;
+			.statistics_order {
 				margin-right: 10rpx;
 			}
-			.statistics_price{
+			.statistics_price {
 				margin-left: 10rpx;
 			}
 			.statistics_order,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.vue
index c3e1a447..2bd2ec7c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.vue
@@ -1,38 +1,48 @@
 <template>
 	<coreshop-page title="分销订单" mode="left">
 		<view class="content-box">
-			<view class="content" >
+			<view class="content">
 				<view class="header">
 					<view class="team">
 						<view class="order">
 							<view class="team_order">
 								<view class="label">团队订单数量(单)</view>
-								<view class="value">{{state.orderInfo?.allOrder | 0}}</view>
+								<view class="value">{{state.orderInfo?.allOrder ? state.orderInfo?.allOrder : 0}}</view>
 							</view>
 							<view class="order_level">
 								<view>
 									<view class="label">一级订单</view>
-									<view class="value">{{state.orderInfo?.firstOrder | 0}}</view>
+									<view class="value">
+										{{state.orderInfo?.firstOrder ? state.orderInfo?.firstOrder : 0}}
+									</view>
 								</view>
 								<view>
 									<view class="label">二级订单</view>
-									<view class="value">{{state.orderInfo?.secondOrder | 0}}</view>
+									<view class="value">
+										{{state.orderInfo?.secondOrder ? state.orderInfo?.secondOrder : 0}}
+									</view>
 								</view>
 							</view>
 						</view>
 						<view class="order_price">
 							<view class="team_price">
 								<view class="label">团队订单数量(单)</view>
-								<view class="value">{{state.orderInfo?.allOrderMoney | 0}}</view>
+								<view class="value">
+									{{state.orderInfo?.allOrderMoney ? state.orderInfo?.allOrderMoney  : 0}}
+								</view>
 							</view>
 							<view class="order_level">
 								<view>
 									<view class="label">一级订单</view>
-									<view class="value">{{state.orderInfo?.firstOrderMoney | 0}}</view>
+									<view class="value">
+										{{state.orderInfo?.firstOrderMoney ? state.orderInfo?.firstOrderMoney : 0}}
+									</view>
 								</view>
 								<view>
 									<view class="label">二级订单</view>
-									<view class="value">{{state.orderInfo?.secondOrderMoney | 0}}</view>
+									<view class="value">
+										{{state.orderInfo?.secondOrderMoney ? state.orderInfo?.secondOrderMoney :  0}}
+									</view>
 								</view>
 							</view>
 						</view>
@@ -40,11 +50,13 @@
 					<view class="statistics">
 						<view class="statistics_order">
 							<view class="label">本月分销订单数量(单)</view>
-							<view class="value">{{state.orderInfo?.monthOrder | 0}}</view>
+							<view class="value">{{state.orderInfo?.monthOrder ? state.orderInfo?.monthOrder :  0}}
+							</view>
 						</view>
 						<view class="statistics_price">
 							<view class="label">本月分销订单金额(元)</view>
-							<view class="value">{{state.orderInfo?.monthOrderMoney | 0}}</view>
+							<view class="value">
+								{{state.orderInfo?.monthOrderMoney ? state.orderInfo?.monthOrderMoney :  0}}</view>
 						</view>
 					</view>
 				</view>
@@ -57,7 +69,7 @@
 			    	}" :inactiveStyle="{
 						color: '#606266',
 						transform: 'scale(1)'
-					}" itemStyle="height: 34px;flex:1"></uv-tabs>
+					}" itemStyle="height: 34px;flex:1;min-width:100rpx"></uv-tabs>
 				</view>
 			</view>
 			<view class="list" v-if="state.list.length > 0">
@@ -117,7 +129,7 @@
 	import type { Response } from '@/core/models';
 	import { timeFormat } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
 	import { useSystemInfo } from '@/core/hooks';
-	import { EmptyEnum } from '@/core/enum'; 
+	import { EmptyEnum } from '@/core/enum';
 
 	const state = reactive<{
 		orderStatus : Array<{ name : string, id : number }>;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
index ebeaa30a..68dd4fc9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
@@ -17,7 +17,7 @@
 					</image>
 				</view>
 				<view class="item line">
-					<view class="value">{{state.storeInfo?.totalGoods}}</view>
+					<view class="value">{{state.totalCount}}</view>
 					<view class="label">全部宝贝</view>
 				</view>
 				<view class="item line">
@@ -58,8 +58,6 @@
 											</view>
 											<view class="buyCount">已售{{ item.buyCount }}{{ item.unit }}</view>
 										</view>
-										<Point :data="item" :flex="false" @hanldeClickGoods="hanldeClickGoods(item)">
-										</Point>
 									</view>
 								</template>
 							</coreshop-goods-card>
@@ -96,6 +94,7 @@
 		page : number;
 		limit : number;
 		totalPages : number;
+		totalCount : number;
 		goodsList : any;
 		storeId : number;
 		storeInfo : any;
@@ -105,6 +104,7 @@
 		page: 1,
 		limit: 20,
 		totalPages: 1,
+		totalCount: 0,
 		goodsList: [[], []],
 		storeId: 0,
 		storeInfo: {},
@@ -143,6 +143,7 @@
 		})
 		if (goodsPage.status) {
 			state.totalPages = goodsPage.data?.totalPages;
+			state.totalCount = goodsPage.data?.totalCount;
 			state.goodsList[0] = state.goodsList[0].concat(splitArrayByStep(goodsPage.data?.list, 2)[0])
 			state.goodsList[1] = state.goodsList[1].concat(splitArrayByStep(goodsPage.data?.list, 2)[1])
 		}