diff --git a/gasStation-uni/pagesHome/Activity/index.vue b/gasStation-uni/pagesHome/Activity/index.vue
index a1fb7dc02..6aba4fbb8 100644
--- a/gasStation-uni/pagesHome/Activity/index.vue
+++ b/gasStation-uni/pagesHome/Activity/index.vue
@@ -7,13 +7,12 @@
-
+
立即前往
-
+
@@ -23,7 +22,15 @@
{{item.name || "活动标题"}}
- {{item.des || "内容"}}
+
+
+
+ 适用用户：普通会员、银牌会员、V2
+
+
+
+ 享受优惠：满送一百万 送一元
+
活动时间
@@ -170,19 +177,21 @@
justify-content: space-between;
border-top: 1px solid #f4f5f6;
font-size: 14px;
+ color: #666666;
}
.box-s-title {
font-size: 17px;
font-weight: bold;
+ margin: 5px auto;
}
.box-s-size {
font-size: 14px;
- color: #666666;
+ color: #777777;
box-sizing: border-box;
- padding: 5px;
- background-color: #f4f5f6;
+ // padding: 5px;
+ // background-color: #f4f5f6;
border-radius: 8px;
margin: 5px auto;
@@ -209,4 +218,24 @@
position: fixed;
top: 0px;
}
+
+ .dian {
+ width: 6px;
+ height: 6px;
+ background: #2F72F7;
+ border-radius: 50%;
+ margin-right: 5px;
+ }
+
+ .dis-box {
+ display: flex;
+ align-items: center;
+
+ }
+
+ .h_size {
+ font-size: 14px;
+ font-weight: 400;
+ color: #777777;
+ }
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/Pointsdetail/Pointsdetail.vue b/gasStation-uni/pagesHome/Pointsdetail/Pointsdetail.vue
index d6ea275c2..0a2391fc5 100644
--- a/gasStation-uni/pagesHome/Pointsdetail/Pointsdetail.vue
+++ b/gasStation-uni/pagesHome/Pointsdetail/Pointsdetail.vue
@@ -8,8 +8,8 @@
+
-
@@ -60,6 +60,7 @@
.content {
width: 100%;
background: #f4f5f6;
+ background: #ffffff;
}
diff --git a/gasStation-uni/pagesHome/activeIn/index.vue b/gasStation-uni/pagesHome/activeIn/index.vue
index 3722707d8..deb197d77 100644
--- a/gasStation-uni/pagesHome/activeIn/index.vue
+++ b/gasStation-uni/pagesHome/activeIn/index.vue
@@ -15,28 +15,44 @@
- 活动明细
-
- {{item.activeDescribe || ""}}
+ 活动介绍
+ 活动介绍活动介绍活动介绍
+ 参与油品
+
+ #95
-
- {{item.discountActiveDescribe || ""}}
-
-
- {{item.fullminusActiveDescribe || ""}}
-
-
- {{item.discountActiveDescribe || ""}}
-
-
- {{datas.newlywedsActiveDescribe || ""}}
-
-
- {{datas.recommendActiveDescribeIn || ""}}
- {{datas.recommendActiveDescribeOut || ""}}
+
+
+
+ 参与会员：普通会员、银牌会员、V2
+
+
+
+ 获得折扣：赠送10积分
+
+
+
@@ -120,17 +136,17 @@
}
})
}
- if (name == '储值卡充值活动') {
- request({
- url: '/business/marketingActivity/cardValue/appletList',
- method: 'get',
- }).then(res => {
- if (res.code == 200) {
- this.datas = res.data
- uni.hideLoading();
- }
- })
- }
+ if (name == '储值卡充值活动') {
+ request({
+ url: '/business/marketingActivity/cardValue/appletList',
+ method: 'get',
+ }).then(res => {
+ if (res.code == 200) {
+ this.datas = res.data
+ uni.hideLoading();
+ }
+ })
+ }
},
@@ -143,7 +159,7 @@
+
+ .w_box {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ }
+
+ .h_size {
+ font-size: 14px;
+ font-weight: 400;
+ color: #777777;
+ }
+
+ .w_oil {
+ border-radius: 4px 4px 4px 4px;
+ box-sizing: border-box;
+ padding: 5px 10px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 10px;
+ border: 1px solid #2F72F7;
+ color: #2F72F7;
+ }
+
+ .h_bottom {
+ width: 100%;
+ background: #F4F4F4;
+ border-radius: 4px;
+ box-sizing: border-box;
+ padding: 10px 5px;
+ margin: 10px auto;
+ }
+
+ .dian {
+ width: 6px;
+ height: 6px;
+ background: #2F72F7;
+ border-radius: 50%;
+ margin-right: 5px;
+ }
+
+ .dis-box {
+ display: flex;
+ align-items: center;
+
+ }
+
\ No newline at end of file
diff --git a/gasStation-uni/pagesRefuel/pagesRefuel/index.vue b/gasStation-uni/pagesRefuel/pagesRefuel/index.vue
index da1037144..e602cb48e 100644
--- a/gasStation-uni/pagesRefuel/pagesRefuel/index.vue
+++ b/gasStation-uni/pagesRefuel/pagesRefuel/index.vue
@@ -19,33 +19,35 @@
-
+
- {{item.store.name}}{{item.store.description ? "("+item.store.description+")" : ""}}
+
+ {{item.store.name}}{{item.store.description ? "("+item.store.description+")" : ""}}
+
{{item.store.address}}
-
+
+
+ {{(Math.ceil(item.distance)).toFixed(1)}}km
- {{(Math.ceil(item.distance)).toFixed(1)}}km
-
+
{{item1.oilNames}}
￥{{item1.gbPrice}}/{{item1.unit}}
-
+
@@ -78,14 +80,14 @@
return {
title: '',
// 店铺列表信息
- storeList:[],
- list:[],
+ storeList: [],
+ list: [],
// 站点名
- storeName:"",
- map:{
- lon:"",
- lat:"",
- storeId:"",
+ storeName: "",
+ map: {
+ lon: "",
+ lat: "",
+ storeId: "",
}
}
},
@@ -100,16 +102,17 @@
},
methods: {
// 查询店铺信息
- queryStore(val){
+ queryStore(val) {
this.list = []
this.storeList.forEach(item => {
- if (item.store.name.includes(val.detail.value) || item.store.description.includes(val.detail.value)){
+ if (item.store.name.includes(val.detail.value) || item.store.description.includes(val.detail
+ .value)) {
this.list.push(item)
}
})
},
// 获取当前经纬度信息
- getLonLat(){
+ getLonLat() {
let _this = this;
wx.getLocation({
type: 'gcj02', // 使用国测局坐标系
@@ -121,26 +124,26 @@
}
})
},
- getList(data){
+ getList(data) {
let _this = this;
request({
url: "business/storeInformation/store/queryStores",
method: 'post',
data: data,
- }).then((res)=>{
+ }).then((res) => {
_this.storeList = res.data
_this.list = _this.storeList
})
},
// 携带油号跳转加油页面
- toRefuelOil(data){
+ toRefuelOil(data) {
console.log(data)
},
// 跳转一键加油页面
- toRefuel(data){
+ toRefuel(data) {
// console.log(data)
- uni.setStorageSync("storeId",data.id)
- uni.setStorageSync("chainStoreId",data.chainStoreId)
+ uni.setStorageSync("storeId", data.id)
+ uni.setStorageSync("chainStoreId", data.chainStoreId)
uni.navigateTo({
url: '/pages/refuel/refuel'
})
@@ -234,7 +237,7 @@
.touxiang {
width: 45px;
height: 45px;
- border-radius: 50%;
+
overflow: hidden;
image {
@@ -244,6 +247,7 @@
}
.box-top-size {
+ width: 80%;
margin-left: 5px;
}
@@ -310,4 +314,4 @@
width: 100%;
flex-wrap: wrap;
}
-
+
\ No newline at end of file