jmash-core-mp 0.1.21 → 0.1.22

package/src/pages/home.mpx

@@ -1,53 +1,53 @@
-<template>
-  <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>
-
-<script>
-import mpx, { createPage, onShow, ref } from '@mpxjs/core'
-import { useUserStore } from '../store/user'
-
-createPage({
-  setup() {
-    let config = getApp().globalData.config;
-    let userStore = useUserStore();
-    //强制登录.
-    onShow(() => {
-      //检查登录并跳转登录
-      userStore.loginOnlyAC().then(() => {
-        //登录成功，加载业务
-        console.log("静默登录成功");
-      }).catch(() => {
-        mpx.navigateTo({
-          url: '/jmash/pages/auth/login'
-        })
-      });
-    });
-    let siteId = ref(config.siteId);
-    let channelAlias = ref("gzdt");
-    return { siteId, channelAlias }
-  }
-})
-</script>
-
-<style lang="scss">
-.home-page {
-  padding: 40rpx;
-  text-align: center;
-  font-size: 32rpx;
-  color: #333;
-}
-</style>
-
-<script type="application/json">
-{
-  "usingComponents": {
-    "cms-acticle-list": "../components/cms/jmash-cms-acticle-list",
-    "cms-article-view": "../components/cms/jmash-cms-article-view"
-  }
-}
+<template>
+  <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>
+
+<script>
+import mpx, { createPage, onShow, ref } from '@mpxjs/core'
+import { useUserStore } from '../store/user'
+
+createPage({
+  setup() {
+    let config = getApp().globalData.config;
+    let userStore = useUserStore();
+    //强制登录.
+    onShow(() => {
+      //检查登录并跳转登录
+      userStore.loginOnlyAC().then(() => {
+        //登录成功，加载业务
+        console.log("静默登录成功");
+      }).catch(() => {
+        mpx.navigateTo({
+          url: '/jmash/pages/auth/login'
+        })
+      });
+    });
+    let siteId = ref(config.siteId);
+    let channelAlias = ref("gzdt");
+    return { siteId, channelAlias }
+  }
+})
+</script>
+
+<style lang="scss">
+.home-page {
+  padding: 40rpx;
+  text-align: center;
+  font-size: 32rpx;
+  color: #333;
+}
+</style>
+
+<script type="application/json">
+{
+  "usingComponents": {
+    "cms-acticle-list": "../components/cms/jmash-cms-acticle-list",
+    "cms-article-view": "../components/cms/jmash-cms-article-view"
+  }
+}
 </script>

package/src/pages/home2.mpx

@@ -1,48 +1,48 @@
-<template>
-  <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>
-
-<script>
-import { createPage, onShow, ref } from '@mpxjs/core'
-import { useUserStore } from '../store/user'
-
-createPage({
-  setup() {
-    let config = getApp().globalData.config;
-    let userStore = useUserStore();
-    //强制登录.
-    onShow(() => {
-      //检查登录并跳转登录
-      userStore.loginAC("/pages/home2", false).then((res) => {
-        console.log(res);
-      });
-    });
-    let siteId = ref(config.siteId);
-    let channelAlias = ref("gzdt");
-    return { siteId, channelAlias }
-  }
-})
-</script>
-
-<style lang="scss">
-.home-page {
-  padding: 40rpx;
-  text-align: center;
-  font-size: 32rpx;
-  color: #333;
-}
-</style>
-
-<script type="application/json">
-{
-  "usingComponents": {
-    "cms-acticle-list": "../components/cms/jmash-cms-acticle-list",
-    "cms-article-view": "../components/cms/jmash-cms-article-view"
-  }
-}
+<template>
+  <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>
+
+<script>
+import { createPage, onShow, ref } from '@mpxjs/core'
+import { useUserStore } from '../store/user'
+
+createPage({
+  setup() {
+    let config = getApp().globalData.config;
+    let userStore = useUserStore();
+    //强制登录.
+    onShow(() => {
+      //检查登录并跳转登录
+      userStore.loginAC("/pages/home2", false).then((res) => {
+        console.log(res);
+      });
+    });
+    let siteId = ref(config.siteId);
+    let channelAlias = ref("gzdt");
+    return { siteId, channelAlias }
+  }
+})
+</script>
+
+<style lang="scss">
+.home-page {
+  padding: 40rpx;
+  text-align: center;
+  font-size: 32rpx;
+  color: #333;
+}
+</style>
+
+<script type="application/json">
+{
+  "usingComponents": {
+    "cms-acticle-list": "../components/cms/jmash-cms-acticle-list",
+    "cms-article-view": "../components/cms/jmash-cms-article-view"
+  }
+}
 </script>

