吃个甘蔗嚼一年 před 3 roky
rodič
revize
c53bcdcbc5
1 změnil soubory, kde provedl 20 přidání a 15 odebrání
  1. 20
    15
      src/shop/components/ShopKeeper/shopKeeper.jsx

+ 20
- 15
src/shop/components/ShopKeeper/shopKeeper.jsx Zobrazit soubor

@@ -142,27 +142,32 @@ export default (props) => {
142 142
           >
143 143
           </mp-tabs>
144 144
         </view>
145
-        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
146 145
 
147
-          <view>
148
-            {/* 未核销 */}
149
-            {activeTab === 0 &&
150
-              <>
146
+        <view>
147
+          {/* 未核销 */}
148
+          {activeTab === 0 &&
149
+            <>
150
+              <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
151
+
151 152
                 <List
152 153
                   style={{ height: '50%' }}
153 154
                   request={getVerifiedOrder}
154 155
                   params={queryParams}
155 156
                   onDataChange={setAllList}
156 157
                   noData={<NoData />}
157
-                  render={({ item, index }) => <ShopUnused key={(index)} item={item} />}
158
+                  render={({ item, index }) =>
159
+                    <ShopUnused key={(index)} item={item} />}
158 160
                 >
159 161
                 </List>
160
-              </>
162
+              </scroll-view>
163
+
164
+            </>
161 165
 
162
-            }
163
-            {/* 已核销 */}
164
-            {activeTab === 1 &&
165
-              <>
166
+          }
167
+          {/* 已核销 */}
168
+          {activeTab === 1 &&
169
+            <>
170
+              <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
166 171
                 <List
167 172
                   style={{ height: '50%' }}
168 173
                   noData={<NoData />}
@@ -172,11 +177,11 @@ export default (props) => {
172 177
                   render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
173 178
                 >
174 179
                 </List>
180
+              </scroll-view>
175 181
 
176
-              </>
177
-            }
178
-          </view>
179
-        </scroll-view>
182
+            </>
183
+          }
184
+        </view>
180 185
 
181 186
         {/* <view className='botton'>这是我的底线</view> */}
182 187
       </view>