@uxda/appkit 1.2.63 → 1.2.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "1.2.63",
+  "version": "1.2.65",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/components/dd-search/index.vue

@@ -113,13 +113,13 @@ const isFoucs = ref(props.focus)
     left: 40px;
     background: transparent;
     .dd-search__form {
-      background: $bg-default;
+      background: #f1f3f5;
       border-color: transparent;
     }
   }
   &.focus {
     .dd-search__form {
-      border-color: $primary-color;
+      border-color: #017fff;
     }
   }
   &__placeholder {
@@ -129,7 +129,6 @@ const isFoucs = ref(props.focus)
     flex: 1;
     box-sizing: border-box;
     height: 36px;
-    //border: 1px solid rgba(180, 180, 180, 0.2);
     border-radius: 5px;
     display: flex;
     align-items: center;
@@ -144,7 +143,7 @@ const isFoucs = ref(props.focus)
     width: 100%;
     box-sizing: border-box;
     padding: 0 10px;
-    caret-color: var(--second-color);
+    caret-color: #017fff;
   }
   &__prefix,
   &__suffix {
@@ -155,15 +154,12 @@ const isFoucs = ref(props.focus)
     height: 33px;
     line-height: 33px;
     padding: 0 10px;
-    font-size: var(--primary-size);
-    color: var(--second-color);
+    font-size: 16px;
+    color: #017fff;
   }
   &.disabled &__suffix {
     display: none;
   }
