af-mobile-client-vue3 1.6.5 → 1.6.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/components/common/MateChat/composables/useMateChat.ts

@@ -10,6 +10,42 @@ import { showToast } from 'vant'
 import { ref } from 'vue'
 import { chatBiz, chatCompletionsStream, getPaginationRecords } from '../apiService'
 
+/** 空回复兜底文案：归因服务端繁忙 */
+const EMPTY_RESPONSE_MESSAGE = '服务器繁忙，请稍后再试。'
+
+/** 网络/请求异常兜底文案 */
+const CHAT_ERROR_MESSAGE = '抱歉，服务暂时不可用，请稍后再试。'
+
+/**
+ * 判定模型返回内容是否「有效为空」
+ */
+function isEmptyModelResponse(content: string | null | undefined): boolean {
+  const text = (content ?? '').trim()
+  if (!text) {
+    return true
+  }
+
+  try {
+    const parsed = JSON.parse(text) as Record<string, unknown>
+    if (!parsed || typeof parsed !== 'object') {
+      return false
+    }
+
+    const msgType = parsed.msgType
+    if (msgType === 'card' || msgType === 'transfer') {
+      return false
+    }
+    if (msgType === 'options' && Array.isArray(parsed.options) && parsed.options.length > 0) {
+      return false
+    }
+  }
+  catch {
+    // 非 JSON 普通文本，trim 已判定非空
+  }
+
+  return false
+}
+
 /**
  * 生成随机 chatId
  */
