验收20%

2026-07-16 07:42:07 +08:00
parent 0dec90ffdd
commit cb25317412
108 changed files with 6477 additions and 1308 deletions
@@ -14,14 +14,15 @@
        <view class="application-intro">
          <text>入谱申请进度</text><text>审核结果会同步到消息中心</text>
        </view>
-        <view v-for="item in applications" :key="item.id" class="application-card" @click="openApprovedGenealogy(item)">
+        <view v-for="item in applications" :key="item.id" class="application-card">
          <image class="application-card__skin" src="/static/assets/modules/genealogy/opaque/application-status-card.png" mode="scaleToFill" />
          <view class="application-card__body">
            <text class="application-card__name">{{ item.genealogyName }}</text>
            <text class="application-card__time">{{ item.appliedAt }}</text>
            <text class="application-card__relation">{{ item.relation }}</text>
            <text class="application-card__status" :class="`application-card__status--${item.status.toLowerCase()}`">{{ statusLabel(item.status) }}</text>
-            <text class="application-card__hint">{{ item.status === 'APPROVED' ? '点按进入家谱' : item.status === 'PENDING' ? '请耐心等待管理员核实' : '可重新检索并提交申请' }}</text>
+            <text class="application-card__hint">{{ statusHint(item.status) }}</text>
+            <view v-if="actionFor(item)" class="application-card__action" @click="handleApplicationAction(item)">{{ actionFor(item) }}</view>
          </view>
        </view>
      </template>
@@ -29,8 +30,8 @@
      <view v-else class="application-state-card">
        <image src="/static/assets/modules/genealogy/opaque/application-status-card.png" mode="scaleToFill" />
        <view class="application-state-card__copy">
-          <text>{{ applicationState === 'empty' ? '还没有入谱申请' : '申请记录暂时无法读取' }}</text>
-          <text>{{ applicationState === 'empty' ? '从公开家谱检索开始，找到家谱后可提交加入申请。' : errorMessage || '请检查网络后重新查看。' }}</text>
+          <text>{{ stateTitle }}</text>
+          <text>{{ stateCopy }}</text>
        </view>
      </view>
      <view v-if="applicationState !== 'list'" class="application-page__action" @click="applicationState === 'error' ? loadApplications({}) : toSearch()">
@@ -38,17 +39,32 @@
        <text>{{ applicationState === 'error' ? '重新查看' : '查找公开家谱' }}</text>
      </view>
    </view>
+
+    <view v-if="withdrawTarget" class="withdraw-layer" @click="cancelWithdraw">
+      <view class="withdraw-dialog" @click.stop>
+        <image class="withdraw-dialog__skin" src="/static/assets/modules/genealogy/opaque/application-status-card.png" mode="scaleToFill" />
+        <view class="withdraw-dialog__content">
+          <text class="withdraw-dialog__title">撤回加入申请</text>
+          <text class="withdraw-dialog__copy">确认撤回对“{{ withdrawTarget.genealogyName }}”的申请？撤回后如需加入，可重新提交。</text>
+          <view class="withdraw-dialog__actions">
+            <view class="withdraw-action" @click="cancelWithdraw">暂不撤回</view>
+            <view class="withdraw-action withdraw-action--danger" @click="confirmWithdraw">确认撤回</view>
+          </view>
+        </view>
+      </view>
+    </view>
  </view>
 </template>

 <script setup>
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import PageHeader from '@/components/PageHeader.vue'

 const applications = ref([])
 const applicationState = ref('loading')
 const errorMessage = ref('')
