From 12c48f04f9ea1a57781a6e8c5c9ef901eaad8518 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 22:31:17 +0800
Subject: [PATCH] merge 1.小程序-花店:1.1-浏览记录建议改成显示30条数据; 1.2-增加一个一键清空已失效商品 2.小程序-花店:增加热区跳转进入店铺 及 点击头像和名字也可以跳转进入店铺 3.小程序-花店:轮播图指示点优化去掉 4.小程序-花店:登录,注册失去焦点验证手机号

---
 sub_pages/supplier/order-manage/order-manage.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sub_pages/supplier/order-manage/order-manage.vue b/sub_pages/supplier/order-manage/order-manage.vue
index 019226d..bee4fe7 100644
--- a/sub_pages/supplier/order-manage/order-manage.vue
+++ b/sub_pages/supplier/order-manage/order-manage.vue
@@ -3,14 +3,21 @@
 	<view>
 		<view class="p15" style="min-height: calc(100vh - 260rpx);">
 			<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
+			<view v-else class="m-b-24">
+				<view class="notice-item flex">
+					<view class="m-r-20">送货日期</view>
+					<view class="num m-l-15 m-r-10">数量</view>
+					<view class="price t-red m-l-0 m-r-a">汇总金额</view>
+				</view>
+			</view>
 			<view v-for="(item,index) in list" :key="index" class="m-b-24">
 				<view class="notice-item flex">
-					<view>{{item.date}}</view>
+					<view class="m-r-10">{{item.date}}</view>
 					<view class="num m-auto">{{item.num || 0}}</view>
 					<view class="price t-red m-auto">¥{{item.price || 0}}</view>
 					<view class="buttons m-l-a m-r-0">
-						<view @click.stop="toDetailFlower(item)" class="button button-1 m-r-10">
-							商品详情
+						<view @click.stop="toDetailFlower(item)" class="button button-1 m-r-0">
+							送货单
 						</view>
 						<view @click.stop="toDetailSettlement(item)" class="m-l-10 button button-0">
 							结算详情
@@ -49,12 +56,12 @@
 		methods: {
 			toDetailFlower(item) {
 				uni.navigateTo({
-					url: `/sub_pages/supplier/order-manage/order-manage-flower?date=${item.date}`
+					url: `/sub_pages/supplier/order-manage/order-manage-flower?day=${item.date}`
 				})
 			},
 			toDetailSettlement(item) {
 				uni.navigateTo({
-					url: `/sub_pages/supplier/order-manage/order-manage-settlement?date=${item.date}`
+					url: `/sub_pages/supplier/order-manage/order-manage-settlement?day=${item.date}`
 				})
 			},
 		}
@@ -67,7 +74,7 @@
 		font-size: 28rpx;
 		font-weight: 600;
 		background-color: #fff;
-
+		line-height: 60rpx;
 		.buttons {
 			display: flex;
 			margin-left: auto;

--
Gitblit v1.9.3