From c9ece393fc028ffecca0915d1b9af62d51b5aef6 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 13 八月 2024 17:21:19 +0800
Subject: [PATCH] 1
---
pages/order/order-delivery.vue | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/pages/order/order-delivery.vue b/pages/order/order-delivery.vue
index af63691..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>
@@ -35,7 +35,9 @@
</image>
<view class="flex1">
<view class=" flex">
- <view class="title">{{item.flowerName }}
+ <view class="title"><span
+ class="level">{{ item.flowerCategory || ''}}</span><span
+ class="level">{{ item.flowerLevelStr || ''}}</span>{{item.flowerName }}
</view>
</view>
<view class="each-list">
@@ -111,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()
@@ -240,6 +255,14 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
+ .level {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #20613D;
+ line-height: 40rpx;
+ margin-right: 20rpx;
+ }
}
.status {
@@ -269,6 +292,14 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
+ .level {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #20613D;
+ line-height: 40rpx;
+ margin-right: 20rpx;
+ }
}
.desc {}
--
Gitblit v1.9.3