Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

# Conflicts:
#	pages/index/index.vue

package-lock.json

@@ -2070,6 +2070,44 @@
      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
      "dev": true
     },
+    "ansi-styles": {
+     "version": "4.3.0",
+     "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+     "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "color-convert": "^2.0.1"
+     }
+    },
+    "chalk": {
+     "version": "4.1.2",
+     "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+     "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "ansi-styles": "^4.1.0",
+      "supports-color": "^7.1.0"
+     }
+    },
+    "color-convert": {
+     "version": "2.0.1",
+     "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "color-name": "~1.1.4"
+     }
+    },
+    "color-name": {
+     "version": "1.1.4",
+     "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+     "dev": true,
+     "optional": true
+    },
     "fs-extra": {
      "version": "7.0.1",
      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-7.0.1.tgz",
@@ -2081,6 +2119,13 @@
       "universalify": "^0.1.0"
      }
     },
+    "has-flag": {
+     "version": "4.0.0",
+     "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+     "dev": true,
+     "optional": true
+    },
     "jsonfile": {
      "version": "4.0.0",
      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -2098,6 +2143,28 @@
      "requires": {
       "minipass": "^3.1.1"
      }
+    },
+    "supports-color": {
+     "version": "7.2.0",
+     "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+     "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "has-flag": "^4.0.0"
+     }
+    },
+    "vue-loader-v16": {
+     "version": "npm:vue-loader@16.8.3",
+     "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+     "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "chalk": "^4.1.0",
+      "hash-sum": "^2.0.0",
+      "loader-utils": "^2.0.0"
+     }
     }
    }
   },
@@ -13152,75 +13219,6 @@
     }
    }
   },
-  "vue-loader-v16": {
-   "version": "npm:vue-loader@16.8.3",
-   "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-   "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-   "dev": true,
-   "optional": true,
-   "requires": {
-    "chalk": "^4.1.0",
-    "hash-sum": "^2.0.0",
-    "loader-utils": "^2.0.0"
-   },
-   "dependencies": {
-    "ansi-styles": {
-     "version": "4.3.0",
-     "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-     "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "color-convert": "^2.0.1"
-     }
-    },
-    "chalk": {
-     "version": "4.1.2",
-     "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-     "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "ansi-styles": "^4.1.0",
-      "supports-color": "^7.1.0"
-     }
-    },
-    "color-convert": {
-     "version": "2.0.1",
-     "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "color-name": "~1.1.4"
-     }
-    },
-    "color-name": {
-     "version": "1.1.4",
-     "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-     "dev": true,
-     "optional": true
-    },
-    "has-flag": {
-     "version": "4.0.0",
-     "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-     "dev": true,
-     "optional": true
-    },
-    "supports-color": {
-     "version": "7.2.0",
-     "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-     "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "has-flag": "^4.0.0"
-     }
-    }
-   }
-  },
   "vue-style-loader": {
    "version": "4.1.3",
    "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz",

pages/article/article.vue

@@ -0,0 +1,23 @@
+<template>
+	<view>
+		
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/article/articleDetails.vue

@@ -0,0 +1,58 @@
+<template>
+	<view style="background-color: #fff;">
+		<u-navbar title="文章详情"></u-navbar>
+		<view class="main">
+			<view class="new-title">
+				推进以县城为载体的城镇化建设，快电助力县镇充电网络建设
+			</view>
+			<view class="time">
+				<view class="time-left">
+					2022-05-11 09:00:00
+				</view>
+				<view class="time-tight">
+					<text class="iconfont">&#xe612;</text><text class="num">566</text>
+				</view>
+			</view>
+			<view class="news-content">
+				 近日，中共中央办公厅、国务院办公厅印发了《关于推进以县城为重要载体的城镇化建设的意见》。《意见》明确，推进以县城为重要载体的城镇化建设。推动公共交通工具和物流配送、市政环卫等车辆电动化。优化公共充换电设施建设布局，加快建设充电桩。随着国家、地方出台的一系列优惠政策，新能源汽车快速下沉至三四线城市及县镇市场。据中汽协数据显示，2021年，新能源汽车下乡车型共完成销售106.8万辆，同比增长169.2％，比整体市场增速高约10个百分点，贡献率逼近30%。随着新能源汽车加速下沉，县镇市场的充电补能需求大幅增加。日前，第三方充换电网络快电发布的《2022五一新能源汽车出行报告》显示，今年五一期间，三四线城市、乡镇市场新能源汽车充电量同比增长227%。其中，漳州市、柳州市、宝鸡市等位列三四线城市充电量前三位。
+			<img src="/static/img/新闻图.png" alt="">
+			《意见》提出，推动公共交通工具和物流配送、市政环卫等车辆电动化。优化公共充换电设施建设布局，加快建设充电桩。可以预期，新能源汽车在县级城市、乡镇市场将迎来新一轮增长。随着这些地区新能源汽车保有量的增加，也对充电基础设施建设提出了更高要求。
+			目前，县镇地区充电桩数量较少、位置更隐蔽、日常维护差。即便车主找到充电桩也有可能是“坏桩”，车主充电体验差且提升难度较大。而对充电运营商来说，县镇车流密度相对较低，在场站选址、日常运维、营收增长等环节均存在难题，很多场站仅靠政府补贴难以生存。因此，解决充电站运营痛点、完善充电基础设施网络已迫在眉睫。
+			第三方充换电网络快电正凭借其构建的覆盖全国的互联互通充电网络，积极推动县镇充电基础设施发展，帮助车主和充电运营商实现共赢。一方面，快电连接了包括特来电、星星充电等在内的主流充电桩运营商，可为车主实时推荐附近好用的充电桩，解决县镇车主找不到桩、找到坏桩等难题。
+			另一方面，快电可为充电运营商提供从选址、建站到获客、运营再到后期维护的全流程服务，破解县镇市场盈利难题。与此同时，快电还可提供增值服务支持，帮助场站增设餐饮、购物、按摩、车后服务等，帮助其不断拓展营收渠道，实现持续盈利。
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss" scoped>
+	.main{
+		
+		margin: 0px 16px ;
+		padding-bottom: 34px;
+		.new-title{
+			color: #101010;
+			font-size: 18px;
+			height: 48px;
+			margin: 16px 0 35px;
+		}
+		.time{
+			display: flex;
+			justify-content: space-between;
+			color: #888888;
+			.num{
+				margin-left: 4px;
+			}
+			
+		}
+		.news-content{
+			margin-top: 13px;
+			font-size: 14px;
+			line-height: 28px;
+			color: #101010;
+		}
+	}
+</style>

pages/article/newsNotice.vue

@@ -0,0 +1,169 @@
+<template>
+	<view style="background-color: #fff;height:1135px;" >
+		<u-navbar title="新闻公告"></u-navbar>
+		
+		<view class="options">
+			<view class="options-item">
+				通知公告
+			</view>
+			<view class="options-item">
+				行业新闻
+			</view>
+			<view class="options-item">
+				优惠活动
+			</view>
+		</view>
+		
+		<view class="swiper-box">
+			<u-swiper  :list="list" mode="dot">
+			
+		
+		
+		</u-swiper>
+		</view>
+		
+		<view class="news">
+		
+			<view class="news-content">
+				<view class="content-text">
+					日印计划联手开发低成本充电桩 推动新兴市场电动车发展
+					<view class="news-time">05-01 09:00</view>
+				</view>
+				<view class="content-img">
+					<img src="/static/img/11091323191.jpg" alt="">
+				</view>
+			</view>
+			<view class="news-content">
+				<view class="content-text">
+					我国新能源汽车市场腾飞在即，充换电何时能够不再“拖后腿”？
+					<view class="news-time">05-01 09:00</view>
+				</view>
+				<view class="content-img">
+					<img src="/static/img/103613441.jpg" alt="">
+				</view>
+			</view>
+		
+			<view class="news-content">
+				<view class="content-text">
+					新疆建成首个充电桩实验室
+					<view class="news-time">05-01 09:00</view>
+				</view>
+				<view class="content-img">
+					<img src="/static/img/180023631.jpg" alt="">
+				</view>
+			</view>
+			<view class="news-content">
+				<view class="content-text">
+					三一集团成立动能换电公司 经营范围含集中式快速充电站
+					<view class="news-time">05-01 09:00</view>
+				</view>
+				<view class="content-img">
+					<img src="/static/img/06002925191.jpg" alt="">
+				</view>
+			</view>
+			<view class="news-content">
+				<view class="content-text">
+					梳理我国充换电基础设施行业9大问题，14条建议提供解决方案
+					<view class="news-time">05-01 09:00</view>
+				</view>
+				<view class="content-img">
+					<img src="/static/img/08425983191.png" alt="">
+				</view>
+			</view>
+		
+			<view class="news-content">
+				<view class="content-text">
+					梳理我国充换电基础设施行业9大问题，14条建议提供解决方案
+					<view class="news-time">05-01 09:00</view>
+				</view>
+				<view class="content-img">
+					<img src="/static/img/image_default.png" alt="">
+				</view>
+			</view>
+		</view>
+		<u-divider>已经到底了</u-divider>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+						image: '/static/img/快乐周末游1x (1).png',
+					}
+					
+				],
+			}
+		},
+		methods: {
+
+		}
+	}
+		
+		
+</script>
+
+<style lang="scss">
+	
+	.options{
+		
+		width: 60%;
+		height: 44px;
+		line-height: 44px;
+		display: flex;
+		justify-content: space-between;
+		margin: 0px 16px ;
+	}
+	.swiper-box{
+		width: 343px;
+		height: 146px;
+		margin-left: 16px;
+	
+		
+	}
+	.news {
+		background-color: #fff;
+		margin: 0 16px ;
+	    border-radius: 8px;
+		.news-content {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 24px;
+	
+			.content-text {
+				width: 211px;
+				height: 42px;
+				line-height: 21px;
+				color: #101010;
+				text-align: left;
+				font-size: 14px
+			}
+	
+			;
+	
+			.content-img {
+				width: 100px;
+				height: 80px;
+	            background-color: #777777;
+				border-radius: 4px;
+				overflow: hidden;
+	
+				img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+	
+			.news-time {
+				margin-top: 12px;
+				color: #999999;
+				width: 80px;
+				height: 20px;
+				font-size: 14px;
+			}
+		}
+	}
+	
+
+</style>

pages/index/index.vue

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <template>
 	<view>
 
@@ -591,4 +592,633 @@
 			font-size: 14px;
 		}
 	}
