diff --git a/src/api/user.js b/src/api/user.js index debf308..252894b 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -36,7 +36,6 @@ export function logout() { } export function uploadUserPic(file){ - debugger return request({ url: '/personPc/uploadUserPic', method: 'post', diff --git a/src/assets/footer_ico.png b/src/assets/footer_ico.png new file mode 100644 index 0000000..c8fdf7c --- /dev/null +++ b/src/assets/footer_ico.png diff --git a/src/assets/service/nodatacard.png b/src/assets/service/nodatacard.png new file mode 100644 index 0000000..40dbbeb --- /dev/null +++ b/src/assets/service/nodatacard.png diff --git a/src/components/VFooter.vue b/src/components/VFooter.vue index d6cb06e..cda188a 100644 --- a/src/components/VFooter.vue +++ b/src/components/VFooter.vue @@ -1,20 +1,104 @@ diff --git a/src/permission.js b/src/permission.js index a641b71..fc4ae01 100644 --- a/src/permission.js +++ b/src/permission.js @@ -11,7 +11,6 @@ NProgress.configure({showSpinner: false}) // NProgress Configuration const whiteList = ['/login'] // no redirect whitelist router.beforeEach(async (to, from, next) => { - debugger // start progress bar NProgress.start() if (to.path.indexOf("service") == -1) { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 91cc65b..2994bb3 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -27,7 +27,6 @@ const mutations = { const actions = { // user login login({ commit }, userInfo) { - debugger const { phone, password } = userInfo return new Promise((resolve, reject) => { login({ userPhone: phone.trim(), validatorCode: password }).then(response => { diff --git a/src/utils/request.js b/src/utils/request.js index 3d392d7..d1a1772 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -43,16 +43,16 @@ service.interceptors.response.use( * You can also judge the status by HTTP Status Code */ response => { - const res = response.data + const res = response.data; // if the custom code is not 20000, it is judged as an error. if (res.code !='8888') { Message({ - message: res.message || 'Error', + message: res.msg || 'Error', type: 'error', duration: 5 * 1000 }) - return Promise.reject(new Error(res.message || 'Error')) + return Promise.reject(res.msg) } else { return res } @@ -60,7 +60,7 @@ service.interceptors.response.use( error => { console.log('err' + error) // for debug Message({ - message: error.message, + message: res.msg || '服务异常', type: 'error', duration: 5 * 1000 }) diff --git a/src/views/cardticket/index.vue b/src/views/cardticket/index.vue index 553a402..c740031 100644 --- a/src/views/cardticket/index.vue +++ b/src/views/cardticket/index.vue @@ -1,26 +1,32 @@ @@ -29,16 +35,7 @@ export default { data() { return { - ticketList:[ - /*{ - id:'123', - ptype:'1', - plname:'静雅地上停车场', - pname:'有效', - pmoney:'50', - ptime:'2019/8/30', - }*/ - ] + ticketList:[] } }, methods: { @@ -154,6 +151,21 @@ export default { line-height:20px; margin-left: 16px; } + .card_null{ + margin-top: 50px; + text-align: center; + } + .card_null img{ + width: 184px; + height: 184px; + } + .card_nulltit{ + font-size: 20px; + font-weight: 400; + height: 30px; + line-height: 30px; + color: rgb(144, 147, 153); + } diff --git a/src/views/home.vue b/src/views/home.vue index 7a33d4d..508c516 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -80,9 +80,16 @@ name: 'home', mounted() { // 百度地图API功能 - var map = new BMap.Map("map"); + var map = new BMap.Map("map", {enableMapClick:false}); var point = new BMap.Point(115.078186, 30.232887); map.centerAndZoom(point, 15); + map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放 + var top_left_control = new BMap.ScaleControl({anchor: BMAP_ANCHOR_TOP_LEFT});// 左上角，添加比例尺 + var top_left_navigation = new BMap.NavigationControl(); //左上角，添加默认缩放平移控件 + var top_right_navigation = new BMap.NavigationControl({anchor: BMAP_ANCHOR_TOP_RIGHT, type: BMAP_NAVIGATION_CONTROL_SMALL}); //右上角，仅包含平移和缩放按钮 + map.addControl(top_left_control); + map.addControl(top_left_navigation); + map.addControl(top_right_navigation); } } @@ -110,7 +117,7 @@ height: 368px; position: absolute; top:200px; - right: 20px; + right: 80px; background: url("../assets/home/berth.png") no-repeat; p{ padding-top: 20px; @@ -185,7 +192,7 @@ content: ''; position: absolute; right: 14px; - bottom: 27px; + bottom: 36px; transform: rotate(-45deg); width: 25px; height: 1px; diff --git a/src/views/information/index.vue b/src/views/information/index.vue index 8591375..2f6d453 100644 --- a/src/views/information/index.vue +++ b/src/views/information/index.vue @@ -100,7 +100,6 @@ }, handleAvatarSuccess(res, file) { this.imageUrl = URL.createObjectURL(file.raw); - debugger }, beforeAvatarUpload(file) { let that = this; @@ -146,7 +145,6 @@ }; updatePersonByCustId(req).then(response =>{ if(response.code ='8888'){ - debugger let userInfo = this.$store.state.user.userInfo; userInfo.custName=username; userInfo.sex=sex; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 360b4b4..89c3d78 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -234,9 +234,9 @@ export default { max-width: 100%; /*padding: 160px 35px 0;*/ /*margin: 0 auto;*/ - top: 50%; + top: 150px; left: 50%; - transform: translate(-50%, -50%); + margin-left: -200px; overflow: hidden; background: rgba(26, 29, 41, .6); } diff --git a/src/views/mycar/index.vue b/src/views/mycar/index.vue index b8e05c6..546d9e6 100644 --- a/src/views/mycar/index.vue +++ b/src/views/mycar/index.vue @@ -108,7 +108,7 @@ methods: { /**校验是否已经绑定*/ checkCarNum(formName){ - debugger + // debugger //checkBoundCarNum let that = this; let custId = this.form.custId; @@ -192,7 +192,7 @@ sysCode:'1001', carBindingStatus:2, //解绑 }; - debugger + // debugger unboundCarNum(req).then(response =>{ if(response.code ='8888'){ this.$message({ diff --git a/src/views/myevaluate/index.vue b/src/views/myevaluate/index.vue index 1186580..76f2389 100644 --- a/src/views/myevaluate/index.vue +++ b/src/views/myevaluate/index.vue @@ -99,6 +99,7 @@ dialogFormVisible: false, total: 10, currentPage: 1, + pagerCount:1, pageSize: 5, orderData: [], rules:{ diff --git a/src/views/service.vue b/src/views/service.vue index b7d9979..3c705f9 100644 --- a/src/views/service.vue +++ b/src/views/service.vue @@ -44,6 +44,10 @@ 个人资料 我的评价 + + + 退出服务 + @@ -69,6 +73,10 @@ }, handleClose(key, keyPath) { console.log(key, keyPath); + }, + async logout() { + await this.$store.dispatch('user/logout') + this.$router.push(`/login?redirect=${this.$route.fullPath}`) } } }