1

components/print/index.js

@@ -110,14 +110,14 @@ export default {
 			(data1.deliveryInfo && data1.deliveryInfo.appointmentDelivery == 1 && data1.status != 7 && data1.status == 11)? '预约单':
 			(data1.status == 7 || data1.status == 11)? '申请退款':
 			(data1.deliveryType == 1 && data1.orderType == 3) ? '面对面配送':
-			(data1.status == 3 && data1.deliveryType == 2)? '待消费':
+			(data1.status == 3 && data1.deliveryType == 2 && data1.userRequireMake != 1)? '待消费':
 			data1.status == 5? '已完成':
 			data1.status == 6? '已取消':
 			data1.status == 8? '已退款':
 			data1.status == 12? '已售后':
-			data1.isPack == 0 ? '到店-堂食':
+			data1.isPack == 0 && data1.otherOrder == null ? '到店-堂食':
 			data1.deliveryType == 1 && data1.isPack == 1 ? '配送':
-			data1.isPack == 1 ? '到店-打包': ''
+			data1.isPack == 1 && data1.otherOrder == null ? '到店-打包': ''
 			
 		);
 		if(data1.deliveryInfo && data1.deliveryInfo.appointmentDelivery == 1){
@@ -126,7 +126,8 @@ export default {
 			);
 		}
 		printerJobs.setSize(1, 1).setLineSpacing(40);
-		printerJobs.setAlign('lt').print(data1.shopName);
+		printerJobs.setAlign('lt').print(data1.shopName + ((data1.deliveryType == 1 && data1.orderType == 3)? '（'+data1.numberCode + '）':''));
+		
 		printerJobs.setAlign('lt').print(
 			'下单时间:' + this.formatTime(data1.createTime)
 		);
