@uxda/appkit 4.2.81 → 4.2.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.2.81",
+  "version": "4.2.83",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",
@@ -20,59 +20,58 @@
   ],
   "author": "",
   "dependencies": {
-    "@babel/runtime": "^7.25.6",
+    "@babel/runtime": "^7.28.4",
     "@nutui/auto-import-resolver": "^1.0.0",
     "@nutui/icons-vue-taro": "^0.0.9",
-    "@nutui/nutui-taro": "^4.3.11",
-    "@tarojs/components": "^4.0.0",
-    "@tarojs/helper": "^4.0.0",
-    "@tarojs/plugin-framework-vue3": "^4.0.0",
-    "@tarojs/plugin-html": "^4.0.0",
-    "@tarojs/plugin-platform-weapp": "^4.0.0",
-    "@tarojs/router": "^4.0.0",
-    "@tarojs/runtime": "^4.0.0",
-    "@tarojs/shared": "^4.0.0",
-    "@tarojs/taro": "^4.0.0",
+    "@nutui/nutui-taro": "^4.3.14",
+    "@tarojs/components": "^4.1.7",
+    "@tarojs/helper": "^4.1.7",
+    "@tarojs/plugin-framework-vue3": "^4.1.7",
+    "@tarojs/plugin-html": "^4.1.7",
+    "@tarojs/plugin-platform-weapp": "^4.1.7",
+    "@tarojs/router": "^4.1.7",
+    "@tarojs/runtime": "^4.1.7",
+    "@tarojs/shared": "^4.1.7",
+    "@tarojs/taro": "^4.1.7",
     "@types/wechat-miniprogram": "^3.4.7",
-    "@uxda/appkit": "^4.2.47",
-    "@uxda/nutshell": "^1.6.50",
-    "dayjs": "^1.11.10",
+    "@uxda/nutshell": "^1.6.86",
+    "dayjs": "^1.11.18",
     "lodash-es": "^4.17.21",
-    "validator": "^13.12.0",
-    "vue": "^3.5.0"
+    "validator": "^13.15.15",
+    "vue": "^3.5.22"
   },
   "devDependencies": {
-    "@babel/core": "^7.8.0",
-    "@tarojs/cli": "^4.0.0",
-    "@tarojs/taro-loader": "^4.0.0",
-    "@tarojs/webpack5-runner": "^4.0.0",
-    "@types/node": "^22.5.0",
+    "@babel/core": "^7.28.4",
+    "@tarojs/cli": "^4.1.7",
+    "@tarojs/taro-loader": "^4.1.7",
+    "@tarojs/webpack5-runner": "^4.1.7",
+    "@types/node": "^24.5.2",
     "@types/webpack-env": "^1.13.6",
-    "@typescript-eslint/eslint-plugin": "^8.2.0",
-    "@typescript-eslint/parser": "^8.2.0",
+    "@typescript-eslint/eslint-plugin": "^8.44.1",
+    "@typescript-eslint/parser": "^8.44.1",
     "@vue/babel-plugin-jsx": "^1.0.6",
-    "@vue/compiler-sfc": "^3.2.40",
+    "@vue/compiler-sfc": "^3.5.22",
     "babel-preset-taro": "^4.0.4",
     "css-loader": "^7.1.2",
     "eslint": "^9.9.0",
     "eslint-config-taro": "^4.0.4",
-    "eslint-plugin-vue": "^9.27.0",
-    "postcss": "^8.4.32",
-    "postcss-import": "^16.1.0",
+    "eslint-plugin-vue": "^10.5.0",
+    "postcss": "^8.5.6",
+    "postcss-import": "^16.1.1",
     "rollup": "^4.6.1",
-    "rollup-plugin-css-only": "^4.5.2",
+    "rollup-plugin-css-only": "^4.5.5",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.0",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-scss": "^4.0.0",
-    "rollup-plugin-visualizer": "^5.12.0",
+    "rollup-plugin-visualizer": "^6.0.3",
     "rollup-plugin-vue": "^6.0.0",
     "style-loader": "^4.0.0",
     "stylelint": "^16.8.2",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.0",
-    "unplugin-auto-import": "^0.18.2",
-    "unplugin-vue-components": "^0.27.3",
+    "unplugin-auto-import": "^20.2.0",
+    "unplugin-vue-components": "^29.1.0",
     "webpack": "^5.78.0"
   },
   "peerDependencies": {

package/src/balance/api/index.ts

@@ -87,11 +87,17 @@ function useHttp() {
     paging: {
       translate: (params: PagingParams) => ({
         pageNum: params.page,
-        pageSize: params.pageSize,
+        pageSize: params.pageSize || 10,
       }),
       transform(data: any): PagingData {
+        const totalRecords = +data.total || 0,
+          pageSize = +data.pageSize || 10,
+          total = data.pages || Math.ceil(totalRecords / pageSize),
+          isLastPage = data.pages === data.pageNum
         return {
-          totalPages: data.pages,
+          total,
+          totalRecords,
+          isLastPage,
         }
       },
     },

package/src/notice/api/endpoints.ts

@@ -1,6 +1,39 @@
 import { HttpEndpoints } from '../../shared/http'
+import dayjs from 'dayjs'
 
-const endpointsList: HttpEndpoints = {}
+// 字段映射表
+const mappings = {}
+
+const endpointsList: HttpEndpoints = {
+  消息列表: {
+    path: '/cas/msg/queryUserMsg',
+    translate: (data: any) => {
+      data.pageNum = data.page || 1
+      return data
+    },
+    transform: (response: any) => {
+      const data = response.list.map((row) => {
+        row['标题'] = row.title == row.context ? '' : row.title
+        row['内容'] = row.context
+        row['时间'] = row.receiveTime && dayjs(row.receiveTime).format('YYYY-MM-DD HH:mm:ss')
+        row['已读'] = row.isRead == '1'
+        row['是公告'] = row.msgType == '3'
+        return row
+      })
+      return data
+    },
+  },
+  全部已读: {
+    path: '/cas/msg/read-all',
+    translate: (data: any) => data,
+    transform: (result: any) => transformRow(result, mappings),
+  },
+  已读: {
+    path: '/cas/msg/read',
+    translate: (data: any) => data,
+    transform: (result: any) => transformRow(result, mappings),
+  },
+}
 
 const endpoints = Object.fromEntries(
   Object.entries(endpointsList).map(([name, def]) => [name, def.path])
@@ -14,4 +47,8 @@ const transforms = Object.fromEntries(
   Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
 )
 
+const transformRow = (row: any, mappings: any) => {
+  return Object.fromEntries(Object.entries(row).map(([k, v]) => [mappings[k] || k, v]))
+}
+
 export { endpoints, translates, transforms }

package/src/notice/api/index.ts

@@ -85,13 +85,22 @@ function useHttp() {
       },
     ],
     paging: {
-      translate: (params: PagingParams) => ({
-        pageNum: params.page,
-        pageSize: params.pageSize,
-      }),
+      translate: (params: PagingParams) => {
+        console.log(params)
+        return {
+          pageNum: params.page,
+          pageSize: params.pageSize || 10,
+        }
+      },
       transform(data: any): PagingData {
+        const totalRecords = +data.total || 0,
+          pageSize = +data.pageSize || 10,
+          total = data.pages || Math.ceil(totalRecords / pageSize),
+          isLastPage = data.pages === data.pageNum
         return {
-          totalPages: data.pages,
+          total,
+          totalRecords,
+          isLastPage,
         }
       },
     },

package/src/notice/components/NoticeList2.vue

@@ -0,0 +1,249 @@
+<template>
+  <ns-page class="news-list">
+    <div class="tabContainer" :class="{ inH5: isWeb() }">
+      <!-- <ns-search
+       v-track-search="{
+          trackInput: false,
+          trackSubmit: true,
+          minLength: 2,
+        }"
+        style="margin: 0 12px"
+        placeholder="请输入关键字搜索"
+        v-model="state.search"
+      ></ns-search> -->
+      <ns-tabs v-model="state.tab" fill="#fff" square size="xl" style="height: 46px" @change="onTabChange">
+        <ns-tabs-item key="全部" tab="全部"></ns-tabs-item>
+        <ns-tabs-item key="业务消息" tab="业务消息"></ns-tabs-item>
+        <ns-tabs-item key="系统公告" tab="系统公告"></ns-tabs-item>
+        <ns-tabs-item key="未读" tab="未读"></ns-tabs-item>
+      </ns-tabs>
+      <div v-if="state.list.length > 0" class="read-all">
+        <div v-track-click="'click'" class="btn" @click="readAll">全部已读</div>
+      </div>
+    </div>
+    <ns-page-content class="mt-68px" scrollable refreshable :refresh-triggered="isRefresh"
+      @pull-down-refresh="onRefresh" @bottom-reached="nextPage">
+      <ns-skeleton :row="8" v-if="显示骨架屏" />
+
+      <template v-else>
+        <ns-repeator v-slot="item" align="stretch" direction="column" :gap="10" :data="state.list"
+          :show-no-more="paging.isLastPage">
+          <ns-card v-track-click="{
+            event: 'click',
+            elementText: '消息详情',
+          }" :r="5" fill="#fff" class="news-item w-full" @click="itemClick(item)">
+            <div v-if="item.标题" :style="{ color: item.已读 ? '#35353599' : '#353535' }" class="news-item-title">
+              <img v-if="item.是公告" class="news-item-title-icon"
+                src="https://cdn.ddjf.com/static/images/loan-manage-app/ic_msg_system_notice.webp" />
+              {{ item.标题 }}
+            </div>
+            <nut-ellipsis :style="{ color: item.已读 ? '#35353566' : '#353535CC' }" class="news-item-content"
+              direction="end" rows="3" expand-text="展开" collapse-text="收起" :content="item.内容"></nut-ellipsis>
+            <div class="news-item-time">{{ item.时间 }}</div>
+          </ns-card>
+        </ns-repeator>
+        <ns-empty v-if="state.list.length == 0" />
+        <div class="safe-area-space"></div>
+      </template>
+    </ns-page-content>
+  </ns-page>
+</template>
+
+<script setup lang="ts">
+import { useDidShow } from '@tarojs/taro'
+import Taro from '@tarojs/taro'
+import { type WithPaging, usePaging } from '@uxda/nutshell/taro'
+import { useHttp, endpoints } from '../api'
+import { reactive, ref } from 'vue'
+import { useAppKitOptions } from '../../Appkit'
+import {
+  NsTabs,
+  NsTabsItem,
+  NsRepeator,
+  NsCard,
+  NsPage,
+  NsPageContent,
+  NsSkeleton,
+  NsEmpty,
+} from "@uxda/nutshell/taro";
+import { isWeb } from '../../utils/utils';
+
+const props = withDefaults(
+  defineProps<{
+    deviceType?: string;
+    userId: string;
+    app: string;
+  }>(),
+  {
+    deviceType: "2",
+    userId: "",
+    app: "",
+  }
+);
+
+const $http = useHttp(),
+  显示骨架屏 = ref(true)
+
+useDidShow(() => {
+  nextPage(1)
+})
+const state = reactive({
+  search: '',
+  tab: '全部',
+  list: [] as any[],
+})
+
+async function load(page: number) {
+  if (!props.app?.replace(',cloudkitPro', '')) {
+    state.list = []
+    return { paging: { page: 1, pageSize: 10, total: 0 }, data: [] }
+  }
+
+  const appkitOptions = useAppKitOptions()
+  const data = {
+    page,
+    pageSize: 10,
+    appCode: props.app,
+    tenantId: appkitOptions.tenant(),
+    userId: props.userId,
+    deviceType: props.deviceType,
+    readOrderStatus: '1',
+  }
+
+  if (state.tab == '业务消息') {
+    data['msgType'] = '1'
+  } else if (state.tab == '系统公告') {
+    data['msgType'] = '3'
+  }
+
+  if (state.tab == '未读') {
+    data['isRead'] = '0'
+  }
+
+  const ep = endpoints['消息列表']
+  return $http.post<WithPaging<any[]>>(ep, data).then((res) => {
+    显示骨架屏.value = false
+    if (page === 1) {
+      state.list = []
+    }
+    state.list = [...state.list, ...res.data]
+    return { paging: res.paging, data: res.data }
+  })
+}
+
+const { paging, nextPage } = usePaging(load)
+
+function onTabChange() {
+  显示骨架屏.value = true
+  nextPage(1)
+}
+
+const isRefresh = ref(false)
+async function onRefresh() {
+  isRefresh.value = true
+  await nextPage(1)
+  isRefresh.value = false
+}
+
+function itemClick(item: any) {
+  read(item)
+
+  emits('itemClick', item)
+}
+
+function read(item: any) {
+  if (item.isRead == '1') return
+  const ep = endpoints['已读']
+  $http.post(ep, [item.id]).then(() => {
+    item['已读'] = true
+  })
+}
+
+async function readAll() {
+  try {
+    Taro.showLoading({
+      title: '请稍后...',
+    })
+
+    const appkitOptions = useAppKitOptions()
+    const ep = endpoints['全部已读']
+    const data = {
+      tenantId: appkitOptions.tenant(),
+      userId: props.userId,
+      deviceType: props.deviceType,
+    }
+    $http.post(ep, data).then(() => {
+      state.list.forEach((item) => {
+        item['已读'] = true
+      })
+    })
+  } finally {
+    Taro.hideLoading()
+  }
+}
+
+const emits = defineEmits(['itemClick'])
+
+defineExpose({
+  readAll,
+})
+</script>
+
+<style lang="scss">
+.news-list {
+  .safe-area-space {
+    padding-bottom: calc(var(--bottom) + 60px);
+    padding-bottom: calc(env(safe-area-inset-bottom) + 60px);
+  }
+
+  .tabContainer {
+    &.inH5 {
+      width: 100%;
+      position: fixed;
+      z-index: 100;
+    }
+
+    .read-all {
+      width: 100%;
+      text-align: end;
+      height: 22px;
+      line-height: 22px;
+      padding: 5px 0;
+      background-color: var(--fill, var(--ns-background));
+
+      .btn {
+        color: #017fff;
+        font-size: 14px;
+        font-weight: 500;
+        margin-right: 16px;
+      }
+    }
+  }
+
+  .news-item {
+    &-title {
+      font-size: 16px;
+      font-weight: 500;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+      &-icon {
+        width: 20px;
+        height: 20px;
+        margin-right: 4px;
+      }
+    }
+
+    &-content {
+      font-size: 14px;
+    }
+
+    &-time {
+      font-size: 13px;
+      color: #35353566;
+      text-align: end;
+    }
+  }
+}
+</style>

package/src/notice/components/index.ts

@@ -1,5 +1,6 @@
 import NoticeBanner from './NoticeBanner.vue'
 import NoticeEntry from './NoticeEntry.vue'
 import NoticeList from './NoticeList.vue'
+import NoticeList2 from './NoticeList2.vue'
 
-export { NoticeBanner, NoticeEntry, NoticeList }
+export { NoticeBanner, NoticeEntry, NoticeList, NoticeList2 }

package/src/shared/composables/useUpload.ts

@@ -26,11 +26,9 @@ type UploadFunction = (url: string, file: Media) => Promise<Media>
 
 export const useUpload = (config: UploadConfig) => {
   const appkitOptions = useAppKitOptions()
-  console.log('===config', config)
 
   const upload: UploadFunction = (url: string, file: Media) => {
     return new Promise<Media>((resolve, reject) => {
-      console.log(file, '----file')
       uploadFile({
         url: config.baseUrl + url,
         filePath: file.path!,
@@ -44,7 +42,6 @@ export const useUpload = (config: UploadConfig) => {
         },
         success: (rsp: any) => {
           const { data } = rsp
-          console.log('===data', data)
           try {
             const response = JSON.parse(data)
             console.log('===response', response)

package/src/shared/http/Http.ts

@@ -10,6 +10,7 @@ import {
   HttpTranslate,
   RequestHeaders,
 } from './types'
+
 /**
  * Useage:
  * const $http = createHttp({
@@ -29,13 +30,17 @@ const request: HttpInstance['request'] = <T>(config: HttpRequestConfig) => {
   const c = {
     ...clientConfig,
     ...config,
+    headers: {
+      ...clientConfig?.headers,
+      ...config?.headers,
+    },
   }
   return new Promise<T>((resolve, reject) => {
     const data =
       config.data && clientConfig.translates && clientConfig.translates[c.url]
         ? (clientConfig.translates[c.url] as HttpTranslate)(c.data || {})
         : c.data
-    console.log(`[][][][][]HTTP.${c.method}, ${c.baseUrl}${c.url}`, data)
+    // console.log(`[][][][][]HTTP.${c.method}, ${c.baseUrl}${c.url}`, data)
 
     clientConfig.vendor &&
       clientConfig.vendor
@@ -71,10 +76,11 @@ const request: HttpInstance['request'] = <T>(config: HttpRequestConfig) => {
               config.data && config.data.page
                 ? (clientConfig.paging as Paging).transform(raw.data)
                 : void 0
+
             resolve(
               paging
                 ? ({
-                    ...paging,
+                    paging,
                     data: response,
                   } as T)
                 : response

package/src/shared/http/types.ts

@@ -139,7 +139,10 @@ export type PagingData = {
   /**
    * 页总数
    */
-  totalPages: number
+  totalPages?: number
+  total: number
+  totalRecords: number
+  isLastPage?: boolean
 }
 
 /**

package/src/shared/weixin/jssdk.ts

@@ -67,7 +67,6 @@ function requestWxH5Pay(options: PrePayOptions) {
           timeStamp: options.timeStamp,
         },
         function (res) {
-          console.log(res, '-------res')
           if (res.err_msg == 'get_brand_wcpay_request:ok') {
             //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠，商户需进一步调用后端查单确认支付结果。
             resolve(true)

package/src/user/api/index.ts

@@ -92,11 +92,17 @@ function useHttp() {
     paging: {
       translate: (params: PagingParams) => ({
         pageNum: params.page,
-        pageSize: params.pageSize,
+        pageSize: params.pageSize || 10,
       }),
       transform(data: any): PagingData {
+        const totalRecords = +data.total || 0,
+          pageSize = +data.pageSize || 10,
+          total = data.pages || Math.ceil(totalRecords / pageSize),
+          isLastPage = data.pages === data.pageNum
         return {
-          totalPages: data.pages,
+          total,
+          totalRecords,
+          isLastPage,
         }
       },
     },

package/src/user/components/UserBinding.vue

@@ -86,7 +86,6 @@ function onAuth() {
 
   // 向当前用户的手机中发送短信验证码
   $http.post('/cas/sysAccount/verify', { verifyCode: authState.code }).then((res) => {
-    console.log(res, 'res')
     if (typeof res !== 'boolean') return
 
     showToast({ title: '身份认证成功', icon: 'success' })

package/src/user/components/UserFeedback.vue

@@ -112,7 +112,6 @@ function toUpload() {
     mediaType: ['mix'],
     maxDuration: 60,
     success: async (res) => {
-      console.log(res.tempFiles, 'res.tempFiles')
       for (const item of res.tempFiles) {
         if (item.fileType === 'video') {
           if (item.size > 1024 * 1024 * 50) {

package/types/global.d.ts

@@ -1,15 +1,15 @@
 /// <reference types="@tarojs/taro" />
 
-declare module '*.png';
-declare module '*.gif';
-declare module '*.jpg';
-declare module '*.jpeg';
-declare module '*.svg';
-declare module '*.css';
-declare module '*.less';
-declare module '*.scss';
-declare module '*.sass';
-declare module '*.styl';
+declare module '*.png'
+declare module '*.gif'
+declare module '*.jpg'
+declare module '*.jpeg'
+declare module '*.svg'
+declare module '*.css'
+declare module '*.less'
+declare module '*.scss'
+declare module '*.sass'
+declare module '*.styl'
 
 declare namespace NodeJS {
   interface ProcessEnv {
@@ -19,4 +19,4 @@ declare namespace NodeJS {
 
 declare module '@tarojs/components' {
   export * from '@tarojs/components/types/index.vue3'
-}
+}