zkx 7 mesiacov pred
rodič
commit
b8afbbbdb0
6 zmenil súbory, kde vykonal 203 pridanie a 203 odobranie
  1. 1 1
      README.md
  2. 5 5
      bobo-router/index.js
  3. 1 1
      manifest.json
  4. 54 54
      pages.json
  5. 71 71
      pages/login/index.vue
  6. 71 71
      pages/login/recharge.vue

+ 1 - 1
README.md

@@ -1,4 +1,4 @@
-#   电单车充电系统
+#   优电联盟-电单车充电系统
 发行方式, uniapp  点击”发行“ -”自定义发行“   prod 正式环境| test 测试环境
 发行方式, uniapp  点击”发行“ -”自定义发行“   prod 正式环境| test 测试环境
 
 
 运行方式  uniapp正常运行方式
 运行方式  uniapp正常运行方式

+ 5 - 5
bobo-router/index.js

@@ -17,16 +17,16 @@
  uniCrazyRouter.afterEach((to, from) => {
  uniCrazyRouter.afterEach((to, from) => {
  	// 逻辑代码
  	// 逻辑代码
 
 
- 	var title = "电单车充电系统"
+ 	var title = "优电联盟-电单车充电系统"
 
 
  	
  	
  	console.log("afterEach")
  	console.log("afterEach")
  	if (process.car.NODE_ENV == 'dev' || process.car.NODE_ENV == 'test') {
  	if (process.car.NODE_ENV == 'dev' || process.car.NODE_ENV == 'test') {
  		title+= '(' + process.car.NODE_ENV + ')'
  		title+= '(' + process.car.NODE_ENV + ')'
  	}
  	}
-	uni.setNavigationBarTitle({
-		title: title ,
-	
+	uni.setNavigationBarTitle({
+		title: title ,
+	
 	})
 	})
  })
  })
 
 
@@ -68,4 +68,4 @@
  	console.log('错误:', e.message || '路由跳转失败')
  	console.log('错误:', e.message || '路由跳转失败')
  })
  })
 
 
- export default router
+ export default router

+ 1 - 1
manifest.json

@@ -79,7 +79,7 @@
                 "enable" : true
                 "enable" : true
             }
             }
         },
         },
-        "title" : "电单车充电系统",
+        "title" : "优电联盟-电单车充电系统",
         "router" : {
         "router" : {
             "base" : "./"
             "base" : "./"
         }
         }

+ 54 - 54
pages.json

