From e6ee42c3d17577022cd0851847270b93839b3d36 Mon Sep 17 00:00:00 2001
From: Jafeng <2998840497@qq.com>
Date: Wed, 4 Feb 2026 19:07:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          |   6 +
 pages/article/article-cate-list.vue | 410 ++++++++++++++++++++++++++++
 pages/home/article-list.vue         | 100 +++++--
 routes/index.js                     |   4 +
 4 files changed, 491 insertions(+), 29 deletions(-)
 create mode 100644 pages/article/article-cate-list.vue

diff --git a/pages.json b/pages.json
index 427334c..641d9dc 100644
--- a/pages.json
+++ b/pages.json
@@ -13,6 +13,12 @@
 				"navigationBarTitleText": "我的宣教"
 			}
 		},
+		{
+			"path": "pages/article/article-cate-list",
+			"style": {
+				"navigationBarTitleText": "健康宣教"
+			}
+		},
 		{
 			"path": "pages/survey/survey-list",
 			"style": {
diff --git a/pages/article/article-cate-list.vue b/pages/article/article-cate-list.vue
new file mode 100644
index 0000000..97ed96b
--- /dev/null
+++ b/pages/article/article-cate-list.vue
@@ -0,0 +1,410 @@
+<template>
+  <view class="bg-gray-100 min-h-screen">
+    <!-- Category Tabs -->
+    <scroll-view
+      scroll-x
+      class="bg-white whitespace-nowrap px-15 py-10 sticky top-0 z-10 w-full"
+      :show-scrollbar="false"
+    >
+      <view
+        v-for="(tab, index) in tabs"
+        :key="index"
+        class="inline-block px-15 py-5 mr-10 text-sm rounded-full border transition-colors"
+        :class="[
+          activeCateId === tab.value
+            ? 'bg-orange-100 text-orange-500 border-orange-500'
+            : 'bg-white text-gray-600 border-gray-200',
+        ]"
+        @click="selectCate(tab.value)"
+      >
+        {{ tab.name }}
+      </view>
+    </scroll-view>
+
+    <!-- List -->
+    <view v-if="loading && list.length === 0" class="loading-container">
+      <uni-icons type="spinner-cycle" size="30" color="#999" />
+      <text class="loading-text">加载中...</text>
+    </view>
+
+    <view v-else-if="!loading && list.length === 0" class="empty-container">
+      <empty-data text="暂无文章" />
+    </view>
+
+    <view v-else class="p-15">
+      <view
+        v-for="(item, index) in list"
+        :key="item._id"
+        class="article-card flex"
+        :class="{ 'mb-15': index < list.length - 1 }"
+        @click="goToDetail(item)"
+      >
+        <image
+          class="flex-shrink-0 cover"
+          :src="item.cover || '/static/home/health-education.png'"
+          mode="aspectFill"
+        />
+        <view class="w-0 flex-grow">
+          <view class="article-title truncate mb-10">
+            {{ item.title || "宣教文章" }}
+          </view>
+          <view v-if="item.summary" class="article-summary line-clamp-2">
+            {{ item.summary }}
+          </view>
+        </view>
+      </view>
+
+      <view v-if="loading && list.length > 0" class="loading-more">
+        <uni-icons type="spinner-cycle" size="20" color="#999" />
+        <text>加载中...</text>
+      </view>
+
+      <view v-if="!loading && list.length >= total" class="no-more">
+        没有更多了
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import { onLoad, onReachBottom } from "@dcloudio/uni-app";
+import dayjs from "dayjs";
+import api from "@/utils/api.js";
+import EmptyData from "@/components/empty-data.vue";
+
+const env = __VITE_ENV__;
+const defaultCorpId = env.MP_CORP_ID;
+
+const corpId = ref("");
+const tabs = ref([{ name: "全部", value: "" }]);
+const activeCateId = ref("");
+
+const list = ref([]);
+const total = ref(0);
+const page = ref(1);
+const pageSize = 20;
+const loading = ref(false);
+
+const loadCates = async () => {
+  if (!corpId.value) return;
+  try {
+    const res = await api("getArticleCateList", { corpId: corpId.value });
+    const cates = res && Array.isArray(res.list) ? res.list : [];
+    tabs.value = [
+      { name: "全部", value: "" },
+      ...cates.map((i) => ({ name: i.label || i.name || "未命名", value: i._id })),
+    ];
+  } catch (err) {
+    console.error("loadCates failed:", err);
+  }
+};
+
+const loadList = async (reset = false) => {
+  if (!corpId.value || loading.value) return;
+  if (reset) {
+    page.value = 1;
+    list.value = [];
+    total.value = 0;
+  }
+  loading.value = true;
+  try {
+    const params = {
+      corpId: corpId.value,
+      page: page.value,
+      pageSize,
+      enable: true,
+    };
+    if (activeCateId.value) params.cateIds = [activeCateId.value];
+    const res = await api("getArticleList", params);
+    const rows = res && Array.isArray(res.list) ? res.list : [];
+    total.value = Number(res?.total) || 0;
+    const mapped = rows.map((r) => ({
+      ...r,
+      time: r?.createTime ? dayjs(r.createTime).format("YYYY-MM-DD") : "",
+    }));
+    if (page.value === 1) list.value = mapped;
+    else list.value = [...list.value, ...mapped];
+  } catch (err) {
+    console.error("loadList failed:", err);
+  } finally {
+    loading.value = false;
+  }
+};
+
+const selectCate = async (cateId) => {
+  if (activeCateId.value === cateId) return;
+  activeCateId.value = cateId;
+  await loadList(true);
+};
+
+function goToDetail(item) {
+  if (!item?._id) return;
+  uni.navigateTo({ url: `/pages/article/article-detail?id=${item._id}` });
+}
+
+onLoad(async (options) => {
+  corpId.value = options?.corpId || defaultCorpId || "";
+  await loadCates();
+  await loadList(true);
+});
+
+onReachBottom(() => {
+  if (loading.value) return;
+  if (list.value.length >= total.value) return;
+  page.value += 1;
+  loadList(false);
+});
+</script>
+
+<style scoped>
+.min-h-screen {
+  min-height: 100vh;
+}
+.bg-gray-100 {
+  background-color: #f7f8fa;
+}
+.bg-white {
+  background-color: #ffffff;
+}
+
+.p-15 {
+  padding: 30rpx;
+}
+.px-15 {
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+}
+.py-10 {
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
+}
+.py-5 {
+  padding-top: 10rpx;
+  padding-bottom: 10rpx;
+}
+.px-5 {
+  padding-left: 10rpx;
+  padding-right: 10rpx;
+}
+
+.mr-10 {
+  margin-right: 20rpx;
+}
+.mr-5 {
+  margin-right: 10rpx;
+}
+.ml-2 {
+  margin-left: 10rpx;
+}
+.mr-2 {
+  margin-right: 10rpx;
+}
+.mb-15 {
+  margin-bottom: 20rpx;
+}
+.mb-10 {
+  margin-bottom: 20rpx;
+}
+.mt-1 {
+  margin-top: 6rpx;
+}
+
+.flex {
+  display: flex;
+}
+.items-start {
+  align-items: flex-start;
+}
+.items-center {
+  align-items: center;
+}
+.justify-between {
+  justify-content: space-between;
+}
+.flex-1 {
+  flex: 1;
+}
+.flex-grow {
+  flex-grow: 1;
+}
+.flex-shrink-0 {
+  flex-shrink: 0;
+}
+.w-0 {
+  width: 0;
+}
+.relative {
+  position: relative;
+}
+
+.border {
+  border-width: 1px;
+  border-style: solid;
+}
+.rounded-full {
+  border-radius: 9999px;
+}
+.rounded {
+  border-radius: 8rpx;
+}
+.rounded-lg {
+  border-radius: 12rpx;
+}
+
+.shadow-sm {
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+}
+
+.text-xs {
+  font-size: 22rpx;
+}
+.text-sm {
+  font-size: 28rpx;
+}
+.text-base {
+  font-size: 32rpx;
+}
+.font-bold {
+  font-weight: 600;
+}
+.leading-normal {
+  line-height: 1.4;
+}
+
+.text-orange-500 {
+  color: #f29e38;
+}
+.bg-orange-100 {
+  background-color: #fff8eb;
+}
+.border-orange-500 {
+  border-color: #f29e38;
+}
+
+.text-gray-600 {
+  color: #333333;
+}
+.text-gray-400 {
+  color: #999999;
+}
+.text-gray-800 {
+  color: #1a1a1a;
+}
+.border-gray-200 {
+  border-color: #e5e5e5;
+}
+
+.text-green-600 {
+  color: #4b8d5f;
+}
+.border-green-600 {
+  border-color: #4b8d5f;
+}
+
+.sticky {
+  position: sticky;
+}
+.top-0 {
+  top: 0;
+}
+.z-10 {
+  z-index: 10;
+}
+.w-full {
+  width: 100%;
+}
+.whitespace-nowrap {
+  white-space: nowrap;
+}
+.inline-block {
+  display: inline-block;
+}
+
+.tag-box {
+  border-radius: 4rpx;
+  line-height: 1.2;
+}
+
+.truncate {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.article-card {
+  background: white;
+  border-radius: 16rpx;
+  box-shadow: 0 8rpx 10rpx 0 rgba(60, 169, 145, 0.06);
+  transition: all 0.3s;
+  min-height: 188rpx;
+  padding: 20rpx;
+  align-items: flex-start;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.article-card:active {
+  transform: translateY(-2rpx);
+  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
+}
+
+.cover {
+  width: 272rpx;
+  height: 151rpx;
+  border-radius: 12rpx;
+  margin-right: 20rpx;
+  object-fit: cover;
+}
+
+.article-title {
+  color: #333333;
+  font-size: 32rpx;
+  font-weight: 500;
+  line-height: normal;
+}
+
+.article-summary {
+  max-width: 402rpx;
+  color: #666666;
+  text-align: justify;
+  font-size: 28rpx;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.line-clamp-2 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
+  overflow: hidden;
+  line-height: 1.5;
+}
+
+.loading-container,
+.empty-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 100rpx 0;
+}
+
+.loading-text {
+  margin-top: 20rpx;
+  font-size: 28rpx;
+  color: #999;
+}
+
+.loading-more,
+.no-more {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 30rpx 0;
+  font-size: 24rpx;
+  color: #999;
+  gap: 10rpx;
+}
+</style>
diff --git a/pages/home/article-list.vue b/pages/home/article-list.vue
index 8ee522a..a7acf0d 100644
--- a/pages/home/article-list.vue
+++ b/pages/home/article-list.vue
@@ -2,16 +2,25 @@
   <view v-if="articles.length" class="article-container">
     <view class="flex items-center justify-between">
       <view class="module-title">健康宣教</view>
-      <view class="flex items-center" @click="toList()">
+      <view v-if="total > 3" class="flex items-center" @click="toMorePage()">
         <view class="mr-5 text-base text-gray">更多</view>
         <image class="arrow-icon" src="/static/home/arrow-right-gray.png" mode="aspectFit"></image>
       </view>
     </view>
+
     <view class="mt-10">
-      <view v-for="(article, index) in articles" :key="article._id"
+      <view
+        v-for="(article, index) in articles"
+        :key="article._id"
         class="article-card flex"
-        :class="{'mb-15': index < articles.length - 1}">
-        <image class="flex-shrink-0 cover" :src="article.cover || '/static/home/health-education.png'" mode="aspectFill" />
+        :class="{ 'mb-15': index < articles.length - 1 }"
+        @click="goToDetail(article)"
+      >
+        <image
+          class="flex-shrink-0 cover"
+          :src="article.cover || '/static/home/health-education.png'"
+          mode="aspectFill"
+        />
         <view class="w-0 flex-grow">
           <view class="article-title truncate mb-10">
             {{ article.title }}
@@ -25,7 +34,7 @@
   </view>
 </template>
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { ref, watch } from "vue";
 import api from '@/utils/api';
 
 const props = defineProps({
@@ -34,34 +43,67 @@ const props = defineProps({
     default: () => ({})
   }
 })
-const articles = ref([])
 
-const qrcode = computed(() => {
-  const qrcodes = props.team && Array.isArray(props.team.qrcodes) ? props.team.qrcodes : [];
-  return qrcodes[0] || {}
-})
-const articleIds = computed(() => {
-  const articles = qrcode.value && Array.isArray(qrcode.value.articles) ? qrcode.value.articles : [];
-  const ids = articles.map(item => item._id).filter(i => typeof i === 'string' && i.trim());
-  return qrcode.value.enableAnnounce === 'YES' ? ids : [];
-})
+const articles = ref([]);
+const total = ref(0);
+const page = ref(1);
+const pageSize = ref(3);
+const loading = ref(false);
 
-function toList() {
-  uni.navigateTo({ url: `/pages/article/article-list?corpId=${props.team.corpId}&ids=${articleIds.value.join()}` })
+function goToDetail(article) {
+  if (!article?._id) return;
+  uni.navigateTo({ url: `/pages/article/article-detail?id=${article._id}` });
 }
 
-async function getArticles() {
-  const res = await api('getArticleByIds', { corpId: props.team.corpId, ids: articleIds.value.join() });
-  articles.value = res && Array.isArray(res.list) ? res.list : [];
-}
-
-watch(articleIds, n => {
-  if (n.length) {
-    getArticles()
-  } else {
-    articles.value = []
+const loadArticles = async (reset = false) => {
+  const corpId = props.team?.corpId || "";
+  if (!corpId || loading.value) return;
+  if (reset) {
+    page.value = 1;
+    articles.value = [];
+    total.value = 0;
   }
-}, { immediate: true })
+  loading.value = true;
+  try {
+    const params = {
+      corpId,
+      page: page.value,
+      pageSize: pageSize.value,
+      enable: true,
+    };
+    const res = await api("getArticleList", params, false);
+    const list = res && Array.isArray(res.list) ? res.list : [];
+    total.value = Number(res?.total) || 0;
+    if (page.value === 1) articles.value = list;
+    else articles.value = [...articles.value, ...list];
+  } catch (err) {
+    console.error("loadArticles failed:", err);
+  } finally {
+    loading.value = false;
+  }
+};
+
+function toMorePage() {
+  const corpId = props.team?.corpId || "";
+  if (!corpId) return;
+  uni.navigateTo({ url: `/pages/article/article-cate-list?corpId=${corpId}` });
+}
+
+watch(
+  () => props.team?.corpId,
+  async (corpId) => {
+    if (!corpId) {
+      articles.value = [];
+      total.value = 0;
+      page.value = 1;
+      pageSize.value = 3;
+      return;
+    }
+    pageSize.value = 3;
+    await loadArticles(true);
+  },
+  { immediate: true }
+);
 </script>
 <style scoped>
 .article-container {
@@ -138,4 +180,4 @@ watch(articleIds, n => {
   overflow: hidden;
   line-height: 1.5;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/routes/index.js b/routes/index.js
index 48f6c8d..05fd767 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -28,6 +28,10 @@ export default [
     path: 'pages/article/article-list',
     meta: { title: '健康宣教', login: true }
   },
+  {
+    path: 'pages/article/article-cate-list',
+    meta: { title: '健康宣教', login: true }
+  },
   {
     path: 'pages/health/list',
     meta: { title: '健康信息', login: true }

From c1a0090279f17158728df0f16d3860436867b47c Mon Sep 17 00:00:00 2001
From: Jafeng <2998840497@qq.com>
Date: Thu, 5 Feb 2026 09:35:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=A1=A3=E6=A1=88=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=92=8C=E5=B9=B4=E9=BE=84=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/customer-archive.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pages/home/customer-archive.vue b/pages/home/customer-archive.vue
index 4acdb0b..5da5684 100644
--- a/pages/home/customer-archive.vue
+++ b/pages/home/customer-archive.vue
@@ -27,13 +27,6 @@
               :class="current && i._id === current._id ? 'text-primary' : 'text-dark'">
               {{ i.name }}
             </view>
-            <view class="flex items-center mb-5">
-              <image v-if="i.sex" class="sex-icon mr-5"
-                :src="i.sex === '男' ? '/static/home/male.svg' : '/static/home/female.svg'" />
-              <view class="customer-age text-base leading-normal text-gray">
-                {{ i.age > 0 ? i.age + '岁' : '' }}
-              </view>
-            </view>
           </view>
           <!-- 选中状态底部条和三角 -->
           <view v-if="current && i._id === current._id" class="active-indicator">
@@ -299,10 +292,6 @@ watch(() => props.corpId, n => {
   margin-top: -8rpx;
 }
 
-.customer-age {
-  color: #999999;
-}
-
 .mr-15 {
   margin-right: 20rpx;
 }