diff --git a/package.json b/package.json index 5619759..a7e3a65 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vite-electron", "private": true, - "version": "1.2.3", + "version": "1.2.5", "main": "dist-electron/main.js", "scripts": { "dev": "chcp 65001 && vite", diff --git a/src/components/fastPayCard.vue b/src/components/fastPayCard.vue index 3392e18..a7f25c9 100644 --- a/src/components/fastPayCard.vue +++ b/src/components/fastPayCard.vue @@ -7,7 +7,7 @@
-
+
应收:¥ {{ money }}
@@ -57,7 +57,7 @@
- @@ -74,7 +74,7 @@ import { ElMessage } from "element-plus"; const props = defineProps({ type: { type: [String, Number], - default: 1 // 1快捷收银 2会员支付 + default: 0 // 1快捷收银 2会员支付 }, userInfo: { type: Object, @@ -129,7 +129,7 @@ async function confirmOrder() { payLoading.value = true; switch (payList.value[payActive.value].payType) { case "cash": //现金 - if (props.type == 1) { + if (props.type == 0) { await quickPay({ amount: money.value, authCode: "", diff --git a/src/components/payCard/payCard.vue b/src/components/payCard/payCard.vue index 9c01d07..610518c 100644 --- a/src/components/payCard/payCard.vue +++ b/src/components/payCard/payCard.vue @@ -121,7 +121,7 @@ function payTypeChange(index, item) { async function confirmOrder() { if (payLoading.value) return try { - if (payList.value[payActive.value].payType == 'scanCode' || payList.value[payActive.value].payType == 'deposit') { + if (payList.value[payActive.value].payType == 'scanCode') { scanModalRef.value.show() } else { if (money.value < props.amount) return @@ -133,10 +133,15 @@ async function confirmOrder() { // } else { // } - await accountPay({ - orderId: props.orderId, - memberId: props.member.id - }) + if (props.member.id) { + await accountPay({ + orderId: props.orderId, + memberId: props.member.id, + memberAccount: '' + }) + } else { + scanModalRef.value.show() + } break; case 'cash'://现金 if (props.selecttype == 1) { diff --git a/src/components/payCard/scanModal.vue b/src/components/payCard/scanModal.vue index c30ac78..42058d3 100644 --- a/src/components/payCard/scanModal.vue +++ b/src/components/payCard/scanModal.vue @@ -72,7 +72,7 @@ const props = defineProps({ default: 0, }, selecttype: { - type: Number, + type: [Number, String], default: 0, }, orderId: { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index d81fcec..66ec1a6 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -114,7 +114,7 @@ - + diff --git a/src/views/member/components/userCharge.vue b/src/views/member/components/userCharge.vue index 833a903..6796d5d 100644 --- a/src/views/member/components/userCharge.vue +++ b/src/views/member/components/userCharge.vue @@ -2,7 +2,7 @@
-
diff --git a/vite.config.js b/vite.config.js index 4ce8683..2600931 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,7 +12,7 @@ export default defineConfig({ // target: 'http://192.168.2.96:10587/cashier-client', // 阿伟 // target: 'https://cashierclient.sxczgkj.cn/cashier-client', // 线上 // target: 'http://192.168.2.116:10587/cashier-client', // 国成 - // target: 'http://192.168.2.171:10587/cashier-client', // 鹏辉 + // target: 'http://192.168.2.41:10587/cashier-client', // 鹏辉 target: 'https://cashier-client.sxczgkj.cn/cashier-client', // 测试 changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '')