Merge remote-tracking branch 'origin/master'
# Conflicts: # pages/demo/index.vuemaster
commit
265107a9b8
|
|
@ -16,7 +16,7 @@
|
||||||
<text class="clear-icon" @click="clearInput('broker')" v-if="mqttConfig.broker">×</text>
|
<text class="clear-icon" @click="clearInput('broker')" v-if="mqttConfig.broker">×</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="form-item" v-if="false">
|
<view class="form-item">
|
||||||
<label>客户端ID:</label>
|
<label>客户端ID:</label>
|
||||||
<view class="input-wrapper">
|
<view class="input-wrapper">
|
||||||
<input
|
<input
|
||||||
|
|
@ -52,7 +52,7 @@
|
||||||
<text class="clear-icon" @click="clearInput('password')" v-if="mqttConfig.password">×</text>
|
<text class="clear-icon" @click="clearInput('password')" v-if="mqttConfig.password">×</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="form-item" v-if="false">
|
<view class="form-item">
|
||||||
<label>连接超时:</label>
|
<label>连接超时:</label>
|
||||||
<view class="input-wrapper">
|
<view class="input-wrapper">
|
||||||
<input
|
<input
|
||||||
|
|
@ -126,7 +126,6 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
<!-- 消息日志区域 -->
|
<!-- 消息日志区域 -->
|
||||||
<view class="log-section">
|
<view class="log-section">
|
||||||
<view class="section-title">消息日志</view>
|
<view class="section-title">消息日志</view>
|
||||||
|
|
@ -215,8 +214,6 @@
|
||||||
发布消息
|
发布消息
|
||||||
</button>
|
</button>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue