diff --git a/src/subPackages/site/details/components/illustrate.vue b/src/subPackages/site/details/components/illustrate.vue
new file mode 100644
index 0000000..eb31571
--- /dev/null
+++ b/src/subPackages/site/details/components/illustrate.vue
@@ -0,0 +1,49 @@
+
+
+
+ 服务费说明
+
+
+ 服务费为本笔订单优惠金额{{
+ discountInfo.feeRatio * 100 + "%"
+ }},最高不超过7元
+
+
+
+
+
+
diff --git a/src/subPackages/site/details/components/info.vue b/src/subPackages/site/details/components/info.vue
new file mode 100644
index 0000000..8b9fdca
--- /dev/null
+++ b/src/subPackages/site/details/components/info.vue
@@ -0,0 +1,63 @@
+
+
+
+ 油站详情
+
+
+
+ 油站开票
+ 发票需油站当天开具,请务必现场咨询油站,过期可能无法回溯发票。
+
+
+
+
+
+
+
diff --git a/src/subPackages/site/details/index.vue b/src/subPackages/site/details/index.vue
index 2a792d9..072d882 100644
--- a/src/subPackages/site/details/index.vue
+++ b/src/subPackages/site/details/index.vue
@@ -5,13 +5,16 @@
{{ siteInfo.siteName }}
-
+
详情
{{ siteInfo.address }}
距您{{ siteInfo.juli | distanceFilter }}km
+
+ 油站开票
+
导航
@@ -73,7 +76,9 @@
>
- 服务费
+
+ 服务费
+
+¥{{ discountInfo.serviceCharge || "0.00" }}
@@ -97,27 +102,25 @@
去支付
+
+
+
+
-
-
- 服务费说明
-
-
- 服务费为本笔订单优惠金额{{
- discountInfo.feeRatio * 100 + "%"
- }},最高不超过7元
-
+
import serve from "api/site/details.js";
+
+import info from "./components/info.vue";
import options from "./components/options.vue";
+import illustrate from "./components/illustrate.vue";
export default {
components: {
+ info,
options,
+ illustrate,
},
data() {
return {
@@ -201,9 +209,6 @@ export default {
},
},
methods: {
- serviceIllustrate() {
- this.$refs.popupIllustrate.open("bottom");
- },
async createCOrder() {
let isHas = this.hasLocationAuthHandle(() => {
this.getById(this.siteInfo);
@@ -228,7 +233,7 @@ export default {
this.wxPay(res.data);
});
},
- // 定位权限是否开启检测
+ // 检测定位权限是否开启
hasLocationAuthHandle(callback = () => {}) {
const appInstance = getApp();
let { hasLocationAuth } = appInstance.globalData;
@@ -253,7 +258,7 @@ export default {
}
return true;
},
- // 距离检测
+ // 检测距离
async beyondDistance() {
let { juli, siteName, siteId, id } = this.siteInfo;
if (juli > 10000) {
@@ -450,26 +455,26 @@ export default {
font-weight: 500;
}
}
-.illustrate {
- min-height: 30vh;
- > .title {
- position: relative;
- padding: 30rpx 0;
- text-align: center;
- > uni-icons {
- position: absolute;
- top: 50%;
- right: 30rpx;
- transform: translateY(-50%);
- }
- }
- > .text {
- padding: 0 20rpx;
- text-align: center;
- font-size: 28rpx;
- color: #999;
- }
-}
+// .illustrate {
+// min-height: 30vh;
+// > .title {
+// position: relative;
+// padding: 30rpx 0;
+// text-align: center;
+// > uni-icons {
+// position: absolute;
+// top: 50%;
+// right: 30rpx;
+// transform: translateY(-50%);
+// }
+// }
+// > .text {
+// padding: 0 20rpx;
+// text-align: center;
+// font-size: 28rpx;
+// color: #999;
+// }
+// }
.container {
min-height: 100vh;
background: #f6f6f6;
@@ -493,6 +498,7 @@ export default {
color: #333;
}
&:nth-of-type(2) {
+ color: #999;
font-size: 24rpx;
}
}
@@ -507,6 +513,17 @@ export default {
font-size: 25rpx;
color: #999;
}
+ &:nth-of-type(4) {
+ margin-top: 10rpx;
+ > view {
+ display: inline-block;
+ padding: 3rpx 10rpx;
+ font-size: 18rpx;
+ color: #33333390;
+ border: 1rpx solid #999;
+ border-radius: 6rpx;
+ }
+ }
&.nav {
position: absolute;
bottom: 20rpx;
diff --git a/src/subPackages/site/search/index.vue b/src/subPackages/site/search/index.vue
index 9581459..76d66d0 100644
--- a/src/subPackages/site/search/index.vue
+++ b/src/subPackages/site/search/index.vue
@@ -29,20 +29,20 @@
@click="jumpDetails(item)"
>
- ¥{{ item.sitePrice || 0 }}/L
+
+ ¥
+ {{ item.sitePrice || 0 }}
+ /L
+
油站价¥{{ item.oilSitePrice }}/L
{{ item.siteName }}
{{ item.address }}
- 加100升约省{{
- item.oilSitePrice | conserveFilter(item.sitePrice)
- }}
+
+ 加100升约省
+ {{ item.oilSitePrice | conserveFilter(item.sitePrice) }}
+
{{ item.juli | distanceFilter }}km
diff --git a/src/utils/request.js b/src/utils/request.js
index 24cfbed..b4ecf67 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -15,25 +15,35 @@ const instance = axios.create({
timeout: 10000,
});
+let token = "";
+let unionId = "";
+let openId = "";
+
instance.interceptors.request.use(
(config) => {
- if (!config.HIDELODING) {
+ if (!config.hideLoading) {
uni.showLoading({
title: "加载中...",
});
}
- const token = uni.getStorageSync("Authorization");
- const unionId = uni.getStorageSync("unionid");
- const openId = uni.getStorageSync("openid");
+ if (!token) {
+ token = uni.getStorageSync("Authorization") || " ";
+ }
+ if (!unionId) {
+ unionId = uni.getStorageSync("unionid") || " ";
+ }
+ if (!openId) {
+ openId = uni.getStorageSync("openid") || " ";
+ }
config.headers["imei"] = unionId;
config.headers["openId"] = openId;
- config.headers["Authorization"] = token;
config.headers["dataSources"] = "MP";
config.headers["loginSystem"] = "MINI_APP";
config.headers["loginDevice"] = "LOGIN_MP_WECHAT";
config.headers["accountSources"] = "LOGIN_MP_WECHAT";
+ config.headers["Authorization"] = token;
if (env === "production") {
const JSESSIONID = utils.uuid();