From 8ee0dd89d7df8e65a99dc2ae018c215b3a684a94 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 16 May 2025 15:04:58 +0800
Subject: [PATCH] dev

---
 .../charge/药慧精灵智慧诊所_files/1.png       | Bin 1723 -> 0 bytes
 .../member/memberProfile/FlowingWater.vue     | 193 +++++++++++-------
 .../member/memberProfile/VipEdit.vue          |   1 +
 src/views/member/index.vue                    |  13 +-
 4 files changed, 127 insertions(+), 80 deletions(-)
 delete mode 100644 public/static/images/charge/药慧精灵智慧诊所_files/1.png

diff --git a/public/static/images/charge/药慧精灵智慧诊所_files/1.png b/public/static/images/charge/药慧精灵智慧诊所_files/1.png
deleted file mode 100644
index 399711410fa4e539cdb4ca9c031d96013fe47560..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1723
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
R-?IP!002ovPDHLkV1mWdDt-U}

diff --git a/src/components/member/memberProfile/FlowingWater.vue b/src/components/member/memberProfile/FlowingWater.vue
index ec48bd2..1bb39f2 100644
--- a/src/components/member/memberProfile/FlowingWater.vue
+++ b/src/components/member/memberProfile/FlowingWater.vue
@@ -1,17 +1,34 @@
 <template>
