dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-01-19 17:37:04 +08:00
commit dd2eb971a3
20 changed files with 181 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gasStation-uni/components/tabbar/tabbar.vue
View File

@ -2,26 +2,27 @@
<view class="bar">
<view class="barbox" @click="gogogo(1)">
<view class="bar-img">
<image v-show="actindex == 1" src="../../static/imgs/homex.png" mode=""></image>
<image v-show="actindex != 1" src="../../static/imgs/home.png" mode=""></image>
<image v-if="actindex == 1" src="../../static/imgs/homex.png" mode="aspectFit"></image>
<image v-if="actindex != 1" src="../../static/imgs/home.png" mode="aspectFit"></image>
</view>
<view class="">首页</view>
</view>
<view class="barbox" @click="gogogo(2)">
<view class="centerbox">
<view class="qiu">
<image src="../../static/imgs/jy.png" mode=""></image>
<image src="../../static/imgs/jy.png" mode="aspectFit"></image>
</view>
</view>
<view class="">一键加油</view>
</view>
<view class="barbox" @click="gogogo(3)">
<view class="bar-img">
<image v-show="actindex == 3" src="../../static/imgs/myx.png" mode=""></image>
<image v-show="actindex != 3" src="../../static/imgs/my.png" mode=""></image>
<image v-if="actindex == 3" src="../../static/imgs/myx.png" mode="aspectFit"></image>
<image v-if="actindex != 3" src="../../static/imgs/my.png" mode="aspectFit"></image>
</view>
<view class="">我的</view>
</view>
</view>
</template>
@ -114,13 +115,13 @@
}
.bar-img {
width: 25px;
height: 25px;
width: 50rpx;
height: 50rpx;
margin: 0px auto;
image {
width: 100%;
height: 100%;
width: 50rpx;
height: 50rpx;
}
}
</style>
</style>

9
gasStation-uni/config.js
View File

@ -1,14 +1,7 @@
// 应用全局配置
module.exports = {
// baseUrl: 'https://vue.ruoyi.vip/prod-api',
// baseUrl: 'http://192.168.0.196:8081/',
// baseUrl: 'http://192.168.1.4:8080/',
<<<<<<< HEAD
baseUrl: 'http://192.168.0.178:8008/',
=======
baseUrl: 'http://192.168.0.138:8008/',
>>>>>>> 0ec2ff3c9193e4196b86613616f090a7bfc9f75a
// baseUrl: 'http://192.168.1.5:8002/cdJdc',
imagesUrl: 'http://www.nuoyunr.com/lananRsc',
// 应用信息
@ -32,4 +25,4 @@ module.exports = {
}
]
}
}
}

3
gasStation-uni/mini.project.json Normal file
View File

@ -0,0 +1,3 @@
{
"format": 2
}

18
gasStation-uni/pages.json
View File