+=======
+<template>
+	<view>
+
+		<!-- 头部图片 -->
+		<view class="banner">
+			<img src="/static/img/banner1.jpg" alt="">
+		</view>
+
+
+		<!-- 选项列表 -->
+		<view class="option-list">
+
+			<view class="list-item">
+				<view class="icon iconfont" style="background-color:#59d96e;">
+					&#xe61a;
+				</view>
+				<view class="text">
+					扫码充电
+				</view>
+
+			</view>
+			<view class="list-item">
+				<view class="icon iconfont" style="background-color:#4BD2C0;">
+					&#xe629;
+				</view>
+				<view class="text">
+					快速充值
+				</view>
+
+			</view>
+			<view class="list-item">
+				<view class="icon iconfont" style="background-color: #6FA5FF;">
+					&#xe625;
+				</view>
+				<view class="text">
+					充电记录
+				</view>
+
+			</view>
+			<view class="list-item">
+				<view class="icon iconfont" style="background-color: #9D9FFF;">
+					&#xe622;
+				</view>
+				<view class="text">
+					附近站点
+				</view>
+
+			</view>
+
+		</view>
+
+		<!-- 站点 -->
+		<!-- <view class="station">
+	     <view class="img-box" >
+	     	<img src="/static/img/Frame 198 (1).png" alt="">
+	     </view>
+		<view class="text"> -->
+		<!-- 站点头部 -->
+		<!-- <view class="station-title">
+	   		<text class="title-left">快充</text>
+	   		<text class="title-right">荆沙大道救助站充电站</text>
+	   	</view> -->
+		<!-- 价格 -->
+		<!-- 	<view class="station-price">
+	   		<view class="price-left">1.25</view>
+	   		<view class="price-right">
+	   			起 元/度
+	   		</view>
+	   	</view> -->
+		<!-- park -->
+		<!-- <view class="park">
+	   		<text class="park-p">p</text>
+	   		<text class="park-text">2小时免费停车</text>
+	   	</view>
+	   	<view class="count">
+	   		<view class="count-left">空闲10/总数10</view>
+	   		<view class="count-right"><text class="iconfont">&#xe615;</text>10公里</view>
+	   	</view>
+		</view>
+	   </view> -->
+		<!-- 定位 -->
+		<view class="location-box">
+			<view class="location">
+				<view class="location-text">
+					<view class="text-1">
+						定位中...
+					</view>
+					<view class="text-2">
+						授权定位后可查询附近充电站
+					</view>
+					<view class="text-3">
+						重新定位
+					</view>
+				</view>
+				<view class="img-box">
+		 		<img src="/static/img/暂无网络信号-缺省页 1.png">
+		  </view>
+		</view>
+		
+	</view>
+		<!-- 充值活动 -->
+		<view class=" top-up">
+			<view class="top-up-title"><text class="line"></text>充值活动</view>
+			<view class="img-box">
+				<view class="img-1">
+					<img src="/static/img/瓷片区1.png" alt="">
+					<view class="img-text">
+						充100送20
+						<view class="img-text2">即充即赠 立享优惠</view>
+					</view>
+				</view>
+				<view class="img-1">
+					<img src="/static/img/瓷片区2.png" alt="">
+					<view class="img-text" style="color: #FF7C00;">
+						邀请有礼
+						<view class="img-text2 color">最高可得500元</view>
+					</view>
+				</view>
+			</view>
+		</view>
+				<!-- 新闻 -->
+				<view class="news-title">
+					<view class="news-title-left">
+						<view class="line" style="margin-top:4px;"></view>新闻公告
+					</view>
+
+					<view class="more">更多<view class="more-icon iconfont"> &#xe600;</view>
+					</view>
+
+
+				</view>
+				<view class="news">
+
+					<view class="news-content">
+						<view class="content-text">
+							日印计划联手开发低成本充电桩 推动新兴市场电动车发展
+							<view class="news-time">05-01 09:00</view>
+						</view>
+						<view class="content-img">
+							<img src="/static/img/11091323191.jpg" alt="">
+						</view>
+					</view>
+					<view class="news-content">
+						<view class="content-text">
+							我国新能源汽车市场腾飞在即，充换电何时能够不再“拖后腿”？
+							<view class="news-time">05-01 09:00</view>
+						</view>
+						<view class="content-img">
+							<img src="/static/img/103613441.jpg" alt="">
+						</view>
+					</view>
+
+					<view class="news-content">
+						<view class="content-text">
+							新疆建成首个充电桩实验室
+							<view class="news-time">05-01 09:00</view>
+						</view>
+						<view class="content-img">
+							<img src="/static/img/180023631.jpg" alt="">
+						</view>
+					</view>
+				</view>
+				<view class="bottom">
+					<view class="bot">
+						<view class="bot-line"></view>
+						<view class="bot-text">已经到底了</view>
+						<view class="bot-line"></view>
+					</view>
+				</view>
+				<!-- 导航栏 -->
+				<view class="navigation">
+					<!-- 	<view class="nav-items">
+				<view class="nav-icon iconfont ">
+	                         &#xe610;
+				</view>
+				<view class="nav-text">主页</view>
+			</view>
+			<view class="nav-items">
+				<view class="nav-icon iconfont">&#xe622;</view>
+				<view class="nav-text">找桩</view>
+			</view>
+			<view class="nav-items">
+				<view class="nav-icon iconfont">&#xe627;</view>
+				<view class="nav-text">我的</view>
+			</view> -->
+					<u-tabbar v-model="current" :list="tabbarList" active-color="#009143"></u-tabbar>
+				</view>
+			</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabbarList: [{
+						iconPath: "home-3-line",
+						selectedIconPath: "home-3-fill",
+						text: '主页 ',
+						count: 0,
+						isDot: true,
+						customIcon: true,
+					},
+					{
+						iconPath: "roadmap-line",
+						selectedIconPath: " road map-fill",
+						text: ' 找桩',
+						midButton: true,
+						customIcon: true,
+
+					},
+					{
+						iconPath: "user- 5- line",
+						selectedIconPath: "user-5- fill",
+						text: '我的',
+						count: 0,
+						isDot: false,
+						customIcon: true,
+
+					}
+				],
+				current: 0
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	// 头部图片
+	img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.banner {
+		width: 100%;
+		height: 300px;
+
+
+	}
+
+
+	// 选项列表
+	.option-list {
+		padding-top: 18px;
+		width: 343px;
+		height: 100px;
+		line-height: 20px;
+		border-radius: 8px;
+		text-align: center;
+		background-color: #fff;
+		position: absolute;
+		top: 260px;
+		left: 0;
+		right: 0;
+		margin: auto;
+		display: flex;
+		justify-content: space-around;
+
+		.list-item {
+
+			// 图标
+			.icon {
+				width: 40px;
+				height: 40px;
+				border-radius: 99px;
+				line-height: 40px;
+				font-size: 24px;
+				text-align: center;
+				margin: auto;
+				color: #ffffff;
+			}
+
+		}
+
+	}
+
+	// 站点
+	.station {
+		// width: 343px;
+		height: 120px;
+		margin-top: 70px;
+
+
+		padding-top: 20px;
+		padding: 0 12px;
+		position: relative;
+
+		.img-box {
+			width: 100%;
+			height: 100%;
+			border-radius: 8px;
+			overflow: hidden;
+		}
+
+		img {
+			width: 100%;
+			height: 100%;
+
+		}
+
+		.text {
+			position: absolute;
+			top: 0;
+			left: 20px;
+
+			// 头部
+			.station-title {
+				display: flex;
+				margin-top: 12px;
+
+				.title-left {
+					display: inline-block;
+					height: 20px;
+					width: 44px;
+					// margin-left: 12px;
+					line-height: 20px;
+					border-radius: 50px;
+					background-color: rgba(133, 140, 255, 100);
+					color: rgba(255, 255, 255, 100);
+					font-size: 12px;
+		 		text-align: center;
+					font-family: Arial;
+				}
+
+				.title-right {
+					display: inline-block;
+					margin-left: 4px;
+					margin-top: 2px;
+					width: 271px;
+					height: 16px;
+					line-height: 16px;
+					color: rgba(16, 16, 16, 100);
+					font-size: 16px;
+					text-align: left;
+					font-family: AlibabaPuHui-regular;
+				}
+			}
+
+			// 价格
+			.station-price {
+				margin-top: 4px;
+				display: flex;
+
+				.price-left {
+		 		width: 40px;
+					height: 20px;
+					color: rgba(255, 98, 0, 100);
+					font-size: 20px;
+					text-align: left;
+					font-family: Roboto-medium;
+				}
+
+				.price-right {
+					height: 20px;
+					line-height: 20px;
+					margin-left: 2px;
+					margin-top: 3px;
+					color: rgba(102, 102, 102, 100);
+					font-size: 14px;
+					text-align: left;
+					font-family: AlibabaPuHui-regular;
+				}
+
+			}
+
+			// park
+			.park {
+				margin-top: 4px;
+				display: flex;
+
+				.park-p {
+					display: inline-block;
+					width: 20px;
+					height: 18px;
+					line-height: 12px;
+					text-align: center;
+					background-color: rgba(125, 177, 255, 100);
+					color: #fff;
+				}
+
+				.park-text {
+					display: inline-block;
+					width: 300px;
+					height: 17px;
+					color: rgba(102, 102, 102, 100);
+					font-size: 12px;
+					text-align: left;
+					margin-left: 2px;
+					margin-top: 2px;
+				}
+			}
+
+			// 数量
+			.count {
+				margin-top: 8px;
+				width: 96%;
+				display: flex;
+				justify-content: space-between;
+			}
+		}
+
+	}
+
+	//定位
+
+	.location {
+		width: 343px;
+		background-color: #ffffff;
+		height: 120px;
+		display: flex;
+		margin: 70px auto 0;
+		border-radius: 8px;
+		border: #F2F4F4 1px;
+
+		.location-text {
+			padding: 24px 28px;
+
+			.text-1 {
+				height: 16px;
+				color: rgba(16, 16, 16, 100);
+				font-size: 16px;
+				text-align: left;
+			}
+
+			.text-2 {
+				height: 17px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 12px;
+				text-align: left;
+				margin-top: 4px;
+			}
+
+			.text-3 {
+				width: 80px;
+				height: 24px;
+				border-radius: 50px;
+				color: rgba(0, 185, 98, 100);
+				font-size: 12px;
+				text-align: center;
+				font-family: Microsoft Yahei;
+				border: 1px solid rgba(0, 185, 98, 100);
+				margin-top: 11px;
+			}
+		}
+
+		.img-box {
+			width: 120px;
+			height: 120px;
+			float: right;
+		}
+	}
+
+	//充值
+	.top-up {
+		margin-left: 16px;
+		margin-top: 17px;
+
+		.top-up-title {
+			color: rgba(16, 16, 16, 100);
+			font-size: 16px;
+		}
+
+		.img-box {
+			margin-top: 12px;
+			width: 345px;
+			height: 146px;
+			display: flex;
+			justify-content: space-between;
+
+			.img-1 {
+				width: 166px;
+				height: 146px;
+				position: relative;
+
+				.img-text {
+					position: absolute;
+					top: 0;
+					left: 0;
+					height: 33px;
+					color: #ff4444;
+					font-size: 24px;
+					text-align: left;
+					margin-left: 12px;
+
+					.img-text2 {
+						font-size: 12px
+					}
+
+				}
+			}
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	// 小竖线
+	.line {
+		display: inline-block;
+		width: 3px;
+		height: 12px;
+		margin-right: 7px;
+		background-color: rgba(0, 145, 67, 100);
+	}
+
+	// 新闻公告
+	.news-title {
+		padding: 0 16px;
+		margin-top: 12px;
+		color: rgba(16, 16, 16, 100);
+		font-size: 16px;
+		display: flex;
+		justify-content: space-between;
+		background-color: #F2F4F4;
+
+		.news-title-left {
+			display: flex;
+		}
+
+		.more {
+			font-size: 14px;
+			color: #777777;
+			display: flex;
+			line-height: 20px;
+
+			.more-icon {
+				font-size: 24px
+			}
+		}
+	}
+
+	.news {
+		background-color: #fff;
+		margin: 17px 16px 0;
+
+		.news-content {
+			display: flex;
+			justify-content: space-between;
+			padding: 12px;
+
+			.content-text {
+				width: 211px;
+				height: 42px;
+				line-height: 21px;
+				color: #101010;
+				text-align: left;
+				font-size: 14px
+			}
+
+			;
+
+			.content-img {
+				width: 100px;
+				height: 80px;
+
+				border-radius: 4px;
+
+				img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.news-time {
+				margin-top: 12px;
+				color: #999999;
+				width: 80px;
+				height: 20px;
+				font-size: 14px;
+			}
+		}
+	}
+
+	.bottom {
+		width: 100%;
+		height: 150px;
+
+		.bot {
+			width: 100%;
+			padding-left: 66px;
+			display: flex;
+
+			.bot-line {
+				margin-top: 20px;
+				width: 80px;
+				height: 0px;
+				border: 1px solid rgba(207, 210, 213, 100);
+			}
+
+			.bot-text {
+				width: 60px;
+				height: 17px;
+				margin-top: 13px;
+				margin-left: 12px;
+				margin-right: 12px;
+				font-size: 12px;
+				text-align: center;
+
+			}
+		}
+	}
+
+	// 导航栏
+	.navigation {
+		width: 100%;
+		// height: 40px;
+		padding: 10px 0;
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		display: flex;
+		justify-content: space-around;
+		text-align: center;
+		color: #999999;
+
+		.nav-icon {
+			width: 54px;
+			font-size: 24px
+		}
+
+		.nav-text {
+			font-size: 14px;
+		}
+	}
+>>>>>>> 3c3be89c85e2a9d6c41986681d59c23622bf81e5
 </style>

pages/login/login.vue

@@ -20,7 +20,12 @@
 						<view class="code">获取验证码</view>
 						<u-input v-model="tel" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
 					</view>
-					<view class="tips">我已阅读并同意<span>《会员协议》</span>和<span>《隐私协议》</span></view>
+					<u-checkbox-group>
+						<u-checkbox class="tips" v-model="value" shape="circle" @change="checkboxChange()">
+							<view v-if="!value">我已阅读并同意<span>《会员协议》</span>和<span>《隐私协议》</span></view>
+							<view v-else>我已阅读并同意<span style="color: #000000;">《会员协议》</span>和<span style="color: #000000;">《隐私协议》</span></view>
+						</u-checkbox>
+					</u-checkbox-group>
 				</view>
 			</view>
 			
@@ -34,7 +39,8 @@
 export default {
 	data() {
 		return {
-			tel: ''
+			tel: '',
+			value: false,
 		}
 	},
 	computed: {
@@ -48,7 +54,9 @@ export default {
 		}
 	},
 	methods: {
-
+		checkboxChange() {
+			this.value = !this.value;
+		},
 	}
 };
 </script>

pages/search/search.vue

@@ -0,0 +1,238 @@
+
+<template>
+	<view>
+		<u-navbar title="">
+			<u-search class="search" placeholder="搜索站点名称" v-model="keyword" color="#c8c8c8"></u-search>
+		</u-navbar>
+		<view class="recommend">推荐充电站</view>
+		<view class="charing-slow">
+			<text class="trickle-charge">慢充</text> <text class="station-items">荆鹏软件园充电站</text>
+			<view class="address">
+				湖北省荆州市沙市区江津东路附155号
+			</view>
+			<view class="price">
+				<view class="num">1.20</view> <view class="unit">
+					起 元/度
+				</view>
+			</view>
+			 <view class="park">
+				<text class="park-p">p</text>
+				<text class="park-text">2小时免费停车</text>
+			</view>
+			<view class="free">
+				<view class="free-num">
+					  <text style="color:#009143;">空闲1</text>/总数5
+				</view>
+				<view class="distance">
+					<text class="iconfont distance-font">&#xe615;</text>0.1公里 1分钟
+				</view>
+			</view>
+		</view>
+		<view class="charing-slow">
+			<text class="fast-charge">快充</text> <text class="station-items">荆沙大道救助站充电站</text>
+			<view class="address">
+				湖北省荆州市沙市区江津东路附155号
+			</view>
+			<view class="price">
+				<view class="num">1.25</view> <view class="unit">
+					起 元/度
+				</view>
+			</view>
+			 <view class="park">
+				<text class="park-p">p</text>
+				<text class="park-text">2小时免费停车</text>
+			</view>
+			<view class="free">
+				<view class="free-num">
+				  <text style="color:#009143;">空闲10</text>/总数10
+				</view>
+				<view class="distance">
+					<text class="iconfont distance-font">&#xe615;</text>1.2公里 3分钟
+				</view>
+			</view>
+		</view>
+		
+		<view class="charing-slow">
+			<text class="trickle-charge">慢充</text> <text class="station-items">荆鹏软件园充电站</text>
+			<view class="address">
+				湖北省荆州市沙市区江津东路附155号
+			</view>
+			<view class="price">
+				<view class="num">1.20</view> <view class="unit">
+					起 元/度
+				</view>
+			</view>
+			 <view class="park">
+				<text class="park-p">p</text>
+				<text class="park-text">2小时免费停车</text>
+			</view>
+			<view class="free">
+				<view class="free-num">
+				  <text style="color:#009143;">空闲1</text>/总数5
+				</view>
+				<view class="distance">
+					<text class="iconfont distance-font">&#xe615;</text>0.1公里 1分钟
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		
+		data() {
+			return {
+          
+			}
+		},
+		 // conponents:{charingSlows},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/deep/.u-content[data-v-1a326067] {
+		flex: 0.95;
+		color: #bdbdbd;
+	}
+
+	/deep/.u-action {
+		margin-right: 0px;
+		color: #c8c8c8;
+	}
+
+	.recommend {
+		width: 100%;
+		height: 44px;
+		line-height: 44px;
+		color: #101010;
+		padding: 0 16px;
+		background-color: #fff;
+		font-weight: 600;
+	}
+
+	.charing-slow {
+		width: 91%;
+		background-color: #fff;
+		margin: 12px auto 0;
+		border-radius: 8px;
+		padding: 10px 12px 0px;
+
+		.trickle-charge {
+			display: inline-block;
+			width: 44px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: rgba(0, 185, 98, 100);
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+		}
+		.fast-charge {
+			display: inline-block;
+			width: 44px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: #9d9fff;
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+		}
+
+		.station-items {
+			display: inline-block;
+			height: 16px;
+			line-height: 16px;
+			font-size: 16px;
+			margin-left: 4px;
+			color: #101010;
+
+
+		}
+
+		.address {
+			margin-top: 8px;
+			line-height: 16px;
+			font-size: 11px;
+			color: rgba(119, 119, 119, 100);
+		}
+		.price{
+			display: flex;
+			height: 20px;
+			.num{
+				height: 20px;
+				color: rgba(255, 98, 0, 100);
+				font-size: 20px;
+				text-align: left;
+				font-family: Roboto-medium;
+			}
+			.unit{
+				height: 14px;
+				line-height: 14px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 14px;
+				text-align: left;
+				font-family: AlibabaPuHui-regular;
+				margin-top: 6px;
+				margin-left: 4px;
+			}
+		}
+		.park {
+			margin-top: 8px;
+		    display: flex;
+			.park-p {
+				display: inline-block;
+				width: 20px;
+				height: 18px;
+				line-height: 12px;
+				text-align: center;
+				background-color: rgba(125, 177, 255, 100);
+				color: #fff;
+			}
+		
+			.park-text {
+				display: inline-block;
+				width: 300px;
+				height: 17px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 12px;
+				text-align: left;
+				margin-left: 4px;
+				margin-top: 2px;
+			}
+		}
+		.free{
+			display: flex;
+			justify-content: space-between;
+			height: 52px;
+			border-top: 1px solid rgba(238, 242, 240, 100);
+			margin-top: 10px;
+			.free-num{
+				line-height: 52px;
+				font-size: 16px
+			}
+			.distance{
+				width: 130px;
+				height: 28px;
+				line-height: 28px;
+				color: rgba(255, 255, 255, 100);
+				font-size: 14px;
+				background-color: #00b962;
+				border-radius: 50px;
+				margin: 12px;
+				text-align: center;
+				.distance-font{
+					font-size: 16px
+				}
+				
+			}
+		}
+	}
+</style>

pages/searchPile/searchPile.vue

@@ -0,0 +1,352 @@
+<template>
+	<view>
+		<!-- 头部 -->
+		<view>
+			<view class="top">
+				<view class="">
+					荆州市 <text class="iconfont" style="color: #bdbdbd;">&#xe62a;</text>
+				</view>
+				<u-search :show-action="false" placeholder="搜索站点名称"></u-search>
+				<view class="">
+					<text class="iconfont">&#xe613;</text> <text class="list">列表</text>
+				</view>
+			</view>
+		</view>
+		<!-- 条件选项 -->
+		<view class="condition">
+			<view class="condition-distance">
+				10公里<text class="iconfont" style="color: #bdbdbd;">&#xe62a;</text>
+			</view>
+			<view class="condition-type">
+				直流快充<text class="iconfont" style="color: #bdbdbd;">&#xe62a;</text>
+			</view>
+			<view class="condition-screen">
+				筛选<text class="iconfont" style="color: #bdbdbd;">&#xe62a;</text>
+			</view>
+
+		</view>
+		<!-- 地图 -->
+		<view class="map">
+			<view class="station-icon"><text class="iconfont">&#xe606;</text>
+			<view class="corner"></view>
+			</view>
+			<view class="station-icon2">
+				<view class="iconfont icon2-left">&#xe606;</view>
+				<view class="icon2-right">
+					<view class="corner2"></view>
+					<view class="">
+						￥1.25
+					</view>
+					<view class="">
+						空闲10
+					</view>
+				</view>
+			</view>
+			
+			<img src="/static/img/地图@1x.png" alt="">
+		</view>
+		<view class="charing-slow">
+			<text class="fast-charge">快充</text> <text class="station-items">荆沙大道救助站充电站</text>
+			<view class="address">
+				湖北省荆州市沙市区江津东路附155号
+			</view>
+			<view class="price">
+				<view class="num">1.25</view>
+				<view class="unit">
+					起 元/度
+				</view>
+			</view>
+			<view class="park">
+				<text class="park-p">p</text>
+				<text class="park-text">2小时免费停车</text>
+			</view>
+			<view class="free">
+				<view class="free-num">
+					<text style="color:#009143;">空闲10</text>/总数10
+				</view>
+				<view class="distance">
+					<text class="iconfont distance-font">&#xe615;</text>1.2公里 3分钟
+				</view>
+			</view>
+		</view>
+
+		<u-tabbar v-model="current" :list="tabbarList" active-color="#009143"></u-tabbar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabbarList: [{
+						iconPath: "home-3-line",
+						selectedIconPath: "home-3-fill",
+						text: '主页 ',
+						count: 0,
+						isDot: true,
+						customIcon: true,
+					},
+					{
+						iconPath: "road-map-line",
+						selectedIconPath: "road-map-fill",
+						text: '找桩',
+						midButton: true,
+						customIcon: true,
+					},
+					{
+						iconPath: "user-5-line",
+						selectedIconPath: "user-5-fill",
+						text: '我的',
+						count: 0,
+						isDot: false,
+						customIcon: true,
+
+					}
+				],
+				current: 0
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.top {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		height: 44px;
+		color: #666666;
+		background-color: rgba(255, 255, 255, 100);
+		padding: 12px 16px;
+		position: fixed;
+		top: 0;
+		left: 0;
+
+		.u-search[data-v-1a326067] {
+			flex: 0.9;
+		}
+
+		.list {
+			margin-left: 2px;
+
+		}
+	}
+
+	.condition {
+		height: 44px;
+		line-height: 20px;
+		padding: 12px 16px;
+		display: flex;
+		justify-content: space-between;
+		background-color: #fff;
+
+		.condition-type {
+			margin-left: 12px;
+		}
+
+		.condition-screen {
+			margin-left: 135px;
+		}
+	}
+
+	.map {
+		width: 100%;
+
+		height: 100%;
+		position: relative;
+
+		img {
+			width: 100%;
+			height: 100%;
+		}
+
+		.station-icon {
+			width: 36px;
+			height: 36px;
+			line-height: 36px;
+			text-align: center;
+			border: 1px solid rgba(133, 140, 255, 100);
+			color: #b58cff;
+			border-radius: 999px;
+			position: absolute;
+			top: 89px;
+			left: 38px;
+			.corner{
+			   width: 0;
+			   height: 0;
+				position: absolute;
+				top: 34px;
+				left: 0;
+				right: 0;
+				margin: auto;
+				border-bottom: 4px solid transparent;
+				border-left: 4px solid transparent;
+				border-right: 4px solid transparent;
+				border-top: 6px solid #b58cff ;
+			}
+		}
+
+		.station-icon2 {
+			width: 100px;
+			height: 36px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: rgba(0, 185, 98, 100);
+			text-align: center;
+			display: flex;
+			position: absolute;
+			top: 191px;
+			left: 168px;
+			.icon2-left{
+				width: 36px;
+				height: 36px;
+				line-height: 36px;
+				text-align: center;
+				border: 1px solid rgba(0, 185, 98, 100);
+				border-radius: 999px;
+				background-color: #fff;
+				color: #00b962;
+			}
+			.icon2-right{
+				color: #ffffff;
+				line-height: 14px;
+				padding: 4px;
+			}
+		}
+		.corner2{
+		   width: 0;
+		   height: 0;
+			position: absolute;
+			top: 36px;
+			left: 0;
+			right: 0;
+			margin: auto;
+			border-bottom: 6px solid transparent;
+			border-left: 6px solid transparent;
+			border-right: 6px solid transparent;
+			border-top: 8px solid #00b962 ;
+			
+		}
+	}
+
+	.charing-slow {
+		background-color: #fff;
+		margin: 0 12px;
+		border-radius: 8px;
+		padding: 10px 12px 0px;
+		position: fixed;
+		bottom: 68px;
+		left: 0;
+		right: 0;
+
+		.fast-charge {
+			display: inline-block;
+			width: 44px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: #9d9fff;
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+		}
+
+		.station-items {
+			display: inline-block;
+			height: 16px;
+			line-height: 16px;
+			font-size: 16px;
+			margin-left: 4px;
+			color: #101010;
+
+
+		}
+
+		.address {
+			margin-top: 8px;
+			line-height: 16px;
+			font-size: 11px;
+			color: rgba(119, 119, 119, 100);
+		}
+
+		.price {
+			display: flex;
+			height: 20px;
+
+			.num {
+				height: 20px;
+				color: rgba(255, 98, 0, 100);
+				font-size: 20px;
+				text-align: left;
+				font-family: Roboto-medium;
+			}
+
+			.unit {
+				height: 14px;
+				line-height: 14px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 14px;
+				text-align: left;
+				font-family: AlibabaPuHui-regular;
+				margin-top: 6px;
+				margin-left: 4px;
+			}
+		}
+
+		.park {
+			margin-top: 8px;
+			display: flex;
+
+			.park-p {
+				display: inline-block;
+				width: 20px;
+				height: 18px;
+				line-height: 12px;
+				text-align: center;
+				background-color: rgba(125, 177, 255, 100);
+				color: #fff;
+			}
+
+			.park-text {
+				display: inline-block;
+				width: 300px;
+				height: 17px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 12px;
+				text-align: left;
+				margin-left: 4px;
+				margin-top: 2px;
+			}
+		}
+
+		.free {
+			display: flex;
+			justify-content: space-between;
+			height: 52px;
+			border-top: 1px solid rgba(238, 242, 240, 100);
+			margin-top: 10px;
+
+			.free-num {
+				line-height: 52px;
+				font-size: 16px
+			}
+
+			.distance {
+				width: 130px;
+				height: 28px;
+				line-height: 28px;
+				color: rgba(255, 255, 255, 100);
+				font-size: 14px;
+				background-color: #00b962;
+				border-radius: 50px;
+				margin: 12px;
+				text-align: center;
+
+				.distance-font {
+					font-size: 16px
+				}
+
+			}
+		}
+	}
+</style>

pages/searchPile/searchPileList.vue

@@ -0,0 +1,335 @@
+<template>
+	<view style="padding-bottom: 205px;">
+		<!-- 头部 -->
+		<view>
+			<view class="top">
+				<view class="">
+					荆州市 <text class="iconfont" style="color: #bdbdbd;">&#xe62a;</text>
+				</view>
+				<u-search :show-action="false" placeholder="搜索站点名称"></u-search>
+				<view class="">
+					<text class="iconfont">&#xe622;</text> <text class="list">地图</text>
+				</view>
+			</view>
+		</view>
+		<!-- 条件选项 -->
+		<view class="condition">
+			<view class="condition-distance">
+				10公里<text class="iconfont" style="color: #bdbdbd;">&#xe62a;</text>
+			</view>
+			<view class="condition-type">
+				直流快充<text class="iconfont" style="color: #bdbdbd;">&#xe62a;</text>
+			</view>
+			<view class="condition-screen">
+				筛选<text class="iconfont" style="color: #bdbdbd;">&#xe62a;</text>
+			</view>
+
+		</view>
+	
+		
+		<view class="charing-slow">
+			<text class="trickle-charge">慢充</text> <text class="station-items">荆沙大道救助站充电站</text>
+			<view class="address">
+				湖北省荆州市沙市区江津东路附155号
+			</view>
+			<view class="price">
+				<view class="num">1.20</view>
+				<view class="unit">
+					起 元/度
+				</view>
+			</view>
+			<view class="park">
+				<text class="park-p">p</text>
+				<text class="park-text">以实际费用为准</text>
+			</view>
+			<view class="free">
+				<view class="free-num">
+					<text style="color:#009143;">空闲1</text>/总数5
+				</view>
+				<view class="distance">
+					<text class="iconfont distance-font">&#xe615;</text>0.1公里 1分钟
+				</view>
+			</view>
+		</view>
+		<view class="charing-slow">
+			<text class="fast-charge">快充</text> <text class="station-items">荆沙大道救助站充电站</text>
+			<view class="address">
+				湖北省荆州市沙市区江津东路附155号
+			</view>
+			<view class="price">
+				<view class="num">1.25</view>
+				<view class="unit">
+					起 元/度
+				</view>
+			</view>
+			<view class="park">
+				<text class="park-p">p</text>
+				<text class="park-text">2小时免费停车</text>
+			</view>
+			<view class="free">
+				<view class="free-num">
+					<text style="color:#009143;">空闲10</text>/总数10
+				</view>
+				<view class="distance">
+					<text class="iconfont distance-font">&#xe615;</text>1.2公里 3分钟
+				</view>
+			</view>
+		</view>
+		<view class="charing-slow">
+			<text class="trickle-charge">慢充</text> <text class="station-items">荆鹏软件园充电站</text>
+			<view class="address">
+				湖北省荆州市沙市区江津东路附155号
+			</view>
+			<view class="price">
+				<view class="num">1.25</view>
+				<view class="unit">
+					起 元/度
+				</view>
+			</view>
+			<view class="park">
+				<text class="park-p">p</text>
+				<text class="park-text">2小时免费停车</text>
+			</view>
+			<view class="free">
+				<view class="free-num">
+					<text style="color:#009143;">空闲1</text>/总数5
+				</view>
+				<view class="distance">
+					<text class="iconfont distance-font">&#xe615;</text>0.1公里 1分钟
+				</view>
+			</view>
+		</view>
+		<view class="charing-slow">
+			<text class="fast-charge">快充</text> <text class="station-items">荆沙大道救助站充电站</text>
+			<view class="address">
+				湖北省荆州市沙市区荆沙大道15号
+			</view>
+			<view class="price">
+				<view class="num">1.20</view>
+				<view class="unit">
+					起 元/度
+				</view>
+			</view>
+			<view class="park">
+				<text class="park-p">p</text>
+				<text class="park-text">2小时免费停车</text>
+			</view>
+			<view class="free">
+				<view class="free-num">
+					<text style="color:#009143;">空闲10</text>/总数10
+				</view>
+				<view class="distance">
+					<text class="iconfont distance-font">&#xe615;</text>1.2公里 3分钟
+				</view>
+			</view>
+		</view>
+<u-divider margin-top="20" bg-color="#F2F4F4">已经到底了</u-divider>
+		<u-tabbar v-model="current" :list="tabbarList" active-color="#009143"></u-tabbar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabbarList: [{
+						iconPath: "home-3-line",
+						selectedIconPath: "home-3-fill",
+						text: '主页 ',
+						count: 0,
+						isDot: true,
+						customIcon: true,
+					},
+					{
+						iconPath: "road-map-line",
+						selectedIconPath: "road-map-fill",
+						text: '找桩',
+						midButton: true,
+						customIcon: true,
+					},
+					{
+						iconPath: "user-5-line",
+						selectedIconPath: "user-5-fill",
+						text: '我的',
+						count: 0,
+						isDot: false,
+						customIcon: true,
+
+					}
+				],
+				current: 0
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.top {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		height: 44px;
+		color: #666666;
+		background-color: rgba(255, 255, 255, 100);
+		padding: 12px 16px;
+		position: fixed;
+		top: 0;
+		left: 0;
+
+		.u-search[data-v-1a326067] {
+			flex: 0.9;
+		}
+
+		.list {
+			margin-left: 2px;
+
+		}
+	}
+
+	.condition {
+		height: 44px;
+		line-height: 20px;
+		padding: 12px 16px;
+		display: flex;
+		justify-content: space-between;
+		background-color: #fff;
+
+		.condition-type {
+			margin-left: 12px;
+		}
+
+		.condition-screen {
+			margin-left: 135px;
+		}
+	}
+
+	
+	.charing-slow {
+		background-color: #fff;
+		margin: 0 12px;
+		border-radius: 8px;
+		padding: 10px 12px 0px;
+		margin-top: 12px;
+		.trickle-charge {
+			display: inline-block;
+			width: 44px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: rgba(0, 185, 98, 100);
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+		}
+
+		.fast-charge {
+			display: inline-block;
+			width: 44px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: #9d9fff;
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+		}
+
+		.station-items {
+			display: inline-block;
+			height: 16px;
+			line-height: 16px;
+			font-size: 16px;
+			margin-left: 4px;
+			color: #101010;
+
+
+		}
+
+		.address {
+			margin-top: 8px;
+			line-height: 16px;
+			font-size: 11px;
+			color: rgba(119, 119, 119, 100);
+		}
+
+		.price {
+			display: flex;
+			height: 20px;
+
+			.num {
+				height: 20px;
+				color: rgba(255, 98, 0, 100);
+				font-size: 20px;
+				text-align: left;
+				font-family: Roboto-medium;
+			}
+
+			.unit {
+				height: 14px;
+				line-height: 14px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 14px;
+				text-align: left;
+				font-family: AlibabaPuHui-regular;
+				margin-top: 6px;
+				margin-left: 4px;
+			}
+		}
+
+		.park {
+			margin-top: 8px;
+			display: flex;
+
+			.park-p {
+				display: inline-block;
+				width: 20px;
+				height: 18px;
+				line-height: 12px;
+				text-align: center;
+				background-color: rgba(125, 177, 255, 100);
+				color: #fff;
+			}
+
+			.park-text {
+				display: inline-block;
+				width: 300px;
+				height: 17px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 12px;
+				text-align: left;
+				margin-left: 4px;
+				margin-top: 2px;
+			}
+		}
+
+		.free {
+			display: flex;
+			justify-content: space-between;
+			height: 52px;
+			border-top: 1px solid rgba(238, 242, 240, 100);
+			margin-top: 10px;
+
+			.free-num {
+				line-height: 52px;
+				font-size: 16px
+			}
+
+			.distance {
+				width: 130px;
+				height: 28px;
+				line-height: 28px;
+				color: rgba(255, 255, 255, 100);
+				font-size: 14px;
+				background-color: #00b962;
+				border-radius: 50px;
+				margin: 12px;
+				text-align: center;
+
+				.distance-font {
+					font-size: 16px
+				}
+
+			}
+		}
+	}
+</style>

pages/searchPile/stationAndPile/stationDetails.vue

@@ -0,0 +1,12 @@
+<template>
+	<view >
+		<u-navbar title="站点详情"></u-navbar>
+		<view station-details></view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/user/car/carAdd.vue

@@ -1,7 +1,21 @@
 <template>
 	<view>
-
-
+		<u-navbar title="车辆管理">
+			<view class="slot-wrap" @click="showDelete">
+				<span class="navBtn">删除车辆</span>
+			</view>
+		</u-navbar>
+		<view>
+			<u-modal v-model="show" @confirm="confirmDelete" confirm-color="#fa3534" :show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" :content="content"></u-modal>
+		</view>
+		<view class="carDet">
+			<u-form :model="form" ref="uForm">
+				<u-form-item label="姓名"><u-input v-model="form.name" /></u-form-item>
+				<u-form-item label="简介"><u-input v-model="form.intro" /></u-form-item>
+				<u-form-item label="开关"><u-switch slot="right" v-model="switchVal"></u-switch></u-form-item>
+			</u-form>
+		</view>
+		<u-button class="login-btn" type="success" shape="circle" @click="keepCar">保存</u-button>
 	</view>
 </template>
 
@@ -9,19 +23,56 @@
 	export default {
 		data() {
 			return {
-				
+				show: false,
+				title: '删除车辆',
+				content: '是否删除此车牌号?',
+				form: {
+					name: '',
+					intro: '',
+				},
+				switchVal: false
 			}
 		},
 		methods: {
-
+			showDelete() {
+				this.show = true;
+			},
+			confirmDelete() {
+				this.show = false;
+				uni.redirectTo({
+					url: '/pages/user/car/index'
+				})
+			},
+			keepCar() {
+				uni.redirectTo({
+					url: '/pages/user/car/index'
+				})
+			}
 		}
 	}
 </script>
 <style>
 	page{
-		background: #f7f7f7;
+		background: #fff;
 	}
 </style>
 <style lang="scss" scoped>
+	.slot-wrap{
+		flex: 1;
+	}
+	.navBtn{
+		float: right;
+		margin-right: 15px;
+		color:#FF6666;
+	}
+	.carDet{
+		padding: 0 16px;
+	}
 	
+	.login-btn {
+		margin: 28px ;
+		background-color:#00B962!important;
+		border-color: #00B962!important;
+		color:#fff!important;
+	}
 </style>

pages/user/car/carDet.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-
+		<u-navbar title="车辆管理"></u-navbar>
 
 	</view>
 </template>
@@ -19,7 +19,7 @@
 </script>
 <style>
 	page{
-		background: #f7f7f7;
+		background: #fff;
 	}
 </style>
 <style lang="scss" scoped>

pages/user/car/index.vue

@@ -1,7 +1,20 @@
 <template>
 	<view>
-
-
+		<u-navbar title="车辆管理"></u-navbar>
+		<!-- <view class="carNone">
+			<img src="/static/img/none2.svg" alt="">
+			<p>暂无绑定车辆</p>
+			<view class="carNone-btn">
+				添加车牌
+			</view>
+		</view> -->
+		<view class="car">
+			<view class="car-item" @click="gotoUrl('pages/user/car/carAdd?id=')">
+				<span>默认</span>
+				<font>鄂D 999999</font>
+			</view>
+			<view class="car-btn" @click="addCar">添加车牌</view>
+		</view>
 	</view>
 </template>
 
@@ -13,15 +26,76 @@
 			}
 		},
 		methods: {
-
+			addCar() {
+				uni.navigateTo({
+					url: '/pages/user/car/carDet'
+				})
+			}
 		}
 	}
 </script>
 <style>
 	page{
-		background: #f7f7f7;
+		background: #fff;
 	}
 </style>
 <style lang="scss" scoped>