@@ -35,6 +71,24 @@ export function useMateChat(config: MateChatConfig) {
   // 使用会话消息缓存
   const { getCachedMessages, setCachedMessages, appendMessages } = useChatMessagesCache()
 
+  /** 请求成功但 content 为空时，统一替换为服务端繁忙提示 */
+  function applyEmptyResponseFallback(
+    loadingIndex: number,
+    userText: string,
+    currentChatId: string,
+  ) {
+    messages.value[loadingIndex] = {
+      from: 'model',
+      content: EMPTY_RESPONSE_MESSAGE,
+      loading: false,
+      typing: false,
+    }
+    appendMessages(currentChatId, [
+      { from: 'user', content: userText },
+      { from: 'model', content: EMPTY_RESPONSE_MESSAGE, loading: false, typing: false },
+    ])
+  }
+
   /**
    * 新建会话：回到起始页并清空历史消息，生成新的 chatId
    * 同时清除历史会话列表缓存，以便下次打开时重新获取
@@ -105,6 +159,9 @@ export function useMateChat(config: MateChatConfig) {
             { from: 'service', content: '您好，客服xxx工号xxx为你服务。功能开发中，敬请期待。' },
           ])
         }
+        else if (isEmptyModelResponse(result.content)) {
+          applyEmptyResponseFallback(loadingMessageIndex, evt, chatId.value)
+        }
         else {
           let typing = true
           try {
@@ -135,13 +192,13 @@ export function useMateChat(config: MateChatConfig) {
         console.error('聊天请求失败:', error)
         messages.value[loadingMessageIndex] = {
           from: 'model',
-          content: '抱歉，服务暂时不可用，请稍后再试。',
+          content: CHAT_ERROR_MESSAGE,
           loading: false,
         }
         // 更新缓存：追加用户消息和错误消息
         appendMessages(chatId.value, [
           { from: 'user', content: evt },
-          { from: 'model', content: '抱歉，服务暂时不可用，请稍后再试。', loading: false },
+          { from: 'model', content: CHAT_ERROR_MESSAGE, loading: false },
         ])
         showToast(error?.message || '请求失败，请稍后再试')
       }
@@ -229,6 +286,11 @@ export function useMateChat(config: MateChatConfig) {
           msg.typing = true
         }
 
+        if (isEmptyModelResponse(msg.content)) {
+          applyEmptyResponseFallback(loadingMessageIndex, evt, chatId.value)
+          return
+        }
+
         // 统一更新缓存
         appendMessages(chatId.value, [
           { from: 'user', content: evt },
@@ -241,12 +303,12 @@ export function useMateChat(config: MateChatConfig) {
         if (!msg) {
           return
         }
-        msg.content = '抱歉，服务暂时不可用，请稍后再试。'
+        msg.content = CHAT_ERROR_MESSAGE
         msg.loading = false
         // 更新缓存：追加用户消息和错误消息
         appendMessages(chatId.value, [
           { from: 'user', content: evt },
-          { from: 'model', content: '抱歉，服务暂时不可用，请稍后再试。', loading: false },
+          { from: 'model', content: CHAT_ERROR_MESSAGE, loading: false },
         ])
         showToast((error as any)?.message || '请求失败，请稍后再试')
       },

package/src/components/data/contract/Signcontract.vue

@@ -0,0 +1,122 @@
+<script setup lang="ts">
+import SignatureComponent from '@af-mobile-client-vue3/components/core/Signature/SignatureComponent.vue'
+import FilePreview from '@af-mobile-client-vue3/components/data/FilePreview/index.vue'
+import { runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { showToast, Button as VanButton, Dialog as VanDialog } from 'vant'
+import { computed, onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+
+/** 生成合同接口返回的 data 结构 */
+interface ContractDetail {
+  f_signature_url?: string
+  f_signature_path?: string
+  f_contract_signature_id?: string
+  f_contract_type?: string
+  f_signature_location?: string
+  [key: string]: unknown
+}
+
+// pdf的路径
+const previewPath = ref('')
+// pdf查看组件引用
+const filePreviewRef = ref()
+// 显示签字弹窗
+const previewVisible = ref(false)
+// 签字组件引用
+const signatureRef = ref<any>()
+// 生成的合同信息
+const contractdetails = ref<ContractDetail>({})
+const id = computed(() => useRoute().query.id?.toString() || '')
+
+function openSign() {
+  previewVisible.value = true
+}
+function onDialogCancel() {
+  previewVisible.value = false
+}
+async function onSignSubmit() {
+  const signData = await Promise.resolve(signatureRef.value?.getSignatureData?.())
+  console.log('signData', signData)
+  const resData = {
+    f_signature_path: contractdetails.value.f_signature_path,
+    f_contract_url: contractdetails.value.f_signature_url,
+    f_contract_signature_id: contractdetails.value.f_contract_signature_id,
+    f_signature_location: contractdetails.value.f_signature_location,
+    f_contract_type: contractdetails.value.f_contract_type,
+    image: signData,
+  }
+  runLogic('contractSignature', resData, 'af-revenue').then(() => {
+    showToast('合同签字成功!')
+    history.back()
+  })
+}
+
+onMounted(() => {
+  runLogic('getNoSignContract', { id: id.value }, 'af-revenue').then((res) => {
+    contractdetails.value = res[0]
+    const path = res[0].f_signature_url
+    filePreviewRef.value.init({ path })
+  })
+})
+</script>
+
+<template>
+  <div class="contract-container">
+    <div>
+      <FilePreview
+        ref="filePreviewRef"
+        :key="`pdf-${previewPath}`"
+        style="height: 95vh"
+      />
+      <div class="bottom-bar">
+        <VanButton type="primary" block @click="openSign">
+          签字提交
+        </VanButton>
+      </div>
+    </div>
+    <VanDialog
+      v-model:show="previewVisible"
+      title="合同信息"
+      show-cancel-button
+      show-confirm-button
+      style="max-width: 90vw; max-height: 40vh;"
+      @confirm="onSignSubmit"
+      @cancel="onDialogCancel"
+    >
+      <SignatureComponent ref="signatureRef" style="padding: 20px;" label="用户签字" :form-readonly="false" />
+    </VanDialog>
+  </div>
+</template>
+
+<style scoped lang="less">
+.contract-container {
+  height: 95vh;
+  display: flex;
+  flex-direction: column;
+}
+
+:deep(.contract-form-group) {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+:deep(.contract-form) {
+  flex: 1;
+  overflow: auto;
+}
+
+.bottom-bar {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: #fff;
+  padding: 8px 12px calc(8px + env(safe-area-inset-bottom));
+  display: grid;
+  gap: 8px;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
+  z-index: 100;
+}
+</style>

package/src/components/data/contract/userinfoContract.vue

@@ -1,39 +1,48 @@
-<script setup lang="ts">
-import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
-import { computed } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-
-const router = useRouter()
-const configName = 'userinfoContractCRUD'
-const serviceName = 'af-system'
-const userId = computed(() => useRoute().query.userId?.toString() || '')
-function addContract() {
-  router.push({
-    name: 'addcontract',
-    query: {
-      userId: userId.value,
-    },
-  })
-}
-function previewContract(res) {
-  router.push({
-    name: 'viewContract',
-    query: {
-      previewPath: res.c_f_signature_url,
-    },
-  })
-}
-</script>
-
-<template>
-  <XCellList
-    :config-name="configName"
-    :service-name="serviceName"
-    :custom-add="true"
-    :fix-query-form="{
-      c_f_userinfo_id: userId,
-    }"
-    @add="addContract"
-    @preview-contract="previewContract"
-  />
-</template>
+<script setup lang="ts">
+import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
+import { computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+const router = useRouter()
+const configName = 'userinfoContractCRUD'
+const serviceName = 'af-system'
+const userId = computed(() => useRoute().query.userId?.toString() || '')
+function addContract() {
+  router.push({
+    name: 'addcontract',
+    query: {
+      userId: userId.value,
+    },
+  })
+}
+function previewContract(res) {
+  router.push({
+    name: 'viewContract',
+    query: {
+      previewPath: res.c_f_signature_url,
+    },
+  })
+}
+function sign(res) {
+  router.push({
+    name: 'signcontract',
+    query: {
+      id: res.c_f_contract_signature_id,
+    },
+  })
+}
+</script>
+
+<template>
+  <XCellList
+    :config-name="configName"
+    :service-name="serviceName"
+    :custom-add="true"
+    :fix-query-form="{
+      c_f_userinfo_id: userId,
+    }"
+    @add="addContract"
+    @preview-contract="previewContract"
+    @sign-contract="sign"
+  />
+</template>