diff --git a/mobile/src/App.vue b/mobile/src/App.vue index 69272e73..f7bcf2db 100644 --- a/mobile/src/App.vue +++ b/mobile/src/App.vue @@ -34,9 +34,10 @@ export default Vue.extend({ @import 'uview-ui/index.scss'; /* 引入自定义图标系统 - 暂时禁用,使用uview-ui内置图标 */ -/* @import 'common/icons/iconfont.css'; */ +@import '@/static/fonts/iconfont.css'; /* 修复uni-app和uview-ui兼容性问题 */ + page { height: 100%; } @@ -118,10 +119,10 @@ page { border-color: #d32f2f !important; } -.u-button--info { - background-color: #1976d2 !important; - border-color: #1976d2 !important; -} +// .u-button--info { +// background-color: #007dfb !important; +// border-color: #007dfb !important; +// } /* 标签主题色覆盖 */ .u-tag--primary { @@ -145,8 +146,8 @@ page { } .u-tag--info { - background-color: #1976d2 !important; - border-color: #1976d2 !important; + background-color: #007dfb !important; + border-color: #007dfb !important; } /* ========== 全局温暖商务风格样式 ========== */ @@ -326,4 +327,28 @@ page { .bg-warm-green { background-color: #689f38; } + +.u-toolbar__wrapper__confirm { + color: #0051d9 !important; +} + +.u-button--plain.u-button--primary { + color: #ffffff !important; +} + +.u-button--plain.u-button--error { + color: #ffffff !important; +} + +.u-button--plain.u-button--info { + color: #3e3b3b !important; +} + +.u-button--plain.u-button--warning { + color: #ffffff !important; +} + +.u-button--plain.u-button--success { + color: #ffffff !important; +} diff --git a/mobile/src/components/Process/approvalButton.vue b/mobile/src/components/Process/approvalButton.vue index 747ea13a..f6a73bf9 100644 --- a/mobile/src/components/Process/approvalButton.vue +++ b/mobile/src/components/Process/approvalButton.vue @@ -26,7 +26,8 @@ diff --git a/mobile/src/components/Process/submitVerify.vue b/mobile/src/components/Process/submitVerify.vue index 375a95f1..d71a4f72 100644 --- a/mobile/src/components/Process/submitVerify.vue +++ b/mobile/src/components/Process/submitVerify.vue @@ -195,7 +195,8 @@ - + @@ -91,6 +91,7 @@ - + {{ isWechatBrowser ? '微信定位' : '定位' }} @@ -207,7 +215,7 @@ - + @@ -278,6 +286,7 @@ v-if="image.status === 'success'" size="mini" type="primary" + shape="round" plain @tap="handleImageDownload(image)" @click.stop.prevent=" @@ -290,6 +299,7 @@ v-if="image.status === 'error'" size="mini" type="warning" + shape="round" plain @click.stop.prevent="retryUploadFile(image, $event)" > @@ -298,6 +308,7 @@ 删除 @@ -410,7 +426,8 @@ - + 搜索 - + 重置 @@ -215,38 +227,74 @@ - - - 修改 - - - - 查看 - + + 修改 + + + + 查看 + - - - 删除 - + + 删除 + - - - 销假 - + + 销假 + @@ -975,46 +1023,6 @@ export default { padding: 20rpx; border-top: 1px solid #f0f0f0; gap: 16rpx; - // background-color: #fafafa; -} - -.action-btn { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - padding: 16rpx 20rpx; - border-radius: 12rpx; - min-width: 120rpx; - transition: all 0.3s ease; - background-color: transparent; - - &:active { - transform: scale(0.95); - opacity: 0.8; - } -} - -.btn-text { - font-size: 24rpx; - margin-top: 8rpx; - font-weight: 500; -} - -.info-btn .btn-text { - color: #3c9cff; -} - -.danger-btn .btn-text { - color: #f56c6c; -} - -.success-btn .btn-text { - color: #5ac725; -} - -.warning-btn .btn-text { - color: #ff9900; } // 分页容器 @@ -1024,7 +1032,7 @@ export default { // 搜索按钮样式 ::v-deep .search-btn { - background: linear-gradient(135deg, #007aff, #0051d9) !important; + // background: linear-gradient(135deg, #007aff, #0051d9) !important; border: none !important; box-shadow: 0 4px 16px rgba(0, 122, 255, 0.3) !important; transition: all 0.3s ease !important; diff --git a/mobile/src/pages/xg/xsjcxx/xsqj/leaveEdit/index.vue b/mobile/src/pages/xg/xsjcxx/xsqj/leaveEdit/index.vue index a4178aaa..5fa8e186 100644 --- a/mobile/src/pages/xg/xsjcxx/xsqj/leaveEdit/index.vue +++ b/mobile/src/pages/xg/xsjcxx/xsqj/leaveEdit/index.vue @@ -178,7 +178,13 @@ - + {{ isWechatBrowser ? '微信定位' : '定位' }} @@ -195,7 +201,13 @@ - + 查看位置 @@ -262,6 +274,7 @@ v-if="image.status === 'success'" size="mini" type="primary" + shape="round" plain @tap="handleImageDownload(image)" @click.stop.prevent=" @@ -274,6 +287,7 @@ v-if="image.status === 'error'" size="mini" type="warning" + shape="round" plain @click.stop.prevent="retryUploadFile(image, $event)" > @@ -283,6 +297,7 @@ size="mini" type="error" plain + shape="round" @tap="handleImageDelete(image, index)" @click.stop.prevent=" handleImageDeleteClick(image, index, $event) @@ -368,6 +383,7 @@ v-if="file.status === 'success'" size="mini" type="primary" + shape="round" plain @tap="handleDownloadFile(file)" @click.stop.prevent="handleDownloadFileClick(file, $event)" @@ -379,6 +395,7 @@ size="mini" type="warning" plain + shape="round" @click.stop.prevent="retryUploadFile(file, $event)" > 重试 @@ -386,6 +403,7 @@ - 取消 + 取消 确认 diff --git a/mobile/src/pages/xg/xsjcxx/xsws/index.vue b/mobile/src/pages/xg/xsjcxx/xsws/index.vue index 29763473..000411ee 100644 --- a/mobile/src/pages/xg/xsjcxx/xsws/index.vue +++ b/mobile/src/pages/xg/xsjcxx/xsws/index.vue @@ -75,23 +75,39 @@ - - - 信息完善 - - - - - 提交历史 - - - - 查看详细 - + + 信息完善 + + + + 提交历史 + + + + 查看详细 + @@ -471,57 +487,15 @@ export default { .card-actions { display: flex; justify-content: space-around; + align-items: center; padding: 20rpx; border-top: 1px solid #f0f0f0; - gap: 16rpx; + gap: 12rpx; } -.action-btn { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - padding: 16rpx 20rpx; - border-radius: 12rpx; - background-color: #f8f9fa; - min-width: 120rpx; - transition: all 0.3s ease; - - &:active { - transform: scale(0.95); - opacity: 0.8; - } -} - -.btn-text { - font-size: 24rpx; - margin-top: 8rpx; - color: #303133; - font-weight: 500; -} - -.info-btn { - background-color: rgba(60, 156, 255, 0); - - .btn-text { - color: #3c9cff; - } -} - -.success-btn { - background-color: rgba(90, 199, 37, 0); - - .btn-text { - color: #5ac725; - } -} - -.warning-btn { - background-color: rgba(255, 153, 0, 0); - - .btn-text { - color: #ff9900; - } +// u-button组件样式调整 +::v-deep .u-button { + font-size: 24rpx !important; } // 弹窗样式 diff --git a/mobile/src/pages/xg/xsjcxx/xsws/stuMsgDialog.vue b/mobile/src/pages/xg/xsjcxx/xsws/stuMsgDialog.vue index e9fdb39e..e0a90b08 100644 --- a/mobile/src/pages/xg/xsjcxx/xsws/stuMsgDialog.vue +++ b/mobile/src/pages/xg/xsjcxx/xsws/stuMsgDialog.vue @@ -1243,6 +1243,8 @@ - + 搜索 - + 重置 @@ -153,10 +165,15 @@ - - - 查看详细 - + + 查看详细 + @@ -656,34 +673,6 @@ export default { border-top: 1px solid #f0f0f0; } -.action-btn { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - padding: 16rpx 20rpx; - border-radius: 12rpx; - background-color: #f8f9fa; - min-width: 120rpx; - transition: all 0.3s ease; - - &:active { - transform: scale(0.95); - opacity: 0.8; - } -} - -.view-btn { - background-color: rgba(60, 156, 255, 0); -} - -.btn-text { - font-size: 24rpx; - margin-top: 8rpx; - color: #3c9cff; - font-weight: 500; -} - .load-more { padding: 20rpx 0; } @@ -701,7 +690,7 @@ export default { // 搜索按钮样式 ::v-deep .search-btn { - background: linear-gradient(135deg, #007aff, #0051d9) !important; + // background: linear-gradient(135deg, #007aff, #0051d9) !important; border: none !important; box-shadow: 0 4px 16px rgba(0, 122, 255, 0.3) !important; transition: all 0.3s ease !important; diff --git a/mobile/src/pages/xgss/sswj/sswjDetail.vue b/mobile/src/pages/xgss/sswj/sswjDetail.vue index a12dc5f1..c0824d24 100644 --- a/mobile/src/pages/xgss/sswj/sswjDetail.vue +++ b/mobile/src/pages/xgss/sswj/sswjDetail.vue @@ -22,7 +22,7 @@ - + 学生信息 @@ -52,7 +52,7 @@ - + 宿舍信息 @@ -78,7 +78,7 @@ - + 违纪信息 diff --git a/mobile/src/pages/xgss/xssswsjc/xssswsjc.vue b/mobile/src/pages/xgss/xssswsjc/xssswsjc.vue index cf32a82e..196ac871 100644 --- a/mobile/src/pages/xgss/xssswsjc/xssswsjc.vue +++ b/mobile/src/pages/xgss/xssswsjc/xssswsjc.vue @@ -22,10 +22,22 @@ - + 搜索 - + 重置 @@ -151,10 +163,15 @@ - - - 查看 - + + 查看 + - - - 查看计划 - - + 查看计划 + + - - 提交申请 - - - - 查看申请 - + 提交申请 + + + 查看申请 + @@ -192,7 +204,12 @@ - + 确定 @@ -619,40 +636,6 @@ export default { gap: 16rpx; } -.action-btn { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - padding: 16rpx 20rpx; - border-radius: 12rpx; - min-width: 120rpx; - transition: all 0.3s ease; - - &:active { - transform: scale(0.95); - opacity: 0.8; - } -} - -.btn-text { - font-size: 24rpx; - margin-top: 8rpx; - font-weight: 500; -} - -.info-btn .btn-text { - color: #3c9cff; -} - -.success-btn .btn-text { - color: #5ac725; -} - -.warning-btn .btn-text { - color: #ff9900; -} - .load-more { padding: 20rpx 0; } diff --git a/mobile/src/pages/xskh/wjjl/revokeApplication.vue b/mobile/src/pages/xskh/wjjl/revokeApplication.vue index 575ae2b3..b637f457 100644 --- a/mobile/src/pages/xskh/wjjl/revokeApplication.vue +++ b/mobile/src/pages/xskh/wjjl/revokeApplication.vue @@ -185,6 +185,7 @@ v-if="image.status === 'success'" size="mini" type="primary" + shape="round" plain @tap="handleImageDownload(image)" @click.stop.prevent=" @@ -197,6 +198,7 @@ v-if="image.status === 'error'" size="mini" type="warning" + shape="round" plain @click.stop.prevent="retryUploadFile(image, $event)" > @@ -206,6 +208,7 @@ v-if="canApply" size="mini" type="error" + shape="round" plain @tap="handleImageDelete(image, index)" @click.stop.prevent=" @@ -317,6 +320,7 @@ v-if="file.status === 'success'" size="mini" type="primary" + shape="round" plain @tap="handleDownloadFile(file)" @click.stop.prevent=" @@ -329,6 +333,7 @@ v-if="file.status === 'error'" size="mini" type="warning" + shape="round" plain @click.stop.prevent="retryUploadFile(file, $event)" > @@ -338,9 +343,12 @@ v-if="canApply" size="mini" type="error" + shape="round" plain @tap="handleRemoveFile(file, index)" - @click.stop.prevent="handleRemoveFileClick(file, index, $event)" + @click.stop.prevent=" + handleRemoveFileClick(file, index, $event) + " > 删除 @@ -357,7 +365,8 @@ 删除申请 diff --git a/mobile/src/pages/xskh/wjjl/xswjjl.vue b/mobile/src/pages/xskh/wjjl/xswjjl.vue index c5212850..ee7c515e 100644 --- a/mobile/src/pages/xskh/wjjl/xswjjl.vue +++ b/mobile/src/pages/xskh/wjjl/xswjjl.vue @@ -76,24 +76,40 @@ - - - 查看 - - - - - 撤销申请 - - - - - 查看撤销申请 - + 查看 + + + 撤销申请 + + + 查看撤销申请 + @@ -412,59 +428,12 @@ export default { .card-actions { display: flex; justify-content: space-around; + align-items: center; padding: 20rpx; border-top: 1px solid #f0f0f0; gap: 16rpx; } -.action-btn { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - padding: 16rpx 20rpx; - border-radius: 12rpx; - // background-color: #f8f9fa; - min-width: 120rpx; - transition: all 0.3s ease; - - &:active { - transform: scale(0.95); - opacity: 0.8; - } -} - -.btn-text { - font-size: 24rpx; - margin-top: 8rpx; - color: #303133; - font-weight: 500; -} - -.info-btn { - // background-color: rgba(60, 156, 255, 0.1); - - .btn-text { - color: #3c9cff; - } -} - -.success-btn { - // background-color: rgba(90, 199, 37, 0.1); - - .btn-text { - color: #5ac725; - } -} - -.warning-btn { - // background-color: rgba(255, 153, 0, 0.1); - - .btn-text { - color: #ff9900; - } -} - .load-more { padding: 40rpx 20rpx; }