订单详情新增打印状态

http/http.js

@@ -15,8 +15,8 @@ import infoBox from "@/commons/utils/infoBox.js";
 import go from "@/commons/utils/go.js";
 import { reject } from "lodash";
 // 设置node环境
-envConfig.changeEnv(storageManage.env('production')) //正式
+// envConfig.changeEnv(storageManage.env('production')) //正式
-// envConfig.changeEnv(storageManage.env("development")); //测试
+envConfig.changeEnv(storageManage.env("development")); //测试
 
 // 测试服
 // #ifdef H5

pages/index/index.vue

@@ -23,11 +23,11 @@
 					<view class="u-flex-1 u-p-l-30 u-text-left">
 						<view class="u-flex">
 							<view class="u-line-1 u-font-36 font-bold" style="width: 80%;">{{shopInfo.shopName}}</view>
-							<view class="u-font-28 color-fff change-shop u-flex u-row-center" @click="changeShop">
+							<!-- <view class="u-font-28 color-fff change-shop u-flex u-row-center" @click="changeShop">
 								<image src="/static/change.png" class="u-m-t-2" style="width: 20rpx;height: 20rpx;"
 									mode=""></image>
 								<text class="u-m-l-6">切换店铺</text>
-							</view>
+							</view> -->
 						</view>
 						<view class="u-m-t-16">
 							<view style="color: rgba(255,255,255,0.83);" v-if="shopStaff">

pagesOrder/detail/components/order.vue

@@ -2,23 +2,23 @@
 	<view class="default-box-padding bg-fff border-r-12 u-m-t-24">
 		<view class="u-flex u-row-between">
 			<view>订单状态</view>
-			<view>{{$dict.getDiceName(data.status,'orderStatus')}}</view>
+			<view>{{ $dict.getDiceName(data.status, 'orderStatus') }}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-24">
 			<view>订单类型</view>
-			<view>{{$dict.getDiceName(data.dineMode,'dineMode')}}</view>
+			<view>{{ $dict.getDiceName(data.dineMode, 'dineMode') }}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-24">
 			<view>桌位号</view>
-			<view>{{table.name||data.tableName}}</view>
+			<view>{{ table.name || data.tableName }}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-24" v-if="seatFee.number">
 			<view>就餐人数</view>
-			<view>{{seatFee.number||''}}</view>
+			<view>{{ seatFee.number || '' }}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-24">
 			<view>支付方式</view>
-			<view>{{$dict.getDiceName(data.payType,'payType')||''}}</view>
+			<view>{{ $dict.getDiceName(data.payType, 'payType') || '' }}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-24">
 			<view>下单时间</view>
@@ -27,9 +27,9 @@
 		<view class="u-flex u-row-between u-m-t-24">
 			<view>订单编号</view>
 			<view class="u-flex">
-				<view>{{data.orderNo}}</view>
+				<view>{{ data.orderNo }}</view>
 				<view v-if="data.orderNo" class="u-m-l-6">
-					<up-copy :content="data.orderNo" >
+					<up-copy :content="data.orderNo">
 						<up-icon name="/static/copy.svg" :size="16"></up-icon>
 					</up-copy>
 				</view>
@@ -37,34 +37,44 @@
 		</view>
 		<view class="u-flex u-row-between u-m-t-24 u-col-top">
 			<view class="no-wrap">商家备注</view>
-			<view class="u-p-l-32 " style="max-width: 522rpx;    word-wrap: break-word;">
+			<view class="u-p-l-32" style="max-width: 522rpx; word-wrap: break-word">
-				{{data.remark}}
+				{{ data.remark }}
+			</view>
+		</view>
+		<view class="u-flex u-row-between u-m-t-24 u-col-top">
+			<view class="no-wrap">打印状态</view>
+			<view class="u-p-l-32" style="max-width: 522rpx; word-wrap: break-word; color: red">
+				<template v-if="JSON.parse(data.printStatus).length > 0">
+					打印失败（{{
+						JSON.parse(data.printStatus)
+							.map((item) => item.name)
+							.join('、')
+					}}）
+				</template>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
-	import { ref } from 'vue';
+import { ref } from 'vue';
 
-	const props = defineProps({
+const props = defineProps({
-		data: {
+	data: {
-			type: Object,
+		type: Object,
-			default: () => {}
+		default: () => {}
-		},
+	},
-		table: {
+	table: {
-			type: Object,
+		type: Object,
-			default: () => {}
+		default: () => {}
-		},
+	},
-		seatFee: {
+	seatFee: {
-			type: Object,
+		type: Object,
-			default: () => {
+		default: () => {
-				totalNumber: 0
+			totalNumber: 0;
-			}
 		}
-	})
+	}
-	
+});
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-</style>