-	
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		height: calc(100vh - 44px);
+		align-items: center;
+		img{
+			width: 256px;
+			height: 256px;
+		}
+		p{
+			margin-top: -60px;
+		}
+		.carNone-btn{
+			font-size: 16px;
+			color:#00B962;
+			border: 1px solid #00B962;
+			padding: 10px 70px;
+			border-radius: 20px;
+			margin-top: 48px;
+		}
+	}
+	.car{
+		padding: 24px;
+		.car-item{
+			background-color: #00B962;
+			height: 80px;
+			border-radius: 8px;
+			position: relative;
+			text-align: center;
+			font{
+				color:#fff;
+				font-size: 36px;
+				line-height:80px;
+			}
+			span{
+				position: absolute;
+				height: 24px;
+				width: 48px;
+				background-color: #008A4B ;
+				color:#fff;
+				right: 0;
+				top: 0;
+				text-align: center;
+				line-height: 24px;
+				border-radius: 0 8px 0 8px;
+			}
+		}
+		.car-btn{
+			font-size: 16px;
+			color:#00B962;
+			border: 1px solid #00B962;
+			border-radius: 21px;
+			padding: 10px 0;
+			text-align: center;
+			margin-top: 12px;
+		}
+	}
 </style>

pages/user/finance/balance.vue

