合并冲突

src/views/myChart/Detail.vue

@@ -12,6 +12,7 @@ function init(){
     const queryObj={
         ChartInfoId:route.query.chartInfoId,
         chartSource: route.query.chartSource,
+        chartCode:route.query.chartCode,
         source:'ybxcx_my_chart',
         token:localStorage.getItem('token'),
         timestamp:new Date().getTime(),//防止缓存

src/views/myChart/List.vue

@@ -66,6 +66,7 @@ function goDetail(item){
         query:{
             chartInfoId:item.chart_info_id,
             chartSource: item.chart_info_source,
+            chartCode:item.unique_code
         }
     })
 }

src/views/myChart/Search.vue

@@ -60,6 +60,7 @@ function goDetail(item){
         query:{
             chartInfoId:item.chart_info_id,
             chartSource: item.chart_info_source,
+            chartCode:item.unique_code
         }
     })
 }