合并冲突

pages-myChart/detail.vue

@@ -14,6 +14,7 @@ export default {
         const queryObj={
             ChartInfoId:options.chartInfoId,
 				chartSource: options.chartSource,
+            chartCode:options.chartCode,
             source:'ybxcx_my_chart',
             token:this.$store.state.user.token||uni.getStorageSync("token"),
             timestamp:new Date().getTime(),//防止缓存

pages-myChart/list.vue

@@ -92,9 +92,9 @@ export default {
             this.getList()
         },
 
-        goDetail({chart_info_id,chart_info_source}){
+        goDetail({chart_info_id,chart_info_source,unique_code}){
             uni.navigateTo({
-                url: `/pages-myChart/detail?chartInfoId=${item.chart_info_id}&chartSource=${chart_info_source}`, 
+                url: `/pages-myChart/detail?chartInfoId=${item.chart_info_id}&chartSource=${chart_info_source}&chartCode=${item.unique_code}`,
             });
         },
 

pages/myChart/index.vue

@@ -159,9 +159,9 @@ export default {
             });
         },
 
-        goDetail({chart_info_id,chart_info_source}){
+        goDetail({chart_info_id,chart_info_source,unique_code}){
             uni.navigateTo({
-                url: `/pages-myChart/detail?chartInfoId=${chart_info_id}&chartSource=${chart_info_source}`, 
+                url: `/pages-myChart/detail?chartInfoId=${chart_info_id}&chartSource=${chart_info_source}&chartCode=${unique_code}`, 
             });
         }
     },