瀏覽代碼

consultant

xujing 5 年之前
父節點
當前提交
b12f17c6b6
共有 4 個文件被更改,包括 29 次插入17 次删除
  1. 4
    4
      config/dev.js
  2. 4
    4
      config/prod.js
  3. 6
    6
      src/onlineSelling/components/ConsultantItem/index.js
  4. 15
    3
      src/onlineSelling/pages/raiseMoney/index.js

+ 4
- 4
config/dev.js 查看文件

5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://47.101.36.130:8085"',//测试
6
     // HOST: '"http://47.101.36.130:8085"',//测试
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
8
-    // HOST: '"https://dev.pawoma.cn"',//测试
9
-    // WSS_HOST: '"wss://dev.pawoma.cn"',
8
+    HOST: '"https://dev.pawoma.cn"',//测试
9
+    WSS_HOST: '"wss://dev.pawoma.cn"',
10
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
10
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
11
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
11
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
12
     // HOST: '"https://lt.pawoma.cn"',
12
     // HOST: '"https://lt.pawoma.cn"',
13
     // WSS_HOST: '"wss://lt.pawoma.cn"',
13
     // WSS_HOST: '"wss://lt.pawoma.cn"',
14
-    HOST: '"http://192.168.2.52:8080"',
15
-    WSS_HOST: '"ws://192.168.2.52:8080"',
14
+    // HOST: '"http://192.168.2.52:8080"',
15
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
16
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
16
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
17
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
17
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
18
     Version: 'V3.5.12'
18
     Version: 'V3.5.12'

+ 4
- 4
config/prod.js 查看文件

3
     NODE_ENV: '"production"'
3
     NODE_ENV: '"production"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"http://192.168.2.52:8080"',
7
-    WSS_HOST: '"ws://192.168.2.52:8080"',
8
-    // HOST: '"https://dev.pawoma.cn"',// 新测试
9
-    // WSS_HOST: '"wss://dev.pawoma.cn"',
6
+    // HOST: '"http://192.168.2.52:8080"',
7
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
8
+    HOST: '"https://dev.pawoma.cn"',// 新测试
9
+    WSS_HOST: '"wss://dev.pawoma.cn"',
10
     // HOST: '"https://lt.pawoma.cn"',
10
     // HOST: '"https://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
12
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',

+ 6
- 6
src/onlineSelling/components/ConsultantItem/index.js 查看文件

3
 
3
 
