许静 5 years ago
parent
commit
b8952ff55d
4 changed files with 27 additions and 18 deletions
  1. 1
    1
      src/pages/city/index.scss
  2. 1
    6
      src/pages/im/index.js
  3. 19
    6
      src/pages/person/profile/index.js
  4. 6
    5
      src/pages/shop/index.js

+ 1
- 1
src/pages/city/index.scss View File

23
 
23
 
24
   .search-list {
24
   .search-list {
25
     position: absolute;
25
     position: absolute;
26
-    top: 136px;
26
+    top: 114px;
27
     width: 100%;
27
     width: 100%;
28
     background: white;
28
     background: white;
29
     min-height: 100vh;
29
     min-height: 100vh;

+ 1
- 6
src/pages/im/index.js View File

78
       const { sendId, sendName, receiverId, receiverName } = this.$router.params
78
       const { sendId, sendName, receiverId, receiverName } = this.$router.params
79
       const { scene } = Taro.getStorageSync('router')
79
       const { scene } = Taro.getStorageSync('router')
80
 
80
 
81
-
81
+      
82
       /**
82
       /**
83
        * 当 scene ==1014 时,是从服务消息直接进入聊天页面,
83
        * 当 scene ==1014 时,是从服务消息直接进入聊天页面,
84
        * 则id为 sendId,反之是为receiverId
84
        * 则id为 sendId,反之是为receiverId
375
     // 发送消息
375
     // 发送消息
376
     socket.sendNotice(payload, res => {
376
     socket.sendNotice(payload, res => {
377
       console.log('发送成功')
377
       console.log('发送成功')
378
-      this.setState({
379
-        inputText: '',
380
-        imageFile: '',
381
-        msgList: list
382
-      }, this.toBottom)
383
       this.appendData(payload)
378
       this.appendData(payload)
384
     })
379
     })
385
   }
380
   }

+ 19
- 6
src/pages/person/profile/index.js View File

21
     documentTitle: '',
21
     documentTitle: '',
22
     verfyList: [], // 审核列表
22
     verfyList: [], // 审核列表
23
     descVisible: false,
23
     descVisible: false,
24
+    showWhich: true,
24
 
25
 
25
   }
26
   }
26
 
27
 
33
     getVerifyList().then(res => {
34
     getVerifyList().then(res => {
34
       this.setState({
35
       this.setState({
35
         verfyList: res
36
         verfyList: res
37
+      }, () => {
38
+        if (this.state.verfyList.length == 0) {
39
+          this.setState({
40
+            showWhich: true
41
+          })
42
+        } else {
43
+          this.setState({
44
+            showWhich: false
45
+          })
46
+        }
47
+
36
       })
48
       })
37
       Taro.hideLoading()
49
       Taro.hideLoading()
38
     }).catch((err) => {
50
     }).catch((err) => {
47
   // 选择图片
59
   // 选择图片
48
   bindAlbumClick(e) {
60
   bindAlbumClick(e) {
49
     this.setState({
61
     this.setState({
50
-      descVisible: true
62
+      descVisible: true,
63
+      showWhich: false
51
     })
64
     })
52
     e.stopPropagation()
65
     e.stopPropagation()
53
     Taro.chooseImage({
66
     Taro.chooseImage({
174
 
187
 
175
 
188
 
176
   render() {
189
   render() {
177
-    const { imgList, documentTitle, verfyList, descVisible } = this.state
190
+    const { imgList, documentTitle, verfyList, descVisible,showWhich } = this.state
178
 
191
 
179
     return (
192
     return (
180
       <View className="profile-page" style={`background: url(${profileBg}) no-repeat top;background-size: 100% 100%;`}>
193
       <View className="profile-page" style={`background: url(${profileBg}) no-repeat top;background-size: 100% 100%;`}>
181
         <ScrollView scrollY scrollWithAnimation style="height: 100vh">
194
         <ScrollView scrollY scrollWithAnimation style="height: 100vh">
182
 
195
 
183
-          {!verfyList.length &&
196
+          {(!verfyList.length && showWhich) &&
184
             <View className="up-images">
197
             <View className="up-images">
185
               {this.renderUpImages()}
198
               {this.renderUpImages()}
186
 
199
 
187
               <View className="tip">
200
               <View className="tip">
188
                 建议上传相关购房资格等相关资料,审核
201
                 建议上传相关购房资格等相关资料,审核
189
-          </View>
202
+              </View>
190
               <View className="tip">
203
               <View className="tip">
191
                 通过后将获取更多积分、兑换好礼~
204
                 通过后将获取更多积分、兑换好礼~
192
-          </View>
205
+              </View>
193
             </View>
206
             </View>
194
           }
207
           }
195
-          {verfyList.length &&
208
+          {(verfyList.length || !showWhich) &&
196
             <View>
209
             <View>
197
 
210
 
198
               {descVisible &&
211
               {descVisible &&

+ 6
- 5
src/pages/shop/index.js View File

144
       url: `/pages/city/index`
144
       url: `/pages/city/index`
145
     })
145
     })
146
   }
146
   }
147
+  
147
   doSign() {
148
   doSign() {
148
     const { user: { id, havaSigned } } = this.state
149
     const { user: { id, havaSigned } } = this.state
149
     if (havaSigned) {
150
     if (havaSigned) {
150
-      Taro.showToast({
151
-        title: '你已经签到过了',
152
-        icon: 'none'
153
-      })
154
       return
151
       return
155
     }
152
     }
156
 
153
 
161
 
158
 
162
       this.loadUserInfo()
159
       this.loadUserInfo()
163
 
160
 
161
+      // App.zhuge.track('签到成功')
164
     })
162
     })
165
   }
163
   }
166
 
164
 
244
   renderDetail() {
242
   renderDetail() {
245
     // const { user } = this.state
243
     // const { user } = this.state
246
     const { userInfo: { person }, curCity } = this.props
244
     const { userInfo: { person }, curCity } = this.props
245
+    const { bannerList } = this.state
247
     return (
246
     return (
248
       <View className="page">
247
       <View className="page">
249
         {/* <Search placeholder="请输入要搜索的商品名称" onSearch={this.onSearch} /> */}
248
         {/* <Search placeholder="请输入要搜索的商品名称" onSearch={this.onSearch} /> */}
285
           </View>
284
           </View>
286
 
285
 
287
 
286
 
287
+          {bannerList.length > 0 &&
288
+            <Banner list={bannerList} indicatorDots={false}></Banner>
289
+          }
288
 
290
 
289
-          <Banner list={this.state.bannerList} indicatorDots={false}></Banner>
290
 
291
 
291
           {this.renderGoods()}
292
           {this.renderGoods()}
292
         </ScrollView>
293
         </ScrollView>