Commit fcd1ac1e authored by wujj's avatar wujj

Merge remote-tracking branch 'origin/master'

parents f8c908c5 c432d018
...@@ -47,8 +47,10 @@ ...@@ -47,8 +47,10 @@
</div> </div>
<div class="class-10" > <div class="class-10" >
<el-form-item> <el-form-item>
<el-button type="primary" @click="updataIndex" :loading="homeLoading">{{homeLoading?'更新中':'生成主页'}}</el-button> <@shiro.hasPermission name="cms:generate:index">
<el-button plain @click="viewIndex">预览主页</el-button> <el-button type="primary" @click="updataIndex" :loading="homeLoading">{{homeLoading?'更新中':'生成主页'}}</el-button>
</@shiro.hasPermission>
<el-button plain @click="viewIndex">预览主页</el-button>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
...@@ -92,9 +94,12 @@ ...@@ -92,9 +94,12 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="class-20" > <div class="class-20" >
<el-form-item> <@shiro.hasPermission name="cms:generate:article">
<el-button type="primary" @click="updateArticle" :loading="articleLoading">{{articleLoading?'更新中':'生成文章'}}</el-button> <el-form-item>
</el-form-item> <el-button type="primary" @click="updateArticle" :loading="articleLoading">{{articleLoading?'更新中':'生成文章'}}</el-button>
</el-form-item>
</@shiro.hasPermission>
</div> </div>
</div> </div>
<div class="class-23" > <div class="class-23" >
...@@ -116,9 +121,12 @@ ...@@ -116,9 +121,12 @@
</div> </div>
<div class="class-30" > <div class="class-30" >
<@shiro.hasPermission name="cms:generate:column">
<el-form-item> <el-form-item>
<el-button type="primary" @click="updateColumn" :loading="columnLoading">{{columnLoading?'更新中':'生成栏目'}}</el-button> <el-button type="primary" @click="updateColumn" :loading="columnLoading">{{columnLoading?'更新中':'生成栏目'}}</el-button>
</el-form-item> </el-form-item>
</@shiro.hasPermission>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment