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

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.131:8080"',
-    WSS_HOST: '"ws://192.168.0.131:8080"',
+    HOST: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/pages/activity/detail/assemble.js

@@ -366,6 +366,9 @@ export default class Detail extends Component {
           title: '失败: ' + err.message,
           icon: 'none'
         })
+        setTimeout(() => {
+          this.initPageData()
+        }, 500)
 
         this.setState({ submitting: false })
       })
@@ -387,8 +390,6 @@ export default class Detail extends Component {
           phone: person.tel || person.phone,
           avatarurl: person.avatarurl,
         }).then(res => {
-          console.log(res,"res")
-
           this.setState({
             recordDetail: res.taShareRecord,
             recordId: res.taShareRecord.recordId,

src/pages/activity/detail/assistance.js

@@ -367,6 +367,9 @@ export default class Detail extends Component {
           title: '失败: ' + err.message,
           icon: 'none'
         })
+        setTimeout(() => {
+          this.initPageData()
+        }, 500)
         this.setState({ submitting: false })
       })
     })

src/pages/activity/item/index.js

@@ -40,10 +40,12 @@ export default class Item extends Component {
             {data.endDate &&
               <View className="time">参与截止时间：{`${dayjs(data.endDate).format('YYYY年MM月DD日 HH:mm:ss')}`}</View>
             }
-            {!data.endDate  &&
-              <View className="time">{data.type != 'dynamic'?'参与截止时间：':''}</View>
+            {!data.endDate &&
+              <View className="time">{data.type != 'dynamic' ? '参与截止时间：' : ''}</View>
+            }
+            {data.endDate &&
+              <View className={data.activityStatus == 0 ? "btn jionin " : data.activityStatus == 1 ? "btn nostart" : data.activityStatus == 2 ? "btn jioned" : "btn"}>{data.activityStatus == 0 ? "立即参与" : data.activityStatus == 1 ? "未开始" : data.activityStatus == 2 ? "已结束" : "已参与"}</View>
             }
-            <View className={data.activityStatus == 0 ? "btn jionin " : data.activityStatus == 1 ? "btn nostart" : data.activityStatus == 2 ? "btn jioned" : "btn"}>{data.activityStatus == 0 ? "立即参与" : data.activityStatus == 1 ? "未开始" : data.activityStatus == 2 ? "已结束" : "已参与"}</View>
           </View>
         </View>
       </View >

src/pages/activity/myActivity.js

@@ -38,7 +38,6 @@ export default class Index extends Component {
     })
   }
   componentDidMount() {
-    console.log(this.$router, "9999999999999999")
   }
   componentWillUnmount() {
     const { recordId } = this.state
@@ -70,10 +69,16 @@ export default class Index extends Component {
   }
 
   handleItemClick(item) {
-
-    Taro.navigateTo({
-      url: '/pages/activity/detail/index?id=' + item.id
-    })
+    if (item.status == 0) {
+      Taro.showToast({
+        title: '当前活动已失效',
+        icon: 'none'
+      })
+    } else {
+      Taro.navigateTo({
+        url: '/pages/activity/detail/index?id=' + item.dynamicId
+      })
+    }
 
 
   }

src/pages/agent/recommend/index.js

@@ -61,7 +61,8 @@ export default class Index extends Component {
   componentWillMount() {
     // const defaultHouseVal = Taro.getStorageSync('targetHouse')
 
-    const { type } = this.$router.params
+    const { type,cityId } = this.$router.params
+    console.log(this.$router.params,"cityId")
     this.setState({
       reType: type
     }, () => {

src/pages/im/index.js

@@ -574,7 +574,7 @@ export default class Chat extends Component {
           <View className="import-top">
             <Input
               className="import-top__input"
-              cursor-spacing={20}
+              cursor-spacing={0}
               value={inputText}
               onInput={this.bindTextInput}
               onConfirm={this.bindInputConfirm}

src/pages/person/index.js

@@ -56,6 +56,11 @@ export default class Person extends Component {
       Taro.showToast({
         title: '签到成功'
       })
+      this.setState({
+        user: {
+          points: res.points
+        }
+      })
 
       this.loadUserInfo()
 

src/pages/person/menus.js

@@ -13,6 +13,7 @@ const icons = {
   calculator: require('@assets/mine/calculator.png'),
   encyclopedia: require('@assets/mine/encyclopedia.png'),
   feedback: require('@assets/mine/feedback.png'),
+  client: require('@assets/mine/client.png'),
 }
 
 const DRIFT = ROLE_CODE['DRIFT']
@@ -63,7 +64,7 @@ const menus = [
     {
       name: '我的客户',
       url: '/pages/person/myGuest/index',
-      icon: icons.activities,
+      icon: icons.client,
       extends: undefined,
       userTypes: [CONSULTANT],
     },
@@ -84,7 +85,7 @@ const menus = [
     {
       name: '我的助力',
       url: '/pages/activity/assistancePage',
-      icon: icons.regiment,
+      icon: icons.help,
       extends: undefined,
       userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
     },

src/pages/person/profile/index.js

@@ -14,7 +14,7 @@ export default class Profile extends Component {
   }
 
   state = {
-   
+
     documentVerifyId: '',
     imgList: [],
     documentTitle: '',
@@ -24,7 +24,7 @@ export default class Profile extends Component {
 
   }
 
-  componentDidMount() {
+  componentDidShow() {
     this.getProfile()
   }
 
@@ -62,6 +62,9 @@ export default class Profile extends Component {
       showWhich: false
     })
     e.stopPropagation()
+    Taro.showLoading({
+      title: '上传中',
+    })
     Taro.chooseImage({
       sizeType: ['original', 'compressed'],  //可选择原图或压缩后的图片
       sourceType: ['album', 'camera'], //可选择性开放访问相册、相机
@@ -76,8 +79,11 @@ export default class Profile extends Component {
             marginTop: 0,
             messageType: 'image',
             imgList: imgList || []
-          }, this.onSendMsg)
+          })
         })
+      },
+      complete: res => {
+        Taro.hideLoading()
       }
     })
   }
@@ -186,7 +192,7 @@ export default class Profile extends Component {
 
 
   render() {
-    const { imgList, documentTitle, verfyList, descVisible,showWhich } = this.state
+    const { imgList, documentTitle, verfyList, descVisible, showWhich } = this.state
 
     return (
       <View className="profile-page" style={`background: url(${profileBg}) no-repeat top;background-size: 100% 100%;`}>

src/pages/project/index.js

@@ -158,7 +158,7 @@ export default class Index extends Component {
   }
 
   loadHelpGroupList() {
-    queryHelpGroup({cityId:this.props.curCity.id,buildingId:''}).then(res => {
+    queryHelpGroup({ cityId: this.props.curCity.id, buildingId: '' }).then(res => {
       console.log(res, "res")
       this.setState({
         helpGroupList: res || []
@@ -260,8 +260,8 @@ export default class Index extends Component {
     })
   }
 
-  handleBannerClick=(item) =>{
-    console.log(this,"this")
+  handleBannerClick = (item) => {
+    console.log(this, "this")
     this.redirectTo(item)
   }
 
@@ -298,7 +298,7 @@ export default class Index extends Component {
       // 资讯
       case 'news':
         Taro.navigateTo({
-          url: 'pages/news/detail/index?id=' + targetId
+          url: '/pages/news/detail/index?id=' + targetId
         })
         return;
 
@@ -380,7 +380,7 @@ export default class Index extends Component {
       })
     } else {
       Taro.navigateTo({
-        url: `/pages/agent/recommend/index?type=index`
+        url: `/pages/agent/recommend/index?type=index` 
       })
     }
   }

src/pages/shop/index.js

@@ -70,7 +70,7 @@ export default class Shop extends Component {
     const params = {
       pageNum: '1',
       pageSize: '9999',
-      buildingId:this.state.goodsBuilding[current].buildingId|| this.state.goodsBuilding[0].buildingId,
+      buildingId: this.state.goodsBuilding[current].buildingId || this.state.goodsBuilding[0].buildingId,
       cityId: this.props.curCity.id
     }
 
@@ -164,13 +164,18 @@ export default class Shop extends Component {
       Taro.showToast({
         title: '签到成功'
       })
+      this.setState({
+        user: {
+          points: res.points
+        }
+      })
 
       this.loadUserInfo()
 
       // App.zhuge.track('签到成功')
     })
   }
-  
+
   loadUserInfo() {
     // debugger
     queryUserInfo().then(user => {
@@ -277,8 +282,8 @@ export default class Shop extends Component {
               <View className='user__left__name'>{person.nickname}</View>
               {
                 user.havaSigned ?
-                (<View className="qiandao__btn">已签到</View>) :
-                (<View className="qiandao__btn" onClick={this.doSign}>签到</View>)
+                  (<View className="qiandao__btn">已签到</View>) :
+                  (<View className="qiandao__btn" onClick={this.doSign}>签到</View>)
               }
               <View className='message'>
                 <View className='message__left'>