feats

src/components/Popup/index.jsx

@@ -2,10 +2,10 @@
 import './style.less'
 
 export default (props) => {
-  const { show, mask = true, maskClosable, onClose } = props
+  const { show, mask = true,  onClose } = props
 
   return (
-    <mp-dialog extClass='x-popup' buttons={[]} show={show} mask={mask} maskClosable={maskClosable} onClose={onClose}>
+    <mp-dialog extClass='x-popup'  buttons={[]} show={show} mask={mask} maskClosable={true} onClose={onClose}>
       {props.children}
     </mp-dialog>
   )

src/components/spreads/Sparead/spreadMoney.jsx

@@ -1,4 +1,4 @@
-import { useState} from 'react'
+import { useState } from 'react'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import Popup from '@/components/Popup'
@@ -9,94 +9,70 @@ import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
 import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
 import './spreadMoney.less'
+import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
 
 export default (props) => {
+
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
     setShowCutover(true)
   }
-  const ok = () => {
+  const onClose = () => {
     setShowCutover(false)
-  }
-  const goToHotel = () => {
-    Taro.redirectTo({ url: '/hotel/pages/landlord/landlord' })
-  }
-  const gotoPerson = () => {
-    Taro.redirectTo({ url: '/pages/index/index' })
-  }
+    }
 
   return (
     <view>
       <view>
         <CustomNav title='十公里' />
       </view>
-      <Popup show={showCutover} maskClosable={false}>
-          <view className='User-box-sths' >
-            <view className='User-box-selectUser'>请选择身份：</view>
-            <view className='User-box-tourist' onClick={gotoPerson}>
-              <image className='Ubs-tourist-image' src={touristOFF} />
-              <text className='Ubs-tourist-text'>游客</text>
-            </view>
-            <view className='User-box-hotelBoss' onClick={goToHotel}>
-              <image className='Ubs-hotelBoss-image' src={hotelBossOFF} />
-              <text className='Ubs-hotelBoss-text'>民宿老板</text>
-
-            </view>
-            <view className='User-box-shopBoss' onClick={ok}>
-              <image className='Ubs-shopBoss-image' src={shopBossON} />
-              <text className='Ubs-shopBoss-text'>店铺老板</text>
-
-            </view>
-          </view>
-
-        </Popup>
-     
+      <ToggleRoul showCutover={showCutover} onClose={onClose} />
       <view style={{ padding: '30rpx', height: '100%' }}>
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
-              <view className='storeName'>店名：<text>Yun咖 云里 咖啡店</text></view>
-              <view onClick={ShowMoldeOn}  className='User-info-cutover'>
-                <image className='User-info-cutover-image' src={cutoverUser} />
-              </view>
-              <view className='tip'>（计算收入以核销为准）</view>
-              <view className='money'>
-                <view className='sleft'>
-                  <view className='lword'>全年推广收入（税前）</view>
-                  <view className='yearMoney'>
-                    <text>2800000</text>元
-                    <image className='micon' src={eyes}></image>
-                  </view>
+            <view className='storeName'>店名：<text>Yun咖 云里 咖啡店</text></view>
+            <view onClick={ShowMoldeOn} className='User-info-cutover'>
+              <image className='User-info-cutover-image' src={cutoverUser} />
+            </view>
+            <view className='tip'>（计算收入以核销为准）</view>
+            <view className='money'>
+              <view className='sleft'>
+                <view className='lword'>全年推广收入（税前）</view>
+                <view className='yearMoney'>
+                  <text>2800000</text>元
+                  <image className='micon' src={eyes}></image>
                 </view>
-                <view className='line' />
-                <view className='sright'>
-                  <view className='rword'>当月推广收入（税前）</view>
-                  <view className='monthMoney'>
-                    <text>******</text>元
-                    <image className='micon2' src={ceyes}></image>
-                  </view></view>
               </view>
+              <view className='line' />
+              <view className='sright'>
+                <view className='rword'>当月推广收入（税前）</view>
+                <view className='monthMoney'>
+                  <text>******</text>元
+                  <image className='micon2' src={ceyes}></image>
+                </view></view>
             </view>
+          </view>
           <view className='title'>推广收入记录</view>
           <view>
             <view className='spreadCard'>
               <view className='spreadDate'>日期：<text>2021-06-24</text></view>
               <view className='card'>
                 <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view> 
+                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view>
               </view>
             </view>
             <view className='spreadCard'>
               <view className='spreadDate'>日期：<text>2021-06-24</text></view>
               <view className='card'>
                 <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view> 
+                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view>
               </view>
             </view>
           </view>
           <view className='botton'>已经到底了~</view>
-        </scroll-view>        
-      </view>
-      
+        </scroll-view>
       </view>
+
+    </view>
   )
 }

