pc1.0

src/layout/Index.vue

@@ -52,7 +52,7 @@ let permission_list_str = computed(() => {
 });
 
 //我的中点击去申请权限
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox,ElMessage } from 'element-plus'
 import {apiLastApplyRecord} from '@/api/user'
 const handleGoApplyPermission=async ()=>{
   const res=await apiLastApplyRecord()
@@ -81,7 +81,13 @@ const handleGoApplyPermission=async ()=>{
 
 // 全局返回按钮
 const goBack=()=>{
-  router.go(-1)
+  if(window.history.state.back){
+    console.log('返回上一页');
+    router.go(-1)
+  }else{
+    console.log('返回首页');
+    router.push({path:'/'})
+  }
 }
 
 

src/views/activity/Detail.vue

@@ -89,13 +89,10 @@ const handleShareMsg=()=>{
     let postData = {
         path: "/pages-activity/detail",
         params:{
-            name:"研报详情",
-            type:'activityDetail',
-            id:info.value.activityId,
-            shareImg:shareImg,
-            h5Url:'/activity/detail'
+            id:info.value.activityId
         },
         title: title,
+        shareImg:shareImg
     };
     wx.miniProgram.postMessage({ data: postData });
 }
@@ -267,12 +264,6 @@ const cancelRegister=async ()=>{
 }
 
 
-
-
-onMounted(() => {
-    
-});
-
 </script>
 
 <template>

src/views/activity/List.vue

@@ -220,7 +220,7 @@ onMounted(() => {
   //向小程序发送消息
   let postData = {
     path: "/pages/activity/activity",
-    params:{name:"研报列表",type:'activityList',h5Url:'/activity/list'},
+    params:{},
     title: "弘则FICC周度电话会安排",
   };
   wx.miniProgram.postMessage({ data: postData });