@@ -9,7 +9,7 @@
 					</view>
 					<view class="balanceCard-main">
 						<h2>120.00</h2>
-						<view class="balanceCard-btn">立即充值</view>
+						<view class="balanceCard-btn" @click="rechargeNow">立即充值</view>
 					</view>
 					<view class="balanceCard-foot">
 						<view class="balanceCard-item">充值金额 100.00</view>
@@ -23,13 +23,13 @@
 						<u-icon name="todo-fill" custom-prefix="custom-icon" color="#6BC6A7" size="40"></u-icon>
 						<span>余额明细</span>
 					</view>
-					<view class="more">
+					<view class="more" @click="seeAll">
 						<span>查看全部</span>
 						<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 					</view>
 				</view>
 				<view class="balanceMain-list">
-					<view class="balanceMain-item">
+					<view class="balanceMain-item" @click="gotoUrl('pages/user/finance/rechargeDet?id=')">
 						<view class="title">
 							<font>充值 - 微信支付</font>
 							<p>2021-12-31 09:00</p>
@@ -64,7 +64,16 @@
 			}
 		},
 		methods: {
-
+			rechargeNow() {
+				uni.navigateTo({
+					url: '/pages/user/finance/recharge'
+				})
+			},
+			seeAll() {
+				uni.navigateTo({
+					url: '/pages/user/finance/rechargeList'
+				})
+			}
 		}
 	}
 </script>

