Merge remote-tracking branch 'origin/dev' into dev

src/project/saas/AppResidentDocument/DetailCard.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="DetailCard" v-if="pageShow">
+    <div class="top"></div>
     <div class="middle">
       <div class="hint">家庭地址</div>
       <div class="areaHint">
@@ -51,17 +52,18 @@
   export default {
     name: 'DetailCard',
 
+    appName: '居民信息',
+
     data() {
       return {
         id: '',
         data: [],
-        pageShow: false,
         resident: {},
+        pageShow: false
       }
     },
 
-    onLoad(o) {
+    onLoad (o) {
-      document.title = '居民信息'
       this.id = o.id
       this.$dict.load('householdRelation', 'fileStatus').then(() => {
         this.getDetail()
@@ -69,7 +71,7 @@
     },
 
     methods: {
-      getDetail() {
+      getDetail () {
         this.$loading()
         this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
           if (res.code == 0) {
@@ -85,8 +87,10 @@
         })
       },
 
-      toDetailPeople(item) {
+      toDetailPeople (item) {
-        uni.navigateTo({ url: `./DetailPeople?id=${item.id}` })
+        uni.navigateTo({
+          url: `./DetailPeople?id=${item.id}`
+        })
       }
     }
   }
@@ -94,9 +98,19 @@
 
 <style scoped lang="scss">
 .DetailCard {
+  height: 100%;
+  .top {
+    height: 112px;
+    background: #3975c6;
+  }
+
   .middle {
-    padding: 48px 32px 32px;
+    margin: -80px 32px 0 32px;
+    padding: 38px 30px 78px 28px;
     background: #ffffff;
+    box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.02);
+    border-radius: 16px;
+    z-index: 999;
     .hint {
       font-size: 32px;
       font-weight: 500;