From 3aefba7a92eb949e8f7cec047c410f2a5c7c85b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 20 Aug 2021 11:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/lf-previewImage/lf-previewImage.vue  | 13 +++++++++++++
 canteen/pages/purchase/detail.vue                   |  6 +++---
 canteen/pages/purchase/receipt.vue                  |  2 +-
 supplier/pages/gonghuo/detail.vue                   | 10 +++++++---
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/canteen/components/lf-previewImage/lf-previewImage.vue b/canteen/components/lf-previewImage/lf-previewImage.vue
index acfe67e..11098ff 100644
--- a/canteen/components/lf-previewImage/lf-previewImage.vue
+++ b/canteen/components/lf-previewImage/lf-previewImage.vue
@@ -14,6 +14,8 @@
 				<movable-area class="movable-area" :scale-area="true">
 					<movable-view class="movable-view" direction="all" :scale="true" :inertia="true" @scale="scale" :scale-value="scale_values[swiper_current]">
 						<image :src="item" class="swiper-image" mode="aspectFit" @mousewheel.stop="mousewheel" @longpress="longpress"></image>
+						<!-- 判断 -->
+						<!-- <view class="loading-failed">图片加载失败</view> -->
 					</movable-view>
 				</movable-area>
 				<!-- 控制器 -->
@@ -308,6 +310,17 @@
 			}
 		}
 	}
+	.loading-failed{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: red;
+	}
 	// 轻提示框样式
 	/deep/.uni-sample-toast{
 		z-index: 1002;
diff --git a/canteen/pages/purchase/detail.vue b/canteen/pages/purchase/detail.vue
index 8f3023b..1ef6f54 100644
--- a/canteen/pages/purchase/detail.vue
+++ b/canteen/pages/purchase/detail.vue
@@ -3,7 +3,7 @@
 		<block v-if="$isRight(order)">
 			<view class="head">
 				<view class="lf-row-between list">
-					<lf-image :src="order.supplier.logo" errSrc="../../static/images/supplier_avatar.png" class="image"></lf-image>
+					<lf-image :src="order.supplier.logo_url" errSrc="../../static/images/supplier_avatar.png" class="image"></lf-image>
 					<view class="info">
 						<view class="lf-font-32 lf-color-black lf-font-bold">{{ order.supplier.supplier_name }}</view>
 						<view class="lf-font-24 lf-color-555">{{ order.supplier.address }}</view>
@@ -218,9 +218,9 @@
 					let canteen_voucher = [];
 					order.voucher.map(item => {
 						if(item.client_type == '供应商'){
-							supplier_voucher.push(item.voucher_pic);
+							supplier_voucher.push(item.voucher_pic_url);
 						}else if(item.client_type == '食堂'){
-							canteen_voucher.push(item.voucher_pic);
+							canteen_voucher.push(item.voucher_pic_url);
 						}
 					})
 					this.supplier_voucher = supplier_voucher;
diff --git a/canteen/pages/purchase/receipt.vue b/canteen/pages/purchase/receipt.vue
index bcd5738..5982cd0 100644
--- a/canteen/pages/purchase/receipt.vue
+++ b/canteen/pages/purchase/receipt.vue
@@ -298,7 +298,7 @@
 					let voucher = res.data?.order?.voucher || [];
 					voucher = voucher.filter(item => item.client_type == '食堂');
 					this.is_upload = voucher.length > 0;
-					this.upload_list = voucher.map(item => item.voucher_pic);
+					this.upload_list = voucher.map(item => item.voucher_pic_url);
 				})
 			},
 			inputBlur(current, key, event){
diff --git a/supplier/pages/gonghuo/detail.vue b/supplier/pages/gonghuo/detail.vue
index a07865d..a4c4880 100644
--- a/supplier/pages/gonghuo/detail.vue
+++ b/supplier/pages/gonghuo/detail.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="head">
 			<view class="lf-row-between list" v-if="order.canteen">
-				<lf-image class="image" :src="order.canteen.logo" errSrc="../../static/images/canteen_avatar.png"></lf-image>
+				<lf-image class="image" :src="order.canteen.logo_url" errSrc="../../static/images/canteen_avatar.png"></lf-image>
 				<view class="info">
 					<view class="lf-font-32 lf-color-black lf-font-bold">{{ order.canteen.canteen_name }}</view>
 					<view class="lf-font-24 lf-color-555">{{ order.canteen.address }}</view>
@@ -244,9 +244,9 @@
 					let canteen_voucher = [];
 					order.voucher.map(item => {
 						if(item.client_type == '供应商'){
-							supplier_voucher.push(item.voucher_pic);
+							supplier_voucher.push(item.voucher_pic_url);
 						}else if(item.client_type == '食堂'){
-							canteen_voucher.push(item.voucher_pic);
+							canteen_voucher.push(item.voucher_pic_url);
 						}
 					})
 					this.supplier_voucher = supplier_voucher;
@@ -601,4 +601,8 @@
 	/deep/.u-drawer{
 		z-index: 999 !important;
 	}
+	// 警告提示组件
+	/deep/.popup-box .content .popup-desc{
+		text-align: left;
+	}
 </style>