-  <div class="container">
-    <div class="body">
-      <div class="body_info">
-        <span class="name">{{props.info.realName}}</span>
-        <span>{{props.info.sex}}</span>
-        <span class="phone">{{props.info.phone}}</span>
-        <span>积分<span class="num">{{props.info.integralBalance}}</span></span>
-      </div>
-      <div class="body_list">
-        <el-table :data="tableData" style="width: 100%">
+  <Mask :width="798" :height="540" :is-show="isFlowingWater" @close="isFlowingWater = false" title="流水记录"
+        :show-footer="true">
+    <template #default>
+      <div class="content">
+        <div class="head">
+          <img style="width: 60px;height: 60px"
+               :src="'/static/images/member/' + (props.info.sex === 1 ? 'man' : 'women') + '.png'"
+               alt="">
+          <div class="right">
+            <div class="name">
+              {{ props.info.name }}
+            </div>
+            <div class="text">
+              <div class="phone">
+                {{ props.info.phone }}
+              </div>
+              <div class="grant-name">
+                积分：
+                <img style="width: 16px;height: 16px" src="/static/images/member/1.png" alt="">
+                <span class="num">{{ props.info.integralBalance }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <el-table class="body_list" :data="tableData"
+                  style="border-radius: 8px;border: 1px solid #EAEAEC;border-bottom: none"
+                  :header-cell-style="{ backgroundColor: '#F1F5FB'}">
           <el-table-column prop="createTime" label="创建时间" width="180">
             <template #default="scope">
-              {{formatDate(scope.row.createTime)}}
+              {{ formatDate(scope.row.createTime) }}
             </template>
           </el-table-column>
           <el-table-column prop="beforeIntegral" label="变化前"/>
@@ -20,113 +37,141 @@
           <el-table-column prop="remark" label="备注"/>
         </el-table>
       </div>
-    </div>
-    <div class="bottom">
-      <el-pagination
-          background
-          layout="prev, pager, next"
-          :page-size="20"
-          :current-page="currentPage"
-          :total="total"
-          @current-change="changePage"
-      />
-    </div>
-  </div>
+    </template>
+    <template #footer>
+      <div class="bottom">
+        <el-pagination
+            background
+            layout="prev, pager, next"
+            :page-size="20"
+            :current-page="currentPage"
+            :total="total"
+            @current-change="changePage"
+        />
+      </div>
+    </template>
+  </Mask>
 </template>
-
 <script lang="ts" setup>
-import {ref,defineEmits, defineProps, onMounted} from 'vue'
-import CloseBtn from "@/components/CloseBtn.vue";
+import {ref, defineEmits, defineProps, onMounted} from 'vue'
 import {post} from "@/utils/request.ts";
+import Mask from "@/components/common/Mask.vue";
+
+const isFlowingWater = defineModel()
 const props = defineProps({
   info: {
     type: Object,
     default: () => ({})
+  },
+  id: {
+    type: String || Number,
+    default: ""
   }
 })
 const currentPage = ref(1)
-const tableData:any = ref<any>([])
+const tableData: any = ref<any>([])
 const total = ref(0)
 const emit = defineEmits(['close'])
 const close = () => {
   emit('close')
 }
-onMounted(()=>{
+onMounted(() => {
   init()
 })
-const changePage = (page:any) => {
+const changePage = (page: any) => {
   const query = {
     pageNum: page,
     pageSize: 20,
-    vipId: props.info.id
+    vipId: props.id
   }
-  post('vip/integral/list',{query:query}).then((res:any)=>{
-    tableData.value.splice(0,tableData.length,...res.list)
+  post('vip/integral/list', {query: query}).then((res: any) => {
+    tableData.value.splice(0, tableData.length, ...res.list)
   })
 }
 const init = () => {
   const query = {
     pageNum: 1,
     pageSize: 10,
-    vipId: props.info.id
+    vipId: props.id
   }
-  post('vip/integral/list',{query:query}).then((res:any)=>{
-    tableData.value.splice(0,tableData.length,...res.list)
+  post('vip/integral/list', {query: query}).then((res: any) => {
+    tableData.value.splice(0, tableData.length, ...res.list)
     total.value = res.total_count
   })
 }
 //修改时间格式化
-const formatDate = (isoStr:any) => {
+const formatDate = (isoStr: any) => {
   const date = new Date(isoStr);
-  return `${date.getFullYear()}-${(date.getMonth()+1).toString().padStart(2,'0')}-${date.getDate().toString().padStart(2,'0')}`;
+  return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
 }
 </script>
 <style scoped lang="scss">
-.container {
-  position: relative;
-  width: 100%;
+.content {
+  padding-top: 24px;
   height: 100%;
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
-  min-height: 0;
-  .title {
-    height: 60px;
-    font-size: 20px;
 
-  }
-  .body {
-    flex: 1;
-    .body_info{
-      height: 50px;
-      display: flex;
-      font-size: 14px;
-      padding-left: 10px;
-      align-items: center;
-      color: #bac2ca;
-      .name{
-        font-size: 16px;
-        margin-right: 10px;
-        color: #121111;
-      }
-      .phone{
-        height: 15px;
-        margin: 0 17px;
-        line-height: 16px;
-      }
-      .num{
-        color: #df9b86;
-        margin-left: 10px;
-      }
-    }
-  }
-  .bottom {
-    position: absolute;
-    bottom: 0;
+  .head {
     height: 60px;
     display: flex;
     align-items: center;
+    margin-bottom: 16px;
+    padding: 0 24px;
+
+    .name {
+      font-weight: bold;
+      font-size: 24px;
+      color: #333333;
+      line-height: 33px;
+      text-align: left;
+      font-style: normal;
+    }
+
+    .right {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      margin-left: 16px;
+
+      .text {
+        margin-top: 4px;
+        display: flex;
+
+        .phone {
+          margin-right: 20px;
+        }
+
+        .grant-name {
+          display: flex;
+
+          .num {
+            font-weight: bold;
+            font-size: 24px;
+            color: #4D6DE4;
+            font-style: normal;
+            line-height: 16px;
+            margin-left: 6px;
+          }
+        }
+
+      }
+    }
+  }
+
+  .body_list {
+    width: 100%;
+    flex: 1;
+    background: #F9FAFC;
+    padding: 24px 24px 0;
   }
 }
 
+.bottom {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding: 0 24px;
+}
 </style>
diff --git a/src/components/member/memberProfile/VipEdit.vue b/src/components/member/memberProfile/VipEdit.vue
index 2ecb6dc..29e9b75 100644
--- a/src/components/member/memberProfile/VipEdit.vue
+++ b/src/components/member/memberProfile/VipEdit.vue
@@ -405,6 +405,7 @@ const init = (_id: any) => {
       ruleForm.value = res
       ruleForm.value.area = JSON.parse(ruleForm.value.area)
       ruleForm.value.levelId = ruleForm.value.levelId == 0 ? null : ruleForm.value.levelId
+      ruleForm.value.certType=Number(ruleForm.value.certType)
       if (!res.levelId) return
       post("vip/vipLevel/get", {levelId: res.levelId}).then((res: any) => {
         levelName.value = res.name
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index 988176f..bde3d9a 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -55,7 +55,7 @@
               <span class="btn" @click="openEdit(listItem.id)">编辑资料</span>
               <span class="btn" @click="openGrant()">发放积分</span>
               <span class="btn" @click="isExchange=true">兑换积分</span>
-              <span class="btn" @click="isFlowingWater=true">查看流水</span>
+              <span class="btn" @click="openFlowingWater">查看流水</span>
               <!--              <span class="btn" @click="openLevelEdit(listItem)">患者等级编辑</span>-->
             </div>
           </div>
@@ -157,9 +157,7 @@
   <VipLevelEdit ref="levelEditRef" @close="init"></VipLevelEdit>
   <Grant v-model="isGrant" :info="listItem" @close="closeGrant()"></Grant>
   <Exchange v-model="isExchange" :info="listItem" @close="closeExchange()"></Exchange>
-  <Mask :is-show="isFlowingWater" @close="isFlowingWater = false" title="流水记录">
-    <FlowingWater :info="listItem"></FlowingWater>
-  </Mask>
+  <FlowingWater :id="flowingId" v-model="isFlowingWater" :info="listItem"></FlowingWater>
   <OrderDetail ref="orderDetailRef" @updateOrderList="getChargeList(listItem.id)"></OrderDetail>
 </template>
 <script setup lang="ts">
@@ -304,7 +302,6 @@ const btn = (item: any, i: number) => {
 //点击发放
 const openGrant = () => {
   isGrant.value = true
-  console.log(listItem.value)
 }
 //消费时间
 const tableData = ref([])
@@ -380,7 +377,11 @@ const handleCurrentChange = (val: number) => {
 const levelEditRef = ref();
 const antysList = ref<any>(Object.entries(antys).map(([id, name]) => ({id, name})))
 const certTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({id, name})))
-
+const flowingId = ref();
+const openFlowingWater=()=>{
+  isFlowingWater.value=true
+  flowingId.value=listItem.value.id
+}
 </script>
 <style scoped lang="scss">
 @use "@/assets/scss/base.scss";