diff --git a/pages.json b/pages.json
index adda29b..abcea56 100644
--- a/pages.json
+++ b/pages.json
@@ -133,7 +133,13 @@
 		{
 			"path": "pages/print/bluetoothPrinter",
 			"style": {
-				"navigationBarTitleText": "打印"
+				"navigationBarTitleText": "打印-测试1"
+			}
+		},
+		{
+			"path": "pages/print/bluetooth-mini-printer",
+			"style": {
+				"navigationBarTitleText": "打印-测试2"
 			}
 		},
 		{
diff --git a/pages/print/bluetooth-mini-printer.vue b/pages/print/bluetooth-mini-printer.vue
new file mode 100644
index 0000000..9c59c3d
--- /dev/null
+++ b/pages/print/bluetooth-mini-printer.vue
@@ -0,0 +1,341 @@
+<template>
+	<view>
+		<button @click="searchBle">搜索蓝牙</button>
+		<view style="margin-top: 30upx;" :key="index" v-for="(item,index) in devices">
+			<button style="width: 400upx; color: #0081FF;" @click="onConn(item)">{{item.name}}</button>
+		</view>
+		<button style="margin-top: 100upx;" @click="senBleLabel()">标签打印</button>
+		<textarea auto-height placeholder-style="color:#F76260" placeholder="请输入票据信息" v-model="piaojuText" />
+		<button style="margin-top: 100upx;" @click="senBleLabel2()">票据打印</button>
+		
+		<canvas :style="{width: canvasWidth +'px', height: canvasHeight +'px'}" canvas-id="firstCanvas" id="firstCanvas" class="firstCanvas" />
+	</view>
+
+
+</template>
+
+<script>
+	import * as tsc from '@/common/libs/tsc.js'
+	import * as esc from '@/common/libs/esc.js'
+	
+	export default {
+		data() {
+			return {
+				devices: [],
+				currDev: null,
+				connId: '',
+				piaojuText:'',
+				
+				tableDomId: '',
+				tableImgPath: '',
+				
+				canvasWidth: 800,
+				canvasHeight: 600,
+				
+				msg: ''
+			}
+		},
+		watch:{
+			msg(){
+				uni.showToast({
+					title: this.msg
+				})
+			}
+		},
+		onReady() {
+			this.renderFinish()
+		},
+		methods: {
+			destroyed: function() {
+				console.log("destroyed----------")
+				if (this.connId != '') {
+					uni.closeBLEConnection({
+						deviceId: this.connId,
+						success(res) {
+							console.log(res)
+						}
+					})
+				}
+
+			},
+			searchBle() {
+				var that = this
+				console.log("initBule")
+				uni.openBluetoothAdapter({
+					success(res) {
+						console.log("打开 蓝牙模块")
+						console.log(res)
+						that.onDevice()
+						uni.getBluetoothAdapterState({
+							success: function(res) {
+								console.log(res)
+								if (res.available) {
+									if (res.discovering) {
+										that.stopFindBule()
+									}
+									//搜索蓝牙
+									//开始搜寻附近的蓝牙外围设备
+									console.log("开始搜寻附近的蓝牙外围设备")
+									uni.startBluetoothDevicesDiscovery({
+										success(res) {
+											console.log(res)
+										}
+									})
+
+								} else {
+									console.log('本机蓝牙不可用')
+								}
+							},
+						})
+					}
+				})
+				
+				
+			},
+			onDevice(){
+				console.log("监听寻找到新设备的事件---------------")
+				var that = this
+				//监听寻找到新设备的事件
+				uni.onBluetoothDeviceFound(function(devices) {
+							console.log('--------------new-----------------------'+JSON.stringify(devices))
+							var re = JSON.parse(JSON.stringify(devices))
+							console.log(re.devices[0].name + "  " + re.devices[0].deviceId)
+								let name = re.devices[0].name
+								if (name != "未知设备") {
+									let deviceId = re.devices[0].deviceId
+									that.devices.push({
+										name: name,
+										deviceId: deviceId,
+										services: []
+									})
+								}
+							
+							
+							
+							
+				})
+				
+				
+			},
+			
+			stopFindBule() {
+				console.log("停止搜寻附近的蓝牙外围设备---------------")
+				uni.stopBluetoothDevicesDiscovery({
+					success(res) {
+						console.log(res)
+					}
+				})
+			},
+			onConn(item) {
+				var that = this
+				console.log("连接蓝牙---------------" + item.deviceId)
+				let deviceId = item.deviceId
+				uni.createBLEConnection({
+					deviceId: deviceId,
+					complete(res) {
+						if (res.errMsg == "createBLEConnection:ok") {
+							console.log("连接蓝牙-[" + item.name + "]--成功")
+							that.connId = deviceId;
+							that.currDev = item
+							setTimeout(function() {
+								that.getBLEServices(deviceId)
+							}, 2000)
+						} else {
+							console.log(res)
+						}
+						//连接成功 关闭搜索
+						that.stopFindBule()
+
+					},
+				})
+				
+			},
+
+			getBLEServices(_deviceId) {
+				var that = this;
+				let deviceId = _deviceId
+				console.log("获取蓝牙设备所有服务(service)。---------------")
+
+				uni.getBLEDeviceServices({
+					// 这里的 deviceId 需要已经通过 createBLEConnection 与对应设备建立链接
+					deviceId: deviceId,
+					complete(res) {
+						console.log(res)
+						let serviceId = ""
+
+						for (var s = 0; s < res.services.length; s++) {
+							console.log(res.services[s].uuid)
+							let serviceId = res.services[s].uuid
+							uni.getBLEDeviceCharacteristics({
+								// 这里的 deviceId 需要已经通过 createBLEConnection 与对应设备建立链接
+								deviceId: deviceId,
+								// 这里的 serviceId 需要在 getBLEDeviceServices 接口中获取
+								serviceId: serviceId,
+								success(res) {
+									var re = JSON.parse(JSON.stringify(res))
+
+									console.log('deviceId = [' + deviceId + ']  serviceId = [' + serviceId + ']')
+									for (var c = 0; c < re.characteristics.length; c++) {
+										if (re.characteristics[c].properties.write == true) {
+											let uuid = re.characteristics[c].uuid
+											console.log(' deviceId = [' + deviceId + ']  serviceId = [' + serviceId + '] characteristics=[' +
+												uuid)
+
+											for (var index in that.devices) {
+												if (that.devices[index].deviceId == deviceId) {
+													that.devices[index].services.push({
+														serviceId: serviceId,
+														characteristicId: uuid
+													})
+													break
+												}
+
+											}
+											console.log(JSON.stringify(that.devices))
+
+										}
+									}
+								}
+							})
+
+						}
+
+
+
+					},
+					fail(res) {
+						console.log(res)
+					},
+				})
+
+			},
+			senBlData(deviceId, serviceId, characteristicId,uint8Array) {
+				console.log('************deviceId = [' + deviceId + ']  serviceId = [' + serviceId + '] characteristics=[' +characteristicId+ "]")
+				var uint8Buf = Array.from(uint8Array);
+				function split_array(datas,size){
+					var result = {};
+					var j = 0
+					if(datas.length < size) {
+						size = datas.length
+					}
+					for (var i = 0; i < datas.length; i += size) {
+						result[j] = datas.slice(i, i + size)
+						j++
+					}
+					//result[j] = datas
+					console.log(result)
+					return result
+				}
+				var sendloop = split_array(uint8Buf, 20);
+				// console.log(sendloop.length)
+				function realWriteData(sendloop, i) {
+					var data = sendloop[i]
+					if(typeof(data) == "undefined"){
+						return
+					}
+					//console.log("第【" + i + "】次写数据"+data)
+					var buffer = new ArrayBuffer(data.length)
+					var dataView = new DataView(buffer)
+					for (var j = 0; j < data.length; j++) {
+						dataView.setUint8(j, data[j]);
+					}
+					uni.writeBLECharacteristicValue({
+						deviceId,
+						serviceId,
+						characteristicId,
+						value: buffer,
+						success(res) {
+							console.log('发送成功',i)
+							setTimeout(()=>{
+								realWriteData(sendloop, i + 1);
+							},100)
+							//realWriteData(sendloop, i + 1);
+							
+						},
+						fail(e) {
+							console.log('发送数据失败')
+							console.log(e)
+						}
+					})
+				}
+               var i = 0;
+				realWriteData(sendloop, i);
+			},
+			senBleLabel() {				
+				//标签模式
+				
+				uni.canvasGetImageData({
+					canvasId: 'firstCanvas',
+					x: 0,
+					y: 0,
+					width: this.canvasWidth,
+					height: this.canvasHeight,
+					success: (res)=> {
+						uni.hideLoading()
+						
+						let deviceId = this.currDev.deviceId;
+						let serviceId = this.currDev.services[0].serviceId;
+						let characteristicId = this.currDev.services[0].characteristicId;
+						
+						var command = tsc.jpPrinter.createNew()
+						command.init()
+						command.setSize(80, 60)
+						//command.setBox(0,0,800,600,1)
+						command.setGap(2)
+						command.setCls()
+						command.setText(50, 10, "TSS24.BF2", 1, 1, "打印测试")
+						command.setQR(50, 50, "L", 5, "A", "https://www.baidu.com")
+						command.setBitmap(100, 0, 0, res)
+						//command.setBitmap2(100, 100, 0,res)
+						command.setBox(5, 5, 795, 595, 1)
+						command.setPagePrint()
+						console.log('command.getData()')
+						//console.log(command.getData())
+						this.senBlData(deviceId, serviceId, characteristicId,command.getData())
+					},
+					fail: function(res) {
+						console.log(res)
+					}
+				})
+				
+			},
+			senBleLabel2(){
+				//票据模式
+				let deviceId = this.currDev.deviceId;
+				let serviceId = this.currDev.services[0].serviceId;
+				let characteristicId = this.currDev.services[0].characteristicId;
+				var command = esc.jpPrinter.createNew()
+				command.init()
+                command.setText(this.piaojuText);
+                command.setPrintAndFeedRow(1)
+				this.senBlData(deviceId, serviceId, characteristicId,command.getData())
+			},
+			renderFinish() {
+				let filePath = '../../static/logo.png'
+				let that = this
+				const firstCanvas = uni.createCanvasContext('firstCanvas', this);
+				let scla = 1
+				uni.getImageInfo({
+					src: filePath,
+					success(res) {
+						that.canvasWidth = res.width * scla
+						that.canvasHeight = res.height * scla
+						console.log(res, that.canvasWidth, that.canvasHeight)
+						firstCanvas.drawImage(filePath, 0, 0, that.canvasWidth, that.canvasHeight);
+						firstCanvas.draw();
+						that.$nextTick(() => { //获取画布像素数据
+							
+						})
+					},
+					fail(res) {
+						console.log(res)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/print/bluetoothPrinter.vue b/pages/print/bluetoothPrinter.vue
index ed9901f..d450004 100644
--- a/pages/print/bluetoothPrinter.vue
+++ b/pages/print/bluetoothPrinter.vue
@@ -105,10 +105,34 @@
 						this.devices = []
 						console.log("打开 蓝牙模块，开始搜索模式...")
 						console.log("openBluetoothAdapter res==", res)
+						// that.getBuleState()
 						bluetoothTool.discoveryNewDevice();
 					}
 				})
 			},
+			getBuleState(){
+				uni.getBluetoothAdapterState({
+					success: function(res) {
+						console.log("====getBluetoothAdapterState===", res)
+						if (res.available) {
+							if (res.discovering) {
+								that.stopFindBule()
+							}
+							//搜索蓝牙
+							//开始搜寻附近的蓝牙外围设备
+							console.log("开始搜寻附近的蓝牙外围设备")
+							uni.startBluetoothDevicesDiscovery({
+								success(res) {
+									console.log(res)
+								}
+							})
+				
+						} else {
+							console.log('本机蓝牙不可用')
+						}
+					},
+				})
+			},
 			onDevice(newDevice){
 				console.log("监听寻找到新设备的事件---------------")
 				console.log(newDevice)
diff --git a/pages/print/courierNote.vue b/pages/print/courierNote.vue
index 46ad58f..f7853e5 100644
--- a/pages/print/courierNote.vue
+++ b/pages/print/courierNote.vue
@@ -93,7 +93,7 @@
 					<u-button @click="handleSubmit()" type="primary" plain="true" size="large" shape="square"
 						custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;margin: 0 10rpx;">搜索蓝牙</u-button>
 
-					<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
+					<u-button @click="handleSubmit(2)" type="primary" size="large" shape="square"
 						custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;margin: 0 10rpx;">打印</u-button>
 				</u-row>
 			</view>
@@ -171,8 +171,12 @@
 				// 	title: '加载中'
 				// });
 			},
-			handleSubmit() {
-				goto("print/bluetoothPrinter")
+			handleSubmit(type) {
+				if(type == 2) {
+					goto("print/bluetoothPrinter")
+				} else {
+					goto("print/bluetooth-mini-printer")
+				}
 			},
 			handleSelAll() {
 				if(this.submitParam.sltDanValues.length == this.yundanList.length) {