From 71f8571f1a800843008f1fe30acca45962376445 Mon Sep 17 00:00:00 2001
From: RIceWqy <1840169763@qq.com>
Date: Sat, 13 Jan 2024 22:03:19 +0800
Subject: [PATCH] 1

---
 .../member-info-detail/member-info-detail.vue | 136 ++++++++++++--
 src/pages/member-info/member-info.vue         |  12 +-
 src/pages/member/member.vue                   | 173 +++++++++---------
 3 files changed, 209 insertions(+), 112 deletions(-)

diff --git a/src/pages/member-info-detail/member-info-detail.vue b/src/pages/member-info-detail/member-info-detail.vue
index 7fe4ba9..d676e75 100644
--- a/src/pages/member-info-detail/member-info-detail.vue
+++ b/src/pages/member-info-detail/member-info-detail.vue
@@ -1,31 +1,129 @@
 <template>
   <view>
+    <div class="section-title">基本信息</div>
     <div class="detail-item">
       <div class="label">姓名:</div>
-      <div class="value">{{ profolio.name }}</div>
+      <div class="value">{{ portfolio.name }}</div>
     </div>
     <div class="detail-item">
-      <div class="label">手机:</div>
-      <div class="value">{{ profolio.phoneNumber }}</div>
+      <div class="label">出生日期:</div>
+      <div class="value">{{ portfolio.birthDate }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">性别:</div>
+      <div class="value">{{ portfolio.gender }}</div>
     </div>
     <div class="detail-item">
       <div class="label">民族:</div>
-      <div class="value">{{ profolio.ethnicity }}</div>
+      <div class="value">{{ portfolio.ethnicity }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">籍贯:</div>
+      <div class="value">{{ portfolio.nativePlace }}</div>
     </div>
     <div class="detail-item">
       <div class="label">身份证号:</div>
-      <div class="value">{{ profolio.idCardNumber }}</div>
+      <div class="value">{{ portfolio.idCardNumber }}</div>
+    </div>
+    <div class="section-title">联系信息</div>
+    <div class="detail-item">
+      <div class="label">住址:</div>
+      <div class="value">{{ portfolio.address }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">联系电话:</div>
+      <div class="value">{{ portfolio.phoneNumber }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">电子邮件地址:</div>
+      <div class="value">{{ portfolio.emailAddress }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">紧急联系人姓名:</div>
+      <div class="value">{{ portfolio.emergencyContactName }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">紧急联系人电话:</div>
+      <div class="value">{{ portfolio.emergencyContactPhone }}</div>
+    </div>
+    <div class="section-title">预先规划的殡葬信息</div>
+    <div class="detail-item">
+      <div class="label">殡葬方式:</div>
+      <div class="value">{{ portfolio.funeralMethod }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">预期的礼仪类型:</div>
+      <div class="value">{{ portfolio.ceremonyType }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">墓地信息:</div>
+      <div class="value">{{ portfolio.cemeteryInfo }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">是否有预购墓地:</div>
+      <div class="value">{{ portfolio.prePurchasedGrave ? '是' : '否' }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">是否有预定的葬礼地点:</div>
+      <div class="value">{{ portfolio.preReservedFuneralLocation }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">是否有遗嘱或活葬指示:</div>
+      <div class="value">{{ portfolio.hasWillOrLivingDirective ? '是' : '否' }}</div>
+    </div>
+    <div class="section-title">财务信息</div>
+    <div class="detail-item">
+      <div class="label">支付方式:</div>
+      <div class="value">{{ portfolio.paymentMethod }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">银行账户信息:</div>
+      <div class="value">{{ portfolio.bankAccountInfo }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">预先支付的葬礼费用:</div>
+      <div class="value">{{ portfolio.prePaidFuneralCost }}</div>
+    </div>
+    <div class="section-title">法律文件</div>
+    <div class="detail-item">
+      <div class="label">遗嘱复印件:</div>
+      <div class="value">{{ portfolio.willCopy }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">生前事务代理人指定书:</div>
+      <div class="value">{{ portfolio.preDeathAgentDesignation }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">医疗事务代理人指定书:</div>
+      <div class="value">{{ portfolio.medicalAgentDesignation }}</div>
+    </div>
+    <div class="detail-item">
+      <div class="label">生命维持治疗决定书:</div>
+      <div class="value">{{ portfolio.lifeSupportDecision }}</div>
+    </div>
+    <div class="section-title">档案状态</div>
+    <div class="detail-item">
+      <div class="label">档案状态:</div>
+      <div class="value">{{ portfolio.portfolioStatus }}</div>
+    </div>
+    <div class="section-title">拒绝理由</div>
+    <div class="detail-item">
+      <div class="label">拒绝理由:</div>
+      <div class="value">{{ portfolio.rejectionReason }}</div>
     </div>
-    <!-- 其他详细信息的展示 -->
   </view>
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { ref } from 'vue'
 
 const portfolio = ref({})
 const portfolioId = ref(0)
 
+onLoad((obj) => {
+  // 在组件挂载时获取档案详情
+  fetchProfileDetail(obj.portfolioId)
+})
 const fetchProfileDetail = (id) => {
   portfolioId.value = id
   // 发送请求获取档案详情数据
@@ -35,21 +133,14 @@ const fetchProfileDetail = (id) => {
     data: {
       portfolioId: portfolioId.value
     }
-  }).then((response) => {
-    console.log(response.data)
-    portfolio.value = response.data
-  }).catch((error) => {
-    console.error('Failed to fetch profile details:', error)
+  }).then((res) => {
+    console.log('@@@@')
+    portfolio.value = res.data
   })
 }
-
-onLoad((obj) => {
-  // 在组件挂载时获取档案详情
-  fetchProfileDetail(obj.portfolioId)
-})
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 /* 样式可以根据你的设计进行修改 */
 .detail-item {
   display: flex;
@@ -57,11 +148,18 @@ onLoad((obj) => {
 }
 
 .label {
-  width: 80px;
+  width: 100px;
   font-weight: bold;
 }
 
 .value {
   flex: 1;
 }
+
+.section-title {
+  font-size: 18px;
+  font-weight: bold;
+  margin-top: 20px;
+  margin-bottom: 10px;
+}
 </style>
diff --git a/src/pages/member-info/member-info.vue b/src/pages/member-info/member-info.vue
index 24a8673..b682693 100644
--- a/src/pages/member-info/member-info.vue
+++ b/src/pages/member-info/member-info.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="profile-list">
     <div class="profile-container">
-      <div class="profile-item" v-for="profile in portfolios" :key="profile.id">
+      <div class="profile-item" v-for="portfolio in portfolios" :key="portfolio.id">
         <!--        <img-show class="avatar" :src="your_image_url" :alt="your_alt_text"  />-->
-        <div class="info" @click="goToDetail(profile.portfolioId)">
-          <div class="name">{{ profile.name }}</div>
+        <div class="info" @click="goToDetail(portfolio.portfolioId)">
+          <div class="name">{{ portfolio.name }}</div>
           <div class="details">
-            <div class="detail">手机: {{ profile.phoneNumber }}</div>
-            <div class="detail">民族: {{ profile.ethnicity }}</div>
-            <div class="detail">身份证号: {{ profile.idCardNumber }}</div>
+            <div class="detail">手机: {{ portfolio.phoneNumber }}</div>
+            <div class="detail">民族: {{ portfolio.ethnicity }}</div>
+            <div class="detail">身份证号: {{ portfolio.idCardNumber }}</div>
           </div>
         </div>
       </div>
diff --git a/src/pages/member/member.vue b/src/pages/member/member.vue
index 5f5ca4b..45ae464 100644
--- a/src/pages/member/member.vue
+++ b/src/pages/member/member.vue
@@ -1,110 +1,109 @@
 <template>
   <!-- 商品列表 -->
-    <view class="prod-item">
-      <block v-if="prodList.length">
-        <block v-for="(prod, key) in prodList" :key="key">
-          <view class="prod-items" :data-prodid="prod.prodId" @tap="toProdPage">
-            <view class="hot-imagecont">
-              <image :src="prod.pic" class="hotsaleimg" />
+  <view class="prod-item">
+    <block v-if="prodList.length">
+      <block v-for="(prod, key) in prodList" :key="key">
+        <view class="prod-items" :data-prodid="prod.prodId" @tap="toProdPage">
+          <view class="hot-imagecont">
+            <image :src="prod.pic" class="hotsaleimg"/>
+          </view>
+          <view class="hot-text">
+            <view class="hotprod-text">
+              {{ prod.prodName }}
             </view>
-            <view class="hot-text">
-              <view class="hotprod-text">
-                {{ prod.prodName }}
-              </view>
-              <view class="prod-info">
-                {{ prod.brief }}
-              </view>
-              <view class="prod-text-info">
-                <view class="price">
-                  <text class="symbol">
-                    ￥
-                  </text>
-                  <text class="big-num">
-                    {{ wxs.parsePrice(prod.price)[0] }}
-                  </text>
-                  <text class="small-num">
-                    .{{ wxs.parsePrice(prod.price)[1] }}
-                  </text>
-                </view>
+            <view class="prod-info">
+              {{ prod.brief }}
+            </view>
+            <view class="prod-text-info">
+              <view class="price">
+                <text class="symbol">
+                  ￥
+                </text>
+                <text class="big-num">
+                  {{ wxs.parsePrice(prod.price)[0] }}
+                </text>
+                <text class="small-num">
+                  .{{ wxs.parsePrice(prod.price)[1] }}
+                </text>
               </view>
             </view>
           </view>
-        </block>
+        </view>
       </block>
-      <view v-else class="empty-wrap">
-        暂无商品数据~
-      </view>
+    </block>
+    <view v-else class="empty-wrap">
+      暂无商品数据~
     </view>
+  </view>
 
 </template>
 
 <script setup>
-  const wxs = number()
+const wxs = number()
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad((options) => {
-    getProdList()
-  })
+/**
+ * 生命周期函数--监听页面加载
+ */
+onLoad((options) => {
+  getProdList()
+})
 
-  const current = ref(1)
-  const pages = ref(0)
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom(() => {
-    if (current.value < pages.value) {
-      current.value = current.value + 1
-      getProdList()
-    }
-  })
-
-  const intoView = ref('')
-  const subCategoryList = ref([])
-
-  const prodList = ref([])
-  const isLoaded = ref(false) // 列表是否加载完毕
-  /**
-   * 根据分类id获取商品列表数据
-   */
-  const getProdList = () => {
-    isLoaded.value = false
-
-    http.request({
-        url: '/prod/prodListByMember',
-        method: 'GET',
-        data: {
-          current: current.value,
-          size: 10,
-          sort: 0,
-          isAllProdType: true
-        }
-      })
-      .then(({
-        data
-      }) => {
-        isLoaded.value = true
-        prodList.value = data.current == 1 ? data.records : prodList.value.concat(data.records)
-        current.value = data.current
-        pages.value = data.pages
-      })
+const current = ref(1)
+const pages = ref(0)
+/**
+ * 页面上拉触底事件的处理函数
+ */
+onReachBottom(() => {
+  if (current.value < pages.value) {
+    current.value = current.value + 1
+    getProdList()
   }
+})
 
+const intoView = ref('')
+const subCategoryList = ref([])
 
-  /**
-   * 跳转商品下详情
-   */
-  const toProdPage = (e) => {
-    const prodid = e.currentTarget.dataset.prodid
-    if (prodid) {
-      uni.navigateTo({
-        url: '/pages/prod/prod?prodid=' + prodid
-      })
+const prodList = ref([])
+const isLoaded = ref(false) // 列表是否加载完毕
+/**
+ * 根据分类id获取商品列表数据
+ */
+const getProdList = () => {
+  isLoaded.value = false
+
+  http.request({
+    url: '/prod/prodListByMember',
+    method: 'GET',
+    data: {
+      current: current.value,
+      size: 10,
+      sort: 0,
+      isAllProdType: true
     }
+  })
+    .then(({
+      data
+    }) => {
+      isLoaded.value = true
+      prodList.value = data.current == 1 ? data.records : prodList.value.concat(data.records)
+      current.value = data.current
+      pages.value = data.pages
+    })
+}
+
+/**
+ * 跳转商品下详情
+ */
+const toProdPage = (e) => {
+  const prodid = e.currentTarget.dataset.prodid
+  if (prodid) {
+    uni.navigateTo({
+      url: '/pages/prod/prod?prodid=' + prodid
+    })
   }
+}
 </script>
 
 <style scoped lang="scss">
-  @use './member.scss';
+@use './member.scss';
 </style>