diff --git a/yifengdian-company-report/src/api/test.js b/yifengdian-company-report/src/api/test.js index 3408288..ff1bda1 100644 --- a/yifengdian-company-report/src/api/test.js +++ b/yifengdian-company-report/src/api/test.js @@ -1,10 +1,12 @@ import http from '../utils/http' +import request from '../utils/request' // /** * @parms resquest 请求地址 例如:http://197.82.15.15:8088/request/... * @param '/testIp'代表vue-cil中config,index.js中配置的代理 */ - +const baseUrl = + process.env.NODE_ENV === "development" ? "" : config.baseUrl.pro; // get请求 const testApi = { getListAPI(params) { @@ -15,3 +17,19 @@ const testApi = { } } export default testApi +export function prcCollectionListForGov (params) { + return request({ + url: '/api/PartyApi/PrcCollectionListForGov', + method: 'post', + data: params, + params + }) + } + +export function getVegetableOutputList (params) { + return request({ + url: '/api/resi/partymember/screenenterpriseoutput/yifengScreen/getVegetableOutputList', + method: 'GET', + params + }) + } \ No newline at end of file diff --git a/yifengdian-company-report/src/assets/css/index.less b/yifengdian-company-report/src/assets/css/index.less index 5017523..7b44320 100644 --- a/yifengdian-company-report/src/assets/css/index.less +++ b/yifengdian-company-report/src/assets/css/index.less @@ -99,6 +99,10 @@ body #app { &1{ flex: 1; } + + &-x{ + flex-direction: row; +} &-y{ flex-direction: column; } diff --git a/yifengdian-company-report/src/main.js b/yifengdian-company-report/src/main.js index 3cb8ec9..1b9214a 100644 --- a/yifengdian-company-report/src/main.js +++ b/yifengdian-company-report/src/main.js @@ -8,8 +8,11 @@ import 'vant/lib/index.css'; import axios from 'axios'; import '@/assets/css/index.less' import scroll from 'vue-seamless-scroll'; //滚动 +import Moment from 'moment' import dayjs from 'dayjs' Vue.prototype.$dayjs = dayjs +Moment.locale('zh-cn') +Vue.prototype.$moment = Moment Vue.use(scroll) Vue.use(Vant); diff --git a/yifengdian-company-report/src/router/router_modular/index.js b/yifengdian-company-report/src/router/router_modular/index.js index b546b64..1c0f856 100644 --- a/yifengdian-company-report/src/router/router_modular/index.js +++ b/yifengdian-company-report/src/router/router_modular/index.js @@ -1,4 +1,4 @@ -import { title } from 'vue-carousel-3d' + const router_modular = [ { @@ -39,7 +39,14 @@ const router_modular = [ name: 'policy', component: () => import(/* webpackChunkName: "about" */ '@/views/policy.vue'), title:'政策资讯' + }, + { + path: '/policyDetails', + name: 'policyDetails', + component: () => import(/* webpackChunkName: "about" */ '@/views/policyDetails.vue'), + title:'政策资讯' } + ] export default router_modular \ No newline at end of file diff --git a/yifengdian-company-report/src/utils/request.js b/yifengdian-company-report/src/utils/request.js index 168c6be..693c834 100644 --- a/yifengdian-company-report/src/utils/request.js +++ b/yifengdian-company-report/src/utils/request.js @@ -3,9 +3,7 @@ import axios from 'axios' import config from '@/config/index'; const baseUrl = - process.env.NODE_ENV === 'development' - ? config.baseUrl.dev - : config.baseUrl.pro; + process.env.NODE_ENV === "development" ? "" : config.baseUrl.pro; //1. 创建新的axios实例, const service = axios.create({ // 公共接口--这里注意后面会讲 diff --git a/yifengdian-company-report/src/views/home.vue b/yifengdian-company-report/src/views/home.vue index 41aba2d..35efdcd 100644 --- a/yifengdian-company-report/src/views/home.vue +++ b/yifengdian-company-report/src/views/home.vue @@ -27,8 +27,8 @@ :key="'vegetable' + index" style="padding: 0 26px;"> -
{{ item.name }}
-
{{ item.num }} +
{{ item.vegetableCategory }}
+
{{ item.output }}
@@ -55,10 +55,14 @@
-
{{ item.name }}
+
{{ item.Name }}
{{ item.price }}
-
{{ item.old }}
+
{{ item.jzrPrice }} + +
+
@@ -69,7 +73,8 @@
政策资讯 - 更多 + 更多
@@ -87,11 +92,29 @@
- diff --git a/yifengdian-company-report/src/views/policy.vue b/yifengdian-company-report/src/views/policy.vue index 57b4f36..c73e9b2 100644 --- a/yifengdian-company-report/src/views/policy.vue +++ b/yifengdian-company-report/src/views/policy.vue @@ -1,19 +1,34 @@ @@ -21,17 +36,27 @@ export default { data() { return { - searchKey:'', + searchKey: '', + dataArray: [ + { + title: "市农业农村局开展智慧农业、设施农业建设工作指导", + source: "青岛市人民政府", + date: "2024-03-14" + }, + { + title: "青岛市人民政府关于强龙头补链条兴业态树品牌加快推进农业产业化发展的意见", + source: "青岛市人民政府", + date: "2020-12-18" + } + ] }; }, - created() {}, + created() { }, methods: {}, - components:{}, - computed:{}, + components: {}, + computed: {}, watch: {}, } - + diff --git a/yifengdian-company-report/src/views/policyDetails.vue b/yifengdian-company-report/src/views/policyDetails.vue new file mode 100644 index 0000000..7178477 --- /dev/null +++ b/yifengdian-company-report/src/views/policyDetails.vue @@ -0,0 +1,109 @@ + + + + + + \ No newline at end of file diff --git a/yifengdian-company-report/yarn.lock b/yifengdian-company-report/yarn.lock index bf661ef..9c2d2bd 100644 --- a/yifengdian-company-report/yarn.lock +++ b/yifengdian-company-report/yarn.lock @@ -2336,6 +2336,11 @@ compression@^1.7.4: safe-buffer "5.1.2" vary "~1.1.2" +comutils@^1.1.9: + version "1.1.19" + resolved "https://registry.npmmirror.com/comutils/-/comutils-1.1.19.tgz#3e07f306abf48e83726511713a72b20565034443" + integrity sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw== + concat-map@0.0.1: version "0.0.1" resolved "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -2575,6 +2580,11 @@ csso@^4.2.0: dependencies: css-tree "^1.1.2" +dayjs@^1.11.7: + version "1.11.11" + resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e" + integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg== + de-indent@^1.0.2: version "1.0.2" resolved "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" @@ -5903,6 +5913,13 @@ vue-router@^3.5.1: resolved "https://registry.npmmirror.com/vue-router/-/vue-router-3.5.4.tgz#c453c0b36bc75554de066fefc3f2a9c3212aca70" integrity sha512-x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ== +vue-seamless-scroll@^1.1.23: + version "1.1.23" + resolved "https://registry.npmmirror.com/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz#dde81b3c79aa499791b3c3bffd0fdb22ff3e59a7" + integrity sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA== + dependencies: + comutils "^1.1.9" + vue-style-loader@^4.1.0, vue-style-loader@^4.1.3: version "4.1.3" resolved "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"