更新
This commit is contained in:
15
src/App.vue
15
src/App.vue
@@ -6,7 +6,7 @@ export default {
|
|||||||
latitude: 39.5426,
|
latitude: 39.5426,
|
||||||
longitude: 116.23292,
|
longitude: 116.23292,
|
||||||
},
|
},
|
||||||
appId: "wxed3e2914d6aa4d52",
|
appId: "wx9995c9f495efa82e",
|
||||||
hasLocationAuth: true,
|
hasLocationAuth: true,
|
||||||
},
|
},
|
||||||
onLaunch: function () {
|
onLaunch: function () {
|
||||||
@@ -37,4 +37,17 @@ export default {
|
|||||||
view {
|
view {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
.common-empty {
|
||||||
|
&.img {
|
||||||
|
display: block;
|
||||||
|
width: 500rpx;
|
||||||
|
margin: 100rpx auto 0;
|
||||||
|
}
|
||||||
|
&.text {
|
||||||
|
margin-top: 30rpx;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 28rpx;
|
||||||
|
color: #999;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
/* 快应用特有相关 */
|
/* 快应用特有相关 */
|
||||||
},
|
},
|
||||||
"mp-weixin": {
|
"mp-weixin": {
|
||||||
/* 微信小程序特有相关 */ "appid": "wxed3e2914d6aa4d52",
|
/* 微信小程序特有相关 */ "appid": "wx9995c9f495efa82e",
|
||||||
"setting": {
|
"setting": {
|
||||||
"urlCheck": false
|
"urlCheck": false
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -25,34 +25,44 @@
|
|||||||
<view @click="select">{{ paramter.params.oilProductCode }} · 筛选</view>
|
<view @click="select">{{ paramter.params.oilProductCode }} · 筛选</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="site">
|
<view class="site">
|
||||||
<view
|
<template v-if="tableList.length">
|
||||||
class="item"
|
<view
|
||||||
v-for="(item, index) in tableList"
|
class="item"
|
||||||
:key="index"
|
v-for="(item, index) in tableList"
|
||||||
@click="jumpDetails(item)"
|
:key="index"
|
||||||
>
|
@click="jumpDetails(item)"
|
||||||
<view class="left">
|
>
|
||||||
<view
|
<view class="left">
|
||||||
>¥<text>{{ item.sitePrice || 0 }}</text
|
<view
|
||||||
>/L</view
|
>¥<text>{{ item.sitePrice || 0 }}</text
|
||||||
>
|
>/L</view
|
||||||
<view>油站价¥{{ item.oilSitePrice }}/L</view>
|
>
|
||||||
</view>
|
<view>油站价¥{{ item.oilSitePrice }}/L</view>
|
||||||
<view class="right">
|
</view>
|
||||||
<view>{{ item.siteName }}</view>
|
<view class="right">
|
||||||
<view>{{ item.address }}</view>
|
<view>{{ item.siteName }}</view>
|
||||||
<view style="opacity: 1"
|
<view>{{ item.address }}</view>
|
||||||
>加100升约省{{
|
<view style="opacity: 1"
|
||||||
item.oilSitePrice | conserveFilter(item.sitePrice)
|
>加100升约省{{
|
||||||
}}元</view
|
item.oilSitePrice | conserveFilter(item.sitePrice)
|
||||||
>
|
}}元</view
|
||||||
<view @click.stop="openMap(item)">
|
>
|
||||||
<image src="/static/index/home/nav.png" mode="" />
|
<view @click.stop="openMap(item)">
|
||||||
{{ item.juli | distanceFilter }}km
|
<image src="/static/index/home/nav.png" mode="" />
|
||||||
|
{{ item.juli | distanceFilter }}km
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
<view class="tip" v-show="isReachBottom">- 到底了 -</view>
|
||||||
<view class="tip" v-show="isReachBottom">- 到底了 -</view>
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<image
|
||||||
|
class="common-empty img"
|
||||||
|
src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/empty.png"
|
||||||
|
mode="widthFix"
|
||||||
|
/>
|
||||||
|
<view class="common-empty text">暂无油站信息</view>
|
||||||
|
</template>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
|
|||||||
@@ -19,51 +19,61 @@
|
|||||||
@scrolltolower="scrolltolower"
|
@scrolltolower="scrolltolower"
|
||||||
>
|
>
|
||||||
<view class="frame">
|
<view class="frame">
|
||||||
<view
|
<template v-if="tableList.length">
|
||||||
class="item"
|
<view
|
||||||
v-for="(item, index) in tableList"
|
class="item"
|
||||||
:key="index"
|
v-for="(item, index) in tableList"
|
||||||
@click="jumpDetails(item)"
|
:key="index"
|
||||||
>
|
@click="jumpDetails(item)"
|
||||||
<view>
|
>
|
||||||
<text>{{ item.siteName }}</text>
|
<view>
|
||||||
<view
|
<text>{{ item.siteName }}</text>
|
||||||
:style="{
|
<view
|
||||||
color: orderStatus.find(
|
:style="{
|
||||||
(_item) => _item.value === item.orderStatus + ''
|
color: orderStatus.find(
|
||||||
).color,
|
(_item) => _item.value === item.orderStatus + ''
|
||||||
}"
|
).color,
|
||||||
>
|
}"
|
||||||
<view>
|
>
|
||||||
{{
|
<view>
|
||||||
orderStatus.find(
|
{{
|
||||||
(_item) => _item.value === item.orderStatus + ""
|
orderStatus.find(
|
||||||
).label
|
(_item) => _item.value === item.orderStatus + ""
|
||||||
}}
|
).label
|
||||||
</view>
|
}}
|
||||||
<view v-if="item.orderStatus == 0 && item.countdown">
|
</view>
|
||||||
剩余支付时间 {{ item.countdown }}
|
<view v-if="item.orderStatus == 0 && item.countdown">
|
||||||
|
剩余支付时间 {{ item.countdown }}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view>
|
||||||
|
<text>油品: {{ item.oilsCode }}</text>
|
||||||
|
<text>升数: {{ item.volume }}L</text>
|
||||||
|
</view>
|
||||||
|
<view>
|
||||||
|
<text>加油金额: ¥{{ item.sitePriceAmount }}</text>
|
||||||
|
<text>实付金额: ¥{{ item.payRealAmount }}</text>
|
||||||
|
</view>
|
||||||
|
<view>
|
||||||
|
<text>下单时间: {{ item.createTime }}</text>
|
||||||
|
<view
|
||||||
|
v-if="item.orderStatus == 0"
|
||||||
|
@click.stop="getOrderPayInfo(item)"
|
||||||
|
>立即支付</view
|
||||||
|
>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view>
|
<view class="tip" v-show="isReachBottom">- 到底了 -</view>
|
||||||
<text>油品: {{ item.oilsCode }}</text>
|
</template>
|
||||||
<text>升数: {{ item.volume }}L</text>
|
<template v-else>
|
||||||
</view>
|
<image
|
||||||
<view>
|
class="common-empty img"
|
||||||
<text>加油金额: ¥{{ item.sitePriceAmount }}</text>
|
src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/empty.png"
|
||||||
<text>实付金额: ¥{{ item.payRealAmount }}</text>
|
mode="widthFix"
|
||||||
</view>
|
/>
|
||||||
<view>
|
<view class="common-empty text">还没有订单哦~</view>
|
||||||
<text>下单时间: {{ item.createTime }}</text>
|
</template>
|
||||||
<view
|
|
||||||
v-if="item.orderStatus == 0"
|
|
||||||
@click.stop="getOrderPayInfo(item)"
|
|
||||||
>立即支付</view
|
|
||||||
>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="tip" v-show="isReachBottom">- 到底了 -</view>
|
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -21,34 +21,44 @@
|
|||||||
@refresherrefresh="refresherrefresh"
|
@refresherrefresh="refresherrefresh"
|
||||||
>
|
>
|
||||||
<view class="site">
|
<view class="site">
|
||||||
<view
|
<template v-if="tableList.length">
|
||||||
class="item"
|
<view
|
||||||
v-for="(item, index) in tableList"
|
class="item"
|
||||||
:key="index"
|
v-for="(item, index) in tableList"
|
||||||
@click="jumpDetails(item)"
|
:key="index"
|
||||||
>
|
@click="jumpDetails(item)"
|
||||||
<view class="left">
|
>
|
||||||
<view
|
<view class="left">
|
||||||
>¥<text>{{ item.sitePrice || 0 }}</text
|
<view
|
||||||
>/L</view
|
>¥<text>{{ item.sitePrice || 0 }}</text
|
||||||
>
|
>/L</view
|
||||||
<view>油站价¥{{ item.oilSitePrice }}/L</view>
|
>
|
||||||
</view>
|
<view>油站价¥{{ item.oilSitePrice }}/L</view>
|
||||||
<view class="right">
|
</view>
|
||||||
<view>{{ item.siteName }}</view>
|
<view class="right">
|
||||||
<view>{{ item.address }}</view>
|
<view>{{ item.siteName }}</view>
|
||||||
<view style="opacity: 1"
|
<view>{{ item.address }}</view>
|
||||||
>加100升约省{{
|
<view style="opacity: 1"
|
||||||
item.oilSitePrice | conserveFilter(item.sitePrice)
|
>加100升约省{{
|
||||||
}}</view
|
item.oilSitePrice | conserveFilter(item.sitePrice)
|
||||||
>
|
}}</view
|
||||||
<view @click.stop="openMap(item)">
|
>
|
||||||
<image src="/static/index/home/nav.png" mode="" />
|
<view @click.stop="openMap(item)">
|
||||||
{{ item.juli | distanceFilter }}km
|
<image src="/static/index/home/nav.png" mode="" />
|
||||||
|
{{ item.juli | distanceFilter }}km
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
<view class="tip" v-show="isReachBottom">- 到底了 -</view>
|
||||||
<view class="tip" v-show="isReachBottom">- 到底了 -</view>
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<image
|
||||||
|
class="common-empty img"
|
||||||
|
src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/empty.png"
|
||||||
|
mode="widthFix"
|
||||||
|
/>
|
||||||
|
<view class="common-empty text">暂无油站信息</view>
|
||||||
|
</template>
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import utils from "@/utils/encode";
|
|||||||
let env;
|
let env;
|
||||||
env = "test";
|
env = "test";
|
||||||
// env = "production";
|
// env = "production";
|
||||||
let testUrl = "http://192.168.110.230:38080";
|
let testUrl = "http://192.168.110.77:38080";
|
||||||
|
|
||||||
let productUrl = "http://uat.xingoil.com/guest-api";
|
let productUrl = "http://uat.xingoil.com/guest-api";
|
||||||
// let productUrl = "https://www.xingoil.com/adminapi";
|
// let productUrl = "https://www.xingoil.com/adminapi";
|
||||||
|
|||||||
Reference in New Issue
Block a user