Bläddra i källkod

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

张延森 3 år sedan
förälder
incheckning
0d647e70d1

+ 1
- 1
config/dev.js Visa fil

@@ -4,7 +4,7 @@ module.exports = {
4 4
   },
5 5
   defineConstants: {
6 6
     // HOST: '"http://192.168.89.147:8080"',
7
-    HOST: '"https://sgl-v2.njyunzhi.com"',
7
+    HOST: '"http://sgl-v2-test.njyunzhi.com"',
8 8
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
9 9
   },
10 10
   mini: {},

+ 0
- 9
project.tt.json Visa fil

@@ -1,9 +0,0 @@
1
-{
2
-  "miniprogramRoot": "./",
3
-  "projectname": "miniapp",
4
-  "appid": "touristappid",
5
-  "setting": {
6
-    "es6": false,
7
-    "minified": false
8
-  }
9
-}

+ 2
- 1
src/components/BossCard/index.jsx Visa fil

@@ -3,6 +3,7 @@ import { View, Text } from '@tarojs/components'
3 3
 import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
4 4
 import { getQueryString } from '@/utils/index'
5 5
 import CouponCard from '@/components/CouponCard'
6
+import { compressImage } from '@/utils'
6 7
 import Location from '@/components/Location'
7 8
 import SaveIcon from '@/components/SaveIcon'
8 9
 
