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

src/assets/css/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "6512684",
+      "name": "暂无数据",
+      "font_class": "nodata",
+      "unicode": "e613",
+      "unicode_decimal": 58899
+    },
     {
       "icon_id": "9063194",
       "name": "消 息",

src/assets/css/iconfont.svg

@@ -14,6 +14,8 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="nodata" unicode="&#58899;" d="M148.994 206.72000000000003h19.968a9.984 9.984 0 0 0 0-19.84h-19.968v-20.48a9.984 9.984 0 0 0-9.984-9.728 10.112 10.112 0 0 0-10.368 9.728v20.48h-19.584a9.984 9.984 0 0 0-9.856 9.984 9.856 9.856 0 0 0 9.856 9.856h20.224v20.096a9.984 9.984 0 0 0 19.84 0v-20.096z m1306.624 79.616v19.968a9.6 9.6 0 0 1-2.944 7.04 10.24 10.24 0 0 1-7.04 2.816 9.984 9.984 0 0 1-9.856-9.856v-19.968h-20.096a8.96 8.96 0 0 1-6.912-3.072 9.344 9.344 0 0 1-2.816-6.912 9.984 9.984 0 0 1 9.728-9.984h20.096V246.39999999999998a9.856 9.856 0 0 1 9.856-9.856 9.984 9.984 0 0 1 9.984 9.856v19.968h20.096a9.984 9.984 0 0 1 0 19.968zM736.386-41.855999999999995H238.082a19.328 19.328 0 0 0-13.824 5.888 19.84 19.84 0 0 0 13.824 33.92h89.6a80.128 80.128 0 0 0-10.624 39.68V614.4a80 80 0 0 0 23.168 56.192 79.104 79.104 0 0 0 56.064 23.296h59.264v20.096a79.488 79.488 0 0 0 23.296 56.192 78.464 78.464 0 0 0 56.192 23.424h475.008a79.36 79.36 0 0 0 79.232-79.36v-577.28a78.464 78.464 0 0 0-10.624-39.552h109.44a19.968 19.968 0 0 0 0-39.808H950.786v-19.968a78.464 78.464 0 0 0-10.496-39.68h10.496a19.712 19.712 0 0 0 19.84-19.84 19.968 19.968 0 0 0-19.84-19.968H846.722a39.424 39.424 0 0 0-6.016-48.384 40.32 40.32 0 0 0-28.032-11.776 39.296 39.296 0 0 0-28.032 11.776z m72.448 39.808h62.976a39.68 39.68 0 0 1 39.424 40.448V615.552a38.4 38.4 0 0 1-38.4 38.4H395.01a38.4 38.4 0 0 1-38.4-38.4V38.39999999999998a39.936 39.936 0 0 1 39.424-39.936h300.544l-9.984 10.24a40.064 40.064 0 0 0-10.368 38.4l-18.688 18.688A138.112 138.112 0 0 0 469.89 86.39999999999998a139.648 139.648 0 0 0 6.656 189.312 137.984 137.984 0 0 0 188.928 7.04 139.52 139.52 0 0 0 20.096-188.8l19.072-19.072a39.424 39.424 0 0 0 38.4-10.24z m141.952 99.456h59.776a39.808 39.808 0 0 1 39.68 39.808V713.984a39.68 39.68 0 0 1-39.424 39.808H534.914a39.808 39.808 0 0 1-39.424-39.808v-19.84h375.552a79.104 79.104 0 0 0 79.616-79.744v-516.992zM253.058 828.4159999999999h29.184a14.976 14.976 0 1 0 0-29.824h-29.44v-29.696a14.976 14.976 0 1 0-29.824 0V798.592h-29.312a14.848 14.848 0 0 0-10.624 4.224 14.976 14.976 0 0 0 10.624 25.6h29.568V857.6a14.976 14.976 0 1 0 29.824 0zM20.354-21.888000000000034a19.968 19.968 0 0 0 19.712 19.84h119.04a19.712 19.712 0 0 0 19.712-19.84 19.968 19.968 0 0 0-19.712-19.968H40.066a19.84 19.84 0 0 0-13.824 5.888 19.456 19.456 0 0 0-5.76 14.08z m624.256 128a99.84 99.84 0 0 1 0 140.8 98.816 98.816 0 0 1-140.032 0 99.84 99.84 0 0 1 0-140.8 98.816 98.816 0 0 1 140.032 0z m-208.768 468.48a19.84 19.84 0 0 0 19.712 19.968h217.6a19.968 19.968 0 0 0 0-39.808h-217.6a20.736 20.736 0 0 0-14.08 5.76 20.224 20.224 0 0 0-5.632 14.08z m0-99.328a19.84 19.84 0 0 0 19.712 19.84h317.312a19.968 19.968 0 0 0 0-39.808H455.682a19.712 19.712 0 0 0-19.84 19.968z m0-99.456a19.84 19.84 0 0 0 19.712 19.84h139.008a19.84 19.84 0 0 0 0-39.68H455.81a19.84 19.84 0 0 0-19.968 19.84zM60.034 495.104a59.648 59.648 0 1 0 59.264 59.648 59.392 59.392 0 0 0-59.264-59.648z m0 29.824a29.824 29.824 0 0 1 0 59.648 29.824 29.824 0 0 1 0-59.648z m1227.392 89.6a59.648 59.648 0 1 0 59.264 59.648 59.264 59.264 0 0 0-59.264-59.776z m0 29.824a29.568 29.568 0 0 1 25.6 14.976 30.208 30.208 0 0 1 0 29.824 29.696 29.696 0 1 1-25.6-44.8z"  horiz-adv-x="1485" />
+      
       <glyph glyph-name="xiaoxi" unicode="&#58935;" d="M882.176 67.584l6.656-6.656 134.656-134.656H512c-282.624-0.512-512 204.8-512 457.728s229.376 458.24 512 458.24S1024 636.928 1024 384c0-122.88-53.76-233.984-141.824-316.416z m-208.384 235.52c44.544 0 80.896 36.352 80.896 80.896s-36.352 80.896-80.896 80.896c-44.544 0-80.896-36.352-80.896-80.896s36.352-80.896 80.896-80.896z m-323.584 0c44.544 0 80.896 36.352 80.896 80.896s-36.352 80.896-80.896 80.896-80.384-36.352-80.384-80.896 35.84-80.896 80.384-80.896z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="jianjie" unicode="&#58927;" d="M767.723243 457.063784h-512a34.594595 34.594595 0 0 0-36.531892 36.531892 34.594595 34.594595 0 0 0 36.531892 36.531892h512a34.594595 34.594595 0 0 0 36.531892-36.531892 34.594595 34.594595 0 0 0-36.531892-36.531892z m0-219.32973h-512a36.531892 36.531892 0 1 0 0 73.063784h512a36.531892 36.531892 0 1 0 0-73.063784z m0-219.191351h-512a36.531892 36.531892 0 1 0 0 73.063783h512a36.531892 36.531892 0 1 0 0-73.063783z m-512 730.776216h219.744865A34.594595 34.594595 0 0 0 512 712.925405a34.594595 34.594595 0 0 0-36.531892-36.531891H256.276757a34.594595 34.594595 0 0 0-36.531892 36.531891 34.456216 34.456216 0 0 0 36.531892 36.531892zM804.393514 896H219.606486A146.542703 146.542703 0 0 1 73.478919 749.457297v-730.914594A146.542703 146.542703 0 0 1 219.606486-128h584.787028a146.542703 146.542703 0 0 1 146.127567 146.542703V749.457297A146.542703 146.542703 0 0 1 804.393514 896z"  horiz-adv-x="1024" />

src/pages/chat/index.jsx

@@ -22,7 +22,7 @@ export default withLayout((props) => {
       ...params || {},
     }).then((res) => {
       Taro.hideLoading()
-      const { records } =  res
+      const { records } = res
       setPageList(records || [])
     }).catch((err) => {
       console.error(err)
@@ -59,7 +59,7 @@ export default withLayout((props) => {
       <ScrollView scrollY refresherEnabled refresherTriggered={IsPull} onRefresherrefresh={PageRefresh} refresherBackground='#fff'>
         <view className='PageContent'>
           {
-            PageList.map((item, index) => (
+            PageList.map((item) => (
               <view className='ListItem flex-h' key={item.friendId} onClick={() => handleChat(item)}>
                 <view className='Icon'>
                   <view>
@@ -79,6 +79,13 @@ export default withLayout((props) => {
               </view>
             ))
           }
+          {
+            PageList.length === 0 &&
+            <view className='NoData centerLabel'>
+              <text className='iconfont icon-nodata'></text>
+              <text>没有更多聊天信息了~</text>
+            </view>
+          }
         </view>
       </ScrollView>
 

src/pages/chat/index.scss

@@ -76,6 +76,18 @@
           }
         }
       }
+      >.NoData {
+        >text {
+          display: block;
+          text-align: center;
+          font-size: 28px;
+          color: #ccc;
+          &.iconfont {
+            font-size: 160px;
+            margin-bottom: 40px;
+          }
+        }
+      }
     }
   }
 }

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

@@ -47,14 +47,26 @@ export default function News (props) {
 
       <view className='List flex-h'>
         {
-          NewsList.map((item, index) => (
-            <view className='flex-item' key={`ListItem-${index}`} onClick={() => gotoDetail(item)}>
-              <view className='Img' style={{display: item.newsImg || item.newsName ? 'block' : 'none'}}>
-                <Image mode='aspectFill' src={getImgURL(item.newsImg)} className='centerLabel'></Image>
-              </view>
-              <text className='Title'>{item.newsName}</text>
+          NewsList.length > 0 &&
+          <view className='flex-item' onClick={() => gotoDetail(NewsList[0])}>
+            <view className='Img' style={{display: NewsList[0].newsImg || NewsList[0].newsName ? 'block' : 'none'}}>
+              <Image mode='aspectFill' src={getImgURL(NewsList[0].newsImg)} className='centerLabel'></Image>
             </view>
-          ))
+            <text className='Title'>{NewsList[0].newsName}</text>
+          </view>
+        }
+        {
+          NewsList.length > 1 &&
+          <view className='flex-item' onClick={() => gotoDetail(NewsList[1])}>
+            <view className='Img' style={{display: NewsList[1].newsImg || NewsList[1].newsName ? 'block' : 'none'}}>
+              <Image mode='aspectFill' src={getImgURL(NewsList[1].newsImg)} className='centerLabel'></Image>
+            </view>
+            <text className='Title'>{NewsList[1].newsName}</text>
+          </view>
+        }
+        {
+          NewsList.length === 1 &&
+          <view className='flex-item'></view>
         }
       </view>
 

src/pages/index/encyDetail/index.jsx

@@ -40,7 +40,7 @@ export default withLayout((props) => {
               <view className="Info">
                 <view>
                   <text className="Title">
-                    {data.title} {data.subtitle}
+                    {data.title}
                   </text>
                   <view>
                   <text>阅读：{data.pvNum}</text>

src/pages/index/encyclopediasOfBuyHouse/index.jsx

@@ -43,7 +43,7 @@ const EncyItem = (props) => {
               });
             }}
           >
-            <text className="Name">{subItem.title}</text>
+            <text className="Name">{subItem.subtitle}</text>
             {subItem.isHot === 1 && (
               <text className="Tips" style={{ background: "#FF0000" }}>
                 {/* {subItem.tips} */}

src/pages/mine/myRecommendCode/index.jsx

@@ -4,6 +4,8 @@ import withLayout from '@/layout'
 import '@/assets/css/iconfont.css'
 import { fetch } from '@/utils/request'
 import { API_QRCODE } from '@/constants/api'
+import { getImgURL } from '@/utils/image'
+import Taro from '@tarojs/taro'
 import './index.scss'
 
 export default withLayout((props) => {
@@ -21,10 +23,48 @@ export default withLayout((props) => {
     })
   }, [])
 
+  const Save = () => {
+    Taro.downloadFile({
+      url: QrCodeUrl,
+      success: function(res) {
+        let tempFilePath = res.tempFilePath
+        Taro.saveFile({
+          tempFilePath: tempFilePath,
+          success: function() {
+            Taro.showToast({title: '保存成功', icon: 'none'})
+          },
+          fail: function() {
+            Taro.showToast({title: '保存失败', icon: 'none'})
+          }
+        })
+      }
+    })
+  }
+
+  const PreviewImage = () => {
+    Taro.previewImage({
+      current: QrCodeUrl,
+      urls: [QrCodeUrl]
+    })
+  }
+
   return (
     <view className='Page myRecommendCode'>
-      <Image mode='widthFix' src={QrCodeUrl}></Image>
-      <text>扫一扫上面的二维码图案,成为我的客户</text>
+      <view className='CodeContent'>
+        <view>
+          <view className='flex-h'>
+            <view className='Icon'>
+              <Image mode='scaleToFill' src={getImgURL(person?.userPhoto || person?.avatarurl)}></Image>
+            </view>
+            <text>{person?.name}</text>
+          </view>
+          <Image mode='widthFix' src={QrCodeUrl} onClick={PreviewImage}></Image>
+          <text>扫一扫上面的二维码图案,成为我的客户</text>
+        </view>
+      </view>
+      <view className='Btn'>
+        <text onClick={Save}>保存到手机</text>
+      </view>
     </view>
   )
 })

src/pages/mine/myRecommendCode/index.scss

@@ -4,16 +4,65 @@
   height: 100%;
   position: relative;
   overflow: hidden;
-  >image {
-    width: 50%;
-    display: block;
-    height: auto;
-    margin: 100px auto 0;
+  >.CodeContent {
+    padding: 30px;
+    position: relative;
+    overflow: hidden;
+    >view {
+      padding: 30px;
+      position: relative;
+      overflow: hidden;
+      background: #fff;
+      border-radius: 16px;
+      box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
+      >.flex-h {
+        align-items: center;
+        >.Icon {
+          width: 80px;
+          height: 80px;
+          border-radius: 6px;
+          position: relative;
+          overflow: hidden;
+          background: #eee;
+          >image {
+            width: 100%;
+            height: 100%;
+          }
+        }
+        >text {
+          font-size: 28px;
+          margin-left: 40px;
+        }
+      }
+      >image {
+        width: 80%;
+        height: auto;
+        display: block;
+        margin: 60px auto 0;
+      }
+      >text {
+        display: block;
+        text-align: center;
+        font-size: 30px;
+        margin-top: 40px;
+      }
+    }
   }
-  >text {
-    display: block;
-    text-align: center;
-    font-size: 30px;
-    margin-top: 40px;
+  >.Btn {
+    position: relative;
+    overflow: hidden;
+    margin-top: 60px;
+    >text {
+      display: block;
+      font-size: 28px;
+      color: #fff;
+      line-height: 80px;
+      text-align: center;
+      background: #193c83;
+      border-radius: 10px;
+      width: 50%;
+      max-width: 360px;
+      margin: 0 auto;
+    }
   }
 }

src/pages/mine/toBeAgent/index.jsx

@@ -17,7 +17,7 @@ export default withLayout(() => {
     if (Code !== '') {
       fetch({ url: `${API_REGISTER_AGENT}?channelCode=${Code}`, method: 'put' }).then(() => {
         Taro.showToast({ title: '绑定成功', icon: 'none', duration: 2000 })
-        dispatch({ type: UPDATE_USER_INFO, payload: { personType: 'estate agent' } })
+        dispatch({ type: UPDATE_USER_INFO, payload: { personType: 'channel agent' } })
         setTimeout(() => {
           Taro.navigateBack({ delta: 1 })
         }, 1200)

src/pages/mine/userInfo/index.jsx

@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
 import withLayout from '@/layout'
-import { ScrollView, Input, Image } from '@tarojs/components'
+import { ScrollView, Input, Image, Block, Textarea } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
 import { fetch, uploadFiles } from '@/utils/request'
 import { UPDATE_USER_INFO, ROLE_CODE } from '@/constants/user'
@@ -20,29 +20,35 @@ export default withLayout(() => {
   const [UserRole, setUserRole] = useState(null) // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理
   const [FormData, setFormData] = useState({
     name: '',
-    phone: ''
+    phone: '',
+    description: ''
   })
 
   useEffect(() => {
     if (user?.userInfo?.person?.personId) {
       const person = user.userInfo.person
-      setUserRole(person.personType === ROLE_CODE.CUSTOMER || person.personType === ROLE_CODE.DRIFT ? 1 : person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : 4)
+      setUserRole(person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : person.personType === ROLE_CODE.MARKETING ? 4 : 1)
     }
   }, [user])
 
   useEffect(() => {
     setUserInfo(user?.userInfo?.person)
-    console.log(user)
-    setFormData({ name: user?.userInfo?.person.name, phone: user?.userInfo?.person.phone })
+    setFormData({ name: user?.userInfo?.person.name, phone: user?.userInfo?.person.phone, description: user?.userInfo?.person.description })
   }, [user])
 
   const Save = () => {
-    fetch({ url: `${API_EDIT_AGENT}?name=${FormData.name}&phone=${FormData.phone}`, method: 'put' }).then(() => {
+    let params = ''
+    if(UserRole === 3) {
+      params = `name=${FormData.name}&phone=${FormData.phone}&description=${FormData.description}`
+    } else {
+      params = `name=${FormData.name}&phone=${FormData.phone}`
+    }
+    fetch({ url: `${API_EDIT_AGENT}?${params}`, method: 'put' }).then(() => {
       Taro.showToast({
         title: '修改成功',
         icon: 'none'
       })
-      dispatch({ type: UPDATE_USER_INFO, payload: { name: FormData.name, phone: FormData.phone } })
+      dispatch({ type: UPDATE_USER_INFO, payload: { name: FormData.name, phone: FormData.phone, description: FormData.description } })
       // login({ path: '', scene: '' })
     })
   }
@@ -54,7 +60,7 @@ export default withLayout(() => {
   }
 
   const ToUploadImg = () => {
-    if(UserRole - 0 === 3) {
+    if (UserRole - 0 === 3) {
       Taro.chooseImage({
         count: 1,
         success: function (res) {
@@ -103,6 +109,18 @@ export default withLayout(() => {
             </view>
           </view>
 
+          {
+            true &&
+            <Block>
+              <text>简介</text>
+              <view className='FormLine flex-h'>
+                <view className='flex-item'>
+                  <Textarea auto-height placeholder='请输入简介' value={FormData.description} onInput={FormChange.bind(this, 'description')} />
+                </view>
+              </view>
+            </Block>
+          }
+
         </view>
 
         <view className='Btn'>

src/pages/mine/userInfo/index.scss

@@ -45,6 +45,11 @@
             line-height: 40px;
             height: 40px;
           }
+          >textarea {
+            font-size: 26px;
+            display: block;
+            width: 100%;
+          }
           >text {
             display: block;
             width: 100%;