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

src/pages/city/index.scss

@@ -23,7 +23,7 @@
 
   .search-list {
     position: absolute;
-    top: 136px;
+    top: 114px;
     width: 100%;
     background: white;
     min-height: 100vh;

src/pages/im/index.js

@@ -375,9 +375,6 @@ export default class Chat extends Component {
     // 发送消息
     socket.sendNotice(payload, res => {
       console.log('发送成功')
-      this.setState({
-        inputText:'',
-      })
       this.appendData(payload)
     })
   }

src/pages/person/profile/index.js

@@ -21,6 +21,7 @@ export default class Profile extends Component {
     documentTitle: '',
     verfyList: [], // 审核列表
     descVisible: false,
+    showWhich: true,
 
   }
 
@@ -33,6 +34,17 @@ export default class Profile extends Component {
     getVerifyList().then(res => {
       this.setState({
         verfyList: res
+      }, () => {
+        if (this.state.verfyList.length == 0) {
+          this.setState({
+            showWhich: true
+          })
+        } else {
+          this.setState({
+            showWhich: false
+          })
+        }
+
       })
       Taro.hideLoading()
     }).catch((err) => {
@@ -47,7 +59,8 @@ export default class Profile extends Component {
   // 选择图片
   bindAlbumClick(e) {
     this.setState({
-      descVisible: true
+      descVisible: true,
+      showWhich: false
     })
     e.stopPropagation()
     Taro.chooseImage({
@@ -174,25 +187,25 @@ export default class Profile extends Component {
 
 
   render() {
-    const { imgList, documentTitle, verfyList, descVisible } = 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%;`}>
         <ScrollView scrollY scrollWithAnimation style="height: 100vh">
 
-          {!verfyList.length &&
+          {(!verfyList.length && showWhich) &&
             <View className="up-images">
               {this.renderUpImages()}
 
               <View className="tip">
                 建议上传相关购房资格等相关资料,审核
-          </View>
+              </View>
               <View className="tip">
                 通过后将获取更多积分、兑换好礼~
-          </View>
+              </View>
             </View>
           }
-          {verfyList.length &&
+          {(verfyList.length || !showWhich) &&
             <View>
 
               {descVisible &&

src/pages/shop/index.js

@@ -144,13 +144,10 @@ export default class Shop extends Component {
       url: `/pages/city/index`
     })
   }
+  
   doSign() {
     const { user: { id, havaSigned } } = this.state
     if (havaSigned) {
-      Taro.showToast({
-        title: '你已经签到过了',
-        icon: 'none'
-      })
       return
     }
 
@@ -161,6 +158,7 @@ export default class Shop extends Component {
 
       this.loadUserInfo()
 
+      // App.zhuge.track('签到成功')
     })
   }
 
@@ -244,6 +242,7 @@ export default class Shop extends Component {
   renderDetail() {
     // const { user } = this.state
     const { userInfo: { person }, curCity } = this.props
+    const { bannerList } = this.state
     return (
       <View className="page">
         {/* <Search placeholder="请输入要搜索的商品名称" onSearch={this.onSearch} /> */}
@@ -285,8 +284,10 @@ export default class Shop extends Component {
           </View>
 
 
+          {bannerList.length > 0 &&
+            <Banner list={bannerList} indicatorDots={false}></Banner>
+          }
 
-          <Banner list={this.state.bannerList} indicatorDots={false}></Banner>
 
           {this.renderGoods()}
         </ScrollView>