diff --git a/index.html b/index.html index 8f7ca91..433866d 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,7 @@ + Vite + Vue diff --git a/src/App.vue b/src/App.vue index c71b43f..c302cce 100644 --- a/src/App.vue +++ b/src/App.vue @@ -94,11 +94,23 @@ html { top: 10px !important; } +.el-pagination { + justify-content: center; +} + .el-drawer__header { // padding: 0 !important; margin-bottom: 5px !important; } +.el-table .warning-row { + --el-table-tr-bg-color: var(--el-color-warning-light-9); +} + +.el-table .success-row { + --el-table-tr-bg-color: var(--el-color-success-light-9); +} + .el-drawer__body { padding: 0 var(--el-drawer-padding-primary) !important; @@ -252,5 +264,4 @@ html { transform: translateX(100%); } } -} - +} diff --git a/src/api/member/index.js b/src/api/member/index.js index c47996d..5e5cbca 100644 --- a/src/api/member/index.js +++ b/src/api/member/index.js @@ -12,4 +12,35 @@ export function queryMembermember(params) { params }); } +export function createMembermember(data) { + return request({ + method: "post", + url: "member/createMember", + data + }); +} +/** + * 查询会员流水 + * @param {*} params + * @returns + */ +export function memberqueryMemberAccount(params) { + return request({ + method: "get", + url: "member/queryMemberAccount", + params + }); +} +/** + * 会员现金充值 + * @param {*} params + * @returns + */ +export function accountPaymember(data) { + return request({ + method: "post", + url: "member/accountPay", + data + }); +} diff --git a/src/components/cwx-keyboard/cwx-keyboard.vue b/src/components/cwx-keyboard/cwx-keyboard.vue new file mode 100644 index 0000000..c96f14d --- /dev/null +++ b/src/components/cwx-keyboard/cwx-keyboard.vue @@ -0,0 +1,282 @@ + + + + + diff --git a/src/views/home/components/keyboard.vue b/src/views/home/components/keyboard.vue new file mode 100644 index 0000000..6c5774c --- /dev/null +++ b/src/views/home/components/keyboard.vue @@ -0,0 +1,200 @@ + + + + + \ No newline at end of file diff --git a/src/views/home/components/member.vue b/src/views/home/components/member.vue index faef1e0..d81c151 100644 --- a/src/views/home/components/member.vue +++ b/src/views/home/components/member.vue @@ -54,49 +54,37 @@ -
+ +
- 添加会员 - 确认 + 添加会员 + 确认
@@ -138,8 +126,7 @@ import { ref, reactive, watch } from 'vue' import { useRoute } from "vue-router" import { ElMessage } from 'element-plus' import lodash_ from 'lodash' - -const route = useRoute() +import keyboard from '@/views/home/components/keyboard.vue' const stored = ref(false)//储值余额 @@ -188,7 +175,6 @@ const moneys = reactive({ const _handleKeyPress = (e) => { console.log('点击传e', e.target.dataset.num); let num = e.target.dataset.num; - console.log(num) //不同按键处理逻辑 // -1 代表无效按键，直接返回 if (num == -1) return false; @@ -211,6 +197,9 @@ watch(() => moneys.money, (newVal, oldVal) => { }) //处理数字 const _handleNumberKey = (num) => { + if (num == undefined) { + return + } if (moneys.money.length == 10) { return } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index b1275a4..5945b04 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -93,8 +93,8 @@ - - + + @@ -116,7 +116,7 @@ import { createCart, queryCart, createCode, packall, delCart, cartStatus, clearC // 商品列表 import goods from '@/views/home/components/goods.vue' -import member from '@/views/home/components/member.vue' +import member from '@/views/member/index.vue' const membershow = ref(false) const store = useUser() const remarkRef = ref(null) diff --git a/src/views/member/components/add.vue b/src/views/member/components/add.vue new file mode 100644 index 0000000..5f5b931 --- /dev/null +++ b/src/views/member/components/add.vue @@ -0,0 +1,73 @@ + + + + + \ No newline at end of file diff --git a/src/views/member/index.vue b/src/views/member/index.vue index 5cf7cbc..edbfdcf 100644 --- a/src/views/member/index.vue +++ b/src/views/member/index.vue @@ -1,40 +1,41 @@