4
 export default function ConsultantItem(props) {
4
 export default function ConsultantItem(props) {
5
 
5
 
6
-  const { data = {}, style, type } = props
6
+  const { data = {}, style, type, tips } = props
7
 
7
 
8
   return (
8
   return (
9
     <Block>
9
     <Block>
10
-      {(!data || !data.id) && (<View style="margin-top: 20px; text-align: center">暂无数据</View>)}
10
+      {(!data || !data.id) && tips == 'show' && (<View style="margin-top: 20px; text-align: center">暂无数据</View>)}
11
       {
11
       {
12
-        (data && data.id) &&
12
+        (data && (data.id || data.consultantPersonId)) &&
13
         (
13
         (
14
           <View className="card-item" style={style}>
14
           <View className="card-item" style={style}>
15
             <View onClick={() => props.onClick && props.onClick(data)}>
15
             <View onClick={() => props.onClick && props.onClick(data)}>
16
               <Image src={data.photo || data.avatar} className='avatar' ></Image>
16
               <Image src={data.photo || data.avatar} className='avatar' ></Image>
17
               {
17
               {
18
-                data.name &&
18
+                (data.name || data.userName) &&
19
                 (
19
                 (
20
                   <View className="name">
20
                   <View className="name">
21
-                    {data.name|| data.userName}
21
+                    {data.name || data.userName}
22
                     <Image src={require('@/assets/person/card.png')} className='card' ></Image>
22
                     <Image src={require('@/assets/person/card.png')} className='card' ></Image>
23
                     {type == 'raiseProfile' && <View className="tip">您的专属置业顾问</View>}
23
                     {type == 'raiseProfile' && <View className="tip">您的专属置业顾问</View>}
24
                   </View>
24
                   </View>
27
               <View className="phone">{data.phone}</View>
27
               <View className="phone">{data.phone}</View>
28
             </View>
28
             </View>
29
             {!type && <View className="home">主页</View>}
29
             {!type && <View className="home">主页</View>}
30
-            {type == 'raiseProfile' && <View className="contact"  onClick={props.contactClick}>联系我<Text className="right-icon"></Text></View>}
30
+            {type == 'raiseProfile' && <View className="contact" onClick={props.contactClick}>联系我<Text className="right-icon"></Text></View>}
31
           </View >
31
           </View >
32
         )
32
         )
33
       }
33
       }

+ 15
- 3
src/onlineSelling/pages/raiseMoney/index.js 查看文件

44
     navigationBarTitleText: '认筹确认'
44
     navigationBarTitleText: '认筹确认'
45
   }
45
   }
46
   state = {
46
   state = {
47
-    current: 4,
47
+    current: 0,
48
     inputName: '',
48
     inputName: '',
49
     raiseProfile: undefined,
49
     raiseProfile: undefined,
50
     record: {},
50
     record: {},
60
         houseId,        // 房源号, 从房源详情进入的
60
         houseId,        // 房源号, 从房源详情进入的
61
         raiseRecordId,  // 认筹单ID, // 从认筹列表进入
61
         raiseRecordId,  // 认筹单ID, // 从认筹列表进入
62
       } = this.$router.params
62
       } = this.$router.params
63
+      console.log(this.state.record,"recordrecordrecordrecord")
63
 
64
 
64
       if (houseId) {
65
       if (houseId) {
65
         this.loadHouseInfo(houseId, salesBatchId)
66
         this.loadHouseInfo(houseId, salesBatchId)
304
             data={consultant}
305
             data={consultant}
305
             style="padding:30rpx 0;width:690rpx; border-bottom: 1px solid #dcdcdc;"
306
             style="padding:30rpx 0;width:690rpx; border-bottom: 1px solid #dcdcdc;"
306
             type="raiseMoney"
307
             type="raiseMoney"
308
+            tips="show"
307
           />
309
           />
308
         </View>
310
         </View>
309
       </ScrollView >
311
       </ScrollView >
420
     })
422
     })
421
 
423
 
422
   }
424
   }
425
+  toRaiseProfile() {
426
+    const id = this.$router.params.raiseRecordId
427
+    Taro.navigateTo({
428
+      url: `/onlineSelling/pages/raiseProfile/index?raiseRecordId=${id}`
429
+    })
430
+  }
423
   renderResult() {
431
   renderResult() {
424
     return (
432
     return (
425
       <View className="result">
433
       <View className="result">
431
         <View className="tip">支付结果请留意微信支付通知</View>
439
         <View className="tip">支付结果请留意微信支付通知</View>
432
         {/* <ContactConsultant buildingId={buildingId} style=" position: absolute;bottom: 8vh;" /> */}
440
         {/* <ContactConsultant buildingId={buildingId} style=" position: absolute;bottom: 8vh;" /> */}
433
         <ContactConsultant style=" position: absolute;bottom: 11vh;" />
441
         <ContactConsultant style=" position: absolute;bottom: 11vh;" />
434
-        <View className="look-btn">查看认筹单</View>
442
+        <View className="look-btn"onClick={()=>this.toRaiseProfile()}>查看认筹单</View>
435
       </View>
443
       </View>
436
 
444
 
437
     );
445
     );
450
 
458
 
451
       // 缴费
459
       // 缴费
452
       case 3:
460
       case 3:
453
-        this.makePay().then()
461
+        this.makePay().then(() => {
462
+          this.setState({
463
+            current: current + 1
464
+          })
465
+        })
454
         return;
466
         return;
455
 
467
 
456
       //
468
       //