From 2d03c09cc139a00f3a95af82b2f76bdc42751fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com>
Date: Mon, 7 Jul 2025 15:23:10 +0800
Subject: [PATCH] update

---
 src/components/XNoticeBar.vue | 58 ++++++++++++++++++++++-------------
 src/pages/home/index.vue      | 10 +++---
 src/pages/wallet/index.vue    |  6 ++--
 3 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/components/XNoticeBar.vue b/src/components/XNoticeBar.vue
index 184faba..d179ee7 100644
--- a/src/components/XNoticeBar.vue
+++ b/src/components/XNoticeBar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import {onMounted, ref, watch} from "vue";
+import {computed, nextTick, onMounted, ref, watch} from "vue";
 import warn from '../static/icons/warn.png';
 import success from '../static/icons/info.png';
 
@@ -16,8 +16,8 @@ const STATUS = {
 
 const {text, status, tile, textColor} = defineProps({
     text: {
-        type: String,
-        default: '提示：请在规定时间内，按要求提交回填1。以免影响收益。哈哈哈哈哈哈哈哈哈哈'
+        type: Array,
+        default: ['1.你好你好', '2.啊我就会发回复哈', '3.测试啊u发哈u发货']
     },
     textColor: {
         type: String,
@@ -32,37 +32,45 @@ const {text, status, tile, textColor} = defineProps({
         default: false,
     }
 });
+const showIndex = ref(0);
+const textC = computed(() => {
+    return text.map((v, index) => ({
+        show: index === showIndex.value,
+        text: `${index + 1}. ${v}`,
+    }))
+});
 
 const XNoticeBox = ref();
 const Context = ref();
 const roll = ref(false);
 
 watch(
-    () => text,
+    () => showIndex.value,
     () => {
         if (!tile) {
-            if (
-                Context.value.$el.clientWidth
-                >
-                XNoticeBox.value.$el.clientWidth
-            ) {
-                roll.value = true;
-            }
+            nextTick(() => {
+                if (
+                    Context.value.$el.clientWidth
+                    >
+                    XNoticeBox.value.$el.clientWidth
+                ) {
+                    roll.value = true;
+                } else {
+                    roll.value = false;
+                }
+            })
         }
     },
     {deep: true}
 )
 
 onMounted(() => {
-    if (!tile) {
-        if (
-            Context.value.$el.clientWidth
-            >
-            XNoticeBox.value.$el.clientWidth
-        ) {
-            roll.value = true;
+    setInterval(() => {
+        showIndex.value++;
+        if (showIndex.value > text.length - 1) {
+            showIndex.value = 0;
         }
-    }
+    }, 5000);
 });
 </script>
 
@@ -72,8 +80,14 @@ onMounted(() => {
               :style="{alignItems: tile ? 'start' : 'center'}">
             <image v-if="status==='error'" class="!size-[26rpx] flex-shrink-0" :src="warn"></image>
             <image v-else class="!size-[26rpx] flex-shrink-0" :src="success"></image>
-            <text v-if="!tile" class="!whitespace-nowrap flex-shrink-0" :style="{color: textColor}"
-                  v-html="text"></text>
+            <view v-if="!tile">
+                <view
+                    class="!whitespace-nowrap flex-shrink-0"
+                    :style="{color: textColor}"
+                    v-for="v in textC.filter(v => v.show)"
+                    v-html="v.text">
+                </view>
+            </view>
             <text v-else :style="{color: textColor}" v-html="text">
             </text>
         </view>
@@ -120,7 +134,7 @@ onMounted(() => {
 
 @keyframes Roll {
     0% {
-        transform: translateX(100%);
+        transform: translateX(0%);
     }
     100% {
         transform: translateX(-100%);
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 94832df..eece582 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -17,7 +17,7 @@ import XNoticeBar from "../../components/XNoticeBar.vue";
 import {onShow} from "@dcloudio/uni-app";
 
 const showAddCustomer = ref(false);
-const textContent = ref(null);
+const textContent = reactive([]);
 const advList = reactive([]);
 const nav = [
     {
@@ -102,10 +102,8 @@ onMounted(() => {
         advList.push(...data);
     });
     Api.system.getBarrageList().then(({data}) => {
-        textContent.value = '';
-        data.forEach((v, index) => {
-            textContent.value += `${index + 1}.${v}&nbsp;&nbsp;&nbsp;&nbsp;`;
-        });
+        textContent.length = 0;
+        textContent.push(...data);
     });
 })
 </script>
@@ -113,7 +111,7 @@ onMounted(() => {
 <template>
     <!--首页-->
     <XNav :show-back="false"></XNav>
-    <x-notice-bar :text="textContent" v-if="textContent"></x-notice-bar>
+    <x-notice-bar :text="textContent" v-if="textContent.length"></x-notice-bar>
 
     <add-customer-service-modal v-model:show="showAddCustomer"></add-customer-service-modal>
 
diff --git a/src/pages/wallet/index.vue b/src/pages/wallet/index.vue
index 3fa7756..82cc93e 100644
--- a/src/pages/wallet/index.vue
+++ b/src/pages/wallet/index.vue
@@ -79,15 +79,15 @@ onShow(() => {
         <view class="w-full !grid grid-cols-3 gap-[20rpx]">
             <view class="py-[24rpx] px-[20rpx] bg-[#fff] rounded-[16rpx]">
                 <view class="text-[#4E5969] test-22r">总收益</view>
-                <view class="test-36r" style="font-weight: 700;">0.00</view>
+                <view class="test-36r" style="font-weight: 700;">{{ UserStore.userInfo.total_money }}</view>
             </view>
             <view class="py-[24rpx] px-[20rpx] bg-[#fff] rounded-[16rpx]">
                 <view class="text-[#4E5969] test-22r">打款中</view>
-                <view class="test-36r" style="font-weight: 700;">0.00</view>
+                <view class="test-36r" style="font-weight: 700;">{{ UserStore.userInfo.tx_money }}</view>
             </view>
             <view class="py-[24rpx] px-[20rpx] bg-[#fff] rounded-[16rpx]">
                 <view class="text-[#4E5969] test-22r">已提现</view>
-                <view class="test-36r" style="font-weight: 700;">0.00</view>
+                <view class="test-36r" style="font-weight: 700;">{{ UserStore.userInfo.withraw_money }}</view>
             </view>
         </view>