fix:修改支付走马灯样式

src/components/AppRecharge/index.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { CloseOutlined, LeftOutlined, RightOutlined } from '@ant-design/icons-vue'
-import { Button, Carousel, Modal, QRCode, message } from 'ant-design-vue'
+import { Button, Carousel, Modal, QRCode, Spin, message } from 'ant-design-vue'
 import { onMounted, ref } from 'vue'
 import type { GoodsData, Racharge } from './index.d'
 import { getIsPay, goodsList, goodsType, payment } from '@/api/recharge/index'
@@ -13,6 +13,7 @@ import { RechargeEnum } from '@/enums/recharge'
 
 const userStore = useUserStore()
 const rechargeStore = useRechargeStore()
+const currentIndex = ref(3)
 // 轮播的ref
 const carouselRef = ref()
 // 选项卡索引
@@ -23,6 +24,8 @@ const qrshow = ref<boolean>(false)
 const tabs = ref<Racharge[]>([])
 // 套餐列表
 const goodslists = ref<GoodsData[]>([])
+
+const isDataLoaded = ref(false)
 // 支付路径
 const payData = ref<any>({
   orderCode: '',
@@ -40,14 +43,19 @@ function getType() {
 
 // 套餐列表
 function getgoodsList(type: string) {
+  isDataLoaded.value = true
   goodsList({ type }).then((res) => {
     goodslists.value = res
+    setTimeout(() => {
+      isDataLoaded.value = false
+    }, 300)
   })
 }
 
 // 选择选项卡
 function selectTab(index: number, key: string) {
   activeTab.value = index
+  currentIndex.value = 3
   getgoodsList(key)
 }
 
@@ -78,7 +86,6 @@ function stopPolling() {
     clearInterval(intervalId.value)
     intervalId.value = null
     qrshow.value = false
-
     userStore.getChatInfoFun()
   }
 }
@@ -111,11 +118,17 @@ function tabClass(index: number) {
 
 // 走马灯向上
 function onPrevClick() {
+  if (currentIndex.value > 3) {
+    currentIndex.value--
     carouselRef.value.prev()
+  }
 }
 // 走马灯向下
 function onNextClick() {
+  if (currentIndex.value < goodslists.value.length) {
+    currentIndex.value++
     carouselRef.value.next()
+  }
 }
 
 // 数字分隔符
@@ -150,7 +163,8 @@ function separator(num: number | string) {
                 <div v-show="goodslists.length > 3" class="prev-button prev" @click="onPrevClick">
                   <LeftOutlined />
                 </div>
-                <Carousel ref="carouselRef" arrows :dots="false" :autoplay="false" :slides-to-show="goodslists.length > 3 ? 3 : goodslists.length" :slides-to-scroll="1">
+                <Spin :spinning="isDataLoaded">
+                  <Carousel :key="activeTab" ref="carouselRef" arrows :dots="false" :infinite="false" :autoplay="false" :slides-to-show="goodslists.length > 3 ? 3 : goodslists.length" :slides-to-scroll="1">
                     <div v-for="(item, index) in goodslists" :key="index" class="carouse-box">
                       <div class="carouse-item">
                         <div class="dotnumbox">
@@ -207,6 +221,7 @@ function separator(num: number | string) {
                       </div>
                     </div>
                   </Carousel>
+
                   <div v-show="goodslists.length > 3" class="next-button next" @click="onNextClick">
                     <RightOutlined />
                   </div>
@@ -233,6 +248,7 @@ function separator(num: number | string) {
                       </div>
                     </div>
                   </div>
+                </Spin>
               </div>
               <div v-else class="extreme-box">
                 <div class="extreme">

src/components/AppRoleDefault/index.vue

@@ -14,7 +14,6 @@ const typeIndex = ref(0)
 function getRoleData() {
   getRole(1).then((res) => {
     roleList.value = res
-    console.log('角色', res)
   })
 }
 getRoleData()
@@ -22,7 +21,6 @@ getRoleData()
 function getAppData() {
   getAppList().then((res) => {
     application.value = res
-    console.log('应用', res)
   })
 }
 
@@ -134,11 +132,13 @@ function handleChange(index: number) {
           height: 100px;
           margin-bottom: 35px;
           background: linear-gradient(169deg, #edf3ff 0%, #f7f9ff 100%);
-          box-shadow: 1px 4px 10px 0px rgba(194, 205, 235, 0.49);
+          // box-shadow: 1px 4px 10px 0px rgba(194, 205, 235, 0.49);
           border-radius: 10px;
-
+          transition: all 0.3s linear 0s;
           cursor: pointer;
-
+          &:hover {
+            box-shadow: 1px 4px 10px 0px rgba(194, 205, 235, 0.49);
+          }
           .top {
             display: flex;
             position: relative;
@@ -157,7 +157,7 @@ function handleChange(index: number) {
               right: 0px;
               width: 4px;
               height: 30px;
-              background: linear-gradient(131deg, #226aff 0%, #3fc6ff 100%);
+              background: #4670e3;
               font-size: 0;
               border-radius: 100px 0px 0px 100px;
               transition: width 0.3s linear 0s;
@@ -199,8 +199,8 @@ function handleChange(index: number) {
             }
           }
           &:hover .exchange {
-            width: 50px;
+            width: 70px;
-            background: linear-gradient(131deg, #226aff 0%, #3fc6ff 100%);
+            background: #4670e3;
             border-radius: 100px 0px 0px 100px;
             text-align: center;
             color: white;

src/components/AppUserInfo/index.vue

@@ -9,6 +9,7 @@ import { useRechargeStore } from '@/store/moules/rechareStore'
 
 const rechargeStore = useRechargeStore()
 const userStore = useUserStore()
+
 const info = computed(() => userStore.getChatInfo)
 
 function handleRecharge() {

src/store/moules/userStore/index.ts

@@ -55,6 +55,7 @@ export const useUserStore = defineStore('useUserStore', {
 
     getChatInfoFun() {
       chatInfo().then((res) => {
+        console.log(res, 'sotre')
         this.setChatInfo(crypto.encryptAES(JSON.stringify(res), crypto.localKey))
       })
     },

src/views/task/components/BasicTask/index.d.ts

@@ -12,5 +12,7 @@ interface TaskType {
   id: string
   receiveCount: number
   finishEnableCount: number
+  finishCount: number
+  finishEnableMaxCount: number
 }
 export { SignType, TaskType }

src/views/task/components/BasicTask/index.vue

@@ -157,7 +157,7 @@ function handleInvite() {
                   已获得{{ item.points }}点数
                 </div>
                 <div v-show="item.status !== 2" class="unfinished">
-                  {{ item.receiveCount }}/{{ item.finishEnableCount }}
+                  {{ item.finishCount }}/{{ item.finishEnableMaxCount }}
                 </div>
               </div>
               <div class="earn-list-right">

src/views/task/components/TaskList/index.d.ts

@@ -5,4 +5,6 @@ export interface TaskType {
   id: string
   receiveCount: number
   finishEnableCount: number
+  finishCount: number
+  finishEnableMaxCount: number
 }

src/views/task/components/TaskList/index.vue

@@ -28,7 +28,6 @@ const props = defineProps({
 })
 const emit = defineEmits(['updateList'])
 const reactiveList: ComputedRef<TaskType[]> = computed(() => props.list)
-console.log(reactiveList, 'reactiveList')
 
 const userStore = useUserStore()
 // 领取积分
@@ -84,7 +83,7 @@ const dynamicStyle = computed(() => {
                 已获得{{ item.points }}点数
               </div>
               <div v-show="item.status !== 2" class="unfinished">
-                {{ item.receiveCount }}/{{ item.finishEnableCount }}
+                {{ item.finishCount }}/{{ item.finishEnableMaxCount }}
               </div>
             </div>
             <div class="earn-list-right">