diff --git a/App.vue b/App.vue index 4555a00..87d0b45 100644 --- a/App.vue +++ b/App.vue @@ -16,6 +16,5 @@ @import "/style/css/layout.css"; @import "style/css/main.css"; @import "style/css/flex-main.css"; - @import "/wxcomponents/vant/dist/common/index.wxss"; @import "/style/iconfont.css"; diff --git a/components/head-view/head-view.vue b/components/head-view/head-view.vue index 72b652a..cf23a84 100644 --- a/components/head-view/head-view.vue +++ b/components/head-view/head-view.vue @@ -27,6 +27,7 @@ .headInfo { position: relative; background-color: #fff; + border-bottom: 1px solid #999999; height: 40px; line-height: 40px; font-size: 18px; @@ -39,4 +40,4 @@ } } - + \ No newline at end of file diff --git a/main.js b/main.js index 2759725..7628154 100644 --- a/main.js +++ b/main.js @@ -23,6 +23,7 @@ Vue.component('uni-pop', uniPop) Vue.component('liu-step-bar', liuStepBar) import Vant from 'vant'; +console.log(Vant) import 'vant/lib/index.less'; Vue.use(Vant); import { @@ -32,7 +33,8 @@ import { Uploader, Field, Checkbox, - CheckboxGroup + CheckboxGroup, + Progress } from 'vant'; Vue.use(Radio); diff --git a/package-lock.json b/package-lock.json index 720f4a7..003bc7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -256,7 +256,7 @@ }, "node_modules/vant": { "version": "2.12.54", - "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.54.tgz", + "resolved": "https://registry.npmmirror.com/vant/-/vant-2.12.54.tgz", "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==", "dependencies": { "@babel/runtime": "7.x", diff --git a/pages.json b/pages.json index aca85b6..5fa9cd2 100644 --- a/pages.json +++ b/pages.json @@ -12,6 +12,12 @@ "navigationBarTitleText": "指令" } }, + { + "path": "pages/index/instructDetails", + "style": { + "navigationBarTitleText": "货物详情" + } + }, { "path": "pages/discharge/index", "style": { diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue index 91d0d39..477fde0 100644 --- a/pages/index/instruct.vue +++ b/pages/index/instruct.vue @@ -1,6 +1,7 @@