From 17977d5bb789b0e42f9871dabaf2e355adbc7d52 Mon Sep 17 00:00:00 2001
From: xk_guohonglei <2057494155@qq.com>
Date: Tue, 18 Aug 2020 17:18:00 +0800
Subject: [PATCH] =?UTF-8?q?pages=E5=88=A0=E9=99=A4=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/common.css                             |  31 +-
 common/temp.vue                               |  51 ++++
 components/PriceList/PriceList.vue            |  37 +--
 components/oil-menu-item.vue                  |  27 ++
 pages.json                                    |  45 +--
 pages/authentication/authForm/authForm.vue    | 197 -------------
 pages/authentication/facial/facial.vue        | 120 --------
 .../fingerPrint/fingerPrint.vue               |  25 --
 pages/login/components/loginBottom.vue        |  26 --
 pages/login/login.vue                         | 267 ------------------
 pages/order/orderList/orderList.vue           |  28 --
 pages/orderList/orderList.vue                 |  20 +-
 pages/ssss.vue                                |  38 ---
 pages/station-info/station-info.vue           | 183 ++++++++++--
 pages/stationList/components/PriceList.vue    |  80 ------
 pages/stationList/components/StationItem.vue  | 138 ---------
 pages/stationList/components/price-list.vue   |  61 ----
 .../stationDetail/stationDetail.vue           | 205 --------------
 pages/stationList/stationList.vue             | 128 ---------
 pages/userPage/userPage.vue                   | 104 -------
 pages/wallet/record/record.vue                |  67 -----
 21 files changed, 308 insertions(+), 1570 deletions(-)
 create mode 100644 common/temp.vue
 create mode 100644 components/oil-menu-item.vue
 delete mode 100644 pages/authentication/authForm/authForm.vue
 delete mode 100644 pages/authentication/facial/facial.vue
 delete mode 100644 pages/authentication/fingerPrint/fingerPrint.vue
 delete mode 100644 pages/login/components/loginBottom.vue
 delete mode 100644 pages/login/login.vue
 delete mode 100644 pages/order/orderList/orderList.vue
 delete mode 100644 pages/ssss.vue
 delete mode 100644 pages/stationList/components/PriceList.vue
 delete mode 100644 pages/stationList/components/StationItem.vue
 delete mode 100644 pages/stationList/components/price-list.vue
 delete mode 100644 pages/stationList/stationDetail/stationDetail.vue
 delete mode 100644 pages/stationList/stationList.vue
 delete mode 100644 pages/userPage/userPage.vue
 delete mode 100644 pages/wallet/record/record.vue

diff --git a/common/common.css b/common/common.css
index 8007b5e..96ef3e6 100644
--- a/common/common.css
+++ b/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;
-}
\ No newline at end of file
+}
+
+.color-333 {
+	color: #333;
+}
+
+.margin-0 {
+	margin: 0;
+}
diff --git a/common/temp.vue b/common/temp.vue
new file mode 100644
index 0000000..dbe11ca
--- /dev/null
+++ b/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>
diff --git a/components/PriceList/PriceList.vue b/components/PriceList/PriceList.vue
index 93e996f..12b5a9b 100644
--- a/components/PriceList/PriceList.vue
+++ b/components/PriceList/PriceList.vue
@@ -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>
@@ -55,8 +55,13 @@
 </template>
 
 <script>
-	export default{
-		name:'PriceList'
+	export default {
+		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;
 	}
 
diff --git a/components/oil-menu-item.vue b/components/oil-menu-item.vue
new file mode 100644
index 0000000..2a535b0
--- /dev/null
+++ b/components/oil-menu-item.vue
@@ -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>
diff --git a/pages.json b/pages.json
index f1a868a..cacc25d 100644
--- a/pages.json
+++ b/pages.json
@@ -1,61 +1,26 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/station-info/station-info",
-			"style": {}
-		}, {
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "星油"
 			}
 		}, {
-			"path": "pages/qrcode/qrcodeList/qrcodeList",
-			"style": {}
-		}, {
-			"path": "pages/qrcode/QrCode_xy/QrCode_xy",
+			"path": "pages/station-info/station-info",
 			"style": {}
 		}, {
-			"path": "pages/authentication/authForm/authForm",
+			"path": "pages/qrcode/qrcodeList/qrcodeList",
 			"style": {}
 		}, {
-			"path": "pages/stationList/stationDetail/stationDetail",
-			"style": {
-				"navigationBarTitleText": "中石化（紫云路）"
-			}
-		}, {
-			"path": "pages/stationList/stationList",
-			"style": {
-				"navigationBarTitleText": "附近油站"
-			}
-		},
-		{
-			"path": "pages/login/login",
+			"path": "pages/qrcode/QrCode_xy/QrCode_xy",
 			"style": {}
 		}
 
-
-
 		, {
 			"path": "pages/qrcode/QrCode-wjy/QrCode-wjy",
 			"style": {}
-		}, {
-			"path": "pages/authentication/facial/facial",
-			"style": {}
-		}, {
-			"path": "pages/authentication/fingerPrint/fingerPrint",
-			"style": {}
-		}
-
-		, {
-			"path": "pages/userPage/userPage",
-			"style": {}
-		}, {
-			"path": "pages/wallet/record/record",
-			"style": {}
-		}, {
-			"path": "pages/order/orderList/orderList",
-			"style": {}
-		}, {
+		},
+		{
 			"path": "pages/orderList/orderList",
 			"style": {}
 		}
