调整

apis/pagejs/energy/index.js

@@ -1,13 +0,0 @@
-import request from '@/apis/utils/request'
- 
- export function homePage(data) {
- 	var url='/mobile/tenant/homePage';
- 	return request({
- 		method: 'post',
- 		data: data,
- 		url: url
- 	})
- }
- 
- 
- 

apis/pagejs/h_user.js

@@ -1,67 +0,0 @@
-import request from '@/apis/utils/request'
- import requestWhite from '@/apis/utils/requestWhite'
- 
- export function findByOpenId(data) {
- 	var url='/mobile/tenantUser/findByOpenId';
- 	return requestWhite({
- 		method: 'get',
- 		data: data,
- 		url: url
- 	})
- }
- 
- export function logout(data) {
- 	var url='/mobile/tenantUser/logout';
- 	return request({
- 		method: 'post',
- 		data: data,
- 		url: url
- 	})
- }
- 
- export function changePassword(data) {
- 	var url='/mobile/tenantUser/changePassword';
- 	return request({
- 		method: 'post',
- 		data: data,
- 		url: url
- 	})
- }
- 
- 
- export function changePhone(data) {
- 	var url='/mobile/tenantUser/changePhone';
- 	return request({
- 		method: 'post',
- 		data: data,
- 		url: url
- 	})
- }
- 
- export function getVerifyCode(data) {
- 	var url='/mobile/tenantUser/getVerifyCode';
- 	return requestWhite({
- 		method: 'post',
- 		data: data,
- 		url: url
- 	})
- }
- 
- export function login(data) {
- 	var url='/mobile/tenantUser/login';
- 	return requestWhite({
- 		method: 'post',
- 		data: data,
- 		url: url
- 	})
- }
- 
- export function validateCode(data) {
- 	var url='/mobile/tenantUser/validateCode';
- 	return requestWhite({
- 		method: 'post',
- 		data: data,
- 		url: url
- 	})
- }
- 

apis/pagejs/e_user.js → apis/pagejs/user.js

@@ -1,24 +1,6 @@
 import request from '@/apis/utils/request'
  import requestWhite from '@/apis/utils/requestWhite'
  
- export function findByOpenId(data) {
- 	var url='/mobile/tenantUser/findByOpenId';
- 	return requestWhite({
- 		method: 'get',
- 		data: data,
- 		url: url
- 	})
- }
- 
- export function logout(data) {
- 	var url='/mobile/tenantUser/logout';
- 	return request({
- 		method: 'post',
- 		data: data,
- 		url: url
- 	})
- }
- 
  export function changePassword(data) {
  	var url='/mobile/tenantUser/changePassword';
  	return request({
@@ -37,31 +19,52 @@ import request from '@/apis/utils/request'
  		url: url
  	})
  }
