From b440f7f88d21aad6b37fe2fd4bda3a2e7870f805 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Fri, 6 Aug 2021 09:39:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=BB=91=E5=AE=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/common/api.js             |  4 ++--
 canteen/pages/purchase/detail.vue | 10 +++++-----
 supplier/common/api.js            |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/canteen/common/api.js b/canteen/common/api.js
index 2c4b17f..b92a7c9 100644
--- a/canteen/common/api.js
+++ b/canteen/common/api.js
@@ -1,8 +1,8 @@
 // appId: 正式 null | 测试 null
 export const DEV = "dev"; // dev 测试 | prod 正式
 export const VERSION = '1.0.0'; // 版本号
-// export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
-export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址
+export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
+// export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址
 export const PRODURL = ''; // 正式服请求地址
 
 export const API_CANTEEN_LOGIN = '/api/canteen/login'; // 登录
diff --git a/canteen/pages/purchase/detail.vue b/canteen/pages/purchase/detail.vue
index fe0a5fa..4def20d 100644
--- a/canteen/pages/purchase/detail.vue
+++ b/canteen/pages/purchase/detail.vue
@@ -145,13 +145,13 @@
 						key: 'supplier_name'
 					},{
 						key: 'pre_tax_price',
-						label: '税前价格'
+						label: '含税价'
 					},{
 						key: 'total_tax_amount',
-						label: '含税合计'
+						label: '含税价合计'
 					},{
 						key: 'after_tax_price',
-						label: '税后价格'
+						label: '不含税价'
 					},{
 						key: 'total_non_tax_amount',
 						label: '不含税合计'
@@ -294,8 +294,8 @@
 							quality_level: item.material.quality_level,
 							m_sn: item.material.m_sn,
 							supplier_name: order.supplier.supplier_name,
-							pre_tax_price: item.total_tax_amount,
-							after_tax_price: item.total_non_tax_amount,
+							pre_tax_price: item.tax_price,
+							after_tax_price: item.non_tax_price,
 							purchase_limit: item.p_order_item.purchase_limit,
 							purchase_number: item.purchase_number,
 							unit: item?.material?.unit?.unit_name || '',
diff --git a/supplier/common/api.js b/supplier/common/api.js
index 6878b15..c35580b 100644
--- a/supplier/common/api.js
+++ b/supplier/common/api.js
@@ -1,8 +1,8 @@
 // appId: 正式 null | 测试 null
 export const DEV = "dev"; // dev 测试 | prod 正式
 export const VERSION = '1.0.0'; // 版本号
-export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址
-// export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
+// export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址
+export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
 export const PRODURL = ''; // 正式服请求地址
 
 export const API_SUPPLIER_INDEX = '/api/supplier/index'; // 落地页