From b2c52517cef7c327e4724a43eafef88e3fa73bb1 Mon Sep 17 00:00:00 2001
From: xk_guohonglei <2057494155@qq.com>
Date: Thu, 10 Sep 2020 11:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=89=88=E6=B2=B9=E7=AB=99=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E4=B8=8E=E8=AE=BE=E8=AE=A1=E5=9B=BE=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/PriceList/PriceList.vue | 62 ++++++-----------------------
components/oil-menu-item.vue | 18 ++++++---
pages/station-info/station-info.vue | 50 ++++++++++++++++++-----
3 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/components/PriceList/PriceList.vue b/components/PriceList/PriceList.vue
index 25c4a85..e8d3acd 100644
--- a/components/PriceList/PriceList.vue
+++ b/components/PriceList/PriceList.vue
@@ -1,58 +1,22 @@
-
-
-
-
-
+
+
+
+
+
+ ￥{{item.price|numberFliter}}
+
-
- ￥{{item.price|numberFliter}}
-
-
-
- 省
-
-
- {{item.free|numberFliter}}
-
-
-
- 星油油价
+
+ {{item.name}}
+
+
-
diff --git a/components/oil-menu-item.vue b/components/oil-menu-item.vue
index 02acd61..8697813 100644
--- a/components/oil-menu-item.vue
+++ b/components/oil-menu-item.vue
@@ -1,7 +1,7 @@
-
+
- {{oilItem.oilName}}
+ {{oilItem.oilName}}
市场价：￥{{ oilItem.standardPrice|numberFliter}}
@@ -44,11 +44,10 @@
if (this.oilItem.xkPrice) {
this.price.push({
price: this.oilItem.xkPrice,
- color: '#ff0000',
+ color: 'red',
name: '星油油价',
className1: 'red',
className2: 'btn-red',
- free: this.oilItem.standardPrice - this.oilItem.xkPrice
})
}
if (this.oilItem.wjyPrice) {
@@ -58,7 +57,6 @@
name: '万金油价',
className1: 'yellow',
className2: 'btn-yellow',
- free: this.oilItem.standardPrice - this.oilItem.wjyPrice
})
}
if (this.oilItem.lvPrice) {
@@ -68,7 +66,15 @@
name: '老吕油价',
className1: 'laolv',
className2: 'btn-laolv',
- free: this.oilItem.standardPrice - this.oilItem.lvPrice
+ })
+ }
+ if (this.oilItem.standardPrice) {
+ this.price.push({
+ price: this.oilItem.standardPrice,
+ color: 'black',
+ name: '市场价',
+ className1: 'laolv',
+ className2: 'btn-laolv',
})
}
}
diff --git a/pages/station-info/station-info.vue b/pages/station-info/station-info.vue
index 0651cd5..09a7a63 100644
--- a/pages/station-info/station-info.vue
+++ b/pages/station-info/station-info.vue
@@ -1,21 +1,17 @@
-
+
油站信息
返回
-
-
-
+
-
-
-
+
{{site.oilSiteName}}
@@ -23,19 +19,23 @@
{{site.address}}
-
+
联系方式：{{site.linkMan}}
暂无
- （{{site.phone}}）
+ （{{site.phone}}）
（暂无）
+
+
+
+
-
+
@@ -110,6 +110,19 @@
})
}
})
+ },
+ makeCall(phone) {
+ if (phone) {
+ uni.makePhoneCall({
+ phoneNumber: phone
+ })
+ } else {
+ uni.showToast({
+ title: '暂无油站联系方式',
+ icon:'none'
+ });
+ }
+
}
}
};
@@ -134,5 +147,22 @@
image {
vertical-align: bottom;
+ background-color: rgba(113, 11, 233, 0.5)
+ }
+
+ .image {
+ border-radius: initial;
+ vertical-align: bottom;
+ background-color: rgba(11, 11, 251, 0.7)
+ }
+
+ .move-top {
+ margin-top: -2px;
+ }
+
+ .position-call {
+ position: absolute;
+ right: 30upx;
+ bottom: 30upx;
}