Merge branch 'milestone-20251031-简版功能开发' of http://39.101.133.168:8807/qimaohong/deepChartVueApp into hongxilin/feature-20251023103318-行情数据及页面

pages/marketSituation/marketOverview.vue

@@ -6,6 +6,10 @@
     <scroll-view class="content_scroll" scroll-y="true" :style="{ top: contentTopPosition + 'px' }">
       <view class="content">
         <view class="map">
+          <view class="INDU">道琼斯{{ INDU.value }}</view>
+          <view class="NDX">纳斯达克{{ NDX.value }}</view>
+          <view class="HSI">恒生指数{{ HSI.value }}</view>
+          <view class="CN">上证指数{{ CN.value }}</view>
           <image src="/static/marketSituation-image/map.png" mode="widthFix"></image>
         </view>
         <view class="global_index">
@@ -60,6 +64,11 @@ const contentHeight = ref(0);
 const headerHeight = ref(0); // 动态计算的header高度
 const isWarnTextOverflow = ref(false); // warn文字是否溢出
 
+const INDU = ref({stockName: "道琼斯",stockCode: "INDU",value: ""});
+const NDX = ref({stockName: "纳斯达克",stockCode: "NDX",value: ""});
+const HSI = ref({stockName: "恒生指数",stockCode: "HSI",value: ""});
+const CN = ref({stockName: "上证指数",stockCode: "1A0001",value: ""});
+
 const pageIndex = ref(0);
 const scrollToView = ref("");
 
@@ -719,6 +728,55 @@ watch(headerHeight, (newHeight) => {
   min-height: 200rpx;
 }
 
+.NDX {
+  position: absolute;
+  top: 30%;
+  left: 17%;
+  transform: translate(-50%, -50%);
+  font-size: 11rpx;
+  color: #000000;
+  padding: 5rpx 10rpx;
+  border-radius: 10rpx;
+  background-color: #ffffff;
+  z-index: 10;
+}
+.INDU {
+  position: absolute;
+  top: 22%;
+  left: 35%;
+  transform: translate(-50%, -50%);
+  font-size: 11rpx;
+  color: #000000;
+  padding: 5rpx 10rpx;
+  border-radius: 10rpx;
+  background-color: #ffffff;
+  z-index: 10;
+}
+.HSI {
+  position: absolute;
+  top: 30%;
+  right: 13%;
+  transform: translate(-50%, -50%);
+  font-size: 11rpx;
+  color: #000000;
+  padding: 5rpx 10rpx;
+  border-radius: 10rpx;
+  background-color: #ffffff;
+  z-index: 10;
+}
+.CN {
+  position: absolute;
+  top: 23%;
+  right: 16%;
+  transform: translate(-50%, -50%);
+  font-size: 11rpx;
+  color: #000000;
+  padding: 5rpx 10rpx;
+  border-radius: 10rpx;
+  background-color: #ffffff;
+  z-index: 10;
+}
+
 .map image {
   width: 100%;
   height: auto;

pages/start/login/login.vue

@@ -10,7 +10,7 @@
       </view> -->
       <view class="nav-right">
         <image
-        @click="goToService"
+          @click="goToService"
           class="icons"
           src="../../../static/icons/Headset.png"
           alt="联系客服"
@@ -209,7 +209,11 @@
 
     <!-- 第三方登录 -->
     <view class="third-party-login">
-      <view class="third-party-btn" @click="loginWithApple">
+      <view
+        v-if="isAppleDevice"
+        class="third-party-btn"
+        @click="loginWithApple"
+      >
         <image
           class="apple-icon"
           src="../../../static/icons/appleIcons.png"
@@ -253,7 +257,7 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { computed, ref } from "vue";
 // 导入完整的国家列表
 import countryList from "./list.js";
 import footerBar from "../../../components/footerBar";
@@ -285,6 +289,19 @@ const verifyCode = ref("");
 const account = ref("");
 const isLoading = ref(false);
 
+const deviceStore = useDeviceStore();
+
+const isAppleDevice = computed(() => {
+  if (deviceStore.deviceInfo.brand) {
+    return deviceStore.deviceInfo.brand.toLowerCase() === "apple";
+  }
+
+  if (deviceStore.deviceInfo.system) {
+    return deviceStore.deviceInfo.system.includes("ios");
+  }
+  return false;
+});
+
 // 使用从list.js导入的完整国家列表数据
 const countries = ref(
   countryList.list.map((item) => ({
@@ -355,8 +372,6 @@ async function Login() {
     return;
   }
 
-  const deviceStore = useDeviceStore();
-
   const account = changeAccount();
   const loginType = changeLoginType();
   isLoading.value = true;