jmash-core-mp 0.1.13 → 0.1.14

package/src/custom-tab-bar/index.mpx

@@ -1,10 +1,10 @@
-<template>
-    <jmash-tab-bar wx:ref="tabBar"></jmash-tab-bar>
-</template>
-<script type="application/json">
-    {
-        "usingComponents": {
-            "jmash-tab-bar": "../components/common/jmash-tab-bar.mpx"
-        }
-    }
-</script>
+<template>
+    <jmash-tab-bar wx:ref="tabBar"></jmash-tab-bar>
+</template>
+<script type="application/json">
+    {
+        "usingComponents": {
+            "jmash-tab-bar": "../components/common/jmash-tab-bar.mpx"
+        }
+    }
+</script>

package/src/global.d.ts

@@ -1,11 +1,11 @@
-declare module "*?fallback=true" {
-  const URL: string;
-  export default URL;
-}
-
-declare const my: {
-  getOpenUserInfo(options: any): Promise<any>;
-  getPhoneNumber(options: any): Promise<any>;
-};
-
-declare module "sm-crypto";
+declare module "*?fallback=true" {
+  const URL: string;
+  export default URL;
+}
+
+declare const my: {
+  getOpenUserInfo(options: any): Promise<any>;
+  getPhoneNumber(options: any): Promise<any>;
+};
+
+declare module "sm-crypto";

package/src/index.ts

@@ -1,71 +1,71 @@
-export type {
-  AppConfig,
-  ResponseData,
-  ValidateData,
-  EventBase,
-  EventTarget,
-  CanvasResponse,
-} from "./api/types";
-export type {
-  LoginReq,
-  LoginRes,
-  RolesPerms,
-  WebLoginReq,
-  TokenModel,
-  PhoneRegisterReq,
-  PhoneReplaceReq,
-  UpdateUserReq,
-  UserInfoReq,
-  UserInfo,
-} from "./api/auth/types";
-export type {
-  CmsSiteList,
-  CmsChannelReq,
-  CmsChannelList,
-  CmsContentInfoReq,
-  CmsContentInfoModel,
-  CmsInfoModel,
-  CmsInfoContentModel,
-  CmsChannelModel,
-} from "./api/cms/types";
-export type { Entry, DictEntryModel } from "./api/dict/types";
-export { EntryDict, EnumDict } from "./api/dicts";
-export type {
-  FileInfo,
-  FileBase64Req,
-  FileDownInfo,
-  FileWebReq,
-} from "./api/files/types";
-export type {
-  DictRegionList,
-  DictRegionReq,
-  DictRegionModel,
-} from "./api/region/types";
-export type {
-  StorageOrganInfoReq,
-  StorageOrganInfoList,
-  StorageOrganInfoModel,
-  ShopBrowserUserList,
-  ShopBrowserUserModel,
-  StorageOrganBrowserUpdateReq,
-  StorageOrganBrowserModel,
-} from "./api/storage/types";
-
-export { mpxFetch } from "./utils/request";
-export { config } from "./utils/config";
-export { grpc } from "./utils/grpc";
-export { db } from "./utils/db";
-export { useUserStore } from "./store/user";
-export { authApi } from "./api/auth";
-export { cmsApi } from "./api/cms";
-export { dictApi } from "./api/dict";
-export { fileApi } from "./api/files";
-export { regionApi } from "./api/region";
-export { storageApi } from "./api/storage";
-export { net } from "./utils/net";
-export {
-  getHeight,
-  formatDateTime,
-  validateRules,
-  validateRequired,
-} from "./utils/common";
+export type {
+  AppConfig,
+  ResponseData,
+  ValidateData,
+  EventBase,
+  EventTarget,
+  CanvasResponse,
+} from "./api/types";
+export type {
+  LoginReq,
+  LoginRes,
+  RolesPerms,
+  WebLoginReq,
+  TokenModel,
+  PhoneRegisterReq,
+  PhoneReplaceReq,
+  UpdateUserReq,
+  UserInfoReq,
+  UserInfo,
+} from "./api/auth/types";
+export type {
+  CmsSiteList,
+  CmsChannelReq,
+  CmsChannelList,
+  CmsContentInfoReq,
+  CmsContentInfoModel,
+  CmsInfoModel,
+  CmsInfoContentModel,
+  CmsChannelModel,
+} from "./api/cms/types";
+export type { Entry, DictEntryModel } from "./api/dict/types";
+export { EntryDict, EnumDict } from "./api/dicts";
+export type {
+  FileInfo,
+  FileBase64Req,
+  FileDownInfo,
+  FileWebReq,
+} from "./api/files/types";
+export type {
+  DictRegionList,
+  DictRegionReq,
+  DictRegionModel,
+} from "./api/region/types";
+export type {
+  StorageOrganInfoReq,
+  StorageOrganInfoList,
+  StorageOrganInfoModel,
+  ShopBrowserUserList,
+  ShopBrowserUserModel,
+  StorageOrganBrowserUpdateReq,
+  StorageOrganBrowserModel,
+} from "./api/storage/types";
+
+export { mpxFetch } from "./utils/request";
+export { config } from "./utils/config";
+export { grpc } from "./utils/grpc";
+export { db } from "./utils/db";
+export { useUserStore } from "./store/user";
+export { authApi } from "./api/auth";
+export { cmsApi } from "./api/cms";
+export { dictApi } from "./api/dict";
+export { fileApi } from "./api/files";
+export { regionApi } from "./api/region";
+export { storageApi } from "./api/storage";
+export { net } from "./utils/net";
+export {
+  getHeight,
+  formatDateTime,
+  validateRules,
+  validateRequired,
+} from "./utils/common";