diff --git a/pages/authentication/authForm/authForm.vue b/pages/authentication/authForm/authForm.vue
deleted file mode 100644
index 66f8fbb..0000000
--- a/pages/authentication/authForm/authForm.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-	<view class="content">
-		<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="padding">
-			<view class="padding-left padding-bottom-xs">
-				<text>身份证</text>
-			</view>
-			<view class="shadow radius">
-				<view class="bg-white padding-sm ">
-					<view class="grid  uplaod-container grid-square justify-between ">
-						<view class="bg-img  basis-sm  " v-for="(item,index) in imgList" :key="index" @tap="ViewImage" :data-url="imgList[index]">
-							<image :src="imgList[index]" mode="aspectFill"></image>
-							<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
-								<text class='cuIcon-close'></text>
-							</view>
-						</view>
-						<view class="solids  oil-main-btn-color basis-sm" @tap="ChooseImage" v-if="imgList.length<1">
-							<text class='cuIcon-cameraadd oil-main-color'></text>
-							<view class="text-center upload-desc font-12">
-								身份证人像面
-							</view>
-						</view>
-						<view class="bg-img basis-sm" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" :data-url="imgList[index]">
-							<image :src="imgList[index]" mode="aspectFill"></image>
-							<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
-								<text class='cuIcon-close'></text>
-							</view>
-						</view>
-						<view class="solids oil-main-btn-color basis-sm" @tap="ChooseImage" v-if="imgList.length<1">
-							<text class='cuIcon-cameraadd oil-main-color'></text>
-							<view class="text-center upload-desc font-12">
-								<text>身份证国徽面</text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="cu-form-group">
-					<view class="title">车牌号</view>
-					<text v-if="!plateText" @tap="showPlateModal(true,false)" class="cuIcon-right oil-main-btn-color oil-main-color"></text>
-					<text v-else @tap="showPlateModal(true,false)" class=" oil-main-btn-color oil-main-color plate-name">{{plateText}}</text>
-					<input v-model="plateNo" :maxlength="6" @tap="showPlateModal(false,true)" read-only adjust-position class="margin-left"
-					 placeholder="车牌号码" name="input"></input>
-				</view>
-				<view class="cu-form-group">
-					<view class="title">姓名</view>
-					<input adjust-position placeholder="两字短标题" name="input"></input>
-				</view>
-				<view class="cu-form-group">
-					<view class="title">性别</view>
-					<input adjust-position placeholder="两字短标题" name="input"></input>
-				</view>
-				<view class="cu-form-group">
-					<view class="title">身份证号</view>
-					<input adjust-position placeholder="两字短标题" name="input"></input>
-				</view>
-				<PlateNumberPicker @newPlate="showPlateModal(false,true)" @onDeleteInput="onDeleteInput" :showInputList="showInputList"
-				 :showPlateList="showPlateList" @selectNo="selectNo" @selectName="selectText" @hideModal="showModel=''" :modalName="showModel" />
-			</view>
-
-		</view>
-		<view class="confirm-btn">
-			<button class="bg-main-oil  margin">确定</button>
-		</view>
-		<view class="my-bg">
-
-		</view>
-	</view>
-</template>
-
-<script>
-	import PlateNumberPicker from '@/components/plate-number-picker/plate-number-picker.vue'
-	export default {
-		components: {
-			PlateNumberPicker
-		},
-		data() {
-			return {
-				showPlateList: true,
-				showInputList: false,
-				carNumber: '',
-				plateNo: '',
-				plateText: '',
-				imgList: [],
-				plateName: '',
-				showPlateList: true,
-				showInputList: false,
-				showModel: ''
-			}
-		},
-		methods: {
-			text() {
-				this.carNumber = this.plateText + this.plateNo
-				this.tsetPlate()
-			},
-			tsetPlate() {
-				this.carNumber = this.plateText + this.plateNo
-				this.testResult =
-					/^(([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z](([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z][A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳使领]))$/
-					.test(this.carNumber)
-			},
-			onDeleteInput() {
-				this.plateNo = this.plateNo.slice(0, -1)
-			},
-			selectText(item) {
-				this.plateText = item
-				this.showPlateList = false
-				this.showInputList = true
-				this.tsetPlate()
-			},
-			selectNo(item) {
-				if (this.plateNo.length >= 5) {
-					this.showModel = ''
-				}
-				this.plateNo = this.plateNo + item
-				this.tsetPlate()
-			},
-			showPlateModal(val1, val2) {
-				this.showPlateList = val1
-				this.showInputList = val2
-				this.showModel = 'show'
-			},
-			ChooseImage() {
-				uni.chooseImage({
-					count: 1, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					success: (res) => {
-						if (this.imgList.length != 0) {
-							this.imgList = this.imgList.concat(res.tempFilePaths)
-						} else {
-							this.imgList = res.tempFilePaths
-						}
-					}
-				});
-			},
-			ViewImage(e) {
-				uni.previewImage({
-					urls: this.imgList,
-					current: e.currentTarget.dataset.url
-				});
-			},
-			DelImg(e) {
-				uni.showModal({
-					title: '召唤师',
-					content: '确定要删除这段回忆吗？',
-					cancelText: '再看看',
-					confirmText: '再见',
-					success: res => {
-						if (res.confirm) {
-							this.imgList.splice(e.currentTarget.dataset.index, 1)
-						}
-					}
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped>
-	.bg-img {
-		min-height: 200rpx;
-	}
-
-	.uplaod-container {
-		min-height: 200upx;
-	}
-
-	.solids {
-		position: relative;
-	}
-
-	.upload-desc {
-		position: absolute;
-		top: 120rpx;
-		color: #FE0505;
-		width: 100%;
-	}
-
-	.content {
-		background-color: #f1f2f7;
-		min-height: 100%;
-	}
-
-	.plate-name {
-		display: inline-block;
-		padding: 0.15rem 0.4rem;
-	}
-
-	.confirm-btn {
-		background-color: #f1f2f7;
-		position: absolute;
-		width: 750upx;
-		bottom: 200rpx;
-	}
-</style>
diff --git a/pages/authentication/facial/facial.vue b/pages/authentication/facial/facial.vue
deleted file mode 100644
index 7812c4d..0000000
--- a/pages/authentication/facial/facial.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-	<view>
-		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
-			<block slot="backText">返回</block>
-			<block slot="content">人脸识别</block>
-		</cu-custom>
-		<button type="primary" @click="checkIsSupportSoterAuthentication">检查支持的认证方式</button>
-		<button type="primary" @click="checkIsSoterEnrolledInDeviceFingerPrint">检查是否录入指纹</button>
-		<button type="primary" @click="checkIsSoterEnrolledInDeviceFaceID">检查是否录入FaceID</button>
-		<button type="primary" @click="startSoterAuthenticationFingerPrint">开始指纹认证</button>
-		<button type="primary" @click="startSoterAuthenticationFaceID">开始FaceID认证</button>
-		<button type="primary" @tap="startAuth">start</button>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-			checkIsSupportSoterAuthentication() {
-				uni.checkIsSupportSoterAuthentication({
-					success(res) {
-						console.log(res);
-					},
-					fail(err) {
-						console.log(err);
-					},
-					complete(res) {
-						console.log(res);
-					}
-				})
-			},
-			checkIsSoterEnrolledInDeviceFingerPrint() {
-				uni.checkIsSoterEnrolledInDevice({
-					checkAuthMode: 'fingerPrint',
-					success(res) {
-						console.log(res);
-					},
-					fail(err) {
-						console.log(err);
-					},
-					complete(res) {
-						console.log(res);
-					}
-				})
-			},
-			checkIsSoterEnrolledInDeviceFaceID() {
-				uni.checkIsSoterEnrolledInDevice({
-					checkAuthMode: 'facial',
-					success(res) {
-						console.log(res);
-					},
-					fail(err) {
-						console.log(err);
-					},
-					complete(res) {
-						console.log(res);
-					}
-				})
-			},
-			startSoterAuthenticationFingerPrint() {
-				uni.startSoterAuthentication({
-					requestAuthModes: ['fingerPrint'],
-					challenge: '123456',
-					authContent: '请用指纹解锁',
-					success(res) {
-						console.log(res);
-					},
-					fail(err) {
-						console.log(err);
-					},
-					complete(res) {
-						console.log(res);
-					}
-				})
-			},
-			startSoterAuthenticationFaceID() {
-				uni.startSoterAuthentication({
-					requestAuthModes: ['facial'],
-					challenge: '123456',
-					authContent: '请用FaceID解锁',
-					success(res) {
-						console.log(res);
-					},
-					fail(err) {
-						console.log(err);
-					},
-					complete(res) {
-						console.log(res);
-					}
-				})
-			},
-			startAuth() {
-
-				uni.startSoterAuthentication({
-					requestAuthModes: ['facial', 'fingerPrint'],
-					challenge: '挑战因子。挑战因子为调用者为此次生物鉴权准备的用于签名的字符串关键识别信息，将作为 resultJSON 的一部分，供调用者识别本次请求。例如：如果场景为请求用户对某订单进行授权确认，则可以将订单号填入此参数。,',
-					authContent: '啦啦啦',
-					success: (res) => {
-						console.log(res)
-					},
-					fail: (err) => {
-						console.log(err)
-					},
-					complete: () => {
-						console.log('触发了')
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-
-</style>
diff --git a/pages/authentication/fingerPrint/fingerPrint.vue b/pages/authentication/fingerPrint/fingerPrint.vue
deleted file mode 100644
index 5630f80..0000000
--- a/pages/authentication/fingerPrint/fingerPrint.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-	<view>
-	<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>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>
diff --git a/pages/login/components/loginBottom.vue b/pages/login/components/loginBottom.vue
deleted file mode 100644
index 02e82b9..0000000
--- a/pages/login/components/loginBottom.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-	<view class="bg-white bottom-part bg-white">
-		<view class=" text-center text-sm">
-			<view class="padding-xxs">
-				全国统一客服/投诉热线：
-				<text class="oil-main-color" :href="'tel:4008-56-5811'">4008-56-5811</text>
-			</view>
-			<view class="padding-xs">
-				登录即代表您已同意我们的
-				<text @click="$router.push('/Agreement')" class="oil-main-color">《服务协议》</text>和 <text class="oil-main-color" @click="$router.push('/PrivacyProtocol')">《隐私政策》</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-
-</script>
-
-<style>
-.bottom-part{
-	width: 750upx;
-	position: absolute;
-	bottom: 60rpx;
-}
-</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
deleted file mode 100644
index 440e95c..0000000
--- a/pages/login/login.vue
+++ /dev/null
@@ -1,267 +0,0 @@
-<template>
-	<view class="login-page bg-white">
-		<view class="image login-bg">
-			<image src="https://www.51xingka.net/LSMOIL/static/img/login-logo.png" mode="widthFix"></image>
-		</view>
-		<scroll-view scroll-x class=" bg-white nav padding  ">
-			<view class="flex text-center padding-bottom">
-				<view class="cu-item  flex-sub" :class="0==TabCur?'text-red cur':''" @tap="tabSelect(0)">
-					个人账号
-				</view>
-				<view class="cu-item  flex-sub" :class="1==TabCur?'text-red cur':''" @tap="tabSelect(1)">
-					企业账号
-				</view>
-			</view>
-
-			<form v-if="0==TabCur">
-				<view class="cu-form-group padding-top">
-					<view class="title">手机号码</view>
-					<input placeholder="请输入手机号码" label="手机号" v-model="driver.phone" type="number" name="input"></input>
-				</view>
-				<view class="cu-form-group" v-if="accuntSource">
-					<view class="title">密码</view>
-					<input placeholder="请输入密码" type="password" v-model="password" name="input"></input>
-				</view>
-				<view class="cu-form-group" v-else>
-					<view class="title">验证码</view>
-					<input placeholder="请输入验证码" type="number" v-model="driver.random" name="input"></input>
-					<view class='oil-main-color' @tap="reqRandom"> 发送验证码</view>
-				</view>
-
-				<view class="cu-form-group">
-					<view class="" v-if="accuntSource" @tap="accuntSourceSelect">
-						验证码登录
-					</view>
-					<view class="" v-else @tap="accuntSourceSelect">
-						密码登录
-					</view>
-					<!-- <view class="" v-if="!accuntSource">
-						忘记密码
-					</view> -->
-				</view>
-				<view class="padding flex flex-direction">
-					<button v-if="accuntSource" class="cu-btn bg-main-oil  lg" @tap="login('wechatOilPersonal')">
-						登录 / 注册
-					</button>
-					<button v-else class="cu-btn bg-main-oil  lg" @tap="login('wechatOilCompany')">
-						登录
-					</button>
-				</view>
-			</form>
-			<form v-if="1==TabCur">
-				<view class="cu-form-group padding-top">
-					<view class="title">手机号码</view>
-					<input name="手机号" label="手机号" type="number" placeholder="请输入企业下绑定手机号" v-model="driver.phone"></input>
-				</view>
-
-				<view class="cu-form-group" v-if="accuntSource">
-					<view class="title">密码</view>
-					<input placeholder="请输入密码" type="password" v-model="password"></input>
-				</view>
-				<view class="cu-form-group" v-else>
-					<view class="title">验证码</view>
-					<input placeholder="请输入验证码" type="number" v-model="driver.random"></input>
-					<view class='oil-main-color'> 发送验证码</view>
-				</view>
-				<view class="cu-form-group">
-					<view class="" v-if="accuntSource" @tap="accuntSourceSelect">
-						验证码登录
-					</view>
-					<view class="" v-else @tap="accuntSourceSelect">
-						密码登录
-					</view>
-					<!-- <view class="" v-if="!accuntSource">
-						忘记密码
-					</view> -->
-				</view>
-				<view class="padding flex flex-direction">
-					<button v-if="accuntSource" class="cu-btn bg-main-oil  lg" @tap="login('wechatOilCompany')">
-						登录 / 注册
-					</button>
-					<button v-else class="cu-btn bg-main-oil  lg" @tap="login('wechatOilCompany')">
-						登录
-					</button>
-				</view>
-
-			</form>
-			<view class=" flex flex-direction">
-				<button class="cu-btn margin bg-main-oil  lg" @tap="skipLogin">
-					跳过
-				</button>
-			</view>
-
-		</scroll-view>
-
-		<view class="cu-load load-modal" v-if="loadModal">
-			<!-- <view class="cuIcon-emojifill text-orange"></view> -->
-			<!-- <image src="/static/logo.png" mode="aspectFit"></image> -->
-			<view class="gray-text">加载中...</view>
-		</view>
-
-		<loginBottom />
-	</view>
-</template>
-
-<script>
-	import uniteApi from '@/api/unite'
-	import weixinApi from '@/api/weixin'
-	import loginBottom from './components/loginBottom.vue'
-	import {
-		setToken
-	} from '@/utils/auth'
-
-	export default {
-		components: {
-			loginBottom
-		},
-		data() {
-			return {
-				TabCur: 0,
-				accuntSource: false,
-				loadModal: false,
-				active: 0,
-				password: "",
-				random: '',
-				IMEI: '1235455',
-				driver: {},
-			}
-		},
-		methods: {
-			skipLogin() {
-				console.log('111')
-				uni.navigateTo({
-					url: '../index/index'
-				})
-			},
-			reqRandom() {
-				if (this.driver.phone && this.driver.phone.length === 11) {
-					uni.showToast({
-						title: '发送中...',
-						duration: 0,
-						icon: 'loding',
-						mask: true
-					})
-					this.phoneError = ''
-					this.disabled = true
-					this.btnColor = '#333'
-
-					const data2 = {
-						...this.driver,
-						IMEI: this.IMEI,
-						serviceCode: 'LSM_SENDMESSAGES',
-						type: 'LSM_APP_LOGIN'
-					}
-
-
-					uniteApi.api(data2).then(res => {
-						console.log('验证码参数', data2)
-						console.log('验证码返回参数res', res)
-						if (res.code === '1000') {
-							this.disabled = true
-							uni.hideLoading()
-							uni.showToast({
-								title: '验证码发送成功',
-								icon: 'success',
-								position: 'bottom'
-							})
-							this.btnColor = '#333'
-							let second = 60
-							const timer = setInterval(() => {
-								second--
-								if (second) {
-									this.tips = `${second}秒后重发`
-								} else {
-									clearInterval(timer)
-									this.tips = `发送验证码`
-									this.disabled = false
-									this.btnColor = '#FE0505'
-								}
-							}, 1000)
-						}
-					})
-				} else {
-					uni.showToast({
-						title: '请输入正确手机号',
-						icon: 'none'
-					})
-				}
-			},
-			login(accountSource) {
-				var pwdData = {
-					...this.driver,
-					accountSource: accountSource,
-					serviceCode: 'LSM_REGISTER_OR_LOGIN',
-					IMEI: this.IMEI
-				}
-				console.log('pwdData', pwdData)
-				uniteApi.api(pwdData).then(res => {
-					console.log('pwdData', pwdData)
-					this.ifSuccess(res.code, res.data.data)
-					setToken(res.data.token)
-				})
-
-			},
-			tabSelect(e) {
-				this.TabCur = e;
-			},
-			accuntSourceSelect() {
-				this.accuntSource = !this.accuntSource
-			},
-			ifSuccess(code, data) {
-				if (code === '1000') {
-					// // // // console.log('122')
-
-					uni.showToast({
-						title: `登录成功!`
-					})
-					uni.navigateTo({
-						url: 'pages/index/index'
-					})
-					// // // // console.log(data)
-					//         this.$cookies.set('baseDriver', {
-					//           dirverId: data.dirverId,
-					//           IMEI: data.IMEI,
-					//           token: data.token,
-					//           phone: data.phone
-					//         }, 60 * 60 * 3)
-					//         this.$store.commit('SET_BASEDRIVER', {
-					//           dirverId: data.dirverId,
-					//           IMEI: data.IMEI,
-					//           token: data.token,
-					//           phone: data.phone
-					//         })
-					//         this.$store.commit('SET_DRIVER', data)
-
-					//         this.$store.commit('SET_HEAD', data.headPortrait)
-					//         if (data.oilPlateNumber) {
-					//           this.$store.commit('SET_CARNO', data.oilPlateNumber)
-					//         }
-					//         this.$store.commit('SET_ACTIVE', 0)
-
-					//         // // // // console.log(data.IMEI)
-					//         this.$cookies.set('accountType', this.active === 0 ? 'wechatOilPersonal' : 'wechatOilCompany')
-
-					//         this.$cookies.set('driver', data, 60 * 60 * 3)
-					//         // this.$router.push('/')
-					//         this.$router.go('-1')
-				}
-			}
-		}
-	}
-</script>
-
-<style>
-	.login-bg {
-		width: 100%;
-	}
-
-	.login-bg image {
-		width: 750upx;
-		vertical-align: bottom;
-	}
-
-	.login-page {
-		height: 750rpx;
-		background-color: #fff;
-	}
-</style>
diff --git a/pages/order/orderList/orderList.vue b/pages/order/orderList/orderList.vue
deleted file mode 100644
index bad16ed..0000000
--- a/pages/order/orderList/orderList.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-	<view>
-		<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="">
-			
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>
diff --git a/pages/orderList/orderList.vue b/pages/orderList/orderList.vue
index bcfb80b..87aee1b 100644
--- a/pages/orderList/orderList.vue
+++ b/pages/orderList/orderList.vue
@@ -4,8 +4,16 @@
 			<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  " :item="order" />
+			<OrderItem class="cu-list menu-avatar comment " v-for="(item,index) in tabList" :key="index" v-if="index==TabCur" :item="order" />
 		</view>
 	</view>
 </template>
@@ -18,6 +26,11 @@
 		},
 		data() {
 			return {
+				tabList:[
+					'全部','待支付','已支付','退款'
+				],
+				TabCur: 0,
+				scrollLeft: 0,
 				order: {
 					istate: 0,
 					vol: 3,
@@ -33,7 +46,10 @@
 			}
 		},
 		methods: {
-			
+			tabSelect(e) {
+				this.TabCur = e.currentTarget.dataset.id;
+				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
+			}
 		}
 	}
 </script>
diff --git a/pages/ssss.vue b/pages/ssss.vue
deleted file mode 100644
index fea156c..0000000
--- a/pages/ssss.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-	<view class="content">
-		<ChooseLits :list="list" :arr="arr" @chooseLike="chooseLike"></ChooseLits>
-		<rich-text :nodes="ddd"></rich-text>
-	</view>
-	
-</template>
-
-<script>
-	import ChooseLits from '../../components/chooseLits.vue'
-	export default {
-		components: {
-			ChooseLits
-		},
-		data() {
-			return {
-				list: ['综合排序', '类型不限', '金额不限'],
-				arr: [
-					['综合排序', '价格降序', '价格升序'],
-					['类型不限', '高通过率', '利率低'],
-					['金额不限', '5k以下', '5k-10k', '10k以上']
-				],
-				i2: [0, 0, 0],
-				ddd:'在飞云之下，啊哈哈哈哈，这风好大，我还是想她。'
-			}
-		},
-		methods: {
-			chooseLike(i1) {
-				if (this.i2[i1[0]] != i1[1]) {
-					this.i2[i1[0]] = i1[1];
-				}
-			},
-		}
-	}
-</script>
-
-<style>
-</style>
diff --git a/pages/station-info/station-info.vue b/pages/station-info/station-info.vue
index f5eaf96..e2c6279 100644
--- a/pages/station-info/station-info.vue
+++ b/pages/station-info/station-info.vue
@@ -1,48 +1,181 @@
 <template>
-	<view>
-		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+	<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>
-			<block slot="content">油站信息</block>
 		</cu-custom>
-		<view class="cu-card case" >
-			<view class="cu-item shadow">
-				<view class="image">
-					<image src="https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.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-xs ">
-						<view class="text-bold text-xl">
-							九龙路加油站
-						</view>
-						<view class="color-999">
-							九龙路1188号
-						</view>
-						<view class="color-333">
-							联系方式：战三（13263967686）
+		<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>
diff --git a/pages/stationList/components/PriceList.vue b/pages/stationList/components/PriceList.vue
deleted file mode 100644
index 93e996f..0000000
--- a/pages/stationList/components/PriceList.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-	<view class="flex" >
-		<view class="flex-sub">
-
-		</view>
-		<view class="flex-treble text-center">
-			<view class="strong font-16 oil-main-color">
-				￥5.81
-			</view>
-			<view class="radius text-center oil-card-price main-color-border">
-				<text class="oil-free">
-					省
-				</text>
-				<text class="free-money">
-					七毛
-				</text>
-			</view>
-			<view class="">
-				星油油价
-			</view>
-		</view>
-		<view class="flex-treble text-center">
-			<view class="strong font-16  oil-main-color">
-				￥5.81
-			</view>
-			<view class="radius text-center oil-card-price main-color-border">
-				<text class="oil-free">
-					省
-				</text>
-				<text class="free-money">
-					七毛
-				</text>
-			</view>
-			<view class="">
-				万金油价
-			</view>
-		</view>
-		<view class="flex-treble text-center">
-			<view class="strong font-16  oil-main-color">
-				￥5.81
-			</view>
-			<view class="radius  oil-card-price main-color-border">
-				<text class="oil-free">
-					省
-				</text>
-				<text class="free-money">
-					七毛
-				</text>
-			</view>
-			<view class="">
-				老吕油价
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:'PriceList'
-	}
-</script>
-
-<style scoped>
-	.oil-card-price {
-		max-width: 4rem;
-		margin: auto;
-	}
-
-	.free-money {
-		color: #FE0505;
-		max-width: 3rem;
-		font-size: 12px;
-		line-height: 12px;
-	}
-
-	.navigation {
-		position: absolute;
-		right: 16px;
-	}
-</style>
diff --git a/pages/stationList/components/StationItem.vue b/pages/stationList/components/StationItem.vue
deleted file mode 100644
index 7b6e6fd..0000000
--- a/pages/stationList/components/StationItem.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-	<view class="my-card my-cell radius">
-		<view class="flex ">
-			<view class="icon-self flex-sub margin-xs">
-				<image src="https://www.51xingka.net/LSMOIL/static/img/oil.png" height="100px" width="100px" mode="widthFix"></image>
-			</view>
-
-
-			<view class="flex-quadruple">
-				<view class="navigation" @tap="openMap">
-					10.2km|
-					<image class="icon-self" src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=907966196,3433585328&fm=11&gp=0.jpg"
-					 mode=""></image>
-					导航
-				</view>
-				<view class="text-cut" style="width: 400upx;">
-					<text class="strong">
-						中国石化(紫云路)
-					</text>
-				</view>
-				<view class="">
-					<text class="">
-						营业时间：00:00-23:59(紫云路)
-					</text>
-				</view>
-				<view class="text-cut" style="width: 400upx;">
-					<text class="">
-						经开区紫云路与金寨南路交口向西经开区紫云路与金寨南路交口向西经开区紫云路与金寨南路交口向西经开区紫云路与金寨南路交口向西经开区紫云路与金寨南路交口向西经开区紫云路与金寨南路交口向西200米.....
-					</text>
-				</view>
-				<view class="padding-top-xs">
-					<text class="strong padding-right font-16">
-						0#柴油
-					</text>
-					<text>市场价 </text>
-					<text class="s-rich">￥6.5</text>
-				</view>
-				<view class="padding-bottom-xs">
-					<text class="color-999 font-12">更新时间；2020-05-07,具体油价与工作人员确定</text>
-				</view>
-
-			</view>
-
-		</view>
-		<PriceList />
-
-
-	</view>
-</template>
-
-<script>
-	import PriceList from './PriceList'
-	export default {
-		components: {
-			PriceList
-		},
-		data() {
-			return {
-				nodes: [{
-					name: 'div',
-					attrs: {
-						class: 'div-class',
-						style: 'line-height: 60px; color: red; text-align:center;'
-					},
-					children: [{
-						type: 'text',
-						text: 'Hello&nbsp;uni-app!'
-					}]
-				}],
-				strings: '<div style="text-align:center;"><img src="https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/uni@2x.png"/></div>'
-			}
-		},
-		methods: {
-			// 打开map地图
-			openMap() {
-				let that = this
-				uni.openLocation({
-					latitude: 117,
-					longitude: 21,
-					name: '江西景德镇',
-					address: '九龙路1188号',
-					scale: 12,
-					success: function() {
-						console.log('success');
-					},
-					fail: (error) => {
-						console.log('error')
-						console.log(error)
-					},
-					complete: () => {
-
-						console.log('made')
-					},
-
-				});
-
-				var map = uni.createMapContext('map');
-				map.moveToLocation();
-			},
-		}
-	}
-</script>
-
-<style>
-	.bottom-part {
-		width: 750upx;
-		position: absolute;
-		bottom: 60rpx;
-	}
-
-	.icon-self {
-		width: 1rem;
-		height: 1rem;
-	}
-
-	.my-card,
-	.my-cell {
-		background-color: #fff;
-		position: relative;
-	}
-
-	.oil-card-price {
-		max-width: 4rem;
-		margin: auto;
-	}
-
-	.free-money {
-		color: #FE0505;
-		max-width: 3rem;
-		font-size: 12px;
-		line-height: 12px;
-	}
-
-	.navigation {
-		position: absolute;
-		right: 16px;
-	}
-</style>
diff --git a/pages/stationList/components/price-list.vue b/pages/stationList/components/price-list.vue
deleted file mode 100644
index 6dd640a..0000000
--- a/pages/stationList/components/price-list.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-	<view class="flex">
-		<view class="flex-sub">
-
-		</view>
-		<view class="flex-treble text-center">
-			<view class="strong font-16 oil-main-color">
-				￥5.81
-			</view>
-			<view class="radius text-center oil-card-price main-color-border">
-				<text class="oil-free">
-					省
-				</text>
-				<text class="free-money">
-					七毛
-				</text>
-			</view>
-			<view class="">
-				星油油价
-			</view>
-		</view>
-		<view class="flex-treble text-center">
-			<view class="strong font-16  oil-main-color">
-				￥5.81
-			</view>
-			<view class="radius text-center oil-card-price main-color-border">
-				<text class="oil-free">
-					省
-				</text>
-				<text class="free-money">
-					七毛
-				</text>
-			</view>
-			<view class="">
-				万金油价
-			</view>
-		</view>
-		<view class="flex-treble text-center">
-			<view class="strong font-16  oil-main-color">
-				￥5.81
-			</view>
-			<view class="radius  oil-card-price main-color-border">
-				<text class="oil-free">
-					省
-				</text>
-				<text class="free-money">
-					七毛
-				</text>
-			</view>
-			<view class="">
-				老吕油价
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>
diff --git a/pages/stationList/stationDetail/stationDetail.vue b/pages/stationList/stationDetail/stationDetail.vue
deleted file mode 100644
index 11c2b48..0000000
--- a/pages/stationList/stationDetail/stationDetail.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<template>
-	<view class="content">
-		<cu-custom class="main-topbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
-			<block slot="backText">返回</block>
-			<block slot="content">中石化紫云路</block>
-		</cu-custom>
-		
-		<!--  -->
-		<view class="my-cell padding-top padding-bottom radius">
-			<view class="strong padding-bottom-xs">
-				中国石化(紫云路)
-			</view>
-			<view class="font-12 color-999">
-				<text class="padding-right">1.32km</text> | <text class="padding-left text-cut">紫云路与金寨南路交口向西200...</text>
-			</view>
-			<view class="navigation" @tap="openMap">
-				<image class="icon-self" src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=907966196,3433585328&fm=11&gp=0.jpg"
-				 mode=""></image>
-				导航
-			</view>
-		</view>
-		<!--  -->
-		<view class="padding-top-xs padding-bottom my-bg">
-			<view class="bg-white padding">
-
-				<view class="padding-bottom-sm">
-					油号选择：
-				</view>
-				<view class="grid col-5 justify-start">
-
-					<view class="padding-xs" v-for="(item,index) in ColorList" :key="index">
-						<button class="cu-btn" :class="[active===index?'bg-red':'line-gray']">0#</button>
-					</view>
-
-				</view>
-				<view class="padding-top-xs">
-					<text class="strong padding-right font-16">
-						0#柴油
-					</text>
-					<text class="s-rich">市场价￥6.5</text>
-				</view>
-				<view class="flex margin-top">
-					<view class="flex-treble text-center oil-price" @tap="selectRadio">
-						<view class="strong font-16 oil-main-color">
-							￥5.81
-						</view>
-						<radio class="red" :class="radio=='A'?'checked':''" :checked="radio=='A'?true:false" value="A"></radio>
-						<view class="">
-							星油油价
-						</view>
-					</view>
-					<view class="flex-treble text-center  oil-price" @tap="selectRadio">
-						<view class="strong font-16  oil-main-color">
-							￥5.81
-						</view>
-						<radio class="red" :class="radio=='A'?'checked':''" :checked="radio=='A'?true:false" value="A"></radio>
-						<view class="">
-							万金油价
-						</view>
-					</view>
-					<view class="flex-treble  oil-price text-center" @tap="selectRadio">
-						<view class="strong font-16  oil-main-color">
-							￥5.81
-						</view>
-						<radio class="red" :class="radio=='A'?'checked':''" :checked="radio=='A'?true:false" value="A"></radio>
-						<view class="">
-							老吕油价
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<view class="padding margin-top-xs margin-bottom-xs bg-white">
-				<view class="padding-bottom-sm">
-					油枪选择：
-				</view>
-				<view class="grid col-5 justify-start">
-
-					<view class="padding-xs" v-for="(item,index) in ColorList" :key="index">
-						<button class="cu-btn" :class="[active===index?'bg-red':'line-gray']">{{index}}</button>
-					</view>
-				</view>
-			</view>
-			<view class="margin-top-xs padding margin-bottom-xs bg-white">
-				<view class=" shadow-warp ">
-					<view class="cu-form-group">
-						<view class="title">加油升数</view>
-						<input placeholder="请输入加油升数" name="input"></input>
-						<text>约￥0.00</text>
-					</view>
-					<view class="my-cell">
-						<text class="font-12">星卡优惠金额</text><text class="fr">-￥0.00</text>
-					</view>
-					<view class="my-cell">
-						<text class="font-12">实际支付金额</text><text class="oil-main-color fr">￥0.00</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 底部去支付 -->
-		<view class="bottom-pay my-bg shadow padding-top">
-
-			<view class="flex bg-white padding pay-bar">
-				<text class="lg cuIcon-qr_code oil-main-color qr-icon padding-right"></text>
-				<view class="flex-twice pay-desc">
-					<text>付款码支付</text>
-					<text class="oil-main-color fr">￥0.00</text>
-				</view>
-				<view class="flex-sub text-right">
-					<button size="mini" class="bg-red">去支付</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				radio: 'B',
-				active: 0,
-				ColorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-			}
-		},
-		methods: {
-			selectRadio() {
-				this.radio === 'A' ? this.radio = '' : this.radio = 'A'
-			},
-			openMap() {
-				let that = this
-				uni.openLocation({
-					latitude: 117,
-					longitude: 21,
-					name: '江西景德镇',
-					address: '九龙路1188号',
-					scale: 12,
-					success: function() {
-						console.log('success')
-					},
-					fail: (error) => {
-						console.log('error')
-						console.log(error)
-					},
-					complete: () => {
-
-						console.log('made')
-					},
-
-				})
-
-				var map = uni.createMapContext('map')
-				map.moveToLocation()
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.content {
-		background-color: #F1F2F7;
-		min-height: 100%;
-		position: relative;
-	}
-
-	.navigation {
-		position: absolute;
-		right: 16px;
-		top: 10px;
-	}
-
-	.icon-self {
-		width: 1rem;
-		height: 1rem;
-	}
-
-	.oil-price {
-		position: relative;
-	}
-
-	.oil-price radio {
-		position: absolute;
-		left: 0rem;
-		top: 10px;
-	}
-
-	.qr-icon {
-		font-size: 2rem;
-	}
-
-	.pay-desc {
-		line-height: 2rem;
-	}
-
-	.bottom-pay {
-		min-height: 100rpx;
-		width: 750upx;
-	}
-
-	.pay-bar {
-		width: 750upx;
-		position: absolute;
-		bottom: 0;
-	}
-</style>
diff --git a/pages/stationList/stationList.vue b/pages/stationList/stationList.vue
deleted file mode 100644
index 245b1c6..0000000
--- a/pages/stationList/stationList.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-	<view class="my-bg">
-		<cu-custom class="main-topbar bg-main-oil" isBack bgColor="bg-main-oil">
-			<block slot="content">附近加油站</block>
-			<block slot="backText">返回</block>
-		</cu-custom>
-		<view class="cu-bar search bg-white">
-			<view class="search-form round">
-				<text class="cuIcon-search"></text>
-				<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text" placeholder="加油站名称" confirm-type="search"></input>
-			</view>
-			<view class="action" @tap="toMap">
-				<image class="icon shadow-blur round icon-gasstation" src="https://www.51xingka.net/LSMOIL/static/img/gas-station.png"
-				 mode=""></image>
-			</view>
-		</view>
-		<view class=" solids-bottom shadow ">
-			<dropdownMenu>
-				<dropdownItem :title="title1" v-model="val1" :list="typeList" @input="typeSelect" @close="show = false" />
-				<dropdownItem :title="title2" v-model="val2" :list="nameLsit" @input="nameSelect" @close="show = false" />
-				<dropdownItem :title="title3" :list="option3" v-model="val3" @input="optionSelect" @close="show = false" />
-			</dropdownMenu>
-		</view>
-		<view class="" @tap="toDetail">
-			<StationItem />
-		</view>
-	</view>
-</template>
-
-<script>
-	import StationItem from './components/StationItem.vue'
-	import dropdownItem from '@/components/ms-dropdown/dropdown-item.vue'
-	import dropdownMenu from '@/components/ms-dropdown/dropdown-menu.vue'
-
-	export default {
-		components: {
-			StationItem,
-			dropdownItem,
-			dropdownMenu
-		},
-		data() {
-			return {
-				val3: 'distance',
-				val1: 'distance',
-				val2: 'distance',
-				title1: "0#",
-				title2: "距离最近",
-				title3: "综合排序",
-				typeList: [{
-						text: '距离最近',
-						value: 'distance'
-					},
-					{
-						text: '价格最低',
-						value: 'price'
-					}
-				],
-				nameLsit: [{
-						text: '全部品牌',
-						value: 0
-					},
-					{
-						text: '距离最近',
-						value: 'distance'
-					},
-					{
-						text: '价格最低',
-						value: 'price'
-					}
-				],
-				option3: [{
-						text: '距离最近',
-						value: 'distance'
-					},
-					{
-						text: '价格最低',
-						value: 'price'
-					}
-				],
-				InputBottom: 0,
-				chooseList: ['1', '2'],
-				arr: ['出', '入'],
-				show: false
-			}
-		},
-		methods: {
-			toDetail(){
-				uni.navigateTo({
-					url: './stationDetail/stationDetail',
-				})
-			},
-			nameSelect(value, item) {
-				this.title2 = item.text
-				console.log(item)
-			},
-			typeSelect(value, item) {
-				console.log(item)
-				this.title1 = item.text
-			},
-			optionSelect(value, item) {
-				console.log(item)
-				this.title3 = item.text
-			},
-			toMap() {
-				uni.navigateTo({
-					url: '../index/index',
-				})
-			},
-			InputFocus(e) {
-				this.InputBottom = e.detail.height
-				console.log(e.detail)
-				console.log(this.InputBottom)
-			},
-			InputBlur(e) {
-				this.InputBottom = 0
-				console.log(this.InputBottom)
-				console.log(e.detail)
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.icon-gasstation {
-		width: 1.2rem;
-		height: 1.2rem;
-	}
-</style>
diff --git a/pages/userPage/userPage.vue b/pages/userPage/userPage.vue
deleted file mode 100644
index 84b27f8..0000000
--- a/pages/userPage/userPage.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-	<view class="page-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="cu-list menu-avatar">
-			<view class="cu-item arrow">
-				<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg);"></view>
-				<view class="content">
-					<view class="text-grey">用户姓名</view>
-					<view class="text-gray text-sm flex">
-						<view class="text-cut">
-							<!-- <text class="cuIcon-infofill text-red  margin-right-xs"></text> -->
-							当前：个人账户
-						</view>
-					</view>
-				</view>
-				<view class="action">
-					<text class="cuIcon-right text-grey  "></text>
-				</view>
-			</view>
-		</view>
-		<view class="cu-list menu ">
-			<view class="cu-item ">
-				<view class="content">
-					<text class="color-000">手机号</text>
-				</view>
-				<view class="action">
-					<text class="text-grey text-sm">111111111</text>
-				</view>
-			</view>
-
-			<view class="cu-item ">
-				<view class="content">
-					<text class="color-000">身份证号</text>
-				</view>
-				<view class="action">
-					<text class="text-grey text-sm">3102***5411</text>
-				</view>
-			</view>
-
-			<view class="cu-item ">
-				<view class="content">
-					<text class="color-000">车牌号</text>
-				</view>
-				<view class="action">
-					<text class="text-grey text-sm">皖ADW857</text>
-				</view>
-			</view>
-
-			<view class="cu-item arrow">
-				<view class="content">
-					<text class="color-000">登入密码</text>
-				</view>
-				<view class="action">
-					<text class="text-grey text-sm">管理登入密码</text>
-				</view>
-			</view>
-
-			<view class="cu-item arrow">
-				<view class="content">
-					<text class="color-000">支付密码</text>
-				</view>
-				<view class="action">
-					<text class="text-grey text-sm">设置支付密码</text>
-				</view>
-			</view>
-		</view>
-		<view class="padding  margin-top bg-white margin-bottom">
-			<view class="cu-item text-center">
-				<text class="color-000 text-center">切换账号</text>
-			</view>
-		</view>
-		<view class="padding   bg-white">
-			<view class="cu-item text-center">
-				<text class="color-000 text-center">退出</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style scoped>
-	.cu-list+.cu-list {
-		margin-top: 0;
-	}
-
-	.page-content {
-		min-height: 100%;
-	}
-</style>
diff --git a/pages/wallet/record/record.vue b/pages/wallet/record/record.vue
deleted file mode 100644
index ab9452b..0000000
--- a/pages/wallet/record/record.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-	<view class="page-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="margin bg-white radius main-money ">
-			<view class="padding-xs flex align-center" @tap="copy">
-				<view class="flex-sub text-center padding-top">
-					<view class="text-center">星油余额</view>
-					<view class=" text-xxl  padding-top-xs">
-						<text class="text-price text-red ">
-							80.00
-						</text>
-					</view>
-				</view>
-			</view>
-			<view class="padding margin-left margin-right flex flex-direction">
-				<button class="cu-btn bg-main-oil oil-main-btn-color oil-main-color lg">
-					转入
-				</button>
-			</view>
-		</view>
-		<view class="margin">
-			<view class="padding-top flex padding-left-xs padding-bottom">
-				<view class="flex-sub">
-					<text>最近的五笔交易</text>
-				</view>
-				<view class="flex-sub text-right padding-right-xs">
-					<text class="text-gray">更多</text>
-
-					<text class="cuIcon-right text-gray"></text>
-				</view>
-			</view>
-			<view class="cu-list menu">
-				<view class="cu-item">
-					<view class="content">
-						微信充值
-					</view>
-					<view class="action">
-						￥ 0.20
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style scoped>
-	.page-content {
-		min-height: 100%;
-	}
-</style>