pages/user/finance/recharge.vue

@@ -1,7 +1,40 @@
 <template>
 	<view>
 		<u-navbar title="充值"></u-navbar>
-
+		<view class="recharge">
+			<view class="title">选择充值金额</view>
+			<p>当前余额￥0.00</p>
+			<view class="rechargeMain">
+				<view class="recharge-item" :class="moneyActiveClass == index ? 'active' : ''"
+					v-for="(item,index) in moneyList" :key="item.id" @click="moneyClick(item,index)">{{item.name}}</view>
+			</view>
+			<p>其他充值金额</p>
+			<view class="recharge-input">
+				<u-input v-model="value1" type="text" :border="true" />
+			</view>
+			<view class="title">选择支付方式</view>
+			<view class="recharge-radio">
+				<u-radio-group v-model="value2" @change="radioGroupChange" :wrap="true" width="100%">
+					<u-radio active-color="#00B962" @change="radioChange" v-for="(item, index) in list" :key="index" :name="item.name"
+						:disabled="item.disabled" width="100%"> 
+						<view class="recharge-radio-item">
+							<u-icon :name="item.icon" custom-prefix="custom-icon" :color="item.color" size="48"></u-icon>
+							<view class="recharge-radio-name">
+								{{item.name}}
+							</view>
+						</view>
+					</u-radio>
+				</u-radio-group>
+			</view>
+			<view class="recharge-btn">
+				<u-checkbox-group>
+					<u-checkbox v-model="checked" shape="circle" @change="checkboxChange()">我已阅读并同意《充值协议》</u-checkbox>
+				</u-checkbox-group>
+				<u-button class="success-btn" shape="circle" type="success" @click="rechargeNow">
+					<span>立即充值</span>
+				</u-button>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -9,15 +42,128 @@
 	export default {
 		data() {
 			return {
-				
+				moneyActiveClass: 1,
+				moneyList: [
+					{id: '1',name: '10'},
+					{id: '2',name: '20'},
+					{id: '3',name: '50'},
+					{id: '4',name: '100'},
+					{id: '5',name: '200'},
+					{id: '6',name: '500'},
+				],
+				list: [{
+						name: '微信支付',
+						icon:'wechat-pay-fill',
+						color:'#22ac38',
+					},
+					{
+						name: '支付宝支付',
+						icon:'alipay-fill',
+						color:'#1677ff',
+					},
+				],
+				// u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
+				value2: '微信支付',
+				value1:'',
+				checked: true,
 			}
 		},
 		methods: {
-
+			moneyClick(item,index) {
+				this.moneyActiveClass = index;
+			},
+			// 选中某个单选框时，由radio时触发
+			radioChange(e) {
+				// console.log(e);
+			},
+			// 选中任一radio时，由radio-group触发
+			radioGroupChange(e) {
+				// console.log(e);
+			},
+			checkboxChange() {
+				this.checked = !this.checked;
+			},
+			rechargeNow() {
+				uni.redirectTo({
+					url: '/pages/user/finance/rechargeRes'
+				})
+			}
 		}
 	}
 </script>
