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

src/apps/AppHelpDeclaration/add.vue

@@ -33,7 +33,7 @@
         <div class="left">
           <span>*</span><span>所在地区</span>
         </div>
-        <AiAreaPicker v-model="form.areaId" class="right__text" :fullName.sync="form.areaName" selectRoot>
+        <AiAreaPicker v-model="form.areaId" class="right__text" :fullName.sync="form.areaName" selectRoot="false">
           <span :class="form.areaName == '' ? 'color-999' : 'color-333' ">{{ form.areaName || "请选择" }}</span>
           <u-icon name="arrow-right" color="#ddd" style="display: inline-block;"/>
         </AiAreaPicker>
@@ -64,7 +64,7 @@
           <span style="margin-right: 8px"></span><span>上传佐证材料（最多9张）</span>
         </div>
         <div style="margin-top: 10px;">
-          <AiUploader v-model="form.files" :limit="9" multiple></AiUploader>
+          <AiUploader v-model="form.files" :limit="9" multiple action="/admin/file/add2"></AiUploader>
         </div>
       </div>
     </div>
@@ -92,7 +92,7 @@ export default {
         declareReason: [],
         reason: '',
         riskDescription: '',
-        files: []
+        files: [],
       },
       list: [],
       flag: false,

src/apps/AppHelpDeclaration/details.vue

@@ -67,16 +67,16 @@
             </div>
 
             <div class="cardss-right">
-              <div class="cardsss-right-left">
+              <div class="cardsss-right-top">
-                <div class="cardssss-right-left-top">
+                <div class="cardssss-right-left">
-                  <span>{{ item.description }}</span>
+                  <div :style="{color: item.status == 0? '#FF883C':item.status == 1? '#1AAAFF': item.status==2? '#FF4466': '#42D784'}" style="font-size: 16px;">
-                  <div :style="{color: item.status == 0? '#FF883C':item.status == 1? '#1AAAFF': item.status==2? '#FF4466': '#42D784'}" style="font-size: 16px; margin-top: 5px">
                     {{ $dict.getLabel('helpDeclarationStatus', item.status) }}
                   </div>
+                  <span>{{ item.doTime }}</span>
                 </div>
               </div>
 
-              <div class="cardees-right-right">{{ item.doTime }}</div>
+              <div class="cardees-right-bottom">{{ item.description }}</div>
             </div>
 
             <div class="lines"></div>
@@ -295,14 +295,10 @@ export default {
           }
           .cardss-right {
             width: calc(100% - 110px);
-            display: flex;
+            .cardsss-right-top {
-            justify-content: space-between;
+              .cardssss-right-left {
-            .cardsss-right-left {
+                display: flex;
-              .cardssss-right-left-top {
+                justify-content: space-between;
-                width: 300px;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                font-size: 32px;
               }
               .cardssss-right-left-bottom {
                 margin-top: 10px;
@@ -335,12 +331,12 @@ export default {
           margin-top: 10px;
           margin-left: 110px;
           img {
-            width: 136px;
+            width: 180px;
-            height: 136px;
+            height: 180px;
             border-radius: 4px;
-            margin-right: 12px;
+            margin-right: 10px;
           }
-          img:nth-child(4n) {
+          img:nth-child(3n) {
             margin-right: 0;
           }
         }

src/apps/AppHelpDeclaration/list.vue

@@ -30,9 +30,9 @@
           <div class="top">
             <div class="title">{{ item.riskDescription }}</div>
 
-            <div class="info"><span>申请人姓名</span><span>{{ item.createUserName }}</span></div>
+            <div class="info"><p>申请人姓名</p><p>{{ item.createUserName }}</p></div>
-            <div class="info"><span>所在地区</span><span>{{ item.areaName }}{{ item.address }}</span></div>
+            <div class="info"><p>所在地区</p><p>{{ item.areaName }}</p></div>
-            <div class="info"><span>风险类型</span><span>{{ item.reason }}</span></div>
+            <div class="info"><p>风险类型</p><p>{{ item.reason }}</p></div>
           </div>
           <div class="bottom">
             <span :style="{background: item.status == 0? '#FF883C':item.status == 1? '#1AAAFF': item.status==2? '#FF4466': '#42D784'}"></span>
@@ -237,13 +237,15 @@ export default {
           margin-bottom: 24px;
         }
         .info {
-          span:first-child {
+          p:first-child {
+            vertical-align: center;
             color: #999999;
             font-size: 26px;
             display: inline-block;
             width: 160px;
           }
-          span:last-child {
+          p:last-child {
+            vertical-align: bottom;
             display: inline-block;
             width: calc(100% - 160px);
             overflow:hidden;