-  //&.disabled &__btn {
-  //  display: none;
-  //}
   &.disabled &__control {
     flex: 1;
     width: fit-content;

package/src/notice/components/NoticeBanner.vue

@@ -19,7 +19,7 @@
         src="https://cdn.ddjf.com/static/images/customer-center/notice-icon.png"
         alt=""
       />
-      <div class="notice-banner-text" style="white-space: pre-wrap">
+      <div class="notice-banner-text">
         {{ item.context }}
       </div>
       <div class="notice-banner-btn" @click="onDetail(item)">详情</div>
@@ -150,7 +150,7 @@ const onClose = debounce((item: any, index: number) => {
       })
       bannerMessages.value.splice(index, 1)
 
-      // startMessageCarousel()
+      startMessageCarousel()
 
       // if (item.isRead === 0) {
       //   toReadFun([item.id])

package/src/notice/components/NoticeEntry.vue

@@ -0,0 +1,93 @@
+<template>
+  <div class="notice-entry">
+    <img
+      class="notice-entry-img"
+      src="https://cdn.ddjf.com/static/images/loan-manage/notice-icon.png"
+      alt=""
+    />
+    <span>通知</span>
+    <div v-if="noticeShow" class="notice-entry-icon"></div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue'
+import { useHttp } from '../api'
+import { useAppKitOptions } from '../../Appkit'
+import Taro from '@tarojs/taro'
+
+const props = withDefaults(
+  defineProps<{
+    app: string
+    userId: string
+  }>(),
+  {
+    app: '',
+    userId: '',
+  }
+)
+
+onMounted(() => {
+  if (!props.app) {
+    return Taro.showToast({
+      title: 'NoticeEntry组件缺少appcode',
+      icon: 'none',
+    })
+  }
+  getNotice()
+})
+
+// 通知红点
+const noticeShow = ref(false)
+async function getNotice() {
+  const appkitOptions = useAppKitOptions()
+  const $http = useHttp()
+
+  $http
+    .get('/cas/msg/count-unread', {
+      deviceType: 2,
+      appCode: props.app,
+      tenantId: appkitOptions.tenant(),
+      userId: props.userId,
+    })
+    .then((result: any) => {
+      if (result.status === 200) {
+        noticeShow.value = result.data > 0
+      }
+    })
+}
+</script>
+
+<style lang="scss">
+.notice-entry {
+  position: fixed;
+  right: 43px;
+  top: 21px;
+  min-width: 66px;
+  padding: 0 12px 0 15px;
+  text-align: center;
+  box-sizing: border-box;
+  height: 25px;
+  line-height: 11px;
+  color: #855f0b;
+  font-size: 13px;
+  background: #ffdf68;
+  border-radius: 50px 0 0 50px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  &-img {
+    width: 20px;
+    height: 20px;
+  }
+  &-icon {
+    position: absolute;
+    background-color: red;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    top: 1px;
+    left: 27px;
+  }
+}
+</style>

package/src/notice/components/NoticeList.vue

@@ -0,0 +1,278 @@
+<template>
+  <div class="notice-list">
+    <DdSearch
+      :bordered="false"
+      :focus="false"
+      :value="query.title"
+      placeholder="请输入客户姓名搜索"
+      @search="onSearch"
+    />
+
+    <div style="flex: 1; overflow: hidden">
+      <div class="wrapper" v-if="list.length">
+        <scroll-view
+          class="content"
+          :scroll-y="true"
+          :refresher-enabled="true"
+          :refresherTriggered="isRefresh"
+          @refresherrefresh="onRefresh"
+          :lower-threshold="100"
+          @scrolltolower="runNext"
+          bindscroll=""
+        >
+          <div
+            class="card"
+            :class="{ active: item.isRead != '1' }"
+            v-for="(item, index) in list"
+            :key="index"
+            @click="notifyRead(item, index)"
+          >
+            <div class="point"></div>
+            <div>
+              <div class="time">
+                {{ formatMinutes(item.receiveTime) }}
+              </div>
+              <div class="text tit" :class="{ gray: item.isRead == '1' }">
+                {{ item.title }}
+              </div>
+              <div class="text" :class="{ gray: item.isRead == '1' }">
+                <rich-text style="white-space: pre-wrap" :nodes="item.context"></rich-text>
+                <span
+                  v-if="item.link && item.msgType == 3"
+                  class="account-news-file"
+                  @click="onNoticeView(item.link)"
+                >
+                  查看附件
+                </span>
+              </div>
+            </div>
+          </div>
+          <div v-if="isLast" class="cue-text" style="padding-bottom: 40px">没有更多了</div>
+        </scroll-view>
+      </div>
+      <div v-else class="no-data">
+        <div class="no-data-img">
+          <img
+            style="width: 100%; height: 100%"
+            src="https://cdn.ddjf.com/static/images/loan-manage/no-data.png"
+            alt=""
+          />
+        </div>
+        <div class="text">暂无记录</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue'
+import Taro from '@tarojs/taro'
+import DdSearch from '../../components/dd-search/index.vue'
+import dayjs from 'dayjs'
+import { useNotice } from './useNotice'
+import { useCommonList } from './useCommonList'
+import { NoticeListQueryTypes, NoticeListTypes } from '../types'
+import { useAppKitOptions } from '../../Appkit'
+
+const props = withDefaults(
+  defineProps<{
+    app: string
+    userId: string
+  }>(),
+  {
+    app: '',
+    userId: '',
+  }
+)
+
+const query = ref<any>({
+  pageNum: 1,
+  pageSize: 15,
+  title: '',
+  deviceType: 2,
+})
+
+const { toReadFun } = useNotice()
+const { list, init, runNext, runRefresh, isLast } = useCommonList<
+  NoticeListTypes,
+  NoticeListQueryTypes
+>('/cas/msg/queryUserMsg', query, true, 'POST')
+
+onMounted(async () => {
+  if (!props.app) {
+    return Taro.showToast({
+      title: 'NoticeList组件缺少appcode',
+      icon: 'none',
+    })
+  }
+
+  const appkitOptions = useAppKitOptions()
+  query.value.appCode = props.app
+  query.value.tenantId = appkitOptions.tenant()
+  query.value.userId = props.userId
+  await init()
+})
+
+// 格式化时间
+function formatMinutes(time: number) {
+  if (!time) return ''
+  const start = dayjs(time)
+  const end = dayjs()
+
+  // 使用diff方法计算差异，单位为分钟
+  const diffInMinutes = end.diff(start, 'minute')
+  if (diffInMinutes < 60 && 0 > diffInMinutes) {
+    return `${diffInMinutes}分钟前`
+  }
+
+  return dayjs(time).format('YYYY-MM-DD HH:mm:ss')
+}
+
+// 消息读取
+async function notifyRead(notice: any, index) {
+  if (notice.isRead == '0') {
+    const res = await toReadFun([notice.id])
+
+    if (res) {
+      list.value[index].isRead = '1'
+    }
+  }
+}
+
+// 点击搜索
+function onSearch(key: string) {
+  delete query.value.title
+  query.value.content = key || ''
+  init()
+}
+
+// 下拉刷新
+const isRefresh = ref(false)
+async function onRefresh() {
+  isRefresh.value = true
+  await runRefresh()
+  isRefresh.value = false
+}
+
+// 查看附件
+function onNoticeView(link) {
+  emits('view', link)
+}
+
+// 父组件事件
+const emits = defineEmits(['view'])
+</script>
+
+<style lang="scss">
+.notice-list {
+  height: 100vh;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  .wrapper {
+    height: 100%;
+    padding: 10px 12px;
+    box-sizing: border-box;
+    .content {
+      height: 100%;
+      background: #ffffff;
+      border-radius: 10px;
+      .card {
+        margin: 0 10px;
+        min-height: 64px;
+        background: #fff;
+        position: relative;
+        padding: 10px;
+        &::before {
+          content: '';
+          position: absolute;
+          left: 2px;
+          top: 0;
+          height: 18px;
+          width: 1px;
+          background: #d8d8d8;
+        }
+        &::after {
+          content: '';
+          position: absolute;
+          left: 2px;
+          top: 18px;
+          bottom: 0;
+          width: 1px;
+          background: #d8d8d8;
+        }
+        &:first-child::before {
+          display: none;
+        }
+        &:last-child::after {
+          display: none;
+        }
+        .point {
+          width: 5px;
+          height: 5px;
+          background-color: #d8d8d8;
+          border-radius: 50%;
+          position: absolute;
+          left: 0;
+          top: 18px;
+          z-index: 9;
+        }
+        .time {
+          font-size: 13px;
+          color: #353535;
+          line-height: 19px;
+          opacity: 0.2;
+          margin-bottom: 5px;
+        }
+        .text {
+          font-size: 14px;
+          line-height: 20px;
+          color: #9fa0a1;
+        }
+        &.active {
+          .point {
+            background-color: #f43309;
+          }
+          .text {
+            color: #171a1d;
+            font-size: 13px;
+            &.tit {
+              font-size: 15px;
+              margin-bottom: 4px;
+            }
+          }
+        }
+      }
+    }
+  }
+  .no-data {
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    height: 100%;
+    .text {
+      height: 20px;
+      font-size: 14px;
+      color: #7e7e7e;
+      line-height: 20px;
+    }
+    &-img {
+      width: 238px;
+      height: 157px;
+      margin-top: 105px;
+      margin-bottom: 19px;
+    }
+  }
+  &-file {
+    font-size: 12px;
+    color: #017fff;
+  }
+  .cue-text {
+    font-size: 13px;
+    color: rgba(60, 60, 60, 0.5);
+    padding: 30px 0 calc(30px + env(safe-area-inset-bottom, 0px));
+    text-align: center;
+  }
+}
+</style>

package/src/notice/components/index.ts

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

package/src/notice/components/useCommonList.ts

@@ -0,0 +1,86 @@
+import Taro from '@tarojs/taro'
+import { Ref, ref, unref } from 'vue'
+import { useHttp } from '../api'
+
+interface ListResponseType<T> {
+  total: number
+  pageNum: number
+  pageSize: number
+  list: Array<T>
+  [prop: string]: unknown
+}
+interface QueryLimit {
+  pageNum: number
+  pageSize: number
+}
+
+export function useCommonList<R, Q extends QueryLimit>(
+  api: string,
+  query: Ref<Q>,
+  showLoading = true,
+  method = 'GET'
+) {
+  const isLast = ref(false)
+  const list = ref<R[]>([]) as Ref<R[]>
+  const firstLoading = ref(true) // 是否第一次加载
+  const total = ref(0)
+  const isLoading = ref(false)
+
+  async function fetchData(loading) {
+    loading &&
+      Taro.showLoading({
+        title: '加载中...',
+      })
+    isLoading.value = true
+
+    const $http = useHttp()
+    const res = await $http[method === 'GET' ? 'get' : 'post']<ListResponseType<R>>(api, {
+      ...unref(query),
+    })
+
+    isLoading.value = false
+    loading && Taro.hideLoading()
+    if (res) {
+      const pages = Math.ceil(res.total / res.pageSize)
+      isLast.value = res.pageNum >= pages
+      total.value = res.total
+    }
+
+    return res?.list || []
+  }
+  async function runNext() {
+    if (isLast.value) return
+    if (isLoading.value) return
+    query.value.pageNum += 1
+    const data = await fetchData(true)
+    list.value.push(...data)
+  }
+  async function runRefresh() {
+    query.value.pageNum = 1
+    isLast.value = false
+    const data = await fetchData(true)
+    if (data.length === 0) {
+      list.value = []
+    } else {
+      list.value = data // 直接替换，避免白屏
+    }
+  }
+
+  async function init(pageNum?: number) {
+    query.value.pageNum = pageNum || 1
+    isLast.value = false
+    const data = await fetchData(showLoading)
+    list.value = data || []
+    firstLoading.value = false
+  }
+
+  return {
+    total,
+    isLast,
+    firstLoading,
+    list,
+    init,
+    runNext,
+    runRefresh,
+  }
+}

package/src/notice/types.ts

@@ -0,0 +1,25 @@
+// 消息
+export interface NoticeListQueryTypes {
+  pageNum: number
+  pageSize: number
+  searchStr: string
+}
+
+// 消息内容
+export interface Notice {
+  applyNo: string // 消息关联订单编号	string
+  customerId: string // 消息关联客户编号	string
+  id: number // id	integer(int64)
+  isRead: string //	是否已读(0:未读;1:已读)	string
+  msg: string //	消息内容	string
+  msgType: string //	消息主体类型(order:订单;customer:客户)	string
+  sendTime: string //	消息发送时间
+  [props: string]: any
+}
+
+// 消息列表
+export interface NoticeListTypes {
+  list: Notice[]
+  total: number | string
+  [props: string]: any
+}

package/src/shared/components/DeviceVersion.vue

@@ -28,7 +28,7 @@ async function getPropertieByCode() {
   if (recommendVersions.value) return
 
   const $http = useHttp()
-  await $http
+  $http
     .get('/cas/properties/getPropertie', {
       code: 'pcRecommendVersion',
     })