diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 7837963a2..dbab47c15 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -19,7 +19,7 @@
- 便利店
+ 二维码
@@ -70,9 +70,12 @@
- {{store.name}}{{store.description ? "("+store.description+")" : ""}}
+ {{store.name}}{{store.description ? "("+store.description+")" : ""}}
+
- {{item}}
+
+ {{item}}
+
@@ -125,13 +128,13 @@
'https://cdn.uviewui.com/uview/swiper/swiper1.png',
],
// 当前经度信息
- longitude:"",
+ longitude: "",
// 纬度
- latitude:"",
+ latitude: "",
// 店铺信息
- store:{},
+ store: {},
// 店铺福利信息
- welfare:[],
+ welfare: [],
distance: "",
}
},
@@ -139,21 +142,21 @@
},
onShow() {
- this.getAddress();
+ // this.getAddress();
},
components: {
tabbar
},
methods: {
// 获取当前位置
- getAddress(){
+ getAddress() {
let _this = this;
uni.getLocation({
// 谷歌使用wgs84 其他使用gcj02
- type: 'wgs84', // 使用国测局坐标系
+ type: 'wgs84', // 使用国测局坐标系
success: function(res) {
- _this.longitude = res.longitude;
- _this.latitude = res.latitude
+ _this.longitude = res.longitude;
+ _this.latitude = res.latitude
// console.log('经度: ' + res.longitude);
// console.log('纬度: ' + res.latitude);
uni.request({
@@ -163,16 +166,16 @@
"lon": res.longitude,
"lat": res.latitude
},
- success: function(response){
- _this.distance = (response.data.data.distance).toFixed(1)
- _this.store = response.data.data.store
+ success: function(response) {
+ _this.distance = (response.data.data.distance).toFixed(1)
+ _this.store = response.data.data.store
let welfare = response.data.data.store.welfare
- if (welfare != undefined && welfare!=null && welfare!=""){
- if (welfare.includes(",")){
- _this.welfare = response.data.data.store.welfare.split(",")
- }else {
- _this.welfare.push(response.data.data.store.welfare)
- }
+ if (welfare != undefined && welfare != null && welfare != "") {
+ if (welfare.includes(",")) {
+ _this.welfare = response.data.data.store.welfare.split(",")
+ } else {
+ _this.welfare.push(response.data.data.store.welfare)
+ }
}
}
})
diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue
index 536ca1745..8b299f717 100644
--- a/gasStation-uni/pages/my/my.vue
+++ b/gasStation-uni/pages/my/my.vue
@@ -17,7 +17,8 @@
size="12">
- 会员等级
+ 会员等级
@@ -100,7 +101,7 @@
-
+
@@ -109,7 +110,7 @@
-
+
@@ -117,7 +118,7 @@
充值记录
-
+
@@ -125,7 +126,7 @@
邀请有礼
-
+
@@ -133,7 +134,7 @@
积分商城
-
+
@@ -141,7 +142,7 @@
子卡管理
-
+
@@ -150,14 +151,12 @@
-
-
+
+
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/feedback/feedback.vue b/gasStation-uni/pagesMy/feedback/feedback.vue
index 4631b8338..48bdf5f6d 100644
--- a/gasStation-uni/pagesMy/feedback/feedback.vue
+++ b/gasStation-uni/pagesMy/feedback/feedback.vue
@@ -2,11 +2,26 @@
+
+
+ 反馈内容
+
+
+
+ 相关截图(选填)
+
+
+
+ 提交反馈
+
+
@@ -14,11 +29,13 @@