diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 7c68f31..50b22e0 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -1,6 +1,6 @@ const install = (Vue, vm) => { Vue.prototype.$u.http.setConfig({ - baseUrl: 'http://192.168.2.88:3100/dev-api', + baseUrl: 'http://192.168.2.10:3100/dev-api', // baseUrl: 'https://znb.ccttiot.com', loadingText: '努力加载中~', loadingTime: 800, diff --git a/page_user/ditu.vue b/page_user/ditu.vue index 68dc869..23a70c9 100644 --- a/page_user/ditu.vue +++ b/page_user/ditu.vue @@ -67,7 +67,7 @@ background:'#25D088' }, listmap: [], - mapScale: 15, + mapScale: 16, datetime: 0, dingobj: '', mapContext: null, @@ -117,6 +117,9 @@ width: 25, height: 30, iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw', + borderColor:'#fff', + borderRadius:5, + bgColor: 'rgba(255, 255, 255, 0.7)' }; this.covers.push(shopCover) }); @@ -136,7 +139,10 @@ fontWeight: 700, color: '#25D088', textShadow: '2px 2px 0px #000, -2px -2px 0px #000, 2px -2px 0px #000, -2px 2px 0px #000', - rotate:20 + rotate:20, + borderColor:'#fff', + borderRadius:5, + bgColor: 'rgba(255, 255, 255, 0.7)' } } this.covers.push(shopCover) @@ -260,6 +266,9 @@ fontWeight: 700, color: '#25D088', textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white', + borderColor:'#fff', + borderRadius:5, + bgColor: 'rgba(255, 255, 255, 0.7)' } }; this.covers.push(shopCover) @@ -343,7 +352,7 @@ display: flex; margin-bottom: 10rpx; // justify-content: space-between; - padding-left: 155rpx; + padding-left: 140rpx; width: 625rpx; box-sizing: border-box; border-radius: 8rpx 8rpx 8rpx 8rpx; diff --git a/pages/index/index.vue b/pages/index/index.vue index 34a9e91..336818a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -135,7 +135,7 @@ jinweidu: '', zujieflag: false, listmap: [], - mapScale: 15, + mapScale: 16, datetime: 0, dingobj: '', mapContext: null, @@ -358,6 +358,9 @@ width: 25, height: 30, iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw', + borderColor:'#fff', + borderRadius:5, + bgColor: 'rgba(255, 255, 255, 0.7)' }; this.covers.push(shopCover) }); @@ -377,7 +380,10 @@ fontWeight: 700, color: '#25D088', textShadow: '2px 2px 0px #000, -2px -2px 0px #000, 2px -2px 0px #000, -2px 2px 0px #000', - rotate: 20 + rotate: 20, + borderColor:'#fff', + borderRadius:5, + bgColor: 'rgba(255, 255, 255, 0.7)' } } this.covers.push(shopCover) @@ -511,6 +517,9 @@ fontWeight: 700, color: '#25D088', textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white', + borderColor:'#fff', + borderRadius:5, + bgColor: 'rgba(255, 255, 255, 0.7)' } }; this.covers.push(shopCover) diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue index b6ac6b7..d7b0130 100644 --- a/pages/nearbystores/index.vue +++ b/pages/nearbystores/index.vue @@ -19,6 +19,7 @@ {{item.name}} + {{item.address}} @@ -59,7 +60,7 @@ background:'#25D088' }, listmap: [], - mapScale: 15, + mapScale: 16, datetime: 0, dingobj: '', mapContext: null, @@ -131,6 +132,9 @@ width: 25, height: 30, iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw', + borderColor:'#fff', + borderRadius:5, + bgColor: 'rgba(255, 255, 255, 0.7)' }; this.covers.push(shopCover); }); @@ -152,7 +156,10 @@ fontWeight: 700, color: '#25D088', textShadow: '2px 2px 0px #000, -2px -2px 0px #000, 2px -2px 0px #000, -2px 2px 0px #000', - rotate:20 + rotate:20, + borderColor:'#fff', + borderRadius:5, + bgColor: 'rgba(255, 255, 255, 0.7)' } } this.covers.push(shopCover); @@ -248,6 +255,9 @@ fontWeight: 700, color: '#25D088', textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white', + borderColor:'#fff', + borderRadius:5, + bgColor: 'rgba(255, 255, 255, 0.7)' } }; this.covers.push(shopCover); @@ -407,6 +417,12 @@ color: #3D3D3D; line-height: 32rpx; margin-top: 14rpx; + image { + display: inline-block; + width: 22rpx; + height: 22rpx; + margin-right: 6rpx; + } } .cenc{ font-weight: 400;