吃个甘蔗嚼一年 3 years ago
parent
commit
d3fbc9d7c9

+ 2
- 2
src/components/CompoentsOrder/complete/index.jsx View File

77
       }
77
       }
78
     }
78
     }
79
   }, [IsPull]);
79
   }, [IsPull]);
80
-  const [ite,setItem]=useState({})
81
-  const show=(val)=>{
80
+  const [ite, setItem] = useState({})
81
+  const show = (val) => {
82
     setItem(val)
82
     setItem(val)
83
   }
83
   }
84
   const slideButtonTap = (e) => {
84
   const slideButtonTap = (e) => {

+ 0
- 1
src/components/MoreGuide/index.jsx View File

23
               autoplay={false}
23
               autoplay={false}
24
               loop={false}
24
               loop={false}
25
               muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
25
               muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
26
-
27
       }
26
       }
28
 
27
 
29
     </>
28
     </>

+ 4
- 1
src/components/ShopUsed/index.jsx View File

34
     <View className='orderCard'>
34
     <View className='orderCard'>
35
       <View style={{ overflow: 'hidden' }}>
35
       <View style={{ overflow: 'hidden' }}>
36
         <View className='orderId'>订单编号:{item.orderId}</View>
36
         <View className='orderId'>订单编号:{item.orderId}</View>
