Merge branch 'master' of https://gitlab.gsstcloud.com/poc/poc-fe into beta

src/locales/langs/en.yaml

@@ -127,6 +127,7 @@ common_module:
   buy_now: 'Buy now'
   payment_success: 'Payment success'
   back: 'Back'
+  time: 'Time(s)'
 
   dialogue_module:
     continue_question_message: 'You can keep asking questions'

src/locales/langs/zh-cn.yaml

@@ -126,6 +126,7 @@ common_module:
   buy_now: '立即购买'
   payment_success: '支付成功'
   back: '返回'
+  time: '次'
 
   dialogue_module:
     continue_question_message: '你可以继续提问'

src/locales/langs/zh-hk.yaml

@@ -126,6 +126,7 @@ common_module:
   buy_now: '立即購買'
   payment_success: '支付成功'
   back: '返回'
+  time: '次'
 
   dialogue_module:
     continue_question_message: '你可以繼續提問'

src/views/equity/equity.vue

@@ -20,6 +20,11 @@ const equityInfo = computed(() => {
   return userStore.equityInfo
 })
 
+/* created */
+;(function () {
+  userStore.fetchUpdateEquityInfo()
+})()
+
 function handlePointRecharge() {
   currentSelectVersion.value = null
 

src/views/home/components/footer-operation.vue

@@ -6,6 +6,7 @@ import { nanoid } from 'nanoid'
 import fetchEventStreamSource from '../utils/fetch-event-stream-source'
 import { throttle } from 'lodash-es'
 import { useI18n } from 'vue-i18n'
+import { useUserStore } from '@/store/modules/user'
 
 interface Props {
   currentSessionId: string
@@ -32,6 +33,7 @@ const currentFetchEventSourceController = defineModel<AbortController | null>('c
 const { t } = useI18n()
 
 const inputFileRef = useTemplateRef<HTMLInputElement | null>('inputFileRef')
+const userStore = useUserStore()
 
 let fileUploadController = shallowRef<AbortController | null>(null)
 
@@ -189,6 +191,8 @@ function questionSubmit() {
 
         nextTick(() => {
           emit('historyRecordListUpdate')
+
+          userStore.fetchUpdateEquityInfo()
         })
       },
       onerror: (err) => {
@@ -339,7 +343,7 @@ defineExpose({
         <Transition name="application-select-menu">
           <ul
             v-show="isShowApplicationSelectMenu"
-            class="absolute -top-[10px] left-1/2 w-[200px] -translate-x-1/2 -translate-y-full rounded-[6px] bg-[#fff] p-[10px] pb-[4px] pr-0 shadow-md"
+            class="absolute -top-[10px] left-0 w-[240px] -translate-y-full rounded-[6px] bg-[#fff] p-[10px] pb-[4px] pr-0 shadow-md"
           >
             <n-virtual-list
               style="max-height: 200px"
@@ -350,7 +354,7 @@ defineExpose({
             >
               <template #default="{ item }">
                 <li
-                  class="relative mb-[6px] flex cursor-pointer items-center overflow-hidden rounded-[4px] bg-[#f3f3f5] px-[10px] py-[4px] transition hover:bg-[#E7E7E7]"
+                  class="relative mb-[6px] flex cursor-pointer items-center overflow-hidden rounded-[4px] bg-[#f3f3f5] py-[4px] pl-[10px] pr-[16px] transition hover:bg-[#E7E7E7]"
                   @click="handleApplicationChange(item)"
                 >
                   <div
@@ -363,6 +367,12 @@ defineExpose({
                       {{ item.agentTitle }}
                     </n-ellipsis>
                   </div>
+                  <div class="pl-[8px] text-[12px] text-[#0B7DFF]">
+                    <template v-if="item.points && item.points !== 0">
+                      {{ item.points }}{{ t('equity_module.points2') }}/{{ t('common_module.time') }}
+                    </template>
+                    <template v-else-if="item.points && item.points === 0">{{ t('common_module.free') }}</template>
+                  </div>
 
                   <i
                     v-if="item.agentId === currentAgentApplication.agentId"

src/views/home/types.d.ts

@@ -5,6 +5,7 @@ export interface AgentApplicationRecordItem {
   agentDesc: string
   creator: string
   publishedTime: string
+  points: number
 }
 
 export interface MessageItemInterface {

src/views/login/login.vue

@@ -160,7 +160,7 @@ function onCountdownFinish() {
 
 function getInputPhoneNumber() {
   return currentPhoneNumberArea.value !== '+86'
-    ? `${currentPhoneNumberArea.value}${smsLoginForm.value.phoneNumber}`
+    ? encodeURIComponent(`${currentPhoneNumberArea.value}${smsLoginForm.value.phoneNumber}`)
     : smsLoginForm.value.phoneNumber
 }
 
@@ -195,7 +195,7 @@ function handleLoginSubmit(method: LoginMethod) {
 
             payload = {
               loginChannel: 'MEMBER_PLATFOMR_SMS',
-              account: getInputPhoneNumber(),
+              account: smsLoginForm.value.phoneNumber,
               authCode: smsLoginForm.value.code,
             }
 

src/views/personal-space/personal-app/personal-app.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n'
 import { Search, MoreOne, Star } from '@icon-park/vue-next'
 import { PaginationInfo } from '@/components/custom-pagination/custom-pagination.vue'
 import { formatDateTime } from '@/utils/date-formatter'
-
 import {
   fetchApplicationsCollectionStatusChange,
   fetchDeleteApplication,
@@ -18,10 +17,12 @@ import { defaultPersonalAppConfigState } from '@/store/modules/personal-app-conf
 import searchEmptyImage from '@/assets/images/search-empty.png'
 import applicationEmptyImage from '@/assets/images/application-empty.png'
 import { debounce } from 'lodash-es'
+import { useUserStore } from '@/store/modules/user'
 
 const { t } = useI18n()
 
 const cardContentWrapRef = useTemplateRef<HTMLDivElement>('cardContentWrapRef')
+const userStore = useUserStore()
 
 const selectedPublishStatusValue = ref('')
 const isShowSaleApplicationsConfigurationModal = ref(false)
@@ -144,6 +145,8 @@ function handleDeletePersonalApp(agentId: string) {
         window.$message.success(t('common_module.delete_success_message'))
         agentAppList.value.length === 1 && (pagingInfo.value.pageNo = pagingInfo.value.pageNo - 1)
         getApplicationList()
+
+        userStore.fetchUpdateEquityInfo()
       })
     })
 }

types/locales.d.ts

@@ -126,6 +126,7 @@ declare namespace I18n {
       buy_now: string
       payment_success: string
       back: string
+      time: string
 
       dialogue_module: {
         continue_question_message: string