src/components/toggleRoul/ToggleRoul.jsx

@@ -0,0 +1,47 @@
+import { useState,useEffect } from 'react';
+
+import touristON from '@/assets/icons/UserCenter/touristON.png'
+import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
+import hotelBossON from '@/assets/icons/UserCenter/hotelBossON.png'
+import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
+import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
+import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
+
+import Popup from '@/components/Popup'
+import './ToggleRoul.less'
+import { useModel } from '@/store'
+
+
+export default ( props)=>{
+  const {showCutover, onClose }=props
+  const {getRoul}=useModel('person')
+  const goToPerson=()=>{
+    getRoul('normal')
+  }
+  const goToHotel=()=>{
+    getRoul('hotel')
+  }
+  const goToShop=()=>{
+    getRoul('shop')
+  }
+
+    return (      
+      <Popup show={showCutover} onClose={onClose}>
+          <view className='User-box-sths' >
+            <view className='User-box-selectUser'>请选择身份：</view>
+            <view className='User-box-tourist' onClick={goToPerson}>
+              <image className='Ubs-tourist-image' src={touristOFF} />
+              <text className='Ubs-tourist-text'>游客</text>
+            </view>
+            <view className='User-box-hotelBoss' onClick={goToHotel}>
+              <image className='Ubs-hotelBoss-image' src={hotelBossOFF} />
+              <text className='Ubs-hotelBoss-text'>民宿老板</text>
+            </view>
+            <view className='User-box-shopBoss' onClick={goToShop}>
+              <image className='Ubs-shopBoss-image' src={shopBossON} />
+              <text className='Ubs-shopBoss-text'>店铺老板</text>
+            </view>
+          </view>
+        </Popup>
+    )  
+}

src/components/toggleRoul/ToggleRoul.less

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

src/pages/details/foodDetails/foodDetails.jsx

@@ -15,11 +15,12 @@ import share from '../../../assets/icons/housemantj/景点分享.png'
 import good from '../../../assets/icons/housemantj/景点爆赞.png'
 import collection from '../../../assets/icons/housemantj/景点收藏.png'
 import hongxin from '../../../assets/icons/housemantj/已收藏.png'
-
 import './foodDetails.less'
