From 1d782559b682f7eb7a374c2e8017ff65cb941e52 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 17:25:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
pages/home/supplier-home.vue | 77 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 19 deletions(-)
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 7862cbc..02eec7a 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -13,11 +13,28 @@
</view>
<view class="flex user-info" v-if="currentInfo&&(currentInfo.id)">
+
+ <image class="user-icon" v-if="
+ (currentInfo.customerDTO&¤tInfo.customerDTO.cover)
+ ||(currentInfo.supplierDTO&¤tInfo.supplierDTO.cover)
+ ||(currentInfo.partnerDTO&¤tInfo.partnerDTO.cover)
+ || currentInfo.picture
+ " :src="
+ (currentInfo.customerDTO&¤tInfo.customerDTO.cover)
+ ||(currentInfo.supplierDTO&¤tInfo.supplierDTO.cover)
+ ||(currentInfo.partnerDTO&¤tInfo.partnerDTO.cover)
+ || currentInfo.picture
+ " mode="scaleToFill"></image>
+
+ <image class="user-icon" v-else
+ src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
+ mode="scaleToFill"></image>
+
<!-- 头像 -->
- <image class="user-icon" v-if="!currentInfo.picture"
+ <!-- <image class="user-icon" v-if="!currentInfo.picture"
src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
mode="aspectFit"></image>
- <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>
+ <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image> -->
<view class="name">
<view class="t1">
@@ -53,7 +70,7 @@
<view class="flex tj-container" v-if="selftype==='supplier'">
<view class="tj-each">
<view class="num">
- {{tj.dealCountLastMonth||0}}单
+ {{tj.dealCountLastMonth||0}}扎
</view>
<view class="name">
上月成交
@@ -61,7 +78,7 @@
</view>
<view class="tj-each">
<view class="num">
- {{tj.dealCountToday||0}}单
+ {{tj.dealCountToday||0}}扎
</view>
<view class="name">
今日成交
@@ -69,7 +86,7 @@
</view>
<view class="tj-each">
<view class="num">
- {{tj.dealCountDay30||0}}单
+ {{tj.dealCountDay30||0}}扎
</view>
<view class="name">
近30天成交
@@ -77,7 +94,7 @@
</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">
{{tj.orderCountToday||0}}单
</view>
@@ -85,7 +102,7 @@
今日订单数
</view>
</view>
- <view class="tj-each">
+ <view class="tj-each" @click="selftype=='supplier'&&goto('/pages/order/order-delivery?range=yesterday',true)">
<view class="num">
{{tj.orderCountYesterday||0}}单
</view>
@@ -93,7 +110,7 @@
昨日订单数
</view>
</view>
- <view class="tj-each">
+ <view class="tj-each" @click="selftype=='supplier'&&goto('/pages/order/order-delivery?range=month',true)">
<view class="num">
{{tj.orderCountMonth||0}}单
</view>
@@ -106,15 +123,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)*100}}%</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 +151,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 +184,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" />
@@ -228,6 +255,7 @@
},
async onPullDownRefresh() {
await this.$store.dispatch('getCurrentInfo')
+ await getTj(true)
uni.stopPullDownRefresh()
},
onLoad(options) {
@@ -235,18 +263,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 +448,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