package/src/pages/index.mpx

@@ -1,15 +1,19 @@
 <template>
   <view class="page-body">
     <button type="default" bind:tap="toHomePage">Welcome to Jmash Core MP</button>
+    <!-- 测试图片上传 -->
+    <jmash-upload-picture limit="6" bind:getImageArray="handleImageArray" />
+    <view wx:if="{{ imageArray.length }}">已上传 {{ imageArray.length }} 张图片</view>
   </view>
 </template>
 
 <script>
-import mpx, { createPage } from '@mpxjs/core'
+import mpx, { createPage, ref } from '@mpxjs/core'
 
 createPage({
   setup(props, context) {
-    return {};
+    const imageArray = ref([]);
+    return { imageArray };
   },
   methods: {
     toHomePage() {
@@ -17,6 +21,10 @@ createPage({
         url: '/pages/tabbar/home'
       })
     },
+    handleImageArray(e) {
+      this.imageArray = e.detail;
+      console.log('上传的图片:', e.detail);
+    },
   }
 })
 </script>
@@ -39,6 +47,8 @@ createPage({
 
 <script type="application/json">
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "jmash-upload-picture": "../components/common/jmash-upload-picture"
+  }
 }
 </script>

package/src/pages/tabbar/home.mpx

@@ -1,78 +1,78 @@
-<template>
-  <view class="page-body">
-    <button type="default" bind:tap="toHomePage">主页（全屏登录检查）</button>
-    <button type="default" bind:tap="toHome2Page">主页（全屏登录）</button>
-    <button type="default" bind:tap="toHalfHomePage">主页（半屏登录）</button>
-    <button type="default" bind:tap="toCompTestPage">组件演示</button>
-    <button type="default" bind:tap="loginOut">退出</button>
-  </view>
-</template>
-
-<script>
-import mpx, { createPage } from '@mpxjs/core'
-import { useUserStore } from '../../store/user';
-
-createPage({
-  data: {
-    userStore: null,
-  },
-  onShow() {
-    this.userStore = useUserStore();
-    if (typeof this.getTabBar === 'function' &&
-      this.getTabBar()) {
-      this.getTabBar().$refs.tabBar.activeTab("Home");
-    }
-  },
-  methods: {
-    toHomePage() {
-      mpx.navigateTo({
-        url: '/pages/home'
-      })
-    },
-    toHome2Page() {
-      mpx.navigateTo({
-        url: '/pages/home2'
-      })
-    },
-    toHalfHomePage() {
-      mpx.navigateTo({
-        url: '/pages/half-home'
-      })
-    },
-    toCompTestPage() {
-      mpx.navigateTo({
-        url: '/pages/basic-component'
-      })
-    },
-    loginOut() {
-      this.userStore.logout();
-      mpx.showToast({
-        title: '已退出登录',
-        icon: 'success'
-      })
-    }
-  }
-})
-</script>
-
-<style lang="scss">
-.page-body {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 40rpx;
-  gap: 30rpx;
-
-  button {
-    width: 80%;
-    height: 80rpx;
-    font-size: 32rpx;
-  }
-}
-</style>
-
-<script type="application/json">
-{
-  "usingComponents": {}
-}
+<template>
+  <view class="page-body">
+    <button type="default" bind:tap="toHomePage">主页（全屏登录检查）</button>
+    <button type="default" bind:tap="toHome2Page">主页（全屏登录）</button>
+    <button type="default" bind:tap="toHalfHomePage">主页（半屏登录）</button>
+    <button type="default" bind:tap="toCompTestPage">组件演示</button>
+    <button type="default" bind:tap="loginOut">退出</button>
+  </view>
+</template>
+
+<script>
+import mpx, { createPage } from '@mpxjs/core'
+import { useUserStore } from '../../store/user';
+
+createPage({
+  data: {
+    userStore: null,
+  },
+  onShow() {
+    this.userStore = useUserStore();
+    if (typeof this.getTabBar === 'function' &&
+      this.getTabBar()) {
+      this.getTabBar().$refs.tabBar.activeTab("Home");
+    }
+  },
+  methods: {
+    toHomePage() {
+      mpx.navigateTo({
+        url: '/pages/home'
+      })
+    },
+    toHome2Page() {
+      mpx.navigateTo({
+        url: '/pages/home2'
+      })
+    },
+    toHalfHomePage() {
+      mpx.navigateTo({
+        url: '/pages/half-home'
+      })
+    },
+    toCompTestPage() {
+      mpx.navigateTo({
+        url: '/pages/basic-component'
+      })
+    },
+    loginOut() {
+      this.userStore.logout();
+      mpx.showToast({
+        title: '已退出登录',
+        icon: 'success'
+      })
+    }
+  }
+})
+</script>
+
+<style lang="scss">
+.page-body {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 40rpx;
+  gap: 30rpx;
+
+  button {
+    width: 80%;
+    height: 80rpx;
+    font-size: 32rpx;
+  }
+}
+</style>
+
+<script type="application/json">
+{
+  "usingComponents": {}
+}
 </script>

