Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

config/dev.js

@@ -5,14 +5,14 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    // HOST: '"https://dev.pawoma.cn"',//测试
-    // WSS_HOST: '"wss://dev.pawoma.cn"',
+    HOST: '"https://dev.pawoma.cn"',//测试
+    WSS_HOST: '"wss://dev.pawoma.cn"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.2.52:8080"',
-    WSS_HOST: '"ws://192.168.2.52:8080"',
+    // HOST: '"http://192.168.2.52:8080"',
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
     Version: 'V3.5.12'

config/prod.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"http://192.168.2.52:8080"',
-    WSS_HOST: '"ws://192.168.2.52:8080"',
-    // HOST: '"https://dev.pawoma.cn"',// 新测试
-    // WSS_HOST: '"wss://dev.pawoma.cn"',
+    // HOST: '"http://192.168.2.52:8080"',
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
+    HOST: '"https://dev.pawoma.cn"',// 新测试
+    WSS_HOST: '"wss://dev.pawoma.cn"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',

src/onlineSelling/components/ConsultantItem/index.js

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

src/onlineSelling/pages/raiseMoney/index.js

@@ -15,9 +15,9 @@ import { getCodeMessage } from '@/services/getCode'
 import { checkIDCard, isEmpty } from '@/utils/tools'
 import ContactConsultant from '../../components/ContactConsultant'
 
-const getRaiseProfile = ({ raiseId, salesBatchId, personId }) => {
+const getRaiseProfile = ({ salesBatchId, raiseRecordId, personId}) => {
   const queryString = [
-    `${raiseId ? 'raiseId=' + raiseId : ''}`,
+    `${raiseRecordId ? 'raiseRecordId=' + raiseRecordId : ''}`,
     `${salesBatchId ? 'salesBatchId=' + salesBatchId : ''}`,
     `${personId ? 'personId=' + personId : ''}`,
   ].filter(Boolean).join('&')
@@ -58,8 +58,8 @@ export default class raiseMoney extends Component {
   componentWillMount() {
     ready.queue(() => {
       const {
-        salesBatchId,   // 批次, 备用
-        houseId,        // 房源号, 从房源详情进入的
+        salesBatchId,    // 批次, 从房源详情进入的
+        houseId,       // 房源号, 备用
         raiseRecordId,  // 认筹单ID, // 从认筹列表进入
       } = this.$router.params
 
@@ -71,7 +71,7 @@ export default class raiseMoney extends Component {
         return;
       }
 
-      this.loadInfo(houseId, salesBatchId, raiseRecordId)
+      this.loadInfo(salesBatchId, raiseRecordId)
 
       if (this.$router.params.type == 'pay') {
         this.setState({ current: 3 })
@@ -79,7 +79,8 @@ export default class raiseMoney extends Component {
     })
   }
 
-  loadInfo = (houseId, salesBatchId, raiseRecordId) => {
+  loadInfo(salesBatchId, raiseRecordId) {
+    console.log(raiseRecordId, "raiseRecordIdraiseRecordIdraiseRecordIdraiseRecordId")
     const { userInfo, house } = this.props
     const { personId, nickname, idcard, tel, phone } = userInfo.person
 
@@ -293,7 +294,7 @@ export default class raiseMoney extends Component {
               <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
               验证码
             </View>
-            <Input className='inputCode' placeholder-style="color:#999" type='text' disabled={disabled}  onInput={this.handleInput.bind(this, 'captcha')} placeholder='请填写验证码' />
+            <Input className='inputCode' placeholder-style="color:#999" type='text' disabled={disabled} onInput={this.handleInput.bind(this, 'captcha')} placeholder='请填写验证码' />
             <Captcha countdown={captchaCountdown} require={this.prepareGetCaptcha.bind(this)} onClick={this.handleCaptcha} />
           </View>
           <View className="profile-flex" style="margin-top:20rpx">
@@ -304,6 +305,7 @@ export default class raiseMoney extends Component {
             data={consultant}
             style="padding:30rpx 0;width:690rpx; border-bottom: 1px solid #dcdcdc;"
             type="raiseMoney"
+            tips="show"
           />
         </View>
       </ScrollView >
@@ -420,6 +422,12 @@ export default class raiseMoney extends Component {
     })
 
   }
+  toRaiseProfile() {
+    const id = this.$router.params.raiseRecordId
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/raiseProfile/index?raiseRecordId=${id}`
+    })
+  }
   renderResult() {
     return (
       <View className="result">
@@ -431,7 +439,7 @@ export default class raiseMoney extends Component {
         <View className="tip">支付结果请留意微信支付通知</View>
         {/* <ContactConsultant buildingId={buildingId} style=" position: absolute;bottom: 8vh;" /> */}
         <ContactConsultant style=" position: absolute;bottom: 11vh;" />
-        <View className="look-btn">查看认筹单</View>
+        <View className="look-btn" onClick={() => this.toRaiseProfile()}>查看认筹单</View>
       </View>
 
     );
@@ -450,7 +458,11 @@ export default class raiseMoney extends Component {
 
       // 缴费
       case 3:
-        this.makePay().then()
+        this.makePay().then(() => {
+          this.setState({
+            current: current + 1
+          })
+        })
         return;
 
       //