wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-22 14:17:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

uniapp【优化】: 分销/代理 订单模块显示

Browse Source
This commit is contained in:
15093570141
2024-10-29 23:25:30 +08:00
parent 6be6c77b80
commit ef8c7e685a
7 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
View File

@@ -22,7 +22,6 @@
const handleShare = async (code : string | number) => { const handleShare = async (code : string | number) => {
const shareData : Response<any> = await queryDeshare({ code, }); const shareData : Response<any> = await queryDeshare({ code, });
console.log('123',shareData)
if (shareData.status) { if (shareData.status) {
uni.setStorageSync(Invitecode, shareData.data?.userShareCode); uni.setStorageSync(Invitecode, shareData.data?.userShareCode);

4
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.scss
View File

@@ -1,10 +1,12 @@
.content-box { .content-box {
padding: 25rpx; padding: 1rpx 25rpx;
.content { .content {
position: fixed; position: fixed;
margin-top: -2rpx;
left: 25rpx; left: 25rpx;
width: calc(100% - 50rpx); width: calc(100% - 50rpx);
background-color: #eef2f6; background-color: #eef2f6;
z-index: 9;
} }
.header { .header {

33
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/order/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<coreshop-page title="分销订单" mode="left"> <coreshop-page title="代理订单" mode="left">
<view class="content-box"> <view class="content-box">
<view class="content"> <view class="content">
<view class="header"> <view class="header">
@@ -7,32 +7,41 @@
<view class="order"> <view class="order">
<view class="team_order"> <view class="team_order">
<view class="label">团队订单数量(单)</view> <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>
<view class="order_level"> <view class="order_level">
<view> <view>
<view class="label">代购订单</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> <view>
<view class="label">客户订单</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>
</view> </view>
<view class="order_price"> <view class="order_price">
<view class="team_price"> <view class="team_price">
<view class="label">总订单金额（元）</view> <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>
<view class="order_level"> <view class="order_level">
<view> <view>
<view class="label">代购订单</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> <view>
<view class="label">客户订单</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> </view>
</view> </view>
@@ -40,11 +49,13 @@
<view class="statistics"> <view class="statistics">
<view class="statistics_order"> <view class="statistics_order">
<view class="label">本月订单总数（单）</view> <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>
<view class="statistics_price"> <view class="statistics_price">
<view class="label">本月订单金额（元）</view> <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> </view>
</view> </view>
@@ -57,7 +68,7 @@
}" :inactiveStyle="{ }" :inactiveStyle="{
color: '#606266', color: '#606266',
transform: 'scale(1)' transform: 'scale(1)'
}" itemStyle="height: 34px;flex:1"></uv-tabs> }" itemStyle="height: 34px;flex:1;min-width:100rpx"></uv-tabs>
</view> </view>
</view> </view>
<view class="list" v-if="state.list.length > 0"> <view class="list" v-if="state.list.length > 0">
@@ -77,7 +88,7 @@
</view> </view>
</view> </view>
<view class="goods-box"> <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> <image class="img" :src="goods.imageUrl"></image>
<view class="goods-msg"> <view class="goods-msg">
<view class="name">{{goods.name}}</view> <view class="name">{{goods.name}}</view>

7
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store/index.vue
View File

@@ -17,7 +17,7 @@
</image> </image>
</view> </view>
<view class="item line"> <view class="item line">
<view class="value">{{state.storeInfo?.totalGoods}}</view> <view class="value">{{state?.totalCount}}</view>
<view class="label">全部宝贝</view> <view class="label">全部宝贝</view>
</view> </view>
<view class="item line"> <view class="item line">
@@ -58,8 +58,6 @@
</view> </view>
<view class="buyCount">已售{{ item.buyCount }}{{ item.unit }}</view> <view class="buyCount">已售{{ item.buyCount }}{{ item.unit }}</view>
</view> </view>
<Point :data="item" :flex="false" @hanldeClickGoods="hanldeClickGoods(item)">
</Point>
</view> </view>
</template> </template>
</coreshop-goods-card> </coreshop-goods-card>
@@ -96,6 +94,7 @@
page : number; page : number;
limit : number; limit : number;
totalPages : number; totalPages : number;
totalCount : number;
goodsList : any; goodsList : any;
storeId : number; storeId : number;
storeInfo : any; storeInfo : any;
@@ -105,6 +104,7 @@
page: 1, page: 1,
limit: 20, limit: 20,
totalPages: 1, totalPages: 1,
totalCount: 0,
goodsList: [[], []], goodsList: [[], []],
storeId: 0, storeId: 0,
storeInfo: {}, storeInfo: {},
@@ -143,6 +143,7 @@
}) })
if (goodsPage.status) { if (goodsPage.status) {
state.totalPages = goodsPage.data?.totalPages; 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[0] = state.goodsList[0].concat(splitArrayByStep(goodsPage.data?.list, 2)[0])
state.goodsList[1] = state.goodsList[1].concat(splitArrayByStep(goodsPage.data?.list, 2)[1]) state.goodsList[1] = state.goodsList[1].concat(splitArrayByStep(goodsPage.data?.list, 2)[1])
} }

16
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.scss
View File

@@ -1,10 +1,12 @@
.content-box { .content-box {
padding: 25rpx; padding: 1rpx 25rpx;
.content { .content {
position: fixed; position: fixed;
left: 25rpx; left: 25rpx;
margin-top: -2rpx;
width: calc(100% - 50rpx); width: calc(100% - 50rpx);
background-color: #eef2f6; background-color: #eef2f6;
z-index: 9;
} }
.header { .header {
@@ -26,11 +28,11 @@
.team { .team {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.order{ .order {
margin-right: 10rpx; margin-right: 10rpx;
} }
.order_price{ .order_price {
margin-left: 10rpx; margin-left: 10rpx;
} }
.order_price, .order_price,
@@ -52,11 +54,11 @@
.statistics { .statistics {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-top: 20rpx; margin-top: 20rpx;
.statistics_order{ .statistics_order {
margin-right: 10rpx; margin-right: 10rpx;
} }
.statistics_price{ .statistics_price {
margin-left: 10rpx; margin-left: 10rpx;
} }
.statistics_order, .statistics_order,

34
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/order/index.vue
View File

@@ -1,38 +1,48 @@
<template> <template>
<coreshop-page title="分销订单" mode="left"> <coreshop-page title="分销订单" mode="left">
<view class="content-box"> <view class="content-box">
<view class="content" > <view class="content">
<view class="header"> <view class="header">
<view class="team"> <view class="team">
<view class="order"> <view class="order">
<view class="team_order"> <view class="team_order">
<view class="label">团队订单数量(单)</view> <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>
<view class="order_level"> <view class="order_level">
<view> <view>
<view class="label">一级订单</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> <view>
<view class="label">二级订单</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>
</view> </view>
<view class="order_price"> <view class="order_price">
<view class="team_price"> <view class="team_price">
<view class="label">团队订单数量(单)</view> <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>
<view class="order_level"> <view class="order_level">
<view> <view>
<view class="label">一级订单</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> <view>
<view class="label">二级订单</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> </view>
</view> </view>
@@ -40,11 +50,13 @@
<view class="statistics"> <view class="statistics">
<view class="statistics_order"> <view class="statistics_order">
<view class="label">本月分销订单数量(单)</view> <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>
<view class="statistics_price"> <view class="statistics_price">
<view class="label">本月分销订单金额(元)</view> <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> </view>
</view> </view>
@@ -57,7 +69,7 @@
}" :inactiveStyle="{ }" :inactiveStyle="{
color: '#606266', color: '#606266',
transform: 'scale(1)' transform: 'scale(1)'
}" itemStyle="height: 34px;flex:1"></uv-tabs> }" itemStyle="height: 34px;flex:1;min-width:100rpx"></uv-tabs>
</view> </view>
</view> </view>
<view class="list" v-if="state.list.length > 0"> <view class="list" v-if="state.list.length > 0">
@@ -117,7 +129,7 @@
import type { Response } from '@/core/models'; import type { Response } from '@/core/models';
import { timeFormat } from '@/uni_modules/uv-ui-tools/libs/function/index.js'; import { timeFormat } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
import { useSystemInfo } from '@/core/hooks'; import { useSystemInfo } from '@/core/hooks';
import { EmptyEnum } from '@/core/enum'; import { EmptyEnum } from '@/core/enum';
const state = reactive<{ const state = reactive<{
orderStatus : Array<{ name : string, id : number }>; orderStatus : Array<{ name : string, id : number }>;

7
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
View File

@@ -17,7 +17,7 @@
</image> </image>
</view> </view>
<view class="item line"> <view class="item line">
<view class="value">{{state.storeInfo?.totalGoods}}</view> <view class="value">{{state.totalCount}}</view>
<view class="label">全部宝贝</view> <view class="label">全部宝贝</view>
</view> </view>
<view class="item line"> <view class="item line">
@@ -58,8 +58,6 @@
</view> </view>
<view class="buyCount">已售{{ item.buyCount }}{{ item.unit }}</view> <view class="buyCount">已售{{ item.buyCount }}{{ item.unit }}</view>
</view> </view>
<Point :data="item" :flex="false" @hanldeClickGoods="hanldeClickGoods(item)">
</Point>
</view> </view>
</template> </template>
</coreshop-goods-card> </coreshop-goods-card>
@@ -96,6 +94,7 @@
page : number; page : number;
limit : number; limit : number;
totalPages : number; totalPages : number;
totalCount : number;
goodsList : any; goodsList : any;
storeId : number; storeId : number;
storeInfo : any; storeInfo : any;
@@ -105,6 +104,7 @@
page: 1, page: 1,
limit: 20, limit: 20,
totalPages: 1, totalPages: 1,
totalCount: 0,
goodsList: [[], []], goodsList: [[], []],
storeId: 0, storeId: 0,
storeInfo: {}, storeInfo: {},
@@ -143,6 +143,7 @@
}) })
if (goodsPage.status) { if (goodsPage.status) {
state.totalPages = goodsPage.data?.totalPages; 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[0] = state.goodsList[0].concat(splitArrayByStep(goodsPage.data?.list, 2)[0])
state.goodsList[1] = state.goodsList[1].concat(splitArrayByStep(goodsPage.data?.list, 2)[1]) state.goodsList[1] = state.goodsList[1].concat(splitArrayByStep(goodsPage.data?.list, 2)[1])
} }