jmash-core-mp 0.1.21 → 0.1.23

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

@@ -101,11 +101,14 @@ export interface CmsInfoModel {
     top?: number;
     status?: string;
     publishDate?: string;
+    publishDateStr?: string;
     dueTime?: string;
     channelId: Array<string>;
     sourceName?: string;
     siteId: string;
     address?: string;
+    geoLongitude?: number;
+    geoLatitude?: number;
 }
 export interface CmsInfoContentReq {
     tenant?: string;
@@ -119,9 +122,7 @@ export interface CmsInfoContentModel {
     infoContent?: string;
     infoType?: string;
     orderBy?: number;
-    infoContentList?: {
-        path: string;
-    }[];
+    infoContentList?: Array<string>;
 }
 export interface CmsInfoContentList {
     results: Array<CmsInfoContentModel>;

package/lib/components/cms/cms-channel-list.mpx.d.ts

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

package/lib/components/cms/jmash-cms-activity-page.mpx.d.ts

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

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

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

package/lib/components/cms/jmash-cms-location-page.mpx.d.ts

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

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

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

package/lib/components/common/jmash-none-data.mpx.d.ts

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

package/lib/components/common/jmash-search.mpx.d.ts

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

package/lib/index.d.ts

@@ -19,3 +19,5 @@ export { regionApi } from "./api/region";
 export { storageApi } from "./api/storage";
 export { net } from "./utils/net";
 export { getHeight, formatDateTime, validateRules, validateRequired, } from "./utils/common";
+import * as dayjs from "dayjs";
+export { dayjs };

package/lib/index.js

@@ -12,3 +12,7 @@ export { regionApi } from "./api/region";
 export { storageApi } from "./api/storage";
 export { net } from "./utils/net";
 export { getHeight, formatDateTime, validateRules, validateRequired, } from "./utils/common";
+import * as dayjsLocaleZhCn from "dayjs/locale/zh-cn";
+import * as dayjs from "dayjs";
+dayjs.locale(dayjsLocaleZhCn);
+export { dayjs };

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

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

package/lib/packages/pages/cms/cms-info.mpx.d.ts

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

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

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

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

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

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "dependencies": {
-    "sm-crypto": "^0.4.0",
     "@mpxjs/api-proxy": "^2.10.19",
     "@mpxjs/core": "^2.10.19",
     "@mpxjs/fetch": "^2.10.19",
@@ -13,7 +12,9 @@
     "@mpxjs/pinia": "^2.10.18",
     "@mpxjs/store": "^2.10.18",
     "@mpxjs/utils": "^2.10.18",
+    "dayjs": "^1.11.21",
     "pinia": "^2.0.14",
+    "sm-crypto": "^0.4.0",
     "vue": "^2.7.0",
     "vue-demi": "^0.14.6",
     "vue-i18n": "^8.27.2",

package/src/api/cms/types.ts

@@ -200,6 +200,8 @@ export interface CmsInfoModel {
   status?: string;
   // 发布时间
   publishDate?: string;
+  // 发布时间字符串
+  publishDateStr?: string;
   // 到期时间
   dueTime?: string;
   // 栏目ID
@@ -210,6 +212,10 @@ export interface CmsInfoModel {
   siteId: string;
   // 地址
   address?: string;
+  // 经度
+  geoLongitude?: number;
+  // 纬度
+  geoLatitude?: number;
 }
 // 信息内容查询
 export interface CmsInfoContentReq {
@@ -235,7 +241,7 @@ export interface CmsInfoContentModel {
   // 排序
   orderBy?: number;
   // 信息内容数组
-  infoContentList?: { path: string }[];
+  infoContentList?: Array<string>;
 }
 // 信息内容列表
 export interface CmsInfoContentList {

package/src/components/cms/jmash-cms-activity-page.mpx

@@ -0,0 +1,360 @@
+<template>
+    <scroll-view class="article-main" type="custom" scroll-y scroll-top="{{ scrollTop }}" bindscrolltolower="loadMore">
+        <block wx:for="{{ articleList }}" wx:key="index" wx:if="{{ style == '1' }}">
+            <view class="article-border" bind:tap="handleInfo" data-item="{{ item }}">
+                <view class="activity-card">
+                    <view class="activity-accent"></view>
+                    <view class="activity-body">
+                        <view class="activity-title">{{ item.infoTitle }}</view>
+                        <view class="activity-address">
+                            <text class="meta-dot address-dot"></text>
+                            <text class="meta-text">{{ item.address }}</text>
+                        </view>
+                        <view class="activity-time">
+                            <text class="meta-dot time-dot"></text>
+                            <text class="meta-text">{{ item.publishDateStr }}</text>
+                        </view>
+                    </view>
+                    <view class="activity-arrow">›</view>
+                </view>
+            </view>
+        </block>
+        <view wx:if="{{ loading }}" class="load-tip">加载中...</view>
+        <view wx:elif="{{ !hasMore && articleList.length > 0 }}" class="load-tip">没有更多了</view>
+    </scroll-view>
+</template>
+
+<script lang="ts">
+import mpx, { createComponent, ref, watch } from "@mpxjs/core";
+import { EventBase } from "../../api/types";
+import * as dayjs from 'dayjs';
+import { cmsApi } from '../../api/cms';
+import { CmsInfoModel } from '../../api/cms/types';
+
+createComponent({
+    properties: {
+        // 样式
+        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
+        },
+        // 搜索标题
+        likeInfoTitle: {
+            type: String,
+            value: ""
+        },
+        //refreshKey
+        refreshKey: {
+            type: Number,
+            value: 0
+        },
+    },
+    setup(props) {
+        let config = getApp().globalData.config;
+        const curPage = ref(1)
+        const hasMore = ref(true)
+        const loading = ref(false)
+        const scrollTop = ref(0)
+        // 资源路径
+        let resourceUrl = config.resourceUrl + '/images';
+        // 文章列表
+        let articleList = ref([] as CmsInfoModel[]);
+        console.log("cms", props);
+
+        const loadRecords = function (page: number = 1) {
+            if (loading.value) return
+            loading.value = true;
+            cmsApi.findCmsInfoPage({
+                tenant: props.organTenant || config.tenant,
+                siteId: props.siteId,
+                channelId: props.channelId,
+                channelAlias: props.channelAlias,
+                curPage: curPage.value,
+                pageSize: props.pageSize,
+                likeInfoTitle: props.likeInfoTitle,
+            }).then(res => {
+                if (res.statusCode === 200) {
+                    // 格式化时间
+                    res.data.results.forEach(item => {
+                        item.publishDateStr = dayjs(item.publishDate).format("YYYY年MM月DD日 dddd");
+                    })
+                    if (curPage.value === 1) {
+                        scrollTop.value = 0
+                        articleList.value = res.data.results || []
+                    } else {
+                        articleList.value = [...articleList.value, ...(res.data.results || [])];
+                    }
+                }
+            }).finally(() => {
+                loading.value = false
+            });
+        }
+        // 接口图片资源路径 容器宽高度150rpx 裁剪2倍
+        let imageUrl = config.baseUrl + "/v1/file/image/clip/300/300/";
+        const loadMore = () => {
+            if (!hasMore.value || loading.value) return
+            loadRecords(curPage.value + 1)
+        }
+        loadRecords(1);
+        watch(
+            () => props.refreshKey,
+            () => {
+                loadRecords(1)
+            }
+        )
+        return { resourceUrl, articleList, imageUrl, curPage, hasMore, loading, scrollTop, loadMore }
+    },
+    methods: {
+        // 点击详情事件
+        handleInfo(e: EventBase) {
+            let config = getApp().globalData.config;
+            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: 24rpx 0;
+    border-bottom: 1rpx solid $border-line;
+
+    &:last-child {
+        border: none;
+    }
+}
+
+// 无分割线列表
+.article-info {
+    position: relative;
+    padding: 24rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+}
+
+.cms-info {
+    display: flex;
+    align-items: center;
+    gap: 24rpx;
+
+    .cms-text {
+        flex: 1;
+        min-width: 0;
+        display: flex;
+        flex-direction: column;
+        gap: 12rpx;
+
+        .cms-text-title {
+            color: #222;
+            font-size: 30rpx;
+            font-weight: 600;
+            line-height: 1.4;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+
+        .cms-text-desc {
+            color: #888;
+            font-size: 24rpx;
+            line-height: 1.5;
+            overflow: hidden;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            text-overflow: ellipsis;
+        }
+
+        .cms-text-meta {
+            display: flex;
+            align-items: center;
+            gap: 6rpx;
+
+            .cms-meta-icon {
+                font-size: 22rpx;
+            }
+
+            .cms-meta-text {
+                color: #aaa;
+                font-size: 22rpx;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+        }
+    }
+
+    .cms-image {
+        flex-shrink: 0;
+        width: 180rpx;
+        height: 180rpx;
+        border-radius: 12rpx;
+        overflow: hidden;
+        background: #f0f0f0;
+
+        .cms-image-thumb {
+            width: 100%;
+            height: 100%;
+        }
+    }
+}
+
+// 活动列表卡片
+.activity-card {
+    display: flex;
+    align-items: center;
+    gap: 20rpx;
+
+    .activity-accent {
+        flex-shrink: 0;
+        width: 6rpx;
+        height: 80rpx;
+        background: linear-gradient(180deg, #409eff, #67c23a);
+        border-radius: 3rpx;
+    }
+
+    .activity-body {
+        flex: 1;
+        min-width: 0;
+        display: flex;
+        flex-direction: column;
+        gap: 14rpx;
+
+        .activity-title {
+            font-size: 32rpx;
+            font-weight: 700;
+            color: #1a1a1a;
+            line-height: 1.4;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+
+        .activity-address,
+        .activity-time {
+            display: inline-flex;
+            align-items: center;
+            gap: 8rpx;
+            padding: 8rpx 16rpx;
+            border-radius: 6rpx;
+            width: fit-content;
+
+            .meta-dot {
+                width: 10rpx;
+                height: 10rpx;
+                border-radius: 50%;
+                flex-shrink: 0;
+            }
+
+            .address-dot {
+                background: #e6a23c;
+            }
+
+            .time-dot {
+                background: #67c23a;
+            }
+
+            .meta-text {
+                font-size: 24rpx;
+                color: #555;
+                font-weight: 500;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+        }
+
+        .activity-address {
+            background: #fdf6ec;
+        }
+
+        .activity-time {
+            background: #f0f9eb;
+        }
+    }
+
+    .activity-arrow {
+        flex-shrink: 0;
+        font-size: 32rpx;
+        color: #bbb;
+        font-weight: 300;
+        width: 36rpx;
+        text-align: center;
+    }
+}
+
+.article-info .cms-arrow {
+    display: block;
+    position: absolute;
+    right: 24rpx;
+    top: 50%;
+    transform: translateY(-50%);
+    font-size: 36rpx;
+    color: #ccc;
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {
+        "jmash-cms-like": "./jmash-cms-like"
+    }
+}
+</script>