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/CompoentsOrder/OrderCard/index.jsx

@@ -60,17 +60,39 @@ export default (props) => {
       url: `/pages/MineUserAll/RefundMoney/CheckRefund/index?id=${item.orderId}`,
     });
   };
-  const PayAction =
-    kkp == '1' ? null ://空卡片用于售后详情页面
-      sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> ://售后页面卡片
-        item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> ://待支付
-          item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> ://待核销
-            item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> ://已退费
-              item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> ://已取消
-                item.status === 9 ? <Action.Image image={Null} /> ://已过期
-                  item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
-                    item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
+  // const PayAction =
+  //   kkp == '1' ? null ://空卡片用于售后详情页面
+  //     sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> ://售后页面卡片
+  //       item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> ://待支付
+  //         item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> ://待核销
+  //           item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> ://已退费
+  //             item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> ://已取消
+  //               item.status === 9 ? <Action.Image image={Null} /> ://已过期
+  //                 item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
+  //                   item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
 
+  let PayAction=null
+  if (kkp=='1') {//空卡片用于售后详情页面
+    PayAction=null
+  }else if (sh=='1') {//售后页面卡片
+     PayAction=<Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} />
+  }else if (item.status===0) {//待支付
+     PayAction=<Action.Icon icon={Pay} text='支付' onClick={handleDetail} />
+  }else if (item.status === 1 && item.isVerified == false) {//待核销
+     PayAction=<Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} />
+  }else if (item.status === 2 && item.isVerified == false) {//已退费
+     PayAction=<Action.Image image={refund} />
+  }else if (item.status === 7 && item.isVerified == false) {//已取消
+     PayAction=<Action.Image image={Cancel} />
+  }else if(item.status === 9){//已过期
+     PayAction=<Action.Image image={Null} />
+  }else if (item.isVerified == true && item.isEvaluated > 0) {//已评价
+     PayAction=<Action.Image image={Evaluated} />
+  }else if (item.isVerified == true) {//待评价
+     PayAction=<Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} />
+  }else{
+    PayAction=null
+  }
 
   return (
     <>

src/pages/index/tabs/Guide.jsx

@@ -33,13 +33,12 @@ export default (props) => {
   const trackClick = useTrackClick(router)
 
   const [taRoomContent, setTaRoomContent] = useState([])
-  const RoomLocation = taRoomContent?.location
   //没有停车 wifi的就不显示按钮
   const [wifiButtonStyle, setWifiButtonStyle] = useState('')
   const [parkingButtonStyle, setParkingButtonStyle] = useState('')
   const [guideStyle, setGuideStyle] = useState('')
-  const parkingGps = taRoomContent?.parkingLocation
-  const roomGps = taRoomContent?.location
+  const parkingGps = taRoomContent.parkingLocation || []
+  const roomGps = taRoomContent.location || []
 
 
 
@@ -81,26 +80,17 @@ export default (props) => {
       setLoading(true)
       // 点击’去这里‘跳转导航
       getTaRoom(roomId).then((res) => {
-        // Roomlog.current = (!res.location).toString().split(',')[0]
-        // Roomlat.current = (!res.location).toString().split(',')[1]
-        // Parklog.current = (!res.parkingLocation).toString().split(',')[0]
-        // Parklat.current = (!res.parkingLocation).toString().split(',')[1]
         setTaRoomContent(res || [])
         setLoading(false)
       })
       //更多指引
       geiZy()
-
-      getRecommendList({ location: location }).then((res) => {
+      getRecommendList({ location: roomGps }).then((res) => {
         setPackage(res || [])
         setLoading(false)
-
       })
-      // setLoading(false)
-
     } else {
       setLoading(true)
-
       getRecommendList({ location: location }).then((res) => {
         setPackage(res || [])
         setLoading(false)
@@ -114,7 +104,7 @@ export default (props) => {
     if (taRoomContent?.parkingAddress === "") {
       setParkingButtonStyle('none')
     }
-  }, [roomId, RoomLocation, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location])
+  }, [roomId, roomGps, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location])
 
 
   const goRoomMap = () => {
@@ -160,102 +150,103 @@ export default (props) => {
 
   return (
     <scroll-view scrollY style={{ height: '100%' }}  >
-        <view className='Guide-Home-box'>
-          {
-            ifroomId === 'havenot' && (
-              <view className='Guide-image-text-box'>
-                <image className='Guide-images' src={sleep} />
-                <view className='Guide-text'>您还没有入住订单哟~</view>
-              </view>
-            )
-          }
-          {/* 有民宿的情况下 */}
-          {
-            ifroomId === 'reality' && (
-              <SpinBox loading={loading}>
-                <view className='room-box-info-ROOM'>
-                  <view className='room-bi-name-ROOM' >
-                    <view className='room-bin-title-ROOM'>房屋名称</view>
-                    <view className='room-bint-nameInfo-ROOM'>{taRoomContent?.roomName}
-                    </view>
+      <view className='Guide-Home-box'>
+        {
+          ifroomId === 'havenot' && (
+            <view className='Guide-image-text-box'>
+              <image className='Guide-images' src={sleep} />
+              <view className='Guide-text'>您还没有入住订单哟~</view>
+            </view>
+          )
+        }
+        {/* 有民宿的情况下 */}
+        {
+          ifroomId === 'reality' && (
+            <SpinBox loading={loading}>
+              <view className='room-box-info-ROOM'>
+                <view className='room-bi-name-ROOM' >
+                  <view className='room-bin-title-ROOM'>房屋名称</view>
+                  <view className='room-bint-nameInfo-ROOM'>{taRoomContent?.roomName}
                   </view>
                 </view>
-                {/* --------房屋位置-------- */}
-                {
-                  !roomGps ? <view></view>
-                    :
-                    <view className='room-box-info-HouLocation'>
-                      <view className='room-bi-name-HouLocation' >
-                        <view className='room-bin-title-HouLocation'>房屋位置</view>
-                        <view className='room-bint-nameInfo-HouLocation'>
-                          <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
-                          <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }} style={{ display: wifiButtonStyle }}>
-                            <image className='room-bintn-image-HouLocation' src={GPS} />
-                            <text className='room-bintn-text-HouLocation'>去这里</text>
-                          </view>
+              </view>
+              {/* --------房屋位置-------- */}
+              {
+                !roomGps ? <view></view>
+                  :
+                  <view className='room-box-info-HouLocation'>
+                    <view className='room-bi-name-HouLocation' >
+                      <view className='room-bin-title-HouLocation'>房屋位置</view>
+                      <view className='room-bint-nameInfo-HouLocation'>
+                        <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
+                        <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }} style={{ display: wifiButtonStyle }}>
+                          <image className='room-bintn-image-HouLocation' src={GPS} />
+                          <text className='room-bintn-text-HouLocation'>去这里</text>
                         </view>
                       </view>
                     </view>
-                }
+                  </view>
 
-                {/* --------停车场-------- */}
-                {
-                  !parkingGps ? <view></view>
-                    :
-                    <view className='room-box-info-Parking'>
-                      <view className='room-bi-name-Parking' >
-                        <view className='room-bin-title-Parking'>停车位置</view>
-                        <view className='room-bint-nameInfo-Parking'>
-                          <view className='room-bint-nameInfo-bool-Parking' >{taRoomContent?.parkingAddress}</view>
-                          <view className='room-bintn-button-Parking' onClick={() => { goParkMap() }} style={{ display: wifiButtonStyle }}>
-                            <image className='room-bintn-image-Parking' src={GPS} />
-                            <text className='room-bintn-text-Parking'>去这里</text>
-                          </view>
+              }
+
+
+              {/* --------停车场-------- */}
+              {
+                !parkingGps ? <view></view>
+                  :
+                  <view className='room-box-info-Parking'>
+                    <view className='room-bi-name-Parking' >
+                      <view className='room-bin-title-Parking'>停车位置</view>
+                      <view className='room-bint-nameInfo-Parking'>
+                        <view className='room-bint-nameInfo-bool-Parking' >{taRoomContent?.parkingAddress}</view>
+                        <view className='room-bintn-button-Parking' onClick={() => { goParkMap() }} style={{ display: wifiButtonStyle }}>
+                          <image className='room-bintn-image-Parking' src={GPS} />
+                          <text className='room-bintn-text-Parking'>去这里</text>
                         </view>
                       </view>
                     </view>
+                  </view>
 
-                }
+              }
 
 
-                {/* --------无线网-------- */}
-                <view className='room-box-info-WIFIContent'>
-                  <view className='room-bi-name-WIFIContent' >
-                    <view className='room-bin-title-WIFIContent'>WiFi信息</view>
-                    <view className='room-bint-nameInfo-WIFIContent'>
-                      <view className='room-bint-nameInfo-bool-WIFIContent-wifi' >名称：{taRoomContent?.wifiName}</view>
-                      <view className='room-bint-nameInfo-bool-WIFIContent-password' >密码：{taRoomContent?.wifiPassword}</view>
-                      <view className='room-bintn-button-WIFIContent' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
-                        <image className='room-bintn-image-WIFIContent' src={copy_logo} />
-                        <text className='room-bintn-text-WIFIContent'>复制</text>
-                      </view>
+              {/* --------无线网-------- */}
+              <view className='room-box-info-WIFIContent'>
+                <view className='room-bi-name-WIFIContent' >
+                  <view className='room-bin-title-WIFIContent'>WiFi信息</view>
+                  <view className='room-bint-nameInfo-WIFIContent'>
+                    <view className='room-bint-nameInfo-bool-WIFIContent-wifi' >名称：{taRoomContent?.wifiName}</view>
+                    <view className='room-bint-nameInfo-bool-WIFIContent-password' >密码：{taRoomContent?.wifiPassword}</view>
+                    <view className='room-bintn-button-WIFIContent' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
+                      <image className='room-bintn-image-WIFIContent' src={copy_logo} />
+                      <text className='room-bintn-text-WIFIContent'>复制</text>
                     </view>
                   </view>
                 </view>
+              </view>
 
-                <view className='Guide-Content-box'  >
-                  <view className='title-image' style={{ display: guideStyle }} >
-                    <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
-                    <text className='title-title-boss' >更多指引</text>
-                  </view>
-                  <view style={{ padding: '0 30rpx', boxSizing: 'border-box' }}>
-                    {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
-                  </view>
+              <view className='Guide-Content-box'  >
+                <view className='title-image' style={{ display: guideStyle }} >
+                  <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
+                  <text className='title-title-boss' >更多指引</text>
                 </view>
-              </SpinBox>
-            )
-          }
-          <view className='Guide-Content-box'>
-            <view className='title-image'>
-              <image mode='scaleToFill' className='title-image-cup' src={Cup} />
-              <text className='title-title-boss' >老板推荐好吃的</text>
-            </view>
-          </view>
-          <view style={{ marginTop: '10rpx', marginBottom: '60rpx' }}>
-            {(spackage || []).map((item, index) => <BossCard det={item} st={parseFloat(item.score.toFixed(1))} key={(index)} trackClick={trackClick} taRoomContent={taRoomContent} item={item} />)}
+                <view style={{ padding: '0 30rpx', boxSizing: 'border-box' }}>
+                  {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
+                </view>
+              </view>
+            </SpinBox>
+          )
+        }
+        <view className='Guide-Content-box'>
+          <view className='title-image'>
+            <image mode='scaleToFill' className='title-image-cup' src={Cup} />
+            <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
-
         </view>
+        <view style={{ marginTop: '10rpx', marginBottom: '60rpx' }}>
+          {(spackage || []).map((item, index) => <BossCard det={item} st={parseFloat(item.score.toFixed(1))} key={(index)} trackClick={trackClick} taRoomContent={taRoomContent} item={item} />)}
+        </view>
+      </view>
     </scroll-view>
   )
 }

src/pages/index/tabs/Recommend.jsx

@@ -1,6 +1,5 @@
 import Taro, { useDidShow } from '@tarojs/taro'
 import { React, useState, useEffect, useRef } from 'react'
-import { View } from '@tarojs/components';
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import locationimg from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'
@@ -27,6 +26,8 @@ export default (props) => {
   // 获取资源表信息
   // const [alllist, setAllList] = useState([])
   const [listData, setListData] = useState({ list: [], rfTimes: 0 })
+  const { isSaved } = listData
+
 
   //分类标签
   const tabs = [{ title: '附近' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
@@ -55,6 +56,7 @@ export default (props) => {
     setListData({ list: value, rfTimes: rfTimes.current })
   }
 
+
   useEffect(() => {
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
@@ -66,16 +68,9 @@ export default (props) => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
   }
-  // // 联动收藏
-  // const likeLook = () => {
-  //   getResourceList().then(e => {
-  //     setAllList(e.records)
-  //   })
-
-  // }
 
   useDidShow(() => {
-    setQueryParams({ ... queryParams})
+    setQueryParams({ ...queryParams })
   })
 
   return (
@@ -107,22 +102,22 @@ export default (props) => {
         </scroll-view>
       </view>
       {/* <View style={{ flex:'auto' }}> */}
-        <List
-          ref={listRef}
-          style={listStyle}
-          request={getResourceList}
-          params={queryParams}
-          onDataChange={handleDataChange}
-        >
-          <view style={{ padding: '30rpx 15rpx' }}>
-            <MasonryLayout
-              itemKey='resourceNo'
-              listData={listData}
-              render={(item, callback) => <Card item={item} onImageLoad={callback} />}
-            />
-          </view>
-
-          {/* {
+      <List
+        ref={listRef}
+        style={listStyle}
+        request={getResourceList}
+        params={queryParams}
+        onDataChange={handleDataChange}
+      >
+        <view style={{ padding: '30rpx 15rpx' }}>
+          <MasonryLayout
+            itemKey='resourceNo'
+            listData={listData}
+            render={(item, callback) => <Card item={item} onImageLoad={callback} />}
+          />
+        </view>
+
+        {/* {
             alllist.length == 0 ?
               <NoData /> :
               <view className='waterfall'>
@@ -131,7 +126,7 @@ export default (props) => {
                 }
               </view>
           } */}
-        </List>
+      </List>
       {/* </View> */}
     </view>
   )