From bc8e463602e07bc2211818d7dd5d977c72d7e896 Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Tue, 29 Apr 2025 12:10:35 +0800
Subject: [PATCH] dev

---
 .../member/memberProfile/VipEdit.vue          | 18 +++----
 src/components/statistics/over/Charge.vue     | 50 +++++++++----------
 src/views/member/index.vue                    |  9 ++--
 3 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/components/member/memberProfile/VipEdit.vue b/src/components/member/memberProfile/VipEdit.vue
index e8decb4..df43b59 100644
--- a/src/components/member/memberProfile/VipEdit.vue
+++ b/src/components/member/memberProfile/VipEdit.vue
@@ -14,8 +14,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="姓名" prop="realName">
-              <el-input v-model="ruleForm.realName" placeholder="输入真实姓名"></el-input>
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="ruleForm.name" placeholder="输入真实姓名"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -42,8 +42,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="身份证码" prop="idcode">
-              <el-input v-model="ruleForm.idcode"></el-input>
+            <el-form-item label="证件号码" prop="certNo">
+              <el-input v-model="ruleForm.certNo"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -105,11 +105,11 @@ const close = () => {
 interface RuleForm {
   exp: string
   phone: string
-  realName: string
+  name: string
   sex: string
   age: string
   birthday: string
-  idCode: string
+  certNo: string
   source: string
   nation: string
   area: string
@@ -119,11 +119,11 @@ interface RuleForm {
 let ruleForm = ref<any>({
   exp: 0,
   phone: '',
-  realName: '',
+  name: '',
   sex: '',
   age: '',
   birthday: '',
-  idCode: '',
+  certNo: '',
   source: '',
   nation: '',
   area: '',
@@ -180,7 +180,7 @@ const rules = {
   phone: [
     {required: true, message: '请输入手机号码', trigger: 'blur'},
   ],
-  realName: [
+  name: [
     {required: true, message: '请输入姓名', trigger: 'blur'},
   ],
   sex: [
diff --git a/src/components/statistics/over/Charge.vue b/src/components/statistics/over/Charge.vue
index 76cb825..2cdfdd1 100644
--- a/src/components/statistics/over/Charge.vue
+++ b/src/components/statistics/over/Charge.vue
@@ -11,22 +11,22 @@
         />
       </div>
       <div class="content-box">
-        <el-table :data="tableData" style="width: 100%" :summary-method="getSummaries" show-summary>
+        <el-table :data="list" style="width: 100%" :summary-method="getSummaries" show-summary>
           <el-table-column prop="date" label="日期" align="center"/>
           <el-table-column label="营业收入" align="center">
-            <el-table-column prop="id" label="总金额" align="center"/>
-            <el-table-column prop="name" label="成本" align="center"></el-table-column>
-            <el-table-column prop="amount1" label="毛利" align="center"></el-table-column>
-            <el-table-column prop="amount1" label="毛利率" align="center"></el-table-column>
+            <el-table-column prop="totalMoney" label="总金额" align="center"/>
+            <el-table-column prop="totalCost" label="成本" align="center"></el-table-column>
+            <el-table-column prop="grossMargin" label="毛利" align="center"></el-table-column>
+            <el-table-column prop="grossProfitRate" label="毛利率" align="center"></el-table-column>
             <el-table-column prop="amount1" label="客量" align="center"></el-table-column>
-            <el-table-column prop="amount1" label="客单" align="center"></el-table-column>
+            <el-table-column prop="orderVolume" label="客单" align="center"></el-table-column>
           </el-table-column>
           <el-table-column label="支付方式" align="center">
-            <el-table-column prop="amount1" label="医保" align="center"/>
-            <el-table-column prop="amount1" label="微信" align="center"/>
-            <el-table-column prop="amount1" label="支付宝" align="center"/>
-            <el-table-column prop="amount1" label="现金" align="center"/>
-            <el-table-column prop="amount1" label="其他" align="center"/>
+            <el-table-column prop="paymentMethodVo.medicalInsurancePayment" label="医保" align="center"/>
+            <el-table-column prop="paymentMethodVo.wechatPayment" label="微信" align="center"/>
+            <el-table-column prop="paymentMethodVo.aliPayment" label="支付宝" align="center"/>
+            <el-table-column prop="paymentMethodVo.cashPayment" label="现金" align="center"/>
+            <el-table-column prop="paymentMethodVo.otherPayment" label="其他" align="center"/>
           </el-table-column>
         </el-table>
       </div>
@@ -35,26 +35,26 @@
 </template>
 <script setup lang="ts">
 import {h, onMounted, ref, type VNode} from 'vue'
-import type { TableColumnCtx } from 'element-plus'
 import {post} from "@/utils/request.ts";
 import {getThisWeek} from "@/utils/dateUtils.ts";
+import type { TableColumnCtx } from 'element-plus'
 
 const dateArray = ref<any>([])
-const tableData: Product[] = [
+const list = ref<any>([])
 
-]
-interface Product {
-  id: string
-  name: string
-  amount1: string
-  amount2: string
-  amount3: number
+
+
+const getDailyReport = ()=>{
+  post("charge/dailyChargingReport",{startDate:dateArray.value[0],endDate:dateArray.value[1]} ).then((res:any)=>{
+    list.value = res
+  })
 }
-interface SummaryMethodProps<T = Product> {
+interface SummaryMethodProps<T> {
   columns: TableColumnCtx<T>[]
   data: T[]
 }
-const getSummaries = (param: SummaryMethodProps) => {
+
+const getSummaries = (param: SummaryMethodProps<any>) => {
   const { columns, data } = param
   const sums: (string | VNode)[] = []
   columns.forEach((column, index) => {
@@ -81,11 +81,9 @@ const getSummaries = (param: SummaryMethodProps) => {
 
   return sums
 }
-const getDailyReport = ()=>{
-  post("charge/dailyChargingReport",{startDate:dateArray.value[0],endDate:dateArray.value[1]} ).then((res:any)=>{
 
-  })
-}
+
+
 onMounted(()=>{
   let thisWeek = getThisWeek()
   dateArray.value[0] = thisWeek.start
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index a3b1a99..ce4fe4a 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -21,7 +21,7 @@
               <img class="image"
                    :src="'/static/images/member/' + (item.sex === '男' ? 'man' : 'women') + '.png'"
                    alt=""/>
-              <div class="name">{{ item.realName || '-' }}</div>
+              <div class="name">{{ item.name || '-' }}</div>
               <span class="age">{{ item.age ? item.age + '岁' : '-' }}</span>
               <el-tooltip
                   class="box-item"
@@ -53,7 +53,7 @@
               <img class="image" src="/static/images/member/head.png" alt="">
               <div class="detail-top-left-text">
                 <div class="detail-top-left-text-name">
-                  <span style="margin-right: 16px">{{ listItem.realName || '-' }}</span>
+                  <span style="margin-right: 16px">{{ listItem.name || '-' }}</span>
                   <el-tag type="success">{{ listItem.levelName || '-' }}</el-tag>
                 </div>
                 <div class="detail-top-left-text-phone">
@@ -80,7 +80,7 @@
               <el-descriptions-item label="出生日期">{{ listItem.birthday || "-" }}</el-descriptions-item>
               <el-descriptions-item label="民族">{{ listItem.nation || "-" }}</el-descriptions-item>
               <el-descriptions-item label="创建日期">{{ listItem.createDatetime || "-" }}</el-descriptions-item>
-              <el-descriptions-item label="身份证号码">{{ listItem.idCode || "-" }}</el-descriptions-item>
+              <el-descriptions-item label="身份证号码">{{ listItem.certNo || "-" }}</el-descriptions-item>
               <el-descriptions-item label="积分"><span>{{ listItem.integralBalance || '-' }}</span>
               </el-descriptions-item>
               <el-descriptions-item label="家庭地址">{{ listItem.address || "-" }}</el-descriptions-item>
@@ -388,6 +388,7 @@ const openLevelEdit = (vip: any) => {
         height: 50px;
         line-height: 50px;
         padding: 0 24px;
+        color: #000000;
 
         .image {
           width: 20px;
@@ -556,7 +557,7 @@ const openLevelEdit = (vip: any) => {
 }
 
 .time_active {
-  color: #fff !important;
+  color: #000000 !important;
 }