jmash-core-mp 0.1.25 → 0.1.27

package/package.json

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

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

@@ -82,8 +82,10 @@ 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.siteTenant,
                 siteId: props.siteId,
@@ -116,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: {

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

@@ -81,8 +81,10 @@ 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.siteTenant,
                 siteId: props.siteId,

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

@@ -1,7 +1,8 @@
 <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="article-list" wx:if="{{ styles == '1' }}">
+            <view class="article-border" wx:for="{{ articleList }}" wx:key="index" bind:tap="handleInfo"
+                data-item="{{ item }}">
                 <view class="cms-info">
                     <view class="cms-image" catch:tap="handlePreview" data-url="{{ item.imgUrl }}">
                         <image class="cms-image-thumb" src="{{ imageUrl + item.imgUrl }}" mode="aspectFill" />
@@ -16,9 +17,8 @@
                     </view>
                 </view>
             </view>
-        </block>
-        <view wx:if="{{ loading }}" class="load-tip">加载中...</view>
-        <view wx:elif="{{ !hasMore && articleList.length > 0 }}" class="load-tip">没有更多了</view>
+        </view>
+        <view wx:if="{{ loading }}">加载中...</view>
     </scroll-view>
 </template>
 
@@ -31,7 +31,7 @@ import { CmsInfoModel } from '../../api/cms/types';
 createComponent({
     properties: {
         // 样式
-        style: {
+        styles: {
             type: String,
             value: "0",
         },
@@ -74,7 +74,7 @@ createComponent({
     setup(props) {
         let config = getApp().globalData.config;
         const curPage = ref(1)
-        const hasMore = ref(true)
+        const totalSize = ref(0)
         const loading = ref(false)
         const scrollTop = ref(0)
         // 资源路径
@@ -84,8 +84,10 @@ 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.siteTenant,
                 siteId: props.siteId,
@@ -103,6 +105,7 @@ createComponent({
                     } else {
                         articleList.value = [...articleList.value, ...(res.data.results || [])];
                     }
+                    totalSize.value = res.data.totalSize as number;
                 }
             }).finally(() => {
                 loading.value = false
@@ -111,7 +114,10 @@ createComponent({
         // 接口图片资源路径 容器宽高度150rpx 裁剪2倍
         let imageUrl = config.baseUrl + "/v1/file/image/clip/300/300/";
         const loadMore = () => {
-            if (!hasMore.value || loading.value) return
+            if (totalSize.value === articleList.value.length || loading.value) {
+                mpx.showToast({ title: "没有更多数据了", icon: "none" });
+                return;
+            }
             loadRecords(curPage.value + 1)
         }
         loadRecords(1);
@@ -121,7 +127,7 @@ createComponent({
                 loadRecords(1)
             }
         )
-        return { resourceUrl, articleList, imageUrl, curPage, hasMore, loading, scrollTop, loadMore }
+        return { resourceUrl, articleList, imageUrl, curPage, totalSize, loading, scrollTop, loadMore }
     },
     methods: {
         // 点击详情事件
@@ -157,9 +163,14 @@ createComponent({
 @use "../../styles/index.scss" as *;
 
 .article-main {
-    padding: 0 30rpx;
-    border-radius: 20rpx;
+    max-height: calc(100vh - 90rpx - env(safe-area-inset-bottom));
+    width: 100vw;
+    box-sizing: border-box;
     background-color: #fff;
+
+    .article-list {
+        padding: 0 30rpx;
+    }
 }
 
 // 有分割线列表

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

@@ -74,8 +74,10 @@ 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.siteTenant,
                 siteId: props.siteId,

package/src/components/core/jmash-cms-protocol.mpx

@@ -25,14 +25,20 @@ createComponent({
         channelAlias: {
             type: String,
             value: ""
-        }
+        },
+        //refreshKey
+        refreshKey: {
+            type: Number,
+            value: 0
+        },
     },
     setup(props) {
         let contents = ref([{ contentId: "123" }]);
         let title = ref("");
-        const { channelAlias } = toRefs(props)
-        watch(channelAlias, (newVal) => {
-            cmsApi.findCmsContentInfo({ siteId: props.siteId, channelAlias: newVal, tenant: props.tenant }).then(({ data }) => {
+        const { refreshKey } = toRefs(props)
+        watch(refreshKey, () => {
+            if (!props.channelAlias) return;
+            cmsApi.findCmsContentInfo({ siteId: props.siteId, channelAlias: props.channelAlias, tenant: props.tenant }).then(({ data }) => {
                 console.log(data)
                 title.value = data.cmsInfo.infoTitle;
                 contents.value = data.infoContentResults;

package/src/packages/pages/auth/cms-protocol.mpx

@@ -1,5 +1,6 @@
 <template>
-    <cms-protocol siteId="{{ siteId }}" tenant="{{ tenant }}" channelAlias="{{ channelAlias }}"></cms-protocol>
+    <cms-protocol siteId="{{ siteId }}" tenant="{{ tenant }}" channelAlias="{{ channelAlias }}"
+        refreshKey="{{ refreshKey }}"></cms-protocol>
 </template>
 
 <script>
@@ -12,13 +13,15 @@ createPage({
         let tenant = ref(config.siteTenant);
         let siteId = ref(config.siteId);
         let channelAlias = ref('');
+        let refreshKey = ref(0);
         onLoad((options) => {
             console.log(options);
             tenant.value = options.tenant || config.siteTenant;
             siteId.value = options.siteId || config.siteId;
             channelAlias.value = options.channelAlias || 'privacy';
+            refreshKey.value = refreshKey.value + 1;
         })
-        return { siteId, tenant, channelAlias };
+        return { siteId, tenant, channelAlias, refreshKey };
     },
 })
 </script>

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

@@ -4,7 +4,6 @@
         <jmash-search placeholder="搜索" bind:handleSearch="handleInput" />
     </view>
     <!-- 栏目列表 -->
-
     <jmash-cms-activity-list isInfo="false" style="1" organTenant="{{ queryParams.tenant }}"
         siteId="{{ queryParams.siteId }}" likeInfoTitle="{{ queryParams.likeInfoTitle }}"
         channelAlias="{{ queryParams.channelAlias }}" pageSize="10" refreshKey="{{ refreshKey }}" />
@@ -13,7 +12,6 @@
 
 <script lang="ts">
 import mpx, { createPage, ref } from "@mpxjs/core";
-import { CmsChannelModel } from '../../../api/cms/types'
 import { EventBase } from "../../../api/types";
 
 createPage({
@@ -23,19 +21,13 @@ createPage({
         let queryParams = ref({
             tenant: config.siteTenant,
             siteId: config.siteId,
-            channelAlias: "hdzx",
+            channelAlias: "",
             likeInfoTitle: "",
-            status: true,
             isOpen: true,
         });
-        // 栏目列表
-        let channelList = ref([] as CmsChannelModel[]);
-
         let refreshKey = ref(0);
-
         return {
             queryParams,
-            channelList,
             refreshKey,
         }
     },

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

@@ -12,7 +12,6 @@
 
 <script lang="ts">
 import mpx, { createPage, ref } from "@mpxjs/core";
-import { CmsChannelModel } from '../../../api/cms/types'
 import { EventBase } from "../../../api/types";
 
 createPage({
@@ -22,19 +21,15 @@ createPage({
         let queryParams = ref({
             tenant: config.siteTenant,
             siteId: config.siteId,
-            channelAlias: "news",
+            channelAlias: "",
             likeInfoTitle: "",
-            status: true,
             isOpen: true,
         });
-        // 栏目列表
-        let channelList = ref([] as CmsChannelModel[]);
 
         let refreshKey = ref(0);
 
         return {
             queryParams,
-            channelList,
             refreshKey,
         }
     },

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

@@ -1,11 +1,10 @@
 <template>
     <!-- 搜索框 -->
     <view class="search-box">
-        <jmash-search placeholder="搜索" bind:handleSearch="handleInput" />
+        <jmash-search placeholder="搜索" backColor="#f3f4f6" bind:handleSearch="handleInput" />
     </view>
     <!-- 栏目列表 -->
-
-    <jmash-cms-location-list isInfo="false" style="1" organTenant="{{ queryParams.tenant }}"
+    <jmash-cms-location-list isInfo="false" styles="1" organTenant="{{ queryParams.tenant }}"
         siteId="{{ queryParams.siteId }}" likeInfoTitle="{{ queryParams.likeInfoTitle }}"
         channelAlias="{{ queryParams.channelAlias }}" pageSize="10" refreshKey="{{ refreshKey }}" />
 
@@ -13,7 +12,6 @@
 
 <script lang="ts">
 import mpx, { createPage, ref } from "@mpxjs/core";
-import { CmsChannelModel } from '../../../api/cms/types'
 import { EventBase } from "../../../api/types";
 
 createPage({
@@ -23,19 +21,15 @@ createPage({
         let queryParams = ref({
             tenant: config.siteTenant,
             siteId: config.siteId,
-            channelAlias: "gmlj",
+            channelAlias: "",
             likeInfoTitle: "",
-            status: true,
             isOpen: true,
         });
-        // 栏目列表
-        let channelList = ref([] as CmsChannelModel[]);
 
         let refreshKey = ref(0);
 
         return {
             queryParams,
-            channelList,
             refreshKey,
         }
     },
@@ -77,11 +71,6 @@ page {
 .search-box {
     padding: 15rpx 30rpx;
 }
-
-.article-list {
-    max-height: calc(100vh - 90rpx - env(safe-area-inset-bottom));
-    box-sizing: border-box;
-}
 </style>
 
 <script type="application/json">

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

@@ -4,7 +4,6 @@
         <jmash-search placeholder="搜索" bind:handleSearch="handleInput" />
     </view>
     <!-- 栏目列表 -->
-
     <jmash-cms-product-list isInfo="false" style="1" organTenant="{{ queryParams.tenant }}"
         siteId="{{ queryParams.siteId }}" likeInfoTitle="{{ queryParams.likeInfoTitle }}"
         channelAlias="{{ queryParams.channelAlias }}" pageSize="10" refreshKey="{{ refreshKey }}" />
@@ -13,7 +12,6 @@
 
 <script lang="ts">
 import mpx, { createPage, ref } from "@mpxjs/core";
-import { CmsChannelModel } from '../../../api/cms/types'
 import { EventBase } from "../../../api/types";
 
 createPage({
@@ -23,19 +21,15 @@ createPage({
         let queryParams = ref({
             tenant: config.siteTenant,
             siteId: config.siteId,
-            channelAlias: "product",
+            channelAlias: "",
             likeInfoTitle: "",
-            status: true,
             isOpen: true,
         });
-        // 栏目列表
-        let channelList = ref([] as CmsChannelModel[]);
 
         let refreshKey = ref(0);
 
         return {
             queryParams,
-            channelList,
             refreshKey,
         }
     },

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

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

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

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

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

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

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

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

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

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

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

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

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

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