9.19
This commit is contained in:
xvv
parent
5ec0803c60
commit
a5f16c5433
@ -50,6 +50,13 @@
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "check/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "扫码买单"
|
||||
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "PointsRedemption/index",
|
||||
"style": {
|
||||
@ -62,6 +69,18 @@
|
||||
"navigationBarTitleText": "卡券详情"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "certificate/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "领券中心"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "certificate/details",
|
||||
"style": {
|
||||
"navigationBarTitleText": "卡券详情"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "cardDetails/index",
|
||||
"style": {
|
||||
@ -348,8 +367,8 @@
|
||||
{
|
||||
"path": "pages/refuel/refuel",
|
||||
"style": {
|
||||
"navigationBarTitleText": "一键加油",
|
||||
"navigationStyle": "custom"
|
||||
"navigationBarTitleText": "一键加油"
|
||||
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@ -15,13 +15,10 @@
|
||||
<!-- 顶部结束 -->
|
||||
<view class="_jgbox">
|
||||
<view class="_bgox">
|
||||
<image src="../../static/new/n1.png" mode=""></image>
|
||||
<image src="../../static/new/n1.png" mode="" @click="getCode()"></image>
|
||||
<view class="">扫码买单</view>
|
||||
</view>
|
||||
<view class="_bgox">
|
||||
<image src="../../static/new/n2.png" mode=""></image>
|
||||
<view class="">一键加油</view>
|
||||
</view>
|
||||
|
||||
<view class="_bgox" @click="goMemberRecharge()">
|
||||
<image src="../../static/new/n3.png" mode=""></image>
|
||||
<view class="">会员充值</view>
|
||||
@ -30,7 +27,7 @@
|
||||
<image src="../../static/new/n4.png" mode=""></image>
|
||||
<view class="">积分兑换</view>
|
||||
</view>
|
||||
<view class="_bgox">
|
||||
<view class="_bgox" @click="goCoupon()">
|
||||
<image src="../../static/new/n5.png" mode=""></image>
|
||||
<view class="">领券中心</view>
|
||||
</view>
|
||||
@ -46,6 +43,10 @@
|
||||
<image src="../../static/new/n8.png" mode=""></image>
|
||||
<view class="">签到有礼</view>
|
||||
</view>
|
||||
<view class="_bgox" @click="goMyCard()">
|
||||
<image src="../../static/new/hykb.png" mode=""></image>
|
||||
<view class="">会员卡包</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 今日油价 -->
|
||||
<view class="_yjbox">
|
||||
@ -120,7 +121,6 @@
|
||||
<view class="_tbox">
|
||||
<view class="_btop">第三方用户信息授权说明</view>
|
||||
<view class="_bbox">
|
||||
|
||||
<view class="">您授权后，小程序开发者将收集您的位置信息，为您提 供智能推荐服务。开发者严格按照《钜油惠百业兴小程 序隐私保护指引》处理您的个人信息，如您发现开发者
|
||||
不当处理您的个人信息，可进行投诉。</view>
|
||||
</view>
|
||||
@ -270,6 +270,30 @@
|
||||
tabbar
|
||||
},
|
||||
methods: {
|
||||
goMyCard() {
|
||||
uni.navigateTo({
|
||||
url: '/pagesHome/MyCard/MyCard'
|
||||
})
|
||||
},
|
||||
getCode() {
|
||||
uni.scanCode({
|
||||
onlyFromCamera: true,
|
||||
success: (res) => {
|
||||
console.log('扫描二维码成功,结果:' + JSON.stringify(res) + res.result);
|
||||
uni.navigateTo({
|
||||
url: '/pagesHome/check/index'
|
||||
})
|
||||
},
|
||||
error: (res) => {
|
||||
console.log('扫描二维码出现错误')
|
||||
}
|
||||
})
|
||||
},
|
||||
goCoupon() {
|
||||
uni.navigateTo({
|
||||
url: '/pagesHome/certificate/index'
|
||||
})
|
||||
},
|
||||
close() {
|
||||
this.ruleShow = false
|
||||
},
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
<template>
|
||||
<view class="content">
|
||||
<view class="container">
|
||||
<view class="my-header">
|
||||
<!-- <view class="my-header">
|
||||
<view class="my-text">一键加油</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="top">
|
||||
<view class="top-box">
|
||||
<view class="dis" style="width: 78%;">
|
||||
<view class="dis">
|
||||
<view class="top-img">
|
||||
<image v-if="!store.logo" src="../../static/logo.png" mode="aspectFit"></image>
|
||||
<image v-else :src="baseUrl+store.logo" mode="aspectFit"></image>
|
||||
@ -15,20 +14,9 @@
|
||||
<view class="top-title">{{store.name}}{{store.description ? "("+store.description+")" : ""}}
|
||||
</view><!--九州加油站（总站）-->
|
||||
<view class="top-hui">{{store.address}}</view><!--平安大道东200米-->
|
||||
<view class="top-hong">￥{{oilPrice}}/{{oilUnit ? oilUnit : "L"}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="" @click="goRefuel" style="width: 22%;font-size: 14px;">
|
||||
<view class="bulu">切换站点 <uni-icons type="right" color="#304fff" size="16"></uni-icons> </view>
|
||||
|
||||
</view>
|
||||
<!-- <view class="bulu-icon">
|
||||
<view class=""></view>
|
||||
<view class="">比国标降 0.22 元 </view>
|
||||
</view> -->
|
||||
|
||||
</view>
|
||||
|
||||
<view v-if="appltType == 'ALIPAY'" style="height: 400px;overflow-y: scroll;">
|
||||
<view class="fa-box">
|
||||
<view class="fa-title">选择油号 <text class="top-hui"> 请务必与员工确认类型</text> </view>
|
||||
@ -140,10 +128,7 @@
|
||||
<uni-icons type="closeempty" size="30" @click="closeStaff"></uni-icons>
|
||||
</view>
|
||||
<view class="wrap-box1" style="margin-left: 5%;">
|
||||
<!-- <view class="box-oil2" :class=" {'xz' :sindex == index }" @click="getSIndex(index)"
|
||||
v-for="(item,index) in 19" :key="index">
|
||||
<text>{{index}}员工</text>
|
||||
</view> -->
|
||||
|
||||
<view class="box-oil2" :class=" {'xz' :sindex == index }" v-for="(item,index) in staffList"
|
||||
:key="index" @click="getSIndex(index,item.id)">
|
||||
<text>{{item.realName}}</text>
|
||||
@ -763,13 +748,13 @@
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
box-sizing: border-box;
|
||||
padding-top: 88px;
|
||||
|
||||
}
|
||||
|
||||
.my-header {
|
||||
width: 100%;
|
||||
height: 88px;
|
||||
background: #304fff;
|
||||
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@ -786,7 +771,7 @@
|
||||
.top {
|
||||
width: 100%;
|
||||
height: 200px;
|
||||
background-image: linear-gradient(180deg, #304fff, #ffffff);
|
||||
|
||||
box-sizing: border-box;
|
||||
padding: 1px;
|
||||
|
||||
@ -797,12 +782,12 @@
|
||||
height: 110px;
|
||||
background-color: #ffffff;
|
||||
border-radius: 8px;
|
||||
margin: 20px auto;
|
||||
margin: 10px auto;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-top: 60px;
|
||||
|
||||
}
|
||||
|
||||
.top-title {
|
||||
@ -812,7 +797,7 @@
|
||||
.top-img {
|
||||
width: 46px;
|
||||
height: 46px;
|
||||
background-color: #304fff;
|
||||
background-color: #eee;
|
||||
border-radius: 6px;
|
||||
overflow: hidden;
|
||||
margin-right: 10px;
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
<view class="centenr">
|
||||
<view class="Candywrapper">
|
||||
<view class="top-box" @click="goIntegral">
|
||||
|
||||
<view class="">积分余额</view>
|
||||
<view class="d-s">4800 <u-icon name="arrow-right"></u-icon> </view>
|
||||
</view>
|
||||
|
||||
158
gasStation-uni/pagesHome/certificate/details.vue
Normal file
158
gasStation-uni/pagesHome/certificate/details.vue
Normal file
@ -0,0 +1,158 @@
|
||||
<template>
|
||||
<view class="centenr">
|
||||
<view class="Candywrapper">
|
||||
<view class="bai-bs">
|
||||
<view class="">
|
||||
<image src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
|
||||
</view>
|
||||
<view class="rr-box">
|
||||
<view class="title_">50元优惠券</view>
|
||||
<view style="font-size: 12px;color: #666666;">最低消费500元</view>
|
||||
<view style="width: 100%;display: flex;justify-content: space-between; ">
|
||||
<view class="red-size">兑换券</view>
|
||||
<view class="red-size">剩余3张</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="bai-bs">
|
||||
<view class="title_">兑换数量</view>
|
||||
<u-number-box v-model="value" @change="valChange"></u-number-box>
|
||||
</view>
|
||||
<view class="bai-box">
|
||||
<view class="title_">兑换内容</view>
|
||||
<view class="si_">本兑换券为一次性使用券，持有人凭此券可在指定兑换
|
||||
点免费兑换一瓶可口可乐经典口味瓶装饮料（规格为
|
||||
300毫升）。此券仅限兑换同等价值商品，不找零，不
|
||||
兑换现金，不可与其他优惠活动同时使用。</view>
|
||||
</view>
|
||||
<view class="bai-box">
|
||||
<view class="title_">使用须知</view>
|
||||
<view class="si_">有效期：领取后3天内有效</view>
|
||||
</view>
|
||||
<view class="bai-box">
|
||||
<view class="title_">兑换方式</view>
|
||||
<view class="si_">门店自提</view>
|
||||
</view>
|
||||
<view class="bai-box">
|
||||
<view style="width: 100%; display: flex;align-items: center;justify-content: space-between; ">
|
||||
<view class="title_">适用门店</view>
|
||||
<view class="d-s" style="font-size: 14px;color: #FF2828;">
|
||||
<image src="../../static/icon/reddh.png" style="width: 18px; height: 18px; "></image>
|
||||
导航
|
||||
</view>
|
||||
</view>
|
||||
<view class="si">中建锦绣广场二期站</view>
|
||||
<view class="si">山东省济南市槐荫区 | 3.0km</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="bottom-box">
|
||||
<view class="or-num">免费</view>
|
||||
<view class="anniu">立即领取</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
value: 0
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
valChange(e) {
|
||||
console.log('当前值为: ' + e.value)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.centenr {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
background: #F9F9F9;
|
||||
}
|
||||
|
||||
.Candywrapper {
|
||||
background: #F9F9F9;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.bottom-box {
|
||||
width: 100%;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 15px 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
position: fixed;
|
||||
left: 0px;
|
||||
bottom: 0px;
|
||||
}
|
||||
|
||||
.or-num {
|
||||
font-weight: 600;
|
||||
font-size: 20px;
|
||||
color: #FA6400;
|
||||
}
|
||||
|
||||
.bai-box {
|
||||
background-color: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
width: 100%;
|
||||
margin: 10px auto;
|
||||
}
|
||||
|
||||
.bai-bs {
|
||||
background-color: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
width: 100%;
|
||||
margin: 10px auto;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.title_ {
|
||||
font-weight: 600;
|
||||
font-size: 16px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.anniu {
|
||||
width: 90px;
|
||||
height: 30px;
|
||||
background: #FF9655;
|
||||
border-radius: 50px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.rr-box {
|
||||
width: 80%;
|
||||
|
||||
}
|
||||
|
||||
.red-size {
|
||||
font-size: 12px;
|
||||
color: #E02020;
|
||||
}
|
||||
|
||||
.si_ {
|
||||
font-size: 14px;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.d-s {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
</style>
|
||||
144
gasStation-uni/pagesHome/certificate/index.vue
Normal file
144
gasStation-uni/pagesHome/certificate/index.vue
Normal file
@ -0,0 +1,144 @@
|
||||
<template>
|
||||
<view class="centenr">
|
||||
<view class="Candywrapper">
|
||||
|
||||
<view class="f-box" v-for="(item,index) in 3" :key="index" @click="goDetails()">
|
||||
<view class="f-top">中建锦绣二期站可用</view>
|
||||
<view class="f-bs">
|
||||
<image src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
|
||||
<view class="r-box">
|
||||
<view class="">
|
||||
<view class="m_">50元优惠</view>
|
||||
<view class="p_">最低消费100元</view>
|
||||
<view class="q_">代金券</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="an_">领取</view>
|
||||
<u-line-progress :percentage="50" :showText="false" height="6"
|
||||
activeColor="#FF9655"></u-line-progress>
|
||||
<view class="hui_">券已领70%</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
goIntegral() {
|
||||
uni.navigateTo({
|
||||
url: '/pagesMy/integral/integral'
|
||||
})
|
||||
},
|
||||
goDetails() {
|
||||
uni.navigateTo({
|
||||
url: '/pagesHome/certificate/details'
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.centenr {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
background: #F9F9F9;
|
||||
}
|
||||
|
||||
.Candywrapper {
|
||||
background: #F9F9F9;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.top-box {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
background: #fff;
|
||||
|
||||
}
|
||||
|
||||
.d-s {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
}
|
||||
|
||||
.f-box {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
background: #fff;
|
||||
margin: 10px auto;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.f-top {
|
||||
box-sizing: border-box;
|
||||
padding: 5px 0px;
|
||||
border-bottom: 1px dashed #eee;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.f-bs {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.r-box {
|
||||
width: 80%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.m_ {
|
||||
font-size: 16px;
|
||||
color: #333333;
|
||||
font-weight: bold;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.p_ {
|
||||
font-size: 12px;
|
||||
color: #666666;
|
||||
}
|
||||
|
||||
.q_ {
|
||||
font-size: 12px;
|
||||
color: #E02020;
|
||||
}
|
||||
|
||||
.an_ {
|
||||
width: 80px;
|
||||
height: 25px;
|
||||
background: #FF9655;
|
||||
border-radius: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.hui_ {
|
||||
font-size: 10px;
|
||||
color: #666666;
|
||||
}
|
||||
</style>
|
||||
119
gasStation-uni/pagesHome/check/index.vue
Normal file
119
gasStation-uni/pagesHome/check/index.vue
Normal file
@ -0,0 +1,119 @@
|
||||
<template>
|
||||
<view class="centenr">
|
||||
<view class="Candywrapper">
|
||||
<view class="title_">中建锦绣二期站</view>
|
||||
<view class="title_">选择油品油枪</view>
|
||||
<view class="input_k">
|
||||
<view class="input_sz" @click="show = true">
|
||||
汽油92#1号枪
|
||||
</view>
|
||||
<view class="rr-box">小王</view>
|
||||
</view>
|
||||
<view class="title_">加油金额</view>
|
||||
<view class="input_k">
|
||||
<view class="input_sz">
|
||||
<input type="text" placeholder="金额" />
|
||||
</view>
|
||||
<view class="rr-box">36.55L</view>
|
||||
</view>
|
||||
<view class="title_">付款备注</view>
|
||||
<view class="input_k"></view>
|
||||
<view class="x_"></view>
|
||||
<view class="title_">支付方式</view>
|
||||
<view class="d_box">
|
||||
<image src="../../static/icon/hyk.png" style="width: 35px; height: 35px; "></image>
|
||||
<div class="r-bot">
|
||||
<view class="">
|
||||
<view class="">会员卡类型</view>
|
||||
<view class="">储值卡（余额：6532.89）</view>
|
||||
</view>
|
||||
<u-icon name="arrow-right" size="18"></u-icon>
|
||||
</div>
|
||||
</view>
|
||||
</view>
|
||||
<u-picker :show="show" :columns="columns" @cancel='cancel' @confirm='confirm'></u-picker>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
show: false,
|
||||
columns: [
|
||||
['汽油95#1号枪', '汽油98#1号枪', '汽油92#1号枪']
|
||||
],
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
cancel() {
|
||||
this.show = false
|
||||
},
|
||||
confirm() {
|
||||
this.show = false
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.centenr {}
|
||||
|
||||
.Candywrapper {
|
||||
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.title_ {
|
||||
margin: 10px 0px;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.input_k {
|
||||
width: 100%;
|
||||
border-radius: 4px;
|
||||
border: 1px solid #EEEEEE;
|
||||
height: 40px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.rr-box {
|
||||
width: 80px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-left: 1px solid #EEEEEE;
|
||||
}
|
||||
|
||||
.input_sz {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.x_ {
|
||||
margin: 10px auto;
|
||||
border-bottom: 1px solid #EEEEEE;
|
||||
}
|
||||
|
||||
.d_box {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 10px 0px;
|
||||
border-bottom: 1px solid #EEEEEE;
|
||||
}
|
||||
|
||||
.r-bot {
|
||||
width: 80%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
|
||||
}
|
||||
</style>
|
||||
BIN
gasStation-uni/static/icon/hyk.png
Normal file
BIN
gasStation-uni/static/icon/hyk.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 752 B |
BIN
gasStation-uni/static/icon/wz.png
Normal file
BIN
gasStation-uni/static/icon/wz.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
gasStation-uni/static/new/hykb.png
Normal file
BIN
gasStation-uni/static/new/hykb.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Loading…
Reference in New Issue
Block a user