Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/demo/index.vue

pages/demo/index.vue

@@ -16,7 +16,7 @@
             <text class="clear-icon" @click="clearInput('broker')" v-if="mqttConfig.broker">×</text>
           </view>
         </view>
-        <view class="form-item" v-if="false">
+        <view class="form-item">
           <label>客户端ID：</label>
           <view class="input-wrapper">
             <input
@@ -52,7 +52,7 @@
             <text class="clear-icon" @click="clearInput('password')" v-if="mqttConfig.password">×</text>
           </view>
         </view>
-        <view class="form-item" v-if="false">
+        <view class="form-item">
           <label>连接超时：</label>
           <view class="input-wrapper">
             <input
@@ -126,7 +126,6 @@
       </view>
     </view>
 
-
     <!-- 消息日志区域 -->
     <view class="log-section">
       <view class="section-title">消息日志</view>
@@ -215,8 +214,6 @@
         发布消息
       </button>
     </view>
-
-
   </view>
 </template>