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

src/mods/AppIntegralApply/AppIntegralApply.vue

@@ -267,10 +267,10 @@ export default {
     bottom: 0;
     width: 100%;
     box-sizing: border-box;
-    background: #4181ff;
-    padding: 20px 0;
+    background: #1365dd;
+    height: 88px;
+    line-height: 88px;
     text-align: center;
-    border-radius: 16px;
     font-size: 34px;
     font-weight: 500;
     color: #ffffff;

src/mods/AppIntegralApply/add.vue

@@ -318,9 +318,9 @@ export default {
     width: 100%;
     box-sizing: border-box;
     background: #1365dd;
-    padding: 20px 0;
+    height: 88px;
+    line-height: 88px;
     text-align: center;
-    border-radius: 16px;
     font-size: 34px;
     font-weight: 500;
     color: #ffffff;

src/mods/AppIntegralApply/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="page">
+  <div class="page" v-if="showPage">
     <div class="top">
       <div class="img-title">填报信息</div>
 
@@ -100,6 +100,7 @@ export default {
     return {
       id: '',
       detail: {},
+      showPage: false,
     }
   },
   onLoad(option) {
@@ -118,6 +119,7 @@ export default {
       this.$instance.post(`/app/appvillagerintegraldeclare/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
           this.detail = res.data
+          this.showPage = true
         }
       })
     },

src/mods/AppServiceOnlineNew/form.vue

@@ -1177,6 +1177,9 @@ export default {
       line-height: 70px;
       padding-right: 20px;
       box-sizing: border-box;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
 
     .form-item__choose {