change

2026-08-26 15:10:25 +08:00
parent 06debfd1fc
commit fc9613197b
202 changed files with 28919 additions and 5551 deletions
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128" fill="none">
+    <circle cx="64" cy="64" r="58" stroke="#F5222D" stroke-width="3"/>
+    <path d="M21 54A44 44 0 0 1 107 54" stroke="#F5222D" stroke-width="9" stroke-linecap="round"/>
+    <path d="M21 74A44 44 0 0 0 107 74" stroke="#F5222D" stroke-width="9" stroke-linecap="round"/>
+    <circle cx="64" cy="64" r="27" stroke="#F5222D" stroke-width="9"/>
+    <path d="M64 20V108" stroke="#F5222D" stroke-width="8" stroke-linecap="round"/>
+</svg>
@@ -124,11 +124,71 @@ body {
 }

 .custom-list-loading {
-    background-color: unset;
+    min-width: 132px;
+    padding: 15px 12px 12px;
+    border-radius: 14px;
+    color: #666;
+    background-color: rgba(255, 255, 255, 0.98);
+    box-shadow: 0 6px 22px rgba(128, 72, 72, 0.08);
 }

 .custom-list-loading .van-icon {
-    font-size: 108px;
+    position: relative;
+    width: 88px;
+    height: 88px;
+    overflow: visible;
+    font-size: 88px;
+}
+
+.custom-list-loading .van-icon::before {
+    position: absolute;
+    inset: 6px;
+    border: 1px solid rgba(255, 112, 103, 0.24);
+    border-radius: 50%;
+    content: "";
+}
+
+.custom-list-loading .van-icon::after {
+    position: absolute;
+    top: 2px;
+    left: 41px;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    background: #ff8c83;
+    box-shadow: 33px 37px 0 #ff6f68, -35px 21px 0 #ffb0a9;
+    content: "";
+    transform-origin: 3px 42px;
+    animation: smart-union-loading-orbit 1.8s linear infinite;
+}
+
+.custom-list-loading .van-icon__image {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    box-sizing: border-box;
+    width: 54px;
+    height: 54px;
+    padding: 5px;
+    border-radius: 50%;
+    background: rgba(255, 238, 236, 0.92);
+    object-fit: contain;
+    transform: translate(-50%, -50%);
+}
+
+@keyframes smart-union-loading-orbit {
+    to {
+        transform: rotate(360deg);
+    }
+}
+
+.custom-list-loading .van-toast__text {
+    margin-top: 4px;
+    color: #707070;
+    font-size: 11px;
+    font-weight: 500;
+    line-height: 18px;
+    white-space: pre-line;
 }

 .list-card {
@@ -8,6 +8,10 @@ const commonUtil = {
                "x-requested-with": "XMLHttpRequest"
            }
        })
