feats

src/actions/house.js

@@ -1,7 +1,17 @@
-import { createActionNormal } from '@/utils/redux'
-import { ADD_CART, SUB_CART } from '@/constants/house'
+import { createAction, createActionNormal } from '@/utils/redux'
+import { API_CARDS_LIST } from '@/constants/api'
+import { ADD_CART, SUB_CART, ADD_CONSULTANT, CHOOSE_CONSULTANT } from '@/constants/house'
 
 // 加入临时车
 export const dispatchAddCart = payload => createActionNormal({ type: ADD_CART, payload })
 // 删减临时车
 export const dispatchSubCart = payload => createActionNormal({ type: SUB_CART, payload })
+// 获取置业顾问
+export const dispatchGetConsultants = payload => createAction({
+  type: ADD_CONSULTANT,
+  url: API_CARDS_LIST,
+  payload
+})
+
+// 临时选择置业
+export const dispatchChooseConsultant = payload => createActionNormal({ type: CHOOSE_CONSULTANT, payload })

src/constants/house.js

@@ -4,3 +4,9 @@ export const ADD_CART = 'ADD_CART'
 
 // 取消选择-暂存
 export const SUB_CART = 'SUB_CART'
+
+// 置业顾问列表
+export const ADD_CONSULTANT = 'ADD_CONSULTANT'
+
+// 临时选择置业
+export const CHOOSE_CONSULTANT = 'CHOOSE_CONSULTANT'

src/onlineSelling/components/ConsultantItem/index.js

@@ -1,18 +1,36 @@
-import { View } from "@tarojs/components";
+import { View, Block } from "@tarojs/components";
 import './index.scss'
 
+export default function ConsultantItem(props) {
 
-export default function CConsultantItem(props) {
-
-  const { data, style, type } = props
+  const { data = {}, style, type } = props
 
   return (
-    <View className="card-item" style={style}>
-      <Image src={data.photo || data.avatar} className='avatar' ></Image>
-      <View className="name">{data.name}<Image src={require('@/assets/person/card.png')} className='card' ></Image>{type == 'raiseProfile' && <View className="tip">您的专属置业顾问</View>}</View>
-      <View className="phone">{data.phone}</View>
-      {!type && <View className="home">主页</View>}
-      {type == 'raiseProfile' && <View className="contact">联系我<Text className="right-icon"></Text></View>}
-    </View >
-  );
-}
+    <Block>
+      {(!data || !data.id) && (<View style="margin-top: 20px; text-align: center">暂无数据</View>)}
+      {
+        (data && data.id) &&
+        (
+          <View className="card-item" style={style}>
+            <View onClick={() => props.onClick && props.onClick(data)}>
+              <Image src={data.photo || data.avatar} className='avatar' ></Image>
+              {
+                data.name &&
+                (
+                  <View className="name">
+                    {data.name}
+                    <Image src={require('@/assets/person/card.png')} className='card' ></Image>
+                    {type == 'raiseProfile' && <View className="tip">您的专属置业顾问</View>}
+                  </View>
+                )
+              }
+              <View className="phone">{data.phone}</View>
+            </View>
+            {!type && <View className="home">主页</View>}
+            {type == 'raiseProfile' && <View className="contact">联系我<Text className="right-icon"></Text></View>}
+          </View >
+        )
+      }
+    </Block>
+  )
+}

src/onlineSelling/components/RaiseCard/index.js