package/src/packages/index.mpx

@@ -1,10 +1,11 @@
-<script type="application/json">
-{
-    "pages": [
-        "./pages/auth/login",
-        "./pages/auth/update-user",
-        "./pages/auth/cms-protocol",
-        "./pages/cms/cms-article"
-    ]
-}
+<script type="application/json">
+{
+    "pages": [
+        "./pages/auth/login",
+        "./pages/auth/update-user",
+        "./pages/auth/cms-protocol",
+        "./pages/cms/cms-article",
+        "./pages/cms/cms-article-list"
+    ]
+}
 </script>

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

@@ -1,31 +1,31 @@
-<template>
-    <cms-protocol siteId="{{ siteId }}" tenant="{{ tenant }}" channelAlias="{{ channelAlias }}"></cms-protocol>
-</template>
-
-<script>
-import { createPage, ref, onLoad } from '@mpxjs/core'
-
-createPage({
-    setup(props) {
-        //console.log("123", props);
-        let siteId = ref(getApp().globalData.config.siteId);
-        let tenant = ref(getApp().globalData.config.tenant);
-        let channelAlias = ref('');
-        onLoad((options) => {
-            console.log(options);
-            channelAlias.value = options.channelAlias || 'privacy';
-        })
-        return { siteId, tenant, channelAlias };
-    },
-})
-</script>
-
-<style lang="scss"></style>
-
-<script type="application/json">
-{
-    "usingComponents": {
-        "cms-protocol": "../../../components/core/jmash-cms-protocol.mpx"
-    }
-}
+<template>
+    <cms-protocol siteId="{{ siteId }}" tenant="{{ tenant }}" channelAlias="{{ channelAlias }}"></cms-protocol>
+</template>
+
+<script>
+import { createPage, ref, onLoad } from '@mpxjs/core'
+
+createPage({
+    setup(props) {
+        //console.log("123", props);
+        let siteId = ref(getApp().globalData.config.siteId);
+        let tenant = ref(getApp().globalData.config.tenant);
+        let channelAlias = ref('');
+        onLoad((options) => {
+            console.log(options);
+            channelAlias.value = options.channelAlias || 'privacy';
+        })
+        return { siteId, tenant, channelAlias };
+    },
+})
+</script>
+
+<style lang="scss"></style>
+
+<script type="application/json">
+{
+    "usingComponents": {
+        "cms-protocol": "../../../components/core/jmash-cms-protocol.mpx"
+    }
+}
 </script>

package/src/packages/pages/auth/login.mpx

