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

src/pages/index/mortgageCalculation/components/ShangYe/index.jsx

@@ -4,9 +4,24 @@ import './index.scss'
 
 export default function ShangYe () {
 
+  // 商贷年限
   const [Years, setYears] = useState([])
-  const [CurrentYearsName, setCurrentYearsName] = useState('30年')
-  const [CurrentYearsId, setCurrentYearsId] = useState(30)
+  const [CurrentYears, setCurrentYears] = useState({})
+  
+  // 利率方式
+  const [InterestTypes] = useState([
+    { name: '按LPR', id: 1 },
+    { name: '按旧版基准利率', id: 2 }
+  ])
+  const [CurrentInterestTypes, setCurrentInterestTypes] = useState(InterestTypes[0])
+
+  let BusinessInterestTypes1 = [ // 按照LPR
+    {name: '', id: 1}
+  ]
+  const BusinessInterestTypes2 = [ // 按照旧版基准利率
+  ]
+  const [BusinessInterestTypes] = useState(BusinessInterestTypes1)
+  const [CurrentBusinessInterest, setCurrentBusinessInterest] = useState(BusinessInterestTypes[0])
 
   useEffect(() => {
     if (!Years.length) {
@@ -15,6 +30,8 @@ export default function ShangYe () {
         Arr.push({ name: `${n}年`, id: n })
       }
       setYears(Arr)
+    } else {
+      setCurrentYears(Years[0])
     }
   }, [Years])
 
@@ -39,7 +56,23 @@ export default function ShangYe () {
       <view className='flex-h'>
         <text>商贷年限</text>
         <view className='flex-item'>
-          <picker value={0} range-key='name' range={Years}>{CurrentYearsName}</picker>
+          <picker value={0} range-key='name' range={Years}>{CurrentYears.name}</picker>
+        </view>
+        <text className='iconfont icon-jiantouright'></text>
+      </view>
+
+      <view className='flex-h'>
+        <text>利率方式</text>
+        <view className='flex-item'>
+          <picker value={0} range-key='name' range={InterestTypes}>{CurrentInterestTypes.name}</picker>
+        </view>
+        <text className='iconfont icon-jiantouright'></text>
+      </view>
+
+      <view className='flex-h'>
+        <text>商贷利率</text>
+        <view className='flex-item'>
+          <picker value={0} range-key='name' range={BusinessInterestTypes}>{CurrentBusinessInterest.name}</picker>
         </view>
         <text className='iconfont icon-jiantouright'></text>
       </view>

src/pages/index/mortgageCalculation/index.jsx

@@ -1,8 +1,8 @@
 import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
 import { ScrollView } from '@tarojs/components'
-import ShangYe from './components/ShangYe/index'
 import '@/assets/css/iconfont.css'
+import ShangYe from './components/ShangYe/index'
 import './index.scss'
 
 export default withLayout(() => {

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

@@ -9,10 +9,12 @@ export default function EditUserDetailBasicInfo (props) {
   const { Data = {}, close = () => { }, CustomerId = null } = props
 
   const [FormData, setFormData] = useState({ ...Data })
-  const [Age, setAge] = useState(null)
-  const [HouseholdIncome, setHouseholdIncome] = useState(null)
-  const [EstimatedPurchaseTime, setEstimatedPurchaseTime] = useState(null)
+  const [Sex, setSex] = useState(Data?.sex - 0 === 1 ? '男' : '女')
+  const [Age, setAge] = useState(Data?.age || null)
+  const [HouseholdIncome, setHouseholdIncome] = useState(Data?.householdIncome || null)
+  const [EstimatedPurchaseTime, setEstimatedPurchaseTime] = useState(Data?.estimatedPurchaseTime || null)
 
+  const [SexList] = useState(['男', '女'])
   const [AgeRange] = useState(['18-25', '26-30', '30-35', '36-45', '46-50', '50-60', '60以上'])
   const [IncomeRange] = useState(['10万以下', '10-15万', '15-20万', '20-30万', '30-50万', '50-75万', '75-100万', '100万以上'])
   const [BuyTimeRange] = useState(['1月以内', '1至3月', '半年以内', '一年以内', '一年以上'])
@@ -40,12 +42,17 @@ export default function EditUserDetailBasicInfo (props) {
     let resData = FormData
     if (key === 'age') {
       resData[key] = AgeRange[e.detail.value]
+      setAge(AgeRange[e.detail.value])
     } else if (key === 'householdIncome') {
       resData[key] = IncomeRange[e.detail.value]
+      setHouseholdIncome(IncomeRange[e.detail.value])
     } else if (key === 'estimatedPurchaseTime') {
       resData[key] = BuyTimeRange[e.detail.value]
+      setEstimatedPurchaseTime(BuyTimeRange[e.detail.value])
+    } else if (key === 'sex') {
+      resData[key] = SexList[e.detail.value] === '男' ? 1 : 2
+      setSex(SexList[e.detail.value])
     }
-    console.log(resData)
     setFormData(resData)
   }
 
@@ -87,6 +94,16 @@ export default function EditUserDetailBasicInfo (props) {
             </view>
           </view>
 
+          <text>性别</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Picker onChange={PickerChange.bind(this, 'sex')} value={null} range={SexList}>
+                <text>{Sex || '请选择'}</text>
+              </Picker>
+            </view>
+            <text className='iconfont icon-jiantoudown'></text>
+          </view>
+
           <text>家庭住址</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
@@ -105,7 +122,7 @@ export default function EditUserDetailBasicInfo (props) {
           <view className='FormLine flex-h'>
             <view className='flex-item'>
               <Picker onChange={PickerChange.bind(this, 'age')} value={null} range={AgeRange}>
-                <text>{FormData.age || '请选择'}</text>
+                <text>{Age || '请选择'}</text>
               </Picker>
             </view>
             <text className='iconfont icon-jiantoudown'></text>
@@ -122,7 +139,7 @@ export default function EditUserDetailBasicInfo (props) {
           <view className='FormLine flex-h'>
             <view className='flex-item'>
               <Picker onChange={PickerChange.bind(this, 'householdIncome')} value={null} range={IncomeRange}>
-                <text>{FormData.householdIncome || '请选择'}</text>
+                <text>{HouseholdIncome || '请选择'}</text>
               </Picker>
             </view>
             <text className='iconfont icon-jiantoudown'></text>
@@ -153,7 +170,7 @@ export default function EditUserDetailBasicInfo (props) {
           <view className='FormLine flex-h'>
             <view className='flex-item'>
               <Picker onChange={PickerChange.bind(this, 'estimatedPurchaseTime')} value={null} range={BuyTimeRange}>
-                <text>{FormData.estimatedPurchaseTime || '请选择'}</text>
+                <text>{EstimatedPurchaseTime || '请选择'}</text>
               </Picker>
             </view>
             <text className='iconfont icon-jiantoudown'></text>

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

@@ -65,7 +65,7 @@ export default function UserDetailFollowRecord (props) {
               PageList.map((item, index) => (
                 <view className='flex-h' key={`Item-${index}`}>
                   <view className='flex-item'>
-                    <text>{formatDate(item.createDate, 'YYYY年MM月DD日 HH:mm:ss')}</text>
+                    <text>{formatDate(item.createDate, 'yyyy年MM月dd日 hh:mm:ss')}</text>
                   </view>
                   <view className='Line'>
                     <view></view>

src/pages/mine/customerDetail/index.jsx

@@ -4,7 +4,7 @@ import withLayout from '@/layout'
 import '@/assets/css/iconfont.css'
 import { Image, Textarea } from '@tarojs/components'
 import { fetch } from '@/utils/request'
-import { API_GET_CUSTOMER_INFO, API_FOLLOW_LIST } from '@/constants/api'
+import { API_GET_CUSTOMER_INFO } from '@/constants/api'
 import { getCustomerDetail, addFollowRecord } from '@/services/person'
 import { getImgURL } from '@/utils/image'
 import { BIZ_STATUS } from '@/constants/user'
@@ -15,7 +15,7 @@ import UserDetailActivityInfo from '../components/UserDetailActivityInfo/index'
 import UserDetailFollowRecord from '../components/UserDetailFollowRecord/index'
 
 export default withLayout((props) => {
-  const { router, person } = props
+  const { router } = props
   const { id : CustomerId,  } = router.params
 
   const [custBaseInfo, setCustBaseInfo] = useState({})
@@ -60,7 +60,7 @@ export default withLayout((props) => {
       customerSex: CustomerInfo.sex,
       customerId: CustomerId,
     }
-    addFollowRecord(payload).then((res) => {
+    addFollowRecord(payload).then(() => {
       Taro.showToast({
         title: '添加跟进成功',
         icon: 'none'
@@ -91,6 +91,19 @@ export default withLayout((props) => {
     }
   }, [CustomerId])
 
+  const ToChat = () => {
+    if(CustomerInfo.personId) {
+      Taro.navigateTo({
+        url: `/pages/chat/chatDetail/index?friend=${CustomerInfo.personId}`
+      })
+    } else {
+      Taro.showToast({
+        title: '当前人员未登录本小程序',
+        icon: 'none'
+      })
+    }
+  }
+
 
   return (
     <view className='Page customerDetail flex-v'>
@@ -110,7 +123,7 @@ export default withLayout((props) => {
                   </view>
                   <text>{custBaseInfo.phone}</text>
                 </view>
-                <text className='iconfont icon-liaotian'></text>
+                <text className='iconfont icon-liaotian' onClick={ToChat}></text>
                 <text className='iconfont icon-dianhua' onClick={() => { Taro.makePhoneCall({ phoneNumber: custBaseInfo.phone }) }}></text>
               </view>
             </view>