commit

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST:  '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // 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.0.84:8080"',
-    // WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/pages/agent/recommend/index.js

@@ -271,7 +271,7 @@ export default class Index extends Component {
       status: 1
     }
     recommendClient(param).then(res => {
-
+      // if (res) {
       Taro.showToast({
         title: '提交成功'
       })
@@ -279,6 +279,7 @@ export default class Index extends Component {
         Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
       }, 700)
       this.clearInputEvent()
+      // }
     })
   }
   // 性别

src/pages/person/customerAnalysis/index.scss

@@ -250,7 +250,7 @@
       }
     }
     .tab-pane3{
-      padding: 20px 40px;
+      padding: 20px 30px;
     }
   }
   .tab-pane4{

src/pages/person/customerAnalysis/item/index.scss

@@ -15,6 +15,7 @@
   width: 98%;
   margin: 0 1%;
   position: relative;
+  margin-bottom: 16px ;
   .type{
     position: absolute;
     left:0;

src/pages/person/customerAnalysis/myCustomer.js

@@ -138,6 +138,8 @@ export default class myCustomer extends Taro.Component {
       const { records, list, total, current, pages } = res || {}
       const _list = records || list || []
       const newList = current <= 1 ? _list : this.state.activityList.concat(_list)
+      console.log(_list, "list")
+      console.log(newList, "newList")
       this.setState({
         activityList: newList,
         isEmpty2: total == 0,
@@ -445,6 +447,7 @@ export default class myCustomer extends Taro.Component {
     const { customerDetail, visitRecord, activityList, followRecord, followVisible, baseVisible, isEmpty, hasMore, isEmpty2, hasMore2, isEmpty3, hasMore3 } = this.state
     return (
       <View>
+        {console.log(activityList, "item")}
         {followVisible && this.renderFollowBox()}
         {baseVisible && this.renderBaseBox()}
         <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,7 +464,7 @@ export default class myCustomer extends Taro.Component {
           </View>
           <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>
         </View>
-        <AtTabs height="calc(100vh - 320rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+        <AtTabs height="calc(100vh - 310rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
             <View className="tab-pane1 pane">
               <View className="status">{customerDetail.status == 1 ? '报备' : customerDetail.status == 2 ? '到访' : customerDetail.status == 3 ? '认筹' : '签约'}</View>
@@ -477,7 +480,7 @@ export default class myCustomer extends Taro.Component {
             <View className="tab-pane2 pane">
               <ListView
                 className="wrap"
-                style="height:calc(100vh - 320rpx)"
+                style="height:calc(100vh - 310rpx)"
                 needInit
                 isEmpty={isEmpty}
                 emptyText="暂无访问记录~"
@@ -513,7 +516,7 @@ export default class myCustomer extends Taro.Component {
             <View className="tab-pane3 pane">
               <ListView
                 className="wrap"
-                style="height:calc(100vh - 320rpx)"
+                style="height:calc(100vh - 310rpx)"
                 needInit
                 isEmpty={isEmpty2}
                 emptyText="暂无活动信息~"
@@ -529,11 +532,15 @@ export default class myCustomer extends Taro.Component {
                     </View>
                   }
                   {activityList.length &&
+
                     activityList.map(item => (
-                      <ActivityItem
-                        data={item}
-                        key={item.id + 'activity'}>
-                      </ActivityItem>
+                      <Block   key={item.id + 'activity'}>
+                        {console.log(item, "item7777777777")}
+                        <ActivityItem
+                          data={item}
+                         >
+                        </ActivityItem>
+                      </Block>
                     ))
                   }
                 </View>

src/pages/signin/index.js

@@ -31,7 +31,6 @@ export default class Index extends Component {
         }
       })
     })
-
   }
 
   getPhoneNumber(e) {