package/src/pages/tabbar/my.mpx

@@ -1,80 +1,80 @@
-<template>
-  <view class="my-page">
-    <!-- 用户信息区（已集成） -->
-    <jmash-user tabbar="true" backurl="/pages/tabbar/my"></jmash-user>
-
-    <!-- 功能菜单区（抽离为组件） -->
-    <jmash-menu menuGroups="{{ menuGroups }}" bind:itemClick="handleMenuClick"></jmash-menu>
-    <!-- 底部退出组件 -->
-    <jmash-logout version="1.0.0" bind:logoutSuccess="onLogoutSuccess"></jmash-logout>
-  </view>
-</template>
-
-<script>
-import { createPage } from '@mpxjs/core'
-import mpx from '@mpxjs/core'
-
-createPage({
-  data: {
-    title: 'MY',
-    // 菜单配置，新增功能直接加配置即可
-    menuGroups: [
-      {
-        id: 1,
-        items: [
-          { key: 'order', title: '我的订单', icon: '📋', iconBg: '#409eff', path: '/pages/my/order' },
-          { key: 'coupon', title: '我的优惠券', icon: '🎫', iconBg: '#f56c6c', path: '/pages/my/coupon', badge: '3' },
-          { key: 'address', title: '我的地址', icon: '📍', iconBg: '#67c23a', path: '/pages/my/address' },
-        ]
-      },
-      {
-        id: 2,
-        items: [
-          { key: 'favorite', title: '我的收藏', icon: '⭐', iconBg: '#e6a23c', path: '/pages/my/favorite' },
-          { key: 'help', title: '帮助与反馈', icon: '💡', iconBg: '#909399', path: '/pages/my/help' },
-          { key: 'setting', title: '设置', icon: '⚙️', iconBg: '#722ed1', path: '/pages/my/setting' },
-        ]
-      }
-    ]
-  },
-  onShow() {
-    // 选中tabbar
-    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
-      this.getTabBar().$refs.tabBar.activeTab("My");
-    }
-  },
-  methods: {
-    // 菜单点击（接收组件抛出的事件）
-    handleMenuClick(e) {
-      const { item } = e.detail
-      if (item.path) {
-        mpx.navigateTo({ url: item.path })
-      }
-    },
-    // 退出成功回调（可选，根据业务需要添加逻辑）
-    onLogoutSuccess() {
-      console.log('退出登录成功，可在此处做后续处理')
-      // 比如重置页面数据、刷新状态等
-    }
-  }
-})
-</script>
-
-<style lang="scss">
-$bg-page: #f5f5f5;
-
-.my-page {
-  min-height: 100vh;
-  background-color: $bg-page;
-}
-</style>
-
-<script type="application/json">
-{
-  "usingComponents": {
-    "jmash-user": "../../components/auth-user/jmash-user.mpx",
-    "jmash-menu": "../../components/common/jmash-menu.mpx",
-    "jmash-logout": "../../components/auth-user/jmash-logout.mpx"
-  }
-}
-</script>
+<template>
+  <view class="my-page">
+    <!-- 用户信息区（已集成） -->
+    <jmash-user tabbar="true" backurl="/pages/tabbar/my"></jmash-user>
+
+    <!-- 功能菜单区（抽离为组件） -->
+    <jmash-menu menuGroups="{{ menuGroups }}" bind:itemClick="handleMenuClick"></jmash-menu>
+    <!-- 底部退出组件 -->
+    <jmash-logout version="1.0.0" bind:logoutSuccess="onLogoutSuccess"></jmash-logout>
+  </view>
+</template>
+
+<script>
+import { createPage } from '@mpxjs/core'
+import mpx from '@mpxjs/core'
+
+createPage({
+  data: {
+    title: 'MY',
+    // 菜单配置，新增功能直接加配置即可
+    menuGroups: [
+      {
+        id: 1,
+        items: [
+          { key: 'order', title: '我的订单', icon: '📋', iconBg: '#409eff', path: '/pages/my/order' },
+          { key: 'coupon', title: '我的优惠券', icon: '🎫', iconBg: '#f56c6c', path: '/pages/my/coupon', badge: '3' },
+          { key: 'address', title: '我的地址', icon: '📍', iconBg: '#67c23a', path: '/pages/my/address' },
+        ]
+      },
+      {
+        id: 2,
+        items: [
+          { key: 'favorite', title: '我的收藏', icon: '⭐', iconBg: '#e6a23c', path: '/pages/my/favorite' },
+          { key: 'help', title: '帮助与反馈', icon: '💡', iconBg: '#909399', path: '/pages/my/help' },
+          { key: 'setting', title: '设置', icon: '⚙️', iconBg: '#722ed1', path: '/pages/my/setting' },
+        ]
+      }
+    ]
+  },
+  onShow() {
+    // 选中tabbar
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().$refs.tabBar.activeTab("My");
+    }
+  },
+  methods: {
+    // 菜单点击（接收组件抛出的事件）
+    handleMenuClick(e) {
+      const { item } = e.detail
+      if (item.path) {
+        mpx.navigateTo({ url: item.path })
+      }
+    },
+    // 退出成功回调（可选，根据业务需要添加逻辑）
+    onLogoutSuccess() {
+      console.log('退出登录成功，可在此处做后续处理')
+      // 比如重置页面数据、刷新状态等
+    }
+  }
+})
+</script>
+
+<style lang="scss">
+$bg-page: #f5f5f5;
+
+.my-page {
+  min-height: 100vh;
+  background-color: $bg-page;
+}
+</style>
+
+<script type="application/json">
+{
+  "usingComponents": {
+    "jmash-user": "../../components/auth-user/jmash-user.mpx",
+    "jmash-menu": "../../components/common/jmash-menu.mpx",
+    "jmash-logout": "../../components/auth-user/jmash-logout.mpx"
+  }
+}
+</script>