From 0c28670d2b8e65d0e2e89f9344f950cc793e682a Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 14 Oct 2022 17:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=A1=E6=A0=B8=E6=97=B6=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8B=92=E7=BB=9D=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E5=AE=A1=E6=A0=B8=E4=B8=8B=E4=B8=80=E9=97=A8?=
 =?UTF-8?q?=E8=AF=BE=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=8F=91=E7=8E=B0?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E9=A1=B9=E5=8F=98=E6=88=90=E6=8B=92?=
 =?UTF-8?q?=E7=BB=9D=E4=BA=86=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=9C=AA=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/authorImg.vue  | 13 +++++++------
 src/components/Portal/authorInfo.vue | 19 ++-----------------
 src/views/examine/NotApproved.vue    |  3 ++-
 src/views/homepage/Index.vue         | 20 ++++++++++----------
 src/views/portal/qa/Answer.vue       |  6 +++---
 5 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/components/Portal/authorImg.vue b/src/components/Portal/authorImg.vue
index 1d59e3ae..bfba83a8 100644
--- a/src/components/Portal/authorImg.vue
+++ b/src/components/Portal/authorImg.vue
@@ -48,11 +48,11 @@
     },
     mounted() {
       this.userName=this.name;
-      if(this.avatar && this.avatar!=''){
+      if(this.avatar){
         this.userAvatar=this.avatar;
-
       }
       this.usersex = this.sex;
+      console.log(this.userAvatar,"this.userAvatar newVal");
     },
     methods:{
       toHome() {
@@ -65,6 +65,7 @@
         this.userName=newVal;
       },
       avatar(newVal,oldVal){
+        console.log(newVal,"this.userAvatar newVal");
         if(newVal){
           if(newVal.startsWith('http')){
             this.userAvatar=newVal;
@@ -74,13 +75,13 @@
 
         }
       },
+      aid(newVal,oldVal){
+        this.aid=newVal
+      },
       sex(newVal,oldVal){
         this.usersex=newVal;
       },
-    },
-    computed:{
-		},
-
+    }
 	}
 </script>
 
diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index 9deef95e..376742f0 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -19,7 +19,7 @@
 	</div>
 </template>
 <script>
-import { userAvatarText } from "@/utils/tools.js";
+
 	export default {
 		props:{
 			avatar:{
@@ -101,22 +101,7 @@ import { userAvatarText } from "@/utils/tools.js";
       info(newVal,oldVal){
         this.userInfo=newVal;
       }
-    },
-    computed:{
-			avatarText(){
-				return userAvatarText(this.userName);
-			}
-		},
-    // computed:{
-    //   headImag(){
-    //     if(this.avatar || this.avatar==null || this.avatar==''){
-    //       return require("@/assets/images/user/default.png");
-    //     }else{
-    //       return this.baseUrl+this.avatar;
-    //     }
-    //   }
-    // }
-
+    }
 	}
 </script>
 
diff --git a/src/views/examine/NotApproved.vue b/src/views/examine/NotApproved.vue
index ec486a15..3874da1d 100644
--- a/src/views/examine/NotApproved.vue
+++ b/src/views/examine/NotApproved.vue
@@ -28,7 +28,7 @@
               <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
           </el-col>
         </el-row>
-     
+
     </div>
     <!-- <div style="padding-left">
 
