From 2367995a9d9314f9448699fb78c0db9ade5b8c61 Mon Sep 17 00:00:00 2001
From: zengBin <web260320689@163.com>
Date: Fri, 18 Oct 2024 15:29:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home/information.wpy |  4 ++++
 src/pages/news/systemNews.wpy  | 37 +++++++++++-----------------------
 src/pages/tabBar/dynamic.wpy   |  3 ++-
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/pages/home/information.wpy b/src/pages/home/information.wpy
index 62843b1..1359f8f 100644
--- a/src/pages/home/information.wpy
+++ b/src/pages/home/information.wpy
@@ -3,6 +3,10 @@
 page {
   background-color: #f5f5f5;
 }
+.ui-information{
+  width: 100vw;
+  overflow-x: hidden;
+}
 .ui-abnormal{
   width: 100%;
   padding-bottom: 300rpx;
diff --git a/src/pages/news/systemNews.wpy b/src/pages/news/systemNews.wpy
index f12bbcf..2eb6fdb 100644
--- a/src/pages/news/systemNews.wpy
+++ b/src/pages/news/systemNews.wpy
@@ -5,6 +5,8 @@ page {
 }
 
 .ui-container{
+  padding-bottom: 100rpx;
+
   .ui-no-data-icon{
     width: 250rpx;
     height: 250rpx;
@@ -92,6 +94,7 @@ page {
       .rit{
         width: 540rpx;
         padding: 20rpx;
+        height: fit-content;
         display: inline-flex;
         flex-flow: column;
         align-items: center;
@@ -161,7 +164,7 @@ page {
                 </view>
               </block>
               <block v-else>
-                <block v-if="item.type != 'friend' && item.type != 'marketing'">
+                <block v-if="item.type != 'friend' && item.type != 'marketing' && item.type != 'gift'">
                   <view v-if="item.type == 'remind_profile'" class="font_24 color-666 friend-text">{{item.content}}>>点击查看</view>
                   <view v-else class="font_24 color-666 friend-text">点击查看>></view>
                 </block>
@@ -251,37 +254,20 @@ wepy.page({
         }
       })
     },
-    jumpH5({path_url, path_type}) {
-      let vm = this
-      wx.login({
-        success: () => {
-          let data = {code: code}
-          vm.$post({url: `${service.host}/chat/message/send`, data}).then(({code, data}) => {
-            if (code == 0) {
-              if (path_type == 2) {
-                wx.navigateTo({url: `/pages/books/bookDetail?url=${encodeURIComponent(path_url)}`})
-              } else {
-                wx.navigateTo({url: path_url})
-              }
-            }
-          }).catch(() => {
-          })
-        },
-        fail: () => {
-        }
-      })
-    },
     jumpPath(e) {
       let url = ``
       if (e.type == 'system' || e.type == 'gift' || e.type == 'marketing') {
-        return
+        if (!e.path_url) {
+          return
+        }
+        wx.navigateTo({url: `/pages/books/bookDetail?url=${encodeURIComponent(e.path_url)}`})
       }
       if (e.type == 'follow' || e.type == 'friend' || e.type == 'remind_profile') {
         url = `/pages/home/information?id=${e.user_id}`
       } else if (e.type == 'temp') {
         url = `/pages/users/tempMember`
       } else if (e.type == 'moment' || e.type == 'change_moment_topic') {
-        url = `/pages/dynamic/feedDetail?id=${e.type_id}`
+        url = `/pages/dynamic/dynamicDetail?id=${e.type_id}`
       }
       wx.navigateTo({url: url})
     },
@@ -312,8 +298,9 @@ wepy.page({
   },
   onShow() {
   },
-  created() {
-    this.getList()
+  onLoad() {
+    let vm = this
+    vm.getList()
   }
 })
 </script>
diff --git a/src/pages/tabBar/dynamic.wpy b/src/pages/tabBar/dynamic.wpy
index f3c2e8f..affa474 100644
--- a/src/pages/tabBar/dynamic.wpy
+++ b/src/pages/tabBar/dynamic.wpy
@@ -232,7 +232,7 @@ wepy.page({
     tabBarList: ['动态'],
     tabBarIndex: 0,
 
-    admin: '1',
+    admin: false,
     dynamicTabs: ['推荐', '最新'],
     dynamicTabsIndex: 0,
     dynamicList: [],
@@ -427,6 +427,7 @@ wepy.page({
     let vm = this
     vm.getList()
     vm.getHotTopics()
+    vm.admin = wx.getStorageSync('userInfo').is_moment_admin
   }
 })
 </script>