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

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wx06a7372d48d56843",
+  "appid": "wx835627a9b9b3932a",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/components/BossCard/index.jsx

@@ -11,7 +11,7 @@ import starOff from '@/assets/icons/housemantj/景点爆赞.png'
 import food from '@/assets/icons/ProCard/food.png'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 
-
+import { getQueryString} from '@/utils/index'
 //入住指引--老板推荐
 
 
@@ -19,16 +19,17 @@ import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import './style.less'
 
 export default (props) => {
-  const { item, cardNavigateTo } = props
-  const { shopId } = props.item
+  const { item, cardNavigateTo,taRoomContent,trackClick } = props
+  const { shopId, packageId } = props.item
   const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.packageId)
   const [city, setCity] = useState({})
   const [detail, setDetail] = useState({})
 
+    
 
-
-
+  
   const goFood = () => {
+     trackClick({ eventType: 'hotel_recommend_package', eventParams: getQueryString({ hotelId:taRoomContent.hotelId,shopId:shopId,packageId:packageId})  })
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
   }
 

src/components/CompoentsOrder/complete/index.jsx

@@ -93,7 +93,6 @@ export default (props) => {
     Taro.scanCode({
       onlyFromCamera: true,
       success: (res) => {
-        console.log(res,'-------------')
         if (res.path) {
           Taro.navigateTo({
             url: `/${res.path}&subOrderId=${item.subOrderId}`,
@@ -107,7 +106,6 @@ export default (props) => {
         }
       },
       fail: (err) => {
-        console.log(err, "err");
       },
     });
   };
@@ -349,7 +347,6 @@ export default (props) => {
                     {/* 评分 */}
                     <view className="card-box-star">
                       {scoreList.map((_, index) => {
-                        console.log(index);
                         const src = index + 1 <= item.score ? starOn : starOff;
                         return (
                           <image

src/components/List/index.jsx

@@ -9,8 +9,8 @@ export default (props) => {
     params,
     pageSize = 10,
     onError,
-    shopId,
     onDataChange,
+    noData,
     ...leftProps
   } = props
 
@@ -73,7 +73,7 @@ export default (props) => {
   // 请求数据
   useEffect(() => {
     fetchRef.current(payload)
-  }, [payload, shopId])
+  }, [payload, request])
 
   return (
     <ScrollView
@@ -85,7 +85,10 @@ export default (props) => {
         ? props.children
         : list.map((item, index) => render({ item, index }))
       }
-      <view className='botton' style={{ display: hasMore ? 'none' : '' }}>已经到底了~</view>
+      { !list || !list.length && noData }
+
+      { list && list.length > 0 && !hasMore && <view className='botton'>已经到底了~</view> }
+      
     </ScrollView>
   )
 }

src/hotel/components/HouseManage/houseManage.jsx

@@ -3,8 +3,9 @@ import see from '@/assets/icons/landlord/查看入住人.png'
 import share from '@/assets/icons/landlord/分享链接.png'
 import del from '@/assets/icons/landlord/删除.png'
 import addImg from '@/assets/icons/landlord/添加.png'
-import React, { useState, useEffect, useRef, useImperativeHandle } from 'react'
+import React, { useState, useEffect, useRef, useImperativeHandle,useMemo } from 'react'
 import { getRoomList, deleteRoom } from '@/services/landlord'
+import List from '@/components/List';
 import SearchBar from '@/components/SearchBar'
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
 import ShareCard from '../shareCard/shareCard'
@@ -15,6 +16,9 @@ export default React.forwardRef((props, ref) => {
   const { hotel } = props
   const [detail, setDetail] = useState([])
 
+  const fetchAPI = useMemo(() => hotel.hotelId?()=>getRoomList({hotelId: hotel.hotelId}):undefined, [hotel?.hotelId])
+  const queryParams = useMemo(() => ({}), [])
+
   const shareDataRef = useRef()
 
   // 判断是否首次加载
@@ -118,20 +122,27 @@ export default React.forwardRef((props, ref) => {
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
         <ShareCard showCutover={showCard} onClose={onClose2} />
-        <scroll-view scrollY style={{ height: 'calc(100vh - 244px)' }}>
-          {
-            (detail || []).map((item, inx) =>
-              <view className='houseCard' key={inx}>
-                <view className='houseName' onClick={() => { handelDetail(item) }} >{item.roomName || ''}</view>
-                <view className='operation'>
-                  <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
-                  <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>
-                  <view onClick={() => handelDelete(item)}><image src={del} />删除房源</view>
-                </view>
-              </view>
-            )
-          }
-        </scroll-view>
+        <List
+          style={{ height: 'calc(100vh - 244px)' }}
+          request={fetchAPI}
+          params={queryParams}
+          onDataChange={setDetail}
+          noData="暂无房源信息"
+        >
+          <view className='waterfall'>
+            {
+              detail.map((item, index) =>
+                <view className='houseCard' key={index}>
+                  <view className='houseName' onClick={() => { handelDetail(item) }} >{item.roomName || ''}</view>
+                  <view className='operation'>
+                    <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
+                    <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>
+                    <view onClick={() => handelDelete(item)}><image src={del} />删除房源</view>
+                  </view>
+                </view>)
+            }
+          </view>
+        </List>
       </view>
       <view className='addHouse' onClick={handelClick}>
         <image className='addImg' src={addImg} />添加房源

src/hotel/components/Income/income.jsx

@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useState, useMemo } from 'react'
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 import sImg from '@/assets/icons/landlord/我的收入2.png'
@@ -6,25 +6,25 @@ import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 import Picker from '@/components/Picker'
 import formatTime from "@/utils/formatTime";
-import {getAccountLogList} from '@/services/landlord'
+import { getAccountLogList } from '@/services/landlord'
 
 import List from '@/components/List';
 import './income.less'
 
 
+const getList = id => params => getAccountLogList(id, params)
 
 export default (props) => {
-  const { hotelList, hotel, account, onHotelChange, accountlog } = props
+  const { hotelList, hotel, account, onHotelChange } = props
 
-  // const [accountLog,setAccountLog]=useState(accountlog)
+  const queryParams = useMemo(() => ({}), [])
 
-
-  // const [queryParams, setQueryParams] = useState({pageNum: 1, pageSize: 10})
-  // setQueryParams(hotel.hotelId)
+  const fetchAPI = useMemo(()=>account.accountId ? getList(account.accountId) : undefined, [account?.accountId])
 
   const handleHotelChange = (hotelId, current) => {
     onHotelChange(current)
   }
+  const [accountlog, setAccountlog] = useState([])
 
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
@@ -68,44 +68,44 @@ export default (props) => {
           </view>
         </view>
 
-        <view className='title' >{accountlog.length != '' ? '推广收入记录' : '暂无推广收入'}</view>
-        
-        {/* <List
-                  style={{ height: '50vh' }}
-                  request={getAccountLogList}
-                  params={queryParams}
-                  onDataChange={setAccountLog}
-                >
-                  {
-                    (accountLog || []).map((item) =>
-                    <view className='spreadCard'>
-                      <view className='card'>
-                        <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
-                        <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
-                        <image className='spreadImg' src={sImg} />
-                      </view>
-                    </view>
-                    )
-                  }
-          </List> */}
-        
-        
-        
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: '50vh' }}>
+        <view className='title' >推广收入记录</view>
 
-          {
-            (accountlog || []).map((item) =>
-              <view className='spreadCard'>
+        <List
+          style={{ height: 'calc(100vh - 390px)' }}
+          request={fetchAPI}
+          params={queryParams}
+          noData={<view className='title' >暂无</view>}
+          render={({item, index}) => (
+            <view className='spreadCard' key={index}>
+              <view className='card'>
+                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
+                <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
+                <image className='spreadImg' src={sImg} />
+              </view>
+            </view>
+          )}
+        >
+        </List>
+        {/*<view className='title' >{accountlog.length==0?'推广收入记录':'暂无推广收入'}</view>
+         <List
+          style={{ height: '50vh' }}
+          request={fetchAPI}
+          params={queryParams}
+          onDataChange={setAccountlog}
+          noData="暂无推广收入"
+        >
+          <view className='waterfall'>
+            {
+              accountlog.map((item,index) => <view className='spreadCard' key={index}>
                 <view className='card'>
                   <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
                   <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
                   <image className='spreadImg' src={sImg} />
                 </view>
-              </view>
-            )
-          }
-        <view className='botton' >已经到底了~</view>
-        </scroll-view>
+              </view>)
+            }
+          </view>
+        </List> */}
       </view>
     </view>
   )

src/hotel/pages/landlord/landlord.jsx

@@ -8,7 +8,7 @@ import onincomeImg from '@/assets/icons/landlord/我的收入按下.png'
 import houseImg from '@/assets/icons/landlord/房源管理.png'
 import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
 import withLayout from '@/layouts'
-import { getHotelManage, getAccountLogList, getNowHotelManage } from '@/services/landlord'
+import { getHotelManage,  getNowHotelManage } from '@/services/landlord'
 import CustomNav from '@/components/CustomNav'
 import './landlord.less'
 
@@ -20,19 +20,16 @@ export default withLayout((props) => {
   const [hotelList, setHotelList] = useState([])
   const [hotel, setHotel] = useState()
   const [account, setAccount] = useState({})
-  const [accountlog, setAccountLog] = useState([])
 
   const houseRef = useRef()
 
+
   useEffect(() => {
     getHotelManage().then((res) => {
       const { hotelList: list, account: acc, hotel: current } = res
       setHotelList(list)
       setHotel(current)
       setAccount(acc)
-      getAccountLogList(acc.accountId).then((res2) => {
-        setAccountLog(res2.records || [])
-      })
     })
   }, [])
 
@@ -41,9 +38,6 @@ export default withLayout((props) => {
       const { account: acc } = res
       setAccount(acc)
       setHotel(current)
-      getAccountLogList(acc.accountId).then((res2) => {
-        setAccountLog(res2.records || [])
-      })
     })
   }
 
@@ -73,7 +67,7 @@ export default withLayout((props) => {
     <view className='page-index'>
       <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
       <view className='index-container'>
-        {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel} account={account} onHotelChange={handleHotelChange} accountlog={accountlog} />}
+        {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel}  account={account} onHotelChange={handleHotelChange} />}
         {currentTab === 1 && <HouseManage hotel={hotel} ref={houseRef} />}
       </view>
       <view className='index-tabbar'>

src/pages/MineUserAll/AllOrder/index.jsx

@@ -28,8 +28,6 @@ export default withLayout((props) => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
     }
-    console.log('---------------------', tabJump);
-
   }, [tabJump])
 
 
@@ -69,11 +67,7 @@ export default withLayout((props) => {
         let ratio = 750 / clientWidth;
         let Height = ratio * clientHeight;
         setSwiperHeight(`height:${Height}rpx;`)
-        console.log('------------->', swiperHeight);
-
-
       }
-
     })
   ]
 

src/pages/MineUserAll/Collect/index.jsx

@@ -9,7 +9,6 @@ import './style.less'
 export default withLayout((props) => {
   const { router, person, location } = props
   const [collectContent, setCollectContent] = useState([])
-  console.log("🚀 ~ file: index.jsx ~ line 12 ~ withLayout ~ collectContent", collectContent)
 
   useEffect(() => {
     getCollectList({

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

@@ -85,7 +85,6 @@ export default withLayout((props) => {
   };
 
   const onRefund = () => {
-    // console.log(explain, checkeds, "----onRefund----");
     refund(id, {
       refundDecription: checkeds?.map(x => options.filter(y => y.key == x)[0]?.title).join(';'),
       refundReason: explain,

src/pages/PayOrder/index.jsx

@@ -53,13 +53,11 @@ export default withLayout((props) => {
 
   const NumberAdd = () => {
     setBuyNumber(BuyNumber + 1);
-    console.log(BuyNumber);
   };
 
   const NumberCut = () => {
     if (DisabledBool) return;
     setBuyNumber(BuyNumber - 1);
-    console.log(BuyNumber);
   };
 
   const onInput = (e) => {
@@ -68,7 +66,6 @@ export default withLayout((props) => {
   };
 
   const requestPayment = (params) => {
-    console.log(params, "requestPayment");
     Taro.hideLoading()
     Taro.requestPayment({
       ...params,
@@ -85,7 +82,6 @@ export default withLayout((props) => {
         });
       },
       fail: (e) => {
-        console.log(e, "fail");
         Taro.showToast({
           title: "支付失败",
           icon: "none",

src/pages/TobeShop/index.jsx

@@ -22,7 +22,6 @@ import "./style.less";
 
 export default withLayout((props) => {
   const { router, person } = props;
-  console.log("🚀 ~ file: index.jsx ~ line 22 ~ withLayout ~ props", props)
   const { id, subOrderId } = props.router.params;
   const [showDialog, setShowDialog] = useState(false);
   //核销

src/pages/details/foodDetails/foodDetails.jsx

@@ -29,9 +29,7 @@ import "./foodDetails.less";
 export default withLayout((props) => {
   const { router, person } = props;
   const { id, subOrderId, scene } = props.router.params;
-  // console.log(id,subOrderId,'--333-----')
   useEffect(() => {
-    console.log(id, subOrderId, "-------");
     if (id && subOrderId) {
       Taro.navigateTo({
         url: `/pages/TobeShop/index?id=${id}&subOrderId=${subOrderId}`,

src/pages/index/components/Card.js

@@ -15,7 +15,6 @@ export default (props) => {
   const [isSaved, toggleSave] = useSave(item.isSaved, item.targetType, item.targetId)
   const Detail = () => {
     if (item.targetType == 'tourist') {
-      let loc = item.lng + ',' + item.lat
       Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
     }
     else {

src/pages/index/index.jsx

@@ -33,7 +33,7 @@ export default withLayout((props) => {
       </view>
       <view className='index-container'>
         {currentTab === 0 && <Recommend location={location} />}
-        {currentTab === 1 && <Guide person={person} router={router} />}
+        {currentTab === 1 && <Guide person={person} router={router} location={location} />}
         {/* {currentTab === 2 && <Strategy />} */}
         {currentTab === 2 && <Mine person={person} />}
       </view>

src/pages/index/tabs/Guide.jsx

@@ -10,6 +10,7 @@ import BlackSpot from '@/assets/icons/GuideCheck/BlackSpot.png'
 import { getRecommendList, getExtendContent } from '@/services/home'
 import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
+import  useTrackClick from '@/utils/hooks/useTrackClick'
 import showMore from '../../../assets/icons/housemantj/查看更多.png'
 
 import './GuideCss/style.less'
@@ -20,14 +21,15 @@ import './GuideCss/style.less'
 
 
 export default (props) => {
-  const { router, person, iflocation } = props
+  const { router, person, location } = props
   const { roomId, roomOrderId } = router.params
   const [extend, setExtend] = useState([])
   const [ifroomId, setIfroomId] = useState('havenot')
   const [spackage, setPackage] = useState([])
 
   const cardNavigateTo = undefined
-
+  
+  const trackClick = useTrackClick(router)
 
   // 住宿经纬度
   const Roomlog = useRef('')
@@ -97,7 +99,7 @@ export default (props) => {
 
 
     } else {
-      getRecommendList({ location: iflocation }).then((res) => {
+      getRecommendList({ location: location }).then((res) => {
         setPackage(res || [])
       })
 
@@ -261,7 +263,7 @@ export default (props) => {
             <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
         </view>
-        {(spackage || []).map((item, index) => <BossCard cardNavigateTo={cardNavigateTo} key={(index)} item={item} />)}
+        {(spackage || []).map((item, index) => <BossCard cardNavigateTo={cardNavigateTo} key={(index)} trackClick={trackClick} taRoomContent={taRoomContent} item={item} />)}
         {/* 卡片------------- */}
         {/* <view className='Guide-Content-box-two'>
           <view className='title-image-two'>

src/pages/search/search.less

@@ -15,19 +15,5 @@
     float: left;
     color: #666666;
     border: 1px solid #999999;
-  }
-  .hotSearchtip view:first-child{
-    border: 2px solid #274190;
-    border-radius: 30px;
-    font-size: 24px;
-     
-    font-weight: bold;
-    color: #0C297F;
-    display: block;
-    margin:0 40px 40px 0;
-    padding:19px 25px;
-    float: left;    
-  }
-  
-  
+  }  
 }

src/services/landlord.js

@@ -36,7 +36,7 @@ export const getHotelManage = (params) => request('/hotel/manage/index', { param
  * @param {*} params 
  * @returns 
  */
-export const getAccountLogList = (id) => request(`/hotel/account/${id}/log`)
+export const getAccountLogList = (id,params) => request(`/hotel/account/${id}/log`,{params})
 
 /**
  * 房源列表

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -1,4 +1,4 @@
-import { React, useState, useEffect, useRef } from 'react'
+import { React, useState, useEffect, useMemo } from 'react'
 import Taro, { useRouter } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import Picker from '@/components/Picker'
@@ -17,7 +17,6 @@ import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import './shopKeeper.less'
-import { useMemo } from 'react'
 
 
 export default (props) => {

src/shop/components/ShopKeeper/shopKeeper.less

@@ -151,7 +151,7 @@
   width: 100%;
   height: 91px;
   .tabs-Unselected {
-    width: 50vw;
+    width: calc(50vw - 30px);
     text-align: center;
     height: 26px;
     font-size: 28px;

src/shop/pages/spread/spreadIndex.jsx

@@ -97,7 +97,6 @@ export default withLayout((props) => {
 
   //店铺选择
   const handleHotelChange = (current) => {
-    console.log('已选择店铺', current);
     getShopMoney(current.shopId, amountType).then((e) => {
       setShop(current)
       getVerifiedOrder({