@@ -32,7 +33,7 @@ export default (props) => {
32 33
       <CouponMedia onClick={goFood}>
33 34
         <CouponMedia.Header
34 35
           cashback={item.cashback}
35
-          image={item.poster}
36
+          image={compressImage(item.poster)}
36 37
           badge='food'
37 38
         />
38 39
         <CouponMedia.Body star={st}>

+ 3
- 2
src/components/CollectList/MyCollect/index.jsx Visa fil

@@ -4,6 +4,7 @@ import formatPrice from "@/utils/formatPrice";
4 4
 import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
5 5
 import baozan from '@/assets/icons/housemantj/bgood.png'
6 6
 import CouponCard from '@/components/CouponCard'
7
+import { compressImage } from '@/utils'
7 8
 import Location from '@/components/Location'
8 9
 import './style.less'
9 10
 
@@ -34,7 +35,7 @@ export default (props) => {
34 35
                 <CouponMedia>
35 36
                   <CouponMedia.Header
36 37
                     cashback={item.cashback}
37
-                    image={item.poster}
38
+                    image={compressImage(item.poster)}
38 39
                     badge='food'
39 40
                   />
40 41
                   <CouponMedia.Body star={star}>
@@ -60,7 +61,7 @@ export default (props) => {
60 61
               <CouponCard action={PayAction}>
61 62
                 <CouponMedia>
62 63
                   <CouponMedia.Header
63
-                    image={item.poster}
64
+                    image={compressImage(item.poster)}
64 65
                     badge={targetType}
65 66
                   />
66 67
                   <CouponMedia.Body >

+ 2
- 1
src/components/CompoentsOrder/AlreadyUsed/index.jsx Visa fil

@@ -4,6 +4,7 @@ import { View } from '@tarojs/components'
4 4
 import starOn from '@/assets/icons/GuideCheck/starOn.png'
5 5
 import starOff from '@/assets/icons/GuideCheck/starOff.png'
6 6
 import formatTime from '@/utils/formatTime'
7
+import { compressImage } from '@/utils'
7 8
 import food from '@/assets/icons/ProCard/food.png'
8 9
 import Popup from '@/components/Popup'
9 10
 import { saveEvaluate } from '@/services/mine'
@@ -73,7 +74,7 @@ export default (props) => {
73 74
         </View>
74 75
         <View className='v2'>
75 76
           <View className='title-image' >
76
-            <image className='image-1' mode='scaleToFill' src={item.poster || []}></image>
77
+            <image className='image-1' mode='scaleToFill' src={compressImage(item.poster) || []}></image>
77 78
             <image className='image-2' src={food}></image>
78 79
           </View>
79 80
           <View className='title-content'>

+ 43
- 28
src/components/CompoentsOrder/OrderCard/index.jsx Visa fil

@@ -1,8 +1,11 @@
1 1
 import Taro from "@tarojs/taro";
2 2
 import { View, Text } from '@tarojs/components'
3
+import { compressImage } from '@/utils'
4
+import { parseQueryString } from '@/utils/index'
3 5
 import formatTime from "@/utils/formatTime";
4 6
 import SlideView from '@/components/SlideView';
5 7
 import CouponCard from '@/components/CouponCard'
8
+import { getQrcode } from '@/services/miniapp'
6 9
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
7 10
 import refund from "@/assets/icons/GuideCheck/refund.png";
8 11
 import Cancel from "@/assets/icons/UserCenter/Cancel.png";
@@ -34,9 +37,21 @@ export default (props) => {
34 37
       onlyFromCamera: true,
35 38
       success: (res) => {
36 39
         if (res.path) {
37
-          Taro.navigateTo({
38
-            url: `/${res.path}&subOrderId=${item.subOrderId}`,
39
-          });
40
+          getQrcode(parseQueryString(res.path.split('?')[1]).scene).then((res2) => {
41
+            const maid = res2.scene.split('=')[1].split('&')[0] //二维码的商铺id
42
+            if (maid == item.shopId) {
43
+              Taro.navigateTo({
44
+                url: `/${res.path}&subOrderId=${item.subOrderId}`,
45
+              });
46
+            } else {
47
+              Taro.showToast({
48
+                title: "非套餐对应店铺二维码",
49
+                icon: "none",
50
+                duration: 2000,
51
+              });
52
+            }
53
+          })
54
+
40 55
         } else {
41 56
           Taro.showToast({
42 57
             title: "非当前小程序生成二维码",
@@ -71,27 +86,27 @@ export default (props) => {
71 86
   //                 item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
72 87
   //                   item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
73 88
 
74
-  let PayAction=null
75
-  if (kkp=='1') {//空卡片用于售后详情页面
76
-    PayAction=null
77
-  }else if (sh=='1') {//售后页面卡片
78
-     PayAction=<Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} />
79
-  }else if (item.status===0) {//待支付
80
-     PayAction=<Action.Icon icon={Pay} text='支付' onClick={handleDetail} />
81
-  }else if (item.status === 1 && item.isVerified == false) {//待核销
82
-     PayAction=<Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} />
83
-  }else if (item.status === 2 && item.isVerified == false) {//已退费
84
-     PayAction=<Action.Image image={refund} />
85
-  }else if (item.status === 7 && item.isVerified == false) {//已取消
86
-     PayAction=<Action.Image image={Cancel} />
87
-  }else if(item.status === 9){//已过期
88
-     PayAction=<Action.Image image={Null} />
89
-  }else if (item.isVerified == true && item.isEvaluated > 0) {//已评价
90
-     PayAction=<Action.Image image={Evaluated} />
91
-  }else if (item.isVerified == true) {//待评价
92
-     PayAction=<Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} />
93
-  }else{
94
-    PayAction=null
89
+  let PayAction = null
90
+  if (kkp == '1') {//空卡片用于售后详情页面
91
+    PayAction = null
92
+  } else if (sh == '1') {//售后页面卡片
93
+    PayAction = <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} />
94
+  } else if (item.status === 0) {//待支付
95
+    PayAction = <Action.Icon icon={Pay} text='支付' onClick={handleDetail} />
96
+  } else if (item.status === 1 && item.isVerified == false) {//待核销
97
+    PayAction = <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} />
98
+  } else if (item.status === 2 && item.isVerified == false) {//已退费
99
+    PayAction = <Action.Image image={refund} />
100
+  } else if (item.status === 7 && item.isVerified == false) {//已取消
101
+    PayAction = <Action.Image image={Cancel} />
102
+  } else if (item.status === 9) {//已过期
103
+    PayAction = <Action.Image image={Null} />
104
+  } else if (item.isVerified == true && item.isEvaluated > 0) {//已评价
105
+    PayAction = <Action.Image image={Evaluated} />
106
+  } else if (item.isVerified == true) {//待评价
107
+    PayAction = <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} />
108
+  } else {
109
+    PayAction = null
95 110
   }
96 111
 
97 112
   return (
@@ -103,11 +118,11 @@ export default (props) => {
103 118
       {
104 119
         //待支付可以左滑删除
105 120
         item.status === 0 ? <SlideView del onDelete={() => handeDelete(item)} >
106
-          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })}} action={PayAction}>
121
+          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }) }} action={PayAction}>
107 122
             <CouponMedia>
