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

config/dev.js

     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"http://127.0.0.1:8081"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"ws://127.0.0.1:8081"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

project.config.json

 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": false,
+		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/constants/api.js

 export const API_RECOMENT_CLIENT = resolvePath('customer/new')
 export const API_CLIENT_PROGRESS = resolvePath('customer')
 export const API_TYPE_DATA = resolvePath('awesome/dict/recommendcustomer')
+export const API_USER_ADD_CUSTOMER = resolvePath('average/report')
 
 // channel
 export const API_CHANNEL_REPORT = resolvePath('channel/report')

src/pages/mine/addCustomer/index.jsx

 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_ITEMS_LIST, API_CARDS_LIST, API_REPORT_CUETOMER, API_RECOMENT_CLIENT, API_CHANNEL_REPORT } from '@/constants/api'
+import { API_ITEMS_LIST, API_CARDS_LIST, API_REPORT_CUETOMER, API_USER_ADD_CUSTOMER, API_CHANNEL_REPORT } from '@/constants/api'
 import Taro from '@tarojs/taro'
 import './index.scss'
 
       if (type === 'consultant') { // 置业顾问
         url = API_REPORT_CUETOMER
       } else if (type === 'customer') { // 普通客户
-        url = API_RECOMENT_CLIENT
+        url = API_USER_ADD_CUSTOMER
       } else { // 经纪人
         url = API_CHANNEL_REPORT
       }

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

 import { useState, useEffect } from 'react'
-import './index.scss'
 import { ScrollView, Input, Picker } from '@tarojs/components'
+import './index.scss'
 
 export default function EditUserDetailBasicInfo (props) {
   const { Data = {}, close = () => { } } = props
 
   const [FormData, setFormData] = useState({ ...Data })
 
-  const [SexList] = useState([
-    {name: '男', id: 1},
-    {name: '女', id: 2}
-  ])
   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月', '半年以内', '一年以内', '一年以上'])
+  const [CanSubmit, setCanSubmit] = useState(false)
+
+  useEffect(() => {
+    if(CanSubmit) {
+      setCanSubmit(false)
+      console.log(FormData)
+      close()
+    }
+  }, [CanSubmit])
+
+  const PickerChange = (key, e) => {
+    let resData = FormData
+    if (key === 'age') {
+      resData[key] = AgeRange[e.detail.value]
+    } else if(key === 'householdIncome') {
+      resData[key] = IncomeRange[e.detail.value]
+    } else if(key === 'estimatedPurchaseTime') {
+      resData[key] = BuyTimeRange[e.detail.value]
+    }
+    setFormData(resData)
+  }
 
-  const PickerChange = (e, type) => {
+  const InputChange = (key, e) => {
+    let resData = FormData
+    resData[key] = e.detail.value
+    setFormData(resData)
+  }
 
+  const Submit = () => {
+    if(!CanSubmit) {
+      setCanSubmit(true)
+    }
   }
 
   return (
           <text>姓名</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入姓名'></Input>
+              <Input placeholder='请输入姓名' onInput={InputChange.bind(this, 'name')}></Input>
             </view>
           </view>
 
           <text>昵称</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入昵称'></Input>
+              <Input placeholder='请输入昵称' onInput={InputChange.bind(this, 'nickname')}></Input>
             </view>
           </view>
 
           <text>手机号码</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'>
-              <Picker range-key='name' onChange={PickerChange.bind(this, 'sex')} value={0} range={SexList}>
-                <text>请选择</text>
-              </Picker>
+              <Input placeholder='请输入手机号码' onInput={InputChange.bind(this, 'phone')}></Input>
             </view>
-            <text className='iconfont icon-jiantoudown'></text>
           </view>
 
           <text>家庭住址</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入家庭住址'></Input>
+              <Input placeholder='请输入家庭住址' onInput={InputChange.bind(this, 'homeAddress')}></Input>
             </view>
           </view>
 
           <text>工作地址</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入工作地址'></Input>
+              <Input placeholder='请输入工作地址' onInput={InputChange.bind(this, 'firmAddress')}></Input>
             </view>
           </view>
 
           <text>年龄段</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Picker onChange={PickerChange.bind(this, 'age')} value={0} range={AgeRange}>
+              <Picker onChange={PickerChange.bind(this, 'age')} value={null} range={AgeRange}>
                 <text>请选择</text>
               </Picker>
             </view>
           <text>职业</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入职业'></Input>
+              <Input placeholder='请输入职业' onInput={InputChange.bind(this, 'career')}></Input>
             </view>
           </view>
 
           <text>家庭年收入范围</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Picker onChange={PickerChange.bind(this, 'income')} value={0} range={IncomeRange}>
+              <Picker onChange={PickerChange.bind(this, 'householdIncome')} value={null} range={IncomeRange}>
                 <text>请选择</text>
               </Picker>
             </view>
           <text>家庭成员数</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入家庭成员数'></Input>
+              <Input placeholder='请输入家庭成员数' onInput={InputChange.bind(this, 'familyNumber')}></Input>
             </view>
           </view>
 
           <text>已有房产数</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入已有房产数'></Input>
+              <Input placeholder='请输入已有房产数' onInput={InputChange.bind(this, 'houseNumber')}></Input>
             </view>
           </view>
 
           <text>已有车辆数</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入已有车辆数'></Input>
+              <Input placeholder='请输入已有车辆数' onInput={InputChange.bind(this, 'carNumber')}></Input>
             </view>
           </view>
 
           <text>预计购房时间</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Picker onChange={PickerChange.bind(this, 'time')} value={0} range={BuyTimeRange}>
+              <Picker onChange={PickerChange.bind(this, 'estimatedPurchaseTime')} value={null} range={BuyTimeRange}>
                 <text>请选择</text>
               </Picker>
             </view>
           <text>客户咨询重点</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等'></Input>
+              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等' onInput={InputChange.bind(this, 'consultation')}></Input>
             </view>
           </view>
 
           <text>购房动机</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请填写 如结婚、养老、二孩、改善、学区、投资等'></Input>
+              <Input placeholder='请填写 如结婚、养老、二孩、改善、学区、投资等' onInput={InputChange.bind(this, 'motivation')}></Input>
             </view>
           </view>
 
           <text>客户抗性分析</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等'></Input>
+              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等' onInput={InputChange.bind(this, 'resistanceAnalysis')}></Input>
             </view>
           </view>
 
           <text>客户对项目认可点</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等；'></Input>
+              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等' onInput={InputChange.bind(this, 'approval')}></Input>
             </view>
           </view>
 
           <text>备注</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='补充说明（选填）'></Input>
+              <Input placeholder='补充说明（选填）' onInput={InputChange.bind(this, 'remark')}></Input>
             </view>
           </view>
 
           <view className='Btn'>
-            <text onClick={close}>提交</text>
+            <text onClick={Submit}>提交</text>
           </view>
 
         </view>

src/pages/mine/index.jsx

     setShowLogin(false)
     if (user?.userInfo?.person?.personId) {
       const person = user.userInfo.person
-      setUserRole(person.personType === 'customer' || person.personType === 'drift' ? 1 : person.personType === 'estate agent' ? 2 : person.personType === 'Realty Consultant' ? 3 : 4)
+      setUserRole(person.personType === 'customer' || person.personType === 'drift' ? 1 : person.personType === 'estate agent' || person.personType === 'channel agent' ? 2 : person.personType === 'Realty Consultant' ? 3 : 4)
     }
   }, [user])