Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

src/components/ProjectItemCard/index.jsx

@@ -17,6 +17,8 @@ export default (props) => {
     <view className='components ProjectItemCard'>
       <view className='Img' onClick={() => goto(Data)}>
         <Image mode='scaleToFill' src={getImgURL(Data?.buildingListImg?.length ? Data.buildingListImg[0].url : null)} className='centerLabel'></Image>
+        <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
+        <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
       </view>
       <view className='Name flex-h' onClick={() => goto(Data)}>
         <view className='flex-item'>

src/components/ProjectItemCard/style.scss

@@ -9,9 +9,22 @@
     overflow: hidden;
     background: #eee;
     border-radius: 8px;
-    > image {
+    > image.centerLabel {
       width: 100%;
       height: 100%;
+      z-index: 1;
+    }
+    >.Tips {
+      width: 30px;
+      height: 30px;
+      display: block;
+      position: absolute;
+      z-index: 2;
+      bottom: 10px;
+      left: 18px;
+      &.Vr {
+        left: 58px;
+      }
     }
   }
   > .Name {

src/components/ProjectListItem/index.jsx

@@ -1,9 +1,9 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+
 import '@/assets/css/iconfont.css'
 import Taro from '@tarojs/taro'
 import { Image } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
+import './index.scss'
 
 export default function ProjectListItem (props) {
   const { Data = {} } = props
@@ -13,6 +13,8 @@ export default function ProjectListItem (props) {
       <view className='Img'>
         <view>
           <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.buildingListImg?.length ? Data.buildingListImg[0].url : null)} />
+          <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
+          <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
         </view>
       </view>
       <view className='flex-item'>

src/components/ProjectListItem/index.scss

@@ -13,9 +13,22 @@
       position: relative;
       overflow: hidden;
       border-radius: 8px;
-      > image {
+      > image.centerLabel {
         width: 100%;
         height: 100%;
+        z-index: 1;
+      }
+      >.Tips {
+        width: 30px;
+        height: 30px;
+        display: block;
+        position: absolute;
+        z-index: 2;
+        bottom: 10px;
+        left: 10px;
+        &.Vr {
+          left: 50px;
+        }
       }
     }
   }

src/constants/api.js

@@ -24,6 +24,7 @@ export const API_GET_CUSTOMER_INFO = resolvePath('customerInfo') // 查询客户
 export const API_SURE_CHIP = resolvePath('marking/preparatory') // 确认认筹
 export const API_SURE_BUY = resolvePath('marking/commission') // 确认结佣
 export const API_SURE_SIGN = resolvePath('marking/signatory') // 确认签约
+export const API_INVALID = resolvePath('marking/invalidCustomer') // 无效
 
 // 获取经纪人绑定楼盘列表
 export const API_GET_AGENT_BUILDINGS = resolvePath('buildingChannel/buildings')

src/pages/index/specialPriceHouse/index.jsx

@@ -5,7 +5,6 @@ import { ScrollView, Image } from '@tarojs/components'
 import Disclaimer from '@/components/Disclaimer'
 import { getImgURL } from '@/utils/image'
 import { formateLeftTime } from '@/utils/tools'
-import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
 import { API_SPECIAL_ROOM_LIST } from '@/constants/api'
 import '@/assets/css/iconfont.css'
@@ -15,7 +14,7 @@ const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/ind
 
 export default withLayout((props) => {
   const { city } = props
-  
+
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [pageNumber, setPageNumber] = useState(1)
@@ -39,14 +38,14 @@ export default withLayout((props) => {
   }
 
   const PageLoadMore = () => { // 页面上拉加载更多
-    if(HasNextPage) {
+    if (HasNextPage) {
       setPageNumber(pageNumber + 1)
     }
   }
 
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      if(pageNumber === 1) {
+      if (pageNumber === 1) {
         GetPageList()
       } else {
         setPageNumber(1)
@@ -84,7 +83,7 @@ export default withLayout((props) => {
 
                 //
                 const specialRoomList = item.specialRoomList || []
-                
+
                 return (
                   <view key={item.buildingId}>
                     <view className='Title'>
@@ -98,6 +97,8 @@ export default withLayout((props) => {
                     <view className='InfoContent'>
                       <view className='Img' onClick={() => goto(item)}>
                         <Image mode='scaleToFill' src={mainImg} className='centerLabel'></Image>
+                        <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
+                        <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
                       </view>
                       <view className='Name flex-h' onClick={() => goto(item)}>
                         <view className='flex-item'>

src/pages/index/specialPriceHouse/index.scss

@@ -77,9 +77,22 @@
               overflow: hidden;
               background: #eee;
               border-radius: 8px;
-              >image {
+              > image.centerLabel {
                 width: 100%;
                 height: 100%;
+                z-index: 1;
+              }
+              >.Tips {
+                width: 30px;
+                height: 30px;
+                display: block;
+                position: absolute;
+                z-index: 2;
+                bottom: 10px;
+                left: 18px;
+                &.Vr {
+                  left: 58px;
+                }
               }
             }
             >.Name {

src/pages/mine/components/ResidentListItem/index.jsx

@@ -1,11 +1,19 @@
-import React, { useState, useEffect } from 'react'
+
 import Taro from '@tarojs/taro'
-import { Image } from '@tarojs/components'
+import { Image, Block } from '@tarojs/components'
 import { formatDate } from '@/utils/chatDate'
+import { fetch } from '@/utils/request'
+import { API_INVALID } from '@/constants/api'
 import './index.scss'
 
 export default function ResidentListItem (props) {
-  const { data = {} } = props
+  const { data = {}, change = () => { } } = props
+  const ToUnVisable = () => {
+    fetch({ url: API_INVALID, method: 'put', payload: { type: data.type, id: data.id } }).then(() => {
+      Taro.showToast({ title: '审核成功', icon: 'none', duration: 2000 })
+      change()
+    })
+  }
   return (
     <view className='components ResidentListItem'>
       <view className='flex-h'>
@@ -13,10 +21,10 @@ export default function ResidentListItem (props) {
         <view className='flex-item'>
           <text>{data.name}</text>
         </view>
-        {
+        {/* {
           data.customerStatus - 0 === 1 &&
           <text className='Status'>已报备</text>
-        }
+        } */}
         {
           data.type === 'report' && (data.channelStatus - 0) === 1 &&
           <text className='Status' onClick={() => { Taro.navigateTo({ url: `/pages/mine/sureVisit/index?id=${data.id}` }) }}>到访确认</text>
@@ -29,23 +37,38 @@ export default function ResidentListItem (props) {
         </view>
         {
           data.customerStatus - 0 === 1 &&
-          <text className='Type'>报备</text>
+          <Block>
+            <Image mode='heightFix' src={require('@/assets/mine-icon29.png')}></Image>
+            <text className='Type'>报备</text>
+          </Block>
         }
         {
           data.customerStatus - 0 === 2 &&
-          <text className='Type'>到访</text>
+          <Block>
+            <Image mode='heightFix' src={require('@/assets/mine-icon30.png')}></Image>
+            <text className='Type'>到访</text>
+          </Block>
         }
         {
           data.customerStatus - 0 === 3 &&
-          <text className='Type'>认筹</text>
+          <Block>
+            <Image mode='heightFix' src={require('@/assets/mine-icon33.png')}></Image>
+            <text className='Type'>认筹</text>
+          </Block>
         }
         {
           data.customerStatus - 0 === 4 &&
-          <text className='Type'>签约</text>
+          <Block>
+            <Image mode='heightFix' src={require('@/assets/mine-icon32.png')}></Image>
+            <text className='Type'>签约</text>
+          </Block>
         }
         {
           data.customerStatus - 0 === 5 &&
-          <text className='Type'>结佣</text>
+          <Block>
+            <Image mode='heightFix' src={require('@/assets/mine-icon31.png')}></Image>
+            <text className='Type'>结佣</text>
+          </Block>
         }
         {/* <Image mode='heightFix' src={require('@/assets/mine-icon27.png')}></Image> */}
       </view>
@@ -63,12 +86,12 @@ export default function ResidentListItem (props) {
       </view>
       <view className='Opt'>
         {
-          !(data.type === 'report' && data.channelStatus === 3) &&
+          !(data.type === 'report' && data.channelStatus - 0 === 3) &&
           <text className='active' onClick={() => { Taro.navigateTo({ url: `/pages/mine/changeVisit/index?id=${data.id}&name=${data.name}&buildingId=${data.buildingId}&type=${data.type}&channelId=${data.channelId}` }) }}>更新交易</text>
         }
         {
-          data.type === 'report' && data.channelStatus === 3 &&
-          <text>无效</text>
+          data.type === 'report' && data.channelStatus - 0 === 1 &&
+          <text onClick={ToUnVisable}>无效</text>
         }
       </view>
     </view>

src/pages/mine/myRecommendCode/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '我的推广码'
+}

src/pages/mine/myRecommendCode/index.jsx

@@ -0,0 +1,13 @@
+// import { useState, useEffect } from 'react'
+import withLayout from '@/layout'
+import '@/assets/css/iconfont.css'
+import './index.scss'
+
+export default withLayout(() => {
+
+  return (
+    <view className='Page myRecommendCode'>
+      我的推广码
+    </view>
+  )
+})

src/pages/mine/myRecommendCode/index.scss

@@ -0,0 +1,7 @@
+.Page.myRecommendCode {
+  background: #f8f8f8;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+}

src/pages/mine/residentManager/index.jsx

@@ -130,6 +130,14 @@ export default withLayout(() => {
     setFilterData({ ...FilterData, keywords: e.detail.value })
   }
 
+  const ListChange = (index) => {
+    return () => {
+      let List = [...PageList]
+      List.splice(index, 1)
+      setPageList(List)
+    }
+  }
+
   return (
     <view className='Page residentManager flex-v'>
 
@@ -169,7 +177,7 @@ export default withLayout(() => {
               <view className='List'>
                 {
                   PageList.map((item, index) => (
-                    <ResidentListItem data={item} key={`ResidentListItem-${index}`}></ResidentListItem>
+                    <ResidentListItem data={item} key={`ResidentListItem-${index}`} change={ListChange(index)}></ResidentListItem>
                   ))
                 }
               </view>

src/pages/mine/tabData.js

@@ -32,6 +32,7 @@ const MineMenuList = {
       { name: '我的收藏', icon: require('../../assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }
     ],
     [
+      { name: '成为驻场管理', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
       { name: '房贷计算器', icon: require('../../assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
       { name: '购房百科', icon: require('../../assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
       { name: '意见反馈', icon: require('../../assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }

src/routes.js

@@ -253,6 +253,12 @@ const routes = [
   },
 
   // 我的
+  {
+    name: '我的推广码',
+    page: 'pages/mine/myRecommendCode/index',
+    pkg: 'main',
+    type: 'mine',
+  },
   {
     name: '房贷计算器',
     page: 'pages/mine/mortgageCalc/index',