108 123
               <CouponMedia.Header
109 124
                 cashback={item.cashback}
110
-                image={item.poster}
125
+                image={compressImage(item.poster)}
111 126
                 badge='food'
112 127
               />
113 128
               <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>
@@ -137,11 +152,11 @@ export default (props) => {
137 152
           </CouponCard>
138 153
         </SlideView>
139 154
           :
140
-          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })}} action={PayAction} >
155
+          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }) }} action={PayAction} >
141 156
             <CouponMedia>
142 157
               <CouponMedia.Header
143 158
                 cashback={item.cashback}
144
-                image={item.poster}
159
+                image={compressImage(item.poster)}
145 160
                 badge='food'
146 161
               />
147 162
               <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>

+ 3
- 10
src/components/MoreGuide/index.jsx Visa fil

@@ -1,19 +1,15 @@
1 1
 import { Video } from '@tarojs/components';
2
+import { compressImage } from '@/utils'
2 3
 import './style.less'
3 4
 
4 5
 export default (props) => {
5 6
   const { item } = props
6 7
   return (
7
-
8 8
     <>
9
-
10 9
       {
11
-
12 10
         item.contentType == 'image' ?
13
-
14
-          <image src={item.content} mode='widthFix' style={{ width: '100%' }} className='image-content' /> :
11
+          <image src={compressImage(item.content)} mode='widthFix' style={{ width: '100%' }} className='image-content' /> :
15 12
           item.contentType == 'text' ?
16
-
17 13
             <view style={{ marginBottom: '5px' }}>
18 14
               <view className='storezn'>{item.content}</view>
19 15
             </view>
@@ -24,9 +20,6 @@ export default (props) => {
24 20
               loop={false}
25 21
               muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
26 22
       }
27
-
28 23
     </>
29 24
   )
30
-}
31
-
32
-
25
+}

+ 2
- 3
src/components/OrderMolded/index.jsx Visa fil

@@ -1,10 +1,9 @@
1 1
 import { useState } from 'react'
2 2
 
3 3
 import { Button, Radio, View } from '@tarojs/components'
4
-import PayOrderCard from '@/components/PayOrderCard'
5 4
 import formatTimes from '@/utils/formatTime'
5
+import { compressImage } from '@/utils'
6 6
 import food from '@/assets/icons/ProCard/food.png'
7
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
8 7
 import './style.less'
9 8
 