@@ -1,7 +1,7 @@
 {
 {
 	"easycom": {
 	"easycom": {
-		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue",
-		"ujp-(.*)": "components/u-$1/u-$1.vue"
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue",
+		"ujp-(.*)": "components/u-$1/u-$1.vue"
 		
 		
 	},
 	},
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages	
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages	
@@ -57,14 +57,14 @@
 			"style": {
 			"style": {
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 			}
-		},
-		{
-			"name": "余额充值",
-			"path": "pages/user/refundList",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
+		},
+		{
+			"name": "余额充值",
+			"path": "pages/user/refundList",
+			"style": {
+				//"navigationStyle": "custom" // 隐藏系统导航栏
+			}
+		},
 		
 		
 
 
 		{
 		{
@@ -93,56 +93,56 @@
 			"style": {
 			"style": {
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 			}
-		},
-		{
-			"path" : "pages/user/rechargeListByPhone",
-			"style" : 
-			{
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/user/rechargeByPhone",
-			"style" : 
-			{
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/user/rechargeDeatilsByPhone",
-			"style" : 
-			{
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/user/rechargeIndex",
-			"style" : 
-			{
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/user/rechargeSubmit",
-			"style" : 
-			{
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/login/recharge",
-			"style" : 
-			{
-				"enablePullDownRefresh" : false
-			}
+		},
+		{
+			"path" : "pages/user/rechargeListByPhone",
+			"style" : 
+			{
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/user/rechargeByPhone",
+			"style" : 
+			{
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/user/rechargeDeatilsByPhone",
+			"style" : 
+			{
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/user/rechargeIndex",
+			"style" : 
+			{
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/user/rechargeSubmit",
+			"style" : 
+			{
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/login/recharge",
+			"style" : 
+			{
+				"enablePullDownRefresh" : false
+			}
 		}
 		}
 		
 		
     ],
     ],
 	"globalStyle": {
 	"globalStyle": {
 		"navigationStyle": "custom", // 隐藏系统导航栏
 		"navigationStyle": "custom", // 隐藏系统导航栏
-		"navigationBarTitleText": "电单车充电系统",
+		"navigationBarTitleText": "优电联盟-电单车充电系统",
 		"enablePullDownRefresh": false
 		"enablePullDownRefresh": false
 
 
 	}
 	}
 
 
-}
+}

+ 71 - 71
pages/login/index.vue

@@ -4,29 +4,29 @@
 		<div class="vongi-login-logo" style="
 		<div class="vongi-login-logo" style="
 			text-align: center;
 			text-align: center;
 			margin-top: 40px;">
 			margin-top: 40px;">
-			<img  v-if="branchParameter=='51team'"
+			<img  v-if="branchParameter=='51team'"
 			 src="@/assets/img/logo.png" style="
 			 src="@/assets/img/logo.png" style="
 			   width: 72px;
 			   width: 72px;
 			   height: 72px;
 			   height: 72px;
 			   border-radius: 15px;
 			   border-radius: 15px;
-			" />
-			<img  v-if="branchParameter=='youdian'"
-			 src="@/assets/img/logoUd.jpg" style="
-			   width: 72px;
-			   height: 72px;
-			   border-radius: 15px;
+			" />
+			<img  v-if="branchParameter=='youdian'"
+			 src="@/assets/img/logoUd.jpg" style="
+			   width: 72px;
+			   height: 72px;
+			   border-radius: 15px;
 			" />
 			" />
 			<div style="
 			<div style="
 				color: rgba(16, 16, 16, 100);
 				color: rgba(16, 16, 16, 100);
 				font-size: 18px;
 				font-size: 18px;
 				text-align: center;
 				text-align: center;
 				font-family: PingFangSC-regular;
 				font-family: PingFangSC-regular;
-			">{{projectName}}</div>
+			">{{projectName}}</div>
 			<!-- 51充电联盟 -->
 			<!-- 51充电联盟 -->
 		</div>
 		</div>
 		<view class="login-title">
 		<view class="login-title">
 <!-- 			<u-icon name="qichexiangguan-chongdianzhan" custom-prefix="custom-icon" color="#1677ff" size="56"></u-icon>
 <!-- 			<u-icon name="qichexiangguan-chongdianzhan" custom-prefix="custom-icon" color="#1677ff" size="56"></u-icon>
- -->			<h3>电单车充电系统</h3>
+ -->			<h3>优电联盟-电单车充电系统</h3>
 		</view>
 		</view>
 		<view class="login-main">
 		<view class="login-main">
 			<u-form :model="form" ref="uForm">
 			<u-form :model="form" ref="uForm">
@@ -57,7 +57,7 @@
 	} from '@/utils'
 	} from '@/utils'
 	export default {
 	export default {
 		data() {
 		data() {
-			return {
+			return {
 				validateGuestCode:0,
 				validateGuestCode:0,
 				form: {
 				form: {
 					phone: '',
 					phone: '',
@@ -125,18 +125,18 @@
 				}
 				}
 
 
 
 
-				API.validateCode({
+				API.validateCode({
 					validateGuestCode:this.validateGuestCode,
 					validateGuestCode:this.validateGuestCode,
 					verifyCode: this.form.code,
 					verifyCode: this.form.code,
 					telephone: this.form.phone,
 					telephone: this.form.phone,
 					openId: this.carhelp.getOpenId(),
 					openId: this.carhelp.getOpenId(),
-					headImg: headImg,
+					headImg: headImg,
 					source:1,
 					source:1,
 				}).then((response) => {
 				}).then((response) => {
 					var token = response ? response.data.token : '';
 					var token = response ? response.data.token : '';
 					this.carhelp.setToken(token);
 					this.carhelp.setToken(token);
-					this.carhelp.setPersonInfo(response.data.regUser);
-					this.carhelp.setPersonInfoPlus(response.data.data  )
+					this.carhelp.setPersonInfo(response.data.regUser);
+					this.carhelp.setPersonInfoPlus(response.data.data  )
 					
 					
 					//this.gotoUrl("pages/user/index")
 					//this.gotoUrl("pages/user/index")
 					uni.redirectTo({
 					uni.redirectTo({
@@ -207,64 +207,64 @@
 					return;
 					return;
 				}
 				}
 				this.$refs.uCode.start();
 				this.$refs.uCode.start();
-			},
-			query(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.findByOpenId({
-					
-					openId: this.carhelp.getOpenId(),
-					
-				}).then((response) => {
-					
-					if(response.data.regUser.userType==1){
-						this.validateGuestCode=1;
-						throw 1
-					}
-					var token = response ? response.data.token : '';
-					this.carhelp.setToken(token);
-					this.carhelp.setPersonInfo(response.data.regUser);
-					//this.gotoUrl("pages/user/index")
-					this.carhelp.setPersonInfoPlus(response.data.data  )
-					
-					uni.redirectTo({
-						url: '/pages/index/index'
-					})
-				
-				}).catch(error => {
-					console.log(error)
-					uni.hideLoading();
-					if (!this.carhelp.getOpenId()) {
-						// uni.showToast({
-						// 	title: "请使用“微信”访问本系统登录"
-						// })
-						// return
-					} else if (this.message) {
-						uni.showToast({
-							title: this.message.split(",")[0],
-							icon: "none"
-						})
-					}
-					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();
-						}
-					}
-					
-				})
+			},
+			query(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.findByOpenId({
+					
+					openId: this.carhelp.getOpenId(),
+					
+				}).then((response) => {
+					
+					if(response.data.regUser.userType==1){
+						this.validateGuestCode=1;
+						throw 1
+					}
+					var token = response ? response.data.token : '';
+					this.carhelp.setToken(token);
+					this.carhelp.setPersonInfo(response.data.regUser);
+					//this.gotoUrl("pages/user/index")
+					this.carhelp.setPersonInfoPlus(response.data.data  )
+					
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+				
+				}).catch(error => {
+					console.log(error)
+					uni.hideLoading();
+					if (!this.carhelp.getOpenId()) {
+						// uni.showToast({
+						// 	title: "请使用“微信”访问本系统登录"
+						// })
+						// return
+					} else if (this.message) {
+						uni.showToast({
+							title: this.message.split(",")[0],
+							icon: "none"
+						})
+					}
+					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();
+						}
+					}
+					
+				})
 			}
 			}
 		},
 		},
-		onReady() {
-			this.query()
+		onReady() {
+			this.query()
 			
 			
 		}
 		}
 	}
 	}
@@ -295,4 +295,4 @@
 	.login-code {
 	.login-code {
 		color: #1677ff;
 		color: #1677ff;
 	}
 	}
-</style>
+</style>

+ 71 - 71
pages/login/recharge.vue

@@ -4,29 +4,29 @@
 		<div class="vongi-login-logo" style="
 		<div class="vongi-login-logo" style="
 			text-align: center;
 			text-align: center;
 			margin-top: 40px;">
 			margin-top: 40px;">
-			<img  v-if="branchParameter=='51team'"
+			<img  v-if="branchParameter=='51team'"
 			 src="@/assets/img/logo.png" style="
 			 src="@/assets/img/logo.png" style="
 			   width: 72px;
 			   width: 72px;
 			   height: 72px;
 			   height: 72px;
 			   border-radius: 15px;
 			   border-radius: 15px;
-			" />
-			<img  v-if="branchParameter=='youdian'"
-			 src="@/assets/img/logoUd.jpg" style="
-			   width: 72px;
-			   height: 72px;
-			   border-radius: 15px;
+			" />
+			<img  v-if="branchParameter=='youdian'"
+			 src="@/assets/img/logoUd.jpg" style="
+			   width: 72px;
+			   height: 72px;
+			   border-radius: 15px;
 			" />
 			" />
 			<div style="
 			<div style="
 				color: rgba(16, 16, 16, 100);
 				color: rgba(16, 16, 16, 100);
 				font-size: 18px;
 				font-size: 18px;
 				text-align: center;
 				text-align: center;
 				font-family: PingFangSC-regular;
 				font-family: PingFangSC-regular;
-			">{{projectName}}</div>
+			">{{projectName}}</div>
 			<!-- 51充电联盟 -->
 			<!-- 51充电联盟 -->
 		</div>
 		</div>
 		<view class="login-title">
 		<view class="login-title">
 <!-- 			<u-icon name="qichexiangguan-chongdianzhan" custom-prefix="custom-icon" color="#1677ff" size="56"></u-icon>
 <!-- 			<u-icon name="qichexiangguan-chongdianzhan" custom-prefix="custom-icon" color="#1677ff" size="56"></u-icon>
- -->			<h3>电单车充电系统</h3>
+ -->			<h3>优电联盟-电单车充电系统</h3>
 		</view>
 		</view>
 		<view class="login-main">
 		<view class="login-main">
 			<u-form :model="form" ref="uForm">
 			<u-form :model="form" ref="uForm">
@@ -57,7 +57,7 @@
 	} from '@/utils'
 	} from '@/utils'
 	export default {
 	export default {
 		data() {
 		data() {
-			return {
+			return {
 				validateGuestCode:0,
 				validateGuestCode:0,
 				form: {
 				form: {
 					phone: '',
 					phone: '',
@@ -125,18 +125,18 @@
 				}
 				}
 
 
 
 
-				API.validateCode({
+				API.validateCode({
 					validateGuestCode:this.validateGuestCode,
 					validateGuestCode:this.validateGuestCode,
 					verifyCode: this.form.code,
 					verifyCode: this.form.code,
 					telephone: this.form.phone,
 					telephone: this.form.phone,
 					openId: this.carhelp.getOpenId(),
 					openId: this.carhelp.getOpenId(),
-					headImg: headImg,
+					headImg: headImg,
 					source:1,
 					source:1,
 				}).then((response) => {
 				}).then((response) => {
 					var token = response ? response.data.token : '';
 					var token = response ? response.data.token : '';
 					this.carhelp.setToken(token);
 					this.carhelp.setToken(token);
-					this.carhelp.setPersonInfo(response.data.regUser);
-					this.carhelp.setPersonInfoPlus(response.data.data  )
+					this.carhelp.setPersonInfo(response.data.regUser);
+					this.carhelp.setPersonInfoPlus(response.data.data  )
 					
 					
 					//this.gotoUrl("pages/user/index")
 					//this.gotoUrl("pages/user/index")
 					uni.redirectTo({
 					uni.redirectTo({
@@ -207,64 +207,64 @@
 					return;
 					return;
 				}
 				}
 				this.$refs.uCode.start();
 				this.$refs.uCode.start();
-			},
-			query(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.findByOpenId({
-					
-					openId: this.carhelp.getOpenId(),
-					
-				}).then((response) => {
-					
-					if(response.data.regUser.userType==1){
-						this.validateGuestCode=1;
-						throw 1
-					}
-					var token = response ? response.data.token : '';
-					this.carhelp.setToken(token);
-					this.carhelp.setPersonInfo(response.data.regUser);
-					//this.gotoUrl("pages/user/index")
-					this.carhelp.setPersonInfoPlus(response.data.data  )
-					
-					uni.redirectTo({
-						url: '/pages/user/rechargeIndex?site=1'
-					})
-				
-				}).catch(error => {
-					console.log(error)
-					uni.hideLoading();
-					if (!this.carhelp.getOpenId()) {
-						// uni.showToast({
-						// 	title: "请使用“微信”访问本系统登录"
-						// })
-						// return
-					} else if (this.message) {
-						uni.showToast({
-							title: this.message.split(",")[0],
-							icon: "none"
-						})
-					}
-					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();
-						}
-					}
-					
-				})
+			},
+			query(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.findByOpenId({
+					
+					openId: this.carhelp.getOpenId(),
+					
+				}).then((response) => {
+					
+					if(response.data.regUser.userType==1){
+						this.validateGuestCode=1;
+						throw 1
+					}
+					var token = response ? response.data.token : '';
+					this.carhelp.setToken(token);
+					this.carhelp.setPersonInfo(response.data.regUser);
+					//this.gotoUrl("pages/user/index")
+					this.carhelp.setPersonInfoPlus(response.data.data  )
+					
+					uni.redirectTo({
+						url: '/pages/user/rechargeIndex?site=1'
+					})
+				
+				}).catch(error => {
+					console.log(error)
+					uni.hideLoading();
+					if (!this.carhelp.getOpenId()) {
+						// uni.showToast({
+						// 	title: "请使用“微信”访问本系统登录"
+						// })
+						// return
+					} else if (this.message) {
+						uni.showToast({
+							title: this.message.split(",")[0],
+							icon: "none"
+						})
+					}
+					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();
+						}
+					}
+					
+				})
 			}
 			}
 		},
 		},
-		onReady() {
-			this.query()
+		onReady() {
+			this.query()
 			
 			
 		}
 		}
 	}
 	}
@@ -295,4 +295,4 @@
 	.login-code {
 	.login-code {
 		color: #1677ff;
 		color: #1677ff;
 	}
 	}
-</style>
+</style>