Merge refs/remotes/origin/master into refs/heads/master

pages/topics/interactive/submitTopic/index.wxml

@@ -2,13 +2,13 @@
 <view class="container">
   <view class="item">
     <view class="must_fill">＊</view>
-      <input class="title" value="{{topicTitle}}" bindinput="bindTextInput" placeholder="议题标题"></input>
+      <input class="title" maxlength="95" value="{{topicTitle}}" bindinput="bindTextInput" placeholder="议题标题"></input>
     </view>
     
     <view class="line-view"></view>
     <view class="item">
       <view class="must_fill">＊</view>
-      <textarea class="textArea" value="{{topicDetail}}" bindinput="bindTextAreaInput" placeholder="议题内容" />
+      <textarea class="textArea" maxlength="1000" value="{{topicDetail}}" bindinput="bindTextAreaInput" placeholder="议题内容" />
     </view>
   
   <mp-cells ext-class="uploader_bd">

pages/topics/message/index.wxml

@@ -2,13 +2,13 @@
 <view class="container">
   <view class="item">
     <view class="must_fill">＊</view>
-      <input class="title" value="{{messageTitle}}" bindinput="bindTextInput" placeholder="请输入标题"></input>
+      <input class="title" maxlength="95" value="{{messageTitle}}" bindinput="bindTextInput" placeholder="请输入标题"></input>
     </view>
     
     <view class="line-view"></view>
     <view class="item">
       <view class="must_fill">＊</view>
-      <textarea class="textArea" value="{{messageDetail}}" bindinput="bindTextAreaInput" placeholder="请输入正文" />
+      <textarea class="textArea" maxlength="1000" value="{{messageDetail}}" bindinput="bindTextAreaInput" placeholder="请输入正文" />
     </view>
 
     <mp-cells ext-class="uploader_msg_bd">