Преглед на файлове

Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

李志伟 преди 3 години
родител
ревизия
9edd866a71

+ 1
- 0
src/components/Spin/style.less Целия файл

139
 
139
 
140
 .loading-wrapper {
140
 .loading-wrapper {
141
   height: 100%;
141
   height: 100%;
142
+
142
   position: relative;
143
   position: relative;
143
   overflow: hidden;
144
   overflow: hidden;
144
 
145
 

+ 9
- 1
src/pages/PayOrder/index.jsx Целия файл

93
       //   requestPayment(payInfo);
93
       //   requestPayment(payInfo);
94
       //   return;
94
       //   return;
95
       // }
95
       // }
96
-
97
       Taro.showLoading({
96
       Taro.showLoading({
98
         title: '支付中',
97
         title: '支付中',
99
       })
98
       })
100
 
99
 
101
       if (packageId) {
100
       if (packageId) {
101
+        if (!totalPrice?.actualPrice) {
102
+          Taro.showToast({
103
+            title: '请选择有效账单',
104
+            icon: 'none'
105
+          })
106
+          return
107
+        }
108
+
109
+
102
         saveOrder(
110
         saveOrder(
103
           list.map((x) => {
111
           list.map((x) => {
104
             return {
112
             return {

+ 27
- 29
src/shop/components/ShopKeeper/shopKeeper.jsx Целия файл

82
     onVarified()
82
     onVarified()
83
   }
83
   }
84
 
84
 
85
-
86
   const [showCutover, setShowCutover] = useState(false)
85
   const [showCutover, setShowCutover] = useState(false)
87
   const ShowMoldeOn = () => {
86
   const ShowMoldeOn = () => {
88
     setShowCutover(true)
87
     setShowCutover(true)
135
           >
134
           >
136
           </mp-tabs>
135
           </mp-tabs>
137
         </view>
136
         </view>
138
-        <view>
137
+        <view  >
139
           {/* 未核销 */}
138
           {/* 未核销 */}
140
           {activeTab === 0 &&
139
           {activeTab === 0 &&
141
-            <>
142
-              <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
143
-                <List
144
-                  style={{ height: '50%' }}
145
-                  request={getVerifiedOrder}
146
-                  params={queryParams}
147
-                  onDataChange={setAllList}
148
-                  noData={<NoData />}
149
-                  render={({ item, index }) =>
150
-                    <ShopUnused key={(index)} item={item} />}
151
-                >
152
-                </List>
153
-              </scroll-view>
154
-            </>
140
+            <view style={{ height: '45vh' }}>
141
+              <List
142
+                style={{ height: '100%' }}
143
+                request={getVerifiedOrder}
144
+                params={queryParams}
145
+                onDataChange={setAllList}
146
+                noData={<NoData />}
147
+                render={({ item, index }) =>
148
+                  <ShopUnused key={(index)} item={item} />}
149
+              >
150
+              </List>
151
+            </view>
152
+
155
           }
153
           }
156
           {/* 已核销 */}
154
           {/* 已核销 */}
157
           {activeTab === 1 &&
155
           {activeTab === 1 &&
158
-            <>
159
-              <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
160
-                <List
161
-                  style={{ height: '50%' }}
162
-                  noData={<NoData />}
163
-                  request={getVerifiedOrder}
164
-                  params={queryParams}
165
-                  onDataChange={setAllList}
166
-                  render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
167
-                >
168
-                </List>
169
-              </scroll-view>
170
-            </>
156
+            <view style={{ height: '45vh' }}>
157
+
158
+              <List
159
+                style={{ height: '100%' }}
160
+                noData={<NoData />}
161
+                request={getVerifiedOrder}
162
+                params={queryParams}
163
+                onDataChange={setAllList}
164
+                render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
165
+              >
166
+              </List>
167
+            </view>
168
+
171
           }
169
           }
172
         </view>
170
         </view>
173
       </view>
171
       </view>

+ 11
- 11
src/shop/components/Sparead/spreadMoney.jsx Целия файл

85
 
85
 
86
 
86
 
87
         <view className='title'>推广收入记录</view>
87
         <view className='title'>推广收入记录</view>
88
-
89
-        <List
90
-          style={{ height: '50%' }}
91
-          request={reqestAPI}
92
-          params={queryParams}
93
-          noData={<NoData />}
94
-          render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
95
-        >
96
-        </List>
97
-
88
+        <view style={{ height: '50vh' }}>
89
+
90
+          <List
91
+            style={{ height: '100%' }}
92
+            request={reqestAPI}
93
+            params={queryParams}
94
+            noData={<NoData />}
95
+            render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
96
+          >
97
+          </List>
98
+        </view>
98
       </view>
99
       </view>
99
-
100
     </view >
100
     </view >
101
   )
101
   )
102
 }
102
 }

+ 3
- 2
src/shop/pages/spread/spreadIndex.jsx Целия файл

17
 
17
 
18
 
18
 
19
 import './spreadIndex.less'
19
 import './spreadIndex.less'
20
+import { View } from '@tarojs/components'
20
 
21
 
21
 
22
 
22
 export default withLayout((props) => {
23
 export default withLayout((props) => {
105
   }, [tab])
106
   }, [tab])
106
 
107
 
107
   return (
108
   return (
108
-    <SpinBox loading={loading} className='page-index'>
109
+    <View className='page-index'>
109
       <view className='index-navbar'>
110
       <view className='index-navbar'>
110
         <CustomNav logo='none' title={shop?.shopName} />
111
         <CustomNav logo='none' title={shop?.shopName} />
111
       </view>
112
       </view>
117
       <view className='index-tabbar'>
118
       <view className='index-tabbar'>
118
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
119
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
119
       </view>
120
       </view>
120
-    </SpinBox>
121
+    </View>
121
 
122
 
122
   )
123
   )
123
 
124