Merge branch 'beta' into 'master'

Beta See merge request !115

Merge branch 'beta' into 'master'
Beta See merge request !115
7e941450 · nick zheng · 561a4e8b · 6f07ed6f · 7e941450 · 7e941450
Commit 7e941450 authored Dec 17, 2024 by nick zheng
8 changed files
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
  <head>
    <meta charset="UTF-8" />
    <link rel="icon" href="/favicon.ico" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"

--- a/src/components/message-tip-modal/message-tip-modal.vue
+++ b/src/components/message-tip-modal/message-tip-modal.vue
@@ -12,6 +12,8 @@ const isShowModal = ref(false)
 const modalOptions = reactive({
  title: t('common_module.tip'),
  content: '',
+  cancelText: t('common_module.cancel_btn_text'),
+  confirmText: t('common_module.confirm_btn_text'),
 })

 let _modalStatusResolve = (_value?: any) => {}
@@ -33,9 +35,11 @@ function handleConfirm() {
  _modalStatusResolve(true)
 }

-function handleShowModal(content: string, title?: string) {
+function handleShowModal(content: string, title?: string, cancelText?: string, confirmText?: string) {
  modalOptions.content = content
  title && (modalOptions.title = title)
+  cancelText && (modalOptions.cancelText = cancelText)
+  confirmText && (modalOptions.confirmText = confirmText)

  isShowModal.value = true

@@ -63,11 +67,11 @@ function handleShowModal(content: string, title?: string) {

      <div class="mt-[50px] text-end">
        <n-button color="#F5F5F5" round class="!px-[34px] !py-[10px] !text-[14px] !text-[#333]" @click="handleCancel">
-          {{ t('common_module.cancel_btn_text') }}
+          {{ modalOptions.cancelText || t('common_module.cancel_btn_text') }}
        </n-button>

        <n-button color="#6F77FF" round class="!ml-[12px] !px-[34px] !py-[10px] !text-[14px]" @click="handleConfirm">
-          {{ t('common_module.confirm_btn_text') }}
+          {{ modalOptions.confirmText || t('common_module.confirm_btn_text') }}
        </n-button>
      </div>
    </div>

--- a/src/locales/langs/en.yaml
+++ b/src/locales/langs/en.yaml
@@ -126,6 +126,7 @@ common_module:
  unlimited_duration: 'Unlimited duration'
  buy_now: 'Buy now'
  payment_success: 'Payment success'
+  back: 'Back'

  dialogue_module:
    continue_question_message: 'You can keep asking questions'
@@ -557,6 +558,7 @@ equity_module:
  point_recharge: 'Point recharge'
  get_points_for_interacting_with_the_ai: 'Get {points} points for interacting with the AI'
  no_time_limit_when_used_up: 'No time limit, when used up'
+  agents_created_exceeds_tip: 'The number of agents created exceeds the current package benefits, please upgrade the package'

 order_manage_module:
  package_name: 'PackageName'

--- a/src/locales/langs/zh-cn.yaml
+++ b/src/locales/langs/zh-cn.yaml
@@ -125,6 +125,7 @@ common_module:
  unlimited_duration: '无期限'
  buy_now: '立即购买'
  payment_success: '支付成功'
+  back: '返回'

  dialogue_module:
    continue_question_message: '你可以继续提问'
@@ -555,6 +556,7 @@ equity_module:
  point_recharge: '积分充值'
  get_points_for_interacting_with_the_ai: '获得{points}积分，用于和AI互动行动'
  no_time_limit_when_used_up: '无期限，用完即止'
+  agents_created_exceeds_tip: '创建应用数量超出当前套餐权益，请升级套餐'

 order_manage_module:
  package_name: '套餐名称'

--- a/src/locales/langs/zh-hk.yaml
+++ b/src/locales/langs/zh-hk.yaml
@@ -125,6 +125,7 @@ common_module:
  unlimited_duration: '無期限'
  buy_now: '立即購買'
  payment_success: '支付成功'
+  back: '返回'

  dialogue_module:
    continue_question_message: '你可以繼續提問'
@@ -555,6 +556,7 @@ equity_module:
  point_recharge: '积分充值'
  get_points_for_interacting_with_the_ai: '獲得{points}積分，用於和AI互動行動'
  no_time_limit_when_used_up: '無期限，用完即止'
+  agents_created_exceeds_tip: '創建應用數量超出當前套餐權益，請升級套餐'

 order_manage_module:
  package_name: '套餐名稱'

--- a/src/views/personal-space/personal-app-setting/components/agent-config/agent-setting/agent-setting.vue
+++ b/src/views/personal-space/personal-app-setting/components/agent-config/agent-setting/agent-setting.vue
@@ -4,6 +4,7 @@ import { FormInst, InputInst } from 'naive-ui'
 import { useI18n } from 'vue-i18n'
 import { Emitter } from 'mitt'
 import { storeToRefs } from 'pinia'
+import { useRouter } from 'vue-router'
 import { useThrottleFn } from '@vueuse/core'
 import CustomIcon from '@/components/custom-icon/custom-icon.vue'
 import { Help, People, RightOne } from '@icon-park/vue-next'
@@ -11,6 +12,7 @@ import UploadImage from '@/components/upload-image/upload-image.vue'
 import AutoConfigModal from './components/auto-config-modal.vue'
 import OptimizeSystemModal from './components/optimize-system-modal.vue'
 import { usePersonalAppConfigStore } from '@/store/modules/personal-app-config'
+import { useUserStore } from '@/store/modules/user'
 import { PersonalAppConfigState } from '@/store/types/personal-app-config'
 import {
  fetchCreateAgentAvatar,
@@ -28,7 +30,10 @@ import AgentRoleSetting from './components/agent-role-setting.vue'

 const { t } = useI18n()

+const router = useRouter()
+
 const personalAppConfigStore = usePersonalAppConfigStore()
+const userStore = useUserStore()

 const { baseInfo, commConfig, commModelConfig, knowledgeConfig } = storeToRefs(personalAppConfigStore)

@@ -130,6 +135,21 @@ async function handleCreatePersonalAgent() {
    return
  }

+  await handleGetEquityInfo()
+
+  if (userStore.equityInfo.usedAgentCount >= userStore.equityInfo.maxAgentCount) {
+    window.$message
+      .ctWarning(t('equity_module.agents_created_exceeds_tip'), '', t('common_module.back'))
+      .then(() => {
+        router.replace({ name: 'Equity' })
+      })
+      .catch(() => {
+        router.back()
+      })
+    handleStopGenerate()
+    return
+  }
+
  const res = await fetchSaveAgentApplication<PersonalAppConfigState>(personalAppConfigStore.$state)

  if (res.code === 0) {
@@ -342,6 +362,17 @@ function handleStopGenerate() {
  generateAgentSystemController?.abort()
  isFullScreenLoading.value = false
 }
+
+async function handleGetEquityInfo() {
+  if (!userStore.isLogin) {
+    router.push({
+      name: 'Login',
+      query: { redirect: encodeURIComponent(router.currentRoute.value.fullPath) },
+    })
+  }
+
+  await userStore.fetchUpdateEquityInfo()
+}
 </script>

 <template>

--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -3,7 +3,7 @@ declare interface Window {
  $loadingBar: import('naive-ui').LoadingBarProviderInst
  $dialog: import('naive-ui').DialogProviderInst
  $message: import('naive-ui').MessageProviderInst & {
-    ctWarning: (message: string, title?: string) => Promise<boolean | Error>
+    ctWarning: (message: string, title?: string, cancelText?: string, confirmText?: string) => Promise<boolean | Error>
  }
  $notification: import('naive-ui').NotificationProviderInst
 }

--- a/types/locales.d.ts
+++ b/types/locales.d.ts
@@ -125,6 +125,7 @@ declare namespace I18n {
      support: string
      buy_now: string
      payment_success: string
+      back: string

      dialogue_module: {
        continue_question_message: string
@@ -571,6 +572,7 @@ declare namespace I18n {
      point_recharge: string
      get_points_for_interacting_with_the_ai: string
      no_time_limit_when_used_up: string
+      agents_created_exceeds_tip: string
    }

    order_manage_module: {