解决冲突

lxf

2025-07-11 2a95677853ec636b4c568d0045a8bb1d4ef13097

 src/views/news/index.vue

@@ -39,15 +39,14 @@
          <div class="font-bold block text-18">{{ item.name }}</div>
          <div class="font-bold block text-20">{{ item.ask }}</div>
          <div class="w-full h-50">
            <div id="DOGEUSDT" class="w-full h-full relative overflow-hidden" 
                style="user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);margin: 0 10px;">
            <div id="DOGEUSDT" class="w-full h-full relative overflow-hidden"
              style="user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);margin: 0 10px;">
              <!-- 添加进度条动画 -->
              <div class="absolute top-10 left-0 h-1 bg-blue-500 progress-bar-animation" 
                  :style="{width: '80%'}"></div>
              <div class="absolute top-10 left-0 h-1 bg-blue-500 progress-bar-animation" :style="{ width: '80%' }"></div>
            </div>
          </div>
          <div class="flex justify-between">
            <div class="py-2 px-8 rounded-full text-13 font-medium bg-white">{{item.change_ratio_str}}</div>
            <div class="py-2 px-8 rounded-full text-13 font-medium bg-white">{{ item.change_ratio_str }}</div>
            <span class="text-18" :class="index % 2 === 1 ? 'c2c_color' : ''">→</span>
          </div>
        </div>
@@ -69,25 +68,26 @@
      <div class="w-40 h-40 rounded-full flex items-center justify-center">
        <img class="w-33 h-33" src="@/assets/c.jpg" draggable="false">
      </div>
      <div class="text-center">{{t('外汇交易')}}</div>
      <div class="text-center">{{ t('外汇交易') }}</div>
    </div>
    <div class="flex-1 flex flex-col items-center" @click="goToPage('/cryptos/perpetualContract/USDSGD?selectIndex=2')">
      <div class="w-40 h-40 rounded-full flex items-center justify-center">
        <img class="w-33 h-33" src="@/assets/c.jpg" draggable="false">
      </div>
      <div class="text-center">{{t('外汇交割')}}</div>
      <div class="text-center">{{ t('外汇交割') }}</div>
    </div>
    <div class="flex-1 flex flex-col items-center" @click="copyInviteLink">
      <div class="w-40 h-40 rounded-full flex items-center justify-center">
        <img class="w-33 h-33" src="@/assets/d.jpg" draggable="false">
      </div>
      <div class="text-center">{{t('邀请好友')}}</div>
      <div class="text-center">{{ t('邀请好友') }}</div>
    </div>
  </div>

  <!-- 新手指南部分 -->
  <div class="mt-20 mx-17 h-50 rounded-5 bg-#d8f0dd font-500 flex items-center justify-between text-16 px-15" @click="goToExplanation">
    <span>{{t('新手')}}</span>
  <div class="mt-20 mx-17 h-50 rounded-5 bg-#d8f0dd font-500 flex items-center justify-between text-16 px-15"
    @click="goToExplanation">
    <span>{{ t('新手') }}</span>
    <div class="text-20">→</div>
  </div>

@@ -99,11 +99,11 @@

  <div class="mt-20">
    <div class="flex items-end justify-between px-17">
      <span class="block text-22 font-medium">{{t('news')}}</span>
      <span class="block text-22 font-medium">{{ t('news') }}</span>
    </div>
    <div class="px-17 mt-10">
      <!-- 新闻条目1 -->
      <div class="rounded-5 overflow-hidden mb-10" v-for="(t , i) in list" :key="t.dataId" >
      <div class="rounded-5 overflow-hidden mb-10" v-for="(t, i) in list" :key="t.dataId">
        <div class="bg-#f5f7f9 py-12 px-15 " @click="openOriginUrl(t.originUrl)">
          <div class="flex" style="border-bottom: 1px solid rgb(209, 209, 209);">
            <div class="text-12 h-70 flex-1 line3">{{ t.description }}</div>
@@ -112,7 +112,7 @@
              draggable="false"> -->
          </div>
          <div class="mt-5 text-10 text-#8c8c8c flex justify-between">
            <span>{{t.createTime}}</span>
            <span>{{ t.createTime }}</span>
            <!-- <div>全球股市</div> -->
          </div>
        </div>
@@ -121,11 +121,11 @@
    </div>
  </div>
</template>
    

<script setup>
import { ref, onMounted, onUnmounted } from 'vue';
import { _getInformationList } from '@/service/etf.api'
import {_getHomeList} from '@/service/cryptos.api'
import { _getHomeList } from '@/service/cryptos.api'
import { showToast } from 'vant'
import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router'
@@ -183,12 +183,12 @@
      hotItems.value = data.slice(0, 3) // 取前3条数据
    })
  }
 

  // 立即执行一次
  fetchData()
  

  intervalId.value = setInterval(fetchData, 1000)
  

  onUnmounted(() => {
    if (intervalId.value) {
      clearInterval(intervalId.value)
@@ -225,7 +225,7 @@
<style lang="scss" scoped>
@import '@/assets/css/deepseek_css_20250625_30ff932.css';

.line3{
.line3 {
  display: -webkit-box;
  -webkit-line-clamp: 3;
  -webkit-box-orient: vertical;
@@ -247,7 +247,7 @@
  // }
}

.c2c_color{
.c2c_color {
  color: #fff;
}
</style>