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

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"https://www.newhousehold.cn"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"https://www.newhousehold.cn"',
     // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://www.newhousehold.cn"',
     // WSS_HOST: '"wss://xlk.njyz.tech"',

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxc96058d57e77f373",
+	"appid": "wxe44244d1a5ea3364",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/constants/api.js

@@ -149,7 +149,7 @@ export const API_CHANNEL_REPORT = resolvePath('channel/report')
 export const API_MANAGE_CUSTOMER_LIST = resolvePath('marking/customers')
 export const API_TOBE_MANAGER = resolvePath('marketing')
 export const API_MY_BUILDINGIDS = resolvePath('building/mine')
-export const API_MARKETING_VISIT = resolvePath('marking//visit')
+export const API_MARKETING_VISIT = resolvePath('marking/visit')
 
 
 // report

src/pages/index/buildingDetail/components/HouseTypeIntro/index.scss

@@ -64,14 +64,20 @@
         }
         >.Title {
           font-size: 0;
-          white-space: nowrap;
+          overflow: hidden;
           margin-top: 20px;
           padding: 0 20px;
           >text {
-            display: inline-block;
-            vertical-align: middle;
+            max-width: 100%;
+            display: block;
+            word-break: break-all;
             font-size: 32px;
             line-height: 44px;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            white-space: pre-line;
             &:first-child {
               color: #FA5431;
               margin-right: 10px;

src/pages/index/components/LiveSale/index.jsx

@@ -23,7 +23,7 @@ export default function LiveSale (props) {
   }, [city])
 
   const GetLiveList = () => {
-    fetch({url: API_LIVE_LIST, method: 'get', payload: {cityId: city.curCity.id, pageNum: 1, pageSize: 20}}).then((res) => {
+    fetch({url: API_LIVE_LIST, method: 'get', payload: {cityId: city.curCity.id, pageNum: 1, pageSize: 20, isHome: 1}}).then((res) => {
       setPageList(res.records || [])
       change(!!(res.records || []).length)
     })

src/pages/mine/addCustomer/getSubmitor.jsx

@@ -6,7 +6,15 @@ import { API_REPORT_CUETOMER, API_USER_ADD_CUSTOMER, API_CHANNEL_REPORT } from '
 export default function getSubmitor(person) {
   const { personType } = person
 
-  const builder = (url) => (payload) => fetch({ url, method: 'post', payload })
+  const builder = (url) => {
+    (payload, callback = () => {}, error = () => {}) => {
+      fetch({ url, method: 'post', payload }).then(() => {
+        callback()
+      }).catch((res) => {
+        error(res)
+      })
+    }
+  }
   let fn = () => undefined
   switch (personType) {
     case ROLE_CODE.CONSULTANT:

src/pages/mine/addCustomer/index.jsx

@@ -90,7 +90,15 @@ export default withLayout((props) => {
     }
 
     setLoading(true)
-    postSubmit(payload).then(() => {
+    let url = null
+    if(personType === ROLE_CODE.CONSULTANT) {
+      url = API_REPORT_CUETOMER
+    } else if(personType === ROLE_CODE.CHANNEL_AGENT) {
+      url = API_CHANNEL_REPORT
+    } else if(personType === ROLE_CODE.CUSTOMER) {
+      url = API_USER_ADD_CUSTOMER
+    }
+    fetch({ url, method: 'post', payload }).then(() => {
       setLoading(false)
       Taro.showToast({ title: '操作成功', icon: 'none' })
       
@@ -98,8 +106,7 @@ export default withLayout((props) => {
         Taro.navigateBack({ delta: 1 })
         clearTimeout(t)
       }, 1500)
-    }).catch((err) => {
-      console.error(err)
+    }).catch(() => {
       setLoading(false)
     })
   }

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

@@ -39,6 +39,7 @@ export default withLayout((props) => {
   const [CurrnetConsultant, setCurrnetConsultant] = useState({})
 
   const [SuccessDate, setSuccessDate] = useState(null)
+  const [channelCustomerId, setChannelCustomerId] = useState(null)
 
   const [StatusList] = useState([
     { name: '认筹', id: 3 },
@@ -68,6 +69,7 @@ export default withLayout((props) => {
       if(CurrentStatusId - 0 === 3) {
         setFormData({ ...FormData, ...res?.customerPreparatory })
       }
+      setChannelCustomerId(res?.channelCustomer?.channelCustomerId)
       setRenChouData({ ...RenChouData, ...res?.customerPreparatory })
       if((res.customerSignatory || []).length) {
         let customerSignatory = res.customerSignatory[0]
@@ -157,7 +159,7 @@ export default withLayout((props) => {
 
   const ToSubmit = () => {
     if (CurrentStatusId === 3) {
-      fetch({ url: API_SURE_CHIP, method: 'put', payload: { customerId: id, customerPreparatory: { ...FormData, channelId: channelId === 'null' || channelId === null ? '' : channelId } } }).then(() => {
+      fetch({ url: API_SURE_CHIP, method: 'put', payload: { customerId: id, customerPreparatory: { ...FormData, channelId: channelId === 'null' || channelId === null ? '' : channelId, channelCustomerId, } } }).then(() => {
         Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
         setTimeout(() => {
           Taro.navigateBack({ delta: 1 })
@@ -171,7 +173,7 @@ 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(() => {
+      fetch({ url: API_SURE_SIGN, method: 'put', payload: { customerId: id, customerSignatory: { ...params, channelId: channelId === 'null' || channelId === null ? '' : channelId, channelCustomerId, } } }).then(() => {
         Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
         setTimeout(() => {
           Taro.navigateBack({ delta: 1 })
@@ -185,7 +187,7 @@ 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(() => {
+      fetch({ url: API_SURE_BUY, method: 'put', payload: { customerId: id, customerSignatory: { ...params, channelId: channelId === 'null' || channelId === null ? '' : channelId, channelCustomerId, } } }).then(() => {
         Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
         setTimeout(() => {
           Taro.navigateBack({ delta: 1 })

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

@@ -22,6 +22,7 @@ export default withLayout((props) => {
   const [visitDate, setVisitDate] = useState(formatDate(Date.now(), 'yyyy-MM-dd'))
   const [imageUrl, setImageUrl] = useState()
   const [remark, setRemark] = useState()
+  const [channelCustomerId, setChannelCustomerId] = useState(null)
 
   const openAlbum = (e) => {
     e.stopPropagation()
@@ -61,6 +62,7 @@ export default withLayout((props) => {
         visitDate: `${visitDate}T12:00:00.000Z`,  // 随便造了一个时刻
         remark,
         channelId: channelCustomer.channelId,
+        channelCustomerId,
       }
     }
 
@@ -86,6 +88,7 @@ export default withLayout((props) => {
         setChannelCustomer(res || {})
 
         setConsultant(res?.realtyConsultant)
+        setChannelCustomerId(res?.channelCustomerId)
 
         if (res?.buildingId) {
           getCardList({