身份显示

config/project.js

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

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

@@ -11,7 +11,7 @@
 					</div>
 					<div class="mui-media-body">
 						<h3 v-text="person_data?person_data.name:''"></h3>
-						<p class='mui-ellipsis' v-text="person_popedom?person_popedom.personRoleName:''"></p>
+						<p class='mui-ellipsis' v-text="person_popedom?(person_popedom.job?person_popedom.job:person_popedom.personRoleName):''"></p>
 					</div>
 					<a class="mui-pull-right" @click="selectRole">切换身份<span class="mui-icon iconfont icon-jiaohuan"></span></a>
 				</div>

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

@@ -77,7 +77,7 @@
 			//微信扫二维码
 			scanCode() {
 				WxJsApi.scanQRCode(1).then(res => {
-					this.subForm.deviceNo = res.resultStr;
+					this.subForm.deviceNo = res;
 				}).catch(error => {
 					mui.toast(error);
 				})

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

@@ -11,7 +11,7 @@
 					</div>
 					<div class="mui-media-body">
 						<h3 v-text="person_data?person_data.name:''"></h3>
-						<p class='mui-ellipsis' v-text="person_popedom?person_popedom.personRoleName:''"></p>
+						<p class='mui-ellipsis' v-text="person_popedom?(person_popedom.job?person_popedom.job:person_popedom.personRoleName):''"></p>
 					</div>
 					<a class="mui-pull-right" @click="selectRole">切换身份<span class="mui-icon iconfont icon-jiaohuan"></span></a>
 				</div>
@@ -308,4 +308,4 @@
 	.red-after:after {
 		background: red;
 	}
-</style>
+</style>