Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master

src/views/unified/tapSwitch/mechanism.vue

@@ -302,7 +302,7 @@ export default {
         areaCode: data,
       }).then((res) => {
         console.log(res, "获取地区下面社会机构统计列表");
-        if (JSON.stringify(res.data)=='{}') {
+        if (res.data.length == 0) {
           this.b = true;
           return;
         }

src/views/unified/tapSwitch/subsidies.vue

@@ -35,14 +35,14 @@
                     <div class="num">
                       {{ poorDisabledNum.difficultTotalNum }}
                     </div>
-                    <div class="text">元</div>
+                    <div class="text">万</div>
                   </div>
                   <div class="rural">贫困残疾救助</div>
                 </div>
                 <div>
                   <div class="flex">
                     <div class="nums">{{ poorDisabledNum.severeTotalNum }}</div>
-                    <div class="texts">元</div>
+                    <div class="texts">万</div>
                   </div>
                   <div class="city">重度残疾救助</div>
                 </div>