@@ -169,18 +170,24 @@ export default {
 		printerJobs.setAlign('lt').print('顾客电话已被隐藏，您可登录商家端或骑手端查看');
 		printerJobs.print(printerUtil.fillLine('-', 1, 32));
 		for (var i = 0; i < data1.goodsList.length; i++) {
+			if(i != 0){
+				printerJobs.setSize(1, 1).print("  ");
+			}
 			var productName = this.removeEmojis(data1.goodsList[i].productName)
-			printerJobs.setAlign('lt').setSize(2, 2).setLineSpacing(70).print(productName);
+			printerJobs.setAlign('lt').setSize(2, 2).print(productName);
-			if (data1.goodsList[i].specs) {
+			
+			if (data1.goodsList[i].specs.indexOf(',') != -1) {
+				printerJobs.setSize(1, 1).setLineSpacing(10).print(' ');
 				printerJobs.setSize(1, 1).print(this.delNode(data1.goodsList[i].specs));
+				
 			}
-			printerJobs.setSize(2, 2);
+			printerJobs.setSize(1, 1).setLineSpacing(10).print(' ');
-			printerJobs.setAlign('lt').setLineSpacing(30).text('￥' + data1.goodsList[i].price);
+			printerJobs.setAlign('lt').setSize(2, 2)
+			printerJobs.setAlign('lt').text('￥' + data1.goodsList[i].price);
 			printerJobs.text("     ");
 			printerJobs.print('X' + data1.goodsList[i].quantity);
-			printerJobs.setSize(1, 1);
 		}
-		printerJobs.print(printerUtil.fillLine('-', 1, 32));
+		printerJobs.setLineSpacing(30).setSize(1, 1).print(printerUtil.fillLine('-', 1, 32));
 		printerJobs.setAlign('lt').print('配 送 费：' + data1.deliveryFee);
 		if(data1.packageFee > 0){
 			printerJobs.print('打 包 费：' + data1.packageFee);
@@ -192,19 +199,20 @@ export default {
 		if(data1.freeAmount > 0){
 			printerJobs.print('锦鲤免单：-' + data1.freeAmount);
 		}
-		printerJobs.print('合计金额：' + (data1.goodsAmount + data1.deliveryFee + data1.packageFee));
+		printerJobs.print('合计金额：' + ((data1.goodsAmount + data1.deliveryFee + data1.packageFee).toFixed(2)));
 		if(data1.mallRefundRecord != null){
 			printerJobs.print('应退金额：' + data1.totalAmount);
 		}else{
 			printerJobs.print('实付金额：' + data1.totalAmount);
 		}
-		printerJobs.setSize(2, 2).setLineSpacing(70).print('备注：' + data1.remark);
+		printerJobs.setSize(2, 2).print('备注：' + data1.remark);
+		printerJobs.lineFeed(1);
 		if(data1.mallRefundRecord != null){
 			printerJobs.setAlign('lt').setLineSpacing(30).print(
 				'退款原因:' + (data1.mallRefundRecord == null ? ' ' : data1.mallRefundRecord[0].reason)
 			);
 		}
-		printerJobs.setSize(1, 1).print(printerUtil.fillLine('-', 1, 32));
+		printerJobs.setSize(1, 1).setLineSpacing(30).print(printerUtil.fillLine('-', 1, 32));
 		printerJobs.setAlign('lt').print('商品取到后，如有任何商品问题，请及时联系商家和平台，客服将为您服务，谢谢您的惠顾');
 		printerJobs.lineFeed(3);
 		let buffer = printerJobs.buffer();

components/tab-bar/delivery.vue

@@ -242,12 +242,15 @@
 		},
 		methods: {
 			init(index){
+				
 				if(index){
 					this.searchForm.searchStatus = index
 					this.currentIndex = index
 				}
 				this.searchForm.pageNum = 1
 				this.orderList = []
+				this.searchForm.shopId = uni.getStorageSync('shopId')
+				this.searchForm.regionId = JSON.parse(uni.getStorageSync('area')).regionId
 				this.getList()
 			},
 			isAppointmentDelivery(item) {
@@ -344,8 +347,10 @@
 				uni.showModal({
 					title: '提示',
 					content: '确定要出餐吗？',
+					confirmText: '取消',
+					cancelText: '确认',
 					success: function (res) {
-						if (res.confirm) {
+						if (res.cancel) {
 							let data = {}
 							let url = ''
 							if(item.deliveryType == 2){ //自取单
@@ -402,19 +407,20 @@
 				this.loadStatus = 'loading'
 				let that = this
 				let url = ''
-				let data = {
+				let dataObj = {
 					linkId: uni.getStorageSync('shopId'),
 					pageNum: this.searchForm.pageNum,
 					pageSize: 10,
 					statusList: [0, 3],
-					regionId: JSON.parse(uni.getStorageSync('area')).id
+					regionId: JSON.parse(uni.getStorageSync('area')).regionId
 				}
+				this.$forceUpdate()
 				if (this.currentIndex == 7) {
 					url = "/mall/refund/page"
 				} else {
 					url = "/mall/order/page"
 				}
-				that.NB.sendRequest(url, this.currentIndex == 7?data : this.searchForm, false, 'POST', 'application/json').then((res) => {
+				that.NB.sendRequest(url, this.currentIndex == 7?dataObj : this.searchForm, false, 'POST', 'application/json').then((res) => {
 					that.loadStatus = 'nomore';
 					if (res.code == 200) {
 						if (that.searchForm.pageNum == 1) {
@@ -466,8 +472,10 @@
 				uni.showModal({
 					title: '提示',
 					content: '确定全部出餐吗？',
+					confirmText: '取消',
+					cancelText: '确认',
 					success: function (res) {
-						if (!res.confirm) return
+						if (!res.cancel) return
 						that.NB.sendRequest("/mall/order/shopMakeTimeBatch", {
 							orderIdList: orderIdList
 						}, false, 'POST', 'application/x-www-form-urlencoded').then((res) => {

components/tab-bar/myCenter.vue

@@ -2,7 +2,7 @@
 	<view class="page1">
 		<view class="title-gary"></view>
 		<view class="title">我的</view>
-		<view class="shop-box" @click="navigatorTo('xiugaixinxi')">
+		<view class="shop-box" >
 			<view class="shop-left">
 				<image :src="shopIcon" alt="">
 			</view>
@@ -11,9 +11,6 @@
 				<view class="shop-name">{{shopName}}</view>
 				<view class="shop-address">{{region}}</view>
 			</view>
-			<view class="shop-right">
-				<uni-icons type="right" size="22"></uni-icons>
-			</view>
 		</view>
 		<view class="list-box">
 			<view class="list-1">
@@ -38,6 +35,17 @@
 					<uni-icons type="right" size="22"></uni-icons>
 				</view>
 			</view>
+			<view class="list-1">
+				<view class="list-icon">
+					<uni-icons type="wallet" size="22"></uni-icons>
+				</view>
+				<view class="list-name" @click="navigatorTo('xiugaixinxi')">
+					商家信息
+				</view>
+				<view class="list-right">
+					<uni-icons type="right" size="22"></uni-icons>
+				</view>
+			</view>
 			<!-- <view class="list-1">
 				<view class="list-icon">
 					<uni-icons type="wallet" size="22"></uni-icons>
@@ -71,7 +79,7 @@
 					<uni-icons type="right" size="22"></uni-icons>
 				</view>
 			</view> -->
-			<view class="list-1" @click="navigatorTo('jianzhi')">
+			<!-- <view class="list-1" @click="navigatorTo('jianzhi')">
 				<view class="list-icon">
 					<uni-icons type="wallet" size="22"></uni-icons>
 				</view>
@@ -81,7 +89,7 @@
 				<view class="list-right">
 					<uni-icons type="right" size="22"></uni-icons>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="list-box">
 			<view class="list-2" @click="logOut">
@@ -121,12 +129,22 @@
 				
 			},
 			logOut() {
+				uni.showModal({
+					title: '提示',
+					content: '确定要退出登录吗？',
+					confirmText: '取消',
+					cancelText: '确认',
+					success: (res) => {
+						if (res.cancel) {
 							uni.clearStorage()
 							this.getRegistrationID()
 							getApp().globalData.userinfo = ''
 							uni.reLaunch({
 								url: '../login/login'
 							})
+						}
+					}
+				})
 			},
 			getRegistrationID() { //获取registerID
 				jpushModule.getRegistrationID(result => {

components/worker/delivery.vue

@@ -764,7 +764,7 @@
 				this.NB.sendRequest("/worker/admin/add", {
 					userId: uni.getStorageSync('id'),
 					isChangeArea: 1,
-					region: area.id
+					region: area.regionId
 				}, false, 'POST', 'application/x-www-form-urlencoded').then((res) => {
 					if (res.code == 200) {
 						if (res.result != null) {
@@ -1067,10 +1067,10 @@
 				uni.showModal({
 					title: '提示',
 					content: '您编辑了接单规则，开启后才会接到路线订单，需要现在开启吗？',
-					confirmText: '确认',
+					confirmText: '取消',
-					cancelText: '取消',
+					cancelText: '确认',
 					success: (res) => {
-						if (res.confirm) {
+						if (res.cancel) {
 							this.openPopup()
 						}
 					}
@@ -1186,7 +1186,7 @@
 					}
 					this.$set(this.completingDeliveryIds, item.id, true)
 				}
-				let regionId = JSON.parse(uni.getStorageSync('area')).id
+				let regionId = JSON.parse(uni.getStorageSync('area')).regionId
 				let url = ''
 				if (status == 2) {
 					if (item.transferDelivery == 1) {

components/worker/tab-bar.vue

@@ -86,7 +86,7 @@
 				const redirectKey = 'login_redirect_' + Date.now()
 				uni.setStorageSync(redirectKey, '/pages/index/index?tabIndex=' + index)
 				uni.navigateTo({
-					url: '/package2/login/login?redirect=' + redirectKey
+					url: '/pages/login/login?redirect=' + redirectKey
 				})
 			},
 			formatBadgeCount(count) {
@@ -151,7 +151,7 @@
 					
 					tasks.push(this.NB.sendRequest("/mall/delivery/countOrderByStatus", {
 						workerId:worker.workerId,
-						regionId:area.id,
+						regionId:area.regionId,
 					}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
 						if (res.code == 200) {
 							let result = {