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;"> -