jmash-core-mp 0.1.24 → 0.1.26

package/lib/api/types.d.ts

@@ -11,6 +11,7 @@ export interface AppConfig {
     wechatComponentAppId: string;
     wechatAppId: string;
     wechatBiz: string;
+    siteTenant: string;
     siteId: string;
     dev: boolean;
     testNewUser: boolean;

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

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

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

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

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

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

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

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

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

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

package/lib/components/core/jmash-login.mpx.d.ts

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

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

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

package/lib/utils/config.js

@@ -11,6 +11,7 @@ const defaultConfig = {
     wechatComponentAppId: "",
     wechatAppId: "",
     wechatBiz: "",
+    siteTenant: "xyvcard",
     siteId: "c0a28f0f-023a-420b-b4e8-0ce138ac8269",
 };
 const config = { ...defaultConfig };

package/package.json

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

package/src/api/types.ts

@@ -24,6 +24,8 @@ export interface AppConfig {
   wechatAppId: string;
   // 微信公众号Biz
   wechatBiz: string;
+  //站点租户
+  siteTenant: string;
   //站点ID.
   siteId: string;
   //是否开发环境.

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

@@ -0,0 +1,208 @@
+<template>
+    <block wx:for="{{ articleList }}" wx:key="infoId">
+        <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>
+        </view>
+    </block>
+</template>
+
+<script lang="ts">
+import mpx, { createComponent, ref, onMounted } from "@mpxjs/core";
+import { EventBase } from "../../api/types";
+import { cmsApi } from '../../api/cms';
+import { CmsInfoModel } from '../../api/cms/types';
+import * as dayjs from 'dayjs';
+
+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 config = getApp().globalData.config;
+        // 资源路径
+        let resourceUrl = config.resourceUrl + '/images';
+        // 文章列表
+        let articleList = ref([] as CmsInfoModel[]);
+        console.log("cms", props);
+        onMounted(() => {
+            cmsApi.findCmsInfoPage({
+                tenant: props.organTenant || config.siteTenant,
+                siteId: props.siteId,
+                channelId: props.channelId,
+                channelAlias: props.channelAlias,
+                curPage: 1,
+                pageSize: props.pageSize,
+                status: "published",
+            }).then(res => {
+                if (res.statusCode === 200) {
+                    // 格式化时间
+                    res.data.results.forEach(item => {
+                        item.publishDateStr = dayjs(item.publishDate).format("YYYY年MM月DD日 dddd");
+                    })
+                    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 config = getApp().globalData.config;
+            let item = e.currentTarget.dataset.item;
+            mpx.navigateTo({
+                url: '/jmash/pages/cms/cms-article?tenant=' + this.organTenant + '&siteId=' + this.siteId + '&infoId=' + item.infoId,
+            });
+            // 浏览
+            this.handelBrowse(this.organTenant || config.siteTenant, 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-border {
+    padding: 24rpx 0;
+    border-bottom: 1rpx solid $border-line;
+
+    &:last-child {
+        border: none;
+    }
+}
+
+.activity-card {
+    display: flex;
+    align-items: flex-start;
+    gap: 20rpx;
+
+    .activity-accent {
+        flex-shrink: 0;
+        width: 6rpx;
+        height: 110rpx;
+        background: linear-gradient(180deg, #409eff, #67c23a);
+        border-radius: 3rpx;
+    }
+
+    .activity-body {
+        flex: 1;
+        min-width: 0;
+        display: flex;
+        flex-direction: column;
+        gap: 12rpx;
+
+        .activity-title {
+            font-size: 32rpx;
+            font-weight: 700;
+            color: #1a1a1a;
+            line-height: 1.4;
+            text-align: left;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+
+        .activity-address,
+        .activity-time {
+            display: flex;
+            align-items: center;
+            gap: 8rpx;
+
+            .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: #888;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+        }
+    }
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {}
+}
+</script>

package/src/components/cms/{jmash-cms-activity-page.mpx → jmash-cms-activity-list.mpx}

@@ -1,6 +1,6 @@
 <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' }}">
+        <block wx:for="{{ articleList }}" wx:key="infoId">
             <view class="article-border" bind:tap="handleInfo" data-item="{{ item }}">
                 <view class="activity-card">
                     <view class="activity-accent"></view>
@@ -33,11 +33,6 @@ import { CmsInfoModel } from '../../api/cms/types';
 
 createComponent({
     properties: {
-        // 样式
-        style: {
-            type: String,
-            value: "0",
-        },
         // 组织租户
         organTenant: {
             type: String,
@@ -87,10 +82,12 @@ createComponent({
         console.log("cms", props);
 
         const loadRecords = function (page: number = 1) {
+            if (!props.channelAlias && !props.channelId) return
             if (loading.value) return
             loading.value = true;
+            curPage.value = page;
             cmsApi.findCmsInfoPage({
-                tenant: props.organTenant || config.tenant,
+                tenant: props.organTenant || config.siteTenant,
                 siteId: props.siteId,
                 channelId: props.channelId,
                 channelAlias: props.channelAlias,
@@ -121,13 +118,13 @@ createComponent({
             if (!hasMore.value || loading.value) return
             loadRecords(curPage.value + 1)
         }
-        loadRecords(1);
         watch(
             () => props.refreshKey,
             () => {
                 loadRecords(1)
             }
         )
+        loadRecords(1);
         return { resourceUrl, articleList, imageUrl, curPage, hasMore, loading, scrollTop, loadMore }
     },
     methods: {
@@ -139,7 +136,7 @@ createComponent({
                 url: '/jmash/pages/cms/cms-article?tenant=' + this.organTenant + '&siteId=' + this.siteId + '&infoId=' + item.infoId,
             });
             // 浏览
-            this.handelBrowse(this.organTenant || config.tenant, item.infoId);
+            this.handelBrowse(this.organTenant || config.siteTenant, item.infoId);
             this.triggerEvent("info", item);
         },
         // 浏览

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

@@ -10,53 +10,26 @@
 * @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 class="{{ isInfo ? 'article-card' : 'article-row' }}" wx:for="{{ articleList }}" wx:key="index"
+            bind:tap="handleInfo" data-item="{{ item }}">
+            <view class="article-item {{ itemClass }}">
+                <view class="article-text">
+                    <view class="article-text-title">{{ item.infoTitle }}</view>
+                    <view class="article-text-desc">{{ item.intro }}</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 class="article-thumb" catch:tap="handlePreview" data-url="{{ item.imgUrl }}">
+                    <image class="article-thumb-img" src="{{ imageUrl + item.imgUrl }}" mode="aspectFill" />
                 </view>
-                <!-- 底部时间、点赞数、预览数 -->
-                <jmash-cms-like organTenant="{{ organTenant }}" interactId="{{ item.infoId }}"
-                    publishDate="{{ item.publishDate }}"></jmash-cms-like>
             </view>
-        </block>
+            <jmash-cms-like organTenant="{{ organTenant }}" interactId="{{ item.infoId }}"
+                publishDate="{{ item.publishDate }}"></jmash-cms-like>
+        </view>
     </view>
 </template>
 
 <script lang="ts">
-import mpx, { createComponent, ref, onMounted } from "@mpxjs/core";
+import mpx, { createComponent, ref, onMounted, computed } from "@mpxjs/core";
 import { EventBase } from "../../api/types";
 import { cmsApi } from '../../api/cms';
 import { CmsInfoModel } from '../../api/cms/types';
@@ -108,12 +81,13 @@ createComponent({
         console.log("cms", props);
         onMounted(() => {
             cmsApi.findCmsInfoPage({
-                tenant: props.organTenant || config.tenant,
+                tenant: props.organTenant || config.siteTenant,
                 siteId: props.siteId,
                 channelId: props.channelId,
                 channelAlias: props.channelAlias,
                 curPage: 1,
                 pageSize: props.pageSize,
+                status: "published",
             }).then(res => {
                 if (res.statusCode === 200) {
                     articleList.value = res.data.results;
@@ -122,7 +96,10 @@ createComponent({
         });
         // 接口图片资源路径 容器宽高度150rpx 裁剪2倍
         let imageUrl = config.baseUrl + "/v1/file/image/clip/300/300/";
-        return { resourceUrl, articleList, imageUrl }
+
+        const itemClass = computed(() => props.style === '1' ? 'article-item--reverse' : '')
+
+        return { resourceUrl, articleList, imageUrl, itemClass }
     },
     methods: {
         // 点击详情事件
@@ -130,10 +107,10 @@ createComponent({
             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,
+                url: '/jmash/pages/cms/cms-article?tenant=' + this.organTenant + '&siteId=' + this.siteId + '&infoId=' + item.infoId,
             });
             // 浏览
-            this.handelBrowse(this.organTenant || config.tenant, item.infoId);
+            this.handelBrowse(this.organTenant || config.siteTenant, item.infoId);
             this.triggerEvent("info", item);
         },
         // 浏览
@@ -158,76 +135,78 @@ createComponent({
 @use "../../styles/index.scss" as *;
 
 .article-main {
-    padding: 0 30rpx;
-    border-radius: 20rpx;
-    background-color: #fff;
+    padding: 0 24rpx;
+    background-color: #f5f5f5;
 }
 
-// 有分割线列表
-.article-border {
-    padding: 30rpx 0;
+.article-row {
+    padding: 24rpx 0;
     border-bottom: 1rpx solid $border-line;
 
-    // 分割线最后一条内容无分割线
     &:last-child {
         border: none;
     }
 }
 
-// 无分割线列表
-.article-info {
-    padding: 30rpx;
+.article-card {
+    padding: 24rpx;
     background-color: #fff;
-    border-radius: 20rpx;
+    border-radius: 16rpx;
     margin-bottom: 20rpx;
+    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
 }
 
-.cms-info {
+.article-item {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-    gap: 30rpx;
-    margin-bottom: 30rpx;
+    gap: 24rpx;
+    margin-bottom: 24rpx;
 
-    // 文章左侧内容
-    .cms-left {
-        width: 450rpx;
+    &--reverse {
+        flex-direction: row-reverse;
+    }
+
+    .article-text {
+        flex: 1;
+        min-width: 0;
         display: flex;
         flex-direction: column;
+        gap: 16rpx;
 
-        .cms-left-title {
-            color: #333;
-            font-size: 28rpx;
+        .article-text-title {
+            color: #1a1a1a;
+            font-size: 30rpx;
             font-weight: 600;
-            margin-bottom: 20rpx;
+            line-height: 1.4;
             overflow: hidden;
-            /* 隐藏超出部分 */
             white-space: nowrap;
-            /* 强制文本不换行 */
             text-overflow: ellipsis;
-            /* 超出部分以省略号显示 */
         }
 
-        .cms-left-info {
-            color: #666;
-            font-size: 26rpx;
-            line-height: 37rpx;
+        .article-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-right-image {
-        width: 150rpx;
-        height: 150rpx;
-        border-radius: 10rpx;
+    .article-thumb {
+        flex-shrink: 0;
+        width: 180rpx;
+        height: 180rpx;
+        border-radius: 12rpx;
+        overflow: hidden;
+        background: #f0f0f0;
+
+        .article-thumb-img {
+            width: 100%;
+            height: 100%;
+        }
     }
 }
 </style>