diff --git a/package-lock.json b/package-lock.json index a85bd26c..7dd78f75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3472,6 +3472,11 @@ } } }, + "dom-walk": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", + "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -4612,6 +4617,15 @@ "is-glob": "^4.0.1" } }, + "global": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", + "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", + "requires": { + "min-document": "^2.19.0", + "process": "^0.11.10" + } + }, "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", @@ -5662,6 +5676,11 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.6.0.tgz?cache=0&sync_timestamp=1614705639458&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjquery%2Fdownload%2Fjquery-3.6.0.tgz", + "integrity": "sha1-xyoJ8Vwb3OFC9J2/EXC9+K2sJHA=" + }, "js-base64": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", @@ -6301,6 +6320,14 @@ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, + "min-document": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", + "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", + "requires": { + "dom-walk": "^0.1.0" + } + }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -9759,8 +9786,7 @@ "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, "process-nextick-args": { "version": "2.0.1", diff --git a/package.json b/package.json index f1653999..f5d12287 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,8 @@ }, "dependencies": { "axios": "^0.21.1", + "jquery": "^3.6.0", + "global": "^4.4.0", "js-cookie": "^2.2.1", "lib-flexible": "^0.3.2", "node-sass": "^5.0.0", diff --git a/src/api/login/index.js b/src/api/login/index.js index 52ddc45c..7f83f7ff 100644 --- a/src/api/login/index.js +++ b/src/api/login/index.js @@ -52,6 +52,7 @@ export function getCodeImg() { method: 'get' }) } + // 发送短信验证码 export function getSmsCode(mobile) { @@ -65,3 +66,4 @@ export function getSmsCode(mobile) { data:data }) } + diff --git a/src/api/project/index.js b/src/api/project/index.js index 34e31def..7e1a8168 100644 --- a/src/api/project/index.js +++ b/src/api/project/index.js @@ -11,8 +11,9 @@ export function getDeptList(id) { //挂牌项目列表 export function getOutProjectList(data){ return request({ - url:'/transaction/website/outproject/list?deptId=&projectNumber=&', + url:'/transaction/website/outproject/list', method:'get', + params:data }) } //挂牌项目详情 diff --git a/src/api/register/index.js b/src/api/register/index.js index 96ff34aa..537d9803 100644 --- a/src/api/register/index.js +++ b/src/api/register/index.js @@ -29,4 +29,12 @@ export function registerOn(memberName, idcard, mobile, smsCode,uuid) { data: data }) } +//注册 +export function userRegister(data) { + return request({ + url: '/transaction/website/addMember', + method: 'post', + data: data + }) +} diff --git a/src/api/user/index.js b/src/api/user/index.js index d045da0d..cace22f4 100644 --- a/src/api/user/index.js +++ b/src/api/user/index.js @@ -102,3 +102,45 @@ export function userDemand(query){ data: query }) } + +//发布供求 +export function updateDemand(query){ + return request({ + url: '/transaction/demand', + method: 'put', + data: query + }) +} + +//供求查询 +export function selectDemand(id){ + return request({ + url: '/transaction/demand/'+id, + method: 'get', + }) +} + +//删除供求 +export function deleteSupply(id){ + return request({ + url: '/transaction/demand/'+id, + method: 'delete' + }) +} + +// 展示图片 +export function showImg(id){ + return request({ + url: '/transaction/website/supplyDemand/showImg/id/'+id, + method: 'get', + }) +} + +//我的竞价 +export function biddinglist(query){ + return request({ + url: '/transaction/outproject/biddinglist/member', + method: 'get', + params: query + }) +} diff --git a/src/assets/images/homestead/farmlandEditSwitch_bg.png b/src/assets/images/homestead/farmlandEditSwitch_bg.png new file mode 100644 index 00000000..71023832 Binary files /dev/null and b/src/assets/images/homestead/farmlandEditSwitch_bg.png differ diff --git a/src/assets/images/homestead/farmlandEditSwitch_close.png b/src/assets/images/homestead/farmlandEditSwitch_close.png new file mode 100644 index 00000000..a615d60f Binary files /dev/null and b/src/assets/images/homestead/farmlandEditSwitch_close.png differ diff --git a/src/assets/images/homestead/nd.png b/src/assets/images/homestead/nd.png new file mode 100644 index 00000000..3c1716b5 Binary files /dev/null and b/src/assets/images/homestead/nd.png differ diff --git a/src/assets/images/homestead/nf.png b/src/assets/images/homestead/nf.png new file mode 100644 index 00000000..19177344 Binary files /dev/null and b/src/assets/images/homestead/nf.png differ diff --git a/src/assets/images/homestead/operation/positioning.png b/src/assets/images/homestead/operation/positioning.png new file mode 100644 index 00000000..7525b8ae Binary files /dev/null and b/src/assets/images/homestead/operation/positioning.png differ diff --git a/src/assets/images/homestead/operation/positioning_active.png b/src/assets/images/homestead/operation/positioning_active.png new file mode 100644 index 00000000..7d58e06e Binary files /dev/null and b/src/assets/images/homestead/operation/positioning_active.png differ diff --git a/src/assets/images/homestead/operation/scale.png b/src/assets/images/homestead/operation/scale.png new file mode 100644 index 00000000..2f6955e2 Binary files /dev/null and b/src/assets/images/homestead/operation/scale.png differ diff --git a/src/assets/images/homestead/operation/scale_active.png b/src/assets/images/homestead/operation/scale_active.png new file mode 100644 index 00000000..349b4d11 Binary files /dev/null and b/src/assets/images/homestead/operation/scale_active.png differ diff --git a/src/assets/images/homestead/operation/spacing.png b/src/assets/images/homestead/operation/spacing.png new file mode 100644 index 00000000..ec873bba Binary files /dev/null and b/src/assets/images/homestead/operation/spacing.png differ diff --git a/src/assets/images/homestead/operation/spacing_active.png b/src/assets/images/homestead/operation/spacing_active.png new file mode 100644 index 00000000..33cb9088 Binary files /dev/null and b/src/assets/images/homestead/operation/spacing_active.png differ diff --git a/src/assets/images/homestead/operation/tensile.png b/src/assets/images/homestead/operation/tensile.png new file mode 100644 index 00000000..66f405b8 Binary files /dev/null and b/src/assets/images/homestead/operation/tensile.png differ diff --git a/src/assets/images/homestead/operation/tensile_active.png b/src/assets/images/homestead/operation/tensile_active.png new file mode 100644 index 00000000..b225ca2f Binary files /dev/null and b/src/assets/images/homestead/operation/tensile_active.png differ diff --git a/src/assets/images/homestead/positioning_icon.png b/src/assets/images/homestead/positioning_icon.png new file mode 100644 index 00000000..5d301485 Binary files /dev/null and b/src/assets/images/homestead/positioning_icon.png differ diff --git a/src/assets/images/homestead/searchBar_close.png b/src/assets/images/homestead/searchBar_close.png new file mode 100644 index 00000000..7f3789cb Binary files /dev/null and b/src/assets/images/homestead/searchBar_close.png differ diff --git a/src/assets/images/homestead/searchBar_close_gray.png b/src/assets/images/homestead/searchBar_close_gray.png new file mode 100644 index 00000000..696e65c9 Binary files /dev/null and b/src/assets/images/homestead/searchBar_close_gray.png differ diff --git a/src/assets/images/homestead/searchBar_save.png b/src/assets/images/homestead/searchBar_save.png new file mode 100644 index 00000000..9b6ba128 Binary files /dev/null and b/src/assets/images/homestead/searchBar_save.png differ diff --git a/src/assets/images/homestead/selectionNext_icon.png b/src/assets/images/homestead/selectionNext_icon.png new file mode 100644 index 00000000..3aaea26a Binary files /dev/null and b/src/assets/images/homestead/selectionNext_icon.png differ diff --git a/src/assets/images/homestead/selection_icon.png b/src/assets/images/homestead/selection_icon.png new file mode 100644 index 00000000..84a0f40e Binary files /dev/null and b/src/assets/images/homestead/selection_icon.png differ diff --git a/src/main.js b/src/main.js index fae73b24..f1fd1c4e 100644 --- a/src/main.js +++ b/src/main.js @@ -11,6 +11,8 @@ import './config/flexible' import store from './store/' import './permission' // permission control +import global from '@/utils/global'; + import { getDicts } from "@/utils/data"; import { selectDictLabel , onClickLeft , getNowFormatDate } from "@/utils/utils"; @@ -19,6 +21,7 @@ Vue.prototype.getDicts = getDicts Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.onClickLeft = onClickLeft Vue.prototype.getNowFormatDate = getNowFormatDate +Vue.prototype.global = global // Vant 引用 import Vant from 'vant'; diff --git a/src/permission.js b/src/permission.js index 528cacd0..e24a2902 100644 --- a/src/permission.js +++ b/src/permission.js @@ -6,8 +6,29 @@ import { getToken } from '@/utils/auth' NProgress.configure({ showSpinner: false }) -const whiteList = ['/index', '/login', '/auth-redirect', '/bind', '/register', '/news/index', '/notice/index', '/supply/index' - , '/interaction/index', '/register/index', '/register/registerType', '/register/userRegister', '/register/companyRegister', '/homestead/login', '/homestead/index'] +const whiteList = [ + '/index', + '/login', + '/auth-redirect', + '/bind', + '/register', + '/news/index', + '/news/newDetail', + '/notice/index', + '/supply/index', + '/interaction/index', + '/register/index', + '/register/registerType', + '/register/userRegister', + '/register/companyRegister', + '/biddingHall', + '/project', + '/policy', + '/policyDetail', + '/attestationDetail', + '/noticeDetail', + +] router.beforeEach((to, from, next) => { NProgress.start() @@ -46,7 +67,7 @@ router.beforeEach((to, from, next) => { next() } else { next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 - //next('/index'); + //next('/index'); NProgress.done() } } diff --git a/src/router/index.js b/src/router/index.js index 5f27c24b..1fcd77c0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -81,7 +81,8 @@ export const constantRoutes = [ path: '/biddingHall', name: 'biddingHall', meta: { - title: '竞价大厅' + title: '竞价大厅', + hidden: true, }, component: (resolve) => require(['@/views/biddingHall'], resolve) }, @@ -106,7 +107,8 @@ export const constantRoutes = [ path: '/news/index', name: 'news', meta: { - title: '新闻资讯' + title: '新闻资讯', + hidden: true, }, component: (resolve) => require(['@/views/news/index'], resolve) }, @@ -114,7 +116,8 @@ export const constantRoutes = [ path: '/news/newDetail', name: 'newDetail', meta: { - title: '新闻详情' + title: '新闻详情', + hidden: true, }, component: (resolve) => require(['@/views/news/newDetail'], resolve) }, @@ -122,7 +125,8 @@ export const constantRoutes = [ path: '/notice/index', name: 'notice', meta: { - title: '项目公告' + title: '项目公告', + hidden: true, }, component: (resolve) => require(['@/views/notice/index'], resolve) }, @@ -130,7 +134,8 @@ export const constantRoutes = [ path: '/supply/index', name: 'supply', meta: { - title: '个人供求' + title: '个人供求', + hidden: true, }, component: (resolve) => require(['@/views/supply/index'], resolve) }, @@ -138,7 +143,8 @@ export const constantRoutes = [ path: '/interaction/index', name: 'interaction', meta: { - title: '互动交流' + title: '互动交流', + hidden: true, }, component: (resolve) => require(['@/views/interaction/index'], resolve) }, diff --git a/src/utils/global.js b/src/utils/global.js new file mode 100644 index 00000000..ea73f392 --- /dev/null +++ b/src/utils/global.js @@ -0,0 +1,8 @@ +const deptId = 100 ; +const severApi = 'http://192.168.31.107:8080'; + +export default +{ + deptId,//区县ID + severApi,//全局API +} diff --git a/src/utils/utils.js b/src/utils/utils.js index 917995c8..9c2c3965 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -15,8 +15,13 @@ export function onClickLeft(){ history.back(-1); } -export function getNowFormatDate() { - var date = new Date(); +export function getNowFormatDate(time) { + var date; + if (!time){ + date = new Date(); + }else{ + date = time; + } var seperator1 = "-"; var seperator2 = ":"; var month = date.getMonth() + 1; diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue index 87d6e7b8..7cde830e 100644 --- a/src/views/biddingHall/index.vue +++ b/src/views/biddingHall/index.vue @@ -1,5 +1,12 @@ diff --git a/src/views/register/registerType.vue b/src/views/register/registerType.vue index 7618550d..8d18b44c 100644 --- a/src/views/register/registerType.vue +++ b/src/views/register/registerType.vue @@ -1,5 +1,12 @@ diff --git a/src/views/user/supply/supplyAdd.vue b/src/views/user/supply/supplyAdd.vue index 74f633cd..03b39bbc 100644 --- a/src/views/user/supply/supplyAdd.vue +++ b/src/views/user/supply/supplyAdd.vue @@ -13,9 +13,11 @@ clickable name="picker" :value="value" - label="选择器" - placeholder="点击选择城市" + label="供求类型" + placeholder="点击选择供求类型" @click="showPicker = true" + required + :rules="[{ required:true }]" /> - - + + - + + + +
发布
@@ -38,7 +45,7 @@ @@ -137,10 +195,11 @@ export default { background-color: #FFF; } .submit{ - position: absolute; + position: fixed; bottom: 5%; width: 90%; left: 5%; + background-color: #FFFFFF; p{ text-align: center; margin-bottom: 0.2rem; diff --git a/static/images/zwtpxw.jpg b/static/images/zwtpxw.jpg new file mode 100644 index 00000000..594b8a00 Binary files /dev/null and b/static/images/zwtpxw.jpg differ