个人信息

src/assets/js/mui.js

@@ -6432,7 +6432,7 @@ Function.prototype.bind = Function.prototype.bind || function(to) {
  * @param {type} undefined
  * @returns {undefined}
  */
-(function($, window, document, name, undefined) {
+/*(function($, window, document, name, undefined) {
 
     var CLASS_CONTROL_ITEM = 'mui-control-item';
     var CLASS_SEGMENTED_CONTROL = 'mui-segmented-control';
@@ -6542,7 +6542,7 @@ Function.prototype.bind = Function.prototype.bind || function(to) {
         e.detail && e.detail.gesture.preventDefault(); //fixed hashchange
     });
 
-})(mui, window, document, 'tab');
+})(mui, window, document, 'tab');*/
 /**
  * Toggles switch
  * @param {type} $

src/components/TopHeader.vue

@@ -73,6 +73,7 @@
 	}
 </script>
 
+<style scoped src="$project/assets/css/xpgj.css"></style>
 <style scoped>
 	.jp-badge {
 		font-size: 12px !important;

src/projects/business/components/NavMenu.vue

@@ -1,22 +1,21 @@
 <template>
 	<nav class="mui-bar mui-bar-tab">
-		<a class="mui-tab-item" @click="doRouter('home')">
+		<router-link :to="router[0]" :class="'mui-tab-item '+(routeName==router[0]['name']?'mui-active':'')">
 			<span class="mui-icon iconfont icon-shouye2"></span>
 			<span class="mui-tab-label">首页</span>
-		</a>
-		<a :class="'mui-tab-item '+'mui-active'" @click="doRouter('message')">
+		</router-link>
+		<router-link :to="router[1]" :class="'mui-tab-item '+(routeName==router[1]['name']?'mui-active':'')">
 			<span class="mui-icon iconfont icon-xiaoxi1"></span>
 			<span class="mui-tab-label">消息</span>
-		</a>
-		<a class="mui-tab-item" @click="doRouter('center')">
+		</router-link>
+		<router-link :to="router[2]" :class="'mui-tab-item '+(routeName==router[2]['name']?'mui-active':'')">
 			<span class="mui-icon iconfont icon-wode1"></span>
 			<span class="mui-tab-label">我的</span>
-		</a>
+		</router-link>
 	</nav>
 </template>
 
 <script>
-	import router from '@/router'
 	export default {
 		name: 'NavMenu',
 		props: {
@@ -24,16 +23,35 @@
 				require: false,
 				default: true,
 			},
-			name: {
-				require: false,
-				default: '',
+			router: {
+				require: true,
+				type: Array,
+				default: [{
+					name: 'Home'
+				}, {
+					name: 'Home'
+				}, {
+					name: 'Home'
+				}],
 			},
 		},
-		created(){
-			console.log(router);
+		created() {
+			console.log(this.$route);
 		},
 		methods: {},
-		mounted() {}
+		mounted() {},
+		computed: {
+			routeName: {
+				// getter
+				get: function() {
+					return this.$route.name;
+				},
+				// setter
+				set: function(newValue) {
+					console.log(newValue)
+				}
+			},
+		}
 	}
 </script>
 

src/projects/business/main.js

@@ -4,7 +4,7 @@ import router from './router'
 import store from '$project/store'
 
 //引入mui
-import mui from '$project/assets/js/mui.min.js'
+import mui from '$project/assets/js/mui.js'
 import '$project/assets/css/mui.min.css'
 import Vconsole from 'vconsole'
 

src/projects/business/views/Master/Center.vue

@@ -1,85 +1,155 @@
 <template>
-<div id="app">			
-			<div class="mui-content margin49">
-				<div class="vongi-me">
-					<div class="vongi-me-name">
-						<div class="vongi-me-top">
-							<div class="flew-items">
-								<div class="mui-media-object mui-pull-left">
-									<img src="~$project/assets/img/02.jpg">
-								</div>
-								<h2>晚上好，{{}}</h2>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+
+		<div class="mui-content margin49">
+			<div class="vongi-me">
+				<div class="vongi-me-name">
+					<div class="vongi-me-top">
+						<div class="flew-items">
+							<div class="mui-media-object mui-pull-left">
+								<img src="~$project/assets/img/02.jpg">
 							</div>
-							<h4>155****1111</h4>
+							<h2>{{wellcomme}}{{person_data.name}}</h2>
 						</div>
-						<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">编辑资料</button>
-					</div>
-					<div class="vongi-me-card">
-						<h2>湖北荆盛商贸有限公司</h2>
-						<h4>信息工程中心</h4>
+						<h4 v-text="person_data.phone"></h4>
 					</div>
+					<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" @click="editInfo">编辑资料</button>
 				</div>
-				<div class="vongi-me-list">
-					<ul class="mui-table-view mui-table-view-chevron vongi-news">
-						<li class="mui-table-view-cell">
-							<a href="" class="mui-navigate-right">
-								<img src="~$project/assets/img/cicon23.png" width="18" /> 携出申请审核
-							</a>
-						</li>
-					</ul>
-					<ul class="mui-table-view mui-table-view-chevron vongi-news">
-						<li class="mui-table-view-cell">
-							<a href="" class="mui-navigate-right">
-								<img src="~$project/assets/img/cicon32.png" width="18" /> 园区账单
-							</a>
-						</li>
-						<li class="mui-table-view-cell">
-							<a href="" class="mui-navigate-right">
-								<img src="~$project/assets/img/cicon07.png" width="18" /> 我的订单
-							</a>
-						</li>
-					</ul>
-					<ul class="mui-table-view mui-table-view-chevron vongi-news">
-						<li class="mui-table-view-cell">
-							<a href="" class="mui-navigate-right">
-								<img src="~$project/assets/img/cicon33.png" width="18" /> 客服热线
-								<span>400-8899-619</span>
-							</a>
-						</li>
-						<li class="mui-table-view-cell">
-							<a href="" class="mui-navigate-right">
-								<img src="~$project/assets/img/cicon17.png" width="18" /> 切换身份
-							</a>
-						</li>
-						<li class="mui-table-view-cell">
-							<a href="" class="mui-navigate-right">
-								<img src="~$project/assets/img/exit.png" width="18" /> 退出帐号
-							</a>
-						</li>
-					</ul>
+				<div class="vongi-me-card">
+					<h2 v-text="person_data.position1"></h2>
+					<h4 v-text="person_data.position2"></h4>
 				</div>
 			</div>
-			<nav class="mui-bar mui-bar-tab">
-				<a class="mui-tab-item" href="index.html">
-					<span class="mui-icon iconfont icon-shouye2"></span>
-					<span class="mui-tab-label">首页</span>
-				</a>
-				<a class="mui-tab-item" href="news.html">
-					<span class="mui-icon iconfont icon-xiaoxi1"></span>
-					<span class="mui-tab-label">消息</span>
-				</a>
-				<a class="mui-tab-item mui-active" href="#">
-					<span class="mui-icon iconfont icon-wode1"></span>
-					<span class="mui-tab-label">我的</span>
-				</a>
-			</nav>
+			<div class="vongi-me-list">
+				<ul class="mui-table-view mui-table-view-chevron vongi-news">
+					<li class="mui-table-view-cell">
+						<a href="" class="mui-navigate-right">
+							<img src="~$project/assets/img/cicon23.png" width="18" /> 携出申请审核
+						</a>
+					</li>
+				</ul>
+				<ul class="mui-table-view mui-table-view-chevron vongi-news">
+					<li class="mui-table-view-cell">
+						<a href="" class="mui-navigate-right">
+							<img src="~$project/assets/img/cicon32.png" width="18" /> 园区账单
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a href="" class="mui-navigate-right">
+							<img src="~$project/assets/img/cicon07.png" width="18" /> 我的订单
+						</a>
+					</li>
+				</ul>
+				<ul class="mui-table-view mui-table-view-chevron vongi-news">
+					<li class="mui-table-view-cell">
+						<a href="" class="mui-navigate-right">
+							<img src="~$project/assets/img/cicon33.png" width="18" /> 客服热线
+							<span>400-8899-619</span>
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a href="" class="mui-navigate-right">
+							<img src="~$project/assets/img/cicon17.png" width="18" /> 切换身份
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a href="" class="mui-navigate-right">
+							<img src="~$project/assets/img/exit.png" width="18" /> 退出帐号
+						</a>
+					</li>
+				</ul>
+			</div>
 		</div>
+
+		<nav-menu :router="[{name:'Master'},{name:'MasterMessage'},{name:'MasterCenter'}]"></nav-menu>
+	</div>
 </template>
 
 <script>
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NavMenu from '@/components/NavMenu.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterCenter',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+			NavMenu
+		},
+		data() {
+			return {
+				pageTitle: '个人中心',
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			//修改个人信息
+			editInfo() {
+				this.$router.push({
+					name: 'MasterEditInfo',
+					query: {}
+				})
+			},
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+
+		},
+		destroyed() {
+
+		},
+		computed: {
+			wellcomme: {
+				// getter
+				get: function() {
+					let now = new Date(),
+						hour = now.getHours()
+					if (hour < 6) {
+						return '凌晨好！';
+					} else if (hour < 9) {
+						return '早上好！';
+					} else if (hour < 12) {
+						return '上午好';
+					} else if (hour < 14) {
+						return '中午好！';
+					} else if (hour < 17) {
+						return '下午好！';
+					} else if (hour < 19) {
+						return '傍晚好！';
+					} else if (hour < 22) {
+						return '晚上好！';
+					} else {
+						return '夜里好！';
+					}
+				},
+				// setter
+				set: function(newValue) {
+					console.log(newValue)
+				}
+			},
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				company_data: 'company_data',
+			})
+		}
+	}
 </script>
 
-<style src="$project/assets/css/xpgj.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style>
+
+<style scoped src="$project/assets/css/xpgj.css"></style>
+<style scoped src="$project/assets/css/iconfont.css"></style>
+<style scoped>
 </style>

src/projects/business/views/Master/EditInfo.vue

@@ -1,53 +1,98 @@
 <template>
-  <div>
-    <header class="mui-bar mui-bar-nav">
-      <h1 class="mui-title">修改个人信息</h1>
-      <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-    </header>
-    <div class="mui-content">
-      <div class="mui-content-padded vongi-editme">
-        <form class="mui-input-group">
-          <div class="mui-input-row">
-            <label style="width: 40%">人脸识别照片</label>
-            <button
-              id="showUserPicker"
-              class="mui-btn mui-btn-block mui-navigate-right"
-              type="button"
-              style="width: 60%"
-            >
-              <img src="~$project/assets/img/audit1.png" />
-            </button>
-          </div>
-          <div class="mui-input-row">
-            <label>姓名</label>
-            <p>{{}}</p>
-          </div>
-          <div class="mui-input-row">
-            <label>手机号码</label>
-            <p>15500001111</p>
-          </div>
-          <div class="mui-input-row">
-            <label>身份证号</label>
-            <input
-              type="text"
-              class="mui-input-clear"
-              placeholder="请输入身份证号"
-            />
-          </div>
-        </form>
-      </div>
-    </div>
-    <div class="fyy-footer">
-      <div class="bindfyy-btn">
-        <button type="submit" class="mui-btn mui-btn-primary">保 存</button>
-      </div>
-    </div>
-  </div>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label style="width: 40%">人脸识别照片</label>
+						<button id="showUserPicker" class="mui-btn mui-btn-block mui-navigate-right" type="button" style="width: 60%">
+							<img :src="person_data.faceImageUrl" />
+						</button>
+					</div>
+					<div class="mui-input-row">
+						<label>姓名</label>
+						<input type="text" class="mui-input-clear" v-model="subForm.name">
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码</label>
+						<input type="text" class="mui-input-clear" v-model="subForm.phone">
+					</div>
+					<div class="mui-input-row">
+						<label>身份证号</label>
+						<input type="text" class="mui-input-clear" v-model="subForm.idCard">
+					</div>
+				</form>
+			</div>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn">
+				<button type="submit" class="mui-btn mui-btn-primary" @click="save">保 存</button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterEditInfo',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '修改个人中心',
+
+				subForm: {
+					name: '',
+					phone: '',
+					idCard: '',
+					wechatNoticeEnabled: true,
+				}
+			}
+		},
+		created() {
+			this.subForm.name = this.person_data.name;
+			this.subForm.phone = this.person_data.phone;
+			this.subForm.idCard = this.person_data.idCard
+		},
+		methods: {
+			//保存
+			save() {
+
+			},
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+
+		},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				company_data: 'company_data',
+			})
+		}
+	}
 </script>
 
-<style src="$project/assets/css/xpwyfyy.css"></style>
-<style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style scoped>
 </style>

src/projects/business/views/Master/Home.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
+		<top-header :pageTitle="pageTitle" headerClass="vongi-bar" :leftShow="false"></top-header>
 
 		<div class="mui-content margin49">
 			<div class="vongi-icons">
@@ -169,7 +169,7 @@
 			</div>
 		</div>
 
-		<nav-menu name="Master"></nav-menu>
+		<nav-menu :router="[{name:'Master'},{name:'MasterMessage'},{name:'MasterCenter'}]"></nav-menu>
 
 	</div>
 </template>
@@ -177,7 +177,6 @@
 <script>
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
-	import isReachBottom from '$project/utils/isReachBottom'
 	import TopHeader from '$project/components/TopHeader.vue'
 	import NavMenu from '@/components/NavMenu.vue'
 	import {

src/projects/business/views/Master/Message.vue

@@ -1,73 +1,104 @@
 <template>
-<div>
-    <header class="mui-bar mui-bar-nav vongi-bar">
-				<h1 class="mui-title">消息</h1>
-			</header>
-			<div class="mui-content margin49">
-				<ul class="mui-table-view vongi-news">
-					<li class="mui-table-view-cell mui-media">
-						<a href="javascript:;">
-							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/bell1.png">
-							<div class="mui-media-body">
-								<h3 class="flew-sp">通知公告<span class="mui-h6">09.20</span></h3>
-								<p class='mui-ellipsis'>9月园区活动通知</p>
-							</div>
-							<span class="mui-badge mui-badge-danger">5</span>
-						</a>
-					</li>
-				</ul>
-				<ul class="mui-table-view vongi-news">
-					<li class="mui-table-view-cell mui-media">
-						<a href="javascript:;">
-							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/kaoqin1.png">
-							<div class="mui-media-body">
-								<h3 class="flew-sp">考勤消息<span class="mui-h6">09.20</span></h3>
-								<p class='mui-ellipsis'>考勤打卡提醒</p>
-							</div>
-						</a>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<a href="javascript:;">
-							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/audit1.png">
-							<div class="mui-media-body">
-								<h3 class="flew-sp">通知公告<span class="mui-h6">09.20</span></h3>
-								<p class='mui-ellipsis'>9月园区活动通知</p>
-							</div>
-						</a>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<a href="javascript:;">
-							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/home1.png">
-							<div class="mui-media-body">
-								<h3 class="flew-sp">通知公告<span class="mui-h6">09.20</span></h3>
-								<p class='mui-ellipsis'>9月园区活动通知</p>
-							</div>
-						</a>
-					</li>
-				</ul>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle" headerClass="vongi-bar" :leftShow="false"></top-header>
 
-			</div>
-			<nav class="mui-bar mui-bar-tab">
-				<a class="mui-tab-item" href="index.html">
-					<span class="mui-icon iconfont icon-shouye2"></span>
-					<span class="mui-tab-label">首页</span>
-				</a>
-				<a class="mui-tab-item mui-active" href="#">
-					<span class="mui-icon iconfont icon-xiaoxi1"></span>
-					<span class="mui-tab-label">消息</span>
-				</a>
-				<a class="mui-tab-item" href="me.html">
-					<span class="mui-icon iconfont icon-wode1"></span>
-					<span class="mui-tab-label">我的</span>
-				</a>
-			</nav>
-</div>
+		<div class="mui-content margin49">
+			<ul class="mui-table-view vongi-news">
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/bell1.png">
+						<div class="mui-media-body">
+							<h3 class="flew-sp">通知公告<span class="mui-h6">09.20</span></h3>
+							<p class='mui-ellipsis'>9月园区活动通知</p>
+						</div>
+						<span class="mui-badge mui-badge-danger">5</span>
+					</a>
+				</li>
+			</ul>
+			<ul class="mui-table-view vongi-news">
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/kaoqin1.png">
+						<div class="mui-media-body">
+							<h3 class="flew-sp">考勤消息<span class="mui-h6">09.20</span></h3>
+							<p class='mui-ellipsis'>考勤打卡提醒</p>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/audit1.png">
+						<div class="mui-media-body">
+							<h3 class="flew-sp">通知公告<span class="mui-h6">09.20</span></h3>
+							<p class='mui-ellipsis'>9月园区活动通知</p>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/home1.png">
+						<div class="mui-media-body">
+							<h3 class="flew-sp">通知公告<span class="mui-h6">09.20</span></h3>
+							<p class='mui-ellipsis'>9月园区活动通知</p>
+						</div>
+					</a>
+				</li>
+			</ul>
+		</div>
+
+		<nav-menu :router="[{name:'Master'},{name:'MasterMessage'},{name:'MasterCenter'}]"></nav-menu>
+	</div>
 </template>
 
 <script>
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NavMenu from '@/components/NavMenu.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterMessage',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+			NavMenu
+		},
+		data() {
+			return {
+				pageTitle: '消息',
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+
+		},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				company_data: 'company_data',
+			})
+		}
+	}
 </script>
 
-<style src="$project/assets/css/xpgj.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style>
+<style scoped src="$project/assets/css/xpgj.css"></style>
+<style scoped src="$project/assets/css/iconfont.css"></style>
+<style scoped>
 </style>

src/projects/home/App.vue

@@ -9,7 +9,6 @@
 		font-family: Avenir, Helvetica, Arial, sans-serif;
 		-webkit-font-smoothing: antialiased;
 		-moz-osx-font-smoothing: grayscale;
-		text-align: center;
-		color: #2c3e50;
 	}
 </style>
+

src/projects/home/main.js

@@ -4,7 +4,7 @@ import router from './router'
 import store from '$project/store'
 
 //引入mui
-import mui from '$project/assets/js/mui.min.js'
+import mui from '$project/assets/js/mui.js'
 import '$project/assets/css/mui.min.css'
 import Vconsole from 'vconsole'
 

src/projects/pension/App.vue

@@ -9,7 +9,6 @@
 		font-family: Avenir, Helvetica, Arial, sans-serif;
 		-webkit-font-smoothing: antialiased;
 		-moz-osx-font-smoothing: grayscale;
-		text-align: center;
-		color: #2c3e50;
 	}
 </style>
+

src/projects/pension/main.js

@@ -4,7 +4,7 @@ import router from './router'
 import store from '$project/store'
 
 //引入mui
-import mui from '$project/assets/js/mui.min.js'
+import mui from '$project/assets/js/mui.js'
 import '$project/assets/css/mui.min.css'
 import Vconsole from 'vconsole'
 

src/projects/residence/App.vue

@@ -9,7 +9,5 @@
 		font-family: Avenir, Helvetica, Arial, sans-serif;
 		-webkit-font-smoothing: antialiased;
 		-moz-osx-font-smoothing: grayscale;
-		text-align: center;
-		color: #2c3e50;
 	}
 </style>

src/projects/residence/main.js

@@ -4,7 +4,7 @@ import router from './router'
 import store from '$project/store'
 
 //引入mui
-import mui from '$project/assets/js/mui.min.js'
+import mui from '$project/assets/js/mui.js'
 import '$project/assets/css/mui.min.css'
 import Vconsole from 'vconsole'