Merge branch 'master' into yb9.1

src/components/QuestionComment.vue

@@ -8,6 +8,8 @@ const props = defineProps({
     item: Object
 })
 
+const emit = defineEmits(['open_nick_dia'])
+
 
 const dataInfo = ref({...props.item,commentInfo: {}});
 
@@ -84,28 +86,7 @@ const checkNickHandle = async() => {
     const { data,code } = await $api.apiCheckNick();
     
     if(code !== 200) return
-    
-    const htmlStr=`检测到您还未设置头像和昵称，您的留言将发布为匿名，是否立即去设置？`
-    !data && ElMessageBox({
-        title:`温馨提醒`,
-        message:htmlStr,
-        center: true,
-        dangerouslyUseHTMLString: true,
-        confirmButtonText:'去设置',
-        confirmButtonClass:'self-elmessage-confirm-btn',
-        showCancelButton:true,
-        cancelButtonText:'暂时不用',
-        cancelButtonClass:'self-elmessage-cancel-btn'
-    }).then(()=>{
-        router.push('/user/setinfo')
-    }).catch(()=>{
-        setCancelNickHandle();
-    })
-}
-/* 不在提醒弹窗 */
-const setCancelNickHandle = async() => {
-    await $api.apiCanelNickTip()
-
+    !data && emit('open_nick_dia')
 }
 /* 发布留言*/
 const publishMessageHandle = async() => {
@@ -156,7 +137,7 @@ const delCommentHandle = ({community_question_comment_id},index) => {
         <view class="commetn-item-wrap" @click="setLikeHandle(2)">
             <img src="@/assets/question/tease_act.png" alt="" v-if="dataInfo.op_type===2" class="icon">
             <img src="@/assets/question/tease.png" alt="" v-else class="icon">
-            <text v-if="dataInfo.tease_total">{{dataInfo.tease_total}}</text>
+            <text style="min-width:50px;">{{dataInfo.tease_total || ''}}</text>
         </view>
         <view class="commetn-item-wrap" >
             <span 
@@ -170,7 +151,7 @@ const delCommentHandle = ({community_question_comment_id},index) => {
         <view class="commetn-item-wrap" @click="setLikeHandle(1)">
             <img src="@/assets/question/like_act.png" alt="" v-if="dataInfo.op_type===1" class="icon">
             <img src="@/assets/question/like.png" alt="" v-else class="icon">
-            <text v-if="dataInfo.like_total">{{dataInfo.like_total}}</text>
+            <text style="min-width:50px;">{{dataInfo.like_total || ''}}</text>
         </view>
     </div>
 

src/views/question/List.vue

@@ -2,7 +2,8 @@
 import{
   apiCountAudioClick,
   apiQuestionList,
-  apipubAsk
+  apipubAsk,
+  apiCanelNickTip
 }from '@/api/question'
 import {apiGetTagTree} from "@/api/common"
 import { apiApplyPermission } from '@/api/user'
@@ -278,6 +279,23 @@ const handlePlay=(item)=>{
 }
 
 
+
+/* 设置昵称弹窗 */
+const showNicklog = ref(false);
+const openNickDialog = () => {
+  showNicklog.value = true;
+}
+/* 跳转我的设置 */
+const goSettingHandle = () => {
+  showNicklog.value = false;
+  router.push('/user/setinfo')
+}
+/* 不在提醒弹窗 */
+const setCancelNickHandle = async() => {
+  showNicklog.value = false;
+  await apiCanelNickTip()
+}
+
 </script>
 
 <template>
@@ -365,7 +383,7 @@ const handlePlay=(item)=>{
               <div class="audio-time">{{moment(item.audio_status.audioTime).format('mm:ss')}}</div>
             </div>
             <!-- 点赞/评论 -->
-            <QuestionComment :item="item"/>
+            <QuestionComment :item="item" @open_nick_dia="openNickDialog"/>
           </div>
         </div>
         </SelfList>
@@ -396,6 +414,19 @@ const handlePlay=(item)=>{
         </el-dialog>
     </div>
   </template>
+  
+  <div class="nick-dialog-mask" v-if="showNicklog">
+    <div class="nick-dialog">
+      <div class="header">
+        温馨提示
+      </div>
+      <div class="content">检测到您还未设置头像和昵称，您的留言将发布为匿名，是否立即去设置？</div>
+      <div class="bottom">
+        <span class="cancel self-elmessage-cancel-btn" @click="setCancelNickHandle">暂时不用</span>
+        <span class="confirm self-elmessage-confirm-btn" @click="goSettingHandle">去设置</span>
+      </div>
+    </div>
+  </div>
 </template>
 
 
@@ -698,5 +729,50 @@ const handlePlay=(item)=>{
   font-size: 18px;
 }
 
+.nick-dialog-mask {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 16px;
+  overflow: hidden;
+  background: rgba(0, 0, 0, 0.3);
+  z-index: 99999;
+  .nick-dialog {
+    background: #fff;
+    border-radius: 4px;
+    width: 420px;
+    padding: 20px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%,-50%);
+    text-align: center;
+    .header {
+      text-align: center;
+      font-size: 18px;
+      margin-bottom: 20px;
+    }
+    .bottom {
+      margin-top: 20px;
+      display: flex;
+      justify-content: center;
+      .cancel {
+        margin-right: 20px;
+      }
+      .cancel,.confirm {
+        width: 100px;
+        height: 40px;
+        line-height: 40px;
+        border-radius: 4px;
+        text-align: center;
+        cursor: pointer;
+        border: 1px solid #F3A52F;
+      }
+    }
+  }
+}
+
 </style>