diff --git a/App.vue b/App.vue index 746ec55..e9039ba 100644 --- a/App.vue +++ b/App.vue @@ -2,7 +2,7 @@ export default { onLaunch: function() { // #ifdef APP-PLUS - plus.screen.lockOrientation('portrait-primary'); + plus.screen.lockOrientation('landscape-primary'); plus.navigator.setFullscreen(true); // #endif }, @@ -11,7 +11,7 @@ }, onUnload() { // #ifdef APP-PLUS - plus.screen.lockOrientation('portrait-primary'); + plus.screen.lockOrientation('landscape-primary'); // #endif } } diff --git a/common/style/iconfont.css b/common/style/iconfont.css index 69dbd73..853a524 100644 --- a/common/style/iconfont.css +++ b/common/style/iconfont.css @@ -12,48 +12,48 @@ -moz-osx-font-smoothing: grayscale; } .delete_icon { - width: 40rpx; - height: 40rpx; - font-size: 40rpx; - line-height: 40rpx; + width: 30px; + height: 35px; + font-size: 20px; + line-height: 35px; color: #bbb; } .delete_icon::after { content: '\e632'; } .eye_colse_icon { - width: 40rpx; - height: 40rpx; - font-size: 40rpx; - line-height: 40rpx; + width: 30px; + height: 35px; + font-size: 20px; + line-height: 35px; color: #bbb; } .eye_colse_icon::after { content: '\e7b2'; } .eye_open_icon { - width: 40rpx; - height: 40rpx; - font-size: 40rpx; - line-height: 40rpx; - color: #bbb; + width: 30px; + height: 35px; + font-size: 20px; + line-height: 35px; + color: #D7592F; } .eye_open_icon::after { - content: '\e7b2'; + content: '\e60a'; } .scan_icon { - width: 80rpx; - height: 80rpx; - font-size: 70rpx; - line-height: 80rpx; + width: 30px; + height: 30px; + font-size: 30px; + line-height: 35px; color: #D7592F; } .scan_icon::after { content: '\e607'; } .icon-check { - width: 44rpx; - height: 44rpx; + width: 30px; + height: 30px; background-color: #fff; border-radius: 50%; margin: 0 auto; diff --git a/common/style/layout.css b/common/style/layout.css index 1cdb0db..0f5c12b 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -18,30 +18,30 @@ uni-button:after { background-color: #f5f5f5; } .search-confirm-wrap { - width: calc(100% - 60rpx); + width: calc(100% - 30px); background-color: #fff; - margin: 30rpx auto; - border-radius: 12rpx; - padding-bottom: 30rpx; + margin: 15px auto; + border-radius: 12px; + padding-bottom: 15px; } .search-wrap{ display: flex; flex-wrap: wrap; justify-content: space-between; width: 100%; - padding: 0 30rpx; + padding: 0 15px; } .search-item{ display: flex; justify-content: space-between; width: 48%; - margin-top: 30rpx; + margin-top: 15px; } .search-label{ - width: 160rpx; - height: 86rpx; - font-size: 32rpx; - line-height: 86rpx; + width: 70px; + height: 35px; + font-size: 16px; + line-height: 35px; color: #323232; text-align: justify; text-align-last: justify; @@ -54,58 +54,51 @@ uni-button:after { visibility: hidden; } .filter_input_wraper { - width: calc(100% - 200rpx); - height: 86rpx; - line-height: 86rpx; -} -.uni-select { - font-size: 32rpx !important; - height: 86rpx !important; -} -.uni-select__input-placeholder { - font-size: 32rpx !important; + width: calc(100% - 100px); + height: 35px; + line-height: 35px; } .search-input{ - width: calc(100% - 200rpx); - height: 86rpx; - line-height: 86rpx; - font-size: 32rpx; + width: calc(100% - 10px); + height: 35px; + line-height: 35px; + font-size: 14px; color: #606266; border: 1px solid #d1d1d1; - border-radius: 8rpx; - text-indent: 40rpx; + border-radius: 4px; + text-indent: 10px; } .search-input-l { width: 100%; - height: 86rpx; - line-height: 86rpx; - font-size: 32rpx; + height: 35px; + line-height: 35px; + font-size: 14px; color: #606266; border: 1px solid #d1d1d1; - border-radius: 8rpx; - text-indent: 40rpx; - padding-right: 30rpx; + border-radius: 4px; + text-indent: 10px; + padding-right: 10px; } .confirm-button-wrap{ display: flex; justify-content: flex-end; width: 100%; - height: 86rpx; - line-height: 86rpx; - margin-top: 30rpx; - padding: 0 30rpx; + height: 35px; + line-height: 35px; + margin-top: 15px; + padding: 0 15px; } .confirm-button{ - margin-left: 30rpx !important; + margin-left: 15px !important; margin-right: 0 !important; background-color: #D7592F; color: #fff; - line-height: 86rpx; + line-height: 35px; } .grid-wrap{ width: 100%; - height: calc(100% - 410rpx); /** 88+ 30*5+ 86*2 */ - padding: 0 30rpx 30rpx 30rpx; + height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */ + padding: 0 15px 15px 15px; overflow-y: scroll; } .grid-table{ @@ -116,55 +109,55 @@ uni-button:after { text-align: center; } .grid-table thead tr th{ - font-size: 26rpx; - line-height: 86rpx; - padding: 0 10rpx; + font-size: 15px; + line-height: 35px; + padding: 0 5px; background-color: #e1e1e1; } .grid-table thead tr th:first-child{ - border-top-left-radius: 12rpx; + border-top-left-radius: 12px; } .grid-table thead tr th:last-child{ - border-top-right-radius: 12rpx; + border-top-right-radius: 12px; } .grid-table th, .grid-table td { color: #464646; background-color: #fff; - border-right: 2rpx solid #e1e1e1; - border-bottom: 2rpx solid #e1e1e1; + border-right: 1px solid #e1e1e1; + border-bottom: 1px solid #e1e1e1; } .grid-table th:first-child, .grid-table td:first-child{ - border-left: 2rpx solid #e1e1e1; + border-left: 1px solid #e1e1e1; } .grid-table td { - height: 88rpx; - line-height: 44rpx; - font-size: 24rpx; - padding: 0 10rpx; + height: 35px; + line-height: 35px; + font-size: 15px; + padding: 0 5px; } .status-wrap { width: 48%; - height: 86rpx; - padding: 0 30rpx; + height: 35px; + padding: 0 15px; display: flex; justify-content: flex-end; align-items: center; - margin-top: 30rpx; + margin-top: 15px; } .status-item { display: flex; align-items: center; - margin-left: 20rpx; + margin-left: 10px; } .status-icon { - width: 40rpx; - height: 40rpx; - border-radius: 4rpx; - margin-right: 10rpx; + width: 20px; + height: 20px; + border-radius: 4px; + margin-right: 10px; } .status-txt { - font-size: 32rpx; - line-height: 86rpx; + font-size: 16px; + line-height: 35px; color: #323232; } .bg-gray { @@ -185,36 +178,36 @@ uni-button:after { justify-content: flex-start; align-content: flex-start; align-items: flex-start; - width: calc(100% - 60rpx); - height: calc(100% - 324rpx);/** 88+30*4+86 */ - margin: 30rpx auto; - padding: 30rpx 30rpx 0 30rpx; + width: calc(100% - 30px); + height: calc(100% - 137px);/** 42+15*4+35 */ + margin: 15px auto; + padding: 15px 15px 0 15px; overflow-y: auto; background-color: #fff; - border-radius: 12rpx; + border-radius: 12px; } .material-item { width: 8.2%; margin-right: 2%; - margin-bottom: 30rpx; - padding: 15rpx 15rpx; - border-radius: 12rpx; + margin-bottom: 15px; + padding: 5px; + border-radius: 12px; } .material-item:nth-child(10n) { margin-right: 0; } .material-title { - font-size: 32rpx; - line-height: 45rpx; - height: 45rpx; + font-size: 16px; + line-height: 35px; + height: 35px; text-align: center; color: #fff; overflow: hidden; } .material-spec { - font-size: 32rpx; - line-height: 45rpx; - height: 90rpx; + font-size: 16px; + line-height: 26px; + height: 52px; text-align: center; color: #fff; overflow: hidden; diff --git a/components/NavBar.vue b/components/NavBar.vue index bf6a22d..f37979e 100644 --- a/components/NavBar.vue +++ b/components/NavBar.vue @@ -52,20 +52,20 @@ @import '@/common/style/mixin.styl'; .header _fj() - _wh(100%, 88rpx) + _wh(100%, 42px) background-color $red z-index 200 - padding 0 20rpx + padding 0 15px .page_name - _font(32rpx, 32rpx, #fff,700,center) + _font(16px, 20px, #fff,700,center) .icon_back { - font-size: 52rpx; - line-height: 52rpx; + font-size: 30px; + line-height: 30px; color: #fff; } .icon_home { - font-size: 52rpx; - line-height: 52rpx; + font-size: 30px; + line-height: 30px; color: #fff; } diff --git a/components/SearchBox.vue b/components/SearchBox.vue index a4121e0..7d4172e 100644 --- a/components/SearchBox.vue +++ b/components/SearchBox.vue @@ -99,30 +99,29 @@ @import '../common/style/mixin.styl'; .search_wraper position relative - _wh(100%, 86rpx) + _wh(100%, 35px) .search_input - padding-right: 160rpx border 1px solid #e5e5e5 border-radius 4px - height: 86rpx; - line-height: 86rpx; + height: 35px; + line-height: 35px; padding-left 10px; - padding-right 150rpx; - font-size: 32rpx; + padding-right 100px; + font-size: 14px; color: #6a6a6a .buttons_wraper _fj() position absolute top 0 right 0 - _wh(auto, 86rpx) + _wh(auto, 35px) .icon-del - _wh(50rpx, 86rpx) - _font(40rpx,86rpx,#6a6a6a,,center) + _wh(30px, 35px) + _font(30px,35px,#6a6a6a,,center) .icon_scan - _wh(50rpx, 86rpx) - _font(40rpx,86rpx,#6a6a6a,,center) + _wh(30px, 35px) + _font(30px,35px,#6a6a6a,,center) .icon_search - _wh(50rpx, 86rpx) - _font(40rpx,86rpx,#6a6a6a,,center) + _wh(30px, 35px) + _font(30px,35px,#6a6a6a,,center) diff --git a/pages/home/home.vue b/pages/home/home.vue index d7e7cc1..a993931 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -73,26 +73,26 @@ flex-direction column .header _fj() - _wh(100%,88rpx) + _wh(100%,42px) background-color $red .header-item - width calc(50% - 20rpx) + width calc(50% - 30px) padding 0 10px .header-user - _font(32rpx, 88rpx, #fff,,) + _font(16px, 42px, #fff,,) .header-r _fj(flex-end) /deep/ .header-r uni-button margin-right 0 .header-button - _wh(160rpx, 60rpx) - _font(32rpx,60rpx,#333,,) + _wh(auto, 34px) + _font(16px,34px,#333,,) .nav-wrapper - _wh(calc(100% - 60rpx),calc(100% - 148rpx)) + _wh(calc(100% - 15px),calc(100% - 72px)) padding 0 20% background-color #fff - border-radius 12rpx - margin 30rpx auto + border-radius 12px + margin 15px auto .nav-wrap _fj(flex-start) align-content center @@ -101,13 +101,13 @@ .nav-item _fj(center) align-items center - _wh(30%,200rpx) - border-radius 20rpx + _wh(30%,82px) + border-radius 12px border 10px solid #acbec6 - margin 15rpx 5% 15rpx 0 + margin 15px 5% 15px 0 .nav-item:nth-child(3n) margin-right 0 .nav-text - _font(40rpx, 60rpx, #333,,) - letter-spacing: 4rpx + _font(18px, 42px, #333,,) + letter-spacing: 2px diff --git a/pages/login/login.vue b/pages/login/login.vue index f270e14..d65da15 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -158,13 +158,13 @@ overflow hidden .login_tab position relative - height 100rpx + height 35px border-bottom 1px solid #E2E2E2 - margin-bottom 40rpx + margin-bottom 15px .login_tab_item float left width 50% - _font(32rpx,100rpx,#444444,,center) + _font(16px,35px,#444444,,center) cursor pointer .login_tab_line position absolute @@ -185,31 +185,31 @@ .inputOuter position relative width 100% - margin 40rpx auto + margin 15px auto .inputStyle - _wh(100%,80rpx) - _font(30rpx,80rpx,#999,,) - text-indent 20rpx + _wh(100%,35px) + _font(16px,35px,#999,,) + text-indent 10px border-bottom 1px solid #E2E2E2 box-sizing border-box .login_icon position absolute - top 20rpx - right 20rpx + top 0 + right 10px .submit width 100% - margin 40rpx auto + margin 15px auto text-align center .primary-button - _wh(100%, 80rpx) + _wh(100%, 35px) background-color #d7592f - border-radius 80rpx - _font(32rpx,80rpx,#fff,,center) + border-radius 35px + _font(16px,35px,#fff,,center) .scanBox _fj() flex-direction column .san_text - _font(32rpx,1,#D7592F,,center) + _font(16px,24px,#D7592F,,center) .drift transition left .3s linear diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue index 1e25df5..bae4cae 100644 --- a/pages/management/hcxcheck.vue +++ b/pages/management/hcxcheck.vue @@ -75,7 +75,7 @@ .search-wrap width 48% .search-item - width calc(100% - 250rpx) + width calc(100% - 120px) .confirm-button-wrap width auto justify-content flex-start diff --git a/pages/management/outscanerror.vue b/pages/management/outscanerror.vue index e8f60ff..be8714a 100644 --- a/pages/management/outscanerror.vue +++ b/pages/management/outscanerror.vue @@ -68,7 +68,7 @@ options1: [], index1: '', val1: '', - dataList: [{instruct_uuid: '1'}], + dataList: [{instruct_uuid: '1', instructorder_no: '000dfj'}], pkId: '', disabled: false };