Merge branch 'wwz' of gitee.com:shaanxi-super-shopkeeper_1/cashierdesktop into gyq

src/components/payCard/scanModal.vue

@@ -55,9 +55,10 @@ import _ from 'lodash'
 import { ref } from 'vue'
 import icon from '@/assets/icon_scan.png'
 import { scanpay, queryOrder } from '@/api/pay'
-
+import { useUser } from "@/store/user.js"
+const store = useUser()
+import { queryMembermember, createMembermember, membermemberScanPay, accountPaymember } from '@/api/member/index.js'
 import { ElMessage } from "element-plus";
-
 const emits = defineEmits(['success'])
 
 const props = defineProps({
@@ -65,6 +66,10 @@ const props = defineProps({
         type: [Number, String],
         default: 0
     },
+    selecttype: {
+        type: Number,
+        default: 0
+    },
     orderId: {
         type: [Number, String],
         default: ''
@@ -84,10 +89,20 @@ async function submitHandle() {
     try {
         if (!scanCode.value) return
         loading.value = true
-        await scanpay({
-            orderId: props.orderId,
-            authCode: scanCode.value
-        })
+        if (props.selecttype == 1) {
+            await membermemberScanPay({
+                shopId: store.userInfo.shopId,
+                memberId: props.orderId,
+                amount: props.amount,
+                authCode: scanCode.value
+            })
+        } else {
+            await scanpay({
+                orderId: props.orderId,
+                authCode: scanCode.value
+            })
+        }
+
         loading.value = false
         scanCode.value = ''
         ElMessage.success('支付成功')