+<style>
+	page{
+		background-color: #fff;
+	}
+</style>
 
 <style lang="scss" scoped>
-	
+	/deep/.u-radio-group{
+		width: 100%;
+	}
+	/deep/.u-radio{
+		position: relative;
+	}
+	/deep/.u-radio__icon-wrap{
+		position: absolute;
+		right: 0;
+	}
+	.recharge{
+		padding: 16px;
+		.title{
+			font-size: 16px;
+		}
+		p{
+			color:#666;
+			margin-top: 4px;
+		}
+		.rechargeMain{
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			margin-top: 12px;
+			margin-bottom: 20px;
+			.recharge-item{
+				width: 31%;
+				border: 1px solid #e3e3e3;
+				padding: 15px 0;
+				border-radius: 4px;
+				text-align: center;
+				margin-bottom: 10px;
+				font-size: 16px;
+			}
+			.active{
+				background-color: #EFFFF7;
+				border-color: #00B962;
+				color:#00B962;
+			}
+		}	
+	}
+	.recharge-input{
+		margin-top: 8px;
+		margin-bottom: 32px;
+	}
+	.recharge-radio{
+		margin-top: 10px;
+		.recharge-radio-item{
+			display: flex;
+			align-items: center;
+		}
+		.recharge-radio-name{
+			margin-left: 8px;
+		}
+	}
+	.recharge-btn{
+		position: fixed;
+		left: 16px;
+		right: 16px;
+		bottom: 16px;
+	}
+	.success-btn{
+		margin-top: 10px;
+		background-color:#00B962!important;
+		flex: 1;
+		border-color: #00B962!important;
+		color:#fff!important;
+	}
 </style>

