From b355aa642c20ab4ccb623fbabc628d182d233c52 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 24 Dec 2021 09:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCodeGeneration/app/visit/Visit.vue     | 39 +++++++++++++------
 .../AppCodeGeneration/components/List.vue     |  2 +-
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue b/packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue
index 93700f3b..9e583047 100644
--- a/packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue
+++ b/packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue
@@ -1,22 +1,23 @@
 <template>
-  <ai-card title="走访记录" class="visit">
+  <ai-card title="走访记录" class="visit" v-loading="loading">
     <el-button slot="right" icon="iconfont iconAdd" type="text" @click="isShow = true">添加走访记录</el-button>
     <template #content>
       <div class="visit-list">
-        <div class="visit-item" v-for="(item, index) in 10" :key="index">
+        <div class="visit-item" v-for="(item, index) in list" :key="index">
           <div class="visit-item__top">
             <div class="left">
-              <img src="https://p26-passport.byteacctimg.com/img/user-avatar/6401428bcd3b2b9bfed4f31cca07b798~300x300.image">
-              <h2>且听风吟</h2>
+              <div class="avatar">{{ item.name.substr(item.name.length - 2) }}</div>
+              <h2>{{ item.name }}</h2>
             </div>
-            <span>2020-07-05 12:02:33</span>
+            <span>{{ item.visitTime }}</span>
           </div>
-          <p>且听风吟且听风吟且听风吟且听风吟且听风吟且听风吟且听风吟且听风吟且听风吟且听风吟且听风吟且听风吟</p>
+          <p>{{ item.description }}</p>
           <div class="visit-imgs">
+            <ai-uploader v-model="item.images" :instance="instance" :limit="9" disabled></ai-uploader>
           </div>
           <div class="visit-status">
             <span>现实状态：</span>
-            <i>失联</i>
+            <i>{{ dict.getLabel('visitCondolenceReality', item.reality) }}</i>
           </div>
         </div>
       </div>
@@ -72,6 +73,7 @@
       return {
         appList: [],
         list: [],
+        loading: false,
         isShow: false,
         form: {
           visitTime: '',
@@ -87,24 +89,32 @@
     },
 
     mounted () {
-      this.dict.load('visitCondolenceReality', () => {
+      this.dict.load('visitCondolenceReality').then(() => {
         this.getList()
       })
     },
 
     methods: {
       getList () {
-        this.instance.post(`/app/appvisitvondolence/list?id=${this.id}&size=10000`).then(res => {
+        this.loading = true
+        this.instance.post(`/app/appvisitvondolence/list?optionId=${this.id}&size=10000`).then(res => {
           if (res.code === 0) {
-            this.list = res.data.records
+            this.list = res.data.records.map(item => {
+              return {
+                ...item,
+                images: item.images ? JSON.parse(item.images) : []
+              }
+            })
           }
+
+          this.loading = false
         })
       },
 
       onConfirm () {
         this.$refs.form.validate((valid) => {
           if (valid) {
-            this.instance.post(`/app/appdiylargescreen/addOrUpdateDatasource`, {
+            this.instance.post(`/app/appvisitvondolence/addOrUpdate`, {
               ...this.form,
               optionId: this.id,
               images: JSON.stringify(this.form.images),
@@ -183,11 +193,16 @@
             display: flex;
             align-items: center;
 
-            img {
+            img, .avatar {
               width: 40px;
               height: 40px;
+              line-height: 40px;
+              text-align: center;
               margin-right: 10px;
               border-radius: 50%;
+              font-size: 14px;
+              color: #fff;
+              background: #26f;
             }
 
             h2 {
diff --git a/packages/2.0.5/AppCodeGeneration/components/List.vue b/packages/2.0.5/AppCodeGeneration/components/List.vue
index f162cc2a..854ee777 100644
--- a/packages/2.0.5/AppCodeGeneration/components/List.vue
+++ b/packages/2.0.5/AppCodeGeneration/components/List.vue
@@ -4,7 +4,7 @@
       <ai-title :title="configs.applicationName" isShowBottomBorder></ai-title>
     </template>
     <template slot="content">
-      <ai-search-bar v-if="searchList.length">
+      <ai-search-bar v-if="searchList.length" bottomBorder style="margin-bottom: 12px;">
         <template #left>
           <div v-for="(item, index) in searchList" :key="index">
             <ai-select