Merge branch 'feature/3月迭代' into dev

src/views/activity/component/CategoryDialog.vue

@@ -10,9 +10,9 @@
         <draggable tag="ul" :list="list" class="list-group" handle=".handle">
           <li class="list-group-item" v-for="(item, idx) in list" :key="idx">
             <el-form-item :prop="idx+'.categoryName'" :rules="rules.categoryName">
-              <p class="show-name" v-show="!item.isEdit">{{list[idx].categoryName}}</p>
-              <el-input v-model="list[idx].categoryName	" v-show="item.isEdit"
-                style="width:430px;" @keyup.enter.native="saveEdit(idx)">
+              <!-- <p class="show-name" v-show="!item.isEdit">{{list[idx].categoryName}}</p> -->
+              <el-input v-model="list[idx].categoryName"
+                style="width:466px;" @keyup.enter.native="saveEdit(idx)">
               </el-input>
             </el-form-item>
             <div class="btn-wrap">
@@ -21,8 +21,8 @@
                 <el-button type="text" @click="saveEdit(idx)">保存</el-button>
               </template>
               <template v-else>
-                <span class="icon-span" @click="editItem(idx)"><i
-                    class="iconfont-components3 icon-cp-edit-outlined" /></span>
+                <!-- <span class="icon-span" @click="editItem(idx)"><i
+                    class="iconfont-components3 icon-cp-edit-outlined" /></span> -->
                 <span class="icon-span" @click="onDeleteItem(idx)"><i
                     class="iconfont-components3 icon-cp-DeleteOutlined" /></span>
                 <el-tooltip popper-class="category-dialog-tooltip" effect="dark" content="拖拽排序"