From b11a3289fd5a0c0b41fd19a97534562b35bbb468 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 22 九月 2024 20:04:39 +0800
Subject: [PATCH] update
---
pages/home/supplier-home.vue | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 6eee11a..581e7a3 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -53,7 +53,7 @@
<view class="flex tj-container" v-if="selftype==='supplier'">
<view class="tj-each">
<view class="num">
- 0扎
+ {{tj.dealCountLastMonth||0}}扎
</view>
<view class="name">
上月成交
@@ -61,7 +61,7 @@
</view>
<view class="tj-each">
<view class="num">
- 0扎
+ {{tj.dealCountToday||0}}扎
</view>
<view class="name">
今日成交
@@ -69,7 +69,7 @@
</view>
<view class="tj-each">
<view class="num">
- 0扎
+ {{tj.dealCountDay30||0}}扎
</view>
<view class="name">
近30天成交
@@ -77,25 +77,25 @@
</view>
</view>
<view class="flex tj-container">
- <view class="tj-each">
+ <view class="tj-each" @click="selftype=='supplier'&&goto('/pages/order/order-delivery?range=today',true)">
<view class="num">
- {{dto.orderCountToday||0}}扎
+ {{tj.orderCountToday||0}}单
</view>
<view class="name">
今日订单数
</view>
</view>
- <view class="tj-each">
+ <view class="tj-each" @click="selftype=='supplier'&&goto('/pages/order/order-delivery?range=yesterday',true)">
<view class="num">
- {{dto.orderCountYesterday||0}}扎
+ {{tj.orderCountYesterday||0}}单
</view>
<view class="name">
昨日订单数
</view>
</view>
- <view class="tj-each">
+ <view class="tj-each" @click="selftype=='supplier'&&goto('/pages/order/order-delivery?range=month',true)">
<view class="num">
- {{dto.orderCountMonth||0}}扎
+ {{tj.orderCountMonth||0}}单
</view>
<view class="name">
本月订单数
@@ -106,15 +106,17 @@
<view class="item-container flex m-t-12" style="padding: 34rpx 44rpx;" v-if="selftype=='supplier'">
<view class="rate-view flex1" style="max-width: 140rpx;">
<view class="title">售后率</view>
- <view class="title" style="color: red;">{{tj.salesRate||0}}%</view>
+ <view class="title" style="color: red;">{{((tj.salesRate||0)*100).toFixed(2)}}%</view>
</view>
- <view class="tj-panel pink flex1" @click="goto('/pages/order/order-delivery?status=ARRIVED',true)">
+ <view class="tj-panel pink flex1"
+ @click="goto('/pages/order/order-delivery?status=PENDING&range=today',true)">
<view class="name">今日待配送</view>
- <view class="title">{{tj.deliverCount||0}}扎</view>
+ <view class="title">{{tj.deliverCount||0}}单</view>
</view>
- <view class="tj-panel green flex1" @click="goto('/pages/order/order-delivery?status=',true)">
+ <view class="tj-panel green flex1"
+ @click="goto('/pages/order/order-delivery?range=today',true)">
<view class="name green">今日配送汇总</view>
- <view class="title">{{tj.deliverTotal||0}}扎</view>
+ <view class="title">{{tj.deliverTotal||0}}单</view>
</view>
</view>
<view class="m-t-12" @click="getNoticeMore">
@@ -132,6 +134,14 @@
src="/static/images/partner/user/user-icon-ddgl.png" mode="scaleToFill" />
</view>
<view class="order-desc tg">订单管理</view>
+ </view>
+ <view class="nav row margin-tb" v-if="selftype==='supplier'"
+ @click="goto('/sub_pages/supplier/order-manage/order-manage',true)">
+ <view class="img-c">
+ <image class="icon margin-bottom order-icon ddgl"
+ src="/static/images/partner/user/user-icon-ddgl.png" mode="scaleToFill" />
+ </view>
+ <view class="order-desc tg">订单统计</view>
</view>
<view class="nav row margin-tb"
@@ -157,7 +167,7 @@
</view>
<view class="order-desc tg">加价配置</view>
</view>
- <view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-sale/order-sale',true)">
+ <view class="nav row margin-tb" @click="goto('/pages/order/order-sale/order-sale',true)">
<view class="img-c">
<image class="icon margin-bottom order-icon shlp"
src="/static/images/supplier/user/user-icon-shlp.png" mode="scaleToFill" />
@@ -206,8 +216,8 @@
},
onShareAppMessage() {
let that = this;
- var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
- currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
@@ -217,8 +227,8 @@
},
onShareTimeline() {
let that = this;
- var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
- currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
@@ -228,6 +238,7 @@
},
async onPullDownRefresh() {
await this.$store.dispatch('getCurrentInfo')
+ await getTj(true)
uni.stopPullDownRefresh()
},
onLoad(options) {
@@ -235,18 +246,29 @@
const urlcode = options.url && decodeURIComponent(options.url) || ''
},
onShow() {
- this.getTj()
+ this.getTj(true)
},
created() {
//公告
- this.$http.request('get', '/api/pub/announcement/list', {
+ var type = ''
+ // #ifdef PUB_CUSTOMER
+ type = 'customer'
+ // #endif
+ // #ifdef PUB_SUPPLIER
+ type = 'supplier'
+ // #endif
+ // #ifdef PUB_PARTNER
+ type = 'partner'
+ // #endif
+
+ this.$http.request('get', '/api/pub/announcement/list/'+type, {
params: {
size: 5,
status: 'A'
}
}).then(res => {
if (res.code == 0) {
- this.noticeList = (res.data && res.data.records || [])
+ this.noticeList = (res.data && res.data || [])
console.log('this.noticeList', this.noticeList)
if (this.noticeList.length > 0) {
this.currentNotice = this.noticeList[0]
@@ -409,10 +431,10 @@
},
})
},
- getTj() {
+ getTj(refresh=false) {
// /api/supplier/delivery
- if (this.currentInfo.id && this.currentInfo.id !== this.cacheUserId) {
+ if (this.currentInfo.id && (this.currentInfo.id !== this.cacheUserId || refresh)) {
this.cacheUserId = this.currentInfo.id
let that = this
setTimeout(() => {
--
Gitblit v1.9.3