@uxda/appkit 4.2.83 → 4.2.85

package/src/notice/components/NoticePopup.vue

@@ -1,163 +1,163 @@
-<template>
-  <nut-popup pop-class="notice-popup" :close-on-click-overlay="false" v-model:visible="showPopup" round>
-    <div class="notice-popup-hd">
-      <img class="notice-popup-hd-icon" src="https://cdn.ddjf.com/static/images/customer-center/system-notice-1.png"
-        alt="" />系统公告
-    </div>
-    <div class="notice-popup-bd">
-      <div style="white-space: pre-wrap">{{ message.context.replace('【系统公告】 ', '') }}</div>
-      <div v-if="message.jumpUrl || message.link" class="notice-popup-bd-link" @click="toViewAttachment">
-        点击查看附件
-      </div>
-    </div>
-    <div class="notice-popup-ft">
-      <div class="notice-popup-ft-btn" @click="onClose">我知道了</div>
-    </div>
-  </nut-popup>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, ref } from 'vue'
-import { useHttp } from '../api'
-
-const props = withDefaults(
-  defineProps<{
-    message: any
-    device?: string
-  }>(),
-  {
-    message: {},
-    device: 'MINI',
-  }
-)
-
-const showPopup = ref(true)
-
-onMounted(() => { })
-
-// 关闭
-function onCancel() {
-  showPopup.value = false
-
-  emits('close')
-}
-
-// 查看附件
-function toViewAttachment() {
-  onClose()
-
-  emits('view', props.message.jumpUrl || props.message.link)
-}
-
-// 关闭弹框
-async function onClose() {
-  const $http = useHttp()
-
-  $http
-    .post('/cas/msg/setMsgStatus', {
-      device: props.device || 'MINI',
-      noticeStatus: 0,
-      receiveId: props.message.id,
-    })
-    .then(() => {
-      // if (props.message.isRead === 0) {
-      //   toReadFun([props.message.id])
-      // }
-      onCancel()
-    })
-}
-
-const emits = defineEmits(['close', 'view'])
-</script>
-
-<style lang="scss">
-.notice-popup {
-  width: 280px;
-  padding: 20px 15px;
-  border-radius: 10px !important;
-  background: linear-gradient(136.72deg, #d0fdfe 6.02%, #a2b9ff 59.97%, #6593ff 108.78%);
-
-  &::after {
-    content: '';
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    left: 0;
-    top: 0;
-    background: linear-gradient(360deg, #ffffff 4.73%, rgba(255, 255, 255, 0) 85.82%);
-    z-index: 1;
-    border-radius: 10px;
-  }
-
-  &::before {
-    content: '';
-    width: 236px;
-    height: 241px;
-    position: absolute;
-    top: 0;
-    right: 40px;
-    background: url('https://cdn.ddjf.com/static/images/customer-center/notice-modal-bg.png');
-  }
-
-  .nutui-popup__content-wrapper {
-    position: relative;
-    z-index: 2;
-  }
-
-  &-hd {
-    color: #0a2668;
-    font-size: 17px;
-    display: flex;
-    align-items: center;
-    margin-bottom: 20px;
-    font-weight: 600;
-
-    &-icon {
-      width: 20px;
-      height: 20px;
-      margin-right: 4px;
-    }
-  }
-
-  &-bd {
-    position: relative;
-    z-index: 10;
-    color: #353535;
-    box-shadow: 0px 2px 8px 0px #ffffff33 inset, 0px 1px 1px 0px #ffffff80 inset,
-      0px 0px 1px 0px #ffffffb2;
-    border-radius: 3px;
-    background: rgba(255, 255, 255, 0.6);
-    min-height: 160px;
-    margin-bottom: 20px;
-    padding: 15px 10px;
-    box-sizing: border-box;
-    font-size: 10px;
-
-    &-link {
-      color: #007fff;
-      margin-top: 2px;
-      font-weight: 600;
-    }
-  }
-
-  &-ft {
-    position: relative;
-    z-index: 10;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    &-btn {
-      background: #007fff;
-      color: #fff;
-      width: 128px;
-      height: 30px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 15px;
-      z-index: 10;
-    }
-  }
-}
-</style>
+<template>
+  <nut-popup pop-class="notice-popup" :close-on-click-overlay="false" v-model:visible="showPopup" round>
+    <div class="notice-popup-hd">
+      <img class="notice-popup-hd-icon" src="https://cdn.ddjf.com/static/images/customer-center/system-notice-1.png"
+        alt="" />系统公告
+    </div>
+    <div class="notice-popup-bd">
+      <div style="white-space: pre-wrap">{{ message.context.replace('【系统公告】 ', '') }}</div>
+      <div v-if="message.jumpUrl || message.link" class="notice-popup-bd-link" @click="toViewAttachment">
+        点击查看附件
+      </div>
+    </div>
+    <div class="notice-popup-ft">
+      <div class="notice-popup-ft-btn" @click="onClose">我知道了</div>
+    </div>
+  </nut-popup>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue'
+import { useHttp } from '../api'
+
+const props = withDefaults(
+  defineProps<{
+    message: any
+    device?: string
+  }>(),
+  {
+    message: {},
+    device: 'MINI',
+  }
+)
+
+const showPopup = ref(true)
+
+onMounted(() => { })
+
+// 关闭
+function onCancel() {
+  showPopup.value = false
+
+  emits('close')
+}
+
+// 查看附件
+function toViewAttachment() {
+  onClose()
+
+  emits('view', props.message.jumpUrl || props.message.link)
+}
+
+// 关闭弹框
+async function onClose() {
+  const $http = useHttp()
+
+  $http
+    .post('/cas/msg/setMsgStatus', {
+      device: props.device || 'MINI',
+      noticeStatus: 0,
+      receiveId: props.message.id,
+    })
+    .then(() => {
+      // if (props.message.isRead === 0) {
+      //   toReadFun([props.message.id])
+      // }
+      onCancel()
+    })
+}
+
+const emits = defineEmits(['close', 'view'])
+</script>
+
+<style lang="scss">
+.notice-popup {
+  width: 280px;
+  padding: 20px 15px;
+  border-radius: 10px !important;
+  background: linear-gradient(136.72deg, #d0fdfe 6.02%, #a2b9ff 59.97%, #6593ff 108.78%);
+
+  &::after {
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    background: linear-gradient(360deg, #ffffff 4.73%, rgba(255, 255, 255, 0) 85.82%);
+    z-index: 1;
+    border-radius: 10px;
+  }
+
+  &::before {
+    content: '';
+    width: 236px;
+    height: 241px;
+    position: absolute;
+    top: 0;
+    right: 40px;
+    background: url('https://cdn.ddjf.com/static/images/customer-center/notice-modal-bg.png');
+  }
+
+  .nutui-popup__content-wrapper {
+    position: relative;
+    z-index: 2;
+  }
+
+  &-hd {
+    color: #0a2668;
+    font-size: 17px;
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+    font-weight: 600;
+
+    &-icon {
+      width: 20px;
+      height: 20px;
+      margin-right: 4px;
+    }
+  }
+
+  &-bd {
+    position: relative;
+    z-index: 10;
+    color: #353535;
+    box-shadow: 0px 2px 8px 0px #ffffff33 inset, 0px 1px 1px 0px #ffffff80 inset,
+      0px 0px 1px 0px #ffffffb2;
+    border-radius: 3px;
+    background: rgba(255, 255, 255, 0.6);
+    min-height: 160px;
+    margin-bottom: 20px;
+    padding: 15px 10px;
+    box-sizing: border-box;
+    font-size: 10px;
+
+    &-link {
+      color: #007fff;
+      margin-top: 2px;
+      font-weight: 600;
+    }
+  }
+
+  &-ft {
+    position: relative;
+    z-index: 10;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    &-btn {
+      background: #007fff;
+      color: #fff;
+      width: 128px;
+      height: 30px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 15px;
+      z-index: 10;
+    }
+  }
+}
+</style>

package/src/notice/components/index.ts

@@ -1,6 +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, NoticeList2 }
+import NoticeBanner from './NoticeBanner.vue'
+import NoticeEntry from './NoticeEntry.vue'
+import NoticeList from './NoticeList.vue'
+import NoticeList2 from './NoticeList2.vue'
+
+export { NoticeBanner, NoticeEntry, NoticeList, NoticeList2 }

package/src/notice/components/useCommonList.ts

@@ -1,86 +1,86 @@
-import Taro, { showLoading, hideLoading } 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>,
-  loading = 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 &&
-      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 && 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(loading)
-    list.value = data || []
-    firstLoading.value = false
-  }
-
-  return {
-    total,
-    isLast,
-    firstLoading,
-    list,
-    init,
-    runNext,
-    runRefresh,
-  }
-}
+import Taro, { showLoading, hideLoading } 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>,
+  loading = 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 &&
+      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 && 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(loading)
+    list.value = data || []
+    firstLoading.value = false
+  }
+
+  return {
+    total,
+    isLast,
+    firstLoading,
+    list,
+    init,
+    runNext,
+    runRefresh,
+  }
+}

