Merge branch 'master' of http://47.92.161.104:10080/wgl/jp-xpgj

config/project.js

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

src/projects/business/views/Master/Company/RegisterExamine.vue

@@ -216,23 +216,17 @@
 			doAction() {
 				this.subForm.ids = this.selectIdList.join(',');
 				if (this.checkForm()) {
-					var btnArray = ['否', '是'];
-					var _this = this;
-					mui.confirm('确认当操作？', '提示', btnArray, function(e) {
-						if (e.index == 1) {
-							_this.isLoading = true;
-							API_Company.doApply(_this.subForm).then(response => {
-								_this.isLoading = false;
+					this.isLoading = true;
+					API_Company.doApply(this.subForm).then(response => {
+						this.isLoading = false;
 
-								_this.openFromVisible = false;
-								_this.listForm.pageIndex = 1;
-								_this.getList();
-							}).catch(error => {
-								_this.isLoading = false;
-								mui.toast(error);
-							})
-						}
-					});
+						this.openFromVisible = false;
+						this.listForm.pageIndex = 1;
+						this.getList();
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
 				}
 			},
 			asynCallBack() {

src/projects/business/views/Master/Company/RegisterInfo.vue

@@ -155,22 +155,16 @@
 			doAction() {
 				this.subForm.ids = this.selectIdList.join(',');
 				if (this.checkForm()) {
-					var btnArray = ['否', '是'];
-					var _this = this;
-					mui.confirm('确认当操作？', '提示', btnArray, function(e) {
-						if (e.index == 1) {
-							_this.isLoading = true;
-							API_Company.doApply(_this.subForm).then(response => {
-								_this.isLoading = false;
+					this.isLoading = true;
+					API_Company.doApply(this.subForm).then(response => {
+						this.isLoading = false;
 
-								_this.openFromVisible = false;
-								_this.getDetail();
-							}).catch(error => {
-								_this.isLoading = false;
-								mui.toast(error);
-							})
-						}
-					});
+						this.openFromVisible = false;
+						this.getDetail();
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
 				}
 			},
 			asynCallBack() {

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

@@ -55,7 +55,7 @@
 						</router-link>
 					</div>
 					<div class="mui-col-xs-6">
-						<router-link :to="{name:'MasterMineEditInfo'}" class="vongi-floor-padded">
+						<router-link :to="{name:'MasterMineFeedback'}" class="vongi-floor-padded">
 							<div class="mui-media-body">
 								<h4 class="mui-ellipsis">问题反馈</h4>
 								<p class="mui-ellipsis">感谢您的发声</p>

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

@@ -15,7 +15,7 @@
 							</div>
 							<h2>{{wellcomme}}{{person_data.name}}</h2>
 						</div>
-						<h4 v-text="person_data.phone"><span>编号:000000</span></h4>
+						<h4>{{person_data.phone}}<span>编号:{{person_data.id}}</span></h4>
 					</div>
 					<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" @click="editInfo">
 						编辑资料

src/projects/home/views/User/Login.vue

@@ -74,6 +74,8 @@
 				sendMsgWz: '发送验证码',
 
 				isLoading: false,
+
+				project: this.$route.query.project,
 			}
 		},
 		created() {
@@ -155,14 +157,14 @@
 							this.set_token(response.token);
 							if (response.personInfo.faceImageUrl) {
 								//跳转到项目主页上去
-								window.location.href = '../' + this.$route.query.project + '/#/master';
+								window.location.href = '../' + this.project + '/#/master';
 							} else {
 								//上传头像					
 								this.$router.push({
 									name: 'UserUploadPhoto',
 									query: {
 										personId: this.personId,
-										project: this.$route.query.project
+										project: this.project
 									}
 								})
 							}
@@ -187,7 +189,8 @@
 						_this.$router.push({
 							name: 'RegisterHome',
 							query: {
-								telephone: _this.subForm.phone
+								telephone: _this.subForm.phone,
+								project: this.$route.query.project
 							}
 						})
 					}

src/projects/pension/views/Common/Device/List.vue

@@ -73,9 +73,10 @@
 					this.isLoading = false;
 
 					this.getWatchList();
-					this.$router.push({
+					mui.toast('切换成功');
+					/* this.$router.push({
 						name: 'Master'
-					})
+					}) */
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);

src/projects/pension/views/Master/Health/Archives.vue

@@ -8,7 +8,7 @@
 				<li class="mui-table-view-cell mui-col-xs-4">
 					<div class="vongi-color-block block-yellow">
 						<span class="vongi-color-unit">mmHg</span>
-						<div class="mui-h1" v-text="healthData.diastolic+'/'+healthData.systolic"></div>
+						<div class="mui-h1" v-text="tolic"></div>
 						<div class="mui-media-body">血压</div>
 					</div>
 				</li>
@@ -97,12 +97,19 @@
 				API_Health.getHeathData().then(response => {
 					this.isLoading = false;
 
-					this.healthData = response;
-					if (response.lbs) {
-						let lbsArr = response.lbs.split(',');
-						//获取定位地址
-						this.getPositionByLonLats(lbsArr[0], lbsArr[1]);
+					if (response) {
+						this.healthData = response;
+						if (response.lbs) {
+							let lbsArr = response.lbs.split(',');
+							//获取定位地址
+							this.getPositionByLonLats(lbsArr[0], lbsArr[1]);
+						}
+					} else {
+						mui.alert('请先绑定智能手表设备，并保持佩戴几分钟以便我们获取最新的监测数据。', '暂无数据', function() {
+
+						});
 					}
+
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
@@ -142,6 +149,20 @@
 
 		},
 		computed: {
+			tolic: {
+				// getter
+				get: function() {
+					if (healthData.diastolic) {
+						return healthData.diastolic + '/' + healthData.systolic;
+					} else {
+						return '';
+					}
+				},
+				// setter
+				set: function(newValue) {
+					console.log(newValue)
+				}
+			},
 			...mapGetters({
 				openId: 'wx_openid',
 				token: 'token',

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

@@ -102,8 +102,8 @@
 						<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-floor-padded">
 							<li class="mui-table-view-cell mui-media mui-col-xs-6">
 								<a  @click="toPay()" >
-									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
-									<div class="mui-media-body">老人防丢手环</div>
+									<div class="vongi-shop-img"><img src="http://oss.xiaoxinda.com/smart/person/2020/10/18172509063.png" width="100%" /></div>
+									<div class="mui-media-body">老人智能安全监控手表</div>
 									<div class="mui-media-body color-yellow">¥0.01</div>
 								</a>
 							</li>

src/projects/pension/views/Master/Mine/Center.vue

@@ -15,7 +15,7 @@
 							</div>
 							<h2>{{wellcomme}}{{person_data.name}}</h2>
 						</div>
-						<h4 v-text="person_data.phone"><span>编号:000000</span></h4>
+						<h4>{{person_data.phone}}<span>编号:{{person_data.id}}</span></h4>
 					</div>
 					<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" @click="editInfo">
 						编辑资料

src/projects/pension/views/Master/User/RelationPersonRegister.vue

@@ -146,9 +146,9 @@
 			},
 			asynCallBack() {
 				if (this.person_data) {
-					/* this.$router.push({
+					this.$router.push({
 						name: 'MasterUserRelationPerson'
-					}) */
+					})
 				}
 			},
 			...mapMutations({