2.6提交

pages_app/myWelfare/myWelfare.vue

@@ -117,9 +117,12 @@
 	import { ref, onMounted } from 'vue';
 	import {onShow,onBackPress,onLoad,onHide} from '@dcloudio/uni-app';
 	import docUrl from '@/utils/docUrl.js';
+	const from = ref('');
 	onBackPress(() => {
-		plus.runtime.quit();
-		return true;
+		if(!from.value){
+			plus.runtime.quit();
+		   return true;
+		}
 	});
 	//import jifenImg from "@/static/duihuan.png"
 	import api from '@/api/api';
@@ -190,7 +193,11 @@
 
 	// 方法
 	const goBack = () => {
-		plus.runtime.quit();
+		if(!from.value){
+			plus.runtime.quit();
+		}else{
+			uni.navigateBack();
+		}
 	};
 
 	const showRules = () => {
@@ -239,6 +246,10 @@
 		}
 	};
   onLoad((options) => {
+	
+	if(options.from){
+		from.value = options.from;
+	}
 	getWelfarePage();
   });
   onHide(() => {
@@ -261,7 +272,7 @@
 				});
 			}else if(benefit.name == 'video'){
 				navTo({
-					url: '/pages_app/video/video'
+					url: '/pages_app/video/video?from=myWelfare'
 				});
 			}else if(benefit.name == 'kejian'){
 				navTo({