首页 发现 帮助
注册 登录
zkx
/
jp-xpgj-GA-file
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

登录调整

wgl 4 年之前
父节点
5c1a36ad3a
当前提交
e90dd5b724
共有 22 个文件被更改，包括 273 次插入 和 232 次删除
合并视图 显示文件统计
  1. 65 7
      config/pages.js
  2. 1 1
      config/project.js
  3. 0 0
      index/pension_company/favicon.ico
  4. 0 0
      index/pension_company/index.html
  5. 二进制
      index/pension_home/favicon.ico
  6. 56 0
      index/pension_home/index.html
  7. 1 1
      src/components/Common.vue
  8. 2 2
      src/projects/business/views/Master/Attendance/VerifyList.vue
  9. 15 94
      src/projects/home/views/Home.vue
  10. 6 3
      src/projects/home/views/User/Login.vue
  11. 45 100
      src/projects/home/views/User/Role.vue
  12. 11 9
      src/projects/home/views/User/UploadPhoto.vue
  13. 0 0
      src/projects/pension_company/App.vue
  14. 0 0
      src/projects/pension_company/main.js
  15. 14 0
      src/projects/pension_home/App.vue
  16. 27 0
      src/projects/pension_home/main.js
  17. 0 2
      src/store/getters.js
  18. 0 1
      src/store/mutation-types.js
  19. 0 6
      src/store/mutations.js
  20. 0 2
      src/store/state.js
  21. 30 0
      src/utils/dictionaries.js
  22. 0 4
      src/utils/storage.js

+ 65 - 7
config/pages.js
查看文件 

@@ -135,17 +135,17 @@ const config = {
 
 			}
 
 			}
 
 		},
 
 		},
 
 	},
 
 	},
 
-	//养老院
 
-	pension: {
 
+	//机构养老院
 
+	pension_company: {
 
 		pages: {
 
 		pages: {
 
 			index: {
 
 			index: {
 
-				entry: 'src/projects/pension/main.js',
 
-				template: 'index/pension/index.html',
 
+				entry: 'src/projects/pension_company/main.js',
 
+				template: 'index/pension_company/index.html',
 
 				filename: 'index.html',
 
 				filename: 'index.html',
 
 				title: '小鹏管家' + title,
 
 				title: '小鹏管家' + title,
 
 			}
 
 			}
 
 		},
 
 		},
 
-		outputDir: 'dist/pension',
 
+		outputDir: 'dist/pension_company',
 
 		devServer: {
 
 		devServer: {
 
 			host: '0.0.0.0',
 
 			host: '0.0.0.0',
 
 			port: 8080,
 
 			port: 8080,
 
@@ -155,9 +155,9 @@ const config = {
 
 			compress: true,
 
 			compress: true,
 
 		},
 
 		},
 
 		chainWebpack: (config) => {
 
 		chainWebpack: (config) => {
 
-			config.entry.app = ['babel-polyfill', '../src/projects/pension/main.js']
 
+			config.entry.app = ['babel-polyfill', '../src/projects/pension_company/main.js']
 
 			config.resolve.alias
 
 			config.resolve.alias
 
-				.set('@', resolve('../src/projects/pension/'))
 
+				.set('@', resolve('../src/projects/pension_company/'))
 
 				.set('$project', resolve('../src/'))
 
 				.set('$project', resolve('../src/'))
 
 
 
 			config.plugins.delete('preload');
 
 			config.plugins.delete('preload');
 
@@ -193,6 +193,64 @@ const config = {
 
 			}
 
 			}
 
 		},
 
 		},
 
 	},
 
 	},
 
+	//居家养老院
 
+	pension_home: {
 
+		pages: {
 
+			index: {
 
+				entry: 'src/projects/pension_home/main.js',
 
+				template: 'index/pension_home/index.html',
 
+				filename: 'index.html',
 
+				title: '小鹏管家' + title,
 
+			}
 
+		},
 
+		outputDir: 'dist/pension_home',
 
+		devServer: {
 
+			host: '0.0.0.0',
 
+			port: 8080,
 
+			//解析缓存
 
+			disableHostCheck: true,
 
+			//支持gzip
 
+			compress: true,
 
+		},
 
+		chainWebpack: (config) => {
 
+			config.entry.app = ['babel-polyfill', '../src/projects/pension_home/main.js']
 
+			config.resolve.alias
 
+				.set('@', resolve('../src/projects/pension_home/'))
 
+				.set('$project', resolve('../src/'))
 
+	
+			config.plugins.delete('preload');
 
+			config.plugins.delete('prefetch');
 
+	
+			config.optimization.minimize(true);
 
+		},
 
+		configureWebpack: (config) => {
 
+			/* //开启gzip压缩,需要配置Nginx服务器gzip选项开启
 
+			config.plugins.push(
 
+				new CompressionWebpackPlugin({
 
+					filename: '[path].gz[query]',
 
+					algorithm: 'gzip',
 
+					test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
 
+					threshold: 10240,
 
+					minRatio: 0.8
 
+				})
 
+			); */
 
+	
+			config.output.filename = `./static/js/[name].${Timestamp}.js`
 
+			config.output.chunkFilename = `./static/js/[name].${Timestamp}.js`
 
+	
+			config.performance = {
 
+				hints: 'warning',
 
+				//入口起点的最大体积 整数类型（以字节为单位）
 
+				maxEntrypointSize: 50000000,
 
+				//生成文件的最大体积 整数类型（以字节为单位 300k）
 
+				maxAssetSize: 30000000,
 
+				//只给出 js 文件的性能提示
 
+				assetFilter: function(assetFilename) {
 
+					return assetFilename.endsWith('.js');
 
+				}
 
+			}
 
+		},
 
+	},
 
 	//入口
 
 	//入口
 
 	home: {
 
 	home: {
 
 		pages: {
 
 		pages: {

+ 1 - 1
config/project.js
查看文件 

@@ -1 +1 @@
 
-exports.name = 'business'
 
+exports.name = 'home'

+ 0 - 0
index/pension/favicon.ico → index/pension_company/favicon.ico
查看文件


+ 0 - 0
index/pension/index.html → index/pension_company/index.html
查看文件


二进制
index/pension_home/favicon.ico
查看文件


+ 56 - 0
index/pension_home/index.html
查看文件 

@@ -0,0 +1,56 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-cn">
 
+	<head>
 
+		<meta charset="utf-8">
 
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,IE=IE9">
 
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+		<meta name="apple-mobile-web-app-capable" content="yes">
 
+		<meta name="apple-touch-fullscreen" content="yes">
 
+		<meta name="aformat-detection" content="telephone=no,email=no">
 
+		<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover">
 
+		<link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
+		<title>
 
+			<%= htmlWebpackPlugin.options.title %>
 
+		</title>
 
+	</head>
 
+	<body>
 
+		<noscript>
 
+			<strong>
 
+				We're sorry but
 
+				<%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to
 
+				continue.
 
+			</strong>
 
+		</noscript>
 
+		<div id="app"></div>
 
+
 
+
 
+		<script type="text/javascript">
 
+			(function() {
 
+				if (typeof WeixinJSBridge == "object" && typeof WeixinJSBridge.invoke == "function") {
 
+					handleFontSize();
 
+				} else {
 
+					if (document.addEventListener) {
 
+						document.addEventListener("WeixinJSBridgeReady", handleFontSize, false);
 
+					} else if (document.attachEvent) {
 
+						document.attachEvent("WeixinJSBridgeReady", handleFontSize);
 
+						document.attachEvent("onWeixinJSBridgeReady", handleFontSize);
 
+					}
 
+				}
 
+
 
+				function handleFontSize() {
 
+					/*设置网页字体为默认大小*/
 
+					WeixinJSBridge.invoke('setFontSizeCallback', {
 
+						'fontSize': 0
 
+					});
 
+					/*重写设置网页字体大小的事件*/
 
+					WeixinJSBridge.on('menu:setfont', function() {
 
+						WeixinJSBridge.invoke('setFontSizeCallback', {
 
+							'fontSize': 0
 
+						});
 
+					});
 
+				}
 
+			})();
 
+		</script>
 
+	</body>
 
+</html>

+ 1 - 1
src/components/Common.vue
查看文件 

@@ -136,7 +136,7 @@
 
 				token: 'token',
 
 				token: 'token',
 
 				person_data: 'person_data',
 
 				person_data: 'person_data',
 
 				person_popedom: 'person_popedom',
 
 				person_popedom: 'person_popedom',
 
-				menu_list: 'menu_list'
 
+				menu_list: 'menu_list',
 
 			})
 
 			})
 
 		}
 
 		}
 
 	}
 
 	}

+ 2 - 2
src/projects/business/views/Master/Attendance/VerifyList.vue
查看文件 

@@ -206,10 +206,10 @@
 
 				if (!this.subForm.ids) {
 
 				if (!this.subForm.ids) {
 
 					mui.toast('请选择要处理的信息');
 
 					mui.toast('请选择要处理的信息');
 
 					return false;
 
 					return false;
 
-				} else if (!this.subForm.content) {
 
+				}/* else if (!this.subForm.content) {
 
 					mui.toast('请填写审核意见');
 
 					mui.toast('请填写审核意见');
 
 					return false;
 
 					return false;
 
-				} else {
 
+				} */else {
 
 					return true;
 
 					return true;
 
 				}
 
 				}
 
 			},
 
 			},

+ 15 - 94
src/projects/home/views/Home.vue
查看文件 

@@ -1,118 +1,40 @@
 
 <template>
 
 <template>
 
 	<div>
 
 	<div>
 
 		<common @asynCallBack="asynCallBack"></common>
 
 		<common @asynCallBack="asynCallBack"></common>
 
-		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 
-
 
-		<div class="mui-content margin60">
 
-			<div class="vongi-choose">
 
-				<h1>选择行业</h1>
 
-				<h5>“小鹏管家”是智慧物业、智慧园区、智慧养老的云管家，是智慧生活的守护神。管家服务于访客、园区（包括小区、居家+机构养老、企事业单位、厂区）人员及管理者。主要功能包括出入管理、健康监管、考勤打卡、物业管理、安全监管、访客管理以及在线缴费等。</h5>
 
-				<ul class="mui-table-view">
 
-					<li class="mui-table-view-cell mui-media vongi-choose-yq">
 
-						<a @click="toPage('business')" class="mui-navigate-right">
 
-							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/icon02.png">
 
-							<div class="mui-media-body">
 
-								工厂园区
 
-								<p class='mui-ellipsis'>适用于办公楼、工厂、工业园等场所</p>
 
-							</div>
 
-						</a>
 
-					</li>
 
-					<li class="mui-table-view-cell mui-media vongi-choose-zz kfz">
 
-						<a class="mui-navigate-right">
 
-							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/icon17.png">
 
-							<div class="mui-media-body">
 
-								社区住宅
 
-								<p class='mui-ellipsis'>适用于社区、小区、公寓等场所</p>
 
-							</div>
 
-						</a>
 
-					</li>
 
-					<li class="mui-table-view-cell mui-media vongi-choose-yl kfz">
 
-						<a class="mui-navigate-right">
 
-							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/icon46.png">
 
-							<div class="mui-media-body">
 
-								机构、居家养老
 
-								<p class='mui-ellipsis'>适用于养老院、居家养老等场所</p>
 
-							</div>
 
-						</a>
 
-					</li>
 
-				</ul>
 
-			</div>
 
-		</div>
 
-		<div class="fyy-footer kfz">
 
-			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-outlined">我是访客</button></div>
 
-		</div>
 
 	</div>
 
 	</div>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
+	import * as Dictionaries from '$project/utils/dictionaries'
 
 	import Common from '$project/components/Common.vue'
 
 	import Common from '$project/components/Common.vue'
 
-	import Loading from '$project/components/Loading.vue'
 
-	import TopHeader from '$project/components/TopHeader.vue'
 
 	import {
 
 	import {
 
 		mapGetters,
 
 		mapGetters,
 
 		mapMutations
 
 		mapMutations
 
 	} from 'vuex'
 
 	} from 'vuex'
 
-	import * as types from '$project/store/mutation-types'
 
 	export default {
 
 	export default {
 
 		name: 'Home',
 
 		name: 'Home',
 
 		components: {
 
 		components: {
 
 			Common,
 
 			Common,
 
-			Loading,
 
-			TopHeader
 
 		},
 
 		},
 
 		data() {
 
 		data() {
 
-			return {
 
-				pageTitle: '小鹏管家',
 
-
 
-				visterScene: {
 
-					project: '',
 
-					role: ''
 
-				}
 
-			}
 
-		},
 
-		created() {
 
-			if (this.vister_scene) {
 
-				this.visterScene = this.vister_scene;
 
-			}
 
+			return {}
 
 		},
 
 		},
 
+		created() {},
 
 		methods: {
 
 		methods: {
 
-			//页面跳转
 
-			toPage(project) {
 
-				this.visterScene.project = project;
 
-				this.set_vister_scene(this.visterScene);
 
-				this.$router.push({
 
-					name: 'Role',
 
-					query: {
 
-						project: project
 
-					}
 
-				})
 
-			},
 
-			//确认
 
-			sure() {
 
-				this.set_vister_scene(this.visterScene);
 
-				if (this.visterScene.project == 'business') {
 
-					if (this.visterScene.role == '1') {
 
-						window.location.href = "../" + this.visterScene.project + '/#/master';
 
-					} else if (this.visterScene.role == '2') {
 
-						window.location.href = "../" + this.visterScene.project + '/#/houseKeeper/admin';
 
-					} else if (this.visterScene.role == '3') {
 
-						window.location.href = "../" + this.visterScene.project + '/#/houseKeeper/control';
 
-					} else {
 
-						mui.toast('请选择角色');
 
-					}
 
-				} else {
 
-					mui.toast('未开放场景');
 
-				}
 
-			},
 
 			asynCallBack() {
 
 			asynCallBack() {
 
-				//如果场景是存在的则直接跳转
 
-				if (this.vister_scene && !this.$route.query.exchange && this.vister_scene.project && this.vister_scene.role) {
 
-					this.sure();
 
+				//登录状态判断
 
+				if (this.person_popedom) {
 
+					let project = Dictionaries.getProject(this.person_popedom.sceneId);
 
+					window.location.href = '../' + project + '/#/master';
 
+				} else {
 
+					this.$router.push({
 
+						name: 'UserLogin',
 
+						query: {
 
+							project: Dictionaries.getProject(0)
 
+						}
 
+					})
 
 				}
 
 				}
 
 			},
 
 			},
 
-			...mapMutations({
 
-				set_vister_scene: types.SET_VISTER_SCENE,
 
-			})
 
 		},
 
 		},
 
 		mounted() {},
 
 		mounted() {},
 
 		destroyed() {
 
 		destroyed() {
 
@@ -123,8 +45,7 @@
 
 				openId: 'wx_openid',
 
 				openId: 'wx_openid',
 
 				token: 'token',
 
 				token: 'token',
 
 				person_data: 'person_data',
 
 				person_data: 'person_data',
 
-                person_popedom: 'person_popedom',
 
-				vister_scene: 'vister_scene',
 
+				person_popedom: 'person_popedom',
 
 			})
 
 			})
 
 		}
 
 		}
 
 	}
 
 	}

+ 6 - 3
src/projects/home/views/User/Login.vue
查看文件 

@@ -80,7 +80,11 @@
 
 			}
 
 			}
 
 		},
 
 		},
 
 		created() {
 
 		created() {
 
-
 
+			//设置默认值,退出帐号后进入登录页面，输入框中保留上次登录时的姓名和手机号信息；
 
+			if (this.person_data) {
 
+				this.subForm.name = this.person_data.name;
 
+				this.subForm.phone = this.person_data.phone;
 
+			}
 
 		},
 
 		},
 
 		methods: {
 
 		methods: {
 
 			//表单检测
 
 			//表单检测
 
@@ -155,7 +159,7 @@
 
 						this.set_token(response);
 
 						this.set_token(response);
 
 						//上传头像					
 						//上传头像					
 						this.$router.push({
 
 						this.$router.push({
 
-							name: 'UploadPhoto',
 
+							name: 'UserUploadPhoto',
 
 							query: {
 
 							query: {
 
 								personId: this.personId,
 
 								personId: this.personId,
 
 								project: this.$route.query.project
 
 								project: this.$route.query.project
 
@@ -188,7 +192,6 @@
 
 				token: 'token',
 
 				token: 'token',
 
 				person_data: 'person_data',
 
 				person_data: 'person_data',
 
 				person_popedom: 'person_popedom',
 
 				person_popedom: 'person_popedom',
 
-				vister_scene: 'vister_scene',
 
 			})
 
 			})
 
 		}
 
 		}
 
 	}
 
 	}

+ 45 - 100
src/projects/home/views/User/Role.vue
查看文件 

@@ -1,68 +1,37 @@
 
 <template>
 
 <template>
 
 	<div>
 
 	<div>
 
-		<common @asynCallBack="asynCallBack"></common>
 
+		<common ref="common" @asynCallBack="asynCallBack"></common>
 
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 
 
 
 		<div class="mui-content margin60">
 
 		<div class="mui-content margin60">
 
 			<div class="vongi-choose mui-content-padded">
 
 			<div class="vongi-choose mui-content-padded">
 
 				<h5>经过比对，您可以使用下列身份登录: </h5>
 
 				<h5>经过比对，您可以使用下列身份登录: </h5>
 
 				<ul class="mui-table-view  mui-table-view-radio vongi-pipei">
 
 				<ul class="mui-table-view  mui-table-view-radio vongi-pipei">
 
-					<li v-show="popedom.indexOf('1')>-1" :class="'mui-table-view-cell '+(visterScene.role=='1'?'mui-selected':'')"
 
-					 @click="visterScene.role='1'">
 
-						<a>
 
+					<li v-for="(item,index) in roleList" :class="'mui-table-view-cell '+(person_popedom.sceneId==item.sceneId?'mui-selected':'')">
 
+						<a @click="switchRole(item.sceneId)">
 
 							<div class="mui-pull-left mui-col-xs-2">
 
 							<div class="mui-pull-left mui-col-xs-2">
 
 								<div class="mui-media-object">
 
 								<div class="mui-media-object">
 
 									<img :src="person_data.faceImageUrl">
 
 									<img :src="person_data.faceImageUrl">
 
 								</div>
 
 								</div>
 
-								<p class='mui-ellipsis'>员工</p>
 
-								<span class="mui-badge mui-badge-danger">1</span>
 
+								<p class='mui-ellipsis' v-text="item.personRoleName"></p>
 
+								<span v-if="item.unreadMessageNum>0" class="mui-badge mui-badge-danger" v-text="item.unreadMessageNum"></span>
 
 							</div>
 
 							</div>
 
 							<div class="mui-media-body mui-col-xs-10">
 
 							<div class="mui-media-body mui-col-xs-10">
 
-								{{person_data.position1}}
 
-								<p class='mui-ellipsis' v-text="person_data.position2"></p>
 
+								{{item.sceneName}}
 
+								<p class='mui-ellipsis' v-text="item.companyName"></p>
 
 							</div>
 
 							</div>
 
 						</a>
 
 						</a>
 
 					</li>
 
 					</li>
 
-					<li v-show="popedom.indexOf('2')>-1" :class="'mui-table-view-cell '+(visterScene.role=='2'?'mui-selected':'')"
 
-					 @click="visterScene.role='2'">
 
-						<a>
 
-							<div class="mui-pull-left mui-col-xs-2">
 
-								<div class="mui-media-object">
 
-									<img :src="person_data.faceImageUrl">
 
-								</div>
 
-								<p class='mui-ellipsis'>管理人员</p>
 
-							</div>
 
-							<div class="mui-media-body mui-col-xs-10">
 
-								{{person_data.position1}}
 
-								<p class='mui-ellipsis' v-text="person_data.position2"></p>
 
-							</div>
 
-						</a>
 
-					</li>
 
-					<!-- <li v-show="popedom.indexOf('3')>-1" :class="'mui-table-view-cell '+(visterScene.role=='3'?'mui-selected':'')"
 
-					 @click="visterScene.role='3'">
 
-						<a>
 
-							<div class="mui-pull-left mui-col-xs-2">
 
-								<div class="mui-media-object">
 
-									<img :src="person_data.faceImageUrl">
 
-								</div>
 
-								<p class='mui-ellipsis'>监管端</p>
 
-							</div>
 
-							<div class="mui-media-body mui-col-xs-10">
 
-								{{person_data.position1}}
 
-								<p class='mui-ellipsis' v-text="person_data.position2"></p>
 
-							</div>
 
-						</a>
 
-					</li> -->
 
 				</ul>
 
 				</ul>
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
-		<div class="fyy-footer">
 
-			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary" @click="sure">确认选择</button></div>
 
-		</div>
 
+
 
+		<loading :visible="isLoading"></loading>
 
 	</div>
 
 	</div>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
+	import * as API_User from '$project/apis/user'
 
 	import Common from '$project/components/Common.vue'
 
 	import Common from '$project/components/Common.vue'
 
 	import Loading from '$project/components/Loading.vue'
 
 	import Loading from '$project/components/Loading.vue'
 
 	import TopHeader from '$project/components/TopHeader.vue'
 
 	import TopHeader from '$project/components/TopHeader.vue'
 
@@ -70,9 +39,8 @@
 
 		mapGetters,
 
 		mapGetters,
 
 		mapMutations
 
 		mapMutations
 
 	} from 'vuex'
 
 	} from 'vuex'
 