37
-        <View className='orderTime'>下单日期:{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss') || ''}</View>
37
+        <View className='orderTime'>下单日期:{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm') || ''}</View>
38
       </View>
38
       </View>
39
       <View className='order'>
39
       <View className='order'>
40
         <Image className='orderImg' src={item.poster} mode='aspectFit' />
40
         <Image className='orderImg' src={item.poster} mode='aspectFit' />
42
           <View className='foodName'>{item.description}</View>
42
           <View className='foodName'>{item.description}</View>
43
           <View className='price'>合计金额:¥<Text style={{ fontSize: '24rpx' }}>{item.actualPrice / 100}</Text>元 <Text className='pnum'>数量:<Text>1</Text>张</Text> </View>
43
           <View className='price'>合计金额:¥<Text style={{ fontSize: '24rpx' }}>{item.actualPrice / 100}</Text>元 <Text className='pnum'>数量:<Text>1</Text>张</Text> </View>
44
         </View>
44
         </View>
45
+
46
+        <View className='veri_Date' > 核销时间:{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>
47
+
45
         <View className='line' />
48
         <View className='line' />
46
         <View className='phone'>客户手机:<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
49
         <View className='phone'>客户手机:<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
47
           {
50
           {

+ 35
- 33
src/components/ShopUsed/style.less View File

1
-.orderCard{
1
+.orderCard {
2
   margin-bottom: 20px;
2
   margin-bottom: 20px;
3
-  .orderId{
3
+  .orderId {
4
     font-size: 20px;
4
     font-size: 20px;
5
     color: #666666;
5
     color: #666666;
6
     line-height: 44px;
6
     line-height: 44px;
7
     float: left;
7
     float: left;
8
     margin: 60px 0 32px 0;
8
     margin: 60px 0 32px 0;
9
-
10
   }
9
   }
11
-  .orderTime{    
10
+  .orderTime {
12
     font-size: 20px;
11
     font-size: 20px;
13
     color: #666666;
12
     color: #666666;
14
     line-height: 44px;
13
     line-height: 44px;
15
     float: right;
14
     float: right;
16
     margin: 60px 0 32px 0;
15
     margin: 60px 0 32px 0;
17
   }
16
   }
18
-  .order{
19
-    background: #FFFFFF;
17
+  .order {
18
+    background: #ffffff;
20
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
19
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
21
     border-radius: 12px;
20
     border-radius: 12px;
22
     padding: 20px;
21
     padding: 20px;
23
-    .orderImg{
22
+    .orderImg {
24
       width: 194px;
23
       width: 194px;
25
       height: 194px;
24
       height: 194px;
26
       border-radius: 22px;
25
       border-radius: 22px;
27
       float: left;
26
       float: left;
28
-      margin:0 26px 30px 0;
27
+      margin: 0 26px 30px 0;
29
     }
28
     }
30
-    .orderRight{
31
-      .foodName{
29
+    .orderRight {
30
+      .foodName {
32
         height: 63px;
31
         height: 63px;
33
         font-size: 24px;
32
         font-size: 24px;
34
         color: #333333;
33
         color: #333333;
35
         line-height: 40px;
34
         line-height: 40px;
36
       }
35
       }
37
-      .price{
36
+      .price {
38
         font-size: 20px;
37
         font-size: 20px;
39
         font-weight: bold;
38
         font-weight: bold;
40
         color: #202020;
39
         color: #202020;
41
         line-height: 44px;
40
         line-height: 44px;
42
         margin: 37px 0 40px 0;
41
         margin: 37px 0 40px 0;
43
         height: 19px;
42
         height: 19px;
44
-        .pnum{
43
+        .pnum {
45
           color: #333333;
44
           color: #333333;
46
           font-weight: 400;
45
           font-weight: 400;
47
-          margin-left: 47px;         
46
+          margin-left: 47px;
48
         }
47
         }
49
       }
48
       }
50
-      .price+view{
49
+      .price + view {
51
         font-size: 20px;
50
         font-size: 20px;
52
         font-weight: bold;
51
         font-weight: bold;
53
-        color: #FF3434;
52
+        color: #ff3434;
54
         line-height: 44px;
53
         line-height: 44px;
55
         margin-bottom: 35px;
54
         margin-bottom: 35px;
56
         height: 19px;
55
         height: 19px;
57
       }
56
       }
58
     }
57
     }
59
-    .line{
58
+    .veri_Date {
59
+      color: red;
60
+      position: absolute;
61
+      letter-spacing: 1px;
62
+      font-size: 30px;
63
+    }
64
+    .line {
60
       width: 100%;
65
       width: 100%;
61
       height: 2px;
66
       height: 2px;
62
       background: #000;
67
       background: #000;
63
       opacity: 0.1;
68
       opacity: 0.1;
64
       margin-top: 100px;
69
       margin-top: 100px;
65
     }
70
     }
66
-    .phone{
71
+    .phone {
67
       font-size: 24px;
72
       font-size: 24px;
68
       color: #666666;
73
       color: #666666;
69
       line-height: 44px;
74
       line-height: 44px;
70
       height: 23px;
75
       height: 23px;
71
       margin: 30px 0;
76
       margin: 30px 0;
72
       // .Button-OK{
77
       // .Button-OK{
73
-      //   font-size: 28px;   
78
+      //   font-size: 28px;
74
       //   color: #C0C8D3;
79
       //   color: #C0C8D3;
75
       //   line-height: 34px;
80
       //   line-height: 34px;
76
       //   text-align: center;
81
       //   text-align: center;
77
       //   padding:40px 0 100px 0;
82
       //   padding:40px 0 100px 0;
78
       // }
83
       // }
79
-
80
     }
84
     }
81
 
85
 
82
-    .tripTime{
86
+    .tripTime {
83
       font-size: 24px;
87
       font-size: 24px;
84
       color: #666666;
88
       color: #666666;
85
       line-height: 44px;
89
       line-height: 44px;
86
       margin-bottom: 30px;
90
       margin-bottom: 30px;
87
     }
91
     }
88
   }
92
   }
89
-
90
-  
91
 }
93
 }
92
-button{
94
+button {
93
   width: 160px;
95
   width: 160px;
94
-height: 40px;
95
-background: #1A3B83;
96
-/* margin: 0 auto; */
97
-line-height: 40px;
98
-border-radius: 12px;
99
-font-size: 23px;
100
-color: #ffffff;
101
-position: relative;
102
-right: -8em;
103
-top: -2em;
96
+  height: 40px;
97
+  background: #1a3b83;
98
+  /* margin: 0 auto; */
99
+  line-height: 40px;
100
+  border-radius: 12px;
101
+  font-size: 23px;
102
+  color: #ffffff;
103
+  position: relative;
104
+  right: -8em;
105
+  top: -2em;
104
 }
106
 }

+ 16
- 18
src/components/toggleRole/ToggleRole.less View File

1
-.User-box-sths{
1
+.User-box-sths {
2
   display: flex;
2
   display: flex;
3
-  margin: 40px 0  60px 0;
3
+  margin: 40px 0 60px 0;
4
   justify-content: space-around;
4
   justify-content: space-around;
5
   flex-wrap: wrap;
5
   flex-wrap: wrap;
6
-  .User-box-selectUser{
6
+  .User-box-selectUser {
7
     width: 100%;
7
     width: 100%;
8
     font-size: 32px;
8
     font-size: 32px;
9
     font-weight: bold;
9
     font-weight: bold;
10
     color: #202020;
10
     color: #202020;
11
     line-height: 32px;
11
     line-height: 32px;
12
-    margin: 60px 0 70px  0;
12
+    margin: 60px 0 70px 0;
13
     text-align: left;
13
     text-align: left;
14
   }
14
   }
15
-  .User-box-tourist{
15
+  .User-box-tourist {
16
     display: inline-block;
16
     display: inline-block;
17
 
17
 
18
-     .Ubs-tourist-image{
18
+    .Ubs-tourist-image {
19
       width: 86px;
19
       width: 86px;
20
       height: 86px;
20
       height: 86px;
21
-
22
     }
21
     }
23
-    .Ubs-tourist-text{
22
+    .Ubs-tourist-text {
24
       display: block;
23
       display: block;
25
       font-size: 30px;
24
       font-size: 30px;
26
       font-weight: bold;
25
       font-weight: bold;
27
-      color: #999999;      
26
+      color: #999999;
28
     }
27
     }
29
   }
28
   }
30
-  .User-box-hotelBoss{
29
+  .User-box-hotelBoss {
31
     display: inline-block;
30
     display: inline-block;
32
-    .Ubs-hotelBoss-image{
31
+    .Ubs-hotelBoss-image {
33
       width: 86px;
32
       width: 86px;
34
       height: 86px;
33
       height: 86px;
35
     }
34
     }
36
-    .Ubs-hotelBoss-text{
35
+    .Ubs-hotelBoss-text {
37
       display: block;
36
       display: block;
38
       font-size: 30px;
37
       font-size: 30px;
39
       font-weight: bold;
38
       font-weight: bold;
40
       color: #999999;
39
       color: #999999;
41
     }
40
     }
42
   }
41
   }
43
-  .User-box-shopBoss{
44
-    .Ubs-shopBoss-image{
42
+  .User-box-shopBoss {
43
+    .Ubs-shopBoss-image {
45
       width: 86px;
44
       width: 86px;
46
       height: 86px;
45
       height: 86px;
47
     }
46
     }
48
-    .Ubs-shopBoss-text{
47
+    .Ubs-shopBoss-text {
49
       display: block;
48
       display: block;
50
       font-size: 30px;
49
       font-size: 30px;
51
       font-weight: bold;
50
       font-weight: bold;
52
-      color:#202020;
51
+      color: #202020;
53
     }
52
     }
54
   }
53
   }
55
-
56
-}
54
+}

+ 3
- 61
src/pages/index/tabs/Guide.jsx View File

48
   //全部指南个数
48
   //全部指南个数
49
   const [AllextNum, setAllextNum] = useState(0)
49
   const [AllextNum, setAllextNum] = useState(0)
50
   //指南当前页数
50
   //指南当前页数
51
-  const [epage, setEpage] = useState(2)
52
   const extendMore = () => {
51
   const extendMore = () => {
53
-    setEpage(epage + 1)
54
-    getExtendContent('room', roomId, { pageNum: epage }).then((res) => {
52
+    getExtendContent('room', roomId, { pageNum: 99999 }).then((res) => {
55
       setExtend([...extend, ...res.records])
53
       setExtend([...extend, ...res.records])
56
       setNewextNum(newextNum + res.records.length)
54
       setNewextNum(newextNum + res.records.length)
57
     })
55
     })
174
         {
172
         {
175
           ifroomId === 'reality' && (
173
           ifroomId === 'reality' && (
176
             <view>
174
             <view>
177
-              {/* 
178
-              <view className='MessageCard'>
179
-                <view className='MessageCard-title1'>
180
-                  <text className='MessageCard-left'>----------</text>
181
-                  名称
182
-                  <text className='MessageCard-right'>----------</text>
183
-                </view>
184
-                <view className='MessageCard-content'>
185
-                  <view className='MessageCard-name' >{taRoomContent?.roomName}</view>
186
-                </view>
187
-              </view>
188
-              <view className='MessageCard-hotle'>
189
-                <view className='MessageCard-title1-hotle'>
190
-                  <text className='MessageCard-left-hotle'>----------</text>
191
-                  民宿位置
192
-                  <text className='MessageCard-right-hotle'>----------</text>
193
-                </view>
194
-                <view className='MessageCard-content-hotle'>
195
-                  <view className='MessageCard-name-hotle' >{taRoomContent?.address}</view>
196
-                </view>
197
-                <view className='MessageCard-button-RoomName-hotle' onClick={() => { goRoomMap() }}>
198
-                  <image className='MessageCard-image-hotle' src={GoHere} />
199
-                  <text className='MessageCard-text-hotle'  >去这里</text>
200
-                </view>
201
-              </view>
202
-              <view className='MessageCard-parkView'>
203
-                <view className='MessageCard-title1-parkView'>
204
-                  <text className='MessageCard-left-parkView'>----------</text>
205
-                  停车位置
206
-                  <text className='MessageCard-right-parkView'>----------</text>
207
-                </view>
208
-                <view className='MessageCard-content-parkView'>
209
-                  <view className='MessageCard-name-parkView' >{taRoomContent?.parkingAddress}</view>
210
-                </view>
211
-                <view className='MessageCard-button-Park-parkView' onClick={() => { goParkMap() }} style={{ display: parkingButtonStyle }} >
212
-                  <image className='MessageCard-image-parkView' src={Taxi} />
213
-                  <text className='MessageCard-text-parkView'  >去这里</text>
214
-                </view>
215
-              </view>
216
-              <view className='MessageCard'>
217
-                <view className='MessageCard-title1'>
218
-                  <text className='MessageCard-left'>----------</text>
219
-                  WiFi信息
220
-                  <text className='MessageCard-right'>----------</text>
221
-                </view>
222
-                <view className='MessageCard-content' style={{ display: wifiButtonStyle }} >
223
-                  <view className='MessageCard-name' >名称:{taRoomContent?.wifiName}</view>
224
-                  <view className='MessageCard-info'  ><text className='MessageCard-name'>密码:</text>{taRoomContent?.wifiPassword}</view>
225
-                </view>
226
-
227
-                <view className='MessageCard-button' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
228
-                  <image className='MessageCard-image' src={WiFi} />
229
-                  <text className='MessageCard-text'>复制</text>
230
-                </view>
231
-              </view> */}
232
-
233
 
175
 
234
               <view className='room-box-info-ROOM'>
176
               <view className='room-box-info-ROOM'>
235
                 <view className='room-bi-name-ROOM' >
177
                 <view className='room-bi-name-ROOM' >
288
                   <text className='title-title-boss' >更多指引</text>
230
                   <text className='title-title-boss' >更多指引</text>
289
                 </view>
231
                 </view>
290
                 {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
232
                 {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
291
-
233
+                {/* 
292
                 <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
234
                 <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
293
                   <view>点击查看更多</view>
235
                   <view>点击查看更多</view>
294
                   <image src={showMore} className='moreTip' />
236
                   <image src={showMore} className='moreTip' />
295
-                </view>
237
+                </view> */}
296
               </view>
238
               </view>
297
             </view>
239
             </view>
298
           )
240
           )

+ 13
- 3
src/shop/components/Sparead/spreadMoney.jsx View File

1
-import { useState,  useMemo } from 'react'
1
+import { useState, useMemo } from 'react'
2
 import Taro from '@tarojs/taro'
2
 import Taro from '@tarojs/taro'
3
 import List from '@/components/List';
3
 import List from '@/components/List';
4
 import Picker from '@/components/Picker'
4
 import Picker from '@/components/Picker'
5
-import {getAccount} from '@/services/shopBoss'
5
+import { getAccount } from '@/services/shopBoss'
6
 import ShopCommission from '@/components/ShopCommission'
6
 import ShopCommission from '@/components/ShopCommission'
7
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
7
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
8
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
8
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
54
   return (
54
   return (
55
     <view>
55
     <view>
56
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
56
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
57
+
57
       <view style={{ padding: '30rpx', height: '100%' }}>
58
       <view style={{ padding: '30rpx', height: '100%' }}>
59
+        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
60
+
58
           <view className='storexx'>
61
           <view className='storexx'>
62
+
59
             <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
63
             <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
60
             <view onClick={ShowMoldeOn} className='User-info-cutover'>
64
             <view onClick={ShowMoldeOn} className='User-info-cutover'>
61
               <image className='User-info-cutover-image' src={cutoverUser} />
65
               <image className='User-info-cutover-image' src={cutoverUser} />
77
                   <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
81
                   <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
78
                 </view></view>
82
                 </view></view>
79
             </view>
83
             </view>
84
+
80
           </view>
85
           </view>
86
+
87
+
81
           <view className='title'>推广收入记录</view>
88
           <view className='title'>推广收入记录</view>
82
           <List
89
           <List
83
             style={{ height: 'calc(100% - 145px)' }}
90
             style={{ height: 'calc(100% - 145px)' }}
87
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
94
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
88
           >
95
           >
89
           </List>
96
           </List>
97
+        </scroll-view>
98
+
90
       </view>
99
       </view>
91
-    </view>
100
+
101
+    </view >
92
   )
102
   )
93
 }
103
 }