新增会员下单

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 {
+                    // } else {
+
+                    // }
                     await accountPay({
                         orderId: props.orderId,
-                            memberId: 1
+                        memberId: props.member.id
                     })
-                    }
                     break;
                 case 'cash'://现金
                     if (props.selecttype == 1) {

src/views/home/components/settleAccount.vue

@@ -11,7 +11,10 @@
             </el-icon>
           </div>
           <div class="info">
-            <div class="master_id">{{ props.masterId }}</div>
+            <div class="master_id">
+              <span>{{ props.masterId }}</span>
+              <span class="member_info" v-if="memberInfo.telephone">会员：{{ memberInfo.telephone }}</span>
+            </div>
             <div class="btm">
               <span class="p">服务员：{{ store.userInfo.shopName || "暂无" }}</span>
               <span class="t">{{
@@ -57,7 +60,7 @@
         </div>
       </div>
       <div class="pay_wrap">
-        <payCard :amount="props.amount" :orderId="props.orderInfo.id" @paySuccess="paySuccess" />
+        <payCard :amount="props.amount" :member="props.member" :orderId="props.orderInfo.id" @paySuccess="paySuccess" />
       </div>
     </div>
   </el-drawer>
@@ -71,6 +74,7 @@ import { print } from "@/api/pay";
 import { bySubType } from "@/api/device";
 import { ElMessage } from "element-plus";
 import dayjs from "dayjs";
+import useStorage from '@/utils/useStorage'
 
 import { ipcRenderer } from "electron";
 
@@ -102,6 +106,10 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  member: {
+    type: Object,
+    default: {}
+  }
 });
 
 const isPrint = ref(true);
@@ -206,9 +214,23 @@ defineExpose({
   show,
 });
 
+
+const memberInfo = ref('')
+
+// 从本地获取会员信息
+function getLocalMemberInfo() {
+  let localMemberInfo = useStorage.get('memberInfo')
+  if (localMemberInfo && localMemberInfo.telephone) {
+    memberInfo.value = localMemberInfo
+  } else {
+    memberInfo.value = ''
+  }
+}
+
 onMounted(() => {
   getPrintList();
   bySubTypeAjax();
+  getLocalMemberInfo()
 });
 </script>
 
@@ -258,6 +280,14 @@ onMounted(() => {
           font-size: calc(var(--el-font-size-base) + 10px);
           border-bottom: 1px solid #ececec;
           padding: $padding 0;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+
+          .member_info {
+            color: #999;
+            font-size: 16px;
+          }
         }
 
         .btm {

src/views/home/index.vue

@@ -11,7 +11,7 @@
         <div class="number" @click="takeFoodCodeRef.show()">
           <el-text class="t">{{ masterId }}</el-text>
         </div>
-        <div class="select_user" @click="fastCashierRef.show()">
+        <div class="select_user" @click="fastCashierRef.show()" v-if="!memberInfo.telephone">
           <el-icon class="icon">
             <WalletFilled />
           </el-icon>
@@ -20,15 +20,15 @@
             <ArrowRight />
           </el-icon>
         </div>
-        <!-- <div class="select_user" @click="membershow = true">
+        <div class="select_user" v-else @click="clearMember">
           <el-icon class="icon">
             <UserFilled />
           </el-icon>
-          <el-text class="t">选择会员</el-text>
+          <el-text class="t">{{ memberInfo.telephone }}</el-text>
           <el-icon class="arrow">
-            <ArrowRight />
+            <Close />
           </el-icon>
-        </div> -->
+        </div>
       </div>
       <div class="shop_operation" v-loading="cartLoading">
         <div class="shop_list">
@@ -112,7 +112,7 @@
   <takeFoodCode ref="takeFoodCodeRef" title="修改取餐号" placeholder="请输入取餐号" @success="takeFoodCodeSuccess" />
   <!-- 结算订单 -->
   <settleAccount ref="settleAccountRef" :cart="cartList" :amount="cartInfo.totalAmount" :remark="remark"
-    :masterId="masterId" :orderInfo="orderInfo" @paySuccess="createCodeAjax(1)" />
+    :masterId="masterId" :orderInfo="orderInfo" :member="memberInfo" @paySuccess="createCodeAjax(1)" />
   <!-- 快捷收银 -->
   <fastCashier ref="fastCashierRef" />
   <!-- 挂起订单 -->
@@ -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();
-
+  getLocalMemberInfo()
-  console.log('route', JSON.parse(route.query.user));
 });
 </script>
 

src/views/member/index.vue

@@ -44,7 +44,8 @@
                         </el-icon>
                         <span class="orderbox_right_top_item_onespan">会员积分</span>
                     </div>
-                    <div class="orderbox_right_top_item_tow">{{ tableData.list.length != 0 ? tableData.list[datarow].levelConsume : '无'  }}</div>
+                    <div class="orderbox_right_top_item_tow">{{ tableData.list.length != 0 ?
+                        tableData.list[datarow].levelConsume : '无' }}</div>
                 </div>
                 <div class="orderbox_right_top_item" @click="stored = true">
                     <div class="orderbox_right_top_item_one">
@@ -81,9 +82,7 @@
             </div>
             <keyboard v-if="props.membershow == '1'" @consumeFees="consumeFees"></keyboard>
             <div class="orderbox_right_button" v-if="props.membershow == '0'">
-                <router-link to="/" style="width: 35%;">
+                <el-button style="width: 100%;" @click="toHome">创建订单</el-button>
-                    <el-button style="width: 100%;">创建订单</el-button>
-                </router-link>
                 <el-button style="width: 60%;" type="primary" @click="recharge = true">账户充值</el-button>
             </div>
             <div class="orderbox_right_button" v-if="props.membershow == '1'">
@@ -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()
 
@@ -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()