@ -19,12 +19,20 @@
{
"root": "pagesLogin",
"pages": [{
"path": "login/login",
"style": {
"navigationBarTitleText": "登录",
"navigationStyle": "custom"
"path": "login/login",
"style": {
"navigationBarTitleText": "登录",
"navigationStyle": "custom"
}
},
{
"path": "login/webview",
"style": {
"navigationBarTitleText": "声明",
"navigationStyle": "custom"
}
}
}]
]
},
{
"root": "pagesHome",

20
gasStation-uni/pages/index/index.vue
View File

@ -28,25 +28,25 @@
<view class="conttainer-jg">
<view class="jg-box" @click="toQRcode">
<view class="jg-img">
<image src="../../static/imgs/viprwm.png" mode=""></image>
<image src="../../static/imgs/viprwm.png" mode="aspectFit"></image>
</view>
<view class="jg-size">二维码</view>
</view>
<view class="jg-box" @click="goActivity()">
<view class="jg-img">
<image src="../../static/imgs/bzhd.png" mode=""></image>
<image src="../../static/imgs/bzhd.png" mode="aspectFit"></image>
</view>
<view class="jg-size">本站活动</view>
</view>
<view class="jg-box" @click="goCard()">
<view class="jg-img">
<image src="../../static/imgs/ykcz.png" mode=""></image>
<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=""></image>
<image src="../../static/imgs/jfsc.png" mode="aspectFit"></image>
</view>
<view class="jg-size">积分商城</view>
</view>
@ -385,8 +385,8 @@
// 谷歌使用wgs84 其他使用gcj02
type: 'gcj02', // 使用国测局坐标系
success: function(res) {
if (_this.longitude=="" && _this.latitude =="") {
if (_this.longitude == "" && _this.latitude == "") {
_this.longitude = res.longitude;
_this.latitude = res.latitude
}
@ -398,7 +398,7 @@
data: {
"lon": _this.longitude,
"lat": _this.latitude,
"storeId":storeId
"storeId": storeId
},
}).then((response) => {
_this.distance = (Math.ceil(response.data.distance))
@ -517,7 +517,7 @@
longitude
}) => { // 选择位置完成后的处理
// this.addressName = address;
console.log(name,address,latitude,longitude);
console.log(name, address, latitude, longitude);
this.longitude = longitude;
this.latitude = latitude;
this.getAddress()
@ -639,8 +639,8 @@
height: 38px;
image {
width: 100%;
height: 100%;
width: 38px;
height: 38px;
}
margin: 5px auto;

16
gasStation-uni/pages/my/my.vue
View File

@ -10,8 +10,8 @@
<view class="dis">
<view class="touxiang" @click="goSetup">
<image v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined"
:src="baseUrl + user.avatar" mode=""></image>
<image v-else src="../../static/imgs/myx.png" mode=""></image>
:src="baseUrl + user.avatar" mode="aspectFit"></image>
<image v-else src="../../static/imgs/myx.png" mode="aspectFit"></image>
</view>
<view class="">
<view class="user-tel" @click="goSetup">{{user.mobile}}</view>
@ -48,7 +48,7 @@
<view class="my-top-box" style="margin-top: 45px;">
<view class="centenr-sx" @click="goMyOrder(0)">
<view class="centenr-img">
<image src="../../static/my/dingdan.png" mode=""></image>
<image src="../../static/my/dingdan.png" mode="aspectFit"></image>
</view>
<view class="centenr-size">
我的订单
@ -58,7 +58,7 @@
<view class="centenr-sx" @click="goMyOrder(1)">
<view class="centenr-img">
<image src="../../static/my/dsy.png" mode=""></image>
<image src="../../static/my/dsy.png" mode="aspectFit"></image>
</view>
<view class="centenr-size">
待使用
@ -67,7 +67,7 @@
<view class="centenr-sx" @click="goMyOrder(2)">
<view class="centenr-img">
<image src="../../static/my/ywc.png" mode=""></image>
<image src="../../static/my/ywc.png" mode="aspectFit"></image>
</view>
<view class="centenr-size">
已完成
@ -75,7 +75,7 @@
</view>
<view class="centenr-sx" @click="goMyOrder(3)">
<view class="centenr-img">
<image src="../../static/my/dpj.png" mode=""></image>
<image src="../../static/my/dpj.png" mode="aspectFit"></image>
</view>
<view class="centenr-size">
待评价
@ -95,7 +95,7 @@
</view>
<view class="centenr-sx" @click="goToDaby">
<view class="centenr-img">
<image src="../../static/my/jryj.png" mode=""></image>
<image src="../../static/my/jryj.png" mode="aspectFit"></image>
</view>
<view class="centenr-size">
今日油价
@ -105,7 +105,7 @@
<view class="centenr-sx" @click="goWriteoff()">
<view class="centenr-img">
<image src="../../static/my/jl.png" mode=""></image>
<image src="../../static/my/jl.png" mode="aspectFit"></image>
</view>
<view class="centenr-size">
核销记录

4
gasStation-uni/pages/refuel/refuel.vue
View File

@ -8,8 +8,8 @@
<view class="top-box">
<view class="dis" style="width: 78%;">
<view class="top-img">
<image v-if="store.logo==''||store.logo==null||store.logo==undefined" src="../../static/logo.png" mode=""></image>
<image v-else :src="baseUrl+store.logo" mode=""></image>
<image v-if="store.logo==''||store.logo==null||store.logo==undefined" src="../../static/logo.png" mode="aspectFit"></image>
<image v-else :src="baseUrl+store.logo" mode="aspectFit"></image>
</view>
<view style="width: 80%;">
<view class="top-title">{{store.name}}{{store.description ? "("+store.description+")" : ""}}

6
gasStation-uni/pagesHome/MyCard/MyCard.vue
View File

@ -15,7 +15,7 @@
<view class="card-cz">
<view class="card-top">
<view class="cardimg">
<image src="../../static/imgs/jyz.png" mode=""></image>
<image src="../../static/imgs/jyz.png" mode="aspectFit"></image>
</view>
<!-- <text>油站名称</text> -->
</view>
@ -48,7 +48,7 @@
<view class="card-ty">
<view class="card-top">
<view class="cardimg">
<image src="../../static/imgs/jyzb.png" mode=""></image>
<image src="../../static/imgs/jyzb.png" mode="aspectFit"></image>
</view>
<!-- <text style="color: #ffffff;">油站名称</text> -->
</view>
@ -84,7 +84,7 @@
<view class="card-lp">
<view class="card-top">
<view class="cardimg">
<image src="../../static/imgs/jyzb.png" mode=""></image>
<image src="../../static/imgs/jyzb.png" mode="aspectFit"></image>
</view>
<!-- <text style="color: #ffffff;">油站名称</text> -->
</view>

2
gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
View File

@ -20,7 +20,7 @@
<view class="t-b-box">
<view class="goodsimg">
<image :src="baseUrl+form.coverImage" mode=""></image>
<image :src="baseUrl+form.coverImage" mode="aspectFit"></image>
</view>
<view class="right-r-box">
<view class="-title">{{form.giftName}}</view>

6
gasStation-uni/pagesHome/PointsMall/PointsMall.vue
View File

@ -19,7 +19,7 @@
</view>
</view>
<view class="tp">
<image src="../../static/imgs/hby.png" mode=""></image>
<image src="../../static/imgs/hby.png" mode="aspectFit"></image>
</view>
</view>
@ -70,7 +70,7 @@
<view class="box-goods" v-for="(item,index) in integralGiftList" :key="index"
@click="godetails(item)">
<view class="goods-img">
<image :src="baseUrl+item.coverImage" mode=""></image>
<image :src="baseUrl+item.coverImage" mode="aspectFit"></image>
</view>
<view class="goods-title">
{{item.giftName}}
@ -78,7 +78,7 @@
<view class="good-red">
<view style="display: flex;align-items: center;">
<view class="bi" v-if="item.exchangeMethod != '金额'">
<image src="../../static/imgs/jb.png" mode=""></image>
<image src="../../static/imgs/jb.png" mode="aspectFit"></image>
</view>
<view style="color: #FC1708;font-weight: bold;">
<span

2
gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
View File

@ -22,7 +22,7 @@
<view class="goods-box" v-for="(item,index) in orderList" :key="item.id" @click="orderDetails(item)">
<view class="goods-top">
<view class="goods-img">
<image :src="baseUrl+item.coverImage" mode=""></image>
<image :src="baseUrl+item.coverImage" mode="aspectFit"></image>
</view>
<view class="nr-tip">
<view class="title-s">{{item.giftName}}</view>

38
gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
View File

@ -44,6 +44,7 @@
<!-- 底部 -->
</view>
<view class="bottom-box">
<view class="anniu" @click="addValueCarRecords()">
<text>立即充值</text>
@ -84,6 +85,8 @@
{{index+1}}.{{item || "" }}
</view>
</view>
<view class="box-gang">
<view class="">推荐员工</view>
<view class=""></view>
@ -92,6 +95,7 @@
</view>
</view>
<!-- 底部 -->
<view class="bottom-box">
<view class="anniu" @click="addFuleCarRecords()">
@ -136,7 +140,17 @@
</view>
</view>
<u-picker :show="show" :columns="columns" keyName="realName" @confirm="confirm" @cancel="cancel"></u-picker>
<!-- <u-picker :show="show" :columns="columns" keyName="realName" @confirm="confirm" @cancel="cancel"></u-picker> -->
<u-popup :show="show" :round="10" mode="bottom" @close="close" @open="open">
<view class="bottom-bb">
<view class="" v-for="(item,index) in columns" :key="index" style="margin-bottom: 10px;">
<u-button @click="confirm(item)" type="primary" :plain="true" :text="item.realName"></u-button>
</view>
<!-- <view class="" v-for="(item,index) in columns" :key="index">
{{item.realName}}
</view> -->
</view>
</u-popup>
<u-modal :show="shows" :title="message" :content='money' @confirm="confirms()"></u-modal>
</view>
</view>
@ -224,6 +238,12 @@
this.getStaffList()
},
methods: {
open() {
console.log();
},
close() {
this.show = false
},
//囤油卡充值
addFuleCarRecords() {
if (this.staffId == '') {
@ -369,8 +389,8 @@
},
confirm(e) {
console.log(e);
this.staffId = e.value[0].id
this.yname = e.value[0].realName
this.staffId = e.id
this.yname = e.realName
this.show = false
},
cancel() {
@ -506,7 +526,8 @@
storeId: uni.getStorageSync("storeId")
}
}).then(res => {
this.columns.push(res.data.records)
this.columns = res.data.records
// this.columns.push(res.data.records)
console.log("columns", this.columns);
})
@ -696,4 +717,13 @@
width: 20%;
}
.bottom-bb {
width: 100%;
height: 200px;
box-sizing: border-box;
padding: 10px;
background: white;
overflow: scroll;
}
</style>

