Ver Fonte

Merge branch 'bug_chart_back' into debug_ht

cldu há 4 dias atrás
pai
commit
e6ee403f8b
1 ficheiros alterados com 14 adições e 7 exclusões
  1. 14 7
      src/views/chart/Detail.vue

+ 14 - 7
src/views/chart/Detail.vue

@@ -78,11 +78,17 @@ function handleChangeChart(type){
   if(type==='pre'){
     if(index<1) return Message.warning('当前已是第一张')
     const obj=changeChartList.value[index-1]
-    getChartDetail(obj)
+    // getChartDetail(obj)
+    wx.miniProgram.redirectTo({
+      url: `/pages-collect/chartDetail/index?id=${obj.chartInfoId}&uniqueCode=${obj.uniqueCode}&chartName=${obj.chartName}&searchKey=${route.query.searchKey}`
+    })
   }else{
     if(index===changeChartList.value.length-1) return Message.warning('当前已是最后一张')
     const obj=changeChartList.value[index+1]
-    getChartDetail(obj)
+    // getChartDetail(obj)   
+    wx.miniProgram.redirectTo({
+      url: `/pages-collect/chartDetail/index?id=${obj.chartInfoId}&uniqueCode=${obj.uniqueCode}&chartName=${obj.chartName}&searchKey=${route.query.searchKey}`
+    })
   }
 }
 
@@ -92,7 +98,7 @@ function handleChangeChart(type){
     <div class="chart-title">{{chartInfo.ChartName}}</div> 
     <div class="collect-icon" @click="handleCollect" >{{chartInfo.IsCollect?'取消收藏':'收藏'}}</div>
     <!-- 图表渲染盒子 -->
-    <div class="chart-render-wrap">
+    <div class="chart-render-wrap" v-if="chartBaseUrl">
       <iframe :src="chartRenderUrl"></iframe>
     </div>
     <div v-if="chartInfo.SourcesFrom&&JSON.parse(chartInfo.SourcesFrom).text"><span>来源:{{chartInfo.SourcesFrom?JSON.parse(chartInfo.SourcesFrom).text:''}}</span></div>
@@ -100,11 +106,11 @@ function handleChangeChart(type){
     <div class="change-btns-box" v-if="changeChartList.length>1">
       <div class="btn bottom" @click="handleChangeChart('pre')">
         <div class="triangle-left"></div>
-        <div>上一张</div>
+        <div style="color: #fff;">上一张</div>
       </div>
       <div class="btn" @click="handleChangeChart('next')">
         <div class="triangle-right"></div>
-        <div>下一张</div>
+        <div style="color: #fff;">下一张</div>
       </div>
     </div>
     <!-- 收藏 -->
@@ -140,12 +146,13 @@ function handleChangeChart(type){
   .change-btns-box {
     position: fixed;
     z-index: 99;
-    right: 34px;
+    right: 24px;
     bottom: 150px;
     .btn {
       width: 100%;
       height: 120px;
-      background-color: #f3f5f9;
+      padding: 10px;
+      background-color: #999999;
       display: flex;
       flex-direction: column; /* 垂直方向排列子元素 */
       justify-content: center; /* 水平居中(对于列布局,这将使整列居中) */