许静 5 years ago
parent
commit
37b99368ac

+ 4
- 4
config/dev.js View File

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.jinchengjiaye.com"',//测试
9
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
8
+    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
9
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
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
-    // HOST: '"http://192.168.0.84:8080"',
13
-    // WSS_HOST: '"ws://192.168.0.84:8080"',
12
+    HOST: '"http://192.168.0.84:8080"',
13
+    WSS_HOST: '"ws://192.168.0.84:8080"',
14
   },
14
   },
15
   weapp: {},
15
   weapp: {},
16
   h5: {}
16
   h5: {}

+ 2
- 1
src/pages/agent/recommend/index.js View File

271
       status: 1
271
       status: 1
272
     }
272
     }
273
     recommendClient(param).then(res => {
273
     recommendClient(param).then(res => {
274
-
274
+      // if (res) {
275
       Taro.showToast({
275
       Taro.showToast({
276
         title: '提交成功'
276
         title: '提交成功'
277
       })
277
       })
279
         Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
279
         Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
280
       }, 700)
280
       }, 700)
281
       this.clearInputEvent()
281
       this.clearInputEvent()
282
+      // }
282
     })
283
     })
283
   }
284
   }
284
   // 性别
285
   // 性别

+ 1
- 1
src/pages/person/customerAnalysis/index.scss View File

250
       }
250
       }
251
     }
251
     }
252
     .tab-pane3{
252
     .tab-pane3{
253
-      padding: 20px 40px;
253
+      padding: 20px 30px;
254
     }
254
     }
255
   }
255
   }
256
   .tab-pane4{
256
   .tab-pane4{

+ 1
- 0
src/pages/person/customerAnalysis/item/index.scss View File

15
   width: 98%;
15
   width: 98%;
16
   margin: 0 1%;
16
   margin: 0 1%;
17
   position: relative;
17
   position: relative;
18
+  margin-bottom: 16px ;
18
   .type{
19
   .type{
19
     position: absolute;
20
     position: absolute;
20
     left:0;
21
     left:0;

+ 14
- 7
src/pages/person/customerAnalysis/myCustomer.js View File

138
       const { records, list, total, current, pages } = res || {}
138
       const { records, list, total, current, pages } = res || {}
139
       const _list = records || list || []
139
       const _list = records || list || []
140
       const newList = current <= 1 ? _list : this.state.activityList.concat(_list)
140
       const newList = current <= 1 ? _list : this.state.activityList.concat(_list)
141
+      console.log(_list, "list")
142
+      console.log(newList, "newList")
141
       this.setState({
143
       this.setState({
142
         activityList: newList,
144
         activityList: newList,
143
         isEmpty2: total == 0,
145
         isEmpty2: total == 0,
445
     const { customerDetail, visitRecord, activityList, followRecord, followVisible, baseVisible, isEmpty, hasMore, isEmpty2, hasMore2, isEmpty3, hasMore3 } = this.state
447
     const { customerDetail, visitRecord, activityList, followRecord, followVisible, baseVisible, isEmpty, hasMore, isEmpty2, hasMore2, isEmpty3, hasMore3 } = this.state
446
     return (
448
     return (
447
       <View>
449
       <View>
450
+        {console.log(activityList, "item")}
448
         {followVisible && this.renderFollowBox()}
451
         {followVisible && this.renderFollowBox()}
449
         {baseVisible && this.renderBaseBox()}
452
         {baseVisible && this.renderBaseBox()}
450
         <View className="user_con" style=" margin: 0 20rpx 40rpx 20rpx; height:256rpx;box-shadow:0rpx 4rpx 12rpx 0rpx rgba(0,0,0,0.12); border-radius:12rpx;">
453
         <View className="user_con" style=" margin: 0 20rpx 40rpx 20rpx; height:256rpx;box-shadow:0rpx 4rpx 12rpx 0rpx rgba(0,0,0,0.12); border-radius:12rpx;">
461
           </View>
464
           </View>
462
           <View onClick={this.handleTelClick.bind(this, customerDetail)} className='user__left__phone'>{customerDetail.phone}<Image style="width:36rpx;height:36rpx;margin-left:20rpx;" src={phoneImg} /></View>
465
           <View onClick={this.handleTelClick.bind(this, customerDetail)} className='user__left__phone'>{customerDetail.phone}<Image style="width:36rpx;height:36rpx;margin-left:20rpx;" src={phoneImg} /></View>
463
         </View>
466
         </View>
464
-        <AtTabs height="calc(100vh - 320rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
467
+        <AtTabs height="calc(100vh - 310rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
465
           <AtTabsPane current={this.state.current} index={0} >
468
           <AtTabsPane current={this.state.current} index={0} >
466
             <View className="tab-pane1 pane">
469
             <View className="tab-pane1 pane">
467
               <View className="status">{customerDetail.status == 1 ? '报备' : customerDetail.status == 2 ? '到访' : customerDetail.status == 3 ? '认筹' : '签约'}</View>
470
               <View className="status">{customerDetail.status == 1 ? '报备' : customerDetail.status == 2 ? '到访' : customerDetail.status == 3 ? '认筹' : '签约'}</View>
477
             <View className="tab-pane2 pane">
480
             <View className="tab-pane2 pane">
478
               <ListView
481
               <ListView
479
                 className="wrap"
482
                 className="wrap"
480
-                style="height:calc(100vh - 320rpx)"
483
+                style="height:calc(100vh - 310rpx)"
481
                 needInit
484
                 needInit
482
                 isEmpty={isEmpty}
485
                 isEmpty={isEmpty}
483
                 emptyText="暂无访问记录~"
486
                 emptyText="暂无访问记录~"
513
             <View className="tab-pane3 pane">
516
             <View className="tab-pane3 pane">
514
               <ListView
517
               <ListView
515
                 className="wrap"
518
                 className="wrap"
516
-                style="height:calc(100vh - 320rpx)"
519
+                style="height:calc(100vh - 310rpx)"
517
                 needInit
520
                 needInit
518
                 isEmpty={isEmpty2}
521
                 isEmpty={isEmpty2}
519
                 emptyText="暂无活动信息~"
522
                 emptyText="暂无活动信息~"
529
                     </View>
532
                     </View>
530
                   }
533
                   }
531
                   {activityList.length &&
534
                   {activityList.length &&
535
+
532
                     activityList.map(item => (
536
                     activityList.map(item => (
533
-                      <ActivityItem
534
-                        data={item}
535
-                        key={item.id + 'activity'}>
536
-                      </ActivityItem>
537
+                      <Block   key={item.id + 'activity'}>
538
+                        {console.log(item, "item7777777777")}
539
+                        <ActivityItem
540
+                          data={item}
541
+                         >
542
+                        </ActivityItem>
543
+                      </Block>
537
                     ))
544
                     ))
538
                   }
545
                   }
539
                 </View>
546
                 </View>

+ 0
- 1
src/pages/signin/index.js View File

31
         }
31
         }
32
       })
32
       })
33
     })
33
     })
34
-
35
   }
34
   }
36
 
35
 
37
   getPhoneNumber(e) {
36
   getPhoneNumber(e) {