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/supplier/order-manage/order-manage.vue | 20 ++++++++++++++------ 1 files changed, 14 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..dae3542 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"> 结算详情 @@ -34,6 +41,7 @@ } }, onLoad() { + this.page.size=15 this.listApi = '/api/supplier/delivery/mine/list' this.getList() @@ -49,12 +57,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 +75,7 @@ font-size: 28rpx; font-weight: 600; background-color: #fff; - + line-height: 60rpx; .buttons { display: flex; margin-left: auto; -- Gitblit v1.9.3