Merge branch 'master' of http://gitlab.scsmile.cn/zxf/setup-project-manager-ui

admin/src/views/Step.vue

@@ -33,11 +33,7 @@
             <div v-show="active == 1">
                 <div class="label">创建站点</div>
                 <div class="line"></div>
-                <div class="elinput">
-                    <el-input placeholder="请输入内容" v-model="siteName">
-                        <template slot="prepend">站点名称</template>
-                    </el-input>
-                </div>
+                
                 <div style="margin:20px 0;">
                     <span style="font-size: 14px">
                         <b>当前选择区域:</b>
@@ -54,6 +50,11 @@
                         :render-content="renderContent" @node-click="handleNodeClick">
                     </el-tree>
                 </div>
+                <div class="elinput" style="margin:20px 0;">
+                    <el-input placeholder="请输入内容" v-model="siteName">
+                        <template slot="prepend">站点名称</template>
+                    </el-input>
+                </div>
                 <div class="line"></div>
                 <el-button type="primary" @click="active = 0">上一步</el-button>
                 <el-button type="primary" @click="updateSiteConform" :loading="loading">下一步</el-button>