pages/user/finance/rechargeList.vue

@@ -1,12 +1,13 @@
 <template>
 	<view>
 		<u-navbar title="充值记录"></u-navbar>
-		<view class="rechargeTime">
-			<span>5月</span>
+		<view class="rechargeTime" @click="show = true">
+			<u-picker mode="time" v-model="show" :params="params" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
+			<span>{{date.month}}月</span>
 			<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 		</view>
 		<view class="rechargeList">
-			<view class="rechargeList-item">
+			<view class="rechargeList-item" @click="gotoUrl('pages/user/finance/rechargeDet?id=')">
 				<view class="rechargeList-row"><span>充值金额</span><h4>100.00</h4></view>
 				<view class="rechargeList-row"><p>微信支付</p><p>2021-12-31 09:00</p></view>
 			</view>
@@ -30,11 +31,43 @@
 	export default {
 		data() {
 			return {
-				
+				params: {
+					year: true,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false,
+					timestamp: true,
+				},
+				show: false,
+				date: {
+					year: '',
+					month: '',
+				},
 			}
 		},
+		onReady() {
+			var date = new Date();
+			this.date.year = date.getFullYear();
+			this.date.month = date.getMonth() + 1;
+			console.log(this.date)
+		},
 		methods: {
-
+			confirmTime(params) {
+				var m = params.month.slice(0,1)
+				if(m == '0') {
+					this.date.month = params.month.slice(1,2);
+				} else {
+					this.date.month = params.month;
+				}
+				
+				this.date.year = params.year;
+				this.show = false;
+			},
+			cancelTime() {
+				this.show = false;
+			}
 		}
 	}
 </script>

