From 78abd5572d7dbf45124ed30a06fbffbb236066b7 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 09 八月 2024 19:17:37 +0800
Subject: [PATCH] update质检
---
pages/order/order-delivery-detail.vue | 13 +++++++++++--
sub_pages/supplier/print/print-list.vue | 9 ++++++++-
sub_pages/partner/delivery/delivery-detail.vue | 4 ++--
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/pages/order/order-delivery-detail.vue b/pages/order/order-delivery-detail.vue
index 58ec465..c281216 100644
--- a/pages/order/order-delivery-detail.vue
+++ b/pages/order/order-delivery-detail.vue
@@ -19,7 +19,13 @@
this.status = options.status || ''
this.query.id = this.id
}
+ // // #ifdef PUB_PARTNER
+ // this.listApi = '/api/partner/delivery/list/items'
+ // // #endif
+ // // #ifdef PUB_CUSTOMER
+ // // #endif
this.listApi = '/api/supplier/delivery/list/items'
+
await this.getList()
},
@@ -110,8 +116,9 @@
</image>
<view class="flex1">
<view class=" flex">
- <view class="title"><span class="level" v-if="item.flowerCategory">{{ item.flowerCategory || ''}}</span><span
- class="level">{{ item.flowerLevelStr || ''}}</span>{{item.flowerName }}
+ <view class="title"><span class="level"
+ v-if="item.flowerCategory">{{ item.flowerCategory || ''}}</span><span
+ class="level">{{ item.flowerLevelStr || ''}}</span>{{item.flowerName }}
</view>
</view>
<view class="each-list ">
@@ -265,6 +272,7 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
.level {
font-weight: 400;
font-size: 28rpx;
@@ -301,6 +309,7 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
.level {
font-weight: 400;
font-size: 28rpx;
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index 1b95d50..bef1835 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -208,8 +208,8 @@
<view class="line-gray">
</view>
- <view class="buttons">
- <view class="button button-0 m-r-0 m-l-a w-fit" @click="printDeliveryOrder(item)">打印</view>
+ <view class="buttons m-r-0 m-l-a w-fit">
+ <view class="button button-0 " @click="printDeliveryOrder(item)">打印</view>
</view>
</view>
</view>
diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index 1a813de..9bf47d5 100644
--- a/sub_pages/supplier/print/print-list.vue
+++ b/sub_pages/supplier/print/print-list.vue
@@ -145,12 +145,19 @@
var t = this.$storage.getItem('cache_delivery_order_print') || ''
if (t) {
this.item = JSON.parse(t)
+ var apitype = ''
+ // #ifdef PUB_SUPPLIER
+ apitype = '/supplier'
+ // #endif
+ // #ifdef PUB_PARTNER
+ // apitype = '/supplier'
+ // #endif
//获取详情接口
this.$message.showLoading()
const {
code,
data
- } = await this.$http.request('get', '/api/supplier/delivery/list/items/view', {
+ } = await this.$http.request('get', `/api${apitype}/delivery/list/items/view`, {
params: {
id: this.item.id
}
--
Gitblit v1.9.3