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

src/hotel/components/HouseManage/houseManage.jsx

@@ -7,7 +7,8 @@ import iconsearch from '@/assets/icons/housemantj/search.png'
 import './houseManage.less'
 import {useState, useEffect,useRef } from 'react'
 import {useDidShow } from '@tarojs/taro'
-import {getRoomList} from '@/services/landlord'
+import {getRoomList,deleteRoom} from '@/services/landlord'
+import ShareRoom from '../shareRoom/ShareRoom.jsx'
 
 
 export default (props) => {
@@ -19,6 +20,27 @@ export default (props) => {
   const handelClick=()=>{
     Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}` });
   }
+  const handelDelete=(roomId)=>{
+    deleteRoom(roomId).then(()=>{
+      Taro.showToast({
+        title: '删除房源成功',
+        icon: 'none',
+      })
+      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
+        setDetail(res.records||[])
+      })
+    })
+  }
+
+  const [showCutover, setShowCutover] = useState(false)
+  const [roomId, setRoomId] = useState()
+  const ShowMoldeOn = (roomId) => {
+    setRoomId(roomId)
+    setShowCutover(true)
+  }
+  const onClose = () => {
+    setShowCutover(false)
+  }
   useEffect(()=>{
     //首次加载页面时
     if (!mounted.current && hotel.hotelId) {
@@ -46,6 +68,7 @@ export default (props) => {
             <image className='searchicon' src={iconsearch} />
             <view className="searchword">请输入关键字搜索</view>
           </view>
+          <ShareRoom showCutover={showCutover} onClose={onClose}  roomId={roomId}/>
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 255px)' }}>
 
           <view>
@@ -54,9 +77,9 @@ export default (props) => {
               <view className='houseCard'>
               <view className='houseName'>{item.roomName}</view>
               <view className='operation'>
-                <view><image src={see} /><text>查看入住人</text></view>
-                <view><image src={share} /><text>分享链接</text></view>
-                <view><image src={del} /><text>删除房源</text></view>
+                <view><image src={see} />查看入住人</view>
+                <view onClick={()=>ShowMoldeOn(item.roomId)}><image src={share}/>分享链接</view>
+                <view onClick={()=>{handelDelete(item.roomId)}}><image src={del} />删除房源</view>
               </view>
             </view>
               )

src/hotel/components/HouseManage/houseManage.less

@@ -40,6 +40,8 @@
   }
   .operation{
     column-count: 3;
+    font-size: 28px;
+    color: #202020;
     image{
       width: 28px;
       height: 28px;
@@ -47,10 +49,6 @@
       position: relative;
       top: 5px;
     }
-    text{      
-      font-size: 28px;
-      color: #202020;
-    }
   }
 }
 .addHouse{

src/hotel/components/Income/income.jsx

@@ -6,6 +6,8 @@ import sImg from '@/assets/icons/landlord/我的收入2.png'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 import Picker from '@/components/Picker'
+import formatTime from "@/utils/formatTime";
+
 
 export default (props) => {
   const { hotelList, hotel, account, onHotelChange, accountlog } = props
@@ -57,17 +59,17 @@ export default (props) => {
                 </view></view>
             </view>
           </view>
-
-          <view className='title' >{accountlog.length != '' ? '推广收入记录' : '暂无推广收入'}</view>
-          {
-            accountlog?.map((item) =>
-              <view className='spreadCard'>
-                <view className='card'>
-                  <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{item.createDate}</text></view>
-                  <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
-                  <image className='spreadImg' src={sImg} />
+          
+          <view className='title' >{accountlog.length!=''?'推广收入记录':'暂无推广收入'}</view>
+            {
+              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>
-              </view>
             )
           }
           {accountlog.length != '' ? <view className='botton'>已经到底了~</view> : ''}

src/hotel/components/shareRoom/ShareRoom.jsx

@@ -0,0 +1,35 @@
+import React from 'react'
+import Popup from '@/components/Popup'
+import Taro from '@tarojs/taro'
+import { Input, Button, View, Picker, Label } from '@tarojs/components'
+import './ShareRoom.less'
+import { useState } from 'react'
+
+
+export default (props) => {
+  const { showCutover, onClose,roomId } = props
+  const [date, setDate] = useState('')
+  const [roomNum, setRoomNum] = useState(0)
+  const handelDate = (e) => {
+    setDate(e.detail.value)
+  }
+const handelShare=()=>{
+  if(roomNum!=0&&date!=''){
+    console.log(roomNum,date,roomId)
+  }
+}
+  return (
+    <Popup show={showCutover} onClose={onClose}>
+      <View><Label>入住人数：</Label><Input focus dataField='nm' onInput={(e) => setRoomNum(e.detail.value )} value={roomNum} type='number' placeholder='请输入入住人数' /></View>
+      <View>
+        <Label>入住时间：</Label>
+        <Picker mode='date' onChange={handelDate}>
+          <View className='picker'  >
+            {date == '' ? '请选择入住时间' : date}
+          </View>
+        </Picker>
+      </View>
+      <View><Button className='btn' onClick={onClose}>取消</Button><Button className='btn' onClick={handelShare}>分享</Button></View>
+    </Popup>
+  )
+}

src/hotel/components/shareRoom/ShareRoom.less

@@ -0,0 +1,17 @@
+  .from-room{
+    width: 100%;
+    box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
+    border-radius: 24px;
+    font-size: 1.1em;
+    padding: 20px;
+    .btn {
+      width: 100px;
+      height: 92px;
+      background: #1A3B83;
+      line-height: 92px;
+      border-radius: 12px;
+      font-size: 40px;
+      color: #ffffff;
+    }
+  }
+  

src/hotel/pages/landlord/addRoom/addRoom.jsx

@@ -32,21 +32,28 @@ export default withLayout((props) => {
     })
   }
   const sumbit = () => {
-    //判断每一项是否为空Object.values(roomModel).filter返回一个数组如果有空属性就是数组长度就不为0
-    Object.values(roomModel).filter(item => item == '').length != 0 ?
-      Taro.showToast({
-        title: '每一项都是必填项哦',
-        icon: 'none',
-      }) :
-      saveRoom(roomModel).then(() => {
-       
-          Taro.showToast({
+    if(
+    roomModel.roomName!=''&&
+    roomModel.address!=''&&
+    roomModel.location!=''&&
+    roomModel.weight!=''
+    )
+     { 
+      saveRoom(roomModel).then(() => {       
+          Taro.showModal({
             title: '保存成功',
-            icon: 'success',
+            showCancel:false
           }).then(() => {
             Taro.navigateBack()
           })
+      })       
+     } else{
+       Taro.showToast({
+        title: '有必填项未填哦',
+        icon: 'none',
       })
+     }
+      
   }
   return (
     <view className='page-index'>
@@ -55,13 +62,13 @@ export default withLayout((props) => {
         <mp-form models={roomModel} >
           <mp-cells title='请填写新增的房源信息' footer='  ' >
             <mp-cell prop='roomName' title='房屋名称：' extClass='font'>
-              <input focus dataField='roomName' onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName}  placeholder='请输入房屋名称' />
+              <input focus dataField='roomName' onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName}  placeholder='请输入房屋名称（必填）' />
             </mp-cell>
             <mp-cell prop='address' title='位置信息：' extClass='font'>
-              <input dataField='address' onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address}  placeholder='请输入房屋位置' />
+              <input dataField='address' onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address}  placeholder='请输入房屋位置（必填）' />
             </mp-cell>
             <mp-cell prop='location' title='定位经纬度：' extClass='font'>
-              <label onClick={onRoomMap}>{roomModel.location == '' ? '房间定位' : roomModel.location}</label>
+              <label onClick={onRoomMap}>{roomModel.location == '' ? '房间定位（必填）' : roomModel.location}</label>
             </mp-cell>
             <mp-cell prop='parkingAddress' title='停车场位置：' extClass='font'>
               <input dataField='parkingAddress' onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress}  placeholder='请输入停车场位置' />
@@ -76,7 +83,7 @@ export default withLayout((props) => {
               <input dataField='wifiPassword' onInput={(e) => setRoomModel({ ...roomModel, wifiPassword: e.detail.value })} value={roomModel.wifiPassword}  placeholder='请输入wifi密码' />
             </mp-cell>
             <mp-cell prop='weight' title='权重：' extClass='font'>
-              <input type='number' dataField='weight'  onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重' />
+              <input type='number' dataField='weight'  onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重（必填）' />
             </mp-cell>
             <mp-cell>
               <button className='button-OK' onClick={sumbit}>确定</button>

src/layouts/index.jsx

@@ -2,14 +2,26 @@
 import { useMemo } from 'react'
 import Taro from '@tarojs/taro'
 import { useModel } from '@/store'
+import { getQueryString } from '@/utils'
 import useRouter from '@/utils/hooks/useRouter'
+import useTrackPage from '@/utils/hooks/useTrackPage'
 import Loading from './Loading'
 import { getPageBy, getIndexPageOf } from '../routes'
 
 export default (Child) => (props) => {
+  const location = Taro.getStorageSync('location')
+
   const { person } = useModel('person')
   const router = useRouter()
 
+  // 埋点页面访问
+  const trackPageData = {
+    page: router.path,
+    params: getQueryString(router.params),
+    location,
+  }
+  useTrackPage(trackPageData)
+
   // 确保人员信息到位
   const loading = !person?.personRole;
 
@@ -48,5 +60,5 @@ export default (Child) => (props) => {
     })
   }
 
-  return loading ? <Loading /> : <Child {...props} person={person} router={router} />
+  return loading ? <Loading /> : <Child {...props} person={person} router={router} location={location} />
 }

src/pages/index/index.config.js

@@ -4,6 +4,7 @@ export default {
   styleIsolation: 'shared',
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
+    "mp-tabs": "../../../components/tabs/index",
     "mp-checkbox-group": "weui-miniprogram/checkbox-group/checkbox-group",
     "mp-checkbox": "weui-miniprogram/checkbox/checkbox",
     "mp-cells": "weui-miniprogram/cells/cells",

src/pages/index/index.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect,useRef } from 'react'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import logo from '@/assets/icons/comm/logo_small.png'
@@ -8,6 +8,10 @@ import Guide from './tabs/Guide'
 import Mine from './tabs/Mine'
 import Recommend from './tabs/Recommend'
 import './index.less'
+import { getLocation } from '@/utils/location'
+import { getIndexType,  getResourceList } from '@/services/home'
+
+
 
 export default withLayout((props) => {
   const { router, person } = props
@@ -16,12 +20,27 @@ export default withLayout((props) => {
 
   const [currentTab, setCurrentTab] = useState(0)
 
+  const locRef = useRef()
+
 
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
   }
 
+  const [queryParams, setQueryParams] = useState({ location: '', pageNum: 1, pageSize: 10, typeId: '' })
+
+
+  useEffect(() => {
+    getLocation().then((res) => {
+      locRef.current = `${res.longitude},${res.latitude}`
+      setQueryParams({
+        ...queryParams,
+        location: locRef.current
+      })
+    })  
+  }, [])
+
   useEffect(() => {
     if (tab) {
       setCurrentTab(tab - 0)
@@ -33,7 +52,7 @@ export default withLayout((props) => {
         <CustomNav logo={logo} title='十公里' />
       </view>
       <view className='index-container'>
-        {currentTab === 0 && <Recommend />}
+        {currentTab === 0 && <Recommend loc={locRef} qp={queryParams}/>}
         {currentTab === 1 && <Guide person={person} router={router} />}
         {/* {currentTab === 2 && <Strategy />} */}
         {currentTab === 2 && <Mine person={person} />}

src/pages/index/tabs/Recommend.jsx

@@ -11,15 +11,20 @@ import './less/Recommend.less'
 
 
 export default (props) => {
-  const { router, person } = props
+  const { router, person, loc,qp } = props
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
   const [typeList, setTypeList] = useState([])
   
-  const locRef = useRef()
-
-  const [queryParams, setQueryParams] = useState({ location: '', pageNum: 1, pageSize: 10, typeId: '' })
+  const locRef = useRef(loc)
+  // if(locRef.current==null){
+  //     Taro.showLoading()
+  //   }
+  //   if (locRef.current!=null) {
+  //     Taro.hideLoading()
+  //   }
+  const [queryParams, setQueryParams] = useState(qp)
 
   // 获取资源表信息
   const [alllist, setAllList] = useState([])
@@ -40,14 +45,7 @@ export default (props) => {
   }
 
   useEffect(() => {
-    getLocation().then((res) => {
-      locRef.current = `${res.longitude},${res.latitude}`
-      setQueryParams({
-        ...queryParams,
-        location: locRef.current
-      })
-    })
-
+    
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
@@ -78,9 +76,6 @@ export default (props) => {
   }
 
 
-  const RefreshCard=()=>{
-    console.log(1111)
-  }
 
   
   return (

src/pages/index/tabs/less/Recommend.less

@@ -141,7 +141,7 @@
     }
   }
   .tabs-Unselected {
-    width: 20vw;      
+    width: 25vw;      
     font-weight: bold;
     color: #C0C8D3; 
     text-align: center;
@@ -154,7 +154,7 @@
   .tabs-Selected {
     font-size: 32px;
     color: #4C4C4C;
-    width: 20vw;      
+    width: 25vw;      
     font-weight: bold;
     text-align: center;
     border-bottom: 6px solid #4C4C4C;

src/services/track.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+/**
+ * 埋点页面访问
+ * @param {*} data 
+ * @returns 
+ */
+export const trackPage = (data) => request('/track/page', { data, method: 'post', skipError: true })
+
+/**
+ * 更新埋点访问
+ * @param {*} id 
+ * @returns 
+ */
+export const updateTrackPage = (id) => request(`/track/page/${id}`, { method: 'put', skipError: true })

src/utils/hooks/useTrackPage.js

@@ -0,0 +1,25 @@
+
+import { useRef } from 'react'
+import { useDidShow, useDidHide, nextTick } from '@tarojs/taro'
+import { trackPage, updateTrackPage } from '@/services/track'
+
+export default (payload) => {
+  const payloadRef = useRef()
+  const resRef = useRef()
+  payloadRef.current = payload
+
+  useDidShow(() => {
+    trackPage(payloadRef.current).then((res) => {
+      resRef.current = res;
+    }).catch((err) => {
+      console.error(err);
+    })
+  })
+
+  useDidHide(() => {
+    if (resRef.current) {
+      updateTrackPage(resRef.current.trackId)
+      resRef.current = undefined
+    }
+  })
+}

src/utils/index.js

@@ -1,4 +1,9 @@
 
+/**
+ * queryString 转 object
+ * @param {*} queryStr 
+ * @returns 
+ */
 export function parseQueryString(queryStr) {
   if (!queryStr) {
     return;
@@ -20,3 +25,20 @@ export function parseQueryString(queryStr) {
   }, {});
   return params;
 }
+
+/**
+ * object 转 queryStr
+ * @param {*} params 
+ * @returns 
+ */
+export function getQueryString(params) {
+  if (!params) return ;
+
+  const keys = Object.keys(params)
+  const arr = keys.map((key) => {
+    const val = params[key]
+    return `${key}=${encodeURIComponent(val)}`
+  })
+
+  return arr.join('&')
+}

src/utils/preFetchData.js

@@ -5,7 +5,23 @@ export default () => {
   const personId = Taro.getStorageSync('personId')
   const openid = Taro.getStorageSync('openid')
 
-  return Promise.resolve({ personId, openid })
+  return new Promise((resolve, reject) => {
+    Taro.getLocation({
+      success(res) {
+        const location = `${res.longitude},${res.latitude}`
+        Taro.setStorageSync('location', location)
+        resolve({
+          location,
+          personId,
+          openid
+        })
+      },
+      fail(err) {
+        console.error(err)
+        reject(err)
+      }
+    })
+  })
 
   // return new Promise((resolve, reject) => {
   //   Taro.getBackgroundFetchData({

src/utils/request.js

@@ -1,23 +1,12 @@
 
 import Taro from '@tarojs/taro'
+import { getQueryString } from '.'
 
 const logger = Taro.getRealtimeLogManager()
 
-const object2QueryString = (params) => {
-  if (!params) return ;
-
-  const keys = Object.keys(params)
-  const arr = keys.map((key) => {
-    const val = params[key]
-    return `${key}=${encodeURIComponent(val)}`
-  })
-
-  return arr.join('&')
-}
-
 export default (url, options) => {
   const { params, skipError, header, ...leftOptions } = options || {}
-  const queryStr = object2QueryString(params)
+  const queryStr = getQueryString(params)
 
   const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
   const nwUrl = `${HOST}/api/wx${urlWithParams}`