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

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"https://www.newhousehold.cn"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"https://www.newhousehold.cn"',
     // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxc96058d57e77f373",
+	"appid": "wxe44244d1a5ea3364",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,
@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": false,
+		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/components/ProjectListItem/index.jsx

@@ -6,7 +6,7 @@ import { getImgURL } from '@/utils/image'
 import './index.scss'
 
 export default function ProjectListItem (props) {
-  const { Data = {} } = props
+  const { Data = {}, ShowImgIcon = true } = props
   const { uvList = [] } = Data
   return (
     <view className='components ProjectListItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId || Data.targetId}` }) }}>
@@ -14,11 +14,11 @@ export default function ProjectListItem (props) {
         <view>
           <Image mode='aspectFill' className='centerLabel' src={getImgURL((Data?.buildingListImg || []).length ? Data.buildingListImg[0].url : Data.activityImg || null)} />
           {
-            (Data?.panoramaList || []).length > 0 &&
+            (Data?.panoramaList || []).length > 0 && ShowImgIcon &&
             <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
           }
           {
-            Data.videoUrl !== null &&
+            Data.videoUrl !== null && ShowImgIcon &&
             <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
           }
         </view>

src/pages/chat/chatDetail/index.jsx

@@ -179,7 +179,7 @@ export default withLayout((props) => {
                                 item.messageType === im.MESSAGETYPE.IMAGE &&
                                 <view className='Message Left Img'>
                                   <view>
-                                    <Image onClick={CheckBigImg(item.message)} mode='scaleToFill' src={item.message}></Image>
+                                    <Image onClick={CheckBigImg(item.message)} mode='aspectFit' src={item.message}></Image>
                                   </view>
                                 </view>
                               }
@@ -204,7 +204,7 @@ export default withLayout((props) => {
                                 item.messageType === im.MESSAGETYPE.IMAGE &&
                                 <view className='Message Right Img'>
                                   <view>
-                                    <Image onClick={CheckBigImg(item.message)} mode='scaleToFill' src={item.message}></Image>
+                                    <Image onClick={CheckBigImg(item.message)} mode='aspectFit' src={item.message}></Image>
                                   </view>
                                 </view>
                               }
@@ -233,7 +233,7 @@ export default withLayout((props) => {
       </view>
       <view className='SendContent flex-h'>
         <view className='flex-item'>
-          <Input placeholder='发送消息' value={text} onInput={(e) => setText(e.detail.value)} />
+          <Input confirm-type='send' hold-keyboard confirm-hold placeholder='发送消息' value={text} onConfirm={submitText} onInput={(e) => setText(e.detail.value)} />
         </view>
         <text className='iconfont icon-tianjia' onClick={submitImage}></text>
         <Button loading={submitting} className='Send' onClick={submitText}>发送</Button>

src/pages/chat/index.jsx

@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react'
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import { ScrollView, Image } from '@tarojs/components'
 import withLayout from '@/layout'
 import { queryChatFriends } from '@/services/chat'
@@ -36,9 +36,13 @@ export default withLayout((props) => {
     })
   }
 
-  useEffect(() => {
+  // useEffect(() => {
+  //   getList({ pageNumber: 1 })
+  // }, [])
+
+  useDidShow(() => {
     getList({ pageNumber: 1 })
-  }, [])
+  })
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)

src/pages/index/buildingDetail/components/PropertyConsultant/index.jsx

@@ -21,7 +21,7 @@ export default function PropertyConsultant (props) {
 
   const handleMore = () => {
     Taro.navigateTo({
-      url: `/pages/index/buildingPropertyConsultant/index?buildingId=${Info?.buildingId}`
+      url: `/pages/index/buildingPropertyConsultant/index?buldingId=${Info?.buildingId}`
     })
   }
 
@@ -64,7 +64,7 @@ export default function PropertyConsultant (props) {
           List.map((item, index) => (
             <view key={`PersonItem-${index}`} className='flex-h'>
               <view className='Icon' onClick={() => gotoDetail(item)}>
-                <Image mode='aspectFill' src={item.photo || item.avatarurl || item.avatar || item.picture}></Image>
+                <Image mode='aspectFill' src={item.userPhoto || item.photo || item.avatarurl || item.avatar || item.picture}></Image>
               </view>
               <view className='flex-item' onClick={() => gotoDetail(item)}>
                 <text>{item.userName}</text>

src/pages/index/buildingList/index.scss

@@ -24,7 +24,7 @@
         display: inline-block;
         vertical-align: middle;
         width: 150px;
-        font-size: 20px;
+        font-size: 22px;
         margin-left: 10px;
         height: 78px;
         text-align: left;

src/pages/index/buildingPropertyConsultant/index.jsx

@@ -12,6 +12,18 @@ export default withLayout((props) => {
   const { buldingId } = router.params
 
   const [List, setList] = useState([])
+  const [PageList, setPageList] = useState([])
+  const [ShowMore, setShowMore] = useState(false)
+
+  useEffect(() => {
+    if(List.length) {
+      if(ShowMore) {
+        setPageList([...List])
+      } else {
+        setPageList(List.slice(0, 3))
+      }
+    }
+  }, [ShowMore, List])
 
   const handleChat = (item) => {
     Taro.navigateTo({
@@ -55,13 +67,13 @@ export default withLayout((props) => {
         <text className='TopTips'>有任何买卖房屋的问题，欢迎随时咨询</text>
         <view className='List'>
           {
-            List.map((item, index) => (
+            PageList.map((item, index) => (
               <view key={`ListItem-${index}`}>
 
                 <view className='flex-h'>
 
                   <view className='Icon'>
-                    <Image mode='scaleToFill' src={getImgURL(item.photo || item.avatar)}></Image>
+                    <Image mode='scaleToFill' src={getImgURL(item.userPhoto || item.photo || item.avatar)}></Image>
                   </view>
 
                   <view className='flex-item' onClick={() => gotoDetail(item)}>
@@ -90,7 +102,16 @@ export default withLayout((props) => {
               </view>
             ))
           }
-          <text className='BottomTips'>已经到底了~</text>
+          {
+            List.length > 3 && !ShowMore &&
+            <view className='More'>
+              <text onClick={() => { setShowMore(true) }}>查看更多置业顾问</text>
+            </view>
+          }
+          {
+            !(List.length > 3 && !ShowMore) &&
+            <text className='BottomTips'>已经到底了~</text>
+          }
         </view>
       </ScrollView>
     </view>

src/pages/index/buildingPropertyConsultant/index.scss

@@ -95,6 +95,16 @@
           }
         }
       }
+      >.More {
+        text-align: center;
+        border: none;
+        >text {
+          display: inline-block;
+          font-size: 28px;
+          color: #333;
+          line-height: 40px;
+        }
+      }
       >.BottomTips {
         display: block;
         text-align: center;

src/pages/index/findHouseFromMap/index.jsx

@@ -121,6 +121,7 @@ export default withLayout((props) => {
           latitude={city?.lat}
           markers={markers}
           onMarkertap={handleMarker}
+          onCallouttap={handleMarker}
           onTap={() => setShowInfo(false)}
         />
       </view>

src/pages/index/specialPriceHouse/index.jsx

@@ -148,7 +148,7 @@ export default withLayout((props) => {
                               const unitW = unitPrice ? `${Number(unitPrice).toFixed(0)}元/㎡` : '单价待定'
                               const currentW = it.currentPrice ? `${Number(it.currentPrice / 10000).toFixed(1)}` : '待定'
                               const originalW = it.originalPrice ? `${Number(it.originalPrice / 10000).toFixed(1)}` : '待定'
-                              const thriftW = it.thriftPrice ? `省${Number(it.thriftPrice / 10000).toFixed(1)}` : '待定'
+                              const thriftW = it.thriftPrice ? `省${Number(it.thriftPrice / 10000).toFixed(1)}万` : '待定'
                               const leftTime = formateLeftTime(new Date(it.endTime) - new Date(), 'min');
 
                               return (

src/pages/mine/mortgageCalc/components/SYForm.jsx

@@ -39,7 +39,7 @@ export default (props) => {
         <input type='digit' placeholder='请输入基点' value={add} onInput={e => setAdd(e.detail.value)} />
       </Cell>
       <Cell header='贷款利率 : ' footer='%'>
-        {`${LPR}% + ${add||''}BP‱ = ${rate}`}
+        {`${LPR}% + ${add||''}BP‱ = ${(rate - 0).toFixed(2)}`}
       </Cell>
     </view>
   )

src/pages/mine/myShare/index.jsx

@@ -66,7 +66,7 @@ export default withLayout(() => {
           <view className='List'>
             {
               PageList.map((item, index) => (
-                <ProjectListItem Data={item} key={`ProjectListItem-${index}`}></ProjectListItem>
+                <ProjectListItem ShowImgIcon={item.eventType === 'building'} Data={item} key={`ProjectListItem-${index}`}></ProjectListItem>
               ))
             }
           </view>

src/subpackages/pages/consultant/components/StatCustomerListItem/index.jsx

@@ -7,6 +7,12 @@ export default function StatCustomerListItem (props) {
 
   const { data = {}, showStatus = false } = props
 
+  const handleChat = () => {
+    Taro.navigateTo({
+      url: `/pages/chat/chatDetail/index?friend=${data.id}`
+    })
+  }
+
   return (
     <view className='components StatCustomerListItem flex-h'>
       <view className='Icon' onClick={() => { Taro.navigateTo({ url: `/pages/mine/customerDetail/index?id=${data.customerId}&name=${data.name}&sex=${data.sex}&phone=${data.phone}&avatarurl=${data.avatarurl}&status=${data.status}` }) }}>
@@ -19,7 +25,7 @@ export default function StatCustomerListItem (props) {
         </view>
         <text>{data.phone}</text>
       </view>
-      <text className='iconfont icon-liaotian'></text>
+      <text className='iconfont icon-liaotian' onClick={handleChat}></text>
       <text className='iconfont icon-dianhua active' onClick={() => { Taro.makePhoneCall({ phoneNumber: data.phone }) }}></text>
       {
         showStatus &&

src/subpackages/pages/consultant/myHomepage/index.jsx

@@ -105,7 +105,7 @@ export default withLayout((props) => {
           <view className='Card UserInfo'>
             <view className='flex-h Top'>
               <view className='Icon'>
-                <Image mode='aspectFill' src={getImgURL(UserInfo.avatarurl || UserInfo.avatar || UserInfo.picture)}></Image>
+                <Image mode='aspectFill' src={getImgURL(UserInfo.userPhoto || UserInfo.photo || UserInfo.avatarurl || UserInfo.avatar || UserInfo.picture)}></Image>
               </view>
               <view className='flex-item'>
                 <view className='flex-h'>