From d7531ae8da977f8574b7838ab652167622234cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 24 Dec 2021 20:15:14 +0800
Subject: [PATCH] css

---
 src/apps/AppMarryAndDie/Add.vue            | 23 ++++++----------------
 src/apps/AppMarryAndDie/AllActiveList.vue  |  4 ++--
 src/apps/AppMarryAndDie/AppMarryAndDie.vue |  4 ++--
 src/apps/AppMarryAndDie/CadreList.vue      |  4 ++--
 src/apps/AppMarryAndDie/FuneralList.vue    |  4 ++--
 src/apps/AppMarryAndDie/MarryList.vue      |  4 ++--
 6 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/apps/AppMarryAndDie/Add.vue b/src/apps/AppMarryAndDie/Add.vue
index bb7b1fd4..78ecd89f 100644
--- a/src/apps/AppMarryAndDie/Add.vue
+++ b/src/apps/AppMarryAndDie/Add.vue
@@ -26,13 +26,13 @@
 
         <div class="line"></div>
 
-        <u-form-item label="地址" prop="address" required :border-bottom="false" right-icon="arrow-right" class="addresss">
-          <AiAreaPicker v-model="forms.areaId" all :areaId="user.areaId" @select="areaSelect"></AiAreaPicker>
+        <u-form-item label="地址" prop="address" :border-bottom="false" right-icon="arrow-right" class="addresss">
+          <u-input v-model="forms.address" placeholder="请输入地址" />
         </u-form-item>
 
         <div class="line"></div>
 
-        <u-form-item label="活动详情" prop="content" required :border-bottom="false" label-position="top" class="contents">
+        <u-form-item label="活动详情" prop="content" :border-bottom="false" label-position="top" class="contents">
           <u-input v-model="forms.content" placeholder="请输入详细描述信息" type="textarea" auto-height height="100" maxlength="500" />
         </u-form-item>
 
@@ -67,7 +67,7 @@ export default {
 
         modeTypeValue: '',
         phone: '',
-        areaId: '',
+        address: '',
         content: '',
 
         personType: 1,
@@ -81,10 +81,9 @@ export default {
   computed: { ...mapState(['user']) },
   onLoad() {
     this.$dict.load('marriageType', 'modeType')
-    this.forms.areaId = this.user.areaId
   },
   onShow() {
-    document.title = "婚丧嫁娶"
+    document.title = '婚丧嫁娶'
   },
 
   mounted() {},
@@ -103,12 +102,6 @@ export default {
           if (!this.forms.phone) {
             return this.$u.toast('请输入联系电话')
           }
-          if (!this.forms.areaId) {
-            return this.$u.toast('请输入地址')
-          }
-          if (!this.forms.content) {
-            return this.$u.toast('请输入详细描述信息')
-          }
 
           const imgs = []
           if (this.forms.files) {
@@ -125,7 +118,7 @@ export default {
               modeType: this.forms.modeTypeValue,
               phone: this.forms.phone,
 
-              address: this.forms.areaId,
+              address: this.forms.address,
               content: this.forms.content,
               createUserId: this.user.id,
               personType: this.forms.personType,
@@ -158,10 +151,6 @@ export default {
         this.forms.modeTypeValue = e[0].value
       }
     },
-
-    areaSelect(e) {
-      this.forms.areaId = e.id
-    },
   },
 }
 </script>
diff --git a/src/apps/AppMarryAndDie/AllActiveList.vue b/src/apps/AppMarryAndDie/AllActiveList.vue
index 3c9422de..32ba9b20 100644
--- a/src/apps/AppMarryAndDie/AllActiveList.vue
+++ b/src/apps/AppMarryAndDie/AllActiveList.vue
@@ -34,12 +34,12 @@
             <span class="right" v-if="item.createTime">{{ item.createTime.substring(0, item.createTime.length - 3) }}</span>
           </div>
 
-          <div class="areaNames">
+          <div class="areaNames" v-if="item.address">
             <span>上报地点</span>
             <span class="right">{{ item.address }}</span>
           </div>
 
-          <div class="contents">
+          <div class="contents" v-if="item.content">
             <span>上报内容</span>
             <span class="right">{{ item.content }}</span>
           </div>
diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index a97171c1..a78f63a8 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -69,12 +69,12 @@
               <span class="right" v-if="item.createTime">{{ item.createTime.substring(0, item.createTime.length - 3) }}</span>
             </div>
 
-            <div class="areaNames">
+            <div class="areaNames" v-if="item.address">
               <span>上报地点</span>
               <span class="right">{{ item.address }}</span>
             </div>
 
-            <div class="contents">
+            <div class="contents" v-if="item.content">
               <span>上报内容</span>
               <span class="right">{{ item.content }}</span>
             </div>
diff --git a/src/apps/AppMarryAndDie/CadreList.vue b/src/apps/AppMarryAndDie/CadreList.vue
index cd25a060..9322a701 100644
--- a/src/apps/AppMarryAndDie/CadreList.vue
+++ b/src/apps/AppMarryAndDie/CadreList.vue
@@ -34,12 +34,12 @@
             <span class="right" v-if="item.createTime">{{ item.createTime.substring(0, item.createTime.length - 3) }}</span>
           </div>
 
-          <div class="areaNames">
+          <div class="areaNames" v-if="item.address">
             <span>上报地点</span>
             <span class="right">{{ item.address }}</span>
           </div>
 
-          <div class="contents">
+          <div class="contents" v-if="item.content">
             <span>上报内容</span>
             <span class="right">{{ item.content }}</span>
           </div>
diff --git a/src/apps/AppMarryAndDie/FuneralList.vue b/src/apps/AppMarryAndDie/FuneralList.vue
index 80adde35..c447db13 100644
--- a/src/apps/AppMarryAndDie/FuneralList.vue
+++ b/src/apps/AppMarryAndDie/FuneralList.vue
@@ -34,12 +34,12 @@
             <span class="right" v-if="item.createTime">{{ item.createTime.substring(0, item.createTime.length - 3) }}</span>
           </div>
 
-          <div class="areaNames">
+          <div class="areaNames" v-if="item.address">
             <span>上报地点</span>
             <span class="right">{{ item.address }}</span>
           </div>
 
-          <div class="contents">
+          <div class="contents" v-if="item.content">
             <span>上报内容</span>
             <span class="right">{{ item.content }}</span>
           </div>
diff --git a/src/apps/AppMarryAndDie/MarryList.vue b/src/apps/AppMarryAndDie/MarryList.vue
index a9bdc7ae..f7bb269f 100644
--- a/src/apps/AppMarryAndDie/MarryList.vue
+++ b/src/apps/AppMarryAndDie/MarryList.vue
@@ -34,12 +34,12 @@
             <span class="right" v-if="item.createTime">{{ item.createTime.substring(0, item.createTime.length - 3) }}</span>
           </div>
 
-          <div class="areaNames">
+          <div class="areaNames" v-if="item.address">
             <span>上报地点</span>
             <span class="right">{{ item.address }}</span>
           </div>
 
-          <div class="contents">
+          <div class="contents" v-if="item.content">
             <span>上报内容</span>
             <span class="right">{{ item.content }}</span>
           </div>