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

src/components/ProjectListItem/index.jsx

@@ -9,7 +9,7 @@ export default function ProjectListItem (props) {
   const { Data = {} } = props
   const { uvList = [] } = Data
   return (
-    <view className='components ProjectListItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId}` }) }}>
+    <view className='components ProjectListItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId || Data.targetId}` }) }}>
       <view className='Img'>
         <view>
           <Image mode='aspectFill' className='centerLabel' src={getImgURL((Data?.buildingListImg || []).length ? Data.buildingListImg[0].url : Data.activityImg || null)} />

src/pages/index/buildingDynamic/index.scss

@@ -67,6 +67,9 @@
                 font-weight: bold;
                 margin-top: 0;
               }
+              &.desc {
+                line-height: 40px;
+              }
             }
             >.Line {
               width: 30px;

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

@@ -123,10 +123,10 @@ export default withLayout((props) => {
         Taro.showToast({ title: '姓名不能为空', icon: 'none', duration: 2000 })
         return false
       }
-      if (FormData.realtyConsultant === '') {
-        Taro.showToast({ title: '请选择内场接待', icon: 'none', duration: 2000 })
-        return false
-      }
+      // if (FormData.realtyConsultant === '') {
+      //   Taro.showToast({ title: '请选择内场接待', icon: 'none', duration: 2000 })
+      //   return false
+      // }
     } else if (CurrentStatusId === 4) { // 签约
 
     }
@@ -138,6 +138,9 @@ export default withLayout((props) => {
     if (CurrentStatusId === 3) {
       fetch({ url: API_SURE_CHIP, method: 'put', payload: { customerId: id, customerPreparatory: { ...FormData, channelId: channelId === 'null' || channelId === null ? '' : channelId } } }).then(() => {
         Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
+        setTimeout(() => {
+          Taro.navigateBack({ delta: 1 })
+        }, 2000)
       })
     } else if (CurrentStatusId === 4) {
       let params = {}
@@ -149,6 +152,9 @@ export default withLayout((props) => {
       params.dividendsName = `${FormData.dividendsName}|${FormData.dividendsPer}%`
       fetch({ url: API_SURE_SIGN, method: 'put', payload: { customerId: id, customerSignatory: { ...params, channelId: channelId === 'null' || channelId === null ? '' : channelId } } }).then(() => {
         Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
+        setTimeout(() => {
+          Taro.navigateBack({ delta: 1 })
+        }, 2000)
       })
     } else if (CurrentStatusId === 5) {
       let params = {}
@@ -160,6 +166,9 @@ export default withLayout((props) => {
       params.dividendsName = `${FormData.dividendsName}|${FormData.dividendsPer}%`
       fetch({ url: API_SURE_BUY, method: 'put', payload: { customerId: id, customerSignatory: { ...params, channelId: channelId === 'null' || channelId === null ? '' : channelId } } }).then(() => {
         Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
+        setTimeout(() => {
+          Taro.navigateBack({ delta: 1 })
+        }, 2000)
       })
     }
   }
@@ -211,7 +220,7 @@ export default withLayout((props) => {
             </view>
           </view>
 
-          <text className='required'>内场接待</text>
+          <text>内场接待</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
               <Picker range-key='name' range={ConsultantList} value={0} onChange={PickerChange.bind(this, 'realtyConsultant')}>{CurrnetConsultant.name || '请选择'}</Picker>