diff --git a/config/index.js b/config/index.js index 39b66d2d..91e8a9e7 100644 --- a/config/index.js +++ b/config/index.js @@ -12,7 +12,7 @@ module.exports = { proxyTable: { "/dev-api": { // 请求的目标主机 - target: 'http://192.168.31.107/api', + target: 'http://116.255.135.38:8081/nsgk_test/', changeOrigin: true, pathRewrite: { '^/dev-api': '' diff --git a/src/api/index.js b/src/api/index.js new file mode 100644 index 00000000..f7ea8892 --- /dev/null +++ b/src/api/index.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +//通讯录查询 +export function newList(query) { + return request({ + url: '/transaction/website/newsList', + method: 'get', + params: query + }) +} diff --git a/src/api/notice/index.js b/src/api/notice/index.js new file mode 100644 index 00000000..cbe9ff12 --- /dev/null +++ b/src/api/notice/index.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +//通讯录查询 +export function newList(query) { + return request({ + url: '/transaction/website/outproject/publicity', + method: 'get', + params: query + }) +} diff --git a/src/main.js b/src/main.js index 63bf468d..73afe248 100644 --- a/src/main.js +++ b/src/main.js @@ -10,6 +10,10 @@ import 'amfe-flexible/index.js' import './config/flexible' import store from './store/' import './permission' // permission control +import { getDicts } from "utils/data"; + +//全局方法挂载 +Vue.prototype.getDicts = () => new getDicts(); // Vant 引用 import Vant from 'vant'; diff --git a/src/router/index.js b/src/router/index.js index 55088e10..6dc2674a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -97,7 +97,8 @@ export const constantRoutes = [ path: '/project/projectDetail', name: 'projectDetail', meta: { - title: '挂牌项目' + title: '挂牌项目', + hidden: true }, component: (resolve) => require(['@/views/project/projectDetail'], resolve) }, @@ -229,6 +230,33 @@ export const constantRoutes = [ hidden: true, }, component: (resolve) => require(['@/views/user/accountSetting/phoneInformation/index'], resolve) + }, + { + path: '/bidding', + name: 'bidding', + meta: { + title: '我的竞价', + hidden: true, + }, + component: (resolve) => require(['@/views/user/bidding/index'], resolve) + }, + { + path: '/userInteraction', + name: 'userInteraction', + meta: { + title: '我的咨询', + hidden: true, + }, + component: (resolve) => require(['@/views/user/interaction/index'], resolve) + }, + { + path: '/userSupply', + name: 'userSupply', + meta: { + title: '我的供求', + hidden: true, + }, + component: (resolve) => require(['@/views/user/supply/index'], resolve) } ]; diff --git a/src/utils/data.js b/src/utils/data.js new file mode 100644 index 00000000..154a0321 --- /dev/null +++ b/src/utils/data.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +//字典查询 +export function getDicts(type) { + return request({ + url: '/transaction/website/data/type/'+type, + method: 'get', + }) +} diff --git a/src/views/index.vue b/src/views/index.vue index 95f5bb06..39944aaa 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -7,10 +7,10 @@ 农村产权交易平台 - - - - + + +

{{item.title}}

+
@@ -46,12 +46,13 @@ v-model="loading" :finished="finished" finished-text="没有更多了" + @load="getList()" > - + @@ -60,6 +61,7 @@ @@ -95,6 +138,19 @@ export default { .app-container { padding: 6% 3% 0; } +.bannerTit{ + position: absolute; + bottom: 0; + background: #000; + opacity: 0.5; + width: 100%; + height: 0.8rem; + line-height: 0.8rem; + color: #eee; + text-align: center; + overflow: hidden; + padding: 0 5%; +} .link{ color: #000; } diff --git a/src/views/news/index.vue b/src/views/news/index.vue index 87be7a66..4d4e930e 100644 --- a/src/views/news/index.vue +++ b/src/views/news/index.vue @@ -11,12 +11,13 @@ v-model="loading" :finished="finished" finished-text="没有更多了" + @load="getList()" > - + @@ -24,34 +25,54 @@ diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue index 05984826..c6162c46 100644 --- a/src/views/notice/index.vue +++ b/src/views/notice/index.vue @@ -6,7 +6,7 @@ fixed placeholder /> - + diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue index eba82971..5adc94c1 100644 --- a/src/views/project/projectDetail.vue +++ b/src/views/project/projectDetail.vue @@ -1,5 +1,11 @@ -
+
保存
- +
diff --git a/src/views/user/bidding/index.vue b/src/views/user/bidding/index.vue new file mode 100644 index 00000000..2b216dd9 --- /dev/null +++ b/src/views/user/bidding/index.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/views/user/index.vue b/src/views/user/index.vue index 8b09ce02..838a82c1 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -18,9 +18,9 @@
- - - + + +
diff --git a/src/views/user/interaction/index.vue b/src/views/user/interaction/index.vue new file mode 100644 index 00000000..b83e9b9c --- /dev/null +++ b/src/views/user/interaction/index.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/views/user/supply/index.vue b/src/views/user/supply/index.vue new file mode 100644 index 00000000..73e50e0f --- /dev/null +++ b/src/views/user/supply/index.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/static/images/zwtp.jpg b/static/images/zwtp.jpg new file mode 100644 index 00000000..8f4b5e86 Binary files /dev/null and b/static/images/zwtp.jpg differ