合并

apis/utils/mixin.js

@@ -1,14 +1,8 @@
-var role="businessHall"
 
-var prefix = 'jp-housekeep-electric-'+role+'-' + process.car.NODE_ENV + '_';
+var prefix = 'jp-housekeep-electric-' + process.car.NODE_ENV + '_';
 
 var app = {
-	setRole(key){
-		role=key;
-		prefix = 'jp-housekeep-electric-'+role+'-' + process.car.NODE_ENV + '_';
-		uni.setStorageSync("jp-housekeep-electric", role)
-		
-	},
+ 
 	getGzDate : (key) => {
 		var tdate=new Date( ).toJSON().substr(0,10).replace("T"," ")
 		var date= uni.getStorageSync( prefix + "is_gz_date")

components/bobo-router/index.js

@@ -48,13 +48,7 @@ const router = new Router()
 // 路由全局拦截器 在这里处理登录、授权等相关操作
 router.beforeEach(function(to, from, next) {
 	
-	if(from.page.indexOf('/pages/businessHall/')==0){
-		carhelp.setRole("businessHall")
-	}
 	
-	if(from.page.indexOf('/pages/energyCenter/')==0){
-		carhelp.setRole("energyCenter")
-	}
 	routerBeforeEach(to, from, next);
 
 })

pages.json

@@ -1,310 +1,7 @@
 {
 
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-		    "path" : "pages/businessHall/login/login",
-		    "style" :                                                                                    
-		    {
-		        //登录
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/energyCenter/login/login",
-		    "style" :                                                                                    
-		    {
-		        //登录
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{ 
-			
-			"path": "pages/businessHall/index/index",
-			"style": {
-				//主页-微营业厅
-				"enablePullDownRefresh": false
-			}
-		
-		}
-	    ,{	
-            "path" : "pages/businessHall/message/message",
-            "style" :                                                                                    
-            {
-               //消息
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/mine/mine",
-            "style" :                                                                                    
-            {
-               //我的
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/recharge/accountRecharge",
-            "style" :                                                                                    
-            {
-               //账户充值
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/recharge/rechargeRecord",
-            "style" :                                                                                    
-            {
-               //充值记录
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/recharge/paymentResult",
-            "style" :                                                                                    
-            {
-               //支付结果
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/recharge/rechargeDetails",
-            "style" :                                                                                    
-            {
-               //充值详情
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/billingRules/billingRules",
-            "style" :                                                                                    
-            {
-               //计费规则
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/deductionRecord/deductionRecord",
-            "style" :                                                                                    
-            {
-               //扣费记录
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/deductionRecord/deductionDetails",
-            "style" :                                                                                    
-            {
-                //扣费详情
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/message/messageList",
-            "style" :                                                                                    
-            {
-               //停电通知
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/mine/tenantInformation",
-            "style" :                                                                                    
-            {
-                //租户信息
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/mine/personInfos",
-            "style" :                                                                                    
-            {
-                 //个人信息
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/businessHall/mine/electronicMonitoring",
-            "style" :                                                                                    
-            {
-                //用电监控
-                "enablePullDownRefresh": false
-            }
-            
-        },
-        {
-        	"path" : "pages/businessHall/returnBalance/returnBalance",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/returnBalance/returnApplication",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/returnBalance/returnDetails",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/recharge/monthlyBill",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/invoiceManagement",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/issueInvoice",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/billingDescription",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/applyBilling",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/invoiceDetails",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/viewE-invoice",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/InvoiceTitleManagement",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/addInvoiceTitle",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/editInvoiceTitle",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/invoiceManagement/personalTitle",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/mine/setting",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/mine/contactService",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/mine/cancelAccount",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/mine/changePassword",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/mine/changePhone",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/businessHall/mine/findBackPassword",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
+		
         {
         	"path" : "pages/statistics/statistics",
         	"style" : 

pages/businessHall/login/login.vue → pages/businessHall-test/login/login.vue

@@ -39,7 +39,7 @@
 			}
 		},
 		onLoad(){
-			this.carhelp.setRole("businessHall");
+			
 			this.query()
 		},
 		methods: {

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 @@
-能源中心