静态页面

config/dev.js

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

src/components/ProjectItemCard/index.jsx

@@ -0,0 +1,57 @@
+
+import Taro from '@tarojs/taro'
+import { Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
+import './style.scss'
+
+export default (props) => {
+  const { Data = {} } = props
+
+  const goto = (it) => {
+    Taro.navigateTo({
+      url: `/pages/index/buildingDetail/index?id=${it.buildingId}`
+    })
+  }
+
+  return (
+    <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>
+      </view>
+      <view className='Name flex-h' onClick={() => goto(Data)}>
+        <view className='flex-item'>
+          <text>{Data.buildingName}</text>
+        </view>
+        <text></text>
+        <text>{Data.price || '价格待定'}</text>
+      </view>
+      <text className='Address' onClick={() => goto(Data)}>{Data.address}</text>
+      <view className='Tag' onClick={() => goto(Data)}>
+        {
+          (Data.buildingTag || []).map(x => x.tagName).slice(0, 6).map((x) => (<text key={x}>{x}</text>))
+        }
+      </view>
+      <view className='Views flex-h' onClick={() => goto(Data)}>
+        <view className='flex-item'>
+          <text className='iconfont icon-fenxiang'></text>
+          <text>{`${Data.shareList?.total || 0} 次分享`}</text>
+        </view>
+        {
+          (Data.uvList?.length || 0) > 0 && (
+            <view className='Icons'>
+              {
+                Data.uvList.map((x) => (
+                  <view key={x.uvId}>
+                    <Image mode='scaleToFill' src={getImgURL(x.photoOravatar)} className='centerLabel'></Image>
+                  </view>
+                ))
+              }
+            </view>
+          )
+        }
+        <text>{`...${Data.uvList?.length || 0}人围观`}</text>
+      </view>
+      {props.children}
+    </view>
+  )
+}

src/components/ProjectItemCard/style.scss

@@ -0,0 +1,111 @@
+.components.ProjectItemCard {
+  position: relative;
+  overflow: hidden;
+  margin-top: 34px;
+  > .Img {
+    width: 100%;
+    padding-bottom: 60%;
+    position: relative;
+    overflow: hidden;
+    background: #eee;
+    border-radius: 8px;
+    > image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  > .Name {
+    align-items: center;
+    margin-top: 30px;
+    > .flex-item {
+      margin-right: 10px;
+      > text {
+        display: block;
+        white-space: nowrap;
+        font-size: 32px;
+        font-weight: bold;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+    > text {
+      font-size: 22px;
+      font-weight: bold;
+      &:last-child {
+        color: #ff0000;
+      }
+    }
+  }
+  > .Address {
+    display: block;
+    font-size: 22px;
+    color: #666;
+    line-height: 1;
+    margin-top: 30px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  > .Tag {
+    font-size: 0;
+    > text {
+      display: inline-block;
+      vertical-align: middle;
+      font-size: 16px;
+      color: #333;
+      line-height: 28px;
+      padding: 0 20px;
+      background: rgba(251, 171, 87, 0.3);
+      margin-right: 20px;
+      margin-top: 20px;
+    }
+  }
+  > .Views {
+    align-items: center;
+    margin-top: 20px;
+    padding-bottom: 30px;
+    border-bottom: 2px solid rgba(0, 0, 0, 0.1);
+    > .flex-item {
+      font-size: 0;
+      white-space: nowrap;
+      > text {
+        display: inline-block;
+        vertical-align: middle;
+        font-size: 16px;
+        line-height: 1;
+        &:first-child {
+          font-size: 20px;
+          color: #666;
+          margin-right: 10px;
+        }
+      }
+    }
+    > .Icons {
+      font-size: 0;
+      white-space: nowrap;
+      > view {
+        display: inline-block;
+        vertical-align: middle;
+        width: 24px;
+        height: 24px;
+        position: relative;
+        overflow: hidden;
+        border-radius: 100%;
+        background: #eee;
+        margin-left: -10px;
+        &:first-child {
+          margin-left: 0;
+        }
+        > image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+    > text {
+      font-size: 16px;
+      margin-left: 6px;
+    }
+  }
+}

src/layout/index.js

@@ -114,7 +114,7 @@ export default (ChildComponent) => (props) => {
       }
       <FirstScreen
         info={screenInfo}
-        visible={screenVisible}
+        visible={false}
         onClick={handleScreen}
         onClose={toggleShowScreen}
       />

src/pages/chat/chatDetail/index.jsx

@@ -52,22 +52,42 @@ export default function MyCollectForActivity () {
 
                         {/* 对方消息（文本） */}
                         {
-                          index % 2 === 0 && !!index &&
+                          index % 2 === 0 && index > 2 &&
                           <view className='Message Left'>
                             <text>知道了</text>
                           </view>
                         }
 
+                        {/* 对方消息（图片） */}
+                        {
+                          index === 2 &&
+                          <view className='Message Left Img'>
+                            <view>
+                              <Image mode='scaleToFill' src={null}></Image>
+                            </view>
+                          </view>
+                        }
+
                         {/* 我方消息（文本） */}
                         {
-                          index % 2 === 1 &&
+                          index % 2 === 1 && index !== 1 &&
                           <view className='Message Right'>
                             <text>知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了</text>
                           </view>
                         }
 
+                        {/* 我方消息（图片） */}
+                        {
+                          index === 1 &&
+                          <view className='Message Right Img'>
+                            <view>
+                              <Image mode='scaleToFill' src={null}></Image>
+                            </view>
+                          </view>
+                        }
+
                       </view>
-                      
+
                       {/* 我方头像 */}
                       {
                         index % 2 === 1 &&

src/pages/chat/chatDetail/index.scss

@@ -72,32 +72,32 @@
                   position: relative;
                   overflow: hidden;
                   padding: 20px 20px 40px;
-                  >.Msg {
+                  > .Msg {
                     display: block;
                     font-size: 32px;
                     line-height: 44px;
                     color: #333;
                   }
-                  >.Tips {
+                  > .Tips {
                     color: rgba(0, 0, 0, 0.37);
                     font-size: 28px;
                     line-height: 40px;
                     margin-top: 30px;
                     display: block;
-                    &+view {
+                    & + view {
                       margin-top: 26px;
                     }
                   }
-                  >view {
+                  > view {
                     font-size: 0;
                     white-space: nowrap;
                     margin-top: 20px;
-                    >text {
+                    > text {
                       display: inline-block;
                       vertical-align: middle;
                       font-size: 28px;
                       line-height: 40px;
-                      color: #02C577;
+                      color: #02c577;
                       margin-left: 20px;
                       &:first-child {
                         margin-left: 0;
@@ -122,6 +122,23 @@
                       color: #333;
                     }
                   }
+                  &.Left.Img,
+                  &.Right.Img {
+                    padding: 0;
+                    font-size: 0;
+                    > view {
+                      width: 300px;
+                      height: 300px;
+                      position: relative;
+                      overflow: hidden;
+                      display: inline-block;
+                      background: rgba(0, 0, 0, 0.03);
+                      > image {
+                        width: 100%;
+                        height: 100%;
+                      }
+                    }
+                  }
                   > text {
                     display: inline-block;
                     color: #fff;

src/pages/index/brandDetail/index.jsx

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'
 import withLayout from '@/layout'
 import Taro from '@tarojs/taro'
 import { ScrollView, Image } from '@tarojs/components'
-import ProjectListItem from '@/components/ProjectListItem/index'
+import ProjectItemCard from '@/components/ProjectItemCard/index'
 import { queryBrandInfo } from '@/services/common';
 import { getImgURL } from '@/utils/image'
 import { fetch } from '@/utils/request'
@@ -88,7 +88,7 @@ export default withLayout((props) => {
             <view className='ProjectList'>
               {
                 PageList.map((item, index) => (
-                  <ProjectListItem Data={item} key={`ProjectListItem-${index}`}></ProjectListItem>
+                  <ProjectItemCard Data={item} key={`ProjectItemCard-${index}`}></ProjectItemCard>
                 ))
               }
             </view>

src/pages/index/mortgageCalculation/components/ShangYe/index.jsx

@@ -0,0 +1,49 @@
+import { useState, useEffect } from 'react'
+import { Input } from '@tarojs/components'
+import './index.scss'
+
+export default function ShangYe () {
+
+  const [Years, setYears] = useState([])
+  const [CurrentYearsName, setCurrentYearsName] = useState('30年')
+  const [CurrentYearsId, setCurrentYearsId] = useState(30)
+
+  useEffect(() => {
+    if (!Years.length) {
+      let Arr = []
+      for (let n = 30; n > 0; n--) {
+        Arr.push({ name: `${n}年`, id: n })
+      }
+      setYears(Arr)
+    }
+  }, [Years])
+
+  return (
+    <view className='components ShangYe'>
+
+      <view className='flex-h'>
+        <text>计算方式</text>
+        <view className='flex-item'>
+
+        </view>
+      </view>
+
+      <view className='flex-h'>
+        <text>商贷金额</text>
+        <view className='flex-item'>
+          <Input></Input>
+        </view>
+        <text>万</text>
+      </view>
+
+      <view className='flex-h'>
+        <text>商贷年限</text>
+        <view className='flex-item'>
+          <picker value={0} range-key='name' range={Years}>{CurrentYearsName}</picker>
+        </view>
+        <text className='iconfont icon-jiantouright'></text>
+      </view>
+
+    </view>
+  )
+}

src/pages/index/mortgageCalculation/components/ShangYe/index.scss

@@ -0,0 +1,4 @@
+.components.ShangYe {
+  position: relative;
+  overflow: hidden;
+}

src/pages/index/mortgageCalculation/index.jsx

@@ -1,44 +1,52 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
 import { ScrollView } from '@tarojs/components'
+import ShangYe from './components/ShangYe/index'
 import '@/assets/css/iconfont.css'
+import './index.scss'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
-  // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
-  const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  const [MenuList] = useState([
+    { name: '商业贷款', id: 1 },
+    { name: '组合贷款', id: 2 },
+    { name: '公积金贷款', id: 3 }
+  ])
+  const [CurrnetMenuId, setCurrnetMenuId] = useState(1)
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
-  }
-
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+  const CutMenu = (id) => {
+    return () => {
+      setCurrnetMenuId(id)
     }
-  }, [IsPull])
+  }
 
   return (
-    <view className='Page mortgageCalculation'>
-
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
-        <view className='PageContent'>
-
-          房贷计算
-
-          {/* bottom */}
-          <view className='PageBottom'>
-            <text>已经到底了~</text>
-          </view>
-
+    <view className='Page mortgageCalculation flex-v'>
+
+      <view className='MenuList flex-h'>
+        {
+          MenuList.map((item, index) => (
+            <view key={`ListItem${index}`} className='flex-item'>
+              <text onClick={CutMenu(item.id)} className={CurrnetMenuId === item.id ? 'active' : ''}>{item.name}</text>
+            </view>
+          ))
+        }
+      </view>
+
+      <view className='flex-item'>
+        <view>
+          <ScrollView scroll-y>
+            <view className='PageContent'>
+
+              {
+                CurrnetMenuId === 1 &&
+                <ShangYe></ShangYe>
+              }
+
+            </view>
+          </ScrollView>
         </view>
-      </ScrollView>
+      </view>
 
     </view>
   )

src/pages/index/mortgageCalculation/index.scss

@@ -1,12 +1,58 @@
 .Page.mortgageCalculation {
   background: #fff;
-  > scroll-view {
-    width: 100%;
-    height: 100%;
-    .PageContent {
-      position: relative;
+  >.MenuList {
+    position: relative;
+    overflow: hidden;
+    border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+    padding: 0 30px;
+    >view {
+      text-align: center;
+      font-size: 0;
+      >text {
+        display: inline-block;
+        font-size: 30px;
+        font-weight: bold;
+        line-height: 40px;
+        padding: 20px 0 30px;
+        position: relative;
+        &.active {
+          color: #193C83;
+          &::after {
+            content: '';
+            width: 30px;
+            height: 4px;
+            border-radius: 4px;
+            background: #193C83;
+            display: block;
+            position: absolute;
+            left: 50%;
+            bottom: 4px;
+            transform: translateX(-50%);
+            -webkit-transform: translateX(-50%);
+          }
+        }
+      }
+    }
+  }
+  >.flex-item {
+    position: relative;
+    overflow: hidden;
+    >view {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
       overflow: hidden;
-      min-height: 100vh;
+      > scroll-view {
+        width: 100%;
+        height: 100%;
+        .PageContent {
+          position: relative;
+          overflow: hidden;
+          min-height: 100vh;
+        }
+      }
     }
   }
 }

src/pages/mine/addCustomer/index.jsx

@@ -148,6 +148,10 @@ export default withLayout((props) => {
       Taro.showToast({ title: '请选择客户的意向楼盘', icon: 'none' })
       return false
     }
+    if (CardId === null && type !== 'consultant') {
+      Taro.showToast({ title: '请选择内场接待', icon: 'none' })
+      return false
+    }
     if (!CanSubmit) {
       setCanSubmit(true)
     }

src/pages/mine/mortgageCalc/index.jsx

@@ -1,17 +1,15 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
 import { ScrollView, Input } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
+import './index.scss'
 
-export default withLayout((props) => {
-
-  // const [PageProps] = useState(props)
+export default withLayout(() => {
 
   return (
     <view className='Page mortgageCalc'>
 
-      <ScrollView scroll-y={true} refresher-enabled={false} refresher-background='#fff'>
+      <ScrollView scroll-y>
         <view className='PageContent'>
 
           <text>房产总价/万元</text>

src/routes.js

@@ -4,6 +4,13 @@ const routes = [
   /**********************************
    *  Tab 页面
    *********************************/
+  {
+    name: '聊天',
+    page: 'pages/chat/chatDetail/index',
+    pkg: 'main',
+    type: 'other',
+    auth: ['phone', 'avatar'],
+  },
   {
     name: '首页',
     page: 'pages/index/index',
@@ -39,17 +46,16 @@ const routes = [
   },
 
   // 聊天
-  {
-    name: '聊天',
-    page: 'pages/chat/chatDetail/index',
-    pkg: 'main',
-    type: 'other',
-    auth: ['phone', 'avatar'],
-  },
 
   // /********************************
   //  * 项目相关
   //  *******************************/
+  {
+    name: '房贷计算',
+    page: 'pages/index/mortgageCalculation/index',
+    pkg: 'main',
+    type: 'building',
+  },
   {
     name: '定位',
     page: 'pages/index/location/index',
@@ -225,12 +231,6 @@ const routes = [
     pkg: 'main',
     type: 'building',
   },
-  {
-    name: '房贷计算',
-    page: 'pages/index/mortgageCalculation/index',
-    pkg: 'main',
-    type: 'building',
-  },
   {
     name: '课程详情',
     page: 'pages/index/courseDetail/index',
@@ -253,6 +253,12 @@ const routes = [
   },
 
   // 我的
+  {
+    name: '房贷计算器',
+    page: 'pages/mine/mortgageCalc/index',
+    pkg: 'main',
+    type: 'mine',
+  },
   {
     name: '基本信息',
     page: 'pages/mine/userInfo/index',
@@ -367,12 +373,6 @@ const routes = [
     pkg: 'main',
     type: 'mine',
   },
-  {
-    name: '房贷计算器',
-    page: 'pages/mine/mortgageCalc/index',
-    pkg: 'main',
-    type: 'mine',
-  },
   {
     name: '个人主页',
     page: 'pages/mine/myHomepage/index',