4
gasStation-uni/pagesHome/order/order.vue
View File

@ -17,7 +17,7 @@
<view class="dis">
<!-- <uni-icons type="location-filled" size="20"></uni-icons> -->
<view class="boximg">
<image :src="logo?baseUrl+logo:'../../static/logo.png'" mode=""></image>
<image :src="logo?baseUrl+logo:'../../static/logo.png'" mode="aspectFit"></image>
</view>
<view class="">
<view class="">{{storeName}}</view>
@ -52,7 +52,7 @@
<view class="box-bait">
<view class="dis-box">
<view class="goodsimg">
<image :src='baseUrl+goodsInfo.coverImage' mode=""></image>
<image :src='baseUrl+goodsInfo.coverImage' mode="aspectFit"></image>
</view>
<view class="">
<view class="">{{goodsInfo.giftName}}</view>

78
gasStation-uni/pagesLogin/login/webview.vue Normal file
View File

@ -0,0 +1,78 @@
<template>
<view class="">
<view class="my-header">
<view class="my-icons" @click="goback"> <uni-icons type="left" size="16"></uni-icons> </view>
<view class="my-text">声明</view>
<view class="my-icons"></view>
</view>
<view class="">
<view class="content" v-html="text">
</view>
</view>
</view>
</template>
<script>
import {
str
} from "../../utils/privacyPolicy.js";
export default {
data() {
return {
text: ""
}
},
onShow() {
this.text = str;
},
methods: {
goback() {
uni.navigateBack()
}
}
}
</script>
<style socped lang="less">
.content {
padding: 20rpx;
}
.content {
background: #fff;
}
.container {
width: 100%;
height: 100vh;
box-sizing: border-box;
padding-top: 88px;
}
.my-header {
width: 100%;
height: 88px;
background: #ffffff;
display: flex;
align-items: center;
justify-content: space-between;
color: #000;
box-sizing: border-box;
padding: 0px 15px;
padding-top: 40px;
z-index: 99999;
.my-icons {
width: 20px;
}
position: fixed;
top: 0px;
}
</style>

