优化打印 优化退单

src/components/lodop/refundPrint.js

@@ -77,6 +77,9 @@ export default (data) => {
         <div style="margin-top: 6px;margin-bottom: 6px;width: 100%">
           <hr/>
         </div>
+        <div style="margin-top: 4px; font-size: 16px;font-weight: bold;">备注：${
+          data.remark
+        }</div>
         <div style="margin-top: 4px; font-size: 12px;">
           打印时间：${data.printTime}
         </div>

src/components/payCard/payCard.vue

@@ -68,7 +68,8 @@
         </div>
     </div>
     <scanModal ref="scanModalRef" :amount="props.amount" :money="money" :orderId="props.orderId"
-        :selecttype="props.selecttype" :payType="payType" :payData="payData" @success="scanCodeSuccess" />
+        :selecttype="props.selecttype" :payType="payType" :payData="payData" @success="scanCodeSuccess"
+        @orderExpired="emit('orderExpired')" />
     <!-- 选择挂账人员 -->
     <el-dialog title="挂账" top="1vh" v-model="showBuyer" width="90%" @closed="resetBuyerTable">
         <el-form inline>
@@ -261,7 +262,7 @@ watch(props, () => {
     money.value = formatDecimal(props.amount)
 })
 
-const emit = defineEmits(["paySuccess"]);
+const emit = defineEmits(["paySuccess", 'orderExpired']);
 
 const money = ref("0");
 const discountRateVlaue = ref(0)
@@ -444,6 +445,10 @@ async function confirmOrder() {
             emit("paySuccess");
         }
     } catch (error) {
+        if (error.code == 701) {
+            // 订单已过期需刷新购物车和订单
+            emit('orderExpired')
+        }
         console.log(error);
         payLoading.value = false;
         scanModalRef.value.loading = false;

src/components/payCard/scanModal.vue

@@ -59,17 +59,11 @@ import { useUser } from "@/store/user.js";
 import { useGlobal } from '@/store/global.js'
 import { formatDecimal } from '@/utils'
 import { microPay, queryOrderStatus, microPayVip, vipPay, queryPayStatus } from '@/api/order.js'
+import { ElMessage } from "element-plus";
 
 const store = useUser();
 const global = useGlobal()
-import {
-  queryMembermember,
-  createMembermember,
-  membermemberScanPay,
-  accountPaymember,
-} from "@/api/member/index.js";
-import { ElMessage } from "element-plus";
-const emits = defineEmits(["success"]);
+const emits = defineEmits(["success", 'orderExpired']);
 
 const props = defineProps({
   amount: {
@@ -181,6 +175,9 @@ async function submitHandle() {
       userPayWait.value = true;
       fastOrder.value = error.data
       autoCheckOrder()
+    } else if (error.code == 701) {
+      // 订单已过期需刷新购物车和订单
+      emits('orderExpired')
     } else {
       scanCode.value = "";
       loading.value = false;