Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
WangHao 2021-11-06 23:16:30 +08:00
parent 6e5cbf2f89
commit 4ca094ab5d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-ui/src/views/bookmark/tag/usertag.vue
View File

@ -80,8 +80,8 @@
>
<el-input v-model="newName" placeholder="请输入新的标签名称"></el-input>
<span slot="footer" class="dialog-footer">
<el-button class="butWidth" size="small" type="primary" @click="editByUser()">确 定</el-button>
<el-button class="butWidth" size="small" @click="dialogVisible = false">取 消</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="editByUser()">确 定</el-button>
</span>
</el-dialog>
@ -367,9 +367,5 @@
margin-top: 9px;
font-size: 16px;
}
.butWidth{
width: 80%;
margin-left: 10% ;
}
</style>