From 40d42f001d0417add954d8c68a45a6417f2ee56f Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Mon, 12 Oct 2026 10:31:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(uniapp):=20=E6=96=B0=E5=A2=9E=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E5=88=97=E8=A1=A8/=E5=BA=97=E9=93=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A5=BC=E5=B1=82=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/article.js                             | 12 +++
 pages/product/shopPage.vue                 |  4 +
 pages/tabbar/home/index.vue                |  4 +
 pages/tabbar/home/template/tpl_article.vue | 89 ++++++++++++++++++++++
 pages/tabbar/home/template/tpl_shop.vue    | 82 ++++++++++++++++++++
 pages/tabbar/special/special.vue           |  4 +
 6 files changed, 195 insertions(+)
 create mode 100644 pages/tabbar/home/template/tpl_article.vue
 create mode 100644 pages/tabbar/home/template/tpl_shop.vue

diff --git a/api/article.js b/api/article.js
index 6e2f6af..8e832fb 100644
--- a/api/article.js
+++ b/api/article.js
@@ -39,5 +39,17 @@ export function getArticleDetail(type) {
   });
 }
 
+/**
+ * 分页获取文章列表（楼层装修用）
+ * @param params { pageNumber, pageSize, categoryId? }
+ */
+export function getArticleList(params) {
+  return http.request({
+    url: `/other/article`,
+    method: Method.GET,
+    params,
+  });
+}
+
 
 
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index e3407b0..281bfdb 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -193,6 +193,8 @@
           <!-- <joinGroup v-if="item.type == 'joinGroup'" :res="item.options" /> -->
           <integral v-if="item.type == 'integral'" :res="item.options" />
           <coupon v-if="item.type == 'coupon'" :res="item.options" />
+          <articleList v-if="item.type == 'article'" :res="item.options" />
+          <shopList v-if="item.type == 'shop'" :res="item.options" />
           <!-- <spike v-if="item.type == 'spike'" :res="item.options" /> -->
           <blank v-if="item.type == 'blank'" :res="item.options" />
           <lineLayout v-if="item.type == 'line'" :res="item.options" />
@@ -234,6 +236,8 @@ import lineLayout from '@/pages/tabbar/home/template/tpl_line.vue'
 import richText from '@/pages/tabbar/home/template/tpl_rich_text.vue'
 import integral from '@/pages/tabbar/home/template/tpl_integral.vue'
 import coupon from '@/pages/tabbar/home/template/tpl_coupon.vue'
