jmash-core-mp 0.1.26 → 0.1.28

package/package.json

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

package/src/app.mpx

@@ -1,12 +1,12 @@
 <script lang="ts">
 import mpx, { createApp } from '@mpxjs/core';
-//api代理
+// api代理
 import apiProxy from '@mpxjs/api-proxy';
 mpx.use(apiProxy, { usePromise: true })
-//状态管理
+// 状态管理
 import { createPinia } from '@mpxjs/pinia';
 createPinia();
-//网络请求和App配置
+// 网络请求和App配置
 import { mpxFetch, config, initConfig } from "./index";
 mpx.use(mpxFetch);
 
@@ -58,14 +58,3 @@ createApp({
     }
   }
 </script>
-
-<!--也可以通过以下形式用js输出json，便于书写注释和使用条件编译-->
-
-<!--<script name="json">-->
-<!--  // 可以写注释，通过defs注入的常量做一些判断之类的操作-->
-<!--  module.exports = {-->
-<!--    pages: [-->
-<!--      './pages/index'-->
-<!--    ]-->
-<!--  }-->
-<!--</script>-->

package/src/components/auth-user/jmash-logout.mpx

@@ -33,7 +33,8 @@ createComponent({
         content: '确定要退出登录吗？',
         success: (res) => {
           if (res.confirm) {
-            this.userStore.logout() // 调用退出接口
+            // 调用退出接口
+            this.userStore.logout()
             mpx.showToast({ title: '已退出登录', icon: 'success' })
             // 通知父组件退出成功
             this.triggerEvent('logoutSuccess');
@@ -50,7 +51,8 @@ $primary: #07c160;
 $text-3: #999999;
 
 .logout-section {
-  padding: 40rpx 16rpx 80rpx; // 底部留空适配tabbar
+  // 底部留空适配tabbar
+  padding: 40rpx 16rpx 80rpx;
   display: flex;
   flex-direction: column;
   align-items: center;

package/src/components/auth-user/jmash-user.mpx

@@ -8,9 +8,6 @@
             wx:if="{{ userInfo.avatar }}" mode="aspectFill"></image>
           <image src="{{ defaultAvatar }}" class="avatar-img" wx:elif="{{ defaultAvatar }}" mode="aspectFill"></image>
           <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img" wx:else mode="aspectFill"></image>
-          <!-- <view class="avatar-badge">
-            <text class="badge-icon">✎</text>
-          </view> -->
         </view>
 
         <!-- 用户信息 -->
@@ -22,13 +19,8 @@
             </view>
           </view>
           <text class="user-mobile" style="color: {{ userMobileColor }}">{{ userInfo.mobilePhoneIns || '未绑定手机号'
-            }}</text>
+          }}</text>
         </view>
-
-        <!-- 右侧箭头 -->
-        <!-- <view class="right-arrow" bind:tap="handleUpdateUser">
-          <text class="arrow-icon">›</text>
-        </view> -->
       </view>
     </block>
 
@@ -36,7 +28,6 @@
     <view class="auth-user-l not-logged-in" wx:else>
       <view class="not-logged-wrapper">
         <view class="avatar-wrapper" bind:tap="handleLogin">
-          <!--  <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img not-logged" mode="aspectFill"></image> -->
           <image src="{{ defaultAvatar }}" class="avatar-img not-logged" wx:if="{{ defaultAvatar }}" mode="aspectFill">
           </image>
           <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img not-logged" wx:else mode="aspectFill">
@@ -66,7 +57,7 @@ createComponent({
   properties: {
     defaultAvatar: {
       type: String,
-      value: ''
+      value: getApp().globalData.config.resourceUrl + "/images/mall/tswk.png"
     },
     backurl: {
       type: String,
@@ -100,16 +91,15 @@ createComponent({
       }
     };
     onShow(refreshFunc);
-    //console.log(resourceUrl);
     const isLogin = computed(() => userStore.accessToken !== '');
     return { resourceUrl, baseUrl, userInfo, userStore, refreshFunc, isLogin };
   },
   methods: {
     handleLogin() {
       console.log("handleLogin");
-      //检查登录并跳转登录
+      // 检查登录并跳转登录
       this.userStore.loginOnlyAC().then(() => {
-        //登录成功，加载业务
+        // 登录成功，加载业务
         console.log("静默登录成功");
         this.refreshFunc();
       }).catch(() => {
@@ -146,10 +136,8 @@ $bg-card: #ffffff;
   display: flex;
   align-items: center;
   padding: 32rpx 24rpx 32rpx 0;
-  // background: linear-gradient(135deg, #ffffff 0%, #fafafa 100%);
   border-radius: 20rpx;
   margin: 16rpx 16rpx 24rpx 0;
-  // box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
   transition: all 0.3s;
   background: transparent;
 
@@ -174,11 +162,8 @@ $bg-card: #ffffff;
         width: 130rpx;
         height: 130rpx;
         border-radius: 50%;
-        // background-color: $bg-page;
         display: block;
         transition: all 0.3s;
-        // border: 3rpx solid rgba(7, 193, 96, 0.1);
-        // box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.1);
 
         &:active {
           transform: scale(1.05);
@@ -190,26 +175,6 @@ $bg-card: #ffffff;
           box-shadow: none;
         }
       }
-
-      .avatar-badge {
-        position: absolute;
-        right: -2rpx;
-        bottom: -2rpx;
-        width: 36rpx;
-        height: 36rpx;
-        background: $primary;
-        border-radius: 50%;
-        border: 2rpx solid $bg-card;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        box-shadow: 0 2rpx 6rpx rgba(7, 193, 96, 0.3);
-
-        .badge-icon {
-          font-size: 16rpx;
-          color: #fff;
-        }
-      }
     }
   }
 
@@ -254,22 +219,6 @@ $bg-card: #ffffff;
     }
   }
 
-  .right-arrow {
-    flex-shrink: 0;
-    width: 32rpx;
-    height: 32rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .arrow-icon {
-      font-size: 66rpx;
-      color: $text-3;
-      font-weight: 300;
-      line-height: 1;
-    }
-  }
-
   // 未登录状态
   .not-logged-in {
     .not-logged-wrapper {

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

@@ -62,7 +62,7 @@ createComponent({
             type: String,
             value: ""
         },
-        //refreshKey
+        // refreshKey
         refreshKey: {
             type: Number,
             value: 0

package/src/components/cms/jmash-cms-like.mpx

@@ -70,7 +70,7 @@ createComponent({
                 isLikeStatus.value = response.data === 'true';
             });
         }
-        //监听
+        // 监听
         const { interactId } = toRefs(props)
         watch(interactId, (newVal) => {
             queryInteractData(props.organTenant, newVal);

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",
         },
@@ -65,7 +65,7 @@ createComponent({
             type: String,
             value: ""
         },
-        //refreshKey
+        // refreshKey
         refreshKey: {
             type: Number,
             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)
         // 资源路径
@@ -105,6 +105,7 @@ createComponent({
                     } else {
                         articleList.value = [...articleList.value, ...(res.data.results || [])];
                     }
+                    totalSize.value = res.data.totalSize as number;
                 }
             }).finally(() => {
                 loading.value = false
@@ -113,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);
@@ -123,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: {
         // 点击详情事件
@@ -159,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

@@ -55,7 +55,7 @@ createComponent({
             type: String,
             value: ""
         },
-        //refreshKey
+        // refreshKey
         refreshKey: {
             type: Number,
             value: 0

package/src/components/common/jmash-avatar-edit.mpx

@@ -23,7 +23,7 @@ createComponent({
                 this.avatar = this.value ? fileApi.imageUrl(this.value, 320, 320, "trans") : this.avatar;
             }
         },
-        // logo图片路径-全路径 编辑回显使用
+        // 图片logo路径-全路径 编辑回显使用
         logoImg: {
             type: String,
             value: "",

package/src/components/common/jmash-popup.mpx

@@ -53,6 +53,11 @@ createComponent({
         borderRadius: {
             type: String,
             value: "50rpx"
+        },
+        // 层级
+        zIndex: {
+            type: Number,
+            value: 999999
         }
     },
     setup() {

package/src/components/common/jmash-tab-bar.mpx

@@ -24,7 +24,6 @@ createComponent({
     },
     methods: {
         clickHandler(tab) {
-            // console.log('tab was clicked', tab)
             const target = this.tabs.find(item => item.value === tab.detail.value)
             if (target) {
                 mpx.switchTab({
@@ -33,7 +32,6 @@ createComponent({
             }
         },
         activeTab(value) {
-            // console.log('activeTab set value:', value)
             this.selectedLabelDefault = value;
         }
     }
@@ -42,9 +40,7 @@ createComponent({
 <script type="application/json">
 {
     "usingComponents": {
-        "cube-tab-bar": "@mpxjs/mpx-cube-ui/lib/components/tab-bar/index.mpx",
-        //   "cube-tab": "@mpxjs/mpx-cube-ui/lib/components/tab-bar/tab.mpx",
-        //  "cube-icon": "@mpxjs/mpx-cube-ui/lib/components/icon/index.mpx"
+        "cube-tab-bar": "@mpxjs/mpx-cube-ui/lib/components/tab-bar/index.mpx"
     }
 }
 </script>

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/components/core/jmash-login.mpx

@@ -62,8 +62,7 @@ createComponent({
       type: String,
       value: "color: #0551ff",
     },
-
-    //登录后跳转页面
+    // 登录后跳转页面
     backurl: {
       type: String,
       value: "/pages/home",
@@ -73,7 +72,7 @@ createComponent({
       type: String,
       value: "redirectTo",
     },
-    //遮罩层效果
+    // 遮罩层效果
     isShowModel: {
       type: Boolean,
       value: false,

package/src/components/core/jmash-login.web.mpx

@@ -71,8 +71,7 @@ createComponent({
       type: String,
       value: "color: #0551ff",
     },
-
-    //登录后跳转页面
+    // 登录后跳转页面
     backurl: {
       type: String,
       value: "/pages/home",
@@ -82,7 +81,7 @@ createComponent({
       type: String,
       value: "redirectTo",
     },
-    //遮罩层效果
+    // 遮罩层效果
     isShowModel: {
       type: Boolean,
       value: false,

package/src/components/core/jmash-popup-login.ali.mpx

@@ -172,7 +172,8 @@ createComponent({
 </script>
 
 <style lang="scss">
-$primary: #1677ff; // 支付宝主题色
+// 支付宝主题色
+$primary: #1677ff;
 $primary-dark: #0958d9;
 $text-1: #111111;
 $text-2: #555555;

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

@@ -1,24 +1,26 @@
 <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>
 import { createPage, ref, onLoad } from '@mpxjs/core'
 
 createPage({
-    setup(props) {
-        //console.log("123", props);
+    setup() {
         let config = getApp().globalData.config;
         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-article.mpx

@@ -6,8 +6,7 @@
 import { createPage, ref, onLoad } from '@mpxjs/core'
 
 createPage({
-    setup(props) {
-        //console.log("123", props);
+    setup() {
         let config = getApp().globalData.config;
         let tenant = ref(config.siteTenant);
         let siteId = ref(config.siteId);

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

@@ -1,10 +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 }}" />
 
@@ -71,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-location.mpx

@@ -6,8 +6,7 @@
 import { createPage, ref, onLoad } from '@mpxjs/core'
 
 createPage({
-    setup(props) {
-        //console.log("123", props);
+    setup() {
         let config = getApp().globalData.config;
         let tenant = ref(config.siteTenant);
         let siteId = ref(config.siteId);

package/src/pages/half-home.mpx

@@ -15,9 +15,9 @@ createPage({
   setup() {
     let isLoginPopup = ref(false);
     let userStore = useUserStore();
-    //检查登录并跳转登录
+    // 检查登录并跳转登录
     userStore.loginOnlyAC().then(() => {
-      //登录成功，加载业务
+      // 登录成功，加载业务
       console.log("静默登录成功");
     }).catch(() => {
       isLoginPopup.value = true;

package/src/pages/home.mpx

@@ -16,11 +16,11 @@ createPage({
   setup() {
     let config = getApp().globalData.config;
     let userStore = useUserStore();
-    //强制登录.
+    // 强制登录
     onShow(() => {
-      //检查登录并跳转登录
+      // 检查登录并跳转登录
       userStore.loginOnlyAC().then(() => {
-        //登录成功，加载业务
+        // 登录成功，加载业务
         console.log("静默登录成功");
       }).catch(() => {
         mpx.navigateTo({

package/src/pages/home2.mpx

@@ -14,9 +14,9 @@ createPage({
   setup() {
     let config = getApp().globalData.config;
     let userStore = useUserStore();
-    //强制登录.
+    // 强制登录
     onShow(() => {
-      //检查登录并跳转登录
+      // 检查登录并跳转登录
       userStore.loginAC("/pages/home2", false).then((res) => {
         console.log(res);
       });

package/src/store/user.ts

@@ -154,7 +154,6 @@ export const useUserStore = defineStore("user", {
     },
     // 登录处理
     loginProcess(resp: ResponseData<LoginRes>): LoginRes {
-      //console.log("miniappLogin", resp);
       if (resp.statusCode === 200 && resp.data.status === true) {
         console.log("login success");
         this.loginSuccess(resp.data.token);

package/src/utils/common.ts

@@ -164,7 +164,6 @@ export const validateRequired = (
   value: string | number,
   message: string
 ): boolean => {
-  console.log(value, message);
   const valueStr = typeof value === "number" ? String(value) : value;
   if (!valueStr || valueStr.trim() === "") {
     // 显示错误提示

package/src/utils/request.ts

@@ -18,7 +18,6 @@ mpx.xfetch.interceptors.request.use(function (config) {
     const appconfig = getApp().globalData.config;
     config.url = appconfig.baseUrl + config.url;
   }
-  //console.log("request:", config);
   // Grpc Gateway 清理默认值,Enum,时间等不能空;
   grpc.clearEmpty(config.params);
   grpc.clearEmpty(config.data);
@@ -52,7 +51,6 @@ mpx.xfetch.interceptors.request.use(function (config) {
     } else {
       delete config.header["Grpc-Metadata-Tenant"];
     }
-    //console.log("header:", config.header);
   } else if (!db.getRefreshToken()) {
     console.log("not token request. ");
     return config;
@@ -96,7 +94,6 @@ mpx.xfetch.interceptors.request.use(function (config) {
 });
 
 mpx.xfetch.interceptors.response.use(function (res) {
-  // console.log(“response:”，res);
   if (res.statusCode === 200) {
     return res;
   } else if (res.statusCode === 401) {

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 {};