diff --git a/common/style/layout.css b/common/style/layout.css index 19096a6..b5ea470 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -63,4 +63,108 @@ uni-button:after { } .scan_icon::after { content: '\e607'; +} + +.content{ + /* display: flex; */ + width: 100%; + height: 100%; + background-color: #fff;/* + justify-content: space-between; + align-items: flex-start; */ +} +.search-wrap{ + display: flex; + flex-wrap: wrap; + justify-content: space-between; + width: 100%; + padding: 0 30rpx; +} +.search-item{ + display: flex; + justify-content: space-between; + width: 48%; + margin-top: 30rpx; +} +.search-label{ + width: 160rpx; + height: 90rpx; + font-size: 32rpx; + line-height: 90rpx; + color: #323232; + text-align: justify; + text-align-last: justify; +} +.search-label::after { + display: inline-block; + content: ''; + width: 100%; + height: 0; + visibility: hidden; +} +.search-input{ + width: calc(100% - 200rpx); + height: 86rpx; + line-height: 86rpx; + font-size: 32rpx; + color: #606266; + border: 1px solid #d1d1d1; + border-radius: 8rpx; + text-indent: 40rpx; +} +.confirm-button-wrap{ + display: flex; + justify-content: flex-end; + width: 100%; + height: 86rpx; + line-height: 86rpx; + margin-top: 30rpx; + padding: 0 30rpx; +} +.confirm-button{ + margin-left: 30rpx !important; + margin-right: 0 !important; + background-color: #D7592F; + color: #fff; + line-height: 86rpx; +} +.grid-wrap{ + width: 100%; + height: calc(100% - 324rpx); /** 88+ 30+ 90 + 30+ 86*/ + padding: 30rpx; + overflow-y: scroll; +} +.grid-table{ + width: 100%; + border-collapse: separate; + border-spacing: 0; + border: 1px #e1e1e1; + text-align: center; +} +.grid-table thead tr th{ + font-size: 26rpx; + line-height: 86rpx; + padding: 0 10rpx; + background-color: #e1e1e1; +} +.grid-table thead tr th:first-child{ + border-top-left-radius: 12rpx; +} +.grid-table thead tr th:last-child{ + border-top-right-radius: 12rpx; +} +.grid-table th, .grid-table td { + color: #464646; + background-color: #fff; + border-right: 2rpx solid #e1e1e1; + border-bottom: 2rpx solid #e1e1e1; +} +.grid-table th:first-child, .grid-table td:first-child{ + border-left: 2rpx solid #e1e1e1; +} +.grid-table td { + height: 88rpx; + line-height: 44rpx; + font-size: 24rpx; + padding: 0 10rpx; } \ No newline at end of file diff --git a/components/NavBar.vue b/components/NavBar.vue new file mode 100644 index 0000000..bf6a22d --- /dev/null +++ b/components/NavBar.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/pages.json b/pages.json index 125fad2..1520aea 100644 --- a/pages.json +++ b/pages.json @@ -11,6 +11,12 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/management/inscanerror", + "style": { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/home/home.vue b/pages/home/home.vue index d63ac74..71ebd5b 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -10,7 +10,7 @@ - 入箱扫码异常 + 入箱扫码异常 出箱扫码异常 diff --git a/pages/management/inscanerror.vue b/pages/management/inscanerror.vue new file mode 100644 index 0000000..cf34117 --- /dev/null +++ b/pages/management/inscanerror.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf index 9cb8c81..e2aaf3a 100644 Binary files a/static/iconfont/iconfont.ttf and b/static/iconfont/iconfont.ttf differ diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff index f8f3232..424bb12 100644 Binary files a/static/iconfont/iconfont.woff and b/static/iconfont/iconfont.woff differ diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2 index 86a8359..f17404c 100644 Binary files a/static/iconfont/iconfont.woff2 and b/static/iconfont/iconfont.woff2 differ