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

src/constants/api.js

@@ -14,6 +14,8 @@ export const resolvePath = api => `${host + pathname}/${api}`
 
 export const API_CITY_AREA = resolvePath('tdCityList/tdAreaCity') // 城市下区域查询
 
+export const API_BUILDING_HOUSE_TYPE = resolvePath('apartmentList') // 获取楼盘户型
+
 // 客户
 export const API_SAVE_CUSTOMER_INFO = resolvePath('customerInfo') // 保存客户信息
 export const API_GET_CUSTOMER_INFO = resolvePath('customerInfo') // 查询客户信息

src/pages/index/courseDetail/index.scss

@@ -108,6 +108,24 @@
             }
           }
           >.Option {
+            >button {
+              background: none;
+              border: none;
+              padding: 0;
+              &::after {
+                display: none;
+              }
+              >text {
+                display: inline-block;
+                vertical-align: middle;
+                font-size: 24px;
+                margin-left: 10px;
+                &:first-child {
+                  margin-left: 0;
+                  font-size: 30px;
+                }
+              }
+            }
             >view, button {
               font-size: 0;
               white-space: nowrap;

src/pages/mine/changeVisit/index.jsx

@@ -3,36 +3,42 @@ import withLayout from '@/layout'
 import { ScrollView, Input, Image, Block, Picker } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import { getCardList } from '@/services/card'
+import { fetch } from '@/utils/request'
+import Taro from '@tarojs/taro'
+import { API_SURE_CHIP, API_BUILDING_HOUSE_TYPE, API_SURE_SIGN, API_SURE_BUY } from '@/constants/api'
 import './index.scss'
 
 export default withLayout((props) => {
 
   const { router } = props
-  const { name, buildingId, type } = router.params
+  const { name, buildingId, type, id, channelId } = router.params
 
   const RenChouData = {
     name,
     realtyConsultant: '',
-    remark: ''
+    remark: '',
   }
 
   const QianYueData = {
     name,
     realtyConsultant: '',
-    remark: ''
-  }
-
-  const JieYongData = {
-    name,
-    realtyConsultant: '',
-    remark: ''
+    remark: '',
+    dividendsName: '',
+    dividendsPer: '',
+    houseInfo: '',
+    houseType: '',
+    price: '',
+    successDate: '',
   }
 
   const [FormData, setFormData] = useState({ ...RenChouData })
 
   const [ConsultantList, setConsultantList] = useState([])
+  const [HouseTypeList, setHouseTypeList] = useState([])
   const [CurrnetConsultant, setCurrnetConsultant] = useState({})
 
+  const [SuccessDate, setSuccessDate] = useState(null)
+
   const [StatusList] = useState([
     { name: '认筹', id: 3 },
     { name: '签约', id: 4 },
@@ -40,14 +46,14 @@ export default withLayout((props) => {
   ])
   const [CurrentStatusId, setCurrentStatusId] = useState(3)
 
-  const [RoomTypeList] = useState([
-    { name: '二室一厅', id: 1 },
-    { name: '三室二厅', id: 2 },
-    { name: '三室一厅', id: 3 },
-    { name: '四室二厅', id: 4 }
-  ])
   const [CurrentRoomTypeId, setCurrentRoomTypeId] = useState(null)
 
+  useEffect(() => {
+    if (channelId !== null && channelId !== 'null') {
+
+    }
+  }, [])
+
   useEffect(() => {
     if (buildingId) {
       const params = {
@@ -62,32 +68,104 @@ export default withLayout((props) => {
     }
   }, [buildingId])
 
+  useEffect(() => {
+    if (CurrentStatusId - 0 !== 3) {
+      fetch({ url: `${API_BUILDING_HOUSE_TYPE}?buildingId=${buildingId}&pageSize=${500}`, method: 'get' }).then((res) => {
+        setHouseTypeList(res.records || [])
+      })
+    }
+  }, [CurrentStatusId])
+
   const CutStatus = (item) => {
     return () => {
       setCurrentStatusId(item.id)
+      if (item.id === 3) {
+        setFormData({ ...RenChouData })
+      } else if (item.id === 4) {
+        setFormData({ ...QianYueData })
+      } else if (item.id === 5) {
+        setFormData({ ...QianYueData })
+      }
     }
   }
 
   const CutRoomType = (item) => {
     return () => {
-      setCurrentRoomTypeId(item.id === CurrentRoomTypeId ? null : item.id)
+      let resData = { ...FormData }
+      resData.houseType = item.apartmentId
+      setFormData({ ...resData })
+      setCurrentRoomTypeId(item.apartmentId)
     }
   }
 
   const InputChange = (key, e) => {
-    let resData = FormData
+    let resData = { ...FormData }
     resData[key] = e.detail.value
-    setFormData(resData)
+    setFormData({ ...resData })
   }
 
   const PickerChange = (key, e) => {
-    let resData = FormData
+    let resData = { ...FormData }
     if (key === 'realtyConsultant') {
       resData[key] = ConsultantList[e.detail.value].id
       resData.realtyConsultantName = ConsultantList[e.detail.value].name
       setCurrnetConsultant(ConsultantList[e.detail.value])
     }
-    setFormData(resData)
+    setFormData({ ...resData })
+  }
+
+  const CheckForm = () => {
+    if (CurrentStatusId === 3) { // 认筹
+      if (FormData.name === '') {
+        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) { // 签约
+
+    }
+    return true
+  }
+
+  const ToSubmit = () => {
+    // if (!CheckForm()) return false
+    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 })
+      })
+    } else if (CurrentStatusId === 4) {
+      let params = {}
+      for (let key in FormData) {
+        if (key !== 'dividendsName' && key !== 'dividendsPer') {
+          params[key] = { ...FormData }[key]
+        }
+      }
+      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 })
+      })
+    } else if (CurrentStatusId === 5) {
+      let params = {}
+      for (let key in FormData) {
+        if (key !== 'dividendsName' && key !== 'dividendsPer') {
+          params[key] = { ...FormData }[key]
+        }
+      }
+      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 })
+      })
+    }
+  }
+
+  const SuccessDateChange = (e) => {
+    let resData = { ...FormData }
+    resData.successDate = new Date(e.detail.value)
+    setFormData(resData.successDate)
+    setSuccessDate(e.detail.value)
   }
 
   return (
@@ -102,7 +180,7 @@ export default withLayout((props) => {
               <view className='CheckBoxList'>
                 {
                   StatusList.map((item, index) => (
-                    <view key={`StatusItem-${index}`} onClick={CutStatus(item)}>
+                    <view key={`StatusItem-${index}`} onClick={CutStatus(item)} style={{ marginRight: index === 2 ? '0px' : '44rpx' }}>
                       <text>{item.name}</text>
                       {
                         CurrentStatusId === item.id &&
@@ -115,99 +193,114 @@ export default withLayout((props) => {
             </view>
           </view>
 
+          <text className='required'>客户姓名</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入姓名' disabled={CurrentStatusId === 5} value={FormData.name} onInput={InputChange.bind(this, 'name')}></Input>
+            </view>
+          </view>
+
+
+          <text>归属渠道</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入渠道' disabled value={type === 'customer' ? '-' : ''}></Input>
+            </view>
+          </view>
+
+          <text className='required'>内场接待</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>
+            </view>
+          </view>
+
           {
-            CurrentStatusId === 3 &&
+            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
             <Block>
-              <text className='required'>客户姓名</text>
+              <text className='required'>业绩分成人|占比/%</text>
               <view className='FormLine flex-h'>
                 <view className='flex-item'>
-                  <Input placeholder='请输入姓名' value={FormData.name} onInput={InputChange.bind(this, 'name')}></Input>
+                  <Input placeholder='请输入业绩分成人' onInput={InputChange.bind(this, 'dividendsName')}></Input>
+                </view>
+                <view className='flex-item'>
+                  <Input placeholder='请输入占比%' type='number' onInput={InputChange.bind(this, 'dividendsPer')}></Input>
                 </view>
               </view>
             </Block>
           }
 
           {
-            CurrentStatusId === 3 &&
+            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
             <Block>
-              <text>归属渠道</text>
+              <text className='required'>户型</text>
               <view className='FormLine flex-h'>
                 <view className='flex-item'>
-                  <Input placeholder='请输入渠道' disabled value={type === 'customer' ? '-' : ''}></Input>
+                  <view className='CheckBoxList'>
+                    {
+                      HouseTypeList.map((item, index) => (
+                        <view key={`RoomTypeItem-${index}`} onClick={CutRoomType(item)}>
+                          <text>{item.apartmentName}</text>
+                          {
+                            CurrentRoomTypeId === item.apartmentId &&
+                            <Image mode='widthFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                          }
+                        </view>
+                      ))
+                    }
+                  </view>
                 </view>
               </view>
             </Block>
           }
 
           {
-            CurrentStatusId === 3 &&
+            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
             <Block>
-              <text className='required'>内场接待</text>
+              <text className='required'>房号</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>
+                  <Input placeholder='请输入房号' onInput={InputChange.bind(this, 'houseInfo')}></Input>
                 </view>
               </view>
             </Block>
           }
 
-          <text className='required'>业绩分成人|占比/%</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入业绩分成人|占比/%'></Input>
-            </view>
-          </view>
-
-          <text className='required'>户型</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <view className='CheckBoxList'>
-                {
-                  RoomTypeList.map((item, index) => (
-                    <view key={`RoomTypeItem-${index}`} onClick={CutRoomType(item)}>
-                      <text>{item.name}</text>
-                      {
-                        CurrentRoomTypeId === item.id &&
-                        <Image mode='widthFix' src={require('../../../assets/findHouse-icon1.png')}></Image>
-                      }
-                    </view>
-                  ))
-                }
+          {
+            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
+            <Block>
+              <text className='required'>签约日期</text>
+              <view className='FormLine flex-h'>
+                <view className='flex-item'>
+                  <Picker mode='date' value={null} onChange={SuccessDateChange}>{SuccessDate || '请选择开始日期'}</Picker>
+                </view>
+                <text className='iconfont icon-jiantoudown'></text>
               </view>
-            </view>
-          </view>
-
-          <text className='required'>房号</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入房号'></Input>
-            </view>
-          </view>
+            </Block>
+          }
 
-          <text className='required'>签约日期</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <text className='iconfont icon-jiantoudown'></text>
-          </view>
+          {
+            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
+            <Block>
+              <text className='required'>成交金额</text>
+              <view className='FormLine flex-h'>
+                <view className='flex-item'>
+                  <Input placeholder='请输入金额' onInput={InputChange.bind(this, 'price')}></Input>
+                </view>
+              </view>
+            </Block>
+          }
 
-          <text className='required'>成交金额</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入金额'></Input>
-            </view>
-          </view>
 
           <text>备注</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='补充说明（选填）'></Input>
+              <Input placeholder='补充说明（选填）' value={FormData.remark} onInput={InputChange.bind(this, 'remark')}></Input>
             </view>
           </view>
 
           <view className='Btn'>
-            <text>提交</text>
+            <text onClick={ToSubmit}>提交</text>
           </view>
 
         </view>

src/pages/mine/changeVisit/index.scss

@@ -71,10 +71,10 @@
             >view {
               display: inline-block;
               vertical-align: middle;
-              width: 194px;
+              min-width: 194px;
               font-size: 0;
               white-space: nowrap;
-              margin-left: 44px;
+              margin-right: 44px;
               border-radius: 4px;
               border: 2px solid #193C83;
               box-sizing: border-box;
@@ -82,9 +82,9 @@
               text-align: center;
               position: relative;
               overflow: hidden;
-              &:nth-child(3n + 1) {
-                margin-left: 0;
-              }
+              // &:nth-child(3n + 1) {
+              //   margin-left: 0;
+              // }
               >text {
                 display: inline-block;
                 font-size: 30px;

src/pages/mine/components/ResidentListItem/index.jsx

@@ -64,7 +64,7 @@ export default function ResidentListItem (props) {
       <view className='Opt'>
         {
           !(data.type === 'report' && data.channelStatus === 3) &&
-          <text className='active' onClick={() => { Taro.navigateTo({ url: `/pages/mine/changeVisit/index?id=${data.id}&name=${data.name}&buildingId=${data.buildingId}&type=${data.type}` }) }}>更新交易</text>
+          <text className='active' onClick={() => { Taro.navigateTo({ url: `/pages/mine/changeVisit/index?id=${data.id}&name=${data.name}&buildingId=${data.buildingId}&type=${data.type}&channelId=${data.channelId}` }) }}>更新交易</text>
         }
         {
           data.type === 'report' && data.channelStatus === 3 &&

src/pages/video/index.scss

@@ -73,6 +73,8 @@
         }
         &:last-child {
           text-align: right;
+          flex: 1;
+          -webkit-flex: 1;
         }
         &.active {
           >text {

src/pages/video/liveDetail/index.scss

@@ -27,5 +27,13 @@
     text{
          color: #ffffff;
     }
+    >button {
+      background: none;
+      border: none;
+      color: #fff;
+      &::after {
+        display: none;
+      }
+    }
   }
 }