diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue
index 8a28b78..d9b9460 100644
--- a/BagStation/orderDetail/orderDetail.vue
+++ b/BagStation/orderDetail/orderDetail.vue
@@ -304,7 +304,7 @@
},
onLoad(option) {
- console.log('++++++++++++++++++', option)
+ // console.log('++++++++++++++++++', option)
this.test = option.id
this.id = option.id
this.tsets = option.name
@@ -312,23 +312,23 @@
uni.showShareMenu()
let _that = this
this.timeinterval = setInterval(() => {
- console.log('1')
+ // console.log('1')
_that.newQrString()
}, 1000 * 60 * 3);
},
filters: {
moneyIntercept(value) {
if (value) {
- console.log(value)
+ // console.log(value)
let valus = (parseInt(value * 100) / 100).toFixed(2) + '¥/'
- console.log(valus)
+ // console.log(valus)
return valus
} else {
return '暂无'
}
},
moneyFormath(value) {
- console.log(value)
+ // console.log(value)
if (value != 'xxx.x') {
let number = value.toFixed(2)
return number
diff --git a/components/site-item/site-item.vue b/components/site-item/site-item.vue
index b850ee7..a953d60 100644
--- a/components/site-item/site-item.vue
+++ b/components/site-item/site-item.vue
@@ -1,27 +1,36 @@
-
-
+
-
-
-
-
- {{siteItem.siteName}}
- {{siteItem.siteLevel}}
+
+
+
+
+
+ {{siteItem.siteName}}
+
- {{siteItem.siteType==1?'加油站':'加气站'}}
+ {{siteItem.siteType==1?'加油站':'加气站'}}
+
尿素
- {{siteItem.listTag|channelCodeFamt}}
+ {{siteItem.listTag|channelCodeFamt}}
距离最近
- {{speedMark(siteItem.highSpeedMark,siteItem.roadTpye)}}{{siteItem.roadName?':'+siteItem.roadName:''}}
+
+ {{speedMark(siteItem.highSpeedMark,siteItem.roadTpye)}}{{siteItem.roadName?':'+siteItem.roadName:''}}
+
-
-
- {{siteItem.address}}
-
+
+
+ {{siteItem.address}}
+
@@ -29,20 +38,21 @@
¥{{siteItem.sitePrice|moneyFormat}}
-
+
- 省¥{{(siteItem.oilSitePrice - siteItem.sitePrice)|moneyFormat}}
-
-
-
- ¥{{siteItem.oilSitePrice|moneyFormat}}/L
-
+ 省¥{{(siteItem.oilSitePrice - siteItem.sitePrice)|moneyFormat}}
+
+
+
+ ¥{{siteItem.oilSitePrice|moneyFormat}}/L
+
-
-
+
+
活动
@@ -51,12 +61,12 @@
-
-
+
+
- {{siteItem.juli|distanceFilter}}
-
-
+ {{siteItem.juli|distanceFilter}}
+
+
@@ -76,51 +86,52 @@
return {
mHeight: 156,
starUrl: this.global.starUrl,
- defaultLogo:'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/logo_default.png'
+ defaultLogo: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/logo_default.png'
}
},
mounted() {
const query = uni.createSelectorQuery().in(this);
-
- query.select('.activity-cu').boundingClientRect(data => {undefined
-
- // console.log(data,'1111111111111111111')
- if(data){
- this.mHeight = this.mHeight + data.height*2
- }
+
+ query.select('.activity-cu').boundingClientRect(data => {
+ undefined
+
+ // console.log(data,'1111111111111111111')
+ if (data) {
+ this.mHeight = this.mHeight + data.height * 2
+ }
}).exec();
},
methods: {
- speedMarkColor(val,data){
- if(val == 0){
- if(data == '0'){
+ speedMarkColor(val, data) {
+ if (val == 0) {
+ if (data == '0') {
return '#666666'
}
- if(data == '1'){
+ if (data == '1') {
return '#F9AA64'
}
- if(data == '2'){
+ if (data == '2') {
return '#D61750'
}
}
- if(val == 1){
+ if (val == 1) {
return '#11A265'
}
},
- speedMark(val,data){
+ speedMark(val, data) {
// console.log(val,data,'qqqqqqqqqqqqqqqqqqqqqq')
- if(val == 0){
- if(data == '0'){
+ if (val == 0) {
+ if (data == '0') {
return '普通'
}
- if(data == '1'){
+ if (data == '1') {
return '省道'
}
- if(data == '2'){
+ if (data == '2') {
return '国道'
}
}
- if(val == 1){
+ if (val == 1) {
return '高速'
}
},
@@ -128,7 +139,7 @@
filters: {
channelCodeFamt(value) {
// console.log(value)
- if (value == null || value == '' ) {
+ if (value == null || value == '') {
return '未知'
// 渠道编码 ( XOIL:星油 WJY:万金油 LV:老吕(找油网) TY:团油 YDJY:一点加油(壳牌))
// switch (value) {
@@ -159,7 +170,9 @@
// console.log('old:',value)
// console.log('new:',realAmount)
// return realAmount
- return String(value).split('.')[1]&&String(value).split('.')[1].length>2?Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`).toFixed(2) :Number(value).toFixed(2);
+ return String(value).split('.')[1] && String(value).split('.')[1].length > 2 ? Number(
+ `${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`
+ ).toFixed(2) : Number(value).toFixed(2);
} else {
return '0.00'
}
@@ -169,10 +182,10 @@
+
\ No newline at end of file