Merge branch 'guohonglei' of http://192.168.0.140:3000/xkhl/LSM_OIL_SITE
This commit is contained in:
@@ -83,12 +83,28 @@ page {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.bg-lv {
|
||||
background-color: #FF5200 !important;
|
||||
}
|
||||
|
||||
.bg-wjy {
|
||||
background-color: #FCB72E;
|
||||
background-color: #FCB72E !important;
|
||||
}
|
||||
|
||||
.color-lv {
|
||||
color: #FF5200 !important;
|
||||
}
|
||||
|
||||
.color-wjy {
|
||||
color: #FCB72E;
|
||||
color: #FCB72E !important;
|
||||
}
|
||||
|
||||
.border-wjy {
|
||||
border: 1px #FCB72E solid;
|
||||
}
|
||||
|
||||
.border-lv {
|
||||
border: 1px #FF5200 solid;
|
||||
}
|
||||
|
||||
.padding-top-0 {
|
||||
@@ -98,6 +114,15 @@ page {
|
||||
.margin-bottom-0 {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.margin-top-0 {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.color-333 {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.margin-0 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
51
common/temp.vue
Normal file
51
common/temp.vue
Normal file
@@ -0,0 +1,51 @@
|
||||
<template>
|
||||
<view class="content my-bg">
|
||||
<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
|
||||
<block slot="backText">返回</block>
|
||||
<block slot="content">油站信息</block>
|
||||
</cu-custom>
|
||||
<view class="main-money">
|
||||
<view class="padding-xs flex align-center">
|
||||
<view class="flex-sub text-center padding-top-lg">
|
||||
<view class="txet-xxs">
|
||||
<text class="text-white">今日收款(元)</text>
|
||||
</view>
|
||||
<view class=" text-sl padding padding-top-xs"><text class="text-white">8450.50</text></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.content{
|
||||
min-height: 100%;
|
||||
}
|
||||
.main-topbar>>>.cu-bar {
|
||||
height: 380rpx !important;
|
||||
z-index: 0 !important;
|
||||
}
|
||||
|
||||
.main-topbar>>>.cu-bar .content {
|
||||
padding-bottom: 300rpx;
|
||||
}
|
||||
|
||||
.main-money {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
</style>
|
||||
@@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<view class="flex" >
|
||||
<view class="flex price-list">
|
||||
<view class="flex-sub">
|
||||
|
||||
</view>
|
||||
<view class="flex-treble text-center">
|
||||
<view class="flex-treble text-center solid-right">
|
||||
<view class="strong font-16 oil-main-color">
|
||||
¥5.81
|
||||
</view>
|
||||
@@ -19,31 +19,31 @@
|
||||
星油油价
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-treble text-center">
|
||||
<view class="strong font-16 oil-main-color">
|
||||
<view class="flex-treble text-center solid-right">
|
||||
<view class="strong font-16 color-wjy">
|
||||
¥5.81
|
||||
</view>
|
||||
<view class="radius text-center oil-card-price main-color-border">
|
||||
<text class="oil-free">
|
||||
<view class="radius text-center oil-card-price main-color-border border-wjy">
|
||||
<text class="oil-free bg-wjy">
|
||||
省
|
||||
</text>
|
||||
<text class="free-money">
|
||||
七毛
|
||||
<text class="free-money color-wjy">
|
||||
¥5.81
|
||||
</text>
|
||||
</view>
|
||||
<view class="">
|
||||
万金油价
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-treble text-center">
|
||||
<view class="strong font-16 oil-main-color">
|
||||
<view class="flex-treble text-center " :class="isLast?'':'solid-right'">
|
||||
<view class="strong font-16 color-lv ">
|
||||
¥5.81
|
||||
</view>
|
||||
<view class="radius oil-card-price main-color-border">
|
||||
<text class="oil-free">
|
||||
<view class="radius oil-card-price border-lv">
|
||||
<text class="oil-free bg-lv">
|
||||
省
|
||||
</text>
|
||||
<text class="free-money">
|
||||
<text class="free-money color-lv">
|
||||
七毛
|
||||
</text>
|
||||
</view>
|
||||
@@ -56,7 +56,12 @@
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name:'PriceList'
|
||||
name: 'PriceList',
|
||||
data() {
|
||||
return {
|
||||
isLast: true
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -67,9 +72,9 @@
|
||||
}
|
||||
|
||||
.free-money {
|
||||
color: #FE0505;
|
||||
max-width: 3rem;
|
||||
font-size: 12px;
|
||||
color: #FE0505;
|
||||
line-height: 12px;
|
||||
}
|
||||
|
||||
|
||||
27
components/oil-menu-item.vue
Normal file
27
components/oil-menu-item.vue
Normal file
@@ -0,0 +1,27 @@
|
||||
<template>
|
||||
<view class="radius padding-xs padding-bottom padding-top margin-top bg-white shadow solid-bottom">
|
||||
<view class="item-title ">
|
||||
<text class="margin color-000 text-bold">92#油</text>
|
||||
<text class="fr padding-right text-sm text-grey">2020-8-18</text>
|
||||
<PriceList />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import PriceList from '@/components/PriceList/PriceList.vue'
|
||||
export default {
|
||||
components: {
|
||||
PriceList
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
};
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
19
pages.json
19
pages.json
@@ -9,7 +9,26 @@
|
||||
"style": {
|
||||
"navigationBarTitleText": "星油"
|
||||
}
|
||||
}, {
|
||||
"path": "pages/station-info/station-info",
|
||||
"style": {}
|
||||
}, {
|
||||
"path": "pages/qrcode/qrcodeList/qrcodeList",
|
||||
"style": {}
|
||||
}, {
|
||||
"path": "pages/qrcode/QrCode_xy/QrCode_xy",
|
||||
"style": {}
|
||||
}
|
||||
|
||||
, {
|
||||
"path": "pages/qrcode/QrCode-wjy/QrCode-wjy",
|
||||
"style": {}
|
||||
},
|
||||
{
|
||||
"path": "pages/orderList/orderList",
|
||||
"style": {}
|
||||
}
|
||||
|
||||
],
|
||||
"globalStyle": {
|
||||
"mp-alipay": {
|
||||
|
||||
61
pages/orderList/orderList.vue
Normal file
61
pages/orderList/orderList.vue
Normal file
@@ -0,0 +1,61 @@
|
||||
<template>
|
||||
<view class="content my-bg">
|
||||
<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
|
||||
<block slot="backText">返回</block>
|
||||
<block slot="content">加油记录</block>
|
||||
</cu-custom>
|
||||
<scroll-view scroll-x class="bg-white nav">
|
||||
<view class="flex text-center">
|
||||
<view class="cu-item flex-sub" :class="index==TabCur?'text-orange cur':''" v-for="(item,index) in tabList" :key="index"
|
||||
@tap="tabSelect" :data-id="index">
|
||||
{{item}}
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<view class="margin">
|
||||
<OrderItem class="cu-list menu-avatar comment " v-for="(item,index) in tabList" :key="index" v-show="index==TabCur" :item="order" />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import OrderItem from '@/components/order-item'
|
||||
export default {
|
||||
components: {
|
||||
OrderItem
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
tabList:[
|
||||
'全部','待支付','已支付','退款'
|
||||
],
|
||||
TabCur: 0,
|
||||
scrollLeft: 0,
|
||||
order: {
|
||||
istate: 0,
|
||||
vol: 3,
|
||||
oilName: '0#',
|
||||
orderID: '15979997825872',
|
||||
oilCode: '12396989',
|
||||
oilSiteName: '疯疯疯加油站',
|
||||
carNo: '皖A12354',
|
||||
sourceType: 3,
|
||||
realamount: 4.66,
|
||||
credateDatetime: '2020-10-12 12:30:10'
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
tabSelect(e) {
|
||||
this.TabCur = e.currentTarget.dataset.id;
|
||||
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.content {
|
||||
min-height: 100%;
|
||||
}
|
||||
</style>
|
||||
181
pages/station-info/station-info.vue
Normal file
181
pages/station-info/station-info.vue
Normal file
@@ -0,0 +1,181 @@
|
||||
<template>
|
||||
<view class="content my-bg">
|
||||
<cu-custom class="main-topbar bg-main-oil" isBack bgColor="bg-main-oil">
|
||||
<block slot="content" class="padding-top">油站信息</block>
|
||||
<block slot="backText">返回</block>
|
||||
</cu-custom>
|
||||
<view class="bg-main-oil bg-view">
|
||||
|
||||
</view>
|
||||
<view class="main-money bg-white margin radius">
|
||||
<view class="cu-card case no-card ">
|
||||
<view class="cu-item shadow">
|
||||
<view class="image">
|
||||
<image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597746946206&di=6e59ce33ad431328fa391cadb807da10&imgtype=0&src=http%3A%2F%2Fpic119.nipic.com%2Ffile%2F20161227%2F12449414_100501543000_2.jpg"
|
||||
mode="widthFix"></image>
|
||||
<!-- <view class="cu-tag bg-blue">史诗</view> -->
|
||||
<!-- <view class="cu-bar bg-shadeBottom"> <text class="text-cut">我已天理为凭,踏入这片荒芜,不再受凡人的枷锁遏制。我已天理为凭,踏入这片荒芜,不再受凡人的枷锁遏制。</text></view> -->
|
||||
</view>
|
||||
<view class="cu-list ">
|
||||
<view class="cu-item padding-sm ">
|
||||
<view class="text-bold color-333 text-xl">
|
||||
九龙路加油站
|
||||
</view>
|
||||
<view class="color-999">
|
||||
九龙路1188号
|
||||
</view>
|
||||
<view class="color-333 padding-top-xs">
|
||||
联系方式:战三(13263967686)
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="margin margin-bottom-0 padding-bottom my-bg">
|
||||
<OilMenuItem />
|
||||
<OilMenuItem />
|
||||
<OilMenuItem />
|
||||
<OilMenuItem />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import OilMenuItem from '@/components/oil-menu-item.vue'
|
||||
export default {
|
||||
components: {
|
||||
OilMenuItem
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
title: 'Hello',
|
||||
cuIconList: [{
|
||||
cuIcon: 'location',
|
||||
color: 'red',
|
||||
badge: 120,
|
||||
name: '加油信息'
|
||||
},
|
||||
{
|
||||
cuIcon: 'form',
|
||||
color: 'orange',
|
||||
badge: 0,
|
||||
name: '加油订单'
|
||||
},
|
||||
{
|
||||
cuIcon: 'new',
|
||||
color: 'yellow',
|
||||
badge: 0,
|
||||
name: '经营分析'
|
||||
},
|
||||
{
|
||||
cuIcon: 'scan',
|
||||
color: 'olive',
|
||||
badge: 0,
|
||||
name: '扫码加油'
|
||||
},
|
||||
{
|
||||
cuIcon: 'qr_code',
|
||||
color: 'cyan',
|
||||
badge: 0,
|
||||
name: '油站二维码'
|
||||
},
|
||||
{
|
||||
cuIcon: 'expressman',
|
||||
color: 'red',
|
||||
badge: 0,
|
||||
name: '员工管理'
|
||||
}
|
||||
|
||||
]
|
||||
};
|
||||
},
|
||||
onLoad() {},
|
||||
methods: {
|
||||
thirdAdd() {
|
||||
uni.chooseAddress({
|
||||
success(res) {
|
||||
console.log(res.userName)
|
||||
console.log(res.postalCode)
|
||||
console.log(res.provinceName)
|
||||
console.log(res.cityName)
|
||||
console.log(res.countyName)
|
||||
console.log(res.detailInfo)
|
||||
console.log(res.nationalCode)
|
||||
console.log(res.telNumber)
|
||||
}
|
||||
})
|
||||
},
|
||||
scanQr() {
|
||||
uni.scanCode({
|
||||
onlyFromCamera: true,
|
||||
success: function(res) {
|
||||
console.log('条码类型:' + res.scanType);
|
||||
console.log('条码内容:' + res.result);
|
||||
uni.vibrate({
|
||||
success: function() {
|
||||
console.log('success');
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
copy() {
|
||||
uni.setClipboardData({
|
||||
data: 'lallalala',
|
||||
success() {
|
||||
uni.showToast({
|
||||
title: '复制成功',
|
||||
position: 'bottom',
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
toAuth() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/authentication/authForm/authForm'
|
||||
})
|
||||
},
|
||||
toQrcode() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/qrcode/qrcodeList/qrcodeList'
|
||||
});
|
||||
},
|
||||
routerTo(url) {
|
||||
uni.navigateTo({
|
||||
url: url
|
||||
});
|
||||
},
|
||||
toLogin() {
|
||||
uni.navigateTo({
|
||||
url: 'pages/login/login'
|
||||
});
|
||||
},
|
||||
// 拨打电话
|
||||
makeCall() {
|
||||
uni.makePhoneCall({
|
||||
phoneNumber: '4008-56-5355' //仅为示例
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.content {
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
|
||||
.cu-card.case.no-card .image {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.bg-view {
|
||||
height: 300rpx;
|
||||
min-width: 100%;
|
||||
position: absolute;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user