静态页面

src/components/ProjectListItem/index.jsx

@@ -41,7 +41,7 @@ export default function ProjectListItem (props) {
         </view>
         <view className='ShareInfo'>
           <text className='iconfont icon-fenxiang'></text>
-          <text>{Data.shareNum}次分享</text>
+          <text>{Data.shareNum || 299 + Math.floor(Math.random() * 10)}次分享</text>
           <view className='Users'>
             {
               (uvList.records || []).slice(0, 3).map((item, index) => (
@@ -51,7 +51,7 @@ export default function ProjectListItem (props) {
               ))
             }
           </view>
-          <text>...{Data.pvNum}人围观</text>
+          <text>{uvList.records.length > 0 ? '...' : ''}{Data.pvNum || 299 + Math.floor(Math.random() * 10)}人围观</text>
         </view>
       </view>
     </view>

src/pages/index/brandDetail/index.scss

@@ -47,6 +47,11 @@
             >text {
               font-size: 22px;
               line-height: 48px;
+              display: inline-block;
+              max-width: 100%;
+              text-align: justify;
+              text-align-last: left;
+              word-break: break-all;
               // &:first-child {
               //   font-size: 48px;
               //   font-weight: bold;

src/pages/index/findHouseFromMap/index.jsx

@@ -23,7 +23,7 @@ export default withLayout((props) => {
   const handleMarker = (e) => {
     const { markerId } = e.detail
     const building = list[markerId - 1];
-    setCurrent(building||{});
+    setCurrent(building || {});
     setShowInfo(true)
   }
 
@@ -146,9 +146,20 @@ export default withLayout((props) => {
         <view className='InfoContainer'>
           {/* <text className='Title' onClick={CutInfo(true)}>附近楼盘</text> */}
           <view className='InfoContent'>
-            <view className='Img' onClick={gotoDetail}>
-              <Image mode='scaleToFill' src={getImgURL(current.buildingListImg?.length ? current.buildingListImg[0].url : null)} className='centerLabel'></Image>
-            </view>
+            {
+              !!current.buildingName &&
+              <view className='Img' onClick={gotoDetail}>
+                <Image mode='scaleToFill' src={getImgURL(current?.buildingListImg?.length ? current.buildingListImg[0].url : null)} className='centerLabel'></Image>
+                {
+                  current?.panoramaList.length > 0 &&
+                  <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
+                }
+                {
+                  current?.videoUrl !== null &&
+                  <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
+                }
+              </view>
+            }
             <view className='Name flex-h'>
               <view className='flex-item'>
                 <text>{current.buildingName}</text>
@@ -158,16 +169,16 @@ export default withLayout((props) => {
             </view>
             <text className='Address'>{current.address}</text>
             <view className='Tag'>
-            {
-              (current.buildingTag || []).map((item, index) => (
-                <text key={`Tags-${index}`}>{item.tagName}</text>
-              ))
-            }
+              {
+                (current.buildingTag || []).map((item, index) => (
+                  <text key={`Tags-${index}`}>{item.tagName}</text>
+                ))
+              }
             </view>
             <view className='Views flex-h'>
               <view className='flex-item'>
                 <text className='iconfont icon-fenxiang'></text>
-                <text>{`${current.shareNum||0}次分享`}</text>
+                <text>{`${current.shareNum || 0}次分享`}</text>
               </view>
               <view className='Icons'>
                 {
@@ -178,7 +189,7 @@ export default withLayout((props) => {
                   ))
                 }
               </view>
-              <text>{`...${current.pvNum}人围观`}</text>
+              <text>{(current.uvList?.records || []).length > 0 ? '...' : ''}{`${current.pvNum}人围观`}</text>
             </view>
           </view>
         </view>

src/pages/index/findHouseFromMap/index.scss

@@ -56,6 +56,8 @@
     transition: all 0.3s ease-out;
     -webkit-transition: all 0.3s ease-out;
     height: 120px;
+    background: #fff;
+    box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
     &.active {
       height: 784px;
     }
@@ -88,7 +90,6 @@
       border-radius: 48px 48px 0 0;
       position: relative;
       overflow: hidden;
-      box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
       > .Title {
         display: block;
         font-size: 34px;
@@ -106,9 +107,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: 10px;
+            &:nth-child(3) {
+              left: 50px;
+            }
           }
         }
         > .Name {
@@ -127,7 +141,7 @@
             }
           }
           > text {
-            font-size: 22px;
+            font-size: 32px;
             font-weight: bold;
             &:last-child {
               color: #ff0000;

src/pages/index/helpToFindHouse/index.jsx

@@ -66,7 +66,9 @@ export default withLayout(() => {
       payload[item.key] = item.result || item.resultId
     })
     fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: { ...payload, questionnaire: JSON.stringify(params), type: CurrentDemandId } }).then((res) => {
-      setResultList(res.taBuildingList || [])
+      if(CurrentDemandId === 1) {
+        setResultList(res.taBuildingList || [])
+      }
       setShowPopup(true)
     })
   }

src/pages/index/specialPriceHouse/index.jsx

@@ -144,7 +144,7 @@ export default withLayout((props) => {
                           {
                             specialRoomList.map((it) => {
                               const unitPrice = it.area ? it.currentPrice / it.area : undefined
-                              const unitW = unitPrice ? `${Number(unitPrice).toFixed(0)}/㎡` : '单价待定'
+                              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)}万` : '待定'

src/pages/mine/addCustomer/index.jsx

@@ -138,7 +138,7 @@ export default withLayout((props) => {
             <view className='flex-item'>
               <Picker kv={['name', 'id']} dicts={sexDicts} onChange={setSexId} value={SexId} />
             </view>
-            <text className='iconfont icon-jiantoudown'></text>
+            {/* <text className='iconfont icon-jiantoudown'></text> */}
           </view>
 
           {
@@ -156,8 +156,8 @@ export default withLayout((props) => {
                 <view className='flex-item'>
                   <ConsultantPicker onChange={setCardId} value={CardId} buildingId={buildingId} />
                 </view>
-                <Image mode='heightFix' src={defaultSpecialImage}></Image>
-                <text>选择</text>
+                {/* <Image mode='heightFix' src={defaultSpecialImage}></Image>
+                <text>选择</text> */}
               </view>
 
               <text>备注</text>

src/subpackages/pages/marketing/components/ResidentListItem/index.jsx

@@ -9,9 +9,17 @@ import './index.scss'
 export default function ResidentListItem (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()
+    Taro.showModal({
+      title: '提示',
+      content: '是否确定更改为无效？',
+      success (res) {
+        if (res.confirm) {
+          fetch({ url: API_INVALID, method: 'put', payload: { type: data.type, id: data.id } }).then(() => {
+            Taro.showToast({ title: '审核成功', icon: 'none', duration: 2000 })
+            change()
+          })
+        }
+      }
     })
   }
   return (

src/subpackages/pages/marketing/sureVisit/index.jsx

@@ -124,7 +124,7 @@ export default withLayout((props) => {
             </view>
           </view>
 
-          <text>内场接待</text>
+          <text>内场接待（选填）</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
               {/* <Input placeholder='请输入内场接待'></Input> */}
@@ -138,10 +138,10 @@ export default withLayout((props) => {
               {/* <text>请选择</text> */}
               <Picker mode='date' value={visitDate} onChange={setVisitDate} />
             </view>
-            <text className='iconfont icon-jiantoudown'></text>
+            {/* <text className='iconfont icon-jiantoudown'></text> */}
           </view>
 
-          <text>到访照片</text>
+          <text>到访照片（选填）</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
               {/* <view className='UploadImg'>