@@ -526,6 +526,7 @@ export default {
       this.examin.examineId = row.id;
       this.examin.examineName = row.name;
       this.auditInfo.remark = '';
+      this.auditInfo.pass=true;//审核状态重置回true
       this.dialogVisible = true;
     },
     enSure() {
diff --git a/src/views/homepage/Index.vue b/src/views/homepage/Index.vue
index d67cf29d..53cbc5e3 100644
--- a/src/views/homepage/Index.vue
+++ b/src/views/homepage/Index.vue
@@ -31,9 +31,8 @@
                     <p class="ach-title">可能感兴趣</p>
                     <ul>
                         <li class="ava-info" v-for="ava in interestedList" :key="ava.aid">
-                            <!-- <img :src="baseUrl + ava.avatar" /> -->
-                            <author-img width="48px" height="48px" :avatar="ava.avatar" :aid="ava.aid" :sex="ava.sex"></author-img>
-                            <!-- <medal-img style="width:48px;height:48px" :item="ava"></medal-img> -->
+                           <!-- <img :src="baseUrl + ava.avatar" style="width: 48px;height: 480x;border-radius: 50%;"  /> -->
+                            <author v-if="ava.aid"  :avatar="ava.avatar" :aid="ava.aid" :sex="ava.sex"></author>
                             <div class="ava-text">
                                 <p style="color: #333333;">{{ava.name}}</p>
                                 <p style="color: #666666;">{{ava.sign}}</p>
@@ -54,11 +53,11 @@
     import apiUserhobby from '@/api/phase2/userhobby.js';
     import apiUser from "@/api/system/user.js";
     import apiFollow from "@/api/phase2/userfollow.js";
-    import authorImg from '@/components/Portal/authorImg.vue';
+    import author from '@/components/Portal/authorImg.vue';
     import { mapGetters } from 'vuex';
 
     export default{
-        components:{top,UcHeader,MedalImg,authorImg},
+        components:{top,UcHeader,MedalImg,author},
         data(){
             return{
                 baseUrl:process.env.VUE_APP_FILE_BASE_URL,
@@ -74,12 +73,13 @@
             }
         },
         created() {
-           if(!this.$route.query.id){
+          this.pageId = this.$route.query.id;
+          if(!this.$route.query.id){
              this.$router.push({path:'/404'})
-           }else{
+          }else{
              this.init();
-           }
-           this.pageId = this.$route.query.id;
+          }
+
         },
         mounted() {
 
@@ -106,7 +106,7 @@
                     apiUser.getByIds(noReapetIds).then(res => {
                     if (res.status == 200) {
                        this.interestedList = res.result;
-                       console.log(this.interestedList,'interestedList');
+                       //console.log(this.interestedList,'interestedList');
                     } else {
                     this.$message.error(res.message);
                     }
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index 6a824005..4790dc23 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -64,7 +64,7 @@
                   <div class="answer" v-for="(item, index) of answerList" :key="item.id" :style="index === answerList.length - 1 ? 'border-bottom:none;' : ''">
                     <div class="answer-top">
                       <div>
-                        <author :avatar="item.avatar" :name="item.sysCreateBy" :info="item.orgInfo" :sex="item.sex"></author>
+                        <author :aid="item.sysCreateAid" :avatar="item.avatar" :name="item.sysCreateBy" :info="item.orgInfo" :sex="item.sex"></author>
                         <div class="sign">{{item.sign}}</div>
                       </div>
                       <div>
@@ -123,7 +123,7 @@
                           :class="i === item.answers.length - 1 ? 'comment-last' : ''">
                           <div class="comment-top">
                             <div class="comment-author">
-                              <author :avatar="con.avatar" :name="con.sysCreateBy" :sex="con.sex"></author>
+                              <author :aid="con.sysCreateAid" :avatar="con.avatar" :name="con.sysCreateBy" :sex="con.sex"></author>
                               <span class="comment-author-text">回复</span>
                               <span style="margin-left: 10px; font-size:14px">{{ con.replayName }}</span>
                             </div>
@@ -166,7 +166,7 @@
                                 :class="rowIdx === con.answers.length - 1 ? 'comment-last' : ''">
                                 <div class="comment-top">
                                   <div class="comment-author">
-                                    <author :avatar="row.avatar" :name="row.sysCreateBy" :sex="row.sex"></author>
+                                    <author :aid="row.sysCreateAid" :avatar="row.avatar" :name="row.sysCreateBy" :sex="row.sex"></author>
                                     <span class="comment-author-text">回复</span>
                                     <span style="margin-left: 10px; font-size:14px">{{ row.replayName }}</span>
                                   </div>