@@ -1,59 +1,59 @@
-<template>
-  <jmash-login linkType="{{ linkType }}" backurl="{{ backurl }}">
-    <image mode="widthFix" src="{{ resourceUrl }}/images/login_bg.png" class="index_bj" slot="before">
-      <image mode="widthFix" src="{{ resourceUrl }}/images/logo.png" class="login_logo"></image>
-    </image>
-    <view class="tips_box" slot="after">温馨提示：{{ appName }}手机号授权登录。</view>
-  </jmash-login>
-</template>
-
-<script>
-import { createPage, ref, onLoad } from '@mpxjs/core'
-
-createPage({
-  setup(props) {
-    let resourceUrl = ref(getApp().globalData.config.resourceUrl);
-    let appName = ref(getApp().globalData.config.name);
-    let linkType = ref("redirectTo");
-    let backurl = ref("/pages/home");
-    onLoad((options) => {
-      console.log(options);
-      linkType.value = options.tabbar === 'true' ? "switchTab" : "redirectTo";
-      backurl.value = options.backurl || "/pages/home";
-      console.log("linkType", linkType);
-      console.log("backurl", backurl);
-    })
-    return { resourceUrl, appName, linkType, backurl };
-  }
-})
-</script>
-
-<style lang="scss">
-.index_bj {
-  width: 100%;
-  position: relative;
-
-  .login_logo {
-    position: absolute;
-    left: 50%;
-    top: 20%;
-    transform: translateX(-50%);
-    width: 120rpx;
-  }
-}
-
-.tips_box {
-  text-align: center;
-  color: #666;
-  font-size: 24rpx;
-  margin-top: 40rpx;
-}
-</style>
-
-<script type="application/json">
-{
-  "usingComponents": {
-    "jmash-login": "../../../components/core/jmash-login.mpx"
-  }
-}
+<template>
+  <jmash-login linkType="{{ linkType }}" backurl="{{ backurl }}">
+    <image mode="widthFix" src="{{ resourceUrl }}/images/login_bg.png" class="index_bj" slot="before">
+      <image mode="widthFix" src="{{ resourceUrl }}/images/logo.png" class="login_logo"></image>
+    </image>
+    <view class="tips_box" slot="after">温馨提示：{{ appName }}手机号授权登录。</view>
+  </jmash-login>
+</template>
+
+<script>
+import { createPage, ref, onLoad } from '@mpxjs/core'
+
+createPage({
+  setup(props) {
+    let resourceUrl = ref(getApp().globalData.config.resourceUrl);
+    let appName = ref(getApp().globalData.config.name);
+    let linkType = ref("redirectTo");
+    let backurl = ref("/pages/home");
+    onLoad((options) => {
+      console.log(options);
+      linkType.value = options.tabbar === 'true' ? "switchTab" : "redirectTo";
+      backurl.value = options.backurl || "/pages/home";
+      console.log("linkType", linkType);
+      console.log("backurl", backurl);
+    })
+    return { resourceUrl, appName, linkType, backurl };
+  }
+})
+</script>
+
+<style lang="scss">
+.index_bj {
+  width: 100%;
+  position: relative;
+
+  .login_logo {
+    position: absolute;
+    left: 50%;
+    top: 20%;
+    transform: translateX(-50%);
+    width: 120rpx;
+  }
+}
+
+.tips_box {
+  text-align: center;
+  color: #666;
+  font-size: 24rpx;
+  margin-top: 40rpx;
+}
+</style>
+
+<script type="application/json">
+{
+  "usingComponents": {
+    "jmash-login": "../../../components/core/jmash-login.mpx"
+  }
+}
 </script>

package/src/packages/pages/auth/update-user.mpx

@@ -1,18 +1,18 @@
-<template>
-    <view>
-        <jmash-update-user></jmash-update-user>
-    </view>
-</template>
-
-<script>
-import { createPage } from '@mpxjs/core'
-createPage({})
-</script>
-
-<script type="application/json">
-{
-    "usingComponents": {
-        "jmash-update-user": "../../../components/auth-user/jmash-update-user"
-    }
-}
+<template>
+    <view>
+        <jmash-update-user></jmash-update-user>
+    </view>
+</template>
+
+<script>
+import { createPage } from '@mpxjs/core'
+createPage({})
+</script>
+
+<script type="application/json">
+{
+    "usingComponents": {
+        "jmash-update-user": "../../../components/auth-user/jmash-update-user"
+    }
+}
 </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/packages/pages/cms/cms-article.mpx

@@ -1,32 +1,32 @@
-<template>
-    <cms-article siteId="{{ siteId }}" tenant="{{ tenant }}" infoId="{{ infoId }}"></cms-article>
-</template>
-
-<script>
-import { createPage, ref, onLoad } from '@mpxjs/core'
-
-createPage({
-    setup(props) {
-        //console.log("123", props);
-        let siteId = ref(getApp().globalData.config.siteId);
-        let tenant = ref(getApp().globalData.config.tenant);
-        let infoId = ref('');
-        onLoad((options) => {
-            console.log(options);
-            siteId.value = options.siteId || getApp().globalData.config.siteId;
-            infoId.value = options.infoId || '';
-        })
-        return { siteId, tenant, infoId };
-    },
-})
-</script>
-
-<style lang="scss"></style>
-
-<script type="application/json">
-{
-    "usingComponents": {
-        "cms-article": "../../../components/cms/jmash-cms-article.mpx"
-    }
-}
+<template>
+    <cms-article siteId="{{ siteId }}" tenant="{{ tenant }}" infoId="{{ infoId }}"></cms-article>
+</template>
+
+<script>
+import { createPage, ref, onLoad } from '@mpxjs/core'
+
+createPage({
+    setup(props) {
+        //console.log("123", props);
+        let siteId = ref(getApp().globalData.config.siteId);
+        let tenant = ref(getApp().globalData.config.tenant);
+        let infoId = ref('');
+        onLoad((options) => {
+            console.log(options);
+            siteId.value = options.siteId || getApp().globalData.config.siteId;
+            infoId.value = options.infoId || '';
+        })
+        return { siteId, tenant, infoId };
+    },
+})
+</script>
+
+<style lang="scss"></style>
+
+<script type="application/json">
+{
+    "usingComponents": {
+        "cms-article": "../../../components/cms/jmash-cms-article.mpx"
+    }
+}
 </script>