From f65992f8134ca462868757e675de6aa06200aacb Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 19:01:20 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0

---
 sub_pages/supplier/print/print-list.vue |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index e544fba..db2c79d 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
 					}
@@ -529,7 +536,7 @@
 					var flowerCategory = that.item.flowerCategory
 					if (flowerCategory) {
 						//只取二级分类
-						var tarr = flowerCategory.splite("/")
+						var tarr = flowerCategory.split("/")
 						if (tarr.length >= 2) {
 							flowerCategory = tarr[tarr.length - 1]
 						}
@@ -667,10 +674,13 @@
 					characteristicId: that.writeCharaterId,
 					value: buf,
 					success: function(res) {
-						console.log(res)
+						// console.log(res)
 					},
 					fail: function(e) {
 						console.log(e)
+						// wx.showToast({
+						// 	title: '打印失败:' + e,
+						// })
 					},
 					complete: function() {
 						currentTime++

--
Gitblit v1.9.3