From 41426416bd250130129fb8a547bee874375768a8 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:47:15 +0800
Subject: [PATCH] 1.付款：改成15分钟，并使用服务器时间进行倒计时 2.优惠券中心：已经领取（达到最大次数），显示已领取且置灰，未领取根据创建时间放前面，已领取根据首次时间正序排序 3.购物车-提交订单：自动根据订单金额选择合适优惠券
---
sub_pages/partner/delivery/delivery-supplier-detail.vue | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/sub_pages/partner/delivery/delivery-supplier-detail.vue b/sub_pages/partner/delivery/delivery-supplier-detail.vue
index b6a4488..21180c3 100644
--- a/sub_pages/partner/delivery/delivery-supplier-detail.vue
+++ b/sub_pages/partner/delivery/delivery-supplier-detail.vue
@@ -19,6 +19,9 @@
},
onLoad(options) {
this.query.supplierId = options.supplierId || ''
+ if(options.warehouseLocationCode){
+ this.query.warehouseLocationCode = options.warehouseLocationCode || ''
+ }
this.listApi = '/api/delivery/check/info/list'
@@ -88,7 +91,7 @@
<!-- 列表页面 -->
<view class="page-delivery">
<view class="p15" style="min-height: calc(100vh - 260rpx);">
- <view class="search-container m-t-12 flex">
+ <view class="search-container m-t-12 flex" v-if="!query.supplierId">
<view class="flex1 input">
<u-input placeholder="请输入供应商名称" v-model="query.supplierName">
<template slot="suffix">
@@ -146,13 +149,17 @@
<view class="form-item-value">{{ item.statusStr || '-' }}</view>
</view>
+ </view>
+ <view class="flex">
<view class="form-item flex1">
<view class="form-item-label">送达时间</view>
<view class="form-item-value">{{ item.arriveTime || '-' }}</view>
</view>
+
</view>
+
<view class="line-gray"></view>
<view class="flex buttons">
<!-- v-if="item.status==='ARRIVED'||item.status==='PENDING'" -->
--
Gitblit v1.9.3