+const withdrawTarget = ref(null)
 const applicationSamples = [
  { id: 1, genealogyId: 1001, genealogyName: '汤氏家谱', relation: '自述为汤正华堂侄', appliedAt: '今天 10:24', status: 'PENDING' },
  { id: 2, genealogyId: 1002, genealogyName: '汝南汤氏家谱', relation: '祖居河南汝南', appliedAt: '昨天 18:02', status: 'APPROVED' },
@@ -58,28 +74,48 @@ const applicationSamples = [
 const statusLabel = (status) => ({
  'PENDING': '审核中',
  'APPROVED': '已通过',
-  'REJECTED': '未通过'
+  'REJECTED': '未通过',
+  'WITHDRAWN': '已撤回'
 }[status] || '状态未知')

+const statusHint = (status) => ({
+  PENDING: '管理员尚未处理，可在审核前撤回',
+  APPROVED: '申请已通过，可进入这部家谱',
+  REJECTED: '请修改关系说明后重新提交',
+  WITHDRAWN: '申请已撤回，不再进入管理员审核'
+}[status] || '')
+
+const actionFor = (item) => ({ PENDING: '撤回申请', APPROVED: '进入家谱', REJECTED: '修改后重新提交' }[item.status] || '')
+const stateTitle = computed(() => applicationState.value === 'empty' ? '还没有入谱申请' : applicationState.value === 'loading' ? '正在整理申请记录' : '申请记录暂时无法读取')
+const stateCopy = computed(() => applicationState.value === 'empty' ? '从家谱搜索提交的申请会显示在这里；邀请码直接加入不进入本页。' : applicationState.value === 'loading' ? '请稍候，正在同步审核状态。' : errorMessage.value || '请检查网络后重新查看。')
+
 const loadApplications = (query = {}) => {
  applicationState.value = 'loading'
  errorMessage.value = ''
  if (query.state === 'empty') { applicationState.value = 'empty'; return }
  if (query.state === 'error') { applicationState.value = 'error'; return }
+  if (query.state === 'loading') { applicationState.value = 'loading'; return }
  applications.value = applicationSamples.map((item) => ({ ...item }))
  applicationState.value = 'list'
 }

 onLoad(loadApplications)
-const openApprovedGenealogy = (item) => {
-  if (item.status !== 'APPROVED') return
-  uni.navigateTo({ url: `/pages/genealogy/g05-genealogy-overview?genealogyId=${item.genealogyId}` })
+const handleApplicationAction = (item) => {
+  if (item.status === 'APPROVED') return uni.navigateTo({ url: `/pages/genealogy/g05-genealogy-overview?genealogyId=${item.genealogyId}` })
+  if (item.status === 'REJECTED') return uni.navigateTo({ url: `/pages/genealogy/g08-join-application?source=search&previous=rejected&genealogyId=${item.genealogyId}` })
+  if (item.status === 'PENDING') withdrawTarget.value = item
+}
+const cancelWithdraw = () => { withdrawTarget.value = null }
+const confirmWithdraw = () => {
+  const target = applications.value.find((item) => item.id === withdrawTarget.value?.id)
+  if (target) target.status = 'WITHDRAWN'
+  cancelWithdraw()
 }
 const toSearch = () => uni.navigateTo({ url: '/pages/genealogy/g06-search-genealogies' })
 </script>

 <style scoped lang="scss">
-.application-page { position: relative; min-height: 100vh; overflow: hidden; background: $paper; }
+.application-page { position: relative; min-height: 100vh; overflow-x: hidden; background: $paper; }
 .application-page__paper { position: absolute; inset: 0; z-index: 0; width: 100%; height: 100%; opacity: .98; pointer-events: none; }
 .application-page__footer { position: absolute; right: 0; bottom: 0; left: 0; z-index: 1; width: 100%; opacity: .13; pointer-events: none; }
 .application-page__header { position: relative; z-index: 3; }
@@ -93,10 +129,11 @@ const toSearch = () => uni.navigateTo({ url: '/pages/genealogy/g06-search-geneal
 .application-card__name { color: $ink; font-family: 'STKaiti', 'KaiTi', serif; font-size: 30rpx; font-weight: 700; }
 .application-card__time { position: absolute; top: 3rpx; right: 0; color: #998873; font-size: 20rpx; }
 .application-card__relation { display: block; max-width: 70%; margin-top: 14rpx; color: $ink-muted; font-size: 22rpx; }
-.application-card__status { position: absolute; right: 3%; bottom: 11%; color: $brand-red; font-size: 24rpx; font-weight: 700; }
+.application-card__status { position: absolute; right: 3%; bottom: 38%; color: $brand-red; font-size: 23rpx; font-weight: 700; }
 .application-card__status--approved { color: #537368; }
 .application-card__status--rejected { color: #7e6f62; }
-.application-card__hint { position: absolute; bottom: 5%; left: 0; color: #8d7c67; font-size: 20rpx; }
+.application-card__hint { position: absolute; bottom: 5%; left: 0; max-width: 62%; color: #8d7c67; font-size: 20rpx; }
+.application-card__action { position: absolute; right: 2%; bottom: 2%; z-index: 2; display: flex; min-height: 54rpx; align-items: center; color: $brand-red; font-size: 21rpx; font-weight: 700; }
 .application-state-card { position: relative; width: 100%; height: calc((100vw - 24px) * .34286); min-height: 228rpx; margin-top: 80rpx; }
 .application-state-card > image { position: absolute; inset: 0; width: 100%; height: 100%; }
 .application-state-card__copy { position: absolute; inset: 22% 12%; display: flex; flex-direction: column; justify-content: center; text-align: center; }
@@ -105,4 +142,13 @@ const toSearch = () => uni.navigateTo({ url: '/pages/genealogy/g06-search-geneal
 .application-page__action { position: relative; width: 420rpx; height: 82rpx; margin: 34rpx auto 0; }
 .application-page__action image { position: absolute; inset: 0; width: 100%; height: 100%; }
 .application-page__action text { position: relative; z-index: 1; display: flex; align-items: center; justify-content: center; height: 100%; color: #fff9ed; font-size: 26rpx; font-weight: 700; }
+.withdraw-layer { position: fixed; z-index: 30; inset: 0; display: flex; align-items: center; justify-content: center; box-sizing: border-box; padding: 42rpx; background: rgba(34, 20, 12, .58); }
+.withdraw-dialog { position: relative; width: 100%; max-width: 660rpx; min-height: 390rpx; }
+.withdraw-dialog__skin { position: absolute; inset: 0; width: 100%; height: 100%; }
+.withdraw-dialog__content { position: relative; z-index: 1; display: flex; min-height: 390rpx; flex-direction: column; align-items: center; box-sizing: border-box; padding: 74rpx 60rpx 46rpx; text-align: center; }
+.withdraw-dialog__title { color: $ink; font-family: 'STKaiti', 'KaiTi', serif; font-size: 36rpx; font-weight: 700; }
+.withdraw-dialog__copy { margin-top: 24rpx; color: $ink-muted; font-size: 23rpx; line-height: 38rpx; }
+.withdraw-dialog__actions { display: flex; width: 100%; margin-top: auto; border-top: 1rpx solid rgba(181, 138, 75, .42); }
+.withdraw-action { display: flex; flex: 1; min-height: 76rpx; align-items: center; justify-content: center; color: $ink-muted; font-size: 23rpx; }
+.withdraw-action--danger { border-left: 1rpx solid rgba(181, 138, 75, .42); color: $brand-red; }
 </style>