From c5b212b92cbf199532b795a1a45d7a6d1152711d Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Tue, 10 Mar 2026 13:43:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package2/other/newLogisticsBill.vue | 52 +++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/package2/other/newLogisticsBill.vue b/package2/other/newLogisticsBill.vue
index dfa491b..69625a0 100644
--- a/package2/other/newLogisticsBill.vue
+++ b/package2/other/newLogisticsBill.vue
@@ -135,10 +135,13 @@
 			<view class="content">
 				<view class="name-box" style="float: left;">到达站</view>
 				<view style="width: 80%;float: left;">
-					<uni-data-select class="uni-data-select" :localdata="arrivalStationList"
-						v-model="voiceData.arrivalStationId" placeholder="到达站" :clear="false"
-						@change="arrivalStationChange" style="width: 60%;">
-					</uni-data-select>
+					<uni-combox style="width: 60%;height: 76rpx !important;"
+					      label=" " 
+					      v-model="voiceData.arrivalStationName" 
+					      :candidates="arrivalStationList1" 
+					      placeholder="请输入或选择到达站" 
+					      @input="arrivalStationChange"
+					    ></uni-combox>
 				</view>
 			</view>
 			<view class="content" style="min-height: 80rpx;">
@@ -546,6 +549,7 @@
 				addressType: '',
 				isVoice: false,
 				priceCurrent: 0,
+				arrivalStationList1:[],
 				priceItems: [{
 					value: 0,
 					name: '否'
@@ -707,7 +711,9 @@
 				let remark = uni.getStorageSync('remark')
 				this.shopRemark = remark.split('\n');
 			}
-			
+			if(uni.getStorageSync('transCompany') =='1751797599075176448'){
+				this.voiceData.cost = 2
+			}
 			if (option.editData) {
 				this.isEdit = true
 				let editData = JSON.parse(option.editData)
@@ -1143,6 +1149,7 @@
 									this.voiceData.landingFee = Number(res.data.result[i].landingFeeRules)
 									this.voiceData.deliveryFee = res.data.result[i].deliveryFeeRules
 								}
+								this.arrivalStationList1.push(res.data.result[i].stationName)
 							}
 							setTimeout(res1 => {
 								
@@ -1271,7 +1278,7 @@
 			arrivalStationChange(e) {
 				
 				for (let i = 0; i < this.arrivalStationList.length; i++) {
-					if (this.arrivalStationList[i].id == e) {
+					if (this.arrivalStationList[i].stationName == e || this.arrivalStationList[i].id == e) {
 						this.voiceData.arrivalStationId = this.arrivalStationList[i].id
 						this.voiceData.arrivalStationName = this.arrivalStationList[i].stationName
 						this.voiceData.freight = (this.voiceData.weight * this.arrivalStationList[i].freightRules).toFixed(
@@ -2060,12 +2067,15 @@
 									
 									if (this.isEdit != true) {
 										
-										if(uni.getStorageSync('transCompany') == '1899370468356526080' || uni.getStorageSync('transCompany') == '1751796589518786560' || uni.getStorageSync('transCompany') == '1899371352842964992' || uni.getStorageSync('transCompany') == '1782981706819702784'){
-											if(uni.getStorageSync('deviceId') != '' && uni.getStorageSync('deviceId') != undefined){
-												this.huoqufuwu(uni.getStorageSync('deviceId'))
-											}else{
+										if(uni.getStorageSync('transCompany') == '1899370468356526080' || uni.getStorageSync('transCompany') == '1751796589518786560' || uni.getStorageSync('transCompany') == '1899371352842964992' || uni.getStorageSync('transCompany') == '1782981706819702784' || uni.getStorageSync('transCompany') == '1751797599075176448'){
+											console.log('打印数据',uni.getStorageSync('deviceId'))
+											// if(uni.getStorageSync('deviceId') != '' && uni.getStorageSync('deviceId') != undefined){
+											// 	console.log('11111111111')
+											// 	this.huoqufuwu(uni.getStorageSync('deviceId'))
+											// }else{
+											// 	console.log('2222222')
 												this.handlePrintTap()
-											}
+											// }
 											this.voiceData.orderNumber = res.data.result.orderNumber
 										}else{
 											this.clearData("1")
@@ -2275,14 +2285,15 @@
 			huoqufuwu(deviceId) {
 				let that = this;
 				//获取服务
-				wx.getBLEDeviceServices({ //666
+				uni.getBLEDeviceServices({ //666
 					deviceId: deviceId, // 搜索到设备的 deviceId
 					success: (res5) => {
+						console.log('333333333')
 						that.duxietezhengzhi(deviceId, res5)
 					},
 					fail: (res) => {
 						that.tui.toast('连接失败，请重启蓝牙或删除小程序重新进入-4', res)
-						
+						console.log('777777777',res)
 						wx.closeBLEConnection({
 							deviceId: deviceId,
 							success(res2) {
@@ -2308,7 +2319,7 @@
 					deviceId: deviceId, // 搜索到设备的 deviceId
 					serviceId: res5.services[0].uuid, // 上一步中找到的某个服务
 					success: (res6) => {
-						
+						console.log('444444444')
 						for (let i = 0; i < res6.characteristics.length; i++) {
 							let item = res6.characteristics[i]
 							that.startNoticeBle(deviceId, res5.services[0].uuid, res6.characteristics[2].uuid)
@@ -2364,6 +2375,9 @@
 					uni.hideLoading()
 					that.clearData('')
 					that.$forceUpdate()
+					uni.closeBLEConnection({
+						deviceId: uni.getStorageSync('deviceId')
+					})
 				})
 			},
 			clearData(type){
@@ -2417,6 +2431,9 @@
 					receivingUserId: '', // 收货站人id
 					receivingUserName: '' // 收货站人名称
 				}
+				if(uni.getStorageSync('transCompany') =='1751797599075176448'){
+					this.voiceData.cost = 2
+				}
 				that.$forceUpdate()
 			},
 			getPrintByte(data) {
@@ -2636,6 +2653,10 @@
 									jiesuan = '提付'
 								}
 								strCmd1 += blesdk.addCPCLText('30', '290', '24', '0', '0', ('结算方式:' + jiesuan))
+								if(uni.getStorageSync('transCompany') != '1751796589518786560'){
+									strCmd1 += blesdk.addCPCLText('300', '290', '24', '0', '0', ('总运费:' + that.getPrintByte(Number(that.voiceDataPrint.freight) + Number(that.voiceDataPrint.cost)) + '元'))
+								}
+								
 							}else{
 								let beginWidth = 0
 								let beginNum = 0
@@ -3207,4 +3228,7 @@
 		border: 1px solid #FFE4E1;
 		color: #87CEFA;
 	}
+	.uni-combox{
+		height: 76rpx !important;
+	}
 </style>
\ No newline at end of file