pages/user/finance/rechargeRes.vue

@@ -10,10 +10,10 @@
 			<p>支付成功</p>
 		</view>
 		<view class="paySuccess-btn">
-			<u-button class="success-btn1" shape="circle" type="">
+			<u-button class="success-btn1" shape="circle" type="" @click="rechargeContinue">
 				<span>继续充值</span>
 			</u-button>
-			<u-button class="success-btn2" shape="circle" type="success">
+			<u-button class="success-btn2" shape="circle" type="success" @click="balanceLook">
 				<span>查看余额</span>
 			</u-button>
 		</view>
@@ -25,10 +25,19 @@
 		data() {
 			return {
 
-            }
+      }
 		},
 		methods: {
-			
+			rechargeContinue() {
+				uni.redirectTo({
+					url: '/pages/user/finance/recharge'
+				})
+			},
+			balanceLook() {
+				uni.redirectTo({
+					url: '/pages/user/finance/balance'
+				})
+			}
 		}
 	}
 </script>

pages/user/index.vue

@@ -9,50 +9,53 @@
 			</view>
 		</view>
 		<view class="userData">
-			<view class="userData-num">
+			<view class="userData-num" @click="toBalance">
 				<view class="userData-data">￥ 0.00</view>
 				<view class="userData-foot">可用余额</view>
 			</view>
-			<view class="userInfo-btn">充值</view>
+			<view class="userInfo-btn" @click="toRecharge">充值</view>
 		</view>
 		
 		<view class="userCell">
-			<view class="userCell-item">
+			<view class="userCell-item" @click="carManage">
 				<view class="userCell-title">
 					<u-icon name="menu_cwcl" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>车辆管理</p>
 				</view>
 				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
-			<view class="userCell-item">
+			<view class="userCell-item" @click="gotoUrl('pages/user/help')">
 				<view class="userCell-title">
 					<u-icon name="compass-3-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>操作指南</p>
 				</view>
 				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
-			<view class="userCell-item">
+			<view class="userCell-item" @click="feedback">
 				<view class="userCell-title">
 					<u-icon name="feedback-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>意见反馈</p>
 				</view>
 				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
-			<view class="userCell-item">
+			<view class="userCell-item" @click="gotoUrl('pages/user/about')">
 				<view class="userCell-title">
 					<u-icon name="information-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>关于我们</p>
 				</view>
 				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
-			<view class="userCell-item">
+			<view class="userCell-item" @click="openModal">
 				<view class="userCell-title">
 					<u-icon name="customer-service-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>联系客服</p>
 				</view>
 				<span>0716-8123456</span>
 			</view>
-			<view class="userCell-item">
+			<view>
+				<u-modal v-model="show" @confirm="confirmPhone" :show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" :content="content"></u-modal>
+			</view>
+			<view class="userCell-item" @click="setUp">
 				<view class="userCell-title">
 					<u-icon name="settings-4-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>设置</p>
@@ -69,6 +72,9 @@
 	export default {
 		data() {
 			return {
+				show: false,
+				title: '联系客服',
+				content: '0716-8123456',
 				tabbarList: [{
 						iconPath: "home-3-line",
 						selectedIconPath: "home-3-fill",
@@ -100,7 +106,40 @@
 			}
 		},
 		methods: {
-
+			toBalance() {
+				uni.navigateTo({
+					url: '/pages/user/finance/balance'
+				})
+			},
+			toRecharge() {
+				uni.navigateTo({
+					url: '/pages/user/finance/recharge'
+				})
+			},
+			carManage() {
+				uni.navigateTo({
+					url: '/pages/user/car/index'
+				})
+			},
+			feedback() {
+				uni.navigateTo({
+					url: '/pages/user/message'
+				})
+			},
+			setUp() {
+				uni.navigateTo({
+					url: '/pages/user/setting'
+				})
+			},
+			openModal() {
+				this.show = true;
+			},
+			confirmPhone(){
+				this.show = false;
+				uni.makePhoneCall({
+					phoneNumber:'0716-8123456' //仅为示例
+				});
+			},
 		}
 	}
 </script>

pages/user/logout.vue

@@ -12,10 +12,10 @@
 			<p>	3.如您已被国家机关调查或正处于诉讼、仲裁程序中,请注意，注销您的帐号并不代表此帐号注销前的帐号行为和相关责任得到豁免或减轻。</p>
 		</view>
 		<view class="logout-btn">
-			<u-button class="logout-btn1" shape="circle" type="">
+			<u-button class="logout-btn1" shape="circle" type="" @click="logout">
 				<span>继续注销</span>
 			</u-button>
-			<u-button class="logout-btn2" shape="circle" type="success">
+			<u-button class="logout-btn2" shape="circle" type="success" @click="toSetting">
 				<span>我再想想</span>
 			</u-button>
 		</view>
@@ -30,7 +30,16 @@
 			}
 		},
 		methods: {
-
+			toSetting() {
+				uni.navigateBack({
+					
+				})
+			},
+			logout() {
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			}
 		}
 	}
 </script>

pages/user/message.vue

@@ -1,24 +1,24 @@
 <template>
   <view>
-	<u-navbar title="意见反馈"></u-navbar>	  
-	<view class="message">
-		<view class="message-form">
-			<u-form :model="form" ref="uForm" label-width ="100">
-                <u-form-item label-width="0">
-                    <u-input v-model="value" type="textarea"  placeholder="请描述您的商品" height="200"/>
-                </u-form-item>
-                <u-form-item label-width="0">
-                	<view class="upload">
-                		<u-upload :action="action" :file-list="fileList" ></u-upload>
-                	</view>
-                </u-form-item>
-				<u-form-item >
-					<u-input v-model="value" placeholder="请留下联系方式，方便我们与您取得联系（必填）" />
-				</u-form-item>
-			</u-form>
+		<u-navbar title="意见反馈"></u-navbar>	  
+		<view class="message">
+			<view class="message-form">
+				<u-form :model="form" ref="uForm" label-width ="100">
+									<u-form-item label-width="0">
+											<u-input v-model="value" type="textarea"  placeholder="请描述您的商品" height="200"/>
+									</u-form-item>
+									<u-form-item label-width="0">
+										<view class="upload">
+											<u-upload :action="action" :file-list="fileList" ></u-upload>
+										</view>
+									</u-form-item>
+					<u-form-item >
+						<u-input v-model="value" placeholder="请留下联系方式，方便我们与您取得联系（必填）" />
+					</u-form-item>
+				</u-form>
+			</view>
 		</view>
-	</view>
-	<u-button class="login-btn" type="success" shape="circle">提交</u-button>
+		<u-button class="login-btn" type="success" shape="circle" @click="submit">提交</u-button>
   </view>
 </template>
 
@@ -38,7 +38,11 @@
 			}
 		},
 		methods: {
-			
+			submit() {
+				uni.redirectTo({
+					url: '/pages/user/index'
+				})
+			}
 		}
 	}
 </script>

pages/user/phone.vue

@@ -15,7 +15,7 @@
 			</view>
 		</view>
 		
-		<u-button class="login-btn" type="success" shape="circle">确定修改</u-button>
+		<u-button class="login-btn" type="success" shape="circle" @click="sure">确定修改</u-button>
 	</view>
 </template>
 
@@ -27,7 +27,11 @@
 			}
 		},
 		methods: {
-
+			sure() {
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			}
 		}
 	}
 </script>

pages/user/setting.vue

@@ -2,10 +2,10 @@
 	<view>
 		<u-navbar title="设置"></u-navbar>
 		<u-cell-group>
-			<u-cell-item title="修改手机号" value="155****1111"></u-cell-item>
-			<u-cell-item title="注销账号" value="注销后无法恢复，请谨慎操作" :value-style="valueStyle"></u-cell-item>
+			<u-cell-item title="修改手机号" value="155****1111" @click="gotoUrl('pages/user/phone')"></u-cell-item>
+			<u-cell-item title="注销账号" value="注销后无法恢复，请谨慎操作" :value-style="valueStyle" @click="gotoUrl('pages/user/logout')"></u-cell-item>
 		</u-cell-group>
-		<view class="logout-btn">
+		<view class="logout-btn" @click="signOut">
 			退出帐号
 		</view>
 	</view>
@@ -21,7 +21,11 @@
 			}
 		},
 		methods: {
-
+			signOut() {
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			}
 		}
 	}
 </script>