2.6提交

pages/live/live.vue

@@ -3,6 +3,7 @@
     <view class="status_bar"></view>
     <uni-nav-bar
     title="肝胆会议"
+    :left-icon="from?'left':''"
     @clickLeft="goBack"
     color="#8B2316"
     :border="false"
@@ -66,6 +67,7 @@
     <scroll-view
       ref="scrollView"
       class="scroll-content"
+      :class="{'active':from}"
       scroll-y="true"
       refresher-enabled="true"
       :refresher-triggered="isRefreshing"
@@ -245,7 +247,7 @@
     </view>
 
     <!-- 底部导航栏 -->
-    <CustomTabbar></CustomTabbar>
+    <CustomTabbar v-if="!from"></CustomTabbar>
     <topTip ref="topTipRef" title="相机权限使用说明" content="“肝胆相照”想使用您的相机和访问您的媒体，用于帮助您进行后续的扫码活动"></topTip>
   </view>
 </template>
@@ -288,6 +290,7 @@ const pageSize = ref(10);
 const scrollTop = ref(0);
 const permissionListener=ref(null);
 const topTipRef=ref(null);
+const from=ref('');
 const goToMeetHistroy = () => {
   navTo({
     url: "/pages_app/meetHistroy/meetHistroy",
@@ -297,7 +300,10 @@ const goToMeetHistroy = () => {
 onUnload (() => {
   permissionListener.value?.stop();
 });
- onLoad(()=>{	
+ onLoad((options)=>{	
+  if(options.from){
+    from.value=options.from;
+  }
 	// #ifdef APP-PLUS
    permissionListener.value=uni.createRequestPermissionListener();
    console.log('放在onLoad执行');
@@ -384,9 +390,15 @@ const goDetail = (item) => {
   uni.navigateTo({
     url: `/pages_app/webview/webview?url=${encoded}&sharetitle=${item.title}&bg=1&type=live_yugao&imgPath=${imgPath}&share=1&title=会议详情`,
   });
+};
+const goBack = () => {
+  if(from.value){
+    uni.navigateBack();
+  }
 };
  onBackPress(() => {
-  try{
+  if(!from.value){
+    try{
 			uni.sendNativeEvent('goTabbarPage', {
 			msg: 'home'
 		},ret => {
@@ -397,6 +409,7 @@ const goDetail = (item) => {
 		}
     plus.runtime.quit()
     return true;
+  }
 })
 const sendWebsocketMsg = (code) => {
   let userInfo = uni.getStorageSync("userInfo");
@@ -1068,6 +1081,9 @@ $shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
   right: 0;
   bottom:120rpx; // 底部导航栏高度
   width: 100%;
+  &.active{
+    bottom:10rpx;
+  }
 }
 
 // 筛选标签栏