李志伟 3 yıl önce
ebeveyn
işleme
c9fbaf517b

+ 16
- 11
src/pages/TobeShop/index.jsx Dosyayı Görüntüle

@@ -1,5 +1,5 @@
1 1
 import Taro from "@tarojs/taro";
2
-import { Button, Icon, Text, Textarea, View } from "@tarojs/components";
2
+import { Button, Icon, ScrollView, Text, Textarea, View } from "@tarojs/components";
3 3
 import { useState, useEffect } from "react";
4 4
 import withLayout from "@/layouts";
5 5
 import CustomNav from "@/components/CustomNav";
@@ -108,7 +108,6 @@ export default withLayout((props) => {
108 108
       Taro.showLoading({
109 109
         title: '核销中'
110 110
       })
111
-
112 111
       setSubmiting(true);
113 112
       Promise.all(checked.map(verifyNo => putVerifyTarget(verifyNo)))
114 113
         .then(res => {
@@ -172,7 +171,7 @@ export default withLayout((props) => {
172 171
           </button>
173 172
         </view>
174 173
       </Popup>
175
-      <view>
174
+      <view className='index-navbar'>
176 175
         <view className='position-header'>
177 176
           <image className='position-LocationBig' src={LocationBig} />
178 177
           <text cla='position-LocationBig-text'>
@@ -187,19 +186,25 @@ export default withLayout((props) => {
187 186
           />
188 187
           <text className='shop-title-title'>请选择你要核销的套餐</text>
189 188
         </view>
190
-        <SpinBox loading={loading}>
191
-          {(list || []).map((item) => {
192
-            return (
193
-              <TBCard item={item} key={item.verifyNo} checked={checked} handleCheck={handleCheck} />             
194
-            )           
195
-          })}
196
-        </SpinBox>
189
+      </view>
190
+      <View className='index-container'>
191
+        <ScrollView scrollY style={{height:'100%'}}>
192
+          <SpinBox loading={loading}>
193
+            {(list || []).map((item) => {
194
+              return (
195
+                <TBCard item={item} key={item.verifyNo} checked={checked} handleCheck={handleCheck} />
196
+              )
197
+            })}
198
+          </SpinBox>
199
+        </ScrollView>
200
+      </View>
201
+      <View className='index-tabber'>
197 202
         <view className='button-info'>
198 203
           <Button className='button-box' onClick={handleVerifyClick}>
199 204
             {btnText}
200 205
           </Button>
201 206
         </view>
202
-      </view>
207
+      </View>
203 208
     </view>
204 209
   );
205 210
 });

+ 6
- 7
src/pages/TobeShop/style.less Dosyayı Görüntüle

@@ -1,7 +1,9 @@
1 1
 @whiteColor: #fff;
2 2
 
3 3
 .shop-Eat {
4
-  padding: 0 30px;
4
+  .coupon-card{
5
+    margin: 30px;
6
+  }
5 7
   .Consumption-Now {
6 8
     font-size: 34px;
7 9
     font-weight: bold;
@@ -36,6 +38,7 @@
36 38
   .position-header {
37 39
     display: flex;
38 40
     align-items: center;
41
+    margin: 0 30px;
39 42
     .position-LocationBig {
40 43
       width: 35px;
41 44
       height: 42px;
@@ -53,8 +56,7 @@
53 56
     width: 100%;
54 57
     display: flex;
55 58
     align-items: center;
56
-    margin-top: 71px;
57
-    margin-bottom: 41px;
59
+    margin: 71px 30px 41px 30px;
58 60
     .shop-title-image-cup {
59 61
       width: 32px;
60 62
       height: 32px;
@@ -69,10 +71,7 @@
69 71
     }
70 72
   }
71 73
   .button-info {
72
-    margin-bottom: 80px;
73
-    position: absolute;
74
-    bottom: 0;
75
-    width: calc(100% - 60px);
74
+    margin:0 30px 80px;
76 75
     .button-box {
77 76
       height: 92px;
78 77
       line-height: 92px;

+ 5
- 0
src/pages/index/tabs/Recommend.jsx Dosyayı Görüntüle

@@ -5,6 +5,7 @@ import locationimg from '@/assets/icons/housemantj/location.png'
5 5
 import Tip from '@/components/tip'
6 6
 import List from '@/components/List';
7 7
 import { getIndexType, getResourceList } from '@/services/home'
8
+import { View } from '@tarojs/components';
8 9
 import Card from '../components/Card'
9 10
 import NoData from '@/components/NoData'
10 11
 import './less/Recommend.less'
@@ -60,6 +61,7 @@ export default (props) => {
60 61
 
61 62
 
62 63
   return (
64
+    // <view style={{ height: '100%', overflow: 'hidden',display:'flex',flexDirection:'column' }}>
63 65
     <view style={{ height: '100%', overflow: 'hidden' }}>
64 66
       <view className='search' onClick={onSearch}>
65 67
         <input className='searchInput' disabled />
@@ -86,8 +88,10 @@ export default (props) => {
86 88
           </mp-tabs>
87 89
         </scroll-view>
88 90
       </view>
91
+      {/* <View style={{flex:'auto'}}> */}
89 92
       <List
90 93
         ref={listRef}
94
+        // style={{ height: '100%' }}
91 95
         style={{ height: 'calc(100% - 145px)' }}
92 96
         request={getResourceList}
93 97
         params={queryParams}
@@ -103,6 +107,7 @@ export default (props) => {
103 107
             </view>
104 108
         }
105 109
       </List>
110
+      {/* </View> */}
106 111
     </view>
107 112
   )
108 113
 }