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

src/components/payCard/payCard.vue

@@ -45,12 +45,14 @@
             </div>
         </div>
     </div>
-    <scanModal ref="scanModalRef" :amount="props.amount" :orderId="props.orderId" @success="scanCodeSuccess" />
+    <scanModal ref="scanModalRef" :amount="props.amount" :orderId="props.orderId" :selecttype="props.selecttype"
+        @success="scanCodeSuccess" />
 </template>
 
 <script setup>
 import { onMounted, ref, computed, watch } from 'vue'
 import { queryPayType, accountPay, cashPay } from '@/api/pay'
+import { queryMembermember, createMembermember, membermemberScanPay, accountPaymember } from '@/api/member/index.js'
 import { useUser } from "@/store/user.js"
 import { clearNoNum } from '@/utils'
 
@@ -64,6 +66,10 @@ const props = defineProps({
         type: Number,
         default: 0
     },
+    selecttype: {
+        type: Number,
+        default: 0
+    },
     orderId: {
         type: [String, Number],
         default: ''
@@ -111,16 +117,35 @@ async function confirmOrder() {
             if (money.value < props.amount) return
             payLoading.value = true
             switch (payList.value[payActive.value].payType) {
-                case 'deposit':
-                    await accountPay({
-                        orderId: props.orderId,
-                        memberId: 1
-                    })
+                case 'deposit'://储值卡
+                    if (props.selecttype == 1) {
+
+                    } else {
+                        await accountPay({
+                            orderId: props.orderId,
+                            memberId: 1
+                        })
+                    }
                     break;
-                case 'cash':
-                    await cashPay({
-                        orderId: props.orderId
-                    })
+                case 'cash'://现金
+                    if (props.selecttype == 1) {
+                        await accountPaymember({
+                            shopId: store.userInfo.shopId,
+                            memberId: props.orderId,
+                            amount: props.amount
+                        })
+                    } else {
+                        await cashPay({
+                            orderId: props.orderId
+                        })
+                    }
+                    break;
+                case 'bank'://银行卡
+                    if (props.selecttype == 1) {//1  代表会员
+
+                    } else {
+                        
+                    }
                     break;
                 default:
                     break;

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('支付成功')