This commit is contained in:
xvv 2024-09-12 18:18:02 +08:00
parent bea205f876
commit b01edd5d1a
7 changed files with 346 additions and 1217 deletions

View File

@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/' VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址 # 后端接口地址
VUE_APP_SERVER_URL = 'http://127.0.0.1:8080/' VUE_APP_SERVER_URL = 'http://127.0.0.1:8081/'
# http://192.168.0.121:8080/ # http://192.168.0.121:8080/

View File

@ -1,11 +1,10 @@
# \u57FA\u672C\u914D\u7F6E # \u57FA\u672C\u914D\u7F6E
server.port=8080 server.port=8081
env.profile=dev env.profile=dev
#env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/ #env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/ #env.properties.path=F:/work/oilSystem/fuintBackend/configure/
#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/ env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
#env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure #env.properties.path=D:/work/oilSystem/fuintBackend/configure/
env.properties.path=D:/Code/yuzhan/oil-station/fuintBackend/configure
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/ #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
# \u6570\u636E\u5E93\u914D\u7F6E # \u6570\u636E\u5E93\u914D\u7F6E

View File

@ -1,16 +0,0 @@
{ // launch.json configurations app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtypelocalremote, localremote
"version": "0.0",
"configurations": [{
"default" :
{
"launchtype" : "local"
},
"mp-weixin" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
}
]
}

View File

