From a165a1551f90457cca0d7c16fa8151da75ac1cfa Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 08 八月 2024 17:42:08 +0800
Subject: [PATCH] update 统计跳转和签收
---
manifest.json | 2 +-
pages/home/supplier-home.vue | 14 ++++++++------
pages/order/order-delivery.vue | 21 ++++++++++++++++++---
3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/manifest.json b/manifest.json
index 782394c..f2448bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- "appid" : "wx6d0ecc4e18710458",
+ "appid" : "wx3203fd935a6ffe09",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 7862cbc..cc67058 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -77,7 +77,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 +85,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 +93,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,13 +106,15 @@
<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>
- <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>
diff --git a/pages/order/order-delivery.vue b/pages/order/order-delivery.vue
index d94e390..1f5537f 100644
--- a/pages/order/order-delivery.vue
+++ b/pages/order/order-delivery.vue
@@ -1,13 +1,13 @@
<template>
<view class="list-container order-sale supplier">
- <view class="component-tab-container m-t-12">
+ <view class="component-tab-container m-t-12" v-if="!range||range=='today'">
<view class="tab-item" :class="[query.status==''?'cur':'']" @click="changeIndex('')">全部订单</view>
<view class="tab-item" :class="[query.status=='PENDING'?'cur':'']" @click="changeIndex('PENDING')">待入位
</view>
<view class="tab-item" :class="[query.status=='ARRIVED'?'cur':'']" @click="changeIndex('ARRIVED')">已入位
</view>
</view>
- <view class="m-t-12">
+ <view class="m-t-12" v-if="!range||range=='today'">
<view class="m-l-a m-r-20 w-fit flex">
<radio :checked="selecttoday" @click="changeSelecrRange"></radio>
<view>只查看今日</view>
@@ -113,15 +113,28 @@
status: '',
},
selecttoday: true,
+ range: '', //today的话才有查询条件，其他的话，不展示顶部查询条件（yesterday、month、todayall)
}
},
onLoad(options) {
if (options.status) {
this.query.status = options.status || ''
}
+ this.range = options.range || ''
//目前应该是admin（质检人员不会用这个页面）
+ if (this.range === 'todayall') {
+ this.listApi = '/api/supplier/delivery/list/today'
- this.listApi = '/api/supplier/delivery/list/today'
+ } else if (this.range === 'month') {
+ this.listApi = '/api/supplier/delivery/list/month'
+
+ } else if (this.range === 'yesterday') {
+ this.listApi = '/api/supplier/delivery/list/yesterday'
+
+ } else {
+ this.listApi = '/api/supplier/delivery/list/today'
+ }
+
// this.listApi = '/api/supplier/delivery/list'
this.getList()
@@ -242,6 +255,7 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
.level {
font-weight: 400;
font-size: 28rpx;
@@ -278,6 +292,7 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
.level {
font-weight: 400;
font-size: 28rpx;
--
Gitblit v1.9.3