+import Taro from '@tarojs/taro'
 import Extend from '../components/extend'
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
+import { useRef } from 'react';
 
 export default withLayout((props) => {
   const { router, person } = props
@@ -67,9 +68,27 @@ export default withLayout((props) => {
       setNewextNum(newextNum+res.records.length)
     })
   }
+  const toShare=()=>{
+    console.log(222222222222)
+    onShareAppMessage()
+  }
+  const openMap=()=>{
+     Taro.openLocation({
+              longitude: log.current - 0,
+              latitude: lat.current - 0,
+              name: detail.shopName,
+              address:detail.address,
+              scale: 12,
+            })
+  }
+  const log=useRef('')
+  const lat=useRef('')
+
   useEffect(()=>{
     getShopDetail(id).then((res)=>{
       setDetail(res)
+      log.current=(res.locaton).toString().split(',')[0]
+      lat.current=(res.locaton).toString().split(',')[1]
       setimglist(res.imageList||[])
     })
     getShopPackage(id).then((res)=>{
@@ -133,7 +152,7 @@ return (
               <view className='yysj'>
                 <image src={yysj} className='yysjImg' />营业时间：{detail.businessHours}
               </view>
-              <view className='dpPosition'> 
+              <view className='dpPosition' onClick={openMap}> 
                 <image src={dw} className='dwTip' />
                 <view>
                   {detail.address}<image src={zhuandao} className='zhuandao'/>
@@ -166,7 +185,7 @@ return (
         </scroll-view>
       </view>
       <view className='bottomTab'>
-        <view className='tab'>
+        <view className='tab' onClick={toShare}>
           <image className='share' src={share} />分享
         </view>
         <view className='tab' onClick={toggleLike}>

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -9,15 +9,16 @@ import showMore from '../../../assets/icons/housemantj/查看更多.png'
 import share from '../../../assets/icons/housemantj/景点分享.png'
 import good from '../../../assets/icons/housemantj/景点爆赞.png'
 import collection from '../../../assets/icons/housemantj/景点收藏.png'
-import './sceneryDetails.less'
 import withLayout from '@/layouts'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useRef } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
 import { Swiper, SwiperItem } from '@tarojs/components';
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Extend from '../components/extend'
 import Cards from '@/components/foodCards/foodCards.jsx'
+import Taro from '@tarojs/taro'
+import './sceneryDetails.less'
 
 
 
@@ -54,8 +55,23 @@ export default withLayout((props) => {
   // 推荐套餐列表
   const [recommend, setRecommend] = useState([])
 
+  const openMap = () => {
+    Taro.openLocation({
+      longitude: log.current - 0,
+      latitude: lat.current - 0,
+      name: detail.touristName,
+      address: detail.address,
+      scale: 12,
+    })
+  }
+  const log = useRef('')
+  const lat = useRef('')
+
+
   useEffect(() => {
     getTouristDetail(id).then((res) => {
+      log.current = (res.locaton).toString().split(',')[0]
+      lat.current = (res.locaton).toString().split(',')[1]
       setDetail(res)
       setimglist(res.imageList || [])
 
@@ -69,7 +85,6 @@ export default withLayout((props) => {
       setRecommend(res || [])
     })
   }, [])
-  console.log(extend=='')
   return (
     <view className='page-index'>
       <view className='index-navbar'>
@@ -106,7 +121,7 @@ export default withLayout((props) => {
                 <text className='bzRight'>爆赞{detail.likeNum}</text>
               </view>
               <view className='wz'>{detail.address}</view>
-              <view className='dpPosition'>
+              <view className='dpPosition' onClick={openMap}>
                 <image src={dw} className='dwTip' />
                 <view className='distance'>{distance}公里</view>
               </view>
@@ -119,7 +134,7 @@ export default withLayout((props) => {
               <image className='scTip' src={isSaved > 0 ? hongxin : baixin} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
             </view>
           </view>
-          <view style={{ position: 'relative',display:extend==''?'none':''}}>
+          <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
             <view className='title'>
               <image src={titlejd} />景点介绍
             </view>
@@ -129,7 +144,7 @@ export default withLayout((props) => {
               <image src={showMore} className='moreTip' />
             </view>
           </view>
-          <view style={{ position: 'relative', display: recommend=='' ? 'none' : '' }}>
+          <view style={{ position: 'relative', display: recommend == '' ? 'none' : '' }}>
             <view className='title'>
               <image src={titlems} />老板推荐好吃的
             </view>

src/pages/index/tabs/Mine.jsx

@@ -32,7 +32,7 @@ export default (props) => {
   // console.log("🚀 ~ file: Mine.jsx ~ line 31 ~ hidePhone", hidePhone)
 
   const ShowMoldeOn = () => {
-    setShowCutover(true)
+    setShowCutover(!showCutover)
   }
 
   // 通过getUserProfile获取微信用户信息

src/pages/index/tabs/Recommend.jsx

@@ -35,7 +35,7 @@ export default (props) => {
       typeId: tab
     })
     if (index == 0) {
-      setQueryParams({ location: location1, pageNum: 1, pageSize: 10, typeId: '' })
+      setQueryParams({ location:  locRef.current, pageNum: 1, pageSize: 10, typeId: '' })
     }
   }
 
@@ -60,7 +60,6 @@ export default (props) => {
       // 更新 typeId
       // 更新 分页
     }
-
     setActiveTab(tabJump - 0)
   }, [tabJump])
 
@@ -77,6 +76,13 @@ export default (props) => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
   }
+
+
+  const RefreshCard=()=>{
+    console.log(1111)
+  }
+
+  
   return (
     <view style={{ height: '100%', overflow: 'auto' }}>
       <view className='search' onClick={onSearch}>
@@ -104,7 +110,9 @@ export default (props) => {
           </mp-tabs>
         </scroll-view>
       </view>
-      <scroll-view scroll-y='true' scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll'>
+      <scroll-view scroll-y='true' scroll-view='true'  	bindscrolltolower='lower' bindscrolltoupper='upper'	 bindscroll='scroll'
+      
+      >
         <view className='waterfall'>
           {
             alllist.map((item) => <Card key={item.resourceNo} item={item} />)

src/services/person.js

@@ -20,3 +20,10 @@ export const authPhone = (data) => request('/auth-phone', { data, method: 'put'
  * @returns 
  */
 export const authAvatar = (data) => request('/auth-user', { data, method: 'put' })
+
+ /**
+ * 切换角色
+ * @param {*} data 
+ * @returns 
+ */
+  export const toggleRoul = (targetType) => request(`/person-role/${targetType}`,{ method: 'post'})

src/store/models/person.js

@@ -1,6 +1,6 @@
 import { useState } from "react"
 import Taro from '@tarojs/taro'
-import { signIn, authPhone, authAvatar } from '@/services/person'
+import { signIn, authPhone, authAvatar,toggleRoul } from '@/services/person'
 
 export default () => {
   const [person, setPerson] = useState()
@@ -34,13 +34,19 @@ export default () => {
     })
   }
 
+  const getRoul = (data) => {
+    return toggleRoul(data).then((res) => {
+      setPerson(res);
+    })
+  }
+
   return {
     person,
     peronRoles,
     setPerson,
     login,
     getPhone,
-
     getAvatar,
+    getRoul
   }
 }