- 
  export function getVerifyCode(data) {
  	var url='/mobile/tenantUser/getVerifyCode';
- 	return requestWhite({
+ 	return request({
  		method: 'post',
  		data: data,
  		url: url
  	})
  }
- 
- export function login(data) {
- 	var url='/mobile/tenantUser/login';
- 	return requestWhite({
+ export function logout(data) {
+ 	var url='/mobile/tenantUser/logout';
+ 	return request({
  		method: 'post',
  		data: data,
  		url: url
  	})
  }
- 
+
  export function validateCode(data) {
  	var url='/mobile/tenantUser/validateCode';
- 	return requestWhite({
+ 	return request({
  		method: 'post',
  		data: data,
  		url: url
  	})
  }
- 
+ 
+  
+  export function findByOpenId(data) {
+  	var url='/mobile/tenantUser/findByOpenId';
+  	return requestWhite({
+  		method: 'get',
+  		data: data,
+  		url: url
+  	})
+  }
+  
+
+  
+  export function login(data) {
+  	var url='/mobile/tenantUser/login';
+  	return requestWhite({
+  		method: 'post',
+  		data: data,
+  		url: url
+  	})
+  }
+  
+ 
+  

components/Tabbar.vue

@@ -28,14 +28,14 @@
 						iconPath: img1,
 						selectedIconPath: img2,
 						text: '主页 ',
-						pagePath2: "/pages/businessHall/index/index",
+						pagePath2: "/pages/index/index",
 					},
 					 
 					{
 						iconPath: img3,
 						selectedIconPath: img4,
 						text: '消息',
-						pagePath2: "/pages/businessHall/message/message",
+						pagePath2: "/pages/message/message",
 						
 					},
 					
@@ -43,7 +43,7 @@
 						iconPath: img5,
 						selectedIconPath: img6,
 						text: '我的',
-						pagePath2: "/pages/businessHall/mine/mine",
+						pagePath2: "/pages/mine/mine",
 					}
 				],
 			};

config/.env.dev.js

@@ -12,7 +12,7 @@ const UNI_APP = {
 	openId:"55555",//测试人员 开发环境
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
-	//openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
+	openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
 	
 	//appid
 	VUE_APP_WXAPPID:"wx0b3c41a903053808",

pages.json

@@ -10,15 +10,7 @@
 		    }
 		    
 		},
-		{
-		    "path" : "pages/energyCenter/login/login",
-		    "style" :                                                                                    
-		    {
-		        //登录
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
+	
 		{ 
 			
 			"path": "pages/index/index",

pages/billingRules/billingRules.vue

@@ -84,7 +84,7 @@
 </template>
 
 <script>
-	import * as API from '@/apis/pagejs/hall/deduction.js'
+	import * as API from '@/apis/pagejs/deduction.js'
 	
 	export default {
 		data() {

pages/deductionRecord/deductionRecord.vue

@@ -68,7 +68,7 @@
 </template>
 
 <script>
-	import * as API from '@/apis/pagejs/hall/deduction.js'
+	import * as API from '@/apis/pagejs/deduction.js'
 	
 	import {
 		nextDay,

pages/energyCenter/login/login.vue

@@ -1,178 +0,0 @@
-<template >
-	<view>
-		<view class="logo">
-			<image class="img" src="@/assets/img/logo.png" mode=""></image>
-			
-		</view>
-		<view  class="logoText">
-			荆鹏电管家
-		</view>
-		<!-- 手机号/密码 -->
-		<view class="input-box">
-			
-			<u-input  v-model="phone"  style="padding: 0 20px" class="tel-input" type="text"  placeholder="请输入手机号码" />
-		
-			<u-input  v-model="password" style="padding: 0 20px" class="password-input" type="password"  placeholder="请输入密码" :password-icon="true" />
-
-		</view>
-		
-		 <button class="login-disable" :class="{
-			 login:password.length&&phone.length
-		 }" @click="submit" >登录</button>
-		 
-		 <view class="reset" @click="gotoUrl('')">
-		 	忘记密码？ <span style="color:#387aea ;">点击找回</span>
-		 </view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/e_user.js'
-	import {
-		checkPhone
-	} from '@/apis/utils'
-	export default {
-		data() {
-			return {
-				phone:"",
-				password:"",
-			}
-		},
-		methods: {
-			loginset(response){
-				var token = response ? response.data.token : '';
-				this.carhelp.setToken(token);
-				this.carhelp.setPersonInfo(response.data.regUser);
-				this.carhelp.setPersonInfoPlus(response.data)
-				//this.gotoUrl("pages/user/index")
-				uni.redirectTo({
-					url: '/'
-				})
-			},
-			query(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.findByOpenId({
-					noerror:true,
-					openId: this.carhelp.getOpenId(),
-					
-				}).then((response) => {
-					this.loginset(response)
-					
-				
-				}).catch(error => {
-					uni.hideLoading();
-					
-				})
-			},
-			submit(){
-				if(!(this.phone.length&&this.password.length)){
-					return
-				}
-				var checkPhoneResult = checkPhone(this.phone);
-					
-				if (checkPhoneResult !== true) {
-					uni.showToast({
-						icon: "none",
-						title: checkPhoneResult,
-						
-					})
-					return;
-				}
-				
-				if(!this.password.length){
-					uni.showToast({
-						icon: "none",
-						title: "请输入密码"
-					})
-					return
-				}
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.login({
-					password:this.password,
-					phone:this.phone,
-					openId: this.carhelp.getOpenId(),
-					
-				}).then((response) => {
-					
-					//this.loginset(response)
-					
-				
-				}).catch(error => {
-					uni.hideLoading();
-					
-				})
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		background-color: #fff;
-		padding-top: 160rpx;
-	}
-	.logoText{
-		width: 160rpx;
-		margin: 0 auto;
-		line-height: 46rpx;
-		color: rgba(16,16,16,1);
-		font-size: 32rpx;
-		margin-top: 20rpx;
-	}
-	.logo{
-		margin: 0 auto;
-		width: 160rpx;
-		height: 160rpx;
-		border-radius: 16px;
-		background: linear-gradient(180deg, rgba(31,85,255,1) 0%,rgba(39,171,255,1) 100%);
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.img{
-			
-			width: 112rpx;
-			height: 112rpx;
-		}
-	}
-
-.input-box{
-	padding: 0 58rpx;
-	margin-top: 112rpx;
-	.tel-input,.password-input{
-		 display: flex;align-items: center;
-		border-radius: 50px;
-		background-color: rgba(248,248,248,1);
-		color: rgba(16,16,16,1);
-		height: 100rpx;
-		line-height: 100rpx;
-		padding: 0 48rpx;
-		margin-bottom: 40rpx;
-	}
-	
-}
-
-.login-disable{
-	margin: 80rpx 56rpx 40rpx;
-	border-radius: 100rpx;
-	background-color: rgba(223,223,223,1);
-	color: rgba(255, 255, 255, 1);
-}
-.login{
-	background-color: rgba(27,119,251,1);
-}
-
-.reset{
-	color: rgba(119,119,119,1);
-	text-align: center;
-}
-</style>

pages/energyCenter/readme.js

@@ -1 +0,0 @@
-能源中心

pages/index/index.vue

@@ -1,153 +1,153 @@
-<template>
-	<view>
-		<u-navbar title="微营业厅" title-color="#fff" :is-back="false" :background="background" back-icon-color="#ffffff"></u-navbar>
-		<!-- 账户充值 扣费记录 -->
-		<view class="function">
-			<view class="item" @click="gotoUrl('/pages/businessHall/recharge/accountRecharge')">
-				<view class="icon">
-					<image class="img" src="@/assets/img/iconPark-wallet.svg" mode=""></image>
-				</view>
-
-				<view class="text">
-					<view class="title">
-						账户充值
-					</view>
-					<view class="infos">
-						余额 {{personInfo.balance}}
-
-					</view>
-				</view>
-			</view>
-
-			<view class="item" @click="gotoUrl('/pages/businessHall/deductionRecord/deductionRecord')">
-				<view class="icon icon2">
-					<image class="img" src="@/assets/img/iconPark-order.svg" mode=""></image>
-				</view>
-
-				<view class="text">
-					<view class="title">
-						扣费记录
-					</view>
-					<view class="infos">
-						查看每日用电情况
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 管家服务 -->
-		<view class="housekeeper-service">
-			<view class="title">
-				管家服务
-			</view>
-			<view class="grid">
-				<u-grid :col="4" :border="false">
-					<u-grid-item @click="gotoUrl('/pages/businessHall/recharge/rechargeRecord')" >
-						<view class="icon icon1">
-							<image class="img" src="@/assets/img/far fa-clock.svg" mode=""></image>
-						</view>
-						<view class="grid-text">充值记录
-						</view>
-					</u-grid-item>
-					<u-grid-item  @click="gotoUrl('/pages/businessHall/billingRules/billingRules')" >
-						<view class="icon icon2">
-							<image class="img" src="@/assets/img/fas fa-file-alt.svg" mode=""></image>
-						</view>
-						<view class="grid-text">计费规则
-						</view>
-					</u-grid-item>
-					<u-grid-item   @click="gotoUrl('/pages/businessHall/message/messageList?type=1')">
-						<view class="icon icon3">
-							<image class="img" src="@/assets/img/antFill-account-book.svg" mode=""></image>
-						</view>
-						<view class="grid-text">余额提醒
-						</view>
+<template>
+	<view>
+		<u-navbar title="微营业厅" title-color="#fff" :is-back="false" :background="background" back-icon-color="#ffffff"></u-navbar>
+		<!-- 账户充值 扣费记录 -->
+		<view class="function">
+			<view class="item" @click="gotoUrl('/pages/recharge/accountRecharge')">
+				<view class="icon">
+					<image class="img" src="@/assets/img/iconPark-wallet.svg" mode=""></image>
+				</view>
+
+				<view class="text">
+					<view class="title">
+						账户充值
+					</view>
+					<view class="infos">
+						余额 {{personInfo.balance}}
+
+					</view>
+				</view>
+			</view>
+
+			<view class="item" @click="gotoUrl('/pages/deductionRecord/deductionRecord')">
+				<view class="icon icon2">
+					<image class="img" src="@/assets/img/iconPark-order.svg" mode=""></image>
+				</view>
+
+				<view class="text">
+					<view class="title">
+						扣费记录
+					</view>
+					<view class="infos">
+						查看每日用电情况
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 管家服务 -->
+		<view class="housekeeper-service">
+			<view class="title">
+				管家服务
+			</view>
+			<view class="grid">
+				<u-grid :col="4" :border="false">
+					<u-grid-item @click="gotoUrl('/pages/recharge/rechargeRecord')" >
+						<view class="icon icon1">
+							<image class="img" src="@/assets/img/far fa-clock.svg" mode=""></image>
+						</view>
+						<view class="grid-text">充值记录
+						</view>
+					</u-grid-item>
+					<u-grid-item  @click="gotoUrl('/pages/billingRules/billingRules')" >
+						<view class="icon icon2">
+							<image class="img" src="@/assets/img/fas fa-file-alt.svg" mode=""></image>
+						</view>
+						<view class="grid-text">计费规则
+						</view>
 					</u-grid-item>
-					<u-grid-item   @click="gotoUrl('/pages/businessHall/message/messageList?type=4')">
+					<u-grid-item   @click="gotoUrl('/pages/message/messageList?type=1')">
+						<view class="icon icon3">
+							<image class="img" src="@/assets/img/antFill-account-book.svg" mode=""></image>
+						</view>
+						<view class="grid-text">余额提醒
+						</view>
+					</u-grid-item>
+					<u-grid-item   @click="gotoUrl('/pages/message/messageList?type=4')">
 						<view class="icon icon9">
 							<image class="img" src="@/assets/img/fas fa-exclamation-triangle.svg" mode=""></image>
 						</view>
 						<view class="grid-text">断电通知
 						</view>
-					</u-grid-item>
-					<u-grid-item   @click="gotoUrl('/pages/businessHall/message/messageList?type=2')">
-						<view class="icon icon5">
-							<image class="img" src="@/assets/img/antFill-notification.svg" mode=""></image>
-						</view>
-						<view class="grid-text">停电通知
-
-						</view>
-					</u-grid-item>
-					<u-grid-item   @click="gotoUrl('/pages/businessHall/message/messageList?type=3')">
-						<view class="icon icon6">
-							<image class="img" src="@/assets/img/fas fa-exclamation-triangle.svg" mode=""></image>
-						</view>
-						<view class="grid-text">故障警报
-
-						</view>
 					</u-grid-item>
-				
-					<u-grid-item   @click="gotoUrl('/pages/businessHall/mine/electronicMonitoring')">
-						<view class="icon icon7">
-							<image class="img" src="@/assets/img/fas fa-chart-pie.svg" mode=""></image>
-						</view>
-						<view class="grid-text">用电监控
-						</view>
+					<u-grid-item   @click="gotoUrl('/pages/message/messageList?type=2')">
+						<view class="icon icon5">
+							<image class="img" src="@/assets/img/antFill-notification.svg" mode=""></image>
+						</view>
+						<view class="grid-text">停电通知
+
+						</view>
+					</u-grid-item>
+					<u-grid-item   @click="gotoUrl('/pages/message/messageList?type=3')">
+						<view class="icon icon6">
+							<image class="img" src="@/assets/img/fas fa-exclamation-triangle.svg" mode=""></image>
+						</view>
+						<view class="grid-text">故障警报
+
+						</view>
+					</u-grid-item>
+				
+					<u-grid-item   @click="gotoUrl('/pages/mine/electronicMonitoring')">
+						<view class="icon icon7">
+							<image class="img" src="@/assets/img/fas fa-chart-pie.svg" mode=""></image>
+						</view>
+						<view class="grid-text">用电监控
+						</view>
 					</u-grid-item>
 					
-					<u-grid-item     @click="gotoUrl('/pages/businessHall/mine/contactService')"  >
+					<u-grid-item     @click="gotoUrl('/pages/mine/contactService')"  >
 						<view class="icon icon4">
 							<image class="img" src="@/assets/img/if-support.svg" mode=""></image>
 						</view>
 						<view class="grid-text">客服热线
 						</view>
-					</u-grid-item>
-					<u-grid-item v-if="false"   @click="gotoUrl('/pages/businessHall/billingRules/billingRules')">
-						<view class="icon icon8">
-							<image class="img" src="@/assets/img/fas fa-book.svg" mode=""></image>
-						</view>
-						<view class="grid-text">用电常识
-						</view>
-					</u-grid-item>
-				</u-grid>
-			</view>
-		</view>
-
-		<view class="cover">
-			<view class="text">
-				预存余额 安心用电
-			</view>
-		</view>
-		<u-divider border-color="#bbbbbb" half-width="80" color="#777777">荆鹏电管家 服务热线 <text
-				class="tel">8121234</text></u-divider>
-		<Tabbar :current="0"></Tabbar>
-	</view>
-
-</template>
-
+					</u-grid-item>
+					<u-grid-item v-if="false"   @click="gotoUrl('/pages/billingRules/billingRules')">
+						<view class="icon icon8">
+							<image class="img" src="@/assets/img/fas fa-book.svg" mode=""></image>
+						</view>
+						<view class="grid-text">用电常识
+						</view>
+					</u-grid-item>
+				</u-grid>
+			</view>
+		</view>
+
+		<view class="cover">
+			<view class="text">
+				预存余额 安心用电
+			</view>
+		</view>
+		<u-divider border-color="#bbbbbb" half-width="80" color="#777777">荆鹏电管家 服务热线 <text
+				class="tel">8121234</text></u-divider>
+		<Tabbar :current="0"></Tabbar>
+	</view>
+
+</template>
+
 <script>
-	import * as API from '@/apis/pagejs/hall/index.js'
-	
-	import Tabbar from '@/components/Tabbar.vue'
-	export default {
-		components: {
-			Tabbar
-		},
-		data() {
+	import * as API from '@/apis/pagejs/index.js'
+	
+	import Tabbar from '@/components/Tabbar.vue'
+	export default {
+		components: {
+			Tabbar
+		},
+		data() {
 			return {
-				personInfo:{},
-				background: {
-					backgroundColor: '#3D86FF',
-				}
-
-			}
+				personInfo:{},
+				background: {
+					backgroundColor: '#3D86FF',
+				}
+
+			}
 		},
 		onLoad() {
 			this.homePage()
 		
-		},
+		},
 		methods: {
-			
+			
 			homePage(){
 				// uni.showLoading({
 				// 	title: "加载中",
@@ -164,144 +164,144 @@
 					//uni.hideLoading();
 					
 				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	//  账户充值 扣费记录 
-	.function {
-		background-color: #fff;
-		padding: 56rpx 40rpx;
-		display: flex;
-		justify-content: space-between;
-
-		.item {
-			display: flex;
-			align-items: center;
-
-			.icon {
-				width: 96rpx;
-				height: 96rpx;
-
-				border-radius: 12px;
-				background: linear-gradient(180deg, rgba(93, 155, 255, 1) 0%, rgba(0, 97, 255, 1) 100%);
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-				.img {
-					width: 64rpx !important;
-					height: 64rpx !important;
-
-
-				}
-			}
-
-			.icon2 {
-				background: linear-gradient(179.2deg, rgba(96, 213, 124, 1) -0.62%, rgba(0, 161, 39, 1) 97.92%);
-			}
-
-			.text {
-				margin-left: 16rpx;
-
-				.title {
-					color: rgba(51, 51, 51, 1);
-					font-size: 36rpx;
-				}
-
-				.infos {
-					color: rgba(119, 119, 119, 1);
-					font-size: 24rpx;
-					margin-top: 8rpx;
-				}
-			}
-		}
-	}
-
-	// 管家服务
-	.housekeeper-service {
-		background-color: #fff;
-		margin-top: 24rpx;
-		padding: 32rpx;
-
-		.title {
-			font-size: 36rpx;
-			color: #333333;
-		}
-
-		.grid-text {
-			margin-top: 28rpx;
-			color: rgba(51, 51, 51, 1);
-		}
-
-		.icon {
-			width: 96rpx;
-			height: 96rpx;
-			border-radius: 24rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			.img {
-				width: 56rpx;
-				height: 56rpx;
-			}
-		}
-
-		.icon1 {
-			background: linear-gradient(181.79deg, rgba(117, 213, 224, 1) -1.13%, rgba(53, 153, 203, 1) 94.2%);
-		}
-
-		.icon2 {
-			background: linear-gradient(179.2deg, rgba(168, 178, 238, 1) 6.28%, rgba(123, 123, 240, 1) 96.94%);
-		}
-
-		.icon3 {
-			background: linear-gradient(180deg, rgba(121, 172, 255, 1) 0%, rgba(57, 132, 255, 1) 100%);
-		}
-
-		.icon4 {
-			background: linear-gradient(180.82deg, rgba(247, 186, 154, 1) 0.58%, rgba(255, 128, 158, 1) 97.52%);
-		}
-
-		.icon5 {
-			background: linear-gradient(180.4deg, rgba(127, 213, 151, 1) 2.1%, rgba(67, 176, 116, 1) 101.21%);
-		}
-
-		.icon6 {
-			background: linear-gradient(180.29deg, rgba(255, 214, 125, 1) 0.9%, rgba(255, 150, 0, 1) 100.4%);
-		}
-
-		.icon7 {
-			background: linear-gradient(178.44deg, rgba(122, 232, 227, 1) 3.96%, rgba(57, 182, 182, 1) 100.6%);
-		}
-
-		.icon8 {
-			background: linear-gradient(180.4deg, rgba(127, 213, 151, 1) 2.1%, rgba(67, 176, 116, 1) 101.21%);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	//  账户充值 扣费记录 
+	.function {
+		background-color: #fff;
+		padding: 56rpx 40rpx;
+		display: flex;
+		justify-content: space-between;
+
+		.item {
+			display: flex;
+			align-items: center;
+
+			.icon {
+				width: 96rpx;
+				height: 96rpx;
+
+				border-radius: 12px;
+				background: linear-gradient(180deg, rgba(93, 155, 255, 1) 0%, rgba(0, 97, 255, 1) 100%);
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.img {
+					width: 64rpx !important;
+					height: 64rpx !important;
+
+
+				}
+			}
+
+			.icon2 {
+				background: linear-gradient(179.2deg, rgba(96, 213, 124, 1) -0.62%, rgba(0, 161, 39, 1) 97.92%);
+			}
+
+			.text {
+				margin-left: 16rpx;
+
+				.title {
+					color: rgba(51, 51, 51, 1);
+					font-size: 36rpx;
+				}
+
+				.infos {
+					color: rgba(119, 119, 119, 1);
+					font-size: 24rpx;
+					margin-top: 8rpx;
+				}
+			}
+		}
+	}
+
+	// 管家服务
+	.housekeeper-service {
+		background-color: #fff;
+		margin-top: 24rpx;
+		padding: 32rpx;
+
+		.title {
+			font-size: 36rpx;
+			color: #333333;
+		}
+
+		.grid-text {
+			margin-top: 28rpx;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		.icon {
+			width: 96rpx;
+			height: 96rpx;
+			border-radius: 24rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.img {
+				width: 56rpx;
+				height: 56rpx;
+			}
+		}
+
+		.icon1 {
+			background: linear-gradient(181.79deg, rgba(117, 213, 224, 1) -1.13%, rgba(53, 153, 203, 1) 94.2%);
+		}
+
+		.icon2 {
+			background: linear-gradient(179.2deg, rgba(168, 178, 238, 1) 6.28%, rgba(123, 123, 240, 1) 96.94%);
+		}
+
+		.icon3 {
+			background: linear-gradient(180deg, rgba(121, 172, 255, 1) 0%, rgba(57, 132, 255, 1) 100%);
+		}
+
+		.icon4 {
+			background: linear-gradient(180.82deg, rgba(247, 186, 154, 1) 0.58%, rgba(255, 128, 158, 1) 97.52%);
+		}
+
+		.icon5 {
+			background: linear-gradient(180.4deg, rgba(127, 213, 151, 1) 2.1%, rgba(67, 176, 116, 1) 101.21%);
+		}
+
+		.icon6 {
+			background: linear-gradient(180.29deg, rgba(255, 214, 125, 1) 0.9%, rgba(255, 150, 0, 1) 100.4%);
+		}
+
+		.icon7 {
+			background: linear-gradient(178.44deg, rgba(122, 232, 227, 1) 3.96%, rgba(57, 182, 182, 1) 100.6%);
+		}
+
+		.icon8 {
+			background: linear-gradient(180.4deg, rgba(127, 213, 151, 1) 2.1%, rgba(67, 176, 116, 1) 101.21%);
 		}
 		.icon9 {
 			background: linear-gradient(180.29deg, rgba(255,124,112,1) 0.9%,rgba(255,79,63,1) 100.4%);
-		}
-	}
-
-	.cover {
-		background: radial-gradient(at 100% 100%, rgba(194, 255, 216, 1) 3%, rgba(138, 182, 232, 1) 39%, rgba(82, 110, 248, 1) 100%);
-		color: #ffffff;
-		text-align: center;
-		padding: 40rpx 0;
-		margin: 24rpx 0;
-
-		.text {
-			font-size: 64rpx;
-			// box-shadow: 0px 4px 12px 0px  rgba(0, 0, 0, 0.2);
-			text-align: center;
-		}
-	}
-
-	.tel {
-		color: #1677FF;
-		margin-left: 16rpx;
-	}
+		}
+	}
+
+	.cover {
+		background: radial-gradient(at 100% 100%, rgba(194, 255, 216, 1) 3%, rgba(138, 182, 232, 1) 39%, rgba(82, 110, 248, 1) 100%);
+		color: #ffffff;
+		text-align: center;
+		padding: 40rpx 0;
+		margin: 24rpx 0;
+
+		.text {
+			font-size: 64rpx;
+			// box-shadow: 0px 4px 12px 0px  rgba(0, 0, 0, 0.2);
+			text-align: center;
+		}
+	}
+
+	.tel {
+		color: #1677FF;
+		margin-left: 16rpx;
+	}
 </style>

pages/login/login.vue

@@ -20,14 +20,14 @@
 			 login:password.length&&phone.length
 		 }" @click="submit" >登录</button>
 		 
-		 <view class="reset" @click="gotoUrl('')">
+		 <view class="reset"  @click="gotoUrl('/pages/mine/findBackPassword')" >
 		 	忘记密码？ <span style="color:#387aea ;">点击找回</span>
 		 </view>
 	</view>
 </template>
 
 <script>
-	import * as API from '@/apis/pagejs/h_user.js'
+	import * as API from '@/apis/pagejs/user.js'
 	import {
 		checkPhone
 	} from '@/apis/utils'
@@ -114,7 +114,10 @@
 				
 				}).catch(error => {
 					uni.hideLoading();
-					
+					uni.showToast({
+						icon: "none",
+						title: "登录失败"
+					})
 				})
 				
 			}

pages/mine/changePassword.vue

@@ -3,26 +3,65 @@
 		<u-navbar title="修改密码" title-color="#101010"></u-navbar>
 		<view class="main">
 			<view class="original-password">
-				<text>原密码	</text><u-input  v-model="password" style="padding: 0 0 0 20px" class="password-input" type="password"  placeholder="填写原密码" :password-icon="true" />
+				<text>原密码	</text><u-input  v-model="form.oldPassword" style="padding: 0 0 0 20px" class="password-input" type="password"  placeholder="填写原密码" :password-icon="true" />
 			</view>
 			<view class="new-password">
-				<text>新密码</text><u-input  v-model="password" style="padding: 0 0 0 20px" class="password-input" type="password"  placeholder="创建6-16位组合新密码" :password-icon="true" />
+				<text>新密码</text><u-input  v-model="form.password" style="padding: 0 0 0 20px" class="password-input" type="password"  placeholder="创建6-16位组合新密码" :password-icon="true" />
 			</view>
 		</view>
 		<!-- 确认修改 -->
-		<button class="confirm">确认修改</button>
+		<button class="confirm" @click="changePassword">确认修改</button>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/user.js'
+	
 	export default {
 		data() {
 			return {
-				
+				form: {
+					oldPassword: '',
+					password: '',
+				},
 			}
 		},
 		methods: {
-			
+			changePassword(){
+				
+				if (!this.form.oldPassword) {
+					uni.showToast({
+						title: "请输入原密码",
+						icon: "none"
+					})
+					return
+				}
+				
+				if (!this.form.password) {
+					uni.showToast({
+						title: "请输入新密码",
+						icon: "none"
+					})
+					return
+				}
+				API.changePassword(this.form).then((response) => {
+					uni.hideLoading();
+					this.form.password=""
+					this.form.oldPassword=""
+					uni.showModal({
+						title:"提示",
+						content:"密码修改成功！",
+						showCancel:false
+					})
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+				
+			}
 		}
 	}
 </script>

pages/mine/changePhone.vue

@@ -3,26 +3,158 @@
 		<u-navbar title="修改手机号" title-color="#101010"></u-navbar>
 		<view class="main">
 			<view class="original-password">
-				<text>新手机号</text><u-input  v-model="password" style="padding: 0 0 0 20px"  maxlength="11" type="number"  placeholder="请填写新手机号"  />
+				<text>新手机号</text><u-input  v-model="form.telephone" style="padding: 0 0 0 20px"  maxlength="11" type="number"  placeholder="请填写新手机号"  />
 			</view>
 			<view class="new-password">
-				<text>验证码</text><u-input  v-model="password" style="padding: 0 0 0 20px" maxlength="6" type="number"  placeholder="6位验证码"  /><text class="verification-code">获取验证码</text>
+				<text>验证码</text><u-input  v-model="form.verifyCode" style="padding: 0 0 0 20px" maxlength="6" type="number"  placeholder="6位验证码"  />
+				<text class="verification-code" :style="isCodeTipsColor ? 'color: #999999;' : ''" @click="getCode" >{{codeTips}}</text>
 			</view>
+			<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start"
+				change-text="(Xs)">
+			</u-verification-code>
 		</view>
 		<!-- 确认修改 -->
-		<button class="confirm">确认修改</button>
+		<button class="confirm" @click="changePhone">确认修改</button>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/user.js'
+	
+	import {
+		checkPhone
+	} from '@/apis/utils'
+	
 	export default {
 		data() {
 			return {
-				
+				form: {
+					telephone: '',
+					verifyCode: '',
+				},
+				isSendMsgIng: false,
+				isCodeTipsColor: false,
+				sendMsgSecond: 60,
+				codeTips: '',
+			}
+		},
+		onReady() {
+			var time = this.carhelp.get("getvcodetime");
+			if (time) {
+				//this.$refs.uCode.start();
+				var nowtime = new Date().getTime()
+				var differ = (nowtime - time) / 1000
+				if (differ < 2 * 60) {
+					this.sendMsgSecond = 2 * 60 - parseInt(differ)
+					this.isSendMsgIng = true;
+					this.$refs.uCode.start();
+					this.isCodeTipsColor = true;
+				}
 			}
 		},
 		methods: {
 			
+			changePhone() {
+				
+				var checkPhoneResult = checkPhone(this.form.telephone);
+				
+				if (!this.form.telephone || checkPhoneResult != true) {
+					uni.showToast({
+						title: checkPhoneResult,
+						icon: "none"
+					})
+					return;
+				}
+				if (!this.form.verifyCode) {
+					uni.showToast({
+						title: "请输入验证码",
+						icon: "none"
+					})
+					return
+				}
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+			
+				
+			
+				API.changePhone(this.form).then((response) => {
+					uni.hideLoading();
+					
+					this.carhelp.logoff()
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			
+			},
+			codeChange(text) {
+				this.codeTips = text;
+			},
+			//倒计时
+			end() {
+				this.sendMsgSecond = 60;
+				this.isSendMsgIng = false;
+				this.isCodeTipsColor = false;
+			},
+			// 获取验证码
+			getCode() {
+				if (this.$refs.uCode.canGetCode) {} else {
+					uni.showToast({
+						title: '倒计时结束后再发送',
+						icon: "none"
+					})
+					return
+				}
+			
+				var checkPhoneResult = checkPhone(this.form.telephone);
+			
+				if (checkPhoneResult !== true) {
+					uni.showToast({
+						icon: "none",
+						title: checkPhoneResult,
+					})
+					return;
+				}
+				this.$refs.uCode.start();
+				this.isCodeTipsColor = true;
+			},
+			start() {
+				if (!this.isSendMsgIng) {
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					API.getVerifyCode(this.form).then((response) => {
+						uni.hideLoading();
+						this.carhelp.set("getvcodetime", new Date().getTime());
+			
+						if (!"") {
+							//倒计时
+							uni.showToast({
+								icon: "none",
+								title: "发送成功"
+							})
+						} else {
+							uni.showToast({
+								icon: "none",
+								title: "您的验证码已经发送[5分钟有效]，请勿重复点击"
+							})
+						}
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}
+			},
 		}
 	}
 </script>

pages/mine/mine.vue

@@ -130,7 +130,7 @@
 </template>
 
 <script>
-	import * as API from '@/apis/pagejs/hall/index.js'
+	import * as API from '@/apis/pagejs/index.js'
 	
 	import Tabbar from '@/components/Tabbar.vue'
 	export default {
@@ -143,7 +143,7 @@
 			}
 		},
 		onLoad() {
-			//zkxthis.homePage()
+			this.homePage()
 		},
 		methods: {
 			homePage(){
@@ -156,7 +156,7 @@
 					
 				}).then((response) => {
 					uni.hideLoading();
-					this.companyInfo=response.companyInfo;
+					this.companyInfo=response.data.companyInfo;
 				}).catch(error => {
 					uni.hideLoading();
 					

pages/mine/setting.vue

@@ -2,29 +2,78 @@
 	<view>
 		<u-navbar title="设置"  title-color="#101010" ></u-navbar>
 		<u-cell-group>
-				<u-cell-item  title="个人信息" ></u-cell-item>
-				<u-cell-item  title="修改密码" ></u-cell-item>
-				<u-cell-item  title="修改手机号" value="15014040129" ></u-cell-item>
-				<u-cell-item  title="修改手机号" ></u-cell-item>
+				<u-cell-item  title="个人信息" @click="gotoUrl('/pages/mine/personInfos')" ></u-cell-item>
+				<u-cell-item  title="修改密码"  @click="gotoUrl('/pages/mine/changePassword')"  ></u-cell-item>
+				<u-cell-item  title="修改手机号" :value="personInfo.phone"  @click="gotoUrl('/pages/mine/changePhone')" ></u-cell-item>
+				<u-cell-item  title="注销账号"   @click="gotoUrl('/pages/mine/cancelAccount')" ></u-cell-item>
 			</u-cell-group>
 			
-			<view class="exit">
+			<view class="exit" @click="signOut" >
 				退出账号
 			</view>
+			
+			<u-modal v-model="show1" @confirm="confirm" confirm-color="#FF3D00" :show-cancel-button="true" ref="uModal" :asyncClose="true" title="退出账号"
+				content="是否退出当前账号?" :content-style="{color: '#333333'}"></u-modal>
+				
 	</view>
 	
 	
 </template>
 
 <script>
+	import * as userApi from '@/apis/pagejs/user.js'
+	import * as API from '@/apis/pagejs/index.js'
+	
 	export default {
 		data() {
 			return {
-				
+					personInfo:{},
+					show1:false,
 			}
 		},
+		onLoad() {
+			this.homePage()
+		},
 		methods: {
-			
+			signOut() {
+				this.show1 = true;
+			},
+			confirm() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				userApi.logout().then((res) => {
+					uni.hideLoading();
+					this.show1 = false;
+					this.carhelp.logoff()
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			homePage(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.homePage({
+					
+				}).then((response) => {
+					uni.hideLoading();
+					
+					this.personInfo=response.data.regUser;
+				}).catch(error => {
+					uni.hideLoading();
+					
+				})
+			}
 		}
 	}
 </script>

pages/recharge/rechargeRecord.vue

@@ -1,63 +1,63 @@
-<template>
-	<view>
-		<u-navbar title="充值记录" title-color="#101010"></u-navbar>
-		<!-- 折线图 -->
-		<view class="chart-box">
+<template>
+	<view>
+		<u-navbar title="充值记录" title-color="#101010"></u-navbar>
+		<!-- 折线图 -->
+		<view class="chart-box">
 			<view class="chart">
 				<view id="pieEcharts" style="min-height:240px;">
 				
 				</view>
-			</view>
-
-		</view>
-		<!-- 标签 -->
+			</view>
+
+		</view>
+		<!-- 标签 -->
 		<view class="tabs">
 			<u-picker  v-model="tabsFrom.show1" mode="selector" :range="tabsFrom.selector1"  range-key="label" @confirm="selector1confirm" ></u-picker>
 			<u-picker-select title="日期选择" v-model="tabsFrom.show2"
 			 :defaultTime="tabsFrom.show2Index" :endYear="endYear"
 			 mode="time" :params="params"  @confirm="selector2confirm" @reset="selector2reset" ></u-picker-select>
-			
-			<view class="tabsItem" @click="tabsFrom.show1=!tabsFrom.show1">{{tabsFrom.show1Text}} <u-icon name="arrow-up"
-					v-if="tabsFrom.show1"></u-icon><u-icon v-else name="arrow-down"></u-icon></view>
-			<view class="tabsItem" @click="tabsFrom.show2=!tabsFrom.show2">{{tabsFrom.show2Text}} <u-icon name="arrow-up"
-					v-if="tabsFrom.show2"></u-icon><u-icon v-else name="arrow-down"></u-icon></view>
-		</view>
-		<!-- 记录 -->
-		<view class="records" >
-			<view class="time">
-				{{queryMonth}} 充值 {{jpAmount(sumAmount)}}元
-
-			</view>
-			<view class="details"  v-for="(item,i) in list" :key="i">
-				<view class="details-title">
-					<view class="name">
-						{{item.remark}}-{{item.methodN}}    
-					</view>
-					<view class="record-time">
-						{{item.createTime}}  
-					</view>
-				</view>
-				<view class="sum">
-					{{jpAmount(item.amount)}} 
-
-				</view>
-			</view>
-
-		</view>
-	</view>
-</template>
-
+			
+			<view class="tabsItem" @click="tabsFrom.show1=!tabsFrom.show1">{{tabsFrom.show1Text}} <u-icon name="arrow-up"
+					v-if="tabsFrom.show1"></u-icon><u-icon v-else name="arrow-down"></u-icon></view>
+			<view class="tabsItem" @click="tabsFrom.show2=!tabsFrom.show2">{{tabsFrom.show2Text}} <u-icon name="arrow-up"
+					v-if="tabsFrom.show2"></u-icon><u-icon v-else name="arrow-down"></u-icon></view>
+		</view>
+		<!-- 记录 -->
+		<view class="records" >
+			<view class="time">
+				{{queryMonth}} 充值 {{jpAmount(sumAmount)}}元
+
+			</view>
+			<view class="details"  v-for="(item,i) in list" :key="i">
+				<view class="details-title">
+					<view class="name">
+						{{item.remark}}-{{item.methodN}}    
+					</view>
+					<view class="record-time">
+						{{item.createTime}}  
+					</view>
+				</view>
+				<view class="sum">
+					{{jpAmount(item.amount)}} 
+
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
 <script>
-	import * as API from '@/apis/pagejs/hall/deduction.js'
+	import * as API from '@/apis/pagejs/deduction.js'
 	import {
 		nextDay,
 		nextMonth,
 	
 	} from '@/apis/utils'
 	import * as echarts from "echarts";
-	
-	export default {
-		data() {
+	
+	export default {
+		data() {
 			return {
 				myChart:null,
 				list:[],
@@ -75,13 +75,13 @@
 					hour: false,
 					minute: false,
 					second: false
-				},
-				tabsFrom: {
+				},
+				tabsFrom: {
 					show1: false,
 					show1Index:0,
-					show2Index:'',
-					show2: false,
-					show1Text: "全部类型",
+					show2Index:'',
+					show2: false,
+					show1Text: "全部类型",
 					show2Text: "全部时间",
 					selector1:[
 						{
@@ -96,12 +96,12 @@
 								label: '线下充值',
 								value: '2',
 							},
-					]
-				},
-				 
-				
-			 
-			}
+					]
+				},
+				 
+				
+			 
+			}
 		},
 		onLoad() {
 			this.endYear=new Date().getFullYear()
@@ -288,90 +288,90 @@
 					
 				})
 			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	// 折线图
-	.chart-box {
-		padding: 24rpx 32rpx;
-		background: linear-gradient(180deg, rgba(203, 234, 255, 1) 0%, rgba(255, 255, 255, 1) 100%);
-
-		.title {
-			color: rgb(16, 16, 16);
-		}
-
-		.sum {
-			color: rgb(51, 51, 51);
-			font-size: 64rpx;
-			margin-top: 16rpx;
-
-			.unit {
-				color: rgb(16, 16, 16);
-				font-size: 28rpx;
-				margin-left: 8rpx;
-			}
-		}
-
-		.chart {
-			width: 100%;
-			height: 240rpx;
-			margin-top: 8rpx;
-
-			.img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-	}
-
-	// 标签
-	.tabs {
-
-		height: 96rpx;
-		line-height: 96rpx;
-		background-color: #fff;
-		border-top: 1px solid rgba(241, 241, 241, 1);
-		display: flex;
-		justify-content: space-around;
-
-	}
-
-	// 记录
-	.records {
-		.time {
-			padding: 24rpx 32rpx;
-			color: rgba(119, 119, 119, 1);
-			font-size: 32rpx;
-		}
-
-		.details {
-			background-color: #fff;
-			padding: 32rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.details-title {
-				.title {
-					color: rgba(51, 51, 51, 1);
-					font-size: 32rpx;
-				}
-
-				.record-time {
-					color: rgb(153, 153, 153);
-					font-size: 24rpx;
-
-					margin-top: 8rpx;
-				}
-			}
-
-			.sum {
-				color: rgb(16, 16, 16);
-				font-size: 40rpx;
-			}
-		}
-	}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 折线图
+	.chart-box {
+		padding: 24rpx 32rpx;
+		background: linear-gradient(180deg, rgba(203, 234, 255, 1) 0%, rgba(255, 255, 255, 1) 100%);
+
+		.title {
+			color: rgb(16, 16, 16);
+		}
+
+		.sum {
+			color: rgb(51, 51, 51);
+			font-size: 64rpx;
+			margin-top: 16rpx;
+
+			.unit {
+				color: rgb(16, 16, 16);
+				font-size: 28rpx;
+				margin-left: 8rpx;
+			}
+		}
+
+		.chart {
+			width: 100%;
+			height: 240rpx;
+			margin-top: 8rpx;
+
+			.img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+	}
+
+	// 标签
+	.tabs {
+
+		height: 96rpx;
+		line-height: 96rpx;
+		background-color: #fff;
+		border-top: 1px solid rgba(241, 241, 241, 1);
+		display: flex;
+		justify-content: space-around;
+
+	}
+
+	// 记录
+	.records {
+		.time {
+			padding: 24rpx 32rpx;
+			color: rgba(119, 119, 119, 1);
+			font-size: 32rpx;
+		}
+
+		.details {
+			background-color: #fff;
+			padding: 32rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.details-title {
+				.title {
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+				}
+
+				.record-time {
+					color: rgb(153, 153, 153);
+					font-size: 24rpx;
+
+					margin-top: 8rpx;
+				}
+			}
+
+			.sum {
+				color: rgb(16, 16, 16);
+				font-size: 40rpx;
+			}
+		}
+	}
 </style>