+        // H5 页面按需注入统一的 Loading 与请求延迟处理，其他端保持原有行为。
+        if (typeof window !== "undefined" && typeof window.bindH5AxiosLoading === "function") {
+            window.bindH5AxiosLoading(axiosService)
+        }
        //axios拦截器
        axiosService.interceptors.response.use(
            (response) => {
@@ -0,0 +1,79 @@
+/**
+ * H5 弹框浏览器历史栈管理器。
+ * 页面只注册关闭回调；本文件全局统一监听 popstate，避免每个页面重复绑定返回事件。
+ */
+;((global) => {
+    const callbacks = new Map()
+    const popupStack = []
+    let tokenSeed = 0
+    let stateSeed = 0
+    let pendingClear = null
+
+    const invokeClose = (entry) => {
+        const callback = callbacks.get(entry.token)
+        if (callback) callback(entry.popupKey)
+    }
+
+    global.addEventListener("popstate", (event) => {
+        if (pendingClear) {
+            event.stopImmediatePropagation()
+            const clear = pendingClear
+            pendingClear = null
+            clear.resolve()
+            return
+        }
+        if (!popupStack.length) return
+
+        // 有弹框历史时消费本次返回事件，阻止 PJAX 将页面直接切回上一个业务页面。
+        event.stopImmediatePropagation()
+        const entry = popupStack.pop()
+        invokeClose(entry)
+    }, true)
+
+    global.h5PopupHistory = {
+        register(closeCallback) {
+            tokenSeed += 1
+            const token = "h5-popup-page-" + tokenSeed
+            callbacks.set(token, closeCallback)
+            return token
+        },
+        unregister(token) {
+            callbacks.delete(token)
+            for (let index = popupStack.length - 1; index >= 0; index -= 1) {
+                if (popupStack[index].token === token) popupStack.splice(index, 1)
+            }
+        },
+        open(token, popupKey) {
+            if (!callbacks.has(token)) return
+            const current = popupStack[popupStack.length - 1]
+            if (current && current.token === token && current.popupKey === popupKey) return
+
+            stateSeed += 1
+            const entry = {token:token,popupKey:popupKey,stateId:stateSeed}
+            popupStack.push(entry)
+            const state = Object.assign({}, global.history.state || {}, {
+                __h5PopupHistory: {token:token,popupKey:popupKey,stateId:stateSeed}
+            })
+            global.history.pushState(state, global.document.title, global.location.href)
+        },
+        close(token, popupKey) {
+            const current = popupStack[popupStack.length - 1]
+            if (!current || current.token !== token || current.popupKey !== popupKey) return false
+            global.history.back()
+            return true
+        },
+        clear(token) {
+            const entries = popupStack.filter((entry) => entry.token === token)
+            if (!entries.length) return Promise.resolve()
+
+            entries.forEach((entry) => invokeClose(entry))
+            for (let index = popupStack.length - 1; index >= 0; index -= 1) {
+                if (popupStack[index].token === token) popupStack.splice(index, 1)
+            }
+            return new Promise((resolve) => {
+                pendingClear = {resolve:resolve}
+                global.history.go(-entries.length)
+            })
+        }
+    }
+})(window)
@@ -0,0 +1,634 @@
+<template>
+  <div>
+    <van-action-sheet
+        v-model="visible"
+        class="activity-schedule-calendar"
+        :style="{ height: '78%' }"
+        :close-on-click-overlay="true"
+        title="活动日历"
+        closeable>
+      <div class="activity-schedule-calendar__body">
+        <div class="activity-schedule-calendar__month-bar">
+          <button type="button" class="activity-schedule-calendar__month-btn" @click="changeMonth(-1)">
+            <van-icon name="arrow-left"></van-icon>
+          </button>
+          <div class="activity-schedule-calendar__month-title">{{ currentYear }}年{{ currentMonth }}月</div>
+          <button type="button" class="activity-schedule-calendar__month-btn" @click="changeMonth(1)">
+            <van-icon name="arrow"></van-icon>
+          </button>
+        </div>
+
+        <div class="activity-schedule-calendar__weekdays">
+          <span v-for="item in weekdays" :key="item">{{ item }}</span>
+        </div>
+        <div class="activity-schedule-calendar__days">
+          <button
+              v-for="day in calendarDays"
+              :key="day.key"
+              type="button"
+              class="activity-schedule-calendar__day"
+              :class="{
+                'is-other-month': !day.currentMonth,
+                'is-selected': day.key === selectedDate,
+                'is-today': day.isToday
+              }"
+              @click="selectDay(day)">
+            <span>
+              <span class="activity-schedule-calendar__day-number">{{ day.day }}</span>
+              <small v-if="day.isToday" class="activity-schedule-calendar__today-label">今</small>
+            </span>
+            <i v-if="day.status" class="activity-schedule-calendar__day-status" :class="'is-' + day.status"></i>
+          </button>
+        </div>
+
+        <div class="activity-schedule-calendar__legend">
+          <span><i class="is-solid"></i>已签到</span>
+          <span><i class="is-outline"></i>可签到</span>
+          <span><i class="is-muted"></i>未开始</span>
+        </div>
+
+        <div v-if="showMap" :id="mapContainerId" class="activity-schedule-calendar__map"></div>
+
+        <section class="activity-schedule-calendar__schedule-card">
+          <div class="activity-schedule-calendar__schedule-title">
+            {{ selectedDate ? selectedDate + ' 的活动时段' : '活动时段' }}
+          </div>
+          <div v-if="selectedTimes.length" class="activity-schedule-calendar__schedule-list">
+            <div v-for="item in selectedTimes" :key="item.id" class="activity-schedule-calendar__schedule-item">
+              <div class="activity-schedule-calendar__schedule-main">
+                <van-icon :name="item.isAttend === true ? 'checked' : 'clock-o'"></van-icon>
+                <div class="activity-schedule-calendar__schedule-copy">
+                  <div class="activity-schedule-calendar__schedule-time">
+                    {{ formatTime(item.courseStartTime) }} - {{ formatTime(item.courseEndTime) }}
+                  </div>
+                  <div v-if="row && row.courseLocation" class="activity-schedule-calendar__schedule-location">
+                    <van-icon name="location-o"></van-icon>
+                    <span>{{ row.courseLocation }}</span>
+                  </div>
+                </div>
+              </div>
+              <span v-if="item.isAttend === true" class="activity-schedule-calendar__status is-success">已签到</span>
+              <button
+                  v-else-if="canSignItem(item)"
+                  type="button"
+                  class="activity-schedule-calendar__sign-btn"
+                  @click.stop="onSign(item)">签到</button>
+              <span v-else class="activity-schedule-calendar__status" :class="{
+                'is-ended': getScheduleStatus(item) === '已结束',
+                'is-progressing': getScheduleStatus(item) === '进行中'
+              }">
+                {{ getScheduleStatus(item) }}
+              </span>
+            </div>
+          </div>
+          <div v-else class="activity-schedule-calendar__empty">
+            <img src="/assets/mobile/img/activity/schedule-empty.png?v=20260821-transparent" alt="">
+            <div class="activity-schedule-calendar__empty-title">当天暂无签到时段</div>
+            <div class="activity-schedule-calendar__empty-desc">当前日期没有需要签到的活动安排</div>
+          </div>
+        </section>
+      </div>
+    </van-action-sheet>
+
+    <van-popup
+        v-model="signVisible"
+        round
+        closeable
+        :safe-area-inset-bottom="true"
+        :close-on-click-overlay="false"
+        :style="{ width: '80%', height: '66%' }"
+        get-container="#app"
+        @close="onSignClose">
+      <scan-code ref="scanCodeRef"></scan-code>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+module.exports = {
+  name: "ActivityScheduleCalendar",
+  props: {
+    moduleType: {
+      type: String,
+      default: "brand"
+    }
+  },
+  components: {
+    "scan-code": httpVueLoader("/components/plugins/sysScanCode/index.vue?v=" + new Date().getTime())
+  },
+  data() {
+    return {
+      visible: false,
+      row: null,
+      currentYear: new Date().getFullYear(),
+      currentMonth: new Date().getMonth() + 1,
+      selectedDate: "",
+      weekdays: ["日", "一", "二", "三", "四", "五", "六"],
+      selectCourseTime: null,
+      signVisible: false,
+      markerLayer: null,
+      map: null,
+      circle: null,
+      mapContainerId: "activityScheduleMap_" + Math.random().toString(36).slice(2)
+    }
+  },
+  computed: {
+    courseTimes() {
+      return this.row && Array.isArray(this.row.courseTimes) ? this.row.courseTimes : []
+    },
+    scheduleDateMap() {
+      const map = {}
+      this.courseTimes.forEach(item => {
+        const key = this.dateKey(item)
+        if (!key) return
+        if (!map[key]) map[key] = []
+        map[key].push(item)
+      })
+      return map
+    },
+    selectedTimes() {
+      return this.scheduleDateMap[this.selectedDate] || []
+    },
+    canSign() {
+      return !!(this.row && this.row.isSign === true && this.row.isMobileSign === true)
+    },
+    showMap() {
+      return !!(this.moduleType === "brand" && this.row && this.row.isMobileSign === true && this.row.signType === 3)
+    },
+    calendarDays() {
+      const firstDay = new Date(this.currentYear, this.currentMonth - 1, 1)
+      const startDate = new Date(this.currentYear, this.currentMonth - 1, 1 - firstDay.getDay())
+      const todayKey = this.formatDateKey(new Date())
+      return Array.from({ length: 42 }, (_, index) => {
+        const date = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate() + index)
+        const key = this.formatDateKey(date)
+        return {
+          key,
+          day: date.getDate(),
+          currentMonth: date.getFullYear() === this.currentYear && date.getMonth() + 1 === this.currentMonth,
+          isToday: key === todayKey,
+          status: this.getDayStatus(this.scheduleDateMap[key] || [])
+        }
+      })
+    }
+  },
+  methods: {
+    onOpen(row) {
+      this.row = row
+      const initialDate = this.formatDateKey(new Date())
+      const date = this.$moment(initialDate)
+      this.currentYear = date.year()
+      this.currentMonth = date.month() + 1
+      this.selectedDate = initialDate
+      this.visible = true
+      this.$nextTick(() => {
+        if (this.showMap) this.initMap()
+      })
+    },
+    dateKey(item) {
+      const value = item && (item.courseDate || item.courseStartTime)
+      return value ? this.$moment(value).format("YYYY-MM-DD") : ""
+    },
+    formatDateKey(date) {
+      const year = date.getFullYear()
+      const month = String(date.getMonth() + 1).padStart(2, "0")
+      const day = String(date.getDate()).padStart(2, "0")
+      return `${year}-${month}-${day}`
+    },
+    formatTime(value) {
+      return value ? this.$moment(value).format("HH:mm") : "--"
+    },
+    canSignItem(item) {
+      if (!this.canSign || !item || !item.courseStartTime || !item.courseEndTime) return false
+      const now = this.$moment()
+      return !now.isBefore(this.$moment(item.courseStartTime)) && !now.isAfter(this.$moment(item.courseEndTime))
+    },
+    getScheduleStatus(item) {
+      if (!item || !item.courseStartTime || !item.courseEndTime) return "待开始"
+      const now = this.$moment()
+      if (now.isBefore(this.$moment(item.courseStartTime))) return "待开始"
+      if (now.isAfter(this.$moment(item.courseEndTime))) return "已结束"
+      return "进行中"
+    },
+    getDayStatus(items) {
+      if (items.some(item => item.isAttend === true)) return "signed"
+      if (items.some(item => this.canSignItem(item))) return "available"
+      if (items.some(item => item.courseStartTime && this.$moment().isBefore(this.$moment(item.courseStartTime)))) return "pending"
+      return ""
+    },
+    changeMonth(offset) {
+      const date = new Date(this.currentYear, this.currentMonth - 1 + offset, 1)
+      this.currentYear = date.getFullYear()
+      this.currentMonth = date.getMonth() + 1
+    },
+    selectDay(day) {
+      this.selectedDate = day.key
+      if (!day.currentMonth) {
+        const date = this.$moment(day.key)
+        this.currentYear = date.year()
+        this.currentMonth = date.month() + 1
+      }
+    },
+    onSign(courseTime) {
+      this.selectCourseTime = courseTime
+      if (this.row.signType === 1) {
+        this.signVisible = true
+        this.$nextTick(() => this.$refs.scanCodeRef.init())
+      } else if (this.row.signType === 2) {
+        this.makeCode()
+      } else if (this.row.signType === 3 && this.moduleType === "brand") {
+        this.positionSign()
+      } else {
+        this.$toast("此签到模式正在升级中")
+      }
+    },
+    onSignClose() {
+      if (this.$refs.scanCodeRef) this.$refs.scanCodeRef.closeScan()
+    },
+    makeCode() {
+      const baseUrl = this.moduleType === "family"
+          ? "/platform/family/mine/passiveScan"
+          : "/platform/trainSignUp/mine/passiveScan"
+      const content = jrQrcode.getQrBase64(baseUrl + "?id=" + this.selectCourseTime.id)
+      vant.ImagePreview([content])
+    },
+    positionSign() {
+      this.getLocation(coords => {
+        if (!coords) return
+        this.$axios.post("/platform/trainSignUp/mine/positionSign", {
+          timeId: this.selectCourseTime.id,
+          courseId: this.row.id,
+          lat: coords.lat,
+          lng: coords.lng
+        }).then(res => {
+          if (res.code === 0) {
+            this.selectCourseTime.isAttend = true
+            this.$toast("签到成功")
+          } else {
+            this.$toast(res.msg)
+          }
+        })
+      })
+    },
+    getLocation(callback) {
+      if (!navigator.geolocation) {
+        this.$toast("当前浏览器不支持定位功能")
+        callback(null)
+        return
+      }
+      const loading = vant.Toast.loading({ message: "获取定位中...", forbidClick: false, duration: 0 })
+      navigator.geolocation.getCurrentPosition(position => {
+        loading.close()
+        callback({ lat: position.coords.latitude, lng: position.coords.longitude })
+      }, error => {
+        loading.close()
+        const messageMap = {
+          1: "请允许浏览器获取位置信息",
+          2: "无法获取当前位置",
+          3: "定位超时，请重试"
+        }
+        this.$toast(messageMap[error.code] || "定位失败，请稍后重试")
+        callback(null)
+      }, { enableHighAccuracy: true, timeout: 10000, maximumAge: 60000 })
+    },
+    initMap() {
+      if (!this.row.courseLocationCoordinates || typeof TMap === "undefined") return
+      const position = JSON.parse(this.row.courseLocationCoordinates)
+      const center = new TMap.LatLng(position[0], position[1])
+      if (this.map) this.map.destroy()
+      this.map = new TMap.Map(this.mapContainerId, { zoom: 16, center })
+      this.markerLayer = new TMap.MultiMarker({
+        map: this.map,
+        geometries: [{ id: "activity", position: center }]
+      })
+      this.circle = new TMap.MultiCircle({
+        map: this.map,
+        geometries: [{ center, radius: this.row.radius || 100 }]
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.activity-schedule-calendar {
+  overflow: hidden;
+  border-radius: 18px 18px 0 0;
+  background: #f4f7fc;
+}
+
+.activity-schedule-calendar /deep/ .van-action-sheet__header {
+  height: 50px;
+  color: #1f2f43;
+  background: #fff;
+  font-size: 16px;
+  line-height: 50px;
+}
+
+.activity-schedule-calendar /deep/ .van-action-sheet__close {
+  top: 14px;
+  color: #7e899a;
+  font-size: 21px;
+}
+
+.activity-schedule-calendar__body {
+  height: 100%;
+  padding: 14px 14px 24px;
+  overflow-y: auto;
+  overflow-anchor: none;
+  box-sizing: border-box;
+}
+
+.activity-schedule-calendar__month-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+
+.activity-schedule-calendar__month-btn {
+  display: flex;
+  width: 36px;
+  height: 36px;
+  padding: 0;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid #edf1f6;
+  border-radius: 50%;
+  color: #263548;
+  background: #fff;
+  box-shadow: 0 5px 14px rgba(55, 85, 126, .08);
+}
+
+.activity-schedule-calendar__month-title {
+  color: #1f2f43;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.activity-schedule-calendar__weekdays,
+.activity-schedule-calendar__days {
+  display: grid;
+  grid-template-columns: repeat(7, minmax(0, 1fr));
+  text-align: center;
+}
+
+.activity-schedule-calendar__weekdays {
+  margin-bottom: 5px;
+  color: #58677b;
+  font-size: 12px;
+  line-height: 28px;
+}
+
+.activity-schedule-calendar__day {
+  position: relative;
+  display: flex;
+  width: 38px;
+  height: 48px;
+  margin: 1px auto;
+  padding: 0;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+  border: 0;
+  color: #263548;
+  background: transparent;
+  font-size: 14px;
+  line-height: 1;
+  box-sizing: border-box;
+}
+
+.activity-schedule-calendar__day > span {
+  position: absolute;
+  top: 4px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 1;
+  display: flex;
+  width: 40px;
+  height: 40px;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  box-sizing: border-box;
+}
+
+.activity-schedule-calendar__day-number {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  line-height: 14px;
+}
+
+.activity-schedule-calendar__today-label {
+  position: absolute;
+  top: 2px;
+  right: 0;
+  left: 0;
+  color: #1989fa;
+  font-size: 10px;
+  line-height: 10px;
+  text-align: center;
+}
+
+.activity-schedule-calendar__day.is-other-month > span {
+  color: #bdc5d0;
+}
+
+.activity-schedule-calendar__day.is-selected > span {
+  flex: 0 0 40px;
+  width: 40px;
+  min-width: 40px;
+  height: 40px;
+  min-height: 40px;
+  color: #fff;
+  background: #1989fa;
+  box-shadow: 0 5px 12px rgba(25, 137, 250, .22);
+}
+
+.activity-schedule-calendar__day.is-selected .activity-schedule-calendar__today-label {
+  top: 2px;
+  color: #fff;
+}
+
+.activity-schedule-calendar__day-status {
+  position: absolute;
+  bottom: -3px;
+  left: 50%;
+  width: 6px;
+  height: 6px;
+  transform: translateX(-50%);
+  border-radius: 50%;
+  box-sizing: border-box;
+}
+
+.activity-schedule-calendar__day-status.is-signed {
+  background: #1989fa;
+}
+
+.activity-schedule-calendar__day-status.is-available {
+  border: 1px solid #1989fa;
+  background: #fff;
+}
+
+.activity-schedule-calendar__day-status.is-pending {
+  background: #d8dde5;
+}
+
+.activity-schedule-calendar__legend {
+  display: flex;
+  margin: 12px 4px 16px;
+  align-items: center;
+  justify-content: space-around;
+  color: #78869a;
+  font-size: 11px;
+}
+
+.activity-schedule-calendar__legend span {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+}
+
+.activity-schedule-calendar__legend i {
+  width: 9px;
+  height: 9px;
+  border-radius: 50%;
+  box-sizing: border-box;
+}
+
+.activity-schedule-calendar__legend .is-solid { background: #1989fa; }
+.activity-schedule-calendar__legend .is-outline { border: 1px solid #1989fa; }
+.activity-schedule-calendar__legend .is-muted { background: #d8dde5; }
+
+.activity-schedule-calendar__map {
+  width: 100%;
+  height: 150px;
+  margin-bottom: 12px;
+  overflow: hidden;
+  border-radius: 12px;
+}
+
+.activity-schedule-calendar__schedule-card {
+  overflow: hidden;
+  border-radius: 12px;
+  background: #fff;
+  box-shadow: 0 7px 20px rgba(55, 85, 126, .07);
+}
+
+.activity-schedule-calendar__schedule-title {
+  padding: 12px 14px;
+  border-bottom: 1px solid #edf1f6;
+  color: #263548;
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.activity-schedule-calendar__schedule-item {
+  display: flex;
+  min-height: 70px;
+  padding: 12px 14px;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1px solid #edf1f6;
+  box-sizing: border-box;
+}
+
+.activity-schedule-calendar__schedule-item:last-child { border-bottom: 0; }
+
+.activity-schedule-calendar__schedule-main {
+  display: flex;
+  min-width: 0;
+  align-items: flex-start;
+  gap: 9px;
+}
+
+.activity-schedule-calendar__schedule-main > .van-icon {
+  margin-top: 2px;
+  color: #1989fa;
+  font-size: 18px;
+}
+
+.activity-schedule-calendar__schedule-time {
+  color: #263548;
+  font-size: 15px;
+  line-height: 22px;
+}
+
+.activity-schedule-calendar__schedule-location {
+  display: flex;
+  margin-top: 5px;
+  align-items: center;
+  gap: 4px;
+  color: #7d899a;
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.activity-schedule-calendar__status {
+  flex: 0 0 auto;
+  padding: 4px 8px;
+  border-radius: 5px;
+  color: #8b96a7;
+  background: #f1f4f8;
+  font-size: 11px;
+}
+
+.activity-schedule-calendar__status.is-success {
+  color: #19a965;
+  background: #eaf8f1;
+}
+
+.activity-schedule-calendar__status.is-progressing {
+  color: #ff8a00;
+  background: #fff4e6;
+}
+
+.activity-schedule-calendar__status.is-ended {
+  color: #98a2b2;
+  background: #eef1f5;
+}
+
+.activity-schedule-calendar__sign-btn {
+  display: inline-flex;
+  min-width: 42px !important;
+  height: 24px !important;
+  padding: 0 8px !important;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid #1989fa !important;
+  border-radius: 5px !important;
+  color: #fff !important;
+  background-color: #1989fa !important;
+  box-shadow: none !important;
+  font-size: 11px !important;
+}
+
+.activity-schedule-calendar__empty {
+  padding: 18px 14px 22px;
+  color: #9aa5b5;
+  text-align: center;
+}
+
+.activity-schedule-calendar__empty img {
+  display: block;
+  width: 142px;
+  height: 94px;
+  margin: 0 auto 4px;
+  object-fit: contain;
+}
+
+.activity-schedule-calendar__empty-title {
+  color: #58677b;
+  font-size: 13px;
+  line-height: 20px;
+}
+
+.activity-schedule-calendar__empty-desc {
+  margin-top: 2px;
+  color: #a2adbc;
+  font-size: 11px;
+  line-height: 18px;
+}
+</style>
@@ -37,26 +37,32 @@ module.exports = {
 <style scoped>
 .table-column {
  display: flex;
-  padding: 6px 0;
-    align-items: center;
+  width: calc(50% - 6px);
+  min-width: 0;
+  padding: 4px 0;
+  align-items: center;
+  box-sizing: border-box;
 }

 .label {
-  color: #333;
-  font-size: 14px;
+  color: #98a3b3;
+  font-size: 12px;
+  line-height: 18px;
  flex-shrink: 0;
-  max-width: 120px;
+  max-width: 50%;
  white-space: nowrap;
  overflow: hidden;
  text-overflow: ellipsis;
 }

 .value {
-  color: #555;
-  font-size: 14px;
-  flex-grow: 1; /* 动态占据剩余部分 */
-  white-space: nowrap; /* 防止换行 */
-  overflow: hidden; /* 隐藏溢出的部分 */
-  text-overflow: ellipsis; /* 省略号 */
+  min-width: 0;
+  color: #56657a;
+  font-size: 12px;
+  line-height: 18px;
+  flex-grow: 1;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 </style>
@@ -1,7 +1,9 @@
 <template>
-  <van-pull-refresh v-model="tableRefreshing" @refresh="onRefresh">
+  <van-pull-refresh class="table-list" v-model="tableRefreshing" @refresh="onRefresh">
    <div v-if="tableData.length === 0" class="empty-state">
-      <van-empty description="暂无数据"></van-empty>
+      <slot name="empty">
+        <van-empty description="暂无数据"></van-empty>
+      </slot>
    </div>
    <van-list v-if="tableData && tableData.length>0"
              v-model="tableLoading"
@@ -9,7 +11,8 @@
              finished-text="没有更多了"
              @load="onLoad">
      <div class="table-list-container">
-        <div v-for="(row, index) in tableData" :key="index" class="table-list-item">
+        <div v-for="(row, index) in tableData" :key="index" class="table-list-item"
+             :data-row-id="row && row.id ? row.id : ''">
          <slot name="header" :index="index" :row="row">
            <div class="item-header">
              <div class="item-title">{{ calcTitle(row) }}</div>
@@ -18,12 +21,12 @@
            </div>
          </slot>

-          <div style="display: flex;column-gap: 10px"
+          <div class="table-list-content"
               :style="{'max-height':img ? '100px':'unset', 'overflow': img ? 'hidden':'unset' }">
            <div class="img-container" v-if="img">
-              <img :src="row[img]" alt="" style="object-fit: cover">
+              <img :src="row[img]" alt="">
            </div>
-            <div style="width: 100%">
+            <div class="table-list-columns">
              <slot :index="index" :row="row"></slot>
            </div>
          </div>
@@ -66,6 +69,10 @@ module.exports = {
    img: {
      type: String,
      default: ""
+    },
+    show_loading_overlay: {
+      type: Boolean,
+      default: true
    }
  },
  watch: {
@@ -87,6 +94,33 @@ module.exports = {
    }
  },
  methods: {
+    /**
+     * 获取当前列表快照。
+     * 返回值包含已加载记录、分页参数和加载完成状态，供业务页面在进入详情前暂存列表现场。
+     */
+    getListState() {
+      return {
+        tableData: JSON.parse(JSON.stringify(this.tableData)),
+        localPageForm: JSON.parse(JSON.stringify(this.localPageForm)),
+        tableFinished: this.tableFinished
+      }
+    },
+
+    /**
+     * 恢复列表快照。
+     * state 应包含 tableData、localPageForm 和 tableFinished；返回 true 表示恢复成功。
+     */
+    restoreListState(state) {
+      if (!state || !Array.isArray(state.tableData)) return false
+      this.$set(this, "tableData", state.tableData)
+      this.$set(this, "localPageForm", {...this.localPageForm, ...(state.localPageForm || {})})
+      this.$set(this, "tableFinished", !!state.tableFinished)
+      this.$set(this, "tableLoading", false)
+      this.$set(this, "tableRefreshing", false)
+      this.$emit("update:page_form", {...this.localPageForm})
+      return true
+    },
+
    calcTitle(row) {
      if (!this.title) return ""
      // 处理key1.key2.key3 这样的形式
@@ -111,9 +145,15 @@ module.exports = {

    pageData() {
      this.tableLoading = true
+      const isInitialLoad = this.tableData.length === 0
+      this.$emit("loading-change", {loading: true, initial: isInitialLoad})

-      const loading = createListLoading()
-      this.$axios.post(this.api, this.json ? ({pageForm: JSON.stringify(this.localPageForm)}) : this.localPageForm).then((res) => {
+      const loading = this.show_loading_overlay ? createListLoading() : null
+      this.$axios.post(
+          this.api,
+          this.json ? ({pageForm: JSON.stringify(this.localPageForm)}) : this.localPageForm,
+          {h5SkeletonLoading: !this.show_loading_overlay}
+      ).then((res) => {
        if (res.code === 0) {
          this.tableData = this.tableData.concat(res.data.list)
          this.localPageForm.totalCount = res.data.totalCount
@@ -123,11 +163,10 @@ module.exports = {
          this.$emit("update:page_form", {...this.localPageForm})
        }
      }).finally(() => {
-        loading.close()
-        console.log(this.tableLoading)
+        if (loading) loading.close()
        this.tableLoading = false
-        console.log(this.tableLoading)
        this.tableRefreshing = false
+        this.$emit("loading-change", {loading: false, initial: isInitialLoad})
      })
    },
    doSearch() {
@@ -152,33 +191,36 @@ module.exports = {
 <style scoped>
 .table-list-container {
  padding: 0;
-  margin-top: 10px;
+  margin-top: 12px;
 }

 .table-list-container .table-list-item {
  background-color: #fff;
-  border-bottom: 1px solid #eaecef;
-  padding: 16px;
+  border: 1px solid #eef1f6;
+  border-radius: 12px;
+  box-shadow: 0 7px 20px rgba(55, 85, 126, .08);
+  padding: 14px;
  position: relative;
-  margin-bottom: 10px;
+  margin-bottom: 12px;
+  overflow: hidden;
 }

 .table-list-container .table-list-item:last-child {
-  border-bottom: none;
  margin-bottom: 0;
 }

 .table-list-container .table-list-item .item-header {
  display: flex;
  justify-content: space-between;
-  align-items: flex-start;
-  margin-bottom: 10px;
+  align-items: center;
+  margin-bottom: 8px;
 }

 .table-list-container .table-list-item .item-title {
-  font-size: 16px;
-  font-weight: 500;
-  color: #1f2f3d;
+  font-size: 15px;
+  line-height: 22px;
+  font-weight: 600;
+  color: #263548;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
@@ -190,15 +232,29 @@ module.exports = {
  width: 100px;
  height: 100px;
  flex-shrink: 0;
-  border-radius: 6px;
+  overflow: hidden;
+  border-radius: 10px;
 }

 .table-list-container .table-list-item .img-container img {
  width: 100%;
  height: 100%;
-  border-radius: 6px;
+  object-fit: cover;
+  border-radius: 10px;
 }

+.table-list-container .table-list-item .table-list-content {
+  display: flex;
+  column-gap: 10px;
+}
+
+.table-list-container .table-list-item .table-list-columns {
+  display: flex;
+  width: 100%;
+  min-width: 0;
+  flex-wrap: wrap;
+  column-gap: 12px;
+}

 .table-list-container .table-list-item .item-meta {
  display: flex;
@@ -245,48 +301,57 @@ module.exports = {

 .table-list-container .table-list-item .item-actions {
  display: flex;
-  column-gap: 20px;
+  gap: 8px;
+  flex-wrap: wrap;
  justify-content: end;
-  margin-top: 15px;
-  padding-top: 12px;
-  border-top: 1px solid #eaecef;
+  margin-top: 10px;
+  padding-top: 10px;
+  border-top: 1px solid #edf1f6;
 }

 .table-list-container .table-list-item .action-btn {
-  display: flex;
+  display: inline-flex;
  align-items: center;
-  justify-content: end;
-  font-size: 14px;
+  justify-content: center;
+  min-height: 26px;
+  padding: 4px 10px;
+  box-sizing: border-box;
+  border-radius: 14px;
+  background-color: #eaf4ff;
+  font-size: 12px;
+  line-height: 18px;
  color: var(--color-primary);
-  padding: 4px 0;
+  cursor: pointer;
 }

 .table-list-container .table-list-item .action-btn i {
-  margin-right: 6px;
-  font-size: 16px;
+  margin-right: 5px;
+  font-size: 13px;
 }

 .table-list-container .table-list-item .action-btn.delete {
-  color: #ff0000;
+  color: #f04444;
+  background-color: #fff0f0;
 }

 .table-list-container .table-list-item .action-btn.review {
  color: #67c23a;
+  background-color: #eef9e9;
 }

-.table-list-container .empty-state {
+.empty-state {
  text-align: center;
  padding: 60px 20px;
  color: #909399;
 }

-.table-list-container .empty-state i {
+.empty-state i {
  font-size: 60px;
  margin-bottom: 16px;
  color: #dcdee0;
 }

-.table-list-container .empty-state p {
+.empty-state p {
  margin-top: 10px;
  font-size: 14px;
 }
@@ -1,13 +1,28 @@
 <template>
    <div class="h5-signature">
-        <div v-if="!showSignaturePanel" class="main-panel">
-            <slot v-if="$slots.default"></slot>
-            <template v-else>
-                <van-button @click="openSignature" class="open-button" size="middle" plain native-type="button">打开签字板</van-button>
-                <van-image :src="signatureContent"></van-image>
-            </template>
+        <slot v-if="$slots.default"></slot>
+        <div v-else class="signature-entry">
+            <!-- 未签名时展示统一空状态和入口，组件放入 van-field 时仍保持完整宽度。 -->
+            <div v-if="!signatureContent" class="signature-entry-panel">
+                <van-icon class="signature-placeholder-icon" name="edit"></van-icon>
+                <div class="signature-placeholder-text">请完成本人手写签名</div>
+                <van-button @click="openSignature" class="signature-open-button" block plain
+                            native-type="button">进入签字板</van-button>
+            </div>
+
+            <!-- 已签名时直接预览结果，并在下方提供统一的重新签名入口。 -->
+            <div v-else class="signature-entry-panel signature-entry-panel--completed">
+                <van-image :src="signatureContent" class="signature-preview" fit="contain"></van-image>
+                <div class="signature-completed-text">
+                    <van-icon name="passed"></van-icon>
+                    <span>已完成本人手写签名</span>
+                </div>
+            </div>
+            <button v-if="signatureContent" @click="openSignature" class="signature-reset-button"
+                    type="button">重新签名</button>
        </div>
-        <van-popup v-model="showSignaturePanel" :style="{ height: '100vh', width: '100vw' }">
+        <van-popup v-model="showSignaturePanel" :close-on-click-overlay="false"
+                   :style="{ height: '100vh', width: '100vw' }" @close="handleSignaturePopupClose">
            <signature @save="save"></signature>
        </van-popup>
    </div>
@@ -36,14 +51,39 @@ module.exports = {
    data() {
        return {
            signatureContent: null,
-            showSignaturePanel: false
+            showSignaturePanel: false,
+            historyLayerName: "",
+            historyLayerUnsubscribe: null
        }
    },
    methods: {
+        /**
+         * 打开签字板。
+         * 无请求参数；优先向全局历史栈增加当前签字弹层，返回值为空。
+         */
        openSignature() {
+            const manager = window.h5HistoryLayerManager
+            if (manager && manager.open(this.historyLayerName)) return
            this.showSignaturePanel = true
        },

+        // 保存成功或业务主动关闭时同步回退签字弹层历史，管理器不可用时直接关闭 Popup。
+        closeSignaturePanel() {
+            const manager = window.h5HistoryLayerManager
+            if (manager && manager.close(this.historyLayerName)) return
+            this.showSignaturePanel = false
+        },
+
+        // Vant 组件自行关闭时仅处理仍位于栈顶的签字层，避免返回同步触发重复 history.back。
+        handleSignaturePopupClose() {
+            const manager = window.h5HistoryLayerManager
+            if (!manager) return
+            const stack = manager.stack
+            if (stack[stack.length - 1] === this.historyLayerName) {
+                manager.close(this.historyLayerName)
+            }
+        },
+
        save(signature) {
            const file = this.base64ToFile(signature, "signature.png")
            const formData = new FormData()
@@ -59,11 +99,20 @@ module.exports = {
                })
                .then((res) => {
                    if (res.code === 0) {
-                        alert("保存成功")
-                        this.showSignaturePanel = false
+                        // 保存成功后使用项目统一的 Vant 反馈，避免浏览器原生弹框阻塞签字流程。
+                        this.$toast.success({
+                            message: "签名保存成功",
+                            duration: 1500,
+                            forbidClick: true
+                        })
                        this.$emit("input", res.data)
+                        this.closeSignaturePanel()
                    } else {
-                        alert("保存失败")
+                        // 接口返回失败时保留签字板，方便用户重试。
+                        this.$toast.fail({
+                            message: res.msg || "签名保存失败，请重试",
+                            duration: 2000
+                        })
                    }
                })
        },
@@ -86,27 +135,114 @@ module.exports = {
            return new File([blob], filename, { type: contentType })
        }
    },
-    created() {}
+    mounted() {
+        const manager = window.h5HistoryLayerManager
+        if (!manager || typeof manager.ensureRegistered !== "function" || typeof manager.subscribe !== "function") return
+
+        // 每个组件实例使用唯一弹层名称，同一页面存在多个签字组件时互不影响。
+        this.historyLayerName = "h5-signature-" + this._uid
+        manager.ensureRegistered("h5-signature-page-" + window.location.pathname + window.location.search)
+        this.historyLayerUnsubscribe = manager.subscribe((stack) => {
+            this.showSignaturePanel = stack.includes(this.historyLayerName)
+        })
+    },
+    beforeDestroy() {
+        if (typeof this.historyLayerUnsubscribe === "function") {
+            this.historyLayerUnsubscribe()
+        }
+    }
 }
 </script>

 <style scoped>
 .h5-signature {
    width: 100%;
+    min-width: 0;
+    box-sizing: border-box;
 }

-.main-panel {
-    position: relative;
-    flex-direction: column-reverse;
+.signature-entry {
+    width: 100%;
    display: flex;
-    row-gap: 10px;
+    flex-direction: column;
+    align-items: stretch;
+    box-sizing: border-box;
 }

-.main-panel .van-image {
+.signature-entry-panel {
+    width: 100%;
    min-height: 150px;
+    padding: 16px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    border: 1px dashed #dfe6ef;
+    border-radius: 9px;
+    background: #fbfcfe;
 }

-.main-panel .open-button {
-    color: var(--color-primary);
+.signature-placeholder-icon {
+    margin-bottom: 6px;
+    color: #c7cfda;
+    font-size: 38px;
+}
+
+.signature-placeholder-text {
+    margin-bottom: 12px;
+    color: #9aa4b2;
+    font-size: 13px;
+    line-height: 20px;
+}
+
+.signature-open-button {
+    width: 100%;
+    height: 40px;
+    color: var(--color-primary, #1989fa);
+    font-size: 15px;
+    font-weight: 500;
+    background: linear-gradient(90deg, #f0f7ff, #f5f9ff);
+    border-color: #d8e9ff;
+    border-radius: 7px;
+}
+
+.signature-entry-panel--completed {
+    min-height: 150px;
+    justify-content: space-between;
+}
+
+.signature-preview {
+    width: 100%;
+    height: 96px;
+    background: #fff;
+    border-radius: 6px;
+    overflow: hidden;
+}
+
+.signature-completed-text {
+    margin-top: 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #5f6b7a;
+    font-size: 13px;
+}
+
+.signature-completed-text .van-icon {
+    margin-right: 5px;
+    color: #28a745;
+    font-size: 16px;
+}
+
+.signature-reset-button {
+    align-self: center;
+    margin-top: 10px;
+    padding: 3px 12px;
+    color: var(--color-primary, #1989fa);
+    font-size: 14px;
+    line-height: 22px;
+    background: transparent;
+    border: 0;
 }
 </style>
@@ -57,7 +57,16 @@ module.exports = {
        },
        save() {
            if (signature.isEmpty()) {
-                alert("请签字后再保存")
+                // H5 页面使用统一的 Vant 提示；未加载 Vant 的独立签字页保留原生提示作为兼容兜底。
+                if (typeof this.$toast === "function") {
+                    this.$toast({
+                        message: "请先完成手写签名",
+                        icon: "edit",
+                        duration: 2000
+                    })
+                } else {
+                    alert("请先完成手写签名")
+                }
                return
            }
            // const png = signature.getPNG()
@@ -1,5 +1,11 @@
 <template>
-    <van-dropdown-item :options="yearOptions" @change="yearChange" v-model="year"></van-dropdown-item>
+    <van-dropdown-item
+        :options="yearOptions"
+        v-model="year"
+        @change="yearChange"
+        @open="$emit('open')"
+        @close="$emit('close')"
+    ></van-dropdown-item>
 </template>

 <script>