package/src/notice/components/useNotice.ts

@@ -1,35 +1,35 @@
-import { useHttp } from '../api'
-
-export function useNotice() {
-  // 点击消息时
-  async function noticeClick(item: any, cb?: Function) {
-    if (item.isRead === 0) {
-      await toReadFun([item.id || item.msgId])
-    }
-    if (item.link) {
-      cb && cb(item.link)
-    }
-    return true
-  }
-
-  // 请求-标记消息已读
-  async function toReadFun(msgIds: number[]) {
-    const $http = useHttp()
-
-    return new Promise<boolean>((resolve) => {
-      $http
-        .post('/cas/msg/read', msgIds)
-        .then(() => {
-          resolve(true)
-        })
-        .catch(() => {
-          resolve(false)
-        })
-    })
-  }
-
-  return {
-    noticeClick,
-    toReadFun,
-  }
-}
+import { useHttp } from '../api'
+
+export function useNotice() {
+  // 点击消息时
+  async function noticeClick(item: any, cb?: Function) {
+    if (item.isRead === 0) {
+      await toReadFun([item.id || item.msgId])
+    }
+    if (item.link) {
+      cb && cb(item.link)
+    }
+    return true
+  }
+
+  // 请求-标记消息已读
+  async function toReadFun(msgIds: number[]) {
+    const $http = useHttp()
+
+    return new Promise<boolean>((resolve) => {
+      $http
+        .post('/cas/msg/read', msgIds)
+        .then(() => {
+          resolve(true)
+        })
+        .catch(() => {
+          resolve(false)
+        })
+    })
+  }
+
+  return {
+    noticeClick,
+    toReadFun,
+  }
+}

package/src/notice/index.ts

@@ -1 +1 @@
-export * from './components'
+export * from './components'

package/src/notice/types.ts

@@ -1,25 +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
-}
+// 消息
+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/payment/api/config.ts

@@ -1,8 +1,8 @@
-import type { HttpClientConfig } from '../../shared/http'
-
-const clientConfig: HttpClientConfig = {
-  baseUrl: 'http://ytech.dev.ddjf.info',
-
-}
-
+import type { HttpClientConfig } from '../../shared/http'
+
+const clientConfig: HttpClientConfig = {
+  baseUrl: 'http://ytech.dev.ddjf.info',
+
+}
+
 export default clientConfig