diff --git a/gasStation-uni/components/tabbar/tabbar.vue b/gasStation-uni/components/tabbar/tabbar.vue index e14e8549e..6545edf9c 100644 --- a/gasStation-uni/components/tabbar/tabbar.vue +++ b/gasStation-uni/components/tabbar/tabbar.vue @@ -2,26 +2,27 @@ - - + + 首页 - + 一键加油 - - + + 我的 + @@ -114,13 +115,13 @@ } .bar-img { - width: 25px; - height: 25px; + width: 50rpx; + height: 50rpx; margin: 0px auto; image { - width: 100%; - height: 100%; + width: 50rpx; + height: 50rpx; } } - + \ No newline at end of file diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js index 9ed5b9493..f9c37c3d1 100644 --- a/gasStation-uni/config.js +++ b/gasStation-uni/config.js @@ -1,14 +1,7 @@ // 应用全局配置 module.exports = { // baseUrl: 'https://vue.ruoyi.vip/prod-api', - // baseUrl: 'http://192.168.0.196:8081/', - // baseUrl: 'http://192.168.1.4:8080/', -<<<<<<< HEAD - baseUrl: 'http://192.168.0.178:8008/', - -======= baseUrl: 'http://192.168.0.138:8008/', ->>>>>>> 0ec2ff3c9193e4196b86613616f090a7bfc9f75a // baseUrl: 'http://192.168.1.5:8002/cdJdc', imagesUrl: 'http://www.nuoyunr.com/lananRsc', // 应用信息 @@ -32,4 +25,4 @@ module.exports = { } ] } -} \ No newline at end of file +} diff --git a/gasStation-uni/mini.project.json b/gasStation-uni/mini.project.json new file mode 100644 index 000000000..ecd9fe6cd --- /dev/null +++ b/gasStation-uni/mini.project.json @@ -0,0 +1,3 @@ +{ + "format": 2 +} diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json index 51effa40e..7237cf8b7 100644 --- a/gasStation-uni/pages.json +++ b/gasStation-uni/pages.json @@ -19,12 +19,20 @@ { "root": "pagesLogin", "pages": [{ - "path": "login/login", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom" + "path": "login/login", + "style": { + "navigationBarTitleText": "登录", + "navigationStyle": "custom" + } + }, + { + "path": "login/webview", + "style": { + "navigationBarTitleText": "声明", + "navigationStyle": "custom" + } } - }] + ] }, { "root": "pagesHome", diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index 77b4a6a7d..80a1ea0bc 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -28,25 +28,25 @@ - + 二维码 - + 本站活动 - + 油卡充值 - + 积分商城 @@ -385,8 +385,8 @@ // 谷歌使用wgs84 其他使用gcj02 type: 'gcj02', // 使用国测局坐标系 success: function(res) { - if (_this.longitude=="" && _this.latitude =="") { - + if (_this.longitude == "" && _this.latitude == "") { + _this.longitude = res.longitude; _this.latitude = res.latitude } @@ -398,7 +398,7 @@ data: { "lon": _this.longitude, "lat": _this.latitude, - "storeId":storeId + "storeId": storeId }, }).then((response) => { _this.distance = (Math.ceil(response.data.distance)) @@ -517,7 +517,7 @@ longitude }) => { // 选择位置完成后的处理 // this.addressName = address; - console.log(name,address,latitude,longitude); + console.log(name, address, latitude, longitude); this.longitude = longitude; this.latitude = latitude; this.getAddress() @@ -639,8 +639,8 @@ height: 38px; image { - width: 100%; - height: 100%; + width: 38px; + height: 38px; } margin: 5px auto; diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue index cff283d99..d14899f7d 100644 --- a/gasStation-uni/pages/my/my.vue +++ b/gasStation-uni/pages/my/my.vue @@ -10,8 +10,8 @@ - + :src="baseUrl + user.avatar" mode="aspectFit"> + {{user.mobile}} @@ -48,7 +48,7 @@ - + 我的订单 @@ -58,7 +58,7 @@ - + 待使用 @@ -67,7 +67,7 @@ - + 已完成 @@ -75,7 +75,7 @@ - + 待评价 @@ -95,7 +95,7 @@ - + 今日油价 @@ -105,7 +105,7 @@ - + 核销记录 diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index 134a55d47..bbeabde1e 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -8,8 +8,8 @@ - - + + {{store.name}}{{store.description ? "("+store.description+")" : ""}} diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue index 770da90ca..042e5a490 100644 --- a/gasStation-uni/pagesHome/MyCard/MyCard.vue +++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue @@ -15,7 +15,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue index 85c0e6984..43e4f27ce 100644 --- a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue +++ b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue @@ -20,7 +20,7 @@ - + {{form.giftName}} diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue index 041f53efa..db0f34105 100644 --- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue +++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue @@ -19,7 +19,7 @@ - + @@ -70,7 +70,7 @@ - + {{item.giftName}} @@ -78,7 +78,7 @@ - + - + {{item.giftName}} diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue index 7ce729caf..409e28d51 100644 --- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue +++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue @@ -44,6 +44,7 @@ + 立即充值 @@ -84,6 +85,8 @@ {{index+1}}.{{item || "" }} + + 推荐员工 @@ -92,6 +95,7 @@ + @@ -136,7 +140,17 @@ - + + + + + + + + + @@ -224,6 +238,12 @@ this.getStaffList() }, methods: { + open() { + console.log(); + }, + close() { + this.show = false + }, //囤油卡充值 addFuleCarRecords() { if (this.staffId == '') { @@ -369,8 +389,8 @@ }, confirm(e) { console.log(e); - this.staffId = e.value[0].id - this.yname = e.value[0].realName + this.staffId = e.id + this.yname = e.realName this.show = false }, cancel() { @@ -506,7 +526,8 @@ storeId: uni.getStorageSync("storeId") } }).then(res => { - this.columns.push(res.data.records) + this.columns = res.data.records + // this.columns.push(res.data.records) console.log("columns", this.columns); }) @@ -696,4 +717,13 @@ width: 20%; } + + .bottom-bb { + width: 100%; + height: 200px; + box-sizing: border-box; + padding: 10px; + background: white; + overflow: scroll; + } \ No newline at end of file diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue index 32efc8284..a3df1cc06 100644 --- a/gasStation-uni/pagesHome/order/order.vue +++ b/gasStation-uni/pagesHome/order/order.vue @@ -17,7 +17,7 @@ - + {{storeName}} @@ -52,7 +52,7 @@ - + {{goodsInfo.giftName}} diff --git a/gasStation-uni/pagesLogin/login/webview.vue b/gasStation-uni/pagesLogin/login/webview.vue new file mode 100644 index 000000000..3faf16b3b --- /dev/null +++ b/gasStation-uni/pagesLogin/login/webview.vue @@ -0,0 +1,78 @@ + + + + + \ No newline at end of file diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue index ec1f0ae93..8f8f772d6 100644 --- a/gasStation-uni/pagesMy/Coupons/Coupons.vue +++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue @@ -20,7 +20,7 @@ ¥{{item.couponAmount}} - + {{item.couponType}} diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue index 367ba6429..3dbd230d6 100644 --- a/gasStation-uni/pagesMy/VIP/vip.vue +++ b/gasStation-uni/pagesMy/VIP/vip.vue @@ -32,7 +32,7 @@ - + @@ -44,7 +44,7 @@ - + {{item.name}} diff --git a/gasStation-uni/pagesMy/comment/comment.vue b/gasStation-uni/pagesMy/comment/comment.vue index 1d912b356..2f850f8ec 100644 --- a/gasStation-uni/pagesMy/comment/comment.vue +++ b/gasStation-uni/pagesMy/comment/comment.vue @@ -13,7 +13,7 @@ 您对工作人员满意吗 - + username(13583017106) diff --git a/gasStation-uni/pagesMy/invite/invite.vue b/gasStation-uni/pagesMy/invite/invite.vue index e6db534db..01129112a 100644 --- a/gasStation-uni/pagesMy/invite/invite.vue +++ b/gasStation-uni/pagesMy/invite/invite.vue @@ -9,7 +9,7 @@ - + @@ -45,7 +45,7 @@ - + {{item.inviteeUserName}} diff --git a/gasStation-uni/pagesMy/setup/index.vue b/gasStation-uni/pagesMy/setup/index.vue index 96a8e5580..812a98274 100644 --- a/gasStation-uni/pagesMy/setup/index.vue +++ b/gasStation-uni/pagesMy/setup/index.vue @@ -10,8 +10,8 @@ diff --git a/gasStation-uni/pagesRefuel/pagesRefuel/index.vue b/gasStation-uni/pagesRefuel/pagesRefuel/index.vue index 5803c06f2..ecfe59bd4 100644 --- a/gasStation-uni/pagesRefuel/pagesRefuel/index.vue +++ b/gasStation-uni/pagesRefuel/pagesRefuel/index.vue @@ -19,7 +19,7 @@ - + @@ -52,7 +52,7 @@ - + 到这去 @@ -61,7 +61,7 @@ - + 去加油