10 9
 export default (props) => {
@@ -15,7 +14,7 @@ export default (props) => {
15 14
       <view class='left-complete-one-cardOrder'>
16 15
         <View className='left-viewText-payOrder'>返现¥{(item.cashback / 100).toFixed(2)}</View>
17 16
         <view className='title-image-cardOrder'>
18
-          <image className='image-1-cardOrder' mode='scaleToFill' src={item.poster}></image>
17
+          <image className='image-1-cardOrder' mode='scaleToFill' src={compressImage(item.poster)}></image>
19 18
           <image className='image-2-cardOrder' src={food}></image>
20 19
         </view>
21 20
         <view className='title-content-cardOrder'>

+ 3
- 2
src/components/PayOrderCard/index.jsx Visa fil

@@ -1,7 +1,8 @@
1 1
 import formatTimes from '@/utils/formatTime'
2 2
 import { useState, useEffect } from 'react'
3
-import { Button, Radio, Input } from '@tarojs/components'
3
+import { Input } from '@tarojs/components'
4 4
 import food from '@/assets/icons/ProCard/food.png'
5
+import { compressImage } from '@/utils'
5 6
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
6 7
 import OrderMolded from '@/components/OrderMolded'
7 8
 import Popup from '@/components/Popup'
@@ -90,7 +91,7 @@ export default (props) => {
90 91
               返现¥{(item.cashback / 100).toFixed(2)}
91 92
             </view>
92 93
             <view className='title-image'>
93
-              <image className='image-1' mode='scaleToFill' src={item.poster}></image>
94
+              <image className='image-1' mode='scaleToFill' src={compressImage(item.poster)}></image>
94 95
               <image className='image-2' src={food}></image>
95 96
             </view>
96 97
             <view className='title-content'>

+ 3
- 1
src/components/ShopUnused/index.jsx Visa fil

@@ -1,5 +1,7 @@
1 1
 import Taro from '@tarojs/taro'
2 2
 import { useState, useEffect } from 'react'
3
+import { compressImage } from '@/utils'
4
+
3 5
 import formatTimes from '@/utils/formatTime'
4 6
 
5 7
 
@@ -22,7 +24,7 @@ export default (props) => {
22 24
         <view className='orderTime'>下单日期:{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm')}</view>
23 25
       </view>
24 26
       <view className='order'>
25
-        <image className='orderImg' src={item.poster} mode='aspectFit' />
27
+        <image className='orderImg' src={compressImage(item.poster)} mode='aspectFit' />
26 28
         <view className='orderRight'>
27 29
           <view className='foodName'>{item.description}</view>
28 30
 

+ 2
- 3
src/components/ShopUsed/index.jsx Visa fil

@@ -1,6 +1,7 @@
1 1
 import Taro from '@tarojs/taro'
2 2
 import { setGetVerifiedOrder } from '@/services/shopBoss'
3 3
 import { View, Text, Image } from '@tarojs/components'
4
+import { compressImage } from '@/utils'
4 5
 import { useState } from 'react'
5 6
 import formatTimes from '@/utils/formatTime'
6 7
 import './style.less'
@@ -36,14 +37,12 @@ export default (props) => {
36 37
         <View className='orderTime'>下单日期:{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm') || ''}</View>
37 38
       </View>
38 39
       <View className='order'>
39
-        <Image className='orderImg' src={item.poster} mode='aspectFit' />
40
+        <Image className='orderImg' src={compressImage(item.poster)} mode='aspectFit' />
40 41
         <View className='orderRight'>
41 42
           <View className='foodName'>{item.description}</View>
42 43
           <View className='price'>合计金额:¥<Text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</Text>元 <Text className='pnum'>数量:<Text>1</Text>张</Text> </View>
43 44
         </View>
44
-
45 45
         <View className='veri_Date' > 核销时间:{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>
46
-
47 46
         <View className='line' />
48 47
         <View className='phone'>客户手机:<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
49 48
           {

+ 1
- 1
src/components/Spin/SpinBox.jsx Visa fil

@@ -7,7 +7,7 @@ import './style.less'
7 7
 const Loading = (props) => {
8 8
   const { loading, size = '64rpx', ...leftProps } = props
9 9
 
10
-  const cls = ['loading-box', loading? 'active' : undefined].filter(Boolean).join(' ')
10
+  const cls = ['loading-box', loading ? 'active' : undefined].filter(Boolean).join(' ')
11 11
 
12 12
   return (
13 13
     <View className={cls}>

+ 2
- 1
src/components/foodCards/foodCards.jsx Visa fil

@@ -2,6 +2,7 @@ import Taro from '@tarojs/taro'
2 2
 import { View, Text } from '@tarojs/components'
3 3
 import CouponCard from '@/components/CouponCard'
4 4
 import Location from '@/components/Location'
5
+import { compressImage } from '@/utils'
5 6
 import SaveIcon from '@/components/SaveIcon'
6 7
 import Pay from '@/assets/icons/housemantj/pay.png'
7 8
 import './style.less'
@@ -27,7 +28,7 @@ export default (props) => {
27 28
         <CouponMedia onClick={goshop ? '' : goFood}>
28 29
           <CouponMedia.Header
29 30
             cashback={item.cashback}
30
-            image={item.poster}
31
+            image={compressImage(item.poster)}
31 32
             badge='food'
32 33
           />
33 34
           <CouponMedia.Body star={st}>

+ 2
- 1
src/hotel/pages/components/Extend/index.jsx Visa fil

@@ -3,6 +3,7 @@ import Taro from '@tarojs/taro';
3 3
 import Popup from '@/components/Popup'
4 4
 import { View, Image, Textarea, Label, Button, Video } from '@tarojs/components';
5 5
 import { update, deleteExtend } from '@/services/landlord'
6
+import { compressImage } from '@/utils'
6 7
 import SlideView from '@/components/SlideView';
7 8
 import './style.less'
8 9
 
@@ -96,7 +97,7 @@ export default (props) => {
96 97
         item.contentType == 'image' ?
97 98
           <View>
98 99
             <SlideView del onDelete={handelDelete}>
99
-              <Image src={eimg} mode='widthFix' style={{ width: '100%', display: 'block' }} onClick={handerChange} />
100
+              <Image src={compressImage(eimg)} mode='widthFix' style={{ width: '100%', display: 'block' }} onClick={handerChange} />
100 101
             </SlideView>
101 102
           </View>
102 103
           :

+ 2
- 4
src/pages/PayOrder/Card/index.jsx Visa fil

@@ -1,9 +1,7 @@
1 1
 import formatTime from "@/utils/formatTime";
2
-import { useState, useEffect } from "react";
3
-
2
+import { compressImage } from '@/utils'
4 3
 import formatPrice from "@/utils/formatPrice";
5 4
 import food from "@/assets/icons/ProCard/food.png";
6
-
7 5
 import './style.less'
8 6
 
9 7
 
@@ -19,7 +17,7 @@ export default (props) => {
19 17
           <image
20 18
             className='image-1-payOrder'
21 19
             mode='scaleToFill'
22
-            src={item.poster}
20
+            src={compressImage(item.poster)}
23 21
           ></image>
24 22
           <image className='image-2-payOrder' src={food}></image>
25 23
         </view>

+ 2
- 1
src/pages/TobeShop/Card/index.jsx Visa fil

@@ -4,6 +4,7 @@ import formatTime from "@/utils/formatTime";
4 4
 import CouponCard from '@/components/CouponCard'
5 5
 import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
6 6
 import Check_NO from "@/assets/icons/UserCenter/Check_NO.png";
7
+import { compressImage } from '@/utils'
7 8
 import './style.less'
8 9
 
9 10
 const CouponMedia = CouponCard.Media
@@ -17,7 +18,7 @@ export default (props) => {
17 18
       <CouponMedia>
18 19
         <CouponMedia.Header
19 20
           cashback={item.cashback}
20
-          image={item.poster}
21
+          image={compressImage(item.poster)}
21 22
           badge='food'
22 23
         />
23 24
         <CouponMedia.Body star='ss'>

+ 2
- 1
src/pages/details/components/Extend/extend.jsx Visa fil

@@ -1,4 +1,5 @@
1 1
 import { Video } from '@tarojs/components';
2
+import { compressImage } from '@/utils'
2 3
 import './extend.less'
3 4
 
4 5
 export default (props) => {
@@ -7,7 +8,7 @@ export default (props) => {
7 8
     <view className='cardext'>
8 9
     {
9 10
       item.contentType == 'image' ?
10
-        <image src={item.content} mode='widthFix' style={{ width: '100%'}} /> :
11
+        <image src={compressImage(item.content)} mode='widthFix' style={{ width: '100%'}} /> :
11 12
         item.contentType == 'text' ?
12 13
           <view className='storezn'>{item.content}</view> :
13 14
           <Video

+ 2
- 1
src/pages/details/foodDetails/foodDetails.jsx Visa fil

@@ -9,6 +9,7 @@ import {
9 9
 import { getVerifyTargetList } from "@/services/payOrder";
10 10
 import { useState, useEffect, useRef } from "react";
11 11
 import { Button, Swiper, SwiperItem, View } from "@tarojs/components";
12
+import { compressImage } from '@/utils'
12 13
 import Star from "@/components/Star/Star.jsx";
13 14
 import NoData from '@/components/NoData'
14 15
 import Cards from "@/components/foodCards/foodCards.jsx";
@@ -145,7 +146,7 @@ export default withLayout((props) => {
145 146
               >
146 147
                 {imglist.map((item, inx) => (
147 148
                   <SwiperItem key={inx}>
148
-                    <image src={item.url} mode='aspectFit' className='storeImage' />
149
+                    <image src={compressImage(item.url)} mode='aspectFit' className='storeImage' />
149 150
                   </SwiperItem>
150 151
                 ))}
151 152
               </Swiper>

+ 2
- 2
src/pages/details/mjDetails/sceneryDetails.jsx Visa fil

@@ -3,7 +3,7 @@ import ax from '@/assets/icons/housemantj/onlove.png'
3 3
 import dw from '@/assets/icons/housemantj/loc-o.png'
4 4
 import titlejd from '@/assets/icons/housemantj/goodTourist.png'
5 5
 import titlems from '@/assets/icons/housemantj/goodFood.png'
6
-import showMore from '@/assets/icons/housemantj/setMore.png'
6
+import { compressImage } from '@/utils'
7 7
 import share from '@/assets/icons/housemantj/touristShare.png'
8 8
 import good from '@/assets/icons/housemantj/touristGood.png'
9 9
 import baozan from '@/assets/icons/housemantj/bgood.png'
@@ -106,7 +106,7 @@ export default withLayout((props) => {
106 106
               {
107 107
                 imglist.map((item) =>(
108 108
                   <SwiperItem>
109
-                    <image src={item.url} mode='aspectFit' className='storeImage' />
109
+                    <image src={compressImage(item.url)} mode='aspectFit' className='storeImage' />
110 110
                     </SwiperItem>
111 111
                 ))}
112 112
               </Swiper>

+ 1
- 0
src/pages/index/tabs/Recommend.jsx Visa fil

@@ -57,6 +57,7 @@ export default (props) => {
57 57
   }
58 58
 
59 59
 
60
+
60 61
   useEffect(() => {
61 62
     //查询分类标签表
62 63
     getIndexType({ pageSize: 20 }).then((res) => {

+ 32
- 33
src/shop/components/Sparead/spreadMoney.jsx Visa fil

@@ -53,48 +53,47 @@ export default (props) => {
53 53
 
54 54
   return (
55 55
     <view>
56
-      <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
57 56
 
58 57
       <view style={{ padding: '0 15px 0 15px', height: '100%' }}>
59
-        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
58
+        <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
60 59
 
61
-          <view className='storexx'>
60
+        <view className='storexx'>
62 61
 
63
-            <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
64
-            <view onClick={ShowMoldeOn} className='User-info-cutover'>
65
-              <image className='User-info-cutover-image' src={cutoverUser} />
66
-            </view>
67
-            <view className='tip'>(计算收入以核销为准)</view>
68
-            <view className='money'>
69
-              <view className='sleft'>
70
-                <view className='lword'>全年推广收入(税前)</view>
71
-                <view className='yearMoney'>
72
-                  <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
73
-                  <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
74
-                </view>
62
+          <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
63
+          <view onClick={ShowMoldeOn} className='User-info-cutover'>
64
+            <image className='User-info-cutover-image' src={cutoverUser} />
65
+          </view>
66
+          <view className='tip'>(计算收入以核销为准)</view>
67
+          <view className='money'>
68
+            <view className='sleft'>
69
+              <view className='lword'>全年推广收入(税前)</view>
70
+              <view className='yearMoney'>
71
+                <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
72
+                <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
75 73
               </view>
76
-              <view className='line' />
77
-              <view className='sright'>
78
-                <view className='rword'>当月推广收入(税前)</view>
79
-                <view className='monthMoney'>
80
-                  <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
81
-                  <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
82
-                </view></view>
83 74
             </view>
84
-
75
+            <view className='line' />
76
+            <view className='sright'>
77
+              <view className='rword'>当月推广收入(税前)</view>
78
+              <view className='monthMoney'>
79
+                <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
80
+                <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
81
+              </view></view>
85 82
           </view>
86 83
 
84
+        </view>
85
+
86
+
87
+        <view className='title'>推广收入记录</view>
87 88
 
88
-          <view className='title'>推广收入记录</view>
89
-          <List
90
-            style={{ height: 'calc(100% - 145px)' }}
91
-            request={reqestAPI}
92
-            params={queryParams}
93
-            noData={<NoData />}
94
-            render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
95
-          >
96
-          </List>
97
-        </scroll-view>
89
+        <List
90
+          style={{ height: 'calc(100% - 145px)' }}
91
+          request={reqestAPI}
92
+          params={queryParams}
93
+          noData={<NoData />}
94
+          render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
95
+        >
96
+        </List>
98 97
 
99 98
       </view>
100 99