flx

src/components/CompoentsOrder/complete/index.jsx

@@ -77,8 +77,8 @@ export default (props) => {
       }
     }
   }, [IsPull]);
-  const [ite,setItem]=useState({})
-  const show=(val)=>{
+  const [ite, setItem] = useState({})
+  const show = (val) => {
     setItem(val)
   }
   const slideButtonTap = (e) => {

src/components/MoreGuide/index.jsx

@@ -23,7 +23,6 @@ export default (props) => {
               autoplay={false}
               loop={false}
               muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
-
       }
 
     </>

src/components/ShopUsed/index.jsx

@@ -34,7 +34,7 @@ export default (props) => {
     <View className='orderCard'>
       <View style={{ overflow: 'hidden' }}>
         <View className='orderId'>订单编号：{item.orderId}</View>
-        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss') || ''}</View>
+        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm') || ''}</View>
       </View>
       <View className='order'>
         <Image className='orderImg' src={item.poster} mode='aspectFit' />
@@ -42,6 +42,9 @@ export default (props) => {
           <View className='foodName'>{item.description}</View>
           <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{item.actualPrice / 100}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
         </View>
+
+        <View className='veri_Date' > 核销时间：{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>
+
         <View className='line' />
         <View className='phone'>客户手机：<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
           {

src/components/ShopUsed/style.less

@@ -1,104 +1,106 @@
-.orderCard{
+.orderCard {
   margin-bottom: 20px;
-  .orderId{
+  .orderId {
     font-size: 20px;
     color: #666666;
     line-height: 44px;
     float: left;
     margin: 60px 0 32px 0;
-
   }
-  .orderTime{    
+  .orderTime {
     font-size: 20px;
     color: #666666;
     line-height: 44px;
     float: right;
     margin: 60px 0 32px 0;
   }
-  .order{
-    background: #FFFFFF;
+  .order {
+    background: #ffffff;
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
     border-radius: 12px;
     padding: 20px;
-    .orderImg{
+    .orderImg {
       width: 194px;
       height: 194px;
       border-radius: 22px;
       float: left;
-      margin:0 26px 30px 0;
+      margin: 0 26px 30px 0;
     }
-    .orderRight{
-      .foodName{
+    .orderRight {
+      .foodName {
         height: 63px;
         font-size: 24px;
         color: #333333;
         line-height: 40px;
       }
-      .price{
+      .price {
         font-size: 20px;
         font-weight: bold;
         color: #202020;
         line-height: 44px;
         margin: 37px 0 40px 0;
         height: 19px;
-        .pnum{
+        .pnum {
           color: #333333;
           font-weight: 400;
-          margin-left: 47px;         
+          margin-left: 47px;
         }
       }
-      .price+view{
+      .price + view {
         font-size: 20px;
         font-weight: bold;
-        color: #FF3434;
+        color: #ff3434;
         line-height: 44px;
         margin-bottom: 35px;
         height: 19px;
       }
     }
-    .line{
+    .veri_Date {
+      color: red;
+      position: absolute;
+      letter-spacing: 1px;
+      font-size: 30px;
+    }
+    .line {
       width: 100%;
       height: 2px;
       background: #000;
       opacity: 0.1;
       margin-top: 100px;
     }
-    .phone{
+    .phone {
       font-size: 24px;
       color: #666666;
       line-height: 44px;
       height: 23px;
       margin: 30px 0;
       // .Button-OK{
-      //   font-size: 28px;   
+      //   font-size: 28px;
       //   color: #C0C8D3;
       //   line-height: 34px;
       //   text-align: center;
       //   padding:40px 0 100px 0;
       // }
-
     }
 
-    .tripTime{
+    .tripTime {
       font-size: 24px;
       color: #666666;
       line-height: 44px;
       margin-bottom: 30px;
     }
   }
-
-  
 }
-button{
+button {
   width: 160px;
-height: 40px;
-background: #1A3B83;
-/* margin: 0 auto; */
-line-height: 40px;
-border-radius: 12px;
-font-size: 23px;
-color: #ffffff;
-position: relative;
-right: -8em;
-top: -2em;
+  height: 40px;
+  background: #1a3b83;
+  /* margin: 0 auto; */
+  line-height: 40px;
+  border-radius: 12px;
+  font-size: 23px;
+  color: #ffffff;
+  position: relative;
+  right: -8em;
+  top: -2em;
 }

src/components/toggleRole/ToggleRole.less

@@ -1,56 +1,54 @@
-.User-box-sths{
+.User-box-sths {
   display: flex;
-  margin: 40px 0  60px 0;
+  margin: 40px 0 60px 0;
   justify-content: space-around;
   flex-wrap: wrap;
-  .User-box-selectUser{
+  .User-box-selectUser {
     width: 100%;
     font-size: 32px;
     font-weight: bold;
     color: #202020;
     line-height: 32px;
-    margin: 60px 0 70px  0;
+    margin: 60px 0 70px 0;
     text-align: left;
   }
-  .User-box-tourist{
+  .User-box-tourist {
     display: inline-block;
 
-     .Ubs-tourist-image{
+    .Ubs-tourist-image {
       width: 86px;
       height: 86px;
-
     }
-    .Ubs-tourist-text{
+    .Ubs-tourist-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color: #999999;      
+      color: #999999;
     }
   }
-  .User-box-hotelBoss{
+  .User-box-hotelBoss {
     display: inline-block;
-    .Ubs-hotelBoss-image{
+    .Ubs-hotelBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-hotelBoss-text{
+    .Ubs-hotelBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
       color: #999999;
     }
   }
-  .User-box-shopBoss{
-    .Ubs-shopBoss-image{
+  .User-box-shopBoss {
+    .Ubs-shopBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-shopBoss-text{
+    .Ubs-shopBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color:#202020;
+      color: #202020;
     }
   }
-
-}
+}

src/pages/index/tabs/Guide.jsx

@@ -48,10 +48,8 @@ export default (props) => {
   //全部指南个数
   const [AllextNum, setAllextNum] = useState(0)
   //指南当前页数
-  const [epage, setEpage] = useState(2)
   const extendMore = () => {
-    setEpage(epage + 1)
-    getExtendContent('room', roomId, { pageNum: epage }).then((res) => {
+    getExtendContent('room', roomId, { pageNum: 99999 }).then((res) => {
       setExtend([...extend, ...res.records])
       setNewextNum(newextNum + res.records.length)
     })
@@ -174,62 +172,6 @@ export default (props) => {
         {
           ifroomId === 'reality' && (
             <view>
-              {/* 
-              <view className='MessageCard'>
-                <view className='MessageCard-title1'>
-                  <text className='MessageCard-left'>----------</text>
-                  名称
-                  <text className='MessageCard-right'>----------</text>
-                </view>
-                <view className='MessageCard-content'>
-                  <view className='MessageCard-name' >{taRoomContent?.roomName}</view>
-                </view>
-              </view>
-              <view className='MessageCard-hotle'>
-                <view className='MessageCard-title1-hotle'>
-                  <text className='MessageCard-left-hotle'>----------</text>
-                  民宿位置
-                  <text className='MessageCard-right-hotle'>----------</text>
-                </view>
-                <view className='MessageCard-content-hotle'>
-                  <view className='MessageCard-name-hotle' >{taRoomContent?.address}</view>
-                </view>
-                <view className='MessageCard-button-RoomName-hotle' onClick={() => { goRoomMap() }}>
-                  <image className='MessageCard-image-hotle' src={GoHere} />
-                  <text className='MessageCard-text-hotle'  >去这里</text>
-                </view>
-              </view>
-              <view className='MessageCard-parkView'>
-                <view className='MessageCard-title1-parkView'>
-                  <text className='MessageCard-left-parkView'>----------</text>
-                  停车位置
-                  <text className='MessageCard-right-parkView'>----------</text>
-                </view>
-                <view className='MessageCard-content-parkView'>
-                  <view className='MessageCard-name-parkView' >{taRoomContent?.parkingAddress}</view>
-                </view>
-                <view className='MessageCard-button-Park-parkView' onClick={() => { goParkMap() }} style={{ display: parkingButtonStyle }} >
-                  <image className='MessageCard-image-parkView' src={Taxi} />
-                  <text className='MessageCard-text-parkView'  >去这里</text>
-                </view>
-              </view>
-              <view className='MessageCard'>
-                <view className='MessageCard-title1'>
-                  <text className='MessageCard-left'>----------</text>
-                  WiFi信息
-                  <text className='MessageCard-right'>----------</text>
-                </view>
-                <view className='MessageCard-content' style={{ display: wifiButtonStyle }} >
-                  <view className='MessageCard-name' >名称：{taRoomContent?.wifiName}</view>
-                  <view className='MessageCard-info'  ><text className='MessageCard-name'>密码：</text>{taRoomContent?.wifiPassword}</view>
-                </view>
-
-                <view className='MessageCard-button' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
-                  <image className='MessageCard-image' src={WiFi} />
-                  <text className='MessageCard-text'>复制</text>
-                </view>
-              </view> */}
-
 
               <view className='room-box-info-ROOM'>
                 <view className='room-bi-name-ROOM' >
@@ -288,11 +230,11 @@ export default (props) => {
                   <text className='title-title-boss' >更多指引</text>
                 </view>
                 {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
-
+                {/* 
                 <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
                   <view>点击查看更多</view>
                   <image src={showMore} className='moreTip' />
-                </view>
+                </view> */}
               </view>
             </view>
           )

src/shop/components/Sparead/spreadMoney.jsx

@@ -1,8 +1,8 @@
-import { useState,  useMemo } from 'react'
+import { useState, useMemo } from 'react'
 import Taro from '@tarojs/taro'
 import List from '@/components/List';
 import Picker from '@/components/Picker'
-import {getAccount} from '@/services/shopBoss'
+import { getAccount } from '@/services/shopBoss'
 import ShopCommission from '@/components/ShopCommission'
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
@@ -54,8 +54,12 @@ export default (props) => {
   return (
     <view>
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
+
       <view style={{ padding: '30rpx', height: '100%' }}>
+        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
+
           <view className='storexx'>
+
             <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
             <view onClick={ShowMoldeOn} className='User-info-cutover'>
               <image className='User-info-cutover-image' src={cutoverUser} />
@@ -77,7 +81,10 @@ export default (props) => {
                   <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
                 </view></view>
             </view>
+
           </view>
+
+
           <view className='title'>推广收入记录</view>
           <List
             style={{ height: 'calc(100% - 145px)' }}
@@ -87,7 +94,10 @@ export default (props) => {
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
           >
           </List>
+        </scroll-view>
+
       </view>
-    </view>
+
+    </view >
   )
 }