diff --git a/yifengdian-company-report/package.json b/yifengdian-company-report/package.json index 1c9f9d9..89e2a66 100644 --- a/yifengdian-company-report/package.json +++ b/yifengdian-company-report/package.json @@ -32,7 +32,8 @@ "less": "^4.0.0", "less-loader": "^8.0.0", "vue-template-compiler": "^2.6.14", - "vue-seamless-scroll": "^1.1.23" + "vue-seamless-scroll": "^1.1.23", + "dayjs": "^1.11.7" }, "eslintConfig": { "root": true, diff --git a/yifengdian-company-report/src/assets/css/index.less b/yifengdian-company-report/src/assets/css/index.less index 723808e..5017523 100644 --- a/yifengdian-company-report/src/assets/css/index.less +++ b/yifengdian-company-report/src/assets/css/index.less @@ -156,6 +156,9 @@ body #app { &-right4{ margin-right: 4px; } + &-right15{ + margin-right: 15px; + } } .p-18{ diff --git a/yifengdian-company-report/src/assets/images/icons/collect2.png b/yifengdian-company-report/src/assets/images/icons/collect2.png new file mode 100644 index 0000000..d274ff5 Binary files /dev/null and b/yifengdian-company-report/src/assets/images/icons/collect2.png differ diff --git a/yifengdian-company-report/src/router/router_modular/index.js b/yifengdian-company-report/src/router/router_modular/index.js index 3732267..b546b64 100644 --- a/yifengdian-company-report/src/router/router_modular/index.js +++ b/yifengdian-company-report/src/router/router_modular/index.js @@ -1,3 +1,4 @@ +import { title } from 'vue-carousel-3d' const router_modular = [ { @@ -18,18 +19,27 @@ const router_modular = [ { path: '/home', name: 'home', - component: () => import(/* webpackChunkName: "about" */ '@/views/home.vue') + component: () => import(/* webpackChunkName: "about" */ '@/views/home.vue'), + title:'首页' }, { path: '/vegetable', name: 'vegetable', - component: () => import(/* webpackChunkName: "about" */ '@/views/vegetable.vue') + component: () => import(/* webpackChunkName: "about" */ '@/views/vegetable.vue'), + title:'移风菜篮子' }, { path: '/bazaar', name: 'bazaar', - component: () => import(/* webpackChunkName: "about" */ '@/views/bazaar.vue') + component: () => import(/* webpackChunkName: "about" */ '@/views/bazaar.vue'), + title:'今日市场' }, + { + path: '/policy', + name: 'policy', + component: () => import(/* webpackChunkName: "about" */ '@/views/policy.vue'), + title:'政策资讯' + } ] export default router_modular \ No newline at end of file diff --git a/yifengdian-company-report/src/views/bazaar.vue b/yifengdian-company-report/src/views/bazaar.vue index 8d80189..2802b20 100644 --- a/yifengdian-company-report/src/views/bazaar.vue +++ b/yifengdian-company-report/src/views/bazaar.vue @@ -2,7 +2,7 @@
+
+
+ + 收藏品种 + + +
+
+ {{ item + }} +
+
+ + {{item}} +
@@ -48,7 +64,7 @@ export default { return { searchKey: null, showDate: false, - currentDate: new Date(), + currentDate: null, priceList: [ { name: '哇啊哇擦哇啊哇擦哇啊哇擦哇啊哇擦', @@ -106,7 +122,11 @@ export default { price: 100, old: '1.1' }, - ] + ], + collectList: ['白菜', '白菜', '白菜', '白菜', '白菜', '白菜', '豆角', '西红柿', '西红柿', '黄瓜', '茄子', '洋葱', '彩椒'], + closeable: false, + showAdd:false, + checked:[] }; }, created() { @@ -134,9 +154,18 @@ export default { } }, 1000); }, - handelCLickConfirmDate() { + handelCLickConfirmDate(val) { this.currentDate = this.$dayjs(val).format('YYYY-MM-DD'); this.showDate = false; + }, + handelClickClose(val) { + console.log(val); + }, + handelClickAddCollect(){ + this.showAdd = true; + }, + handelClickDelCollect() { + this.closeable = true; } }, components: {}, @@ -161,6 +190,9 @@ export default { border-radius: 17px; width: 100%; position: relative; + padding: 0 10px; + box-sizing: border-box; + font-size: 14px; &::after { content: ''; @@ -224,4 +256,31 @@ export default { width: calc(100% - 20px); margin: 0 auto; } + +.collect { + background-color: #ffffff; + width: 100%; + font-family: pingfang-bold; + font-size: 17px; + padding: 15px 0 15px 10px; + box-sizing: border-box; + + img { + width: 20px; + height: 20px; + } + + span { + margin: 0 16px 0 6px; + } + + .tags { + margin-top: 10px; + } +} + +:deep(.van-tag) { + font-family: none; + margin-top: 8px !important; +} diff --git a/yifengdian-company-report/src/views/home.vue b/yifengdian-company-report/src/views/home.vue index 465518c..41aba2d 100644 --- a/yifengdian-company-report/src/views/home.vue +++ b/yifengdian-company-report/src/views/home.vue @@ -69,7 +69,7 @@
政策资讯 - 更多 + 更多
diff --git a/yifengdian-company-report/src/views/policy.vue b/yifengdian-company-report/src/views/policy.vue new file mode 100644 index 0000000..57b4f36 --- /dev/null +++ b/yifengdian-company-report/src/views/policy.vue @@ -0,0 +1,37 @@ + + + + +