Merge branch 'guohonglei' of http://192.168.0.140:3000/xkhl/LSM_OIL_SITE

common/common.css

@@ -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;
+}

common/temp.vue

@@ -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>