Merge branch 'dev_zxc_hsjcd_add' into dev

src/views/modules/visual/basicinfo/people.vue

@@ -70,22 +70,22 @@
 
               <div class="ren-prop z-4">
                 <img src="@/assets/img/shuju/people/ren-prop-4.png" />
-                <span>志愿者类别</span>
+                <span>住户类别</span>
 
                 <div class="ren-cnt">
-                  <h5>志愿者类别：</h5>
+                  <h5>住户类别：</h5>
                   <p>
                     {{
-                      info.volunteerCategory.length == 0
+                      info.isTenant == null || info.isTenant == ''
                         ? "--"
-                        : info.volunteerCategory.join("、")
+                        : info.isTenant == '1' ? '租户' : '业主'
                     }}
                   </p>
                 </div>
               </div>
 
-              <div class="ren-prop z-5">
+              <div class="ren-prop z-6">
-                <img src="@/assets/img/shuju/people/ren-prop-5.png" />
+                <img src="@/assets/img/shuju/people/ren-prop-6.png" />
                 <span>房屋信息</span>
 
                 <div class="ren-cnt">
@@ -100,18 +100,16 @@
                 </div>
               </div>
 
-              <div class="ren-prop z-6">
+              <div class="ren-prop z-5">
-                <img src="@/assets/img/shuju/people/ren-prop-6.png" />
+                <img src="@/assets/img/shuju/people/ren-prop-5.png" />
-                <span>经济状况</span>
+                <span>联系电话</span>
 
                 <div class="ren-cnt">
-                  <h5>经济状况：</h5>
+                  <h5>联系电话：</h5>
                   <p>
-                    月薪:
+                    联系电话:
                     {{
-                      info.financialSituation.monthlyIncome || "--"
+                      info.mobile || "--"
-                    }}，退休金：{{
-                      info.financialSituation.retirementAmount || "--"
                     }}
                   </p>
                 </div>