1002884655 4 lat temu
rodzic
commit
dd936d12a1
2 zmienionych plików z 20 dodań i 14 usunięć
  1. 19
    13
      src/layouts/index.jsx
  2. 1
    1
      src/pages/ShouYe/index.jsx

+ 19
- 13
src/layouts/index.jsx Wyświetl plik

@@ -49,6 +49,9 @@ export default function (props) {
49 49
         }
50 50
       })
51 51
     }
52
+    if (user !== null) {
53
+      setShowAddLayer(true)
54
+    }
52 55
   }, [user])
53 56
 
54 57
   // 埋点
@@ -112,19 +115,6 @@ export default function (props) {
112 115
   return (
113 116
     <Spin loading={loading}>
114 117
 
115
-      <view className={ShowAddLayer ? 'AddRenZhengLayer active' : 'AddRenZhengLayer'}>
116
-        <view className='centerLabel'>
117
-          <view>
118
-            <scroll-view scroll-y='true'>
119
-              {
120
-                ShowAddLayer &&
121
-                <AddYeZhuRenZheng Close={() => { setShowAddLayer(false) }}></AddYeZhuRenZheng>
122
-              }
123
-            </scroll-view>
124
-          </view>
125
-        </view>
126
-      </view>
127
-
128 118
       {/* 广告 */}
129 119
       <view className='AdvLayer' style={{ display: user !== null && user.ShowIndexAdv !== undefined && user.ShowIndexAdv ? 'block' : 'none' }}>
130 120
         <view className='centerLabel'>
@@ -138,6 +128,22 @@ export default function (props) {
138 128
       {
139 129
         props.children
140 130
       }
131
+
132
+      {
133
+        user !== null &&
134
+        <view className={ShowAddLayer ? 'AddRenZhengLayer active' : 'AddRenZhengLayer'}>
135
+          <view className='centerLabel'>
136
+            <view>
137
+              <scroll-view scroll-y='true'>
138
+                {
139
+                  ShowAddLayer &&
140
+                  <AddYeZhuRenZheng Close={() => { setShowAddLayer(false) }}></AddYeZhuRenZheng>
141
+                }
142
+              </scroll-view>
143
+            </view>
144
+          </view>
145
+        </view>
146
+      }
141 147
     </Spin>
142 148
   )
143 149
 }

+ 1
- 1
src/pages/ShouYe/index.jsx Wyświetl plik

@@ -31,7 +31,7 @@ export default function Index (props) {
31 31
   const [NewsList, setNewsList] = useState([])
32 32
 
33 33
   useUserMounted(() => {
34
-    Refresh()
34
+    Init()
35 35
   })
36 36
 
37 37
   const Init = (done = () => { }) => { // 初始化