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

src/components/BossCard/index.jsx

@@ -19,10 +19,16 @@ import './style.less'
 
 export default (props) => {
   const { item } = props
+  const { shopId } = props.item
   const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.packageId)
   const [city, setCity] = useState({})
   const [detail, setDetail] = useState({})
 
+  const goFood = () => {
+    Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
+
+  }
+
   useEffect(() => {
     getShopDetail(item.shopId).then((res) => {
       setDetail(res)
@@ -35,7 +41,7 @@ export default (props) => {
   return (
     <view class='container'>
       <view class='wrapper'>
-        <view class='left-complete-one'>
+        <view class='left-complete-one' onClick={() => { goFood() }} >
           <image className='left-image-1' src={ProCard_hot}></image>
           <view className='left-viewText'>
             返现￥{item.cashback / 100}

src/components/CompoentsOrder/AlreadyExpired/index.jsx

@@ -23,7 +23,7 @@ const score = '3.9'
 export default (props) => {
 
   return (
-    <scroll-view scroll-y style='height: 90vh;'  >
+    <scroll-view scroll-y style='height:100%;'  >
 
       <view className='AlreadyExpired-box' >
 

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -38,7 +38,8 @@ export default (props) => {
 
   return (
 
-    <scroll-view scroll-y style='height: 90vh;'  >
+    <scroll-view scroll-y style='height:100%;'  >
+
       <view className='AlreadyUsed-box' >
         <Popup show={showDialog} maskClosable={false}>
           <AlreadyUsedMolded />

src/components/CompoentsOrder/TobePaid/index.jsx

@@ -17,7 +17,8 @@ export default (props) => {
     Taro.navigateTo({ url: '/pages/PayOrder/index' })
   }
   return (
-    <scroll-view scroll-y style='height: 90vh;'  >
+    <scroll-view scroll-y style='height:100%;'  >
+
       <view className='TobePaid-box'>
         <view className='OrderNumber'>订单编号：ABC123456789</view>
         {/* 待支付 */}

src/components/CompoentsOrder/TobeWritten/index.jsx

@@ -9,7 +9,8 @@ import './style.less'
 export default (props) => {
 
   return (
-    <scroll-view scroll-y style='height: 90vh;'  >
+    <scroll-view scroll-y style='height:100%;'  >
+
 
       <view className='TobeWritten-box'>
         <view className='OrderNumber'>订单编号：ABC123456789</view>

src/components/toggleRole/ToggleRole.jsx

@@ -1,4 +1,4 @@
-import { useState,useEffect } from 'react';
+import { useState, useEffect } from 'react';
 
 import touristON from '@/assets/icons/UserCenter/touristON.png'
 import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
@@ -12,38 +12,39 @@ import './ToggleRole.less'
 import { useModel } from '@/store'
 
 
-export default ( props)=>{
-  const {showCutover, onClose }=props
-  const {getRole}=useModel('person')
-  const goToPerson=()=>{
+export default (props) => {
+  const { showCutover, onClose, role } = props
+  const { getRole } = useModel('person')
+  const goToPerson = () => {
     getRole('normal')
   }
-  const goToHotel=()=>{
+  const goToHotel = () => {
     getRole('hotel')
+
   }
-  const goToShop=()=>{
+  const goToShop = () => {
     getRole('shop')
   }
-  const onClose2=()=>{
-    console.log('2222222222222222222')
+  const onClose2 = () => {
+    // console.log('2222222222222222222')
   }
-    return (      
-      <Popup show={showCutover} onClose={onClose2}>
-          <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>
-    )  
+  return (
+    <Popup show={showCutover} onClose={onClose2}>
+      <view className='User-box-sths' >
+        <view className='User-box-selectUser'>请选择身份：</view>
+        <view className='User-box-tourist' onClick={goToPerson}>
+          <image className='Ubs-tourist-image' src={role === 'normal' ? touristON : touristOFF} />
+          <text className='Ubs-tourist-text'>游客</text>
+        </view>
+        <view className='User-box-hotelBoss' onClick={goToHotel}>
+          <image className='Ubs-hotelBoss-image' src={role === 'hotel' ? hotelBossON : hotelBossOFF} />
+          <text className='Ubs-hotelBoss-text'>民宿老板</text>
+        </view>
+        <view className='User-box-shopBoss' onClick={goToShop}>
+          <image className='Ubs-shopBoss-image' src={role === 'shop' ? shopBossON : shopBossOFF} />
+          <text className='Ubs-shopBoss-text'>店铺老板</text>
+        </view>
+      </view>
+    </Popup>
+  )
 }

src/hotel/components/Income/income.jsx

@@ -32,7 +32,7 @@ export default (props) => {
   }
   return (
     <view>
-      <ToggleRole showCutover={showCutover} onClose={onClose} />
+      <ToggleRole role='hotel' 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'>
@@ -57,20 +57,20 @@ 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>
+
+          <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>
-              )
-            }
-            {accountlog.length!=''?<view className='botton'>已经到底了~</view>:''}          
+              </view>
+            )
+          }
+          {accountlog.length != '' ? <view className='botton'>已经到底了~</view> : ''}
         </scroll-view>
       </view>
     </view>

src/hotel/pages/landlord/landlord.jsx

@@ -35,9 +35,9 @@ export default withLayout((props) => {
     })
   }, [])
 
-  const handleHotelChange = (current) => {    
+  const handleHotelChange = (current) => {
     getNowHotelManage(current.hotelId).then((res) => {
-      const {account: acc } = res
+      const { account: acc } = res
       setAccount(acc)
       setHotel(current)
       getAccountLogList(acc.accountId).then((res2) => {

src/layouts/index.jsx

@@ -24,6 +24,9 @@ export default (Child) => (props) => {
     let indexPage = getIndexPageOf(personRole)
     if (!isNormalPerson) {
       indexPage = `${personRole}/${indexPage.page}`
+
+    } else {
+      indexPage = `pages/index/index`
     }
 
     const isMatched = isNormalPerson ?
@@ -31,9 +34,11 @@ export default (Child) => (props) => {
       !currentPage.root :
       // 其他角色, 应该是对应的
       currentPage.root === personRole
-    
+
+
     // 如果对应上, 就不跳转
-    return isMatched ? undefined : indexPage
+    return isMatched ? personRole : indexPage
+
   }, [router.path, person?.personRole])
 
   if (jumpPage) {

src/pages/index/components/Card.js

@@ -13,30 +13,30 @@ export default (props) => {
   const { item } = props
 
   const [isSaved, toggleSave] = useSave(item.isSaved, item.targetType, item.targetId)
-  const Detail=()=>{
-    if (item.targetType=='tourist') {
-      let location=item.lng+','+item.lat
-      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance/1000).toFixed(2)}&location=${location}` });
+  const Detail = () => {
+    if (item.targetType == 'tourist') {
+      let location = item.lng + ',' + item.lat
+      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&location=${location}` });
     }
-    else{
-      Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` });
+    else {
+      Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
     }
   }
   return (
     <view className='contentCard'>
       <view className='cardTop'>
         <image mode='widthFix' onClick={Detail} src={item.poster} className='cCardimg' />
-        <image className='lefttips' src={item.targetType==='tourist'?mjTip:msTip}/>
-        <image onClick={toggleSave} src={isSaved> 0?onlove:love} className='loveharde'></image>
+        <image className='lefttips' src={item.targetType === 'tourist' ? mjTip : msTip} />
+        <image onClick={toggleSave} src={isSaved > 0 ? onlove : love} className='loveharde'></image>
       </view>
       <view className='bContent' onClick={Detail}>
-        <view className='cCword'>{(item.title).toString().length>35?(item.title).substring(0, 35)+'...':(item.title)}</view>
+        <view className='cCword'>{(item.title).toString().length > 35 ? (item.title).substring(0, 35) + '...' : (item.title)}</view>
         <view className='cCleft'>
           <image src={location} className='cCicon'></image>
-          <view className='distance'><text>{(item.distance/1000).toFixed(2)}</text>公里</view>
+          <view className='distance'><text>{(item.distance / 1000).toFixed(2)}</text>公里</view>
         </view>
-        <view className='cCright'>          
-          <view className='price'><text className='money'>￥</text><text>{item.averagePrice/100}</text>/人</view>
+        <view className='cCright'>
+          <view className='price'><text className='money'>￥</text><text>{item.averagePrice / 100}</text>/人</view>
         </view>
       </view>
     </view>

src/pages/index/tabs/Guide.jsx

@@ -32,8 +32,6 @@ export default (props) => {
   const { router, person } = props
   console.log("🚀 ~ file: Guide.jsx ~ line 34 ~ props", props)
   const { roomId, location, roomOrderId } = router.params
-  const [value, setVaule] = useState('已收藏')
-  const [imageSrc, setImageSrc] = useState(starOn)
   const [extend, setExtend] = useState([])
   const [ifroomId, setIfroomId] = useState('havenot')
   const [spackage, setPackage] = useState([])
@@ -76,7 +74,6 @@ export default (props) => {
 
 
 
-
   useEffect(() => {
     // 老板推荐的套餐
     getRecommendList({ location: location }).then((res) => {
@@ -151,14 +148,10 @@ export default (props) => {
 
 
 
-  const AddCollect = () => {
-    setImageSrc(starOff)
-    setVaule('加入收藏')
 
-  }
-  // onClick={handleClick}
   return (
-    <scroll-view scroll-y style='height: 77vh;' >
+    <scroll-view scroll-y style='height:100%;'  >
+
 
       <view className='Guide-Home-box'>
         {
@@ -220,7 +213,7 @@ export default (props) => {
                 </view>
                 <view className='MessageCard-content'>
                   <view className='MessageCard-name' >名称：{taRoomContent?.wifiName}</view>
-                  <view className='MessageCard-info' ><text className='MessageCard-name'>密码：</text>{taRoomContent?.wifiPassword}</view>
+                  <view className='MessageCard-info'  ><text className='MessageCard-name'>密码：</text>{taRoomContent?.wifiPassword}</view>
                 </view>
                 <view className='MessageCard-button'>
                   <image className='MessageCard-image' src={WiFi} />

src/pages/index/tabs/GuideCss/style.less

@@ -40,11 +40,14 @@
       margin-left: 30px;
 
       .MessageCard-name {
-        height: 30px;
+        height: 40px;
         font-size: 32px;
         font-weight: bold;
         color: #202020;
         line-height: 44px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
       }
       .MessageCard-info {
         height: 23px;

src/pages/index/tabs/Mine.jsx

@@ -16,11 +16,14 @@ import Rules from '@/assets/icons/UserCenter/Rules.png'
 import DefaultImage from '@/assets/icons/UserCenter/DefaultImage.png'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import { PaysOrder, getMineOrder } from '@/services/payOrder' //创建订单
-import  ToggleRole  from  '@/components/toggleRole/ToggleRole'
+import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 import { useModel } from '@/store'
 import './MineCss/style.less'
 
+
+
+
 export default (props) => {
   const { person } = props
   const { getAvatar } = useModel('person')
@@ -107,12 +110,12 @@ export default (props) => {
   //#endregion
 
   return !person.phone ? <AuthPage /> : (
-    <scroll-view scroll-y style='height: 77vh;' >
+    <scroll-view scroll-y style='height: 100%;' >
 
 
       <view className='User-box'>
         {/* 身份切换 */}
-        <ToggleRole showCutover={showCutover} onClose={onClose} />
+        <ToggleRole showCutover={showCutover} onClose={onClose} role='normal' />
         <view className='User-info'>
           <view className='User-photos-box'>
             <image src={person.avatar || DefaultImage} className='User-photos' />

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -1,5 +1,5 @@
 import { React, useState, useEffect, } from 'react'
-import Taro,{ useRouter } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import Popup from '@/components/Popup'
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
@@ -14,7 +14,7 @@ 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 './shopKeeper.less'
-import  ToggleRole  from  '@/components/toggleRole/ToggleRole'
+import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 
 export default (props) => {
@@ -27,7 +27,7 @@ export default (props) => {
       setActiveTab(tabJump - 0)
     }
   }, [tabJump])
-  
+
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
@@ -37,8 +37,8 @@ export default (props) => {
       title: '未核销订单',
     },
     {
-      title: '已核销订单',  
-    },   
+      title: '已核销订单',
+    },
   ]
 
   const [showCutover, setShowCutover] = useState(false)
@@ -53,13 +53,13 @@ export default (props) => {
       <view>
         <CustomNav title='十公里' />
       </view>
-      <ToggleRole showCutover={showCutover} onClose={onClose} />
-  
+      <ToggleRole showCutover={showCutover} onClose={onClose} role='shop' />
+
       <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'>
+            <view onClick={ShowMoldeOn} className='User-info-cutover'>
               <image className='User-info-cutover-image' src={cutoverUser} />
             </view>
             <view className='tip'>（计算收入以核销为准）</view>
@@ -81,12 +81,12 @@ export default (props) => {
             </view>
           </view>
           <view className='search'>
-            <input className='searchInput'  />
+            <input className='searchInput' />
             <image className='searchicon' src={iconsearch} />
             <view className="searchword">搜索订单(输入客户手机号码)</view>
           </view>
           <view className='index-tabs'>
-          <mp-tabs
+            <mp-tabs
               tabClass='tabs-Unselected'
               swiperClass='tabs-swiper'
               activeClass='tabs-Selected'
@@ -96,10 +96,10 @@ export default (props) => {
               activeTab={activeTab}
             >
             </mp-tabs>
-            </view>
-            
+          </view>
+
           <view>
-            {activeTab === 0&&
+            {activeTab === 0 &&
               <view className='orderCard'>
                 <view style={{ overflow: 'hidden' }}>
                   <view className='orderId'>订单编号：<text>ABC123456789</text></view>
@@ -117,52 +117,52 @@ export default (props) => {
                   <view className='phone'>客户手机：<text>136****9434</text></view>
                   <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
                 </view>
-              </view>              
-            }
-            {activeTab === 1&&
-            <>
-            <view className='orderCard'>
-              <view style={{ overflow: 'hidden' }}>
-                <view className='orderId'>订单编号：<text>ABC123456789</text></view>
-                <view className='orderTime'>下单日期：<text>2021-06-22 12:35</text></view>
               </view>
-              <view className='order'>
-                <image className='orderImg' src={ms} mode='aspectFit' />
-                <view className='orderRight'>
-                  <view className='foodName'>【SEOUL.创意韩国料理】火爆全南京，
-                    新街口又开新店啦...</view>
-                  <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>88</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
-                  <view>已下单：等待客户上门就餐</view>
+            }
+            {activeTab === 1 &&
+              <>
+                <view className='orderCard'>
+                  <view style={{ overflow: 'hidden' }}>
+                    <view className='orderId'>订单编号：<text>ABC123456789</text></view>
+                    <view className='orderTime'>下单日期：<text>2021-06-22 12:35</text></view>
+                  </view>
+                  <view className='order'>
+                    <image className='orderImg' src={ms} mode='aspectFit' />
+                    <view className='orderRight'>
+                      <view className='foodName'>【SEOUL.创意韩国料理】火爆全南京，
+                        新街口又开新店啦...</view>
+                      <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>88</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
+                      <view>已下单：等待客户上门就餐</view>
+                    </view>
+                    <view className='line' />
+                    <view className='phone'>客户手机：<text>136****9434</text></view>
+                    <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
+                  </view>
                 </view>
-                <view className='line' />
-                <view className='phone'>客户手机：<text>136****9434</text></view>
-                <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
-              </view>
-            </view>
-            <view className='orderCard'>
-              <view style={{ overflow: 'hidden' }}>
-                <view className='orderId'>订单编号：<text>ABC123456789</text></view>
-                <view className='orderTime'>下单日期：<text>2021-06-22 12:35</text></view>
-              </view>
-              <view className='order'>
-                <image className='orderImg' src={ms} mode='aspectFit' />
-                <view className='orderRight'>
-                  <view className='foodName'>【SEOUL.创意韩国料理】火爆全南京，
-                    新街口又开新店啦...</view>
-                  <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>88</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
-                  <view>已下单：等待客户上门就餐</view>
+                <view className='orderCard'>
+                  <view style={{ overflow: 'hidden' }}>
+                    <view className='orderId'>订单编号：<text>ABC123456789</text></view>
+                    <view className='orderTime'>下单日期：<text>2021-06-22 12:35</text></view>
+                  </view>
+                  <view className='order'>
+                    <image className='orderImg' src={ms} mode='aspectFit' />
+                    <view className='orderRight'>
+                      <view className='foodName'>【SEOUL.创意韩国料理】火爆全南京，
+                        新街口又开新店啦...</view>
+                      <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>88</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
+                      <view>已下单：等待客户上门就餐</view>
+                    </view>
+                    <view className='line' />
+                    <view className='phone'>客户手机：<text>136****9434</text></view>
+                    <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
+                  </view>
                 </view>
-                <view className='line' />
-                <view className='phone'>客户手机：<text>136****9434</text></view>
-                <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
-              </view>
-            </view>
-          </>
+              </>
             }
-            </view>
+          </view>
           <view className='botton'>已经到底了~</view>
-        </scroll-view>        
-      </view>      
+        </scroll-view>
       </view>
+    </view>
   )
 }

src/shop/components/Sparead/spreadMoney.jsx

@@ -9,7 +9,7 @@ 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  ToggleRole  from  '@/components/toggleRole/ToggleRole'
+import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 export default (props) => {
 
@@ -19,14 +19,14 @@ export default (props) => {
   }
   const onClose = () => {
     setShowCutover(false)
-    }
+  }
 
   return (
     <view>
       <view>
         <CustomNav title='十公里' />
       </view>
-      <ToggleRole showCutover={showCutover} onClose={onClose} />
+      <ToggleRole showCutover={showCutover} onClose={onClose} role='shop' />
       <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'>