diff --git a/README.md b/README.md index c572938..2e2901d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # 注意事项 + 原生APP云打包使用自有证书 + 证书别名：testalias -+ 诺力三期的接口文档：http://47.111.78.178:27017/，账号名字首字母小写 , 密码123456 \ No newline at end of file ++ 诺力三期的接口文档：http://47.111.78.178:27017/，账号名字首字母小写 , 密码123456 ++ 屏幕尺寸：854px * 534px \ No newline at end of file diff --git a/common/style/layout.css b/common/style/layout.css index ea0f30e..0524fe8 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -24,13 +24,13 @@ uni-button{ background-color: #040d1e; } .search-confirm-wrap { - width: calc(100% - 60rpx); - margin: 30rpx auto; - border-radius: 12rpx; - padding: 30rpx; + width: calc(100% - 20px); + margin: 10px auto 0 auto; + border-radius: 6px; + padding: 10px; background: linear-gradient(to right, rgba(8, 38, 68, 0.5) 1%, rgba(8, 38, 68, 0.98) 100%); - border: 1rpx solid #0490DD; - box-shadow: rgba(4, 136, 203, 0.2) -6rpx 6px 12rpx 2rpx, rgba(4, 136, 203, 0.2) 6rpx -6rpx 12rpx 2rpx; + border: 1px solid #0490DD; + box-shadow: rgba(4, 136, 203, 0.2) -3px 6px 6px 1px, rgba(4, 136, 203, 0.2) 3px -3px 6px 1px; } .search-label{ height: 35px; @@ -79,12 +79,12 @@ uni-button{ background-color: #e1e1e1; } .confirm-button{ - min-width: 160rpx; - height: 72rpx; + min-width: 80px; + height: 30px; color: #fff; padding: 0; - font-size: 28rpx; - margin-left: 20rpx; + font-size: 13px; + margin-left: 10px; margin-right: 0; white-space: nowrap; background: center / 100% 100% url(./static/images/button.png) no-repeat; @@ -96,20 +96,20 @@ uni-button{ background: center / 100% 100% url(./static/images/button_disabled.png) no-repeat; } .table-title_wraper { - width: calc(100% - 60rpx); + width: calc(100% - 20px); margin: 0 auto; - font-size: 36rpx; + font-size: 16px; color: #fff; - line-height: 70rpx; + line-height: 28px; font-family: 'YouSheBiaoTiHei'; - padding: 30rpx 0 0 30rpx; + padding: 15px 0 0 15px; background: center / 100% 100% url(./static/images/bg-task-r1.png) no-repeat; } .grid-wrap{ - width: calc(100% - 60rpx); - height: calc(100% - 420rpx); - padding: 30rpx 60rpx 0rpx 60rpx; - margin: 10rpx auto 0; + width: calc(100% - 20px); + height: calc(100% - 145px); + padding: 5px 10px 0 10px; + margin: 0 auto; background: center / 100% 100% url(./static/images/bg-task-r2.png) no-repeat; /* border: 1px solid #0090e6; background-color: rgba(2, 38, 72, 90%); @@ -118,9 +118,9 @@ uni-button{ } .table-wrap { width: 100%; - height: calc(100% - 150rpx); + height: calc(100% - 53px); overflow-y: scroll; - margin-bottom: 40rpx; + margin-bottom: 9px; } .grid-wrap .grid-table{ width: 100%; @@ -205,52 +205,54 @@ uni-button{ display: flex; align-items: center; justify-content: center; - font-size: 30rpx; - line-height: 36rpx; - height: 80rpx; + font-size: 14px; + line-height: 15px; + height: 30px; color: #AFBED8; font-weight: bold; - padding: 0 10rpx; + padding: 0 5px; text-align: center; } .zd-sec-th { display: flex; align-items: center; justify-content: center; - font-size: 28rpx; - line-height: 30rpx; - height: 78rpx; + font-size: 12px; + line-height: 13px; + height: 30px; color: #fff; /* background-color: #0F1521; */ font-weight: bold; - padding: 0 10rpx; + padding: 0 5px; text-align: center; } .zd-td { display: flex; justify-content: center; align-items: center; - font-size: 28rpx; - line-height: 36rpx; - height: 86rpx; + font-size: 12px; + line-height: 13px; + height: 30px; color: #fff; - padding: 0 16rpx; + padding: 0 5px; text-align: center; - border-bottom: 2rpx solid #7A9FE0; + border-bottom: 1px solid #7A9FE0; + word-break: break-all; overflow: hidden; } .zd-sec-td { display: flex; justify-content: center; align-items: center; - font-size: 24rpx; - line-height: 28rpx; - height: 80rpx; + font-size: 12px; + line-height: 13px; + height: 30px; color: #fff; background-color: rgba(194, 86, 62, 0.2); - padding: 0 16rpx; + padding: 0 5px; text-align: center; - border-bottom: 2rpx solid #C2563E; + border-bottom: 1px solid #C2563E; + word-break: break-all; overflow: hidden; } .zd-td-checked .zd-td { @@ -258,8 +260,8 @@ uni-button{ border-bottom: 0 } .zd-checkbox { - width: 44rpx; - height: 44rpx; + width: 18px; + height: 18px; background: center / 100% 100% url(./static/images/icon-check1.png) no-repeat; } .zd-checkbox_active { @@ -281,8 +283,8 @@ uni-button{ .zd-sec-wraper { width: 100%; background-color: rgba(63,106,202,0.3); - padding: 30rpx; - border-bottom: 2rpx solid #7A9FE0; + padding: 5px 10px; + border-bottom: 1px solid #7A9FE0; transition: height 0.5s ease; } .status-wrap { @@ -431,18 +433,18 @@ uni-button{ height: 40%; } .kwcode_wraper { - height: calc(100% - 170rpx) + height: calc(100% - 85px) } .pop-title { - font-size: 36rpx; + font-size: 18px; color: #fff; font-family: 'YouSheBiaoTiHei'; - line-height: 70rpx; + line-height: 35px; } .pop-grid-wraper { - width: calc(100% - 60rpx); - height: calc(100% - 250rpx); - margin: 40rpx auto; + width: calc(100% - 30px); + height: calc(100% - 125px); + margin: 20px auto; overflow-y: scroll; } .zd-pop-th-wraper { @@ -450,16 +452,16 @@ uni-button{ } .zd-pop-td { background-color: RGBA(23, 123, 172, 0.4); - border-bottom: 2rpx solid #177BAC; - height: 100rpx; - font-size: 30rpx; + border-bottom: 1px solid #177BAC; + height: 40px; + font-size: 12px; } .pop-input { width: 100%; - height: 70rpx; - line-height: 70rpx; - font-size: 28rpx; + height: 28px; + line-height: 28px; + font-size: 12px; color: #fff; - border: 2rpx solid #21D0F2; - border-radius: 24rpx + border: 1px solid #21D0F2; + border-radius: 12px } diff --git a/common/style/reset.css b/common/style/reset.css index 92913cd..1a16037 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -141,11 +141,14 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re .mgr5 { margin-right: 5px; } -.mgt40 { - margin-top: 40rpx +.mgt10 { + margin-top: 10px } -.mgb40 { - margin-bottom: 40rpx +.mgt20 { + margin-top: 20px +} +.mgb20 { + margin-bottom: 20px } .popshow { transform: translateY(0); diff --git a/components/NavBar.vue b/components/NavBar.vue index 4ee6834..508c37a 100644 --- a/components/NavBar.vue +++ b/components/NavBar.vue @@ -52,26 +52,26 @@ @import '@/common/style/mixin.styl'; .header _fj() - _wh(100%, 90rpx) + _wh(100%, 30px) background-color #041427 - border-bottom 1rpx solid #13568B + border-bottom 1px solid #13568B z-index 200 - padding 0 30rpx - box-shadow: 0 2rpx 4rpx 0 RGBA(19, 86, 139, 0.5); + padding 0 10px + box-shadow: 0 1px 2px 0 RGBA(19, 86, 139, 0.5); .page_name - _font(50rpx, 90rpx, #F6F9FE,700,center) + _font(22px, 30px, #F6F9FE,700,center) font-family: YouSheBiaoTiHei background: linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; .icon_back { - font-size: 60rpx; - line-height: 60rpx; + font-size: 26px; + line-height: 30px; color: #fff; } .icon_home { - font-size: 60rpx; - line-height: 60rpx; + font-size: 26px; + line-height: 30px; color: #fff; } diff --git a/components/Pagination.vue b/components/Pagination.vue index f3c9a2b..5f493a5 100644 --- a/components/Pagination.vue +++ b/components/Pagination.vue @@ -69,12 +69,12 @@ export default { } text { display: inline-block; - padding: 0 20rpx; + padding: 0 10px; background-color: #fff; - border: 2rpx solid #ddd; - border-radius: 6rpx; - margin-right: 20rpx; - _font(30rpx, 70rpx, #053978,,) + border: 1px solid #ddd; + border-radius: 3px; + margin-right: 10px; + _font(13px, 26px, #053978,,) } text.active { diff --git a/components/ScanInput.vue b/components/ScanInput.vue index b7ce332..8f4d6c3 100644 --- a/components/ScanInput.vue +++ b/components/ScanInput.vue @@ -123,19 +123,19 @@ diff --git a/components/SearchBox.vue b/components/SearchBox.vue index f5e76b0..1c90815 100644 --- a/components/SearchBox.vue +++ b/components/SearchBox.vue @@ -126,30 +126,30 @@ diff --git a/pages/home/home.vue b/pages/home/home.vue index d7fef6c..c5f8a0e 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -74,44 +74,44 @@ _wh(100%, 100%) _bis(,'../../static/images/home_bg.jpg', 100%, 100%,bottom) .header - height 120rpx - padding 0 30rpx + height 60px + padding 0 15px align-items flex-start justify-content flex-end _bis(,'../../static/images/header_bg.png', 100%, 100%,bottom) .home_title - _font(50rpx,70rpx,#F6F9FE,,center) + _font(25px,35px,#F6F9FE,,center) font-family: YouSheBiaoTiHei; .home_userinfo - height 70rpx + height 35px .user_icon - _wh(50rpx, 50rpx) - margin-right 10rpx + _wh(25px, 25px) + margin-right 5px _bis(,'../../static/images/user_icon.png', 100%, 100%,center) .user_name - _font(34rpx,34rpx,#fff,,center) - padding-right 10rpx - margin 18rpx 20rpx 18rpx 0 - border-right 1rpx solid #AECAF5 + _font(17px,17px,#fff,,center) + padding-right 5px + margin 9px 10px 9px 0 + border-right 1px solid #AECAF5 .exit_text - height 60rpx - _font(28rpx,60rpx,#fff,,center) - padding 0 20rpx - margin 5rpx 0 + height 30px + _font(14px,30px,#fff,,center) + padding 0 10px + margin 2.5px 0 _bis(,'../../static/images/state-item_bg.png', 100%, 100%,center) .welcome_text_wraper - height 140rpx - margin 30rpx 100rpx + height 70px + margin 0 50px .welcome_text - _font(26px, 140rpx, #F6F9FE,,) - padding-left 40rpx + _font(26px, 70px, #F6F9FE,,) + padding-left 20px font-family: YouSheBiaoTiHei background: linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; .zd_wrapper - _wh(calc(100% - 200rpx),calc(100% - 450rpx)) /** 120rpx + 200rpx + 130rpx */ - margin 40rpx 100rpx 0rpx 100rpx + _wh(calc(100% - 100px),calc(100% - 180px)) /** 120rpx + 200rpx + 130rpx */ + margin 20px 50px 0 50px _bis(,'../../static/images/bg-task-r2.png', 100%, 100%,center) .menu-wrap flex-wrap wrap @@ -120,27 +120,27 @@ height 100% .menu-item width 20% - margin-bottom 100rpx + margin 20px 0 .menu_name_bg position relative - _wh(200rpx, 200rpx) + _wh(100px, 100px) margin 0 auto - border-radius 40rpx - background-image: radial-gradient( ellipse farthest-corner at 22rpx 22rpx , #afafb9, #afafb9 50%, #ffffff 50%); - background-size: 22rpx 22rpx; + border-radius 20px + background-image: radial-gradient( ellipse farthest-corner at 11px 11px , #afafb9, #afafb9 50%, #ffffff 50%); + background-size: 11px 11px; .bg_texture_1, .bg_texture_7 - background: repeating-linear-gradient( -45deg, #afafb9, #afafb9 10rpx, #ffffff 10rpx, #ffffff 16rpx ); + background: repeating-linear-gradient( -45deg, #afafb9, #afafb9 5px, #ffffff 5px, #ffffff 8px ); .menu-name background-color rgba(49, 95, 255, 0.8) .bg_texture_3, .bg_texture_6 background-image: repeating-linear-gradient(45deg, #afafb9 25%, transparent 25%, transparent 75%, #afafb9 75%, #afafb9), repeating-linear-gradient(45deg, #afafb9 25%, #ffffff 25%, #ffffff 75%, #afafb9 75%, #afafb9); - background-position: 0 0, 22rpx 22rpx; - background-size: 44rpx 22rpx; + background-position: 0 0, 11px 11px; + background-size: 22px 22px; .menu-name background-color rgba(0, 239, 48, 0.8) .bg_texture_2, .bg_texture_5 - background: radial-gradient(circle, transparent 20%, #ffffff 20%, #ffffff 80%, transparent 80%, transparent), radial-gradient(circle, transparent 20%, #ffffff 20%, #ffffff 80%, transparent 80%, transparent) 27.5rpx 27.5rpx, linear-gradient(#afafb9 4rpx, transparent 4rpx) 0 -4rpx, linear-gradient(90deg, #afafb9 4rpx, #ffffff 4rpx) -4rpx 0; - background-size: 55rpx 55rpx, 55rpx 55rpx, 27.5rpx 27.5rpx, 27.5rpx 27.5rpx; + background: radial-gradient(circle, transparent 20%, #ffffff 20%, #ffffff 80%, transparent 80%, transparent), radial-gradient(circle, transparent 20%, #ffffff 20%, #ffffff 80%, transparent 80%, transparent) 13.5px 13.5px, linear-gradient(#afafb9 2px, transparent 2px) 0 -2px, linear-gradient(90deg, #afafb9 2px, #ffffff 2px) -2px 0; + background-size: 27.5px 27.5px, 27.5px 27.5px, 13.75px 13.75px, 13.75px 13.75px; .menu-name background-color rgba(255, 189, 45, 0.8) .bg_texture_4 @@ -150,25 +150,25 @@ display flex justify-content center align-items center - _wh(200rpx, 200rpx) - padding 20rpx - border-radius 40rpx - _font(40rpx, 50rpx, #fff,bold,center) + _wh(100px, 100px) + padding 10px + border-radius 20px + _font(20px, 25px, #fff,bold,center) background-color rgba(0,166,255,0.8) .bill_count position absolute - top -20rpx - right -20rpx - _wh(60rpx, 60rpx) + top -10px + right -10px + _wh(30px, 30px) background-color $red border-radius 50% - _font(40rpx, 60rpx, #fff,bold,center) - box-shadow 6rpx 6rpx 2rpx 2rpx rgba(0,0,0,.3) + _font(20px, 30px, #fff,bold,center) + box-shadow 3px 3px 1px 1px rgba(0,0,0,.3) .left_bg position absolute left 0 top 0 - _wh(50rpx, 100%) + _wh(25px, 100%) _bis(,'../../static/images/hud_left.png', 100%, ,center) .right_bg left auto diff --git a/pages/login/login.vue b/pages/login/login.vue index 49edc87..1e7ff20 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -12,13 +12,13 @@ - + - + @@ -26,7 +26,7 @@ - + @@ -37,20 +37,20 @@