2
gasStation-uni/pagesMy/Coupons/Coupons.vue
View File

@ -20,7 +20,7 @@
<view class="left-img">
<view class="huiz" v-if="item.couponType == '优惠券'">￥{{item.couponAmount}}</view>
<view class="hui-icon" v-if="item.couponType != '优惠券'">
<image src="../../static/imgs/iconcar.png" mode=""></image>
<image src="../../static/imgs/iconcar.png" mode="aspectFit"></image>
</view>
<view class="cbai">{{item.couponType}}</view>
</view>

4
gasStation-uni/pagesMy/VIP/vip.vue
View File

@ -32,7 +32,7 @@
<u-line-progress :percentage="30" activeColor="#2F72F7"></u-line-progress>
</view>
<view class="right-img">
<image src="../../static/imgs/vipxz.png" mode=""></image>
<image src="../../static/imgs/vipxz.png" mode="aspectFit"></image>
</view>
</view>
</view>
@ -44,7 +44,7 @@
<view class="box-ba" v-for="(item,index) in oilNameList" :key="index">
<view class="min-box">
<image :src="item.imgurl" mode=""></image>
<image :src="item.imgurl" mode="aspectFit"></image>
</view>
<view class="mu_">{{item.name}}</view>
</view>

2
gasStation-uni/pagesMy/comment/comment.vue
View File

@ -13,7 +13,7 @@
<view class="c-box-top">您对工作人员满意吗</view>
<view class="dis">
<view class="touxiang">
<image src="../../static/imgs/myx.png" mode=""></image>
<image src="../../static/imgs/myx.png" mode="aspectFit"></image>
</view>
<view class="">
<view class="username">username(13583017106)</view>

4
gasStation-uni/pagesMy/invite/invite.vue
View File

@ -9,7 +9,7 @@
</view>
<view class="faimg">
<view class="box-img">
<image src="../../static/imgs/fmbj.png" mode=""></image>
<image src="../../static/imgs/fmbj.png" mode="aspectFit"></image>
</view>
<view class="hbbox">
<view class="h-box">
@ -45,7 +45,7 @@
<view class="t-box" v-for="(item,index) in activeRecommendRecordsList" :key="index">
<view class="diss">
<view class="touxiang">
<image src="../../static/imgs/myx.png" mode=""></image>
<image src="../../static/imgs/myx.png" mode="aspectFit"></image>
</view>
<view class="">
<view class="name-t">{{item.inviteeUserName}}</view>

4
gasStation-uni/pagesMy/setup/index.vue
View File

@ -10,8 +10,8 @@
<button class="box-hang" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<view class="">头像</view>
<view class="touxiang">
<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined" :src="baseUrl + user.avatar" mode=""></image>
<image class="touxiang" v-else src="@/static/imgs/myx.png" mode=""></image>
<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined" :src="baseUrl + user.avatar" mode="aspectFit"></image>
<image class="touxiang" v-else src="@/static/imgs/myx.png" mode="aspectFit"></image>
</view>
</button>
<view class="box-hang" @click="goEdit(0)">

6
gasStation-uni/pagesRefuel/pagesRefuel/index.vue
View File

@ -19,7 +19,7 @@
<view class="box-top">
<view class="dis">
<view class="touxiang">
<image src="../../static/imgs/bzhd.png" mode=""></image>
<image src="../../static/imgs/bzhd.png" mode="aspectFit"></image>
</view>
<view class="box-top-size">
<view class="box-title">
@ -52,7 +52,7 @@
<view class="box-bottom">
<view class="box-bottom-anniu">
<view class="bottom-icon">
<image src="../../static/icon/daohang.png" mode=""></image>
<image src="../../static/icon/daohang.png" mode="aspectFit"></image>
</view>
<view class="">到这去</view>
</view>
@ -61,7 +61,7 @@
</view>
<view class="box-bottom-anniu">
<view class="bottom-icon">
<image src="../../static/icon/jiayou.png" mode=""></image>
<image src="../../static/icon/jiayou.png" mode="aspectFit"></image>
</view>
<view class="" @click="toRefuel(item.store)">去加油</view>
</view>