吃个甘蔗嚼一年 3 jaren geleden
bovenliggende
commit
c53bcdcbc5
1 gewijzigde bestanden met toevoegingen van 20 en 15 verwijderingen
  1. 20
    15
      src/shop/components/ShopKeeper/shopKeeper.jsx

+ 20
- 15
src/shop/components/ShopKeeper/shopKeeper.jsx Bestand weergeven

142
           >
142
           >
143
           </mp-tabs>
143
           </mp-tabs>
144
         </view>
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
                 <List
152
                 <List
152
                   style={{ height: '50%' }}
153
                   style={{ height: '50%' }}
153
                   request={getVerifiedOrder}
154
                   request={getVerifiedOrder}
154
                   params={queryParams}
155
                   params={queryParams}
155
                   onDataChange={setAllList}
156
                   onDataChange={setAllList}
156
                   noData={<NoData />}
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
                 </List>
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
                 <List
171
                 <List
167
                   style={{ height: '50%' }}
172
                   style={{ height: '50%' }}
168
                   noData={<NoData />}
173
                   noData={<NoData />}
172
                   render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
177
                   render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
173
                 >
178
                 >
174
                 </List>
179
                 </List>
180
+              </scroll-view>
175
 
181
 
176
-              </>
177
-            }
178
-          </view>
179
-        </scroll-view>
182
+            </>
183
+          }
184
+        </view>
180
 
185
 
181
         {/* <view className='botton'>这是我的底线</view> */}
186
         {/* <view className='botton'>这是我的底线</view> */}
182
       </view>
187
       </view>