diff --git a/yifengdian-company-report/src/router/index.js b/yifengdian-company-report/src/router/index.js index 6c6e59e..dbe5a58 100644 --- a/yifengdian-company-report/src/router/index.js +++ b/yifengdian-company-report/src/router/index.js @@ -12,11 +12,24 @@ const router = new VueRouter({ }) //全局路由守卫 router.beforeEach((to,from,next)=>{ - console.log(to,from); - next() + if(to.fullPath=="/vegetableDetails"){ + if(from.fullPath=="/login"){ + console.log("155"); + next() + } + else( + + next("/login") + ) + } + else{ + next() + } + }) router.afterEach((to,from)=>{ console.log(to,from); }) + export default router diff --git a/yifengdian-company-report/src/views/bazaar.vue b/yifengdian-company-report/src/views/bazaar.vue index 8152db2..8dedd41 100644 --- a/yifengdian-company-report/src/views/bazaar.vue +++ b/yifengdian-company-report/src/views/bazaar.vue @@ -86,64 +86,8 @@ export default { showDate: false, currentDate: null, priceList: [ - { - name: '哇啊哇擦哇啊哇擦哇啊哇擦哇啊哇擦', - price: 100, - old: '1.1' - }, - { - name: '土豆', - price: 100, - old: '1.1' - }, - { - name: '土豆', - price: 100, - old: '1.1' - }, - { - name: '土豆', - price: 100, - old: '1.1' - }, { - name: '土豆', - price: 100, - old: '1.1' - }, { - name: '土豆', - price: 100, - old: '1.1' - }, { - name: '土豆', - price: 100, - old: '1.1' - }, { - name: '土豆', - price: 100, - old: '1.1' - }, { - name: '土豆', - price: 100, - old: '1.1' - }, { - name: '土豆', - price: 100, - old: '1.1' - }, { - name: '土豆', - price: 100, - old: '1.1' - }, { - name: '土豆', - price: 100, - old: '1.1' - }, { - name: '土豆', - price: 100, - old: '1.1' - }, ], - collectList: ['白菜', '白菜', '白菜', '白菜', '白菜', '白菜', '豆角', '西红柿', '西红柿', '黄瓜', '茄子', '洋葱', '彩椒'], + collectList: [], closeable: false, showAdd: false, checked: [], diff --git a/yifengdian-company-report/src/views/policy.vue b/yifengdian-company-report/src/views/policy.vue index c0c7bcf..7505bd1 100644 --- a/yifengdian-company-report/src/views/policy.vue +++ b/yifengdian-company-report/src/views/policy.vue @@ -34,16 +34,6 @@ export default { return { searchKey: '', policyList: [ - { - title: "市农业农村局开展智慧农业、设施农业建设工作指导", - source: "青岛市人民政府", - date: "2024-03-14" - }, - { - title: "青岛市人民政府关于强龙头补链条兴业态树品牌加快推进农业产业化发展的意见", - source: "青岛市人民政府", - date: "2020-12-18" - } ] }; }, diff --git a/yifengdian-company-report/src/views/policyDetails.vue b/yifengdian-company-report/src/views/policyDetails.vue index 10be404..015ead8 100644 --- a/yifengdian-company-report/src/views/policyDetails.vue +++ b/yifengdian-company-report/src/views/policyDetails.vue @@ -33,10 +33,7 @@ placeOrgName: null, password: null, collection:false, - ArrayList:{title:"青岛市人民政府关于强龙头补链条兴业态树品牌加快推进农业产业化发展的意见", - source: "青岛市人民政府", - date: "2024-03-14", - context:" 各区、市人民政府,青岛西海岸新区管委,市 政府各部门,市直各单位: 为深入贯彻党的二十 大关于加快建设农业强国的部署要" + ArrayList:{ } }; }, diff --git a/yifengdian-company-report/src/views/vegetable.vue b/yifengdian-company-report/src/views/vegetable.vue index b43b2ff..38db59e 100644 --- a/yifengdian-company-report/src/views/vegetable.vue +++ b/yifengdian-company-report/src/views/vegetable.vue @@ -9,9 +9,10 @@
{{ item.placeOrgName }}
-
种植时间: {{ item.growTime }}
-
上市时间: {{ item.marketTime }}
-
产量(吨): {{ item.output }}
+
种植时间:{{ item.growTime }}
+
上市时间:{{ item.marketTime }}
+
产量(吨):{{item.output}}
+