jmash-core-mp 0.1.13 → 0.1.15

package/lib/api/cms/types.d.ts

@@ -94,6 +94,7 @@ export interface CmsInfoModel {
     infoId?: string;
     modelCode?: string;
     infoTitle: string;
+    subTitle?: string;
     imgUrl?: string;
     author?: string;
     intro?: string;
@@ -104,6 +105,7 @@ export interface CmsInfoModel {
     channelId: Array<string>;
     sourceName?: string;
     siteId: string;
+    address?: string;
 }
 export interface CmsInfoContentReq {
     tenant?: string;

package/lib/components/cms/jmash-cms-article-item.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/components/cms/jmash-cms-article-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/components/cms/jmash-cms-like.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/packages/pages/cms/cms-article-list.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/common.js

@@ -122,6 +122,9 @@ export const formatDateTime = (dateTimeString, format) => {
     if (format === "HH:mm:ss") {
         return hours + ":" + minutes + ":" + seconds;
     }
+    if (format === "HH:mm") {
+        return hours + ":" + minutes;
+    }
     return "";
 };
 /**

package/lib/utils/request.js

@@ -34,7 +34,7 @@ mpx.xfetch.interceptors.request.use(function (config) {
     }
     // 请求设置token和租户
     const expire = db.isTokenExpires();
-    if (!expire) {
+    if (!expire && db.getToken()) {
         config.header["Authorization"] = "Bearer " + db.getToken();
         const organTenant = db.getOrganTenant(config.tenant);
         if (organTenant && config.header.GrpcMetadataTenant !== false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/cms/types.ts

@@ -186,6 +186,8 @@ export interface CmsInfoModel {
   modelCode?: string;
   // 内容标题
   infoTitle: string;
+  // 副标题
+  subTitle?: string;
   // 封面图片
   imgUrl?: string;
   // 作者
@@ -206,6 +208,8 @@ export interface CmsInfoModel {
   sourceName?: string;
   // 站点Id
   siteId: string;
+  // 地址
+  address?: string;
 }
 // 信息内容查询
 export interface CmsInfoContentReq {

package/src/components/auth-user/jmash-user.mpx

@@ -23,7 +23,7 @@
             </view>
           </view>
           <text class="user-mobile" style="color: {{ userMobileColor }}">{{ userInfo.mobilePhoneIns || '未绑定手机号'
-            }}</text>
+          }}</text>
         </view>
 
         <!-- 右侧箭头 -->
@@ -73,7 +73,7 @@ createComponent({
       type: String,
       value: 'false'
     },
-    userNameColor: { 
+    userNameColor: {
       type: String,
       value: '#111111'
     },
@@ -137,6 +137,7 @@ $text-3: #999999;
 $border: #e8e8e8;
 $bg-page: #f5f5f5;
 $bg-card: #ffffff;
+
 // 修改背景色从白色变到透明
 .auth-user-box {
   display: flex;
@@ -167,8 +168,8 @@ $bg-card: #ffffff;
       cursor: pointer;
 
       .avatar-img {
-        width: 96rpx;
-        height: 96rpx;
+        width: 130rpx;
+        height: 130rpx;
         border-radius: 50%;
         background-color: $bg-page;
         display: block;

package/src/components/cms/jmash-cms-acticle-list.mpx

@@ -1,8 +1,12 @@
 /**
 * 文章列表
-* @param style 样式 String （box:盒子列表效果 page:页面列表效果） 默认box
-* @param list 文章列表 Array
-* @event click 点击事件,参数为点击的项对象 item
+* @param style 样式 String （box:盒子列表效果 page:页面列表效果） 默认page
+* @param organTenant 租户 String
+* @param siteId 站点ID String
+* @param channelId 栏目ID String
+* @param channelAlias 栏目别名 String
+* @param pageSize 数量 String 默认值为5
+* @event info 文章详情点击事件,参数为点击的项对象 item
 */
 <template>
     <!-- 文章列表 -->
@@ -11,16 +15,12 @@
             data-item="{{ item }}">
             <view class="article-title">{{ item.infoTitle }}</view>
             <view class="article-text">
-                <!-- TODO:图标要改静态资源 -->
-                <!-- <image class="text-image" src="/src/images/icon-address.png" mode="widthFix" /> -->
                 <image class="text-image" src="{{ resourceUrl + 'icon-address.png' }}" mode="widthFix" />
                 {{ item.address || item.subTitle }}
             </view>
             <view class="article-text">
-                <!-- TODO:图标要改静态资源 -->
-                <!-- <image class="text-image" src="/src/images/icon-time.png" mode="aspectFit" /> -->
                 <image class="text-image" src="{{ resourceUrl + 'icon-time.png' }}" mode="widthFix" />
-                {{ item.createTime }}
+                {{ item.publishDate }}
             </view>
         </view>
     </view>
@@ -31,13 +31,14 @@ import mpx, { createComponent, ref, onMounted } from "@mpxjs/core";
 import { EventBase } from "../../api/types";
 import { config } from '../../utils/config';
 import { cmsApi } from '../../api/cms';
+import { CmsInfoModel } from '../../api/cms/types';
 
 createComponent({
     properties: {
         // 样式
         style: {
             type: String,
-            value: "box",
+            value: "page",
         },
         // 组织租户
         organTenant: {
@@ -59,7 +60,7 @@ createComponent({
             type: String,
             value: ""
         },
-        //数量
+        // 数量
         pageSize: {
             type: Number,
             value: 5
@@ -67,9 +68,9 @@ createComponent({
     },
     setup(props) {
         // 资源路径
-        let resourceUrl = config.resourceUrl + '/images/cultrue/';
+        let resourceUrl = config.resourceUrl + '/images/';
         // 文章列表
-        let articleList = ref([] as any[]);
+        let articleList = ref([] as CmsInfoModel[]);
         console.log("cms", props);
         onMounted(() => {
             cmsApi.findCmsInfoPage({

package/src/components/cms/jmash-cms-article-item.mpx

@@ -0,0 +1,241 @@
+/**
+* 文章内容列表item 组织组件
+* @param isInfo 是否是文章详情页 Boolean 默认值为false
+* @param style 样式 0：默认图片在右侧 1：默认图片在左侧 String 默认值为0
+* @param organTenant 租户 String
+* @param siteId 站点ID String
+* @param channelId 栏目ID String
+* @param channelAlias 栏目别名 String
+* @param pageSize 数量 String 默认值为5
+* @event info 文章详情点击事件,参数为文章项item
+*/
+<template>
+    <!-- 文章内容列表item -->
+    <view class="{{ isInfo ? '' : 'article-main' }}">
+        <!-- 默认图片在右侧的样式  枚举值为0  -->
+        <block wx:for="{{ articleList }}" wx:key="index" wx:if="{{ style == '0' }}">
+            <view class="{{ isInfo ? 'article-info' : 'article-border' }}" bind:tap="handleInfo" data-item="{{ item }}">
+                <!-- 内容 -->
+                <view class="cms-info">
+                    <view class="cms-left">
+                        <!-- 标题 -->
+                        <view class="cms-left-title">{{ item.infoTitle }}</view>
+                        <!-- 内容 -->
+                        <view class="cms-left-info">{{ item.intro }}</view>
+                    </view>
+                    <view bind:tap="handlePreview" data-url="{{ item.imgUrl }}">
+                        <image class="cms-right-image" src="{{ imageUrl + item.imgUrl }}" mode="widthFix" />
+                    </view>
+                </view>
+                <!-- 底部时间、点赞数、预览数 -->
+                <jmash-cms-like organTenant="{{ organTenant }}" interactId="{{ item.infoId }}"
+                    publishDate="{{ item.publishDate }}"></jmash-cms-like>
+            </view>
+        </block>
+        <!-- 默认图片在左侧的样式  枚举值为1  -->
+        <block wx:for="{{ articleList }}" wx:key="index" wx:if="{{ style == '1' }}">
+            <view class="{{ isInfo ? 'article-info' : 'article-border' }}" bind:tap="handleInfo" data-item="{{ item }}">
+                <!-- 内容 -->
+                <view class="cms-info">
+                    <view bind:tap="handlePreview" data-url="{{ item.imgUrl }}">
+                        <image class="cms-right-image" src="{{ imageUrl + item.imgUrl }}" mode="widthFix" />
+                    </view>
+                    <view class="cms-left">
+                        <!-- 标题 -->
+                        <view class="cms-left-title">{{ item.infoTitle }}</view>
+                        <!-- 内容 -->
+                        <view class="cms-left-info">{{ item.intro }}</view>
+                    </view>
+                </view>
+                <!-- 底部时间、点赞数、预览数 -->
+                <jmash-cms-like organTenant="{{ organTenant }}" interactId="{{ item.infoId }}"
+                    publishDate="{{ item.publishDate }}"></jmash-cms-like>
+            </view>
+        </block>
+    </view>
+</template>
+
+<script lang="ts">
+import mpx, { createComponent, ref, onMounted } from "@mpxjs/core";
+import { EventBase } from "../../api/types";
+import { config } from '../../utils/config';
+import { cmsApi } from '../../api/cms';
+import { CmsInfoModel } from '../../api/cms/types';
+
+createComponent({
+    properties: {
+        // 是否更多详情
+        isInfo: {
+            type: Boolean,
+            value: false
+        },
+        // 样式
+        style: {
+            type: String,
+            value: "0",
+        },
+        // 组织租户
+        organTenant: {
+            type: String,
+            value: ""
+        },
+        // 站点ID
+        siteId: {
+            type: String,
+            value: ""
+        },
+        // 栏目ID
+        channelId: {
+            type: String,
+            value: ""
+        },
+        // 栏目别名
+        channelAlias: {
+            type: String,
+            value: ""
+        },
+        // 数量
+        pageSize: {
+            type: Number,
+            value: 5
+        },
+    },
+    setup(props) {
+        // 资源路径
+        let resourceUrl = config.resourceUrl + '/images';
+        // 文章列表
+        let articleList = ref([] as CmsInfoModel[]);
+        console.log("cms", props);
+        onMounted(() => {
+            cmsApi.findCmsInfoPage({
+                tenant: props.organTenant || config.tenant,
+                siteId: props.siteId,
+                channelId: props.channelId,
+                channelAlias: props.channelAlias,
+                curPage: 1,
+                pageSize: props.pageSize,
+            }).then(res => {
+                if (res.statusCode === 200) {
+                    articleList.value = res.data.results;
+                }
+            });
+        });
+        // 接口图片资源路径 容器宽高度150rpx 裁剪2倍
+        let imageUrl = config.baseUrl + "/v1/file/image/clip/300/300/";
+        return { resourceUrl, articleList, imageUrl }
+    },
+    methods: {
+        // 点击详情事件
+        handleInfo(e: EventBase) {
+            let item = e.currentTarget.dataset.item;
+            mpx.navigateTo({
+                url: '/jmash/pages/cms/cms-article?siteId=' + this.siteId + '&infoId=' + item.infoId,
+            });
+            // 浏览
+            this.handelBrowse(this.organTenant || config.tenant, item.infoId);
+            this.triggerEvent("info", item);
+        },
+        // 浏览
+        handelBrowse(tenant: string, infoId: string) {
+            const tempData = {
+                // 用于检测重复请求的唯一字符串ID
+                requestId: Math.random() * 10 + "",
+                // 类型
+                type: "information",
+                // 关系
+                relationId: infoId,
+                // 租户
+                tenant: tenant
+            };
+            cmsApi.createfrontBrowseRecord(tempData);
+        },
+    }
+})
+</script>
+
+<style lang="scss">
+@use "../../styles/index.scss" as *;
+
+.article-main {
+    padding: 0 30rpx;
+    border-radius: 20rpx;
+    background-color: #fff;
+}
+
+// 有分割线列表
+.article-border {
+    padding: 30rpx 0;
+    border-bottom: 1rpx solid $border-line;
+
+    // 分割线最后一条内容无分割线
+    &:last-child {
+        border: none;
+    }
+}
+
+// 无分割线列表
+.article-info {
+    padding: 30rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+    margin-bottom: 20rpx;
+}
+
+.cms-info {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 30rpx;
+    margin-bottom: 30rpx;
+
+    // 文章左侧内容
+    .cms-left {
+        width: 450rpx;
+        display: flex;
+        flex-direction: column;
+
+        .cms-left-title {
+            color: #333;
+            font-size: 28rpx;
+            font-weight: 600;
+            margin-bottom: 20rpx;
+            overflow: hidden;
+            /* 隐藏超出部分 */
+            white-space: nowrap;
+            /* 强制文本不换行 */
+            text-overflow: ellipsis;
+            /* 超出部分以省略号显示 */
+        }
+
+        .cms-left-info {
+            color: #666;
+            font-size: 26rpx;
+            line-height: 37rpx;
+            overflow: hidden;
+            /* 隐藏超出部分 */
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            /* 文本只显示两行 */
+            text-overflow: ellipsis;
+            /* 超出部分以省略号显示 */
+        }
+    }
+
+    // 文章右侧图片
+    .cms-right-image {
+        width: 150rpx;
+        height: 150rpx;
+        border-radius: 10rpx;
+    }
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {
+        "jmash-cms-like": "./jmash-cms-like"
+    }
+}
+</script>

package/src/components/cms/jmash-cms-article-view.mpx

@@ -0,0 +1,132 @@
+<template>
+    <view class="article-main">
+        <block>
+            <!-- 标题 -->
+            <view class="main-top" bind:tap="handleMore">
+                <view class="top-left-title">{{ title }}</view>
+                <view class="top-right-more">
+                    <view class="more-text">更多</view>
+                    <image class="more-image" src="{{ resourceUrl + '/components/caret-right_blcak.png' }}"
+                        mode="widthFix" />
+                </view>
+            </view>
+            <!-- 文章列表 -->
+            <jmash-cms-article-item isInfo="{{ isInfo }}" organTenant="{{ organTenant }}" siteId="{{ siteId }}"
+                channelId="{{ channelId }}" channelAlias="{{ channelAlias }}" pageSize="{{ pageSize }}"
+                style="{{ style }}"></jmash-cms-article-item>
+        </block>
+    </view>
+</template>
+
+<script lang="ts">
+import mpx, { createComponent } from "@mpxjs/core";
+import { EventBase } from "../../api/types";
+import { config } from '../../utils/config';
+
+createComponent({
+    properties: {
+        // 标题
+        title: {
+            type: String,
+            value: ""
+        },
+        // 是否更多详情
+        isInfo: {
+            type: Boolean,
+            value: false
+        },
+        // 样式
+        style: {
+            type: String,
+            value: "0",
+        },
+        // 组织租户
+        organTenant: {
+            type: String,
+            value: ""
+        },
+        // 站点ID
+        siteId: {
+            type: String,
+            value: ""
+        },
+        // 栏目ID
+        channelId: {
+            type: String,
+            value: ""
+        },
+        // 栏目别名
+        channelAlias: {
+            type: String,
+            value: ""
+        },
+        //数量
+        pageSize: {
+            type: Number,
+            value: 5
+        },
+    },
+    setup(props) {
+        // 资源路径
+        let resourceUrl = config.resourceUrl + '/images';
+        return { resourceUrl }
+    },
+    methods: {
+        // 点击更多事件
+        handleMore(e: EventBase) {
+            mpx.navigateTo({
+                url: '/jmash/pages/cms/cms-article-list?organTenant=' + this.organTenant + '&siteId=' + this.siteId + '&channelId=' + this.channelId + '&channelAlias=' + this.channelAlias,
+            });
+        }
+    }
+})
+</script>
+
+<style lang="scss">
+@use "../../styles/index.scss" as *;
+
+.article-main {
+    background-color: #fff;
+    border-radius: 20rpx;
+    margin-top: 20rpx;
+
+    .main-top {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 30rpx 30rpx 0 30rpx;
+
+        // 标题
+        .top-left-title {
+            color: #666;
+            font-size: 24rpx;
+        }
+
+        // 更多
+        .top-right-more {
+            display: flex;
+            align-items: center;
+
+            .more-text {
+                color: #666;
+                font-size: 24rpx;
+            }
+
+            .more-image {
+                width: 20rpx;
+                height: auto;
+            }
+        }
+    }
+
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {
+        "jmash-cms-article-item": "./jmash-cms-article-item.mpx"
+    }
+}
+</script>

package/src/components/cms/jmash-cms-like.mpx

@@ -0,0 +1,151 @@
+/**
+* 底部时间、点赞数、预览数组件
+* @param organTenant 租户 String
+* @param interactId 互动ID String
+* @param publishDate 发布时间 String
+*/
+<template>
+    <view class="cms-bottom">
+        <!-- 时间 -->
+        <view>{{ showDate }}</view>
+
+        <view class="cms-bottom-right">
+            <!-- 浏览 -->
+            <view class="cms-bottom-look">
+                <image class="bottom-look-image-left" src="{{ resourceUrl + '/icon_image/eye_open.png' }}"
+                    mode="widthFix" />
+                <view>{{ browseCount }}</view>
+            </view>
+            <!-- 点赞 -->
+            <view class="cms-bottom-look" catch:tap="handleLike" data-infoid="{{ interactId }}">
+                <image class="bottom-look-image-right"
+                    src="{{ !isLikeStatus ? resourceUrl+'/icon_image/thumbs_up.png' : resourceUrl+'/icon_image/like_fill2x.png' }}"
+                    mode="widthFix" />
+                <view>{{ likeCount }}</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script lang="ts">
+import { createComponent, ref, toRefs, watch, computed } from '@mpxjs/core'
+import { cmsApi } from '../../api/cms/index'
+import { config } from '../../utils/config';
+import { FrontLikeCreateReq } from '../../api/cms/types'
+import { EventBase } from '../../api/types'
+
+createComponent({
+    properties: {
+        // 租户
+        organTenant: {
+            type: String,
+            value: ""
+        },
+        // 互动ID
+        interactId: {
+            type: String,
+            value: ""
+        },
+        // 发布时间
+        publishDate: {
+            type: String,
+            value: ""
+        }
+    },
+    setup(props) {
+        let browseCount = ref(0);
+        let likeCount = ref(0);
+        let isLikeStatus = ref(false);
+        let resourceUrl = config.resourceUrl + "/images";
+        // 点赞和收藏数量
+        let queryInteractData = function (tenant: string, interactId: string) {
+            cmsApi.cmsInfoInteractId({ interactId: interactId, tenant: tenant }).then((response) => {
+                likeCount.value = response.data.likeCount;
+                browseCount.value = response.data.browseCount;
+            });
+        }
+        // 是否已点赞
+        let queryIsLike = function (tenant: string, interactId: string) {
+            cmsApi.isLike({ relationId: interactId, tenant: tenant }).then((response) => {
+                isLikeStatus.value = response.data === 'true';
+            });
+        }
+        //监听
+        const { interactId } = toRefs(props)
+        watch(interactId, (newVal) => {
+            queryInteractData(props.organTenant, newVal);
+            queryIsLike(props.organTenant, newVal);
+        })
+        queryInteractData(props.organTenant, props.interactId);
+        queryIsLike(props.organTenant, props.interactId);
+
+        const showDate = computed(() => props.publishDate.substring(0, 10))
+
+        return { showDate, resourceUrl, isLikeStatus, likeCount, browseCount, queryInteractData, queryIsLike };
+    },
+    methods: {
+        // 点赞/取消点赞
+        handleLike(e: EventBase) {
+            const tempData = {
+                // 用于检测重复请求的唯一字符串ID
+                requestId: Math.random() * 10 + "",
+                // 点赞类型
+                likeType: "info",
+                // 关系
+                relationId: e.currentTarget?.dataset.infoid,
+                // 点赞true/取消点赞false
+                action: !this.isLikeStatus,
+                // 租户
+                tenant: this.organTenant || config.tenant
+            } as FrontLikeCreateReq;
+            // 点赞/取消点赞
+            cmsApi.frontLike(tempData).then((response) => {
+                if (response.data.likeId) {
+                    // 获取互动数据
+                    this.queryInteractData(this.organTenant, e.currentTarget?.dataset.infoid);
+                    // 是否已点赞
+                    this.queryIsLike(this.organTenant, e.currentTarget?.dataset.infoid);
+                }
+            });
+        },
+    }
+})
+</script>
+
+<style lang="scss">
+// 时间预览点赞
+.cms-bottom {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    color: #999;
+    font-size: 12px;
+
+    // 预览/点赞
+    .cms-bottom-right {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 55rpx;
+
+        .cms-bottom-look {
+            display: flex;
+            align-items: center;
+
+            .bottom-look-image-left,
+            .bottom-look-image-right {
+                width: 32rpx;
+                height: 32rpx;
+                margin-right: 10rpx;
+            }
+        }
+    }
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {}
+}
+</script>

package/src/packages/index.mpx

@@ -4,7 +4,8 @@
         "./pages/auth/login",
         "./pages/auth/update-user",
         "./pages/auth/cms-protocol",
-        "./pages/cms/cms-article"
+        "./pages/cms/cms-article",
+        "./pages/cms/cms-article-list"
     ]
 }
 </script>

package/src/packages/pages/cms/cms-article-list.mpx

@@ -0,0 +1,164 @@
+<template>
+    <view class="article-main">
+        <!-- 默认图片在右侧的样式  枚举值为0  -->
+        <block wx:for="{{ articleList }}" wx:key="index">
+            <view class="{{ isInfo ? 'article-info' : 'article-border' }}" bind:tap="handleInfo" data-item="{{ item }}">
+                <!-- 内容 -->
+                <view class="cms-info">
+                    <view class="cms-left">
+                        <!-- 标题 -->
+                        <view class="cms-left-title">{{ item.infoTitle }}</view>
+                        <!-- 内容 -->
+                        <view class="cms-left-info">{{ item.intro }}</view>
+                    </view>
+                    <view bind:tap="handlePreview" data-url="{{ item.imgUrl }}">
+                        <image class="cms-right-image" src="{{ imageUrl + item.imgUrl }}" mode="widthFix" />
+                    </view>
+                </view>
+            </view>
+        </block>
+    </view>
+</template>
+
+<script lang="ts">
+import mpx, { createPage, ref, onLoad, onPullDownRefresh } from '@mpxjs/core'
+import { EventBase } from '../../../api/types';
+import { cmsApi } from '../../../api/cms';
+import { CmsInfoModel } from '../../../api/cms/types';
+import { config } from '../../../utils/config';
+
+createPage({
+    setup(props) {
+        let organTenant = ref(getApp().globalData.config.tenant);
+        let siteId = ref(getApp().globalData.config.siteId);
+        let channelId = ref('');
+        let channelAlias = ref('');
+        let curPage = ref(1);
+        let articleList = ref([] as CmsInfoModel[]);
+        let imageUrl = config.baseUrl + "/v1/file/image/clip/300/300/";
+        let queryCmsInfo = function () {
+            cmsApi.findCmsInfoPage({
+                tenant: organTenant.value || config.tenant,
+                siteId: siteId.value,
+                channelId: channelId.value,
+                channelAlias: channelAlias.value,
+                curPage: curPage.value,
+                pageSize: 10,
+            }).then(res => {
+                if (res.statusCode === 200) {
+                    console.log("article-list-add", res.data.results);
+                    articleList.value.push(...res.data.results);
+                    curPage.value++;
+                }
+            });
+        }
+        onLoad((options) => {
+            console.log("article-list", options);
+            siteId.value = options.siteId || getApp().globalData.config.siteId;
+            channelId.value = options.channelId || '';
+            channelAlias.value = options.channelAlias || '';
+            curPage.value = 1;
+            queryCmsInfo();
+        })
+        onPullDownRefresh(() => {
+            queryCmsInfo();
+        })
+        return { organTenant, siteId, channelId, channelAlias, curPage, articleList, imageUrl, queryCmsInfo };
+    },
+    methods: {
+        // 点击详情事件
+        handleInfo(e: EventBase) {
+            let item = e.currentTarget.dataset.item;
+            mpx.navigateTo({
+                url: '/jmash/pages/cms/cms-article?siteId=' + this.siteId + '&infoId=' + item.infoId,
+            });
+            // 浏览
+            this.handelBrowse(this.organTenant || config.tenant, item.infoId);
+        },
+    }
+})
+</script>
+
+<style lang="scss">
+@use "../../../styles/index.scss" as *;
+
+.article-main {
+    padding: 0 30rpx;
+    border-radius: 20rpx;
+    background-color: #fff;
+}
+
+// 有分割线列表
+.article-border {
+    padding: 30rpx 0;
+    border-bottom: 1rpx solid $border-line;
+
+    // 分割线最后一条内容无分割线
+    &:last-child {
+        border: none;
+    }
+}
+
+// 无分割线列表
+.article-info {
+    padding: 30rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+    margin-bottom: 20rpx;
+}
+
+.cms-info {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 30rpx;
+    margin-bottom: 30rpx;
+
+    // 文章左侧内容
+    .cms-left {
+        width: 450rpx;
+        display: flex;
+        flex-direction: column;
+
+        .cms-left-title {
+            color: #333;
+            font-size: 28rpx;
+            font-weight: 600;
+            margin-bottom: 20rpx;
+            overflow: hidden;
+            /* 隐藏超出部分 */
+            white-space: nowrap;
+            /* 强制文本不换行 */
+            text-overflow: ellipsis;
+            /* 超出部分以省略号显示 */
+        }
+
+        .cms-left-info {
+            color: #666;
+            font-size: 26rpx;
+            line-height: 37rpx;
+            overflow: hidden;
+            /* 隐藏超出部分 */
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            /* 文本只显示两行 */
+            text-overflow: ellipsis;
+            /* 超出部分以省略号显示 */
+        }
+    }
+
+    // 文章右侧图片
+    .cms-right-image {
+        width: 150rpx;
+        height: 150rpx;
+        border-radius: 10rpx;
+    }
+}
+</style>
+
+<script type="application/json">
+{
+    "usingComponents": {}
+}
+</script>

package/src/pages/home.mpx

@@ -2,6 +2,8 @@
   <view class="home-page">
     <text>主页（全屏登录）</text>
     <cms-acticle-list organTenant="xyvcard" siteId="{{ siteId }}" channelAlias="{{ channelAlias }}"></cms-acticle-list>
+    <cms-article-view title="企业动态" isInfo="{{ true }}" organTenant="xyvcard" siteId="{{ siteId }}"
+      channelAlias="{{ channelAlias }}" style="1"></cms-article-view>
   </view>
 </template>
 
@@ -45,6 +47,7 @@ createPage({
 {
   "usingComponents": {
     "cms-acticle-list": "../components/cms/jmash-cms-acticle-list",
+    "cms-article-view": "../components/cms/jmash-cms-article-view"
   }
 }
 </script>

package/src/utils/common.ts

@@ -126,6 +126,9 @@ export const formatDateTime = (dateTimeString: string, format?: any) => {
   if (format === "HH:mm:ss") {
     return hours + ":" + minutes + ":" + seconds;
   }
+  if (format === "HH:mm") {
+    return hours + ":" + minutes;
+  }
   return "";
 };
 

package/src/utils/request.ts

@@ -45,7 +45,7 @@ mpx.xfetch.interceptors.request.use(function (config) {
   }
   // 请求设置token和租户
   const expire = db.isTokenExpires();
-  if (!expire) {
+  if (!expire && db.getToken()) {
     config.header["Authorization"] = "Bearer " + db.getToken();
     const organTenant = db.getOrganTenant(config.tenant);
     if (organTenant && config.header.GrpcMetadataTenant !== false) {