@ -5,7 +5,7 @@ module.exports = {
// baseUrl: 'https://www.tuofeng.cc/oilAdmin/', // baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
// baseUrl: 'https://oilapi.youkerr.com/oilAdmin/', // baseUrl: 'https://oilapi.youkerr.com/oilAdmin/',
// baseUrl: 'https://8q4f124343.yicp.fun/', // baseUrl: 'https://8q4f124343.yicp.fun/',
baseUrl: 'http://192.168.31.96:8080/', baseUrl: 'http://192.168.31.178:8080/',
// baseUrl: 'http://192.168.1.5:8002/cdJdc', // baseUrl: 'http://192.168.1.5:8002/cdJdc',
imagesUrl: 'http://www.nuoyunr.com/lananRsc', imagesUrl: 'http://www.nuoyunr.com/lananRsc',
// 应用信息 // 应用信息

File diff suppressed because it is too large Load Diff

View File

@ -50,6 +50,13 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{
"path": "memberRecharge/index",
"style": {
"navigationBarTitleText": "会员充值"
}
},
{ {
"path": "RechargeRecords/RechargeRecords", "path": "RechargeRecords/RechargeRecords",
"style": { "style": {
@ -307,8 +314,8 @@
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "首页", "navigationBarTitleText": "百业兴智慧加油站"
"navigationStyle": "custom" // "navigationStyle": "custom"
} }
}, },
{ {
@ -329,7 +336,7 @@
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app", "navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8", "navigationBarBackgroundColor": "#fff",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
}, },
"uniIdRouter": {} "uniIdRouter": {}

View File

@ -1,147 +1,117 @@
<template> <template>
<view class="content"> <view class="content">
<view class="container"> <view class="container">
<!--外层 -->
<!-- 顶部 --> <!-- 顶部 -->
<view class="conttainer-top">
<!-- 轮播图 -->
<view style="width: 100%;height: 300px;">
<swiper class="swiper" style="width: 100%;height: 300px;" circular :indicator-dots="indicatorDots"
:autoplay="autoplay" :interval="interval" :duration="duration">
<swiper-item v-for="(item,index) in list1" :key="index" @click="goPage(item.routeUrl)">
<view class="swiper-item uni-bg-red">
<image style="width: 100%;" :src="item.bannerUrl"></image> <swiper class="swiper" style="width: 100%;height: 160px; border-radius: 6px;overflow: hidden; " circular
</view> :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
<!-- <image style="width: 100%;" :src="getBannerUrl(item.bannerUrl)"></image> --> <swiper-item v-for="(item,index) in 3" :key="index" @click="goPage(item.routeUrl)">
</swiper-item> <view class="swiper-item uni-bg-red">
</swiper> <image src="../../static/new/banners.png" style="height: 163px; width: 100%;"></image>
</view>
<!-- 标题 -->
<view class="top-title">
出行服务 优惠加油
</view>
<view class="lan-gang">
<view class="lsiez"> <uni-icons type="checkbox" color="#ffffff" size="10"></uni-icons> </view>
<view class="lsiez"> <uni-icons type="checkbox" color="#ffffff" size="10"></uni-icons> </view>
<view class="lsiez"> <uni-icons type="checkbox" color="#ffffff" size="10"></uni-icons> </view>
</view>
<!-- 金刚区 -->
<view class="conttainer-jg">
<view class="jg-box" @click="toQRcode">
<view class="jg-img">
<image src="../../static/imgs/viprwm.png" mode="aspectFit"></image>
</view>
<view class="jg-size">二维码</view>
</view> </view>
<view class="jg-box" @click="goActivity()"> </swiper-item>
<view class="jg-img"> </swiper>
<image src="../../static/imgs/bzhd.png" mode="aspectFit"></image>
</view>
<view class="jg-size">本站活动</view>
</view>
<view class="jg-box" @click="goCard()" v-if="isOpen">
<view class="jg-img">
<image src="../../static/imgs/ykcz.png" mode="aspectFit"></image>
</view>
<view class="jg-size">油卡充值</view>
</view>
<view class="jg-box" @click="goMall()">
<view class="jg-img">
<image src="../../static/imgs/jfsc.png" mode="aspectFit"></image>
</view>
<view class="jg-size">积分商城</view>
</view>
</view>
<!-- 金刚区结束 -->
</view>
<!-- 顶部结束 --> <!-- 顶部结束 -->
<!-- centenr --> <view class="_jgbox">
<view class="conttainer-cetr"> <view class="_bgox">
<view class="conttainer-title">今日会员价</view> <image src="../../static/new/n1.png" mode=""></image>
<!-- <view class="conttainer-box" v-for="(item,index) in oilTypeList" :key="index"> <view class="">扫码买单</view>
<view class="c-box-box1"> </view>
<view class="">{{item.oilName||''}}</view> <view class="_bgox">
<image src="../../static/new/n2.png" mode=""></image>
</view> <view class="">一键加油</view>
<view class="c-box-box2"> </view>
<view class="xred">会员价</view> <view class="_bgox" @click="goMemberRecharge()">
<view class="dred"> <text class="xred"></text> {{item.oilPrice||0}}</view> <image src="../../static/new/n3.png" mode=""></image>
</view> <view class="">会员充值</view>
<view class="c-box-box3"> </view>
<view class="xblck">国标价</view> <view class="_bgox">
<view class="dblck"> <text class="xblck"></text> {{item.gbPrice||0}}</view> <image src="../../static/new/n4.png" mode=""></image>
</view> <view class="">积分兑换</view>
</view> --> </view>
<view class="_bgox">
<swiper class="swiper" style="width: 100%;height: 70px;" circular :autoplay="autoplay" <image src="../../static/new/n5.png" mode=""></image>
:interval="interval" :vertical="true" :duration="duration"> <view class="">领券中心</view>
<swiper-item class="conttainer-box" v-for="(item,index) in oilTypeList" :key="index"> </view>
<view class="c-box-box1"> <view class="_bgox">
<view class="">{{item.oilName||''}}</view> <image src="../../static/new/n6.png" mode=""></image>
<view class="">邀请有礼</view>
</view> </view>
<view class="c-box-box2"> <view class="_bgox">
<view class="xred">会员价</view> <image src="../../static/new/n7.png" mode=""></image>
<view class="dred"> <text class="xred"></text> {{item.oilPrice||0}}</view> <view class="">每日抽奖</view>
</view> </view>
<view class="c-box-box3"> <view class="_bgox">
<view class="xblck">国标价</view> <image src="../../static/new/n8.png" mode=""></image>
<view class="dblck"> <text class="xblck"></text> {{item.gbPrice||0}}</view> <view class="">签到有礼</view>
</view> </view>
</swiper-item>
</swiper>
</view> </view>
<!-- centenr结束 --> <!-- 今日油价 -->
<!-- 加油站卡片--> <view class="_yjbox">
<view class="station"> <view class="title-img">
<view class="station-box"> <image src="../../static/new/t1.png" mode=""></image>
</view>
<view class="station-title" style="display: flex;justify-content: space-between;"> <view class="_gbox">
{{store.name}}{{store.description ? "("+store.description+")" : ""}} <view class="_ns">92#汽油</view>
<!-- <view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;"> <view class="_ns">¥8.99</view>
<view style="font-size: 12px;">切换位置 <uni-icons type="right" color="#304fff" <view class="_ns _lv">0.12%</view>
size="14"></uni-icons> </view> </view>
</view> --> <view class="_gbox">
</view><!--顺通石化加油站(工业南路站)--> <view class="_ns">92#汽油</view>
<view style="display: flex;"> <view class="_ns">¥8.99</view>
<view class="bule-icon" v-if="welfare.length!=0" v-for="(item,index) in welfare" :key="index"> <view class="_ns _red">0.12%</view>
{{item}} </view>
</view> <view class="_gbox">
<view class="_ns">92#汽油</view>
<view class="_ns">¥8.99</view>
<view class="_ns _red">0.12%</view>
</view>
<view class="_gbox">
<view class="_ns">92#汽油</view>
<view class="_ns">¥8.99</view>
<view class="_ns _red">0.12%</view>
</view>
</view>
<view class="station-box" @click="ruleShow = true ">
<view class="station-title" style="display: flex;justify-content: space-between;">
<view>{{store.name}}{{store.description ? "("+store.description+")" : ""}}</view>
<view class="lananniu" @click="goGoGo" v-if="distance!=''">
<uni-icons type="paperplane-filled" color="#E02020" size="16"></uni-icons>
导航
</view> </view>
<view class="dis-bt"> </view><!--顺通石化加油站(工业南路站)-->
<view class=""> <view style="display: flex;">
<view class="hui1">{{ store.address }}</view> <view class="bule-icon" v-if="welfare.length!=0" v-for="(item,index) in welfare" :key="index">
<view class="hui2" v-if="distance">{{ distance }}km</view> {{item}}
</view>
<view class="lananniu" @click="goGoGo" v-if="distance!=''">
<uni-icons type="paperplane-filled" color="#195ADA" size="16"></uni-icons>
{{ distance || "0" }}KM
</view>
</view>
<u-swiper :list="list3" previousMargin="30" nextMargin="30" circular :autoplay="false" radius="5"
bgColor="#ffffff"></u-swiper>
<view class="juanniu" @click="goOil()">
<view class="">一键加油</view>
</view> </view>
</view> </view>
<view style="height: 88px; width: 100%;"></view> <view class="dis-bt">
<view class="">
<view class="hui1">{{ store.address }} | {{ distance || 0 }}km </view>
<view class="hui2" v-if="distance"></view>
</view>
<!-- <view class="lananniu" @click="goGoGo" v-if="distance!=''">
<uni-icons type="paperplane-filled" color="#195ADA" size="16"></uni-icons>
{{ distance || "0" }}KM
</view> -->
</view>
</view> </view>
<!-- 加油站卡片结束--> <!-- 加油站卡片结束-->
<view style="width: 100%; height: 68px; "></view>
<u-picker :columns="columns" @confirm="confirm" :show="show" @cancel="show = false" <u-picker :columns="columns" @confirm="confirm" :show="show" @cancel="show = false"
keyName="label"></u-picker> keyName="label"></u-picker>
<u-overlay :show="shows == true"> <!-- <u-popup :show="ruleShow" mode="bottom" @close="close" @open="open">
<image src="../../static/imgs/zzxryl.png" <view class="_tbox">
style="width: 280px; height: 350px; margin: 20px auto; margin-top: 200px; "> <view class="_btop">百业兴加油站申请</view>
</image> <view class="">
<view class="anniuprp" @click="drawDown()"> <view class="">获取您的位置信息</view>
<text>立即领取</text> <view class="">我们将获取您的当前位置信息以便精准推荐</view>
</view>
<view class="b-cen"></view>
</view> </view>
</u-overlay> </u-popup> -->
<!--外层结束 --> <!--外层结束 -->
<tabbar :msg="msg"></tabbar> <tabbar :msg="msg"></tabbar>
</view> </view>
@ -159,6 +129,7 @@
export default { export default {
data() { data() {
return { return {
ruleShow: false,
isOpen: false, isOpen: false,
chainStoreId: '', chainStoreId: '',
indicatorDots: true, indicatorDots: true,
@ -280,6 +251,11 @@
tabbar tabbar
}, },
methods: { methods: {
goMemberRecharge() {
uni.navigateTo({
url: '/pagesHome/memberRecharge/index'
})
},
isRecharge() { isRecharge() {
request({ request({
url: 'business/storeInformation/store/isRecharge', url: 'business/storeInformation/store/isRecharge',
@ -785,19 +761,22 @@
<style scoped lang="scss"> <style scoped lang="scss">
.content { .content {
background: #ebf5ff; background: #f9f9f9;
box-sizing: border-box;
} }
.container { .container {
width: 100%; width: 100%;
height: 100vh; box-sizing: border-box;
padding: 10px;
// height: 100vh;
} }
.conttainer-top { .conttainer-top {
width: 100%; width: 100%;
height: 250px;
// background-color: #3da4df;
// background: url('http://47.95.206.185:83/topbj.png')center no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
position: relative; position: relative;
margin-bottom: 60px; margin-bottom: 60px;
@ -955,12 +934,12 @@
} }
.station-box { .station-box {
width: 95%; width: 100%;
background-color: white; background-color: white;
border-radius: 8px; border-radius: 8px;
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
margin: 0px auto; margin: 15px auto;
} }
.station-title { .station-title {
@ -971,13 +950,13 @@
.bule-icon { .bule-icon {
width: 85px; width: 85px;
font-size: 12px; font-size: 12px;
color: #195ADA; color: #333333;
box-sizing: border-box; box-sizing: border-box;
padding: 2px 5px; padding: 2px 2px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border: 1px solid #195ADA; border: 1px solid #FF9655;
border-radius: 4px; border-radius: 4px;
margin: 5px 3px; margin: 5px 3px;
} }
@ -1004,13 +983,13 @@
.lananniu { .lananniu {
box-sizing: border-box; box-sizing: border-box;
padding: 3px 10px; padding: 3px 10px;
background: #DBE9FF;
border-radius: 12px; border-radius: 12px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 14px; font-size: 14px;
color: #195ADA; color: #E02020;
} }
@ -1059,4 +1038,78 @@
color: white; color: white;
margin: 0 auto; margin: 0 auto;
} }
</style>
._jgbox {
width: 100%;
background: #fff;
box-sizing: border-box;
padding: 0px 15px;
display: flex;
flex-wrap: wrap;
margin: 10px auto;
}
.title-img {
text-align: center;
image {
height: 30px;
width: 100%;
}
}
._gbox {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
}
._ns {
width: 33%;
text-align: center;
margin: 10px auto;
}
._yjbox {
width: 100%;
background: #fff;
box-sizing: border-box;
}
._bgox {
width: 25%;
text-align: center;
font-size: 14px;
color: #333333;
margin: 10px auto;
image {
width: 50px;
height: 50px;
}
}
._lv {
color: #6DD400 !important;
}
._red {
color: #E02020 !important;
}
._tbox {
border-radius: 10px;
background: #fff;
width: 100%;
height: 100px;
}
.b-cen {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
}
</style>