diff --git a/App.uvue b/App.uvue index dface834c998e67c5c9350b057d49d6a8a7c896a..dc2b78f1b0dc06db4166445922a1d20b2e8780e7 100644 --- a/App.uvue +++ b/App.uvue @@ -1,101 +1,65 @@ + /*每个页面公共css */ + @import "./common/uni.css"; + \ No newline at end of file diff --git a/common/uni-uvue.css b/common/uni-uvue.css index 899cd21d5ecc28839f577edf15d5c07b8c06ab61..c033ed84c908612a8db83b7d3265b8c8d50eced7 100644 --- a/common/uni-uvue.css +++ b/common/uni-uvue.css @@ -1,157 +1,127 @@ -/* #ifndef APP-PLUS-NVUE */ -/* page { - min-height: 100%; - height: auto; -} */ -/* #endif */ - -/* 解决头条小程序字体图标不显示问题,因为头条运行时自动插入了span标签,且有全局字体 */ -/* #ifdef MP-TOUTIAO */ -/* text :not(view) { - font-family: uniicons; -} */ -/* #endif */ - -.uni-icon { - /* font-family: uniicons; - font-weight: normal; */ - width: 14px; - height: 14px; -} - -.uni-container { - padding: 15px; - background-color: #f8f8f8; -} - -.uni-header-logo { - /* #ifdef H5 */ - display: flex; - /* #endif */ - padding: 15px 15px; - flex-direction: column; - justify-content: center; - align-items: center; - margin-top: 10rpx; -} - -.uni-header-image { - width: 80px; - height: 80px; -} - -.uni-text-box { - margin-bottom: 20px; -} - -.hello-text { - color: #7A7E83; - font-size: 14px; - line-height: 20px; -} - -.hello-link { - color: #7A7E83; - font-size: 14px; - line-height: 20px; -} - -.uni-panel { - margin-bottom: 12px; -} - -.text-disabled { - color: #a0a0a0; -} - -.uni-panel-h { - /* #ifdef H5 */ - display: flex; - /* #endif */ - background-color: #ffffff; - flex-direction: row !important; - justify-content: space-between !important; - align-items: center !important; - padding: 12px; -} -/* -.uni-panel-h:active { - background-color: #f8f8f8; -} - */ -.uni-panel-h-on { - background-color: #f0f0f0; -} - -.uni-panel-text { - color: #000000; - font-size: 14px; - font-weight: normal; -} - -.uni-panel-icon { - margin-left: 15px; - color: #999999; - font-size: 14px; - font-weight: normal; - transform: rotate(0deg); - transition-duration: 0s; - transition-property: transform; -} - -.uni-panel-icon-on { - transform: rotate(180deg); -} - -.uni-navigate-item { - /* #ifdef H5 */ - display: flex; - /* #endif */ - flex-direction: row; - align-items: center; - background-color: #FFFFFF; - border-top-style: solid; - border-top-color: #f0f0f0; - border-top-width: 1px; - padding: 12px; - justify-content: space-between; - /* #ifdef H5 */ - /* cursor: pointer; */ - /* #endif */ -} - -.uni-navigate-item:active { - background-color: #f8f8f8; -} -.is--active { - background-color: #f8f8f8; -} -.uni-navigate-text { - color: #000000; - font-size: 14px; - font-weight: normal; -} - -.uni-navigate-icon { - margin-left: 15px; - color: #999999; - font-size: 14px; - font-weight: normal; -} - -.arrow { - width: 8px; - height: 8px; - border-top: 2px solid #ccc; - border-left: 2px solid #ccc; -} - -.arrow-right { - transform: rotate(135deg); -} -.arrow-up { - transform: rotate(45deg); -} -.arrow-down { - transform: rotate(-135deg); -} +.uni-icon { + width: 14px; + height: 14px; +} + +.uni-container { + padding: 15px; + background-color: #f8f8f8; +} + +.uni-header-logo { + /* #ifdef H5 */ + display: flex; + /* #endif */ + padding: 15px 15px; + flex-direction: column; + justify-content: center; + align-items: center; + margin-top: 10rpx; +} + +.uni-header-image { + width: 80px; + height: 80px; +} + +.uni-text-box { + margin-bottom: 20px; +} + +.hello-text { + color: #7A7E83; + font-size: 14px; + line-height: 20px; +} + +.hello-link { + color: #7A7E83; + font-size: 14px; + line-height: 20px; +} + +.uni-panel { + margin-bottom: 12px; +} + +.text-disabled { + color: #a0a0a0; +} + +.uni-panel-h { + /* #ifdef H5 */ + display: flex; + /* #endif */ + background-color: #ffffff; + flex-direction: row !important; + justify-content: space-between !important; + align-items: center !important; + padding: 12px; +} + +/* +.uni-panel-h:active { + background-color: #f8f8f8; +} + */ +.uni-panel-h-on { + background-color: #f0f0f0; +} + +.uni-panel-text { + color: #000000; + font-size: 14px; + font-weight: normal; +} + +.uni-panel-icon { + margin-left: 15px; + color: #999999; + font-size: 14px; + font-weight: normal; + transform: rotate(0deg); + transition-duration: 0s; + transition-property: transform; +} + +.uni-panel-icon-on { + transform: rotate(180deg); +} + +.uni-navigate-item { + /* #ifdef H5 */ + display: flex; + /* #endif */ + flex-direction: row; + align-items: center; + background-color: #FFFFFF; + border-top-style: solid; + border-top-color: #f0f0f0; + border-top-width: 1px; + padding: 12px; + justify-content: space-between; + /* #ifdef H5 */ + /* cursor: pointer; */ + /* #endif */ +} + +.uni-navigate-item:active { + background-color: #f8f8f8; +} + +.is--active { + background-color: #f8f8f8; +} + +.uni-navigate-text { + color: #000000; + font-size: 14px; + font-weight: normal; +} + +.uni-navigate-icon { + margin-left: 15px; + color: #999999; + font-size: 14px; + font-weight: normal; +} \ No newline at end of file diff --git a/common/uni.css b/common/uni.css index 31e66c5428988f7e187d0d28fbbd3e30b1e2386e..6a8221132b534dc2d8c584fd72e2299e744a512a 100644 --- a/common/uni.css +++ b/common/uni.css @@ -1,156 +1,150 @@ .uni-padding-wrap { - padding: 0 30rpx; + padding: 0 30rpx; } .uni-title { - padding: 20rpx 0; + padding: 20rpx 0; } .uni-title-text { - font-size: 30rpx; - font-weight: bold; + font-size: 30rpx; + font-weight: bold; } .uni-subtitle-text { - margin-top: 10rpx; - font-size: 24rpx; - color: #888; - font-weight: bold; + margin-top: 10rpx; + font-size: 24rpx; + color: #888; + font-weight: bold; } .uni-common-mb { - margin-bottom: 30rpx; + margin-bottom: 30rpx; } .uni-common-pb { - padding-bottom: 30rpx; + padding-bottom: 30rpx; } .uni-common-pl { - padding-left: 30rpx; + padding-left: 30rpx; } .uni-common-mt { - margin-top: 30rpx; + margin-top: 30rpx; } .uni-hello-text { - color: #7A7E83; - line-height: 22px; + color: #7A7E83; + line-height: 22px; } .uni-list { - background-color: #FFFFFF; - position: relative; - display: flex; - flex-direction: column; - border-bottom: 1px solid #c8c7cc; + background-color: #FFFFFF; + position: relative; + display: flex; + flex-direction: column; + border-bottom: 1px solid #c8c7cc; } .uni-list-cell { - position: relative; - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; + position: relative; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; } .uni-list-cell-line { - border-bottom: 1px solid #c8c7cc; + border-bottom: 1px solid #c8c7cc; } .uni-list-cell-hover { - background-color: #eee; + background-color: #eee; } .uni-list-cell-pd { - padding: 22rpx 30rpx 22rpx 0; + padding: 22rpx 30rpx 22rpx 0; } .uni-list-cell-left { - padding: 0 30rpx 0 20rpx; + padding: 0 30rpx 0 20rpx; } .uni-list-cell-db, .uni-list-cell-right { - flex: 1; + flex: 1; } .uni-label { - width: 210rpx; - font-size: 28rpx; - /* word-wrap: break-word; - word-break: break-all; - text-indent:20rpx; */ + width: 210rpx; } .uni-input { - height: 50rpx; - padding: 15rpx 25rpx; - /* line-height: 50rpx; - font-size: 28rpx; */ - background: #FFF; - flex: 1; - box-sizing: content-box; + height: 50rpx; + padding: 15rpx 25rpx; + line-height: 50rpx; + font-size: 28rpx; + background: #FFF; + flex: 1; + box-sizing: content-box; } .uni-flex { - /* #ifdef H5 */ - display: flex; - /* #endif */ - flex-direction: row; + /* #ifdef H5 */ + display: flex; + /* #endif */ + flex-direction: row; } .uni-flex-item { - flex: 1; + flex: 1; } .uni-row { - flex-direction: row; + flex-direction: row; } .uni-column { - flex-direction: column; + flex-direction: column; } -/* 背景色 */ .uni-bg-red { - background: #F76260; + background: #F76260; } .uni-bg-green { - background: #09BB07; + background: #09BB07; } .uni-bg-blue { - background: #007AFF; + background: #007AFF; } .uni-btn-v { - padding: 10rpx 0; + padding: 10rpx 0; } .uni-btn { - margin-top: 20rpx; + margin-top: 20rpx; } .uni-link { - color: #576B95; - font-size: 26rpx; + color: #576B95; + font-size: 26rpx; } .uni-center { - flex-direction: row; - justify-content: center; + flex-direction: row; + justify-content: center; } -/* textarea */ .uni-textarea-box { - background: #ffffff; + background: #ffffff; } .uni-textarea { - padding: 18rpx; - /* line-height: 1.6; - font-size: 28rpx; */ -} + padding: 18rpx; + line-height: 1.6; + font-size: 28rpx; +} \ No newline at end of file diff --git a/pages/API/download-file/download-file.uvue b/pages/API/download-file/download-file.uvue index 202c5f44e7087aad12e2cc6b8708b4058f57da6c..e028784e245e9c2c4851fc9584eb22e5a4073f31 100644 --- a/pages/API/download-file/download-file.uvue +++ b/pages/API/download-file/download-file.uvue @@ -9,9 +9,7 @@ - - 点击按钮下载服务端示例图片(下载网络文件到本地临时目录) - + 点击按钮下载服务端示例图片(下载网络文件到本地临时目录) diff --git a/pages/API/pull-down-refresh/pull-down-refresh.uvue b/pages/API/pull-down-refresh/pull-down-refresh.uvue index f9199feaadd54905763cff6781612c1edc04cc45..7dba66f1e923ec372d11c050ea258462f44509a0 100644 --- a/pages/API/pull-down-refresh/pull-down-refresh.uvue +++ b/pages/API/pull-down-refresh/pull-down-refresh.uvue @@ -2,7 +2,7 @@ - list - {{num}} + list - {{num}} {{loadMoreText}} diff --git a/pages/API/upload-file/upload-file.uvue b/pages/API/upload-file/upload-file.uvue index 9df35c459dea4cd1e695ded48fbced4a5c90022a..7554d04c192dd9a9b5a2658a52b4983e3ad49bde 100644 --- a/pages/API/upload-file/upload-file.uvue +++ b/pages/API/upload-file/upload-file.uvue @@ -12,8 +12,8 @@ class="image" mode="widthFix" > - + 选择图片+ 选择图片 @@ -108,7 +108,6 @@ export default { .uni-hello-addfile { text-align: center; - line-height: 300rpx; background: #fff; padding: 50rpx; margin-top: 10px; diff --git a/pages/API/websocket-global/websocket-global.uvue b/pages/API/websocket-global/websocket-global.uvue index 997808bdd2f02cad83b7fbb0d635842c78220af4..3f751f5d2dd6b1d351c790d17e7e3271361e6ae3 100644 --- a/pages/API/websocket-global/websocket-global.uvue +++ b/pages/API/websocket-global/websocket-global.uvue @@ -3,7 +3,7 @@ - {{ showMsg }} + {{ showMsg }} @@ -18,8 +18,8 @@ - 发送消息后会收到一条服务器返回的消息(与发送的消息内容一致)发送消息后会收到一条服务器返回的消息(与发送的消息内容一致) diff --git a/pages/API/websocket-socketTask/websocket-socketTask.uvue b/pages/API/websocket-socketTask/websocket-socketTask.uvue index 21b403ae418522d8be0b75f83fe07eeeaf713869..8139774e680530b115010054e781a72cab801f20 100644 --- a/pages/API/websocket-socketTask/websocket-socketTask.uvue +++ b/pages/API/websocket-socketTask/websocket-socketTask.uvue @@ -3,7 +3,7 @@ - {{ showMsg }} + {{ showMsg }} @@ -18,8 +18,8 @@ - 发送消息后会收到一条服务器返回的消息(与发送的消息内容一致)发送消息后会收到一条服务器返回的消息(与发送的消息内容一致) diff --git a/pages/component/input/input.uvue b/pages/component/input/input.uvue index 9b94edae7e90cefff9262eb90cf92afdaf66df41..d824cbf79b114edc83eea8b2302d402dffb6e30c 100644 --- a/pages/component/input/input.uvue +++ b/pages/component/input/input.uvue @@ -292,8 +292,8 @@ .uni-input { height: 28px; - /* line-height: 28px; - font-size: 15px; */ + line-height: 28px; + font-size: 15px; padding: 0px; flex: 1; background-color: #ffffff; diff --git a/pages/tabBar/template.uvue b/pages/tabBar/template.uvue index 50921bca17c80f03b9b2c717be41dd9cac1ab9ea..75eee77393ca9217dc10e5be3d60acf12895b9f2 100644 --- a/pages/tabBar/template.uvue +++ b/pages/tabBar/template.uvue @@ -9,7 +9,6 @@ 以下是部分模板示例,更多模板见插件市场: