From 7418def7dba7a6f84017e8215b299dbd9ce2a016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 28 Jul 2021 19:25:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=90=BD=E5=9C=B0=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/canteen/index/index.vue | 6 +++---
 pages/supply/index/index.vue  | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pages/canteen/index/index.vue b/pages/canteen/index/index.vue
index c9cd443..c2a5c78 100644
--- a/pages/canteen/index/index.vue
+++ b/pages/canteen/index/index.vue
@@ -1,9 +1,9 @@
 <template>
 	<view>
 		<view class="lf-row-center lf-flex-column head">
-			<image :src="canteen.logo"></image>
-			<view class="lf-m-t-20 lf-font-32 lf-font-bold lf-color-black">{{ canteen.ctl_man }}</view>
-			<view class="lf-font-28 lf-color-555 lf-m-t-10">{{ canteen.purchase_man }}</view>
+			<image :src="canteen.avatar"></image>
+			<view class="lf-m-t-20 lf-font-32 lf-font-bold lf-color-black">{{ canteen.name }}</view>
+			<view class="lf-font-28 lf-color-555 lf-m-t-10">{{ canteen.user.canteen.remark }}</view>
 		</view>
 		<view class="list">
 			<view class="lf-row-between list-item" hover-class="lf-opacity"
diff --git a/pages/supply/index/index.vue b/pages/supply/index/index.vue
index 5b8611f..193ee33 100644
--- a/pages/supply/index/index.vue
+++ b/pages/supply/index/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="lf-row-center lf-flex-column head">
-			<image :src="supplier.logo"></image>
-			<view class="lf-m-t-20 lf-font-32 lf-font-bold lf-color-black">{{ supplier.subject_name }}</view>
+			<image :src="supplier.avatar"></image>
+			<view class="lf-m-t-20 lf-font-32 lf-font-bold lf-color-black">{{ supplier.name }}</view>
 		</view>
 		<view class="list">
 			<view class="lf-row-between list-item" hover-class="lf-opacity"
@@ -61,7 +61,8 @@
 				this.$http(this.API.API_SUPPLIER_INDEX).then(res => {
 					this.supplier = res.data.supplier;
 					this.block_list = res.data.block;
-					getApp().globalData.supplier_id = res.data.supplier.id;
+					// 不用存supplier_id
+					// getApp().globalData.supplier_id = res.data.supplier.id;
 				});
 			}
 		}