合并

components/deepExploration_header.vue

@@ -65,8 +65,16 @@
             class="history-item"
           >
             <view class="history-left">
-              <view class="flag-circle"
-                ><image
+              <view class="flag-circle">
+                <image
+                  class="icon-stock-model"
+                  :src="modelImage(item.model)"
+                  mode="scaleToFill"
+              /></view>
+            </view>
+            <view class="history-left">
+              <view class="flag-circle">
+                <image
                   class="icon-stock"
                   :src="stockImage(item.stockMarket)"
                   mode="scaleToFill"
@@ -75,7 +83,6 @@
             <view class="history-main" @click="itemClick(item)">
               <text class="history-query">{{ item.stockName }}</text>
               <text class="history-query">（{{ item.stockCode }}）</text>
-              <text class="history-query">{{ modelType(item.model) }} </text>
             </view>
             <text class="history-time">{{
               formatTimeForHistory(item.createdTime)
@@ -163,6 +170,20 @@ const onDrawerBackClick = () => {
 };
 
 // 历史记录国家图像
+function modelImage(model) {
+  switch (model) {
+    case 1:
+      return "../../static/icons/tracking.png";
+    case 2:
+      return "../../static/icons/radar.png";
+    case 3:
+      return "../../static/icons/decoding.png";
+    case 4:
+      return "../../static/icons/funds.png";
+  }
+}
+
+// 历史记录国家图像
 function stockImage(Market) {
   switch (Market) {
     case "usa":
@@ -184,7 +205,6 @@ function stockImage(Market) {
   }
 }
 
-
 // 历史记录详情
 async function itemClick(item) {
   const res = await RecordInfoApi({
@@ -488,6 +508,10 @@ onMounted(() => {});
   height: 50rpx;
 }
 
+.icon-stock-model {
+  width: 45rpx;
+  height: 45rpx;
+}
 
 .icon-stock {
   width: 36rpx;
@@ -503,11 +527,11 @@ onMounted(() => {});
   display: flex;
   align-items: center;
   justify-content: center;
-  image {
-    width: 50rpx;
-    height: 50rpx;
-    border-radius: 50%;
-  }
+  // image {
+  //   width: 50rpx;
+  //   height: 50rpx;
+  //   border-radius: 50%;
+  // }
 }
 
 .history-main {

pages/deepExploration/MainForceActions.vue

@@ -577,6 +577,7 @@
 				stockChange.value = historyData.value.stockData.StockInformation.Zhang || '5.120%'
 				stockAdd.value = historyData.value.stockData.StockInformation.ZhangFu || '22.410'
 				stockPrice.value = historyData.value.stockData.StockInformation.Price || '435.900'
+				currentIndex.value = historyData.value.model-1 
 			}, {
 				deep: true,
 				immediate: true
@@ -588,7 +589,7 @@
 	// 页面加载时执行
 	onLoad((e) => {
 		if (e.index) {
-			currentIndex.value = e.index - 1
+			// currentIndex.value = e.index - 1
 			console.log('模块：', currentIndex.value)
 		}
 		if (e.stockName) {

pages/start/select/select.vue

@@ -110,6 +110,7 @@ function toLogin() {
   border-radius: 60rpx;
   font-size: 32rpx;
   padding: 20rpx;
+  border: 1rpx solid #00000022;
 }
 
 .register-button {

pages/start/startup/startup.vue

@@ -1,11 +1,13 @@
 <template>
   <view class="background">
-    <image
+   <!-- <image
       class="logo"
       src="../../../static/icons/start-logo.png"
       mode="scaleToFill"
     />
-    <view class="logo-text"> DeepChart </view>
+    <view class="logo-text"> DeepChart </view> -->
+
+    <image class="start" src="../../../static/start.webp" mode="scaleToFill" />
   </view>
 </template>
 
@@ -19,7 +21,7 @@ onShow(() => {
   // 获取设备ID
   uni.getSystemInfo({
     success: (res) => {
-      deviceInfo.setDeviceInfo(res)
+      deviceInfo.setDeviceInfo(res);
     },
   });
 
@@ -38,7 +40,7 @@ onShow(() => {
         animationDuration: 1000,
       });
     }
-  }, 1500);
+  }, 3000);
 });
 </script>
 
@@ -49,6 +51,11 @@ onShow(() => {
   height: 100vh;
 }
 
+.start{
+  width: 100vw;
+  height: 100vh;
+}
+
 .logo-text {
   display: flex;
   justify-content: center;

utils/http.js

@@ -23,7 +23,7 @@ const httpInterceptor = {
         // 打印最终请求地址
         console.log('HTTP(finalUrl)=', options.url)
         // 2.请求超时，默认60s
-        options.timeout = 10000
+        options.timeout = 30000
         console.log(options)
         //3 添加小程序端请求头
         const sys = uni.getSystemInfoSync();