From 7313766a639428113cc6bf9a6f7a66755bc91952 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 15 八月 2024 22:24:18 +0800
Subject: [PATCH] update 供应商的协议和商品情况更新
---
sub_pages/supplier/order-manage/order-manage.vue | 13 ++++++++++---
manifest.json | 2 +-
pages.json | 6 +++---
sub_pages/supplier/order-manage/order-manage-settlement.vue | 10 +++++-----
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/manifest.json b/manifest.json
index 2848179..f2448bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- "appid" : "wx1441324401626290",
+ "appid" : "wx3203fd935a6ffe09",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/pages.json b/pages.json
index 472fdb1..060f515 100644
--- a/pages.json
+++ b/pages.json
@@ -219,7 +219,7 @@
{
"path": "order-manage/order-manage",
"style": {
- "navigationBarTitleText": "订单管理",
+ "navigationBarTitleText": "送货单",
"enablePullDownRefresh": true
}
},
@@ -227,14 +227,14 @@
"path" : "order-manage/order-manage-settlement",
"style" :
{
- "navigationBarTitleText" : "配送结算明细"
+ "navigationBarTitleText" : "送货单结算明细"
}
},
{
"path" : "order-manage/order-manage-flower",
"style" :
{
- "navigationBarTitleText" : "配送商品明细"
+ "navigationBarTitleText" : "送货单"
}
}
// #endif
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index cdaf2a9..6e75864 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -38,19 +38,19 @@
</view>
<view class="flex form-item">
<view class="m-r-20 flex" style="min-width: 280rpx;">
- <view class="desc-gray m-r-10">下单时间</view>
- <view class="desc-gray ">{{item.orderTime||item.orderTime || '-'}}</view>
+ <view class="desc-gray m-r-5">下单时间</view>
+ <view class=" ">{{item.orderTime||item.orderTime || '-'}}</view>
</view>
<view class="flex flex1">
- <view class="flex1 text-center value "><span class="desc-gray m-r-10">数量</span>{{item.num||0}}扎
+ <view class="flex1 text-center value "><span class="desc-gray m-r-5">数量</span>{{item.num||0}}扎
</view>
<view class="flex1 text-center value"><span
- class="desc-gray m-r-10">合计</span>￥{{item.totalAmount||'0.00'}}</view>
+ class="desc-gray m-r-5">合计</span>￥{{item.totalAmount||'0.00'}}</view>
</view>
</view>
- <view>
+ <view v-if="item.status">
<view class="flex">
<view class="form-item">
<view class="label">服务费</view>
diff --git a/sub_pages/supplier/order-manage/order-manage.vue b/sub_pages/supplier/order-manage/order-manage.vue
index ba9ac7f..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 class="m-r-20">{{item.date}}</view>
- <view class="num m-auto">{{item.num || 0}}单</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-0">
- 商品详情
+ 送货单
</view>
<view @click.stop="toDetailSettlement(item)" class="m-l-10 button button-0">
结算详情
--
Gitblit v1.9.3