Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -131,8 +131,8 @@
                 <p class="q-mt-md row flex-between items-center">
                     <div class="row items-center">
                         <span class="Required q-mr-md">*</span>选择颜色：
-                    </div>
-                    <el-button v-if="searchData.isTeamManage" size="small" 
+                    </div> 
+                    <el-button size="small" 
                     class="button-new-tag q-ml-md ml-1" 
                     @click="setColorsShow">
                         + 颜色