@@ -48,7 +48,7 @@ export default function HouseCard(props) {
     }
   }
   return (
-    <View className="housecard" style={props.style} onClick={props.handleCard}>
+    <View className="housecard" style={props.style}>
       <View className="head">
         {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
           <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
@@ -56,7 +56,7 @@ export default function HouseCard(props) {
       </View>
       <View className="body">
         {props.type == 'raiseMoney' && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
-        <View onClick={toHouseDetail}>
+        <View onClick={props.handleCard}>
           {!props.type && <View className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
           {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className={status == '1' ? 'raised badge' : status == '2' ? 'unraise badge' : 'badge'}>{status == '1' ? '已锁给我' : '未缴费'}</View>}
           {props.type == 'raiseProfile' || props.type == 'raiseMoney' && <View style={props.type == 'raiseMoney' ? 'color:#BB9C79;font-size:30rpx' : 'color:#BB9C79;font-size:30rpx;margin-top:-20rpx'}>{apartmentName || ''}</View>}

src/onlineSelling/pages/chooseConsultant/index.js

@@ -3,29 +3,55 @@ import { View } from '@tarojs/components'
 import ConsultantItem from '../../components/ConsultantItem/index'
 import './index.scss'
 
+import { connect } from '@tarojs/redux'
+import * as houseActions from '@/actions/house'
+import Blank from '../../components/Blank'
 
+@connect(({ house }) => ({ house }), {...houseActions})
 export default class ConsultantList extends Component {
   config = {
     navigationBarTitleText: '选择置业顾问'
   }
+
+  componentDidMount () {
+    const { buildingId } = this.$router.params
+    const { house } = this.props
+
+    if (!house.consultantList || !house.consultantList.length) {
+      this.props.dispatchGetConsultants({
+        buildingId,
+        pageSize: 999,
+        pageNumber: 1,
+      })
+    }
+  }
+
+  handleItemClick = (consultant) => {
+    console.log('----------------->', consultant)
+    this.props.dispatchChooseConsultant(consultant)
+
+    Taro.navigateBack({ delta: 1 })
+  }
  
   render() {
-    const list = [
-      {name:'哈哈哈1',phone:'138541369741',avatar:'http://img5.imgtn.bdimg.com/it/u=3299138037,391931528&fm=26&gp=0.jpg'},
-      {name:'哈哈哈2',phone:'131600514722',avatar:'http://pic1.zhimg.com/50/v2-03d53b468e27ddc99f1ffcd17eec9700_hd.jpg'},
-      {name:'哈哈哈3',phone:'131600514722',avatar:'http://img0.imgtn.bdimg.com/it/u=3024308660,1355431406&fm=26&gp=0.jpg'},
-    ]
+    const { house } = this.props
+
     return (
       <View className="consultantList">
-          {
-            list.map((item,index) => (
-              <ConsultantItem
-                data={item}
-                key={index+'card'}
-                onClick={this.handleItemClick}>
-              </ConsultantItem>
-            ))
-          }    
+        {
+          (!house.consultantList || !house.consultantList.length) &&
+          (<Blank tips="暂无数据"/>)
+        }
+
+        {
+          house.consultantList.map((item,index) => (
+            <ConsultantItem
+              data={item}
+              key={index+'card'}
+              onClick={this.handleItemClick}>
+            </ConsultantItem>
+          ))
+        }
       </View>
     )
   }

src/onlineSelling/pages/raiseMoney/Captcha/index.js

@@ -10,29 +10,30 @@ export default class extends Component {
   }
 
   handleClick = (left) => {
+    if (!this.props.require()) return;
     if (!this.props.countdown) return;
 
     // 计时中
     if (left > 0 && left < this.props.countdown) return;
-
-    // 开始跑表
-    if (this.props.countdown) {
-      let s = 0
-      this.setState({ sec: s })
-
-      const tk = setInterval(() => {
-        if (s >= this.props.countdown) {
-          clearInterval(tk)
-          this.setState({ sec: 0 })
-        } else {
-          s += 1
+    
+    if (this.props.onClick) {
+      this.props.onClick().then(() => {
+        // 开始跑表
+        if (this.props.countdown) {
+          let s = 0
           this.setState({ sec: s })
+    
+          const tk = setInterval(() => {
+            if (s >= this.props.countdown) {
+              clearInterval(tk)
+              this.setState({ sec: 0 })
+            } else {
+              s += 1
+              this.setState({ sec: s })
+            }
+          }, 1000)
         }
-      }, 1000)
-
-      if (this.props.onClick) {
-        this.props.onClick()
-      }
+      })
     }
   }
 

src/onlineSelling/pages/raiseMoney/index.js

@@ -11,6 +11,8 @@ import NextStep from './NextStep'
 import { fetch, apis } from '@/utils/request'
 import Captcha from './Captcha'
 import { raiseOrder } from '@/services/project'
+import { getCodeMessage } from '@/services/getCode'
+import { checkIDCard, isEmpty } from '@/utils/tools'
 
 const getRaiseProfile = ({raiseId, salesBatchId, personId}) => {
   const queryString = [
@@ -23,7 +25,7 @@ const getRaiseProfile = ({raiseId, salesBatchId, personId}) => {
 }
 
 const saveRaiseRecord = (record, raise) => {
-  const data = {
+  const payload = {
     ...record,
     raiseId: raise.raiseId,
     orgId: raise.orgId,
@@ -31,8 +33,7 @@ const saveRaiseRecord = (record, raise) => {
     buildingId: raise.buildingId,
   }
 
-  return fetch({ url: `${apis.API_SAVE_RAISE_RECORD}`, method: 'POST', data })
-  
+  return fetch({ url: `${apis.API_SAVE_RAISE_RECORD}`, method: 'POST', payload })  
 }
 
 @connect(({ user, house }) => ({ ...user, house }), { ...houseActions })
@@ -47,6 +48,8 @@ export default class raiseMoney extends Component {
     record: {},
   }
 
+  captchaLock = false
+
   // 此页面不支持分享，以及二维码
   componentWillMount(){
     ready.queue(() => {
@@ -79,11 +82,21 @@ export default class raiseMoney extends Component {
   }
 
   loadHouseInfo = (houseId, salesBatchId) => {
-    const { personId } = this.props.userInfo.person
+    const { userInfo, house } = this.props
+    const { personId, nickname, idcard, tel, phone } = userInfo.person
 
     // 请求认筹信息
     getRaiseProfile({ salesBatchId, personId }).then(res => {
-      this.setState({ raiseProfile: res, record: res.record || {} })
+      this.setState({ raiseProfile: res, record: res.record || { personId, name: nickname, idcard, tel: tel || phone } })
+
+      // 请求置业顾问列表
+      if (!house.consultantList || !house.consultantList.length) {
+        this.props.dispatchGetConsultants({
+          buildingId: res.buildingId,
+          pageSize: 999,
+          pageNumber: 1,
+        })
+      }
     })
   }
 
@@ -172,12 +185,39 @@ export default class raiseMoney extends Component {
     this.setState({
       record: {
         ...(this.state.record || {}),
-        userId: person.personId,
+        personId: person.personId,
         [`${key}`]: e.detail.value,
       }
     })
   }
 
+  //
+  prepareGetCaptcha = () => {
+    const { record } = this.state
+    const disabled = !!record.raiseRecordId
+    if (disabled) return false;
+
+    if (this.captchaLock) {
+      Taro.showToast({
+        title: '发送中, 请稍后',
+        icon: 'none'
+      })
+      return false;
+    }
+
+    const { tel } = this.state.record || {}
+
+    if (isEmpty(tel) || tel.length < 11) {
+      Taro.showToast({
+        title: '请填写正确的手机号',
+        icon: 'none'
+      })
+      return false;
+    }
+
+    return true
+  }
+
   // 获取验证码
   handleCaptcha = e => {
     const { tel } = this.state.record || {}
@@ -187,18 +227,38 @@ export default class raiseMoney extends Component {
         title: '请填写手机号',
         icon: 'none'
       })
-      return;
+      return Promise.reject();
     }
+
+    return new Promise((resolve, reject) => {
+      this.captchaLock = true
+      getCodeMessage(tel).then(() => {
+        Taro.showToast({ title: '发送成功' })
+        this.captchaLock = false
+        resolve()
+      }).catch(() => {
+        this.captchaLock = false
+        reject()
+      })
+    })
   }
 
   tochooseConsultant() {
+    console.log('--------------------------------------')
     Taro.navigateTo({
       url: '/onlineSelling/pages/chooseConsultant/index'
     })
   }
+
+  getConsultant = () => {
+    const { house } = this.props
+    return house.chooseConsultant ||(house.consultantList || []).filter(x => x.mine)[0]
+  }
+
   renderProfile() {
-    const item = { name: '哈哈哈1', phone: '138541369741', avatar: 'http://img5.imgtn.bdimg.com/it/u=3299138037,391931528&fm=26&gp=0.jpg' }
     const { record } = this.state
+    const consultant = this.getConsultant()
+    const disabled = !!record.raiseRecordId
 
     return (
       <ScrollView scrollY className="container2">
@@ -210,40 +270,39 @@ export default class raiseMoney extends Component {
               <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
               姓名
             </View>
-            <Input className='input' placeholder-style="color:#999" value={record.userName} onInput={this.handleInput.bind(this, 'userName')} type='text' placeholder='请填写真实姓名' />
+            <Input className='input' placeholder-style="color:#999" disabled={disabled} value={record.name} onInput={this.handleInput.bind(this, 'name')} type='text' placeholder='请填写真实姓名' />
           </View>
           <View className="profile-item">
             <View className="name">
               <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
               身份证号
             </View>
-            <Input className='input' placeholder-style="color:#999" value={record.idcard} onInput={this.handleInput.bind(this, 'idcard')} type='text' placeholder='请填写身份证号' />
+            <Input className='input' placeholder-style="color:#999" disabled={disabled} value={record.idcard} onInput={this.handleInput.bind(this, 'idcard')} type='text' placeholder='请填写身份证号' />
           </View>
           <View className="profile-item">
             <View className="name">
               <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
               手机号
             </View>
-            <Input className='input' placeholder-style="color:#999" value={record.tel} onInput={this.handleInput.bind(this, 'tel')} type='text' placeholder='请填写手机号' />
+            <Input className='input' placeholder-style="color:#999" disabled={disabled} value={record.tel} type='text' onInput={this.handleInput.bind(this, 'tel')} placeholder='请填写手机号' />
           </View>
           <View className="profile-item">
             <View className="name">
               <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
               验证码
             </View>
-            <Input className='inputCode' placeholder-style="color:#999" onInput={this.handleCaptcha} type='text' placeholder='请填写验证码' />
-            <Captcha countdown={5} />
+            <Input className='inputCode' placeholder-style="color:#999" type='text' disabled={disabled}  onInput={this.handleInput.bind(this, 'captcha')} placeholder='请填写验证码' />
+            <Captcha countdown={5} require={this.prepareGetCaptcha.bind(this)} onClick={this.handleCaptcha} />
           </View>
           <View className="profile-flex" style="margin-top:20rpx">
             <View className="title">我的置业顾问信息</View>
-            <View className="choose" onClick={() => this.tochooseConsultant}>选择置业顾问</View>
+            <View className="choose" onClick={this.tochooseConsultant}>选择置业顾问</View>
           </View>
           <ConsultantItem
-            data={item}
+            data={consultant}
             style="padding:30rpx 0;width:690rpx; border-bottom: 1px solid #dcdcdc;"
             type="raiseMoney"
-            onClick={this.handleItemClick}>
-          </ConsultantItem>
+          />
         </View>
       </ScrollView >
     )
@@ -264,9 +323,63 @@ export default class raiseMoney extends Component {
     const { record, raiseProfile } = this.state
     const { house } = this.props
     const houseList = house.raiseCart.map(x => x.houseId)
+    const disabled = !!record.raiseRecordId
+    if (disabled) return Promise.resolve();
+
+    if (isEmpty(record.name)) {
+      Taro.showToast({
+        title: '姓名不能为空',
+        icon: 'none',
+      })
+
+      return Promise.reject()
+    }
+
+    // 校验身份证号
+    if (isEmpty(record.idcard) || !checkIDCard(record.idcard)) {
+      Taro.showToast({
+        title: '身份证号码不合法',
+        icon: 'none',
+      })
+
+      return Promise.reject()
+    }
+    
+    // 校验手机号
+    if (isEmpty(record.tel) || record.tel < 11) {
+      Taro.showToast({
+        title: '手机号格式不正确',
+        icon: 'none',
+      })
+    }
+    
+    // 验证码
+    if (isEmpty(record.captcha)) {
+      Taro.showToast({
+        title: '验证码不能为空',
+        icon: 'none',
+      })
+
+      return Promise.reject()
+    }
+
+    // 校验置业
+    const consultant = this.getConsultant()
+    if (!consultant || !consultant.id) {
+      Taro.showToast({
+        title: '置业顾问不能为空',
+        icon: 'none',
+      })
+      return Promise.reject()
+    }
 
     return new Promise((resolve, reject) => {
-      saveRaiseRecord({ ...record, houseList}, raiseProfile).then(() => {
+      saveRaiseRecord({
+        ...record,
+        houseList,
+        userId: consultant.userId,
+        userName: consultant.name,
+      }, raiseProfile).then(() => {
         resolve()
       })
     })

src/reducers/house.js

@@ -5,11 +5,18 @@
  import {
    ADD_CART,
    SUB_CART,
+   ADD_CONSULTANT,
+   CHOOSE_CONSULTANT,
  } from '@/constants/house'
 
 const INITIAL_STATE = {
   // 认筹临时选中房源
   raiseCart: [],
+
+  // 置业顾问列表
+  consultantList: [],
+
+  chooseConsultant: undefined,
 }
 
 export default function(state = INITIAL_STATE, action) {
@@ -30,6 +37,18 @@ export default function(state = INITIAL_STATE, action) {
         raiseCart: state.raiseCart.filter(x => x.houseId !== payload.houseId),
       };
 
+    case ADD_CONSULTANT:
+      return {
+        ...state,
+        consultantList: payload.records,
+      };
+
+    case CHOOSE_CONSULTANT:
+      return {
+        ...state,
+        chooseConsultant: payload,
+      };
+
     default:
       return state;
   }

src/utils/tools.js

@@ -641,3 +641,54 @@ export function getCanvasConfig(config, params) {
     ...itemConf,
   }
 }
+
+/**
+ * 身份证校验
+ * 
+ * https://blog.csdn.net/gqzydh/article/details/90295842
+ * 
+ * @param {*} idcode 
+ */
+export function checkIDCard(idcode){
+  // 加权因子
+  var weight_factor = [7,9,10,5,8,4,2,1,6,3,7,9,10,5,8,4,2];
+  // 校验码
+  var check_code = ['1', '0', 'X' , '9', '8', '7', '6', '5', '4', '3', '2'];
+
+  var code = idcode + "";
+  var last = idcode[17];//最后一位
+
+  var seventeen = code.substring(0,17);
+
+  // ISO 7064:1983.MOD 11-2
+  // 判断最后一位校验码是否正确
+  var arr = seventeen.split("");
+  var len = arr.length;
+  var num = 0;
+  for(var i = 0; i < len; i++){
+      num = num + arr[i] * weight_factor[i];
+  }
+  
+  // 获取余数
+  var resisue = num%11;
+  var last_no = check_code[resisue];
+
+  // 格式的正则
+  // 正则思路
+  /*
+  第一位不可能是0
+  第二位到第六位可以是0-9
+  第七位到第十位是年份，所以七八位为19或者20
+  十一位和十二位是月份，这两位是01-12之间的数值
+  十三位和十四位是日期，是从01-31之间的数值
+  十五，十六，十七都是数字0-9
+  十八位可能是数字0-9，也可能是X
+  */
+  var idcard_patter = /^[1-9][0-9]{5}([1][9][0-9]{2}|[2][0][0|1][0-9])([0][1-9]|[1][0|1|2])([0][1-9]|[1|2][0-9]|[3][0|1])[0-9]{3}([0-9]|[X])$/;
+
+  // 判断格式是否正确
+  var format = idcard_patter.test(idcode);
+
+  // 返回验证结果，校验码和格式同时正确才算是合法的身份证号码
+  return last === last_no && format ? true : false;
+}