From e4774204ba55d4d1403540484d204d28384f8ac8 Mon Sep 17 00:00:00 2001
From: fanp <mrfanping@163.com>
Date: Wed, 30 Oct 2019 09:31:24 +0800
Subject: [PATCH] update topic

---
 images/topic/avatar.png                       | Bin 0 -> 2118 bytes
 pages/topics/index.js                         |  25 ++++++++++++++----
 .../topics/interactive/submitTopic/index.wxss |   2 ++
 pages/topics/message/index.wxss               |   4 ++-
 pages/user/myFavorite/index.wxml              |   2 +-
 5 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 images/topic/avatar.png

diff --git a/images/topic/avatar.png b/images/topic/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad25d8428cdcce7a20688adcc02f9f4e49faf431
GIT binary patch
literal 2118
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

literal 0
HcmV?d00001

diff --git a/pages/topics/index.js b/pages/topics/index.js
index daeb49c..47034a5 100644
--- a/pages/topics/index.js
+++ b/pages/topics/index.js
@@ -25,18 +25,33 @@ Page({
    */
 
   onLoad: function () {
-    if (store.hasPhone()) {
-      console.log('已经绑定手机号码')
+    if (store.hasBindUserInfo()){
+      console.log('已经绑定微信')
+      if (store.hasPhone()) {
+        console.log('已经绑定手机号码')
+      } else {
+        console.log('未绑定手机号码')
+        wx.redirectTo({
+          url: '/pages/register/index',
+        })
+      }
     } else {
-      console.log('未绑定手机号码')
-      wx.redirectTo({
-        url: '/pages/register/index',
+      console.log('未绑定微信')
+      wx.reLaunch({
+        url: '/pages/user/index',
       })
     }
+    
   },
   onShow: function () {
     // 页面出现在前台时执行
     console.log('啦啦啦')
+    let segmentIndex = this.data.segmentIndex
+    if (segmentIndex === 0 || segmentIndex === 1){
+      wx.pageScrollTo({
+        scrollTop: 0,
+      })
+    }
     this.setData({
       currPage: 1,
     })
diff --git a/pages/topics/interactive/submitTopic/index.wxss b/pages/topics/interactive/submitTopic/index.wxss
index 6fe0e45..bbc4f20 100644
--- a/pages/topics/interactive/submitTopic/index.wxss
+++ b/pages/topics/interactive/submitTopic/index.wxss
@@ -15,9 +15,11 @@
 }
 .title{
   font-size: 15px;
+  width: 100%;
 }
 .textArea{
   font-size: 14px;
+  width: 100%;
 }
 .line-view{
   height: 1px;
diff --git a/pages/topics/message/index.wxss b/pages/topics/message/index.wxss
index 2f287a2..a5f7e02 100644
--- a/pages/topics/message/index.wxss
+++ b/pages/topics/message/index.wxss
@@ -15,10 +15,12 @@
 }
 .title{
   font-size: 15px;
+  width: 100%;
 }
 .textArea{
   font-size: 14px;
-  line-height: 10px;
+  width: 100%;
+  /* line-height: 10px; */
 }
 .line-view{
   height: 1px;
diff --git a/pages/user/myFavorite/index.wxml b/pages/user/myFavorite/index.wxml
index 42b0395..e0b8ad1 100644
--- a/pages/user/myFavorite/index.wxml
+++ b/pages/user/myFavorite/index.wxml
@@ -18,7 +18,7 @@
         time="{{item.time}}" 
         commentNum="{{item.commentNum}}"
         type="{{item.type}}"
-        userIcon="{{item.userIcon}}"
+        userIcon="{{item.userIcon || '/images/topic/avatar.png'}}"
         bind:clickListItem="clickListItem"/>
     </block>
   </block>