+import articleList from '@/pages/tabbar/home/template/tpl_article.vue'
+import shopList from '@/pages/tabbar/home/template/tpl_shop.vue'
 import goodsTemplate from '@/components/m-goods-list/list.vue'
 import { getStoreBaseInfo, getStoreCategory } from '@/api/store.js'
 import {
diff --git a/pages/tabbar/home/index.vue b/pages/tabbar/home/index.vue
index 5997d10..444168d 100644
--- a/pages/tabbar/home/index.vue
+++ b/pages/tabbar/home/index.vue
@@ -48,6 +48,8 @@
       <richText v-if="item.type == 'richText'" :res="item.options" />
       <integral v-if="item.type == 'integral'" :res="item.options" />
       <coupon v-if="item.type == 'coupon'" :res="item.options" />
+      <articleList v-if="item.type == 'article'" :res="item.options" />
+      <shopList v-if="item.type == 'shop'" :res="item.options" />
     </view>
     <fetchCoupon ref="couponRef" />
   </view>
@@ -88,6 +90,8 @@ import lineLayout from '@/pages/tabbar/home/template/tpl_line.vue'
 import richText from '@/pages/tabbar/home/template/tpl_rich_text.vue'
 import integral from '@/pages/tabbar/home/template/tpl_integral.vue'
 import coupon from '@/pages/tabbar/home/template/tpl_coupon.vue'
+import articleList from '@/pages/tabbar/home/template/tpl_article.vue'
+import shopList from '@/pages/tabbar/home/template/tpl_shop.vue'
 import { getFloorData } from '@/api/home'
 
 const HOME_LAYOUT_PADDING_RPX = 16
diff --git a/pages/tabbar/home/template/tpl_article.vue b/pages/tabbar/home/template/tpl_article.vue
new file mode 100644
index 0000000..a38000d
--- /dev/null
+++ b/pages/tabbar/home/template/tpl_article.vue
@@ -0,0 +1,89 @@
+<template>
+  <view class="tpl-article" :style="wrapperStyle" v-if="articleList.length">
+    <view class="article-title" v-if="title">{{ title }}</view>
+    <view
+      class="article-item"
+      v-for="item in articleList"
+      :key="item.id"
+      @click="goDetail(item)"
+    >
+      <view class="article-text">
+        <view class="article-name">{{ item.title }}</view>
+        <view class="article-time" v-if="item.createTime">{{ item.createTime.split(" ")[0] }}</view>
+      </view>
+      <image v-if="item.cover" class="article-thumb" :src="item.cover" mode="aspectFill" />
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, onMounted } from "vue";
+import { getArticleList } from "@/api/article.js";
+
+const props = defineProps<{ res: any }>();
+
+const articleList = ref<any[]>([]);
+
+const title = computed(() => props.res?.list?.[0]?.title || "");
+const count = computed(() => props.res?.list?.[0]?.count || 3);
+const categoryId = computed(() => props.res?.list?.[0]?.categoryId || "");
+
+const wrapperStyle = computed(() => ({
+  background: props.res?.bgColor || "#FFFFFF",
+  padding: `20rpx ${props.res?.paddingX ?? 0}rpx`,
+  marginBottom: `${props.res?.pageGap ?? 10}rpx`,
+  borderRadius: `${props.res?.borderRadius ?? 0}rpx`,
+  overflow: "hidden",
+}));
+
+onMounted(() => {
+  const params: any = { pageNumber: 1, pageSize: count.value };
+  if (categoryId.value) params.categoryId = categoryId.value;
+  getArticleList(params).then((res) => {
+    if (res.data.success && res.data.result) {
+      articleList.value = (res.data.result.records || []).slice(0, count.value);
+    }
+  });
+});
+
+function goDetail(item: any) {
+  uni.navigateTo({ url: `/pages/passport/article?id=${item.id}` });
+}
+</script>
+
+<style lang="scss" scoped>
+.article-title {
+  font-size: 30rpx;
+  font-weight: 600;
+  padding: 8rpx 24rpx 20rpx;
+}
+.article-item {
+  display: flex;
+  align-items: center;
+  padding: 16rpx 24rpx;
+  border-top: 2rpx solid #f5f5f5;
+}
+.article-text {
+  flex: 1;
+  min-width: 0;
+}
+.article-name {
+  font-size: 26rpx;
+  color: #333;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.article-time {
+  font-size: 22rpx;
+  color: #999;
+  margin-top: 8rpx;
+}
+.article-thumb {
+  width: 112rpx;
+  height: 84rpx;
+  border-radius: 8rpx;
+  margin-left: 20rpx;
+  flex-shrink: 0;
+}
+</style>
diff --git a/pages/tabbar/home/template/tpl_shop.vue b/pages/tabbar/home/template/tpl_shop.vue
new file mode 100644
index 0000000..af0f0e6
--- /dev/null
+++ b/pages/tabbar/home/template/tpl_shop.vue
@@ -0,0 +1,82 @@
+<template>
+  <view class="tpl-shop" :style="wrapperStyle" v-if="shopList.length">
+    <view class="shop-title" v-if="title">{{ title }}</view>
+    <view class="shop-grid">
+      <view
+        class="shop-item"
+        v-for="item in shopList"
+        :key="item.id"
+        @click="goShop(item)"
+      >
+        <image class="shop-logo" :src="item.storeLogo" mode="aspectFill" />
+        <view class="shop-name">{{ item.storeName }}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, onMounted } from "vue";
+import { getStoreList } from "@/api/store.js";
+
+const props = defineProps<{ res: any }>();
+
+const shopList = ref<any[]>([]);
+
+const title = computed(() => props.res?.list?.[0]?.title || "");
+const count = computed(() => props.res?.list?.[0]?.count || 4);
+
+const wrapperStyle = computed(() => ({
+  background: props.res?.bgColor || "#FFFFFF",
+  padding: `20rpx ${props.res?.paddingX ?? 0}rpx`,
+  marginBottom: `${props.res?.pageGap ?? 10}rpx`,
+  borderRadius: `${props.res?.borderRadius ?? 0}rpx`,
+  overflow: "hidden",
+}));
+
+onMounted(() => {
+  getStoreList({ pageNumber: 1, pageSize: count.value }).then((res) => {
+    if (res.data.success && res.data.result) {
+      shopList.value = (res.data.result.records || []).slice(0, count.value);
+    }
+  });
+});
+
+function goShop(item: any) {
+  uni.navigateTo({ url: `/pages/product/shopPage?id=${item.id}` });
+}
+</script>
+
+<style lang="scss" scoped>
+.shop-title {
+  font-size: 30rpx;
+  font-weight: 600;
+  padding: 8rpx 24rpx 20rpx;
+}
+.shop-grid {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0 24rpx;
+}
+.shop-item {
+  width: 50%;
+  display: flex;
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+.shop-logo {
+  width: 72rpx;
+  height: 72rpx;
+  border-radius: 50%;
+  background: #f0f0f0;
+  flex-shrink: 0;
+}
+.shop-name {
+  font-size: 26rpx;
+  color: #333;
+  margin-left: 16rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+</style>
diff --git a/pages/tabbar/special/special.vue b/pages/tabbar/special/special.vue
index 8816d30..de1a588 100644
--- a/pages/tabbar/special/special.vue
+++ b/pages/tabbar/special/special.vue
@@ -48,6 +48,8 @@
       <lineLayout v-if="item.type == 'line'" :res="item.options" />
       <richText v-if="item.type == 'richText'" :res="item.options" />
       <coupon v-if="item.type == 'coupon'" :res="item.options" />
+      <articleList v-if="item.type == 'article'" :res="item.options" />
+      <shopList v-if="item.type == 'shop'" :res="item.options" />
     </div>
     <u-no-network></u-no-network>
   </div>
@@ -80,6 +82,8 @@ import lineLayout from '@/pages/tabbar/home/template/tpl_line'
 import richText from '@/pages/tabbar/home/template/tpl_rich_text'
 import integral from '@/pages/tabbar/home/template/tpl_integral'
 import coupon from '@/pages/tabbar/home/template/tpl_coupon'
+import articleList from '@/pages/tabbar/home/template/tpl_article'
+import shopList from '@/pages/tabbar/home/template/tpl_shop'
 import { toSpecial, getSpecial } from '@/api/home'
 import permision from '@/js_sdk/wa-permission/permission.js'
 import config from '@/config/config'