-	import * as types from '$project/store/mutation-types'
 
 	export default {
 
 	export default {
 
-		name: 'Role',
 
+		name: 'UserRole',
 
 		components: {
 
 		components: {
 
 			Common,
 
 			Common,
 
 			Loading,
 
 			Loading,
 
@@ -81,80 +49,57 @@
 
 		data() {
 
 		data() {
 
 			return {
 
 			return {
 
 				pageTitle: '匹配身份',
 
 				pageTitle: '匹配身份',
 
+				isLoading: false,
 
 
 
-				//传递过来的场景项目
 
-				visterScene: {
 
-					project: this.$route.query.project,
 
-					role: ''
 
-				}
 
-			}
 
-		},
 
-		created() {
 
-			if (this.$route.query.project) {
 
-				this.visterScene.project = this.$route.query.project
 
+				roleList: []
 
 			}
 
 			}
 
 		},
 
 		},
 
+		created() {},
 
 		methods: {
 
 		methods: {
 
-			//确认
 
-			sure(auto) {
 
-				this.set_vister_scene(this.visterScene);
 
-				if (this.visterScene.project == 'business') {
 
-					if (this.visterScene.role == '1') {
 
-						window.location.href = "../" + this.visterScene.project + '/#/master';
 
-					} else if (this.visterScene.role == '2') {
 
-						window.location.href = "../" + this.visterScene.project + '/#/houseKeeper/admin';
 
-					} else if (this.visterScene.role == '3') {
 
-						window.location.href = "../" + this.visterScene.project + '/#/houseKeeper/control';
 
-					} else {
 
-						if (!auto) {
 
-							mui.toast('请选择角色');
 
-						}
 
-					}
 
-				} else {
 
-					mui.toast('未开放场景');
 
-				}
 
+			//获取用户角色列表
 
+			getRoleList() {
 
+				this.isLoading = true;
 
+				API_User.getRoleList().then(response => {
 
+					this.isLoading = false;
 
+
 
+					this.roleList = response.list;
 
+				}).catch(error => {
 
+					this.isLoading = false;
 
+					mui.toast(error);
 
+				})
 
+			},
 
+			//切换角色
 
+			switchRole(id) {
 
+				this.isLoading = true;
 
+				API_User.exchangePopedom({
 
+					id: id
 
+				}).then(response => {
 
+					this.isLoading = false;
 
+
 
+					//跳转到项目主页上去
 
+					window.location.href = '../' + this.$route.query.project + '/#/master';
 
+				}).catch(error => {
 
+					this.isLoading = false;
 
+					mui.toast(error);
 
+				})
 
 			},
 
 			},
 
 			asynCallBack() {
 
 			asynCallBack() {
 
-				//如果用户不存则去注册用户
 
-				if (!this.person_data) {
 
-					this.$router.push({
 
-						name: 'Login',
 
-						query: {
 
-							project: this.visterScene.project
 
-						}
 
-					})
 
-				}
 
 
 
-				//如果场景是存在的则直接跳转
 
-				if (!this.$route.query.exchange && this.vister_scene.project && this.vister_scene.role) {
 
-					this.sure(true);
 
-				}
 
 			},
 
 			},
 
-			...mapMutations({
 
-				set_vister_scene: types.SET_VISTER_SCENE,
 
-			})
 
 		},
 
 		},
 
-		mounted() {},
 
+		mounted() {
 
+			//获取用户角色列表
 
+			this.getRoleList();
 
+		},
 
 		destroyed() {
 
 		destroyed() {
 
 
 
 		},
 
 		},
 
 		computed: {
 
 		computed: {
 
-			popedom: {
 
-				// getter
 
-				get: function() {
 
-					return this.person_data ? this.person_data.popedom.split(',') : [];
 
-				},
 
-				// setter
 
-				set: function(newValue) {
 
-					console.log(newValue)
 
-				}
 
-			},
 
 			...mapGetters({
 
 			...mapGetters({
 
 				openId: 'wx_openid',
 
 				openId: 'wx_openid',
 
 				token: 'token',
 
 				token: 'token',
 
 				person_data: 'person_data',
 
 				person_data: 'person_data',
 
-                person_popedom: 'person_popedom',
 
-				vister_scene: 'vister_scene',
 
+				person_popedom: 'person_popedom',
 
 			})
 
 			})
 
 		}
 
 		}
 
 	}
 
 	}

+ 11 - 9
src/projects/home/views/User/UploadPhoto.vue
查看文件 

@@ -23,6 +23,7 @@
 
 			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary" @click="submit">提交</button></div>
 
 			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary" @click="submit">提交</button></div>
 
 		</div>
 
 		</div>
 
 
 
+		<loading :visible="isLoading"></loading>
 
 
 
 		<!--图片裁剪-->
 
 		<!--图片裁剪-->
 
 		<cropper :cwidth="cropperWidth" :cheight="cropperHeight" :visible="cropperVisible" :field="cropperField" :cropper="cropper"
 
 		<cropper :cwidth="cropperWidth" :cheight="cropperHeight" :visible="cropperVisible" :field="cropperField" :cropper="cropper"
 
@@ -42,7 +43,7 @@
 
 	import Cropper from '$project/components/Cropper.vue'
 
 	import Cropper from '$project/components/Cropper.vue'
 
 	import * as WxJsApi from '$project/utils/wxJsApi'
 
 	import * as WxJsApi from '$project/utils/wxJsApi'
 
 	export default {
 
 	export default {
 
-		name: 'UploadPhoto',
 
+		name: 'UserUploadPhoto',
 
 		components: {
 
 		components: {
 
 			Common,
 
 			Common,
 
 			Loading,
 
 			Loading,
 
@@ -156,13 +157,8 @@
 
 					API_Person.save(this.subForm).then(response => {
 
 					API_Person.save(this.subForm).then(response => {
 
 						this.isLoading = false;
 
 						this.isLoading = false;
 
 
 
-						//场景之前选过，这里直接去选择角色，第一次注册也要传递project
 
-						this.$router.push({
 
-							name: 'Role',
 
-							query: {
 
-								project: this.$route.query.project
 
-							}
 
-						})
 
+						//跳转到项目主页上去
 
+						window.location.href = '../' + this.$route.query.project + '/#/master';
 
 
 
 					}).catch(error => {
 
 					}).catch(error => {
 
 						this.isLoading = false;
 
 						this.isLoading = false;
 
@@ -171,7 +167,11 @@
 
 				}
 
 				}
 
 			},
 
 			},
 
 			asynCallBack() {
 
 			asynCallBack() {
 
-
 
+				//如果已经有头像了则跳过这里的注册上传头像
 
+				if (this.person_data && this.person_data.faceImageUrl) {
 
+					//跳转到项目主页上去
 
+					window.location.href = '../' + this.$route.query.project + '/#/master';
 
+				}
 
 			},
 
 			},
 
 		},
 
 		},
 
 		mounted() {
 
 		mounted() {
 
@@ -183,6 +183,8 @@
 
 			...mapGetters({
 
 			...mapGetters({
 
 				openId: 'wx_openid',
 
 				openId: 'wx_openid',
 
 				token: 'token',
 
 				token: 'token',
 
+				person_data: 'person_data',
 
+				person_popedom: 'person_popedom',
 
 			})
 
 			})
 
 		}
 
 		}
 
 	}
 
 	}

+ 0 - 0
src/projects/pension/App.vue → src/projects/pension_company/App.vue
查看文件


+ 0 - 0
src/projects/pension/main.js → src/projects/pension_company/main.js
查看文件


+ 14 - 0
src/projects/pension_home/App.vue
查看文件 

@@ -0,0 +1,14 @@
 
+<template>
 
+	<div id="app">
 
+		<router-view />
 
+	</div>
 
+</template>
 
+
 
+<style lang="scss">
 
+	#app {
 
+		font-family: Avenir, Helvetica, Arial, sans-serif;
 
+		-webkit-font-smoothing: antialiased;
 
+		-moz-osx-font-smoothing: grayscale;
 
+	}
 
+</style>
 
+

+ 27 - 0
src/projects/pension_home/main.js
查看文件 

@@ -0,0 +1,27 @@
 
+import Vue from 'vue'
 
+import App from './App.vue'
 
+import router from './router'
 
+import store from '$project/store'
 
+
 
+//引入mui
 
+import mui from '$project/assets/js/mui.js'
 
+import '$project/assets/css/mui.min.css'
 
+import Vconsole from 'vconsole'
 
+
 
+window.mui = mui;
 
+window.mui.init();
 
+
 
+if (location.hostname === 'localhost') {
 
+	Vue.prototype.HTTPLOCAT = ''
 
+} else {
 
+	const http = window.location.protocol + '//' + location.hostname + ':' + location.port
 
+	Vue.prototype.HTTPLOCAT = http + ''
 
+}
 
+
 
+Vue.config.productionTip = false
 
+
 
+new Vue({
 
+	router,
 
+	store,
 
+	render: h => h(App)
 
+}).$mount('#app')

+ 0 - 2
src/store/getters.js
查看文件 

@@ -6,8 +6,6 @@ export const person_data = state => state.person_data
 
 
 
 export const person_popedom = state => state.person_popedom
 
 export const person_popedom = state => state.person_popedom
 
 
 
-export const vister_scene = state => state.vister_scene
 
-
 
 export const add_person_data = state => state.add_person_data
 
 export const add_person_data = state => state.add_person_data
 
 
 
 export const menu_list = state => state.menu_list
 
 export const menu_list = state => state.menu_list

+ 0 - 1
src/store/mutation-types.js
查看文件 

@@ -3,6 +3,5 @@ export const SET_WEIXIN_OPENID = 'SET_WEIXIN_OPEN_ID'
 
 
 
 export const SET_PERSON_DATA = 'SET_PERSON_DATA'
 
 export const SET_PERSON_DATA = 'SET_PERSON_DATA'
 
 export const SET_PERSON_POPEDOM = 'SET_PERSON_POPEDOM'
 
 export const SET_PERSON_POPEDOM = 'SET_PERSON_POPEDOM'
 
-export const SET_VISTER_SCENE = 'SET_VISTER_SCENE'
 
 export const SET_ADD_PERSON_DATA = 'SET_ADD_PERSON_DATA'
 
 export const SET_ADD_PERSON_DATA = 'SET_ADD_PERSON_DATA'
 
 export const SET_MENI_LIST = 'SET_MENI_LIST'
 
 export const SET_MENI_LIST = 'SET_MENI_LIST'

+ 0 - 6
src/store/mutations.js
查看文件 

@@ -4,7 +4,6 @@ import {
 
 	setToken,
 
 	setToken,
 
 	setPersonData,
 
 	setPersonData,
 
 	setPersonPopedom,
 
 	setPersonPopedom,
 
-	setVisterScene,
 
 	setMenuList
 
 	setMenuList
 
 } from '../utils/storage'
 
 } from '../utils/storage'
 
 
 
@@ -31,11 +30,6 @@ const mutations = {
 
 		state.person_popedom = data
 
 		state.person_popedom = data
 
 	},
 
 	},
 
 
 
-	[types.SET_VISTER_SCENE](state, data) {
 
-		setVisterScene(storage_prefix, data)
 
-		state.vister_scene = data
 
-	},
 
-
 
 	[types.SET_ADD_PERSON_DATA](state, data) {
 
 	[types.SET_ADD_PERSON_DATA](state, data) {
 
 		state.add_person_data = data
 
 		state.add_person_data = data
 
 	},
 
 	},

+ 0 - 2
src/store/state.js
查看文件 

@@ -3,7 +3,6 @@ import {
 
 	getToken,
 
 	getToken,
 
 	getPersonData,
 
 	getPersonData,
 
 	getPersonPopedom,
 
 	getPersonPopedom,
 
-	getVisterScene,
 
 	getMenuList
 
 	getMenuList
 
 } from '../utils/storage'
 
 } from '../utils/storage'
 
 
 
@@ -14,7 +13,6 @@ const state = {
 
 	token: getToken(),
 
 	token: getToken(),
 
 	person_data: getPersonData(storage_prefix),
 
 	person_data: getPersonData(storage_prefix),
 
 	person_popedom: getPersonPopedom(storage_prefix),
 
 	person_popedom: getPersonPopedom(storage_prefix),
 
-	vister_scene: getVisterScene(storage_prefix),
 
 	add_person_data: '',
 
 	add_person_data: '',
 
 	control_abnormal_statistics_startTime: '',
 
 	control_abnormal_statistics_startTime: '',
 
 	control_abnormal_statistics_endTime: '',
 
 	control_abnormal_statistics_endTime: '',

+ 30 - 0
src/utils/dictionaries.js
查看文件 

@@ -0,0 +1,30 @@
 
+const scene_list = [{
 
+		id: '1',
 
+		title: '工厂园区',
 
+		project: 'business'
 
+	},
 
+	{
 
+		id: '2',
 
+		title: '社区住宅',
 
+		project: 'residence'
 
+	},
 
+	{
 
+		id: '3',
 
+		title: '机构养老',
 
+		project: 'pension_company'
 
+	},
 
+	{
 
+		id: '4',
 
+		title: '居家养老',
 
+		project: 'pension_home'
 
+	},
 
+];
 
+
 
+export function getProject(id) {
 
+	for (var i = 0; i < scene_list.length; i++) {
 
+		if (id == scene_list[i]['id']) {
 
+			return scene_list[i]['project'];
 
+		}
 
+	}
 
+	return scene_list[0]['project'];
 
+}

+ 0 - 4
src/utils/storage.js
查看文件 

@@ -66,10 +66,6 @@ export const setPersonPopedom = (channel, data) => set(channel + '_person_popedo
 
 
 
 export const getPersonPopedom = (channel) => get(channel + '_person_popedom')
 
 export const getPersonPopedom = (channel) => get(channel + '_person_popedom')
 
 
 
-export const setVisterScene = (channel, data) => set(channel + '_vister_scene', data)
 
-
 
-export const getVisterScene = (channel) => get(channel + '_vister_scene')
 
-
 
 export const setMenuList = (channel, data) => set(channel + '_menu_list', data)
 
 export const setMenuList = (channel, data) => set(channel + '_menu_list', data)
 
 
 
 export const getMenuList = (channel) => get(channel + '_menu_list')
 
 export const getMenuList = (channel) => get(channel + '_menu_list')