Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/makerActvityDetails.vue

@@ -248,7 +248,7 @@
                     <div class="deleteContent">是否修改“{{ tableData.title}}”项目活动？</div>
                     <span slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="save" class="AllDialogBtn" >确认提交</el-button>
-                        <el-button @click="dialogVisible1=false;" class="AllDialogBtn" style="background:#cccccc" >取消</el-button>
+                        <el-button @click="dialogVisible1=false;" class="AllDialogBtn" >取消</el-button>
                     </span>
                   </el-dialog>
                   <!-- 删除文件对话框结束 -->
@@ -261,7 +261,7 @@
                     <div class="deleteContent" >是否删除“{{DelFileData.fileName}}”文件？</div>
                     <span slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="DelFileYes" class="AllDialogBtn" >确认删除</el-button>
-                        <el-button @click="DelFileDialog=false;" class="AllDialogBtn" style="background:#cccccc" >取消</el-button>
+                        <el-button @click="DelFileDialog=false;" class="AllDialogBtn" >取消</el-button>
                     </span>
                   </el-dialog>
                   <!-- 删除文件对话框结束 -->
@@ -275,7 +275,7 @@
                     <div class="deleteContent">是否审核“{{ tableData.title}}”项目活动？</div>
                     <span slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="process" class="AllDialogBtn" >确认审核</el-button>
-                        <el-button @click="processDialog=false;" class="AllDialogBtn" style="background:#cccccc" >取消</el-button>
+                        <el-button @click="processDialog=false;" class="AllDialogBtn">取消</el-button>
                     </span>
                   </el-dialog>
                   <!-- 审核对话框结束 -->