Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/api/integral.js

@@ -15,16 +15,16 @@ export const rewardEventTrackClick = async (url) => {
 }
 
 // 获取用户积分数
-export const getUserRewardPoint = async () => {
-  return await request.get({
-    url: '/app-api/menduner/reward/user-point/get'
-  })
-}
+// export const getUserRewardPoint = async () => {
+//   return await request.get({
+//     url: '/app-api/menduner/reward/user-point/get'
+//   })
+// }
 
 // 获取用户积分明细
 export const getUserRewardPointPage = async (params) => {
   return await request.get({
-    url: `/app-api/menduner/reward/user/account/record/page`,
+    url: `/app-api/menduner/system/user/account/record/page`,
     params
   })
 }

src/views/integral/components/integralShow.vue

@@ -6,7 +6,7 @@
       <span style="font-size: 14px; color: var(--color-666); line-height: 24px; cursor: pointer;" class="ml-2" @click="integralRulesClick">{{ $t('points.integralRules') }}</span>
     </div>
     <div class="d-flex justify-space-between align-end my-1">
-      <span style="font-size: 42px; color: #10897bba; line-height: 50px;" class="ml-10 cursor-pointer" @click="integralDetails">{{ integral }}</span>
+      <span style="font-size: 42px; color: #10897bba; line-height: 50px;" class="ml-10 cursor-pointer" @click="integralDetails">{{ accountData?.point || 0 }}</span>
       <span style="font-size: 16px; color: #787d82; line-height: 24px;" class="mr-8">
         <!-- 积分商城 -->
         <template v-if="props.showMall">
@@ -26,8 +26,8 @@
 <script setup>
 defineOptions({name: 'myRegistration-integralShow'})
 import { ref } from 'vue'
+import { useUserStore } from '@/store/user'
 import { useRouter } from 'vue-router'; const router = useRouter()
-import { getUserRewardPoint } from '@/api/integral'
 
 const props = defineProps({
   title: {
@@ -48,15 +48,14 @@ const props = defineProps({
     default: false
   }
 })
-const integral = ref(0)
 
-// 积分数
-const getIntegral = async () => {
-  const data = await getUserRewardPoint()
-  if (!data) return
-  integral.value = data
-}
-getIntegral()
+const userStore = useUserStore()
+const key = props.isEnterprise ? 'enterpriseUserAccount' : 'userAccount'
+let accountData = ref(JSON.parse(localStorage.getItem(key)) || {})
+
+userStore.$subscribe((mutation, state) => {
+  if (Object.keys(state[key]).length) accountData.value = state[key]
+})
 
 // 积分规则
 const integralRulesClick = () => {
@@ -71,10 +70,6 @@ const handleClickMall = () => {
 const integralDetails = () => {
   window.open(props.isEnterprise ? '/enterprise/memberCenter/myPoints' : '/integral/pointsManagement')
 }
-
-defineExpose({
-  getIntegral
-})
 </script>
 
 <style lang="scss" scoped>

src/views/recruit/enterprise/memberCenter/myPoints/index.vue

@@ -2,35 +2,15 @@
 <template>
   <div class="white-bgc pa-3">
     <integralShow :showMall="true" :taskCenter="false" :title="descriptiveTitle" :isEnterprise="true"></integralShow>
-    <div>
-      <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#fff" @update:model-value="getPositionList">
-        <v-tab :value="1">{{ $t('points.redemptionOfPoints') }}</v-tab>
-        <v-tab :value="2">{{ $t('points.pointsDetails') }}</v-tab>
-      </v-tabs>
-    </div>
-    <div class="mt-3 white-bgc pa-3 pt-1">
-      <div v-if="tab === 2">
-        <pointsDetails></pointsDetails>
-      </div>
-      <div v-if="tab === 1" class="pt-3">
-        <pointsMall></pointsMall>
-      </div>
-    </div>
+    <pointsDetails></pointsDetails>
   </div>
 </template>
 
 <script setup>
+defineOptions({name: 'personal-pointsManagement-index'})
 import pointsDetails from './pointsDetails.vue'
-import pointsMall from './pointsMall.vue'
 import integralShow from '@/views/integral/components/integralShow.vue'
-import { useRoute } from 'vue-router'; const route = useRoute()
-import { useRouter } from 'vue-router'; const router = useRouter()
-import { ref } from 'vue'
-defineOptions({name: 'personal-pointsManagement-index'})
-const tab = ref(+route.query?.tab || 1)
-const getPositionList = () => {
-  if (route.query) router.replace({ path: route.path }) // 不留记录的清除跳转带过来的参数
-}
+
 const descriptiveTitle = '您当前可用积分'
 </script>
 <style lang="scss" scoped>