diff --git a/src/components/payCard/payCard.vue b/src/components/payCard/payCard.vue
index 417238a..5c5f96c 100644
--- a/src/components/payCard/payCard.vue
+++ b/src/components/payCard/payCard.vue
@@ -73,6 +73,10 @@ const props = defineProps({
orderId: {
type: [String, Number],
default: ''
+ },
+ member: {
+ type: Object,
+ default: {}
}
})
@@ -119,14 +123,15 @@ async function confirmOrder() {
payLoading.value = true
switch (payList.value[payActive.value].payType) {
case 'deposit'://储值卡
- if (props.selecttype == 1) {
+ // if (props.selecttype == 1) {
- } else {
- await accountPay({
- orderId: props.orderId,
- memberId: 1
- })
- }
+ // } else {
+
+ // }
+ await accountPay({
+ orderId: props.orderId,
+ memberId: props.member.id
+ })
break;
case 'cash'://现金
if (props.selecttype == 1) {
diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue
index f6640b8..c85214d 100644
--- a/src/views/home/components/settleAccount.vue
+++ b/src/views/home/components/settleAccount.vue
@@ -11,7 +11,10 @@
-
{{ props.masterId }}
+
+ {{ props.masterId }}
+ 会员:{{ memberInfo.telephone }}
+
服务员:{{ store.userInfo.shopName || "暂无" }}
{{
@@ -57,7 +60,7 @@
@@ -112,7 +112,7 @@
+ :masterId="masterId" :orderInfo="orderInfo" :member="memberInfo" @paySuccess="createCodeAjax(1)" />
@@ -134,6 +134,7 @@ import cartOperation from "@/views/home/components/cartOperation.vue";
import settleAccount from "@/views/home/components/settleAccount.vue";
import fastCashier from "@/views/home/components/fastCashier.vue";
import pendingCartModal from "@/views/home/components/pendingCartModal.vue";
+import useStorage from '@/utils/useStorage'
import {
createCart,
@@ -172,6 +173,8 @@ const cartLoading = ref(false);
const orderInfo = ref({});
const createOrderLoading = ref(false);
+const memberInfo = ref({})
+
// 取餐码
const masterId = ref("");
@@ -234,6 +237,7 @@ async function pendingCart(params, status = true) {
if (status && cartList.value.length) {
await createCodeAjax();
cartLoading.value = false;
+ clearMember()
} else {
cartLoading.value = false;
}
@@ -369,10 +373,25 @@ async function createCodeAjax(type = "0") {
}
}
+// 从本地获取会员信息
+function getLocalMemberInfo() {
+ let localMemberInfo = useStorage.get('memberInfo')
+ if (localMemberInfo && localMemberInfo.telephone) {
+ memberInfo.value = localMemberInfo
+ } else {
+ memberInfo.value = ''
+ }
+}
+
+// 清除本地会员
+function clearMember() {
+ useStorage.del('memberInfo')
+ getLocalMemberInfo()
+}
+
onMounted(() => {
createCodeAjax();
-
- console.log('route', JSON.parse(route.query.user));
+ getLocalMemberInfo()
});
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index 6867ee3..b703581 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -27,15 +27,15 @@
手机号码:
- {{ tableData.list.length != 0 ? tableData.list[datarow].telephone : '无' }}
+ {{ tableData.list.length != 0 ? tableData.list[datarow].telephone : '无' }}
会员编号:
- {{ tableData.list.length != 0 ? tableData.list[datarow].code : '无' }}
+ {{ tableData.list.length != 0 ? tableData.list[datarow].code : '无' }}
会员等级:
- {{ tableData.list.length != 0 ? tableData.list[datarow].level : '无' }}
+ {{ tableData.list.length != 0 ? tableData.list[datarow].level : '无' }}
@@ -44,7 +44,8 @@
会员积分
-
{{ tableData.list.length != 0 ? tableData.list[datarow].levelConsume : '无' }}
+
{{ tableData.list.length != 0 ?
+ tableData.list[datarow].levelConsume : '无' }}
@@ -54,7 +55,7 @@
储值余额
-
{{ tableData.list.length != 0 ? tableData.list[datarow].amount : '无' }}
+
{{ tableData.list.length != 0 ? tableData.list[datarow].amount : '无' }}
@@ -81,9 +82,7 @@
-
- 创建订单
-
+ 创建订单
账户充值
@@ -173,6 +172,10 @@ import add from '@/views/member/components/add.vue'
import cwxeyboard from '@/components/cwx-keyboard/cwx-keyboard.vue'
import keyboard from '@/views/home/components/keyboard.vue'
import payCard from '@/components/payCard/payCard.vue'
+import { useRouter } from 'vue-router'
+import useStorage from '@/utils/useStorage'
+
+const router = useRouter()
const store = useUser()
@@ -257,7 +260,7 @@ const MemberAccount = async () => {//获取流水
flowingwater.total = res.total
flowingwater.list = res.list
} catch (error) {
-
+
}
}
@@ -400,6 +403,14 @@ const createMembermemberSubmit = async () => { ///添加会员
});
}
const moneys = ref('')// 钱数
+
+const toHome = () => {
+ useStorage.set('memberInfo', tableData.list[datarow.value])
+ router.push({
+ name: 'home'
+ })
+}
+
onMounted(() => {
// resetMembrform.value = { ...membrform.value }
asyncqueryMembermember()