From a479cb17b9b05bbc52f60a0e86ea94d819318d55 Mon Sep 17 00:00:00 2001
From: Zhang HaoYang <1304907854@qq.com>
Date: Thu, 28 Dec 2023 02:11:23 +0800
Subject: [PATCH] update

---
 src/components/detail/NavDetail.vue           | 77 +++++++++++++------
 .../setting/website/websiteManage.vue         |  6 +-
 2 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/src/components/detail/NavDetail.vue b/src/components/detail/NavDetail.vue
index 4c8329a..5e3a9c8 100644
--- a/src/components/detail/NavDetail.vue
+++ b/src/components/detail/NavDetail.vue
@@ -51,8 +51,7 @@
             <span style="font-size:30px;font-family: STHupo">{{ UrlObj.name }}</span><br/>
             <div class="NavInfo">
               <span style="width:200px">创建时间：{{ Cdate }}</span><br/>
-              <span style="width:200px">创建用户：{{}}</span><br/>
-              <span style="width:200px">所属标签：｛小视频｝</span><br/>
+              <span style="width:200px">所属标签：{{BelongTo}}</span><br/>
               <div style="display: flex;flex-direction: row">
                 <div class="little-Circle" id="readNum" style=" margin-left:15px;">
                   <el-tooltip placement="top" width="150"
@@ -72,24 +71,31 @@
                     <div class="MyPopover" slot="content">
                       <span style="font-size:12px !important;">【{{UrlObj.name}}】总星级</span><br/><br/>
                       <div style="width:100% ;text-align: center;">
-                        <span style="font-size:20px">★★★☆☆</span>
+                        <span style="font-size:20px">
+                          <el-rate
+                              v-model="SumStar"
+                              disabled
+                              score-template="{value}"
+                              >
+                          </el-rate>
+                        </span>
                         <br/>
-                        <span>评分： 3.8分</span>
+                        <span>评分：{{SumStar}} 分</span>
                       </div>
                     </div>
                     <i class="el-icon-star-on" id="little-Circle-content" style=" padding:5.5px; "></i>
                   </el-tooltip>
                 </div>
-                <div class="little-Circle" id="Rank" style="margin-left:15px;" @click="WarnToAdmin()">
-                  <el-tooltip placement="top" width="150"
-                              trigger="hover"
-                              effect="dark" close-delay="2000">
-                    <div class="MyPopover" slot="content">
-                      <span style="font-size:12px !important;">向管理员反馈问题</span><br/><br/>
-                    </div>
-                    <i class="el-icon-warning" id="little-Circle-content" style=" padding:5px; "></i>
-                  </el-tooltip>
-                </div>
+<!--                <div class="little-Circle" id="Rank" style="margin-left:15px;" @click="WarnToAdmin()">-->
+<!--                  <el-tooltip placement="top" width="150"-->
+<!--                              trigger="hover"-->
+<!--                              effect="dark" close-delay="2000">-->
+<!--                    <div class="MyPopover" slot="content">-->
+<!--                      <span style="font-size:12px !important;">向管理员反馈问题</span><br/><br/>-->
+<!--                    </div>-->
+<!--                    <i class="el-icon-warning" id="little-Circle-content" style=" padding:5px; "></i>-->
+<!--                  </el-tooltip>-->
+<!--                </div>-->
               </div>
             </div>
           </div>
@@ -129,8 +135,10 @@
           </div>
         </div>
         <!--用户评论-->
-        <div v-show="update" id="用户评论" class="JustBack" style="width:670px;height:auto;display:flex; flex-direction: column; flex-wrap: nowrap;">
-        <div  class="JustBack" style="width:670px;height:auto;display:flex; flex-direction: column; flex-wrap: nowrap;">
+        <div v-show="update" id="用户评论" class="JustBack" style="width:670px;
+        height:auto;display:flex; flex-direction: column; flex-wrap: nowrap;">
+        <div   style="width:670px;height:auto;display:flex;
+         flex-direction: column; flex-wrap: nowrap;">
           <div style="width:670px;color: var(--theme-color)">
             <div class="HeadLine" style="margin-top:30px">
               <div class="HeadSquare"></div>
@@ -200,7 +208,8 @@
                                <el-button type="success" class="el-icon-chat-dot-square" size="medium" plain circle
                                           style="margin-top:6px;margin-left:70px" @click="addReply(item.id)">
                                </el-button>
-
+                               <el-rate v-model="item.rating" disabled  style="margin-top:10px"></el-rate>
+                               <span style="font-size:18px;font-family: STHupo;line-height:40px;margin-left:20px" >评价: &nbsp;</span>
                              </div>
                              <!--子评论-->
                              <div  v-for="(item2,index2) in rootId_AllComment[item.id]" :key="index2" >
@@ -242,7 +251,6 @@
                     </div>
                   </el-card>
                 </div>
-                <UserComment></UserComment>
               </el-card>
             </div>
           </div>
@@ -263,7 +271,7 @@
       <el-form ref="form" :rules="rules" class="login_container" :model="form"
                style="margin-top:-10px" status-icon  label-width="100px" >
         <el-form-item label="回复内容" prop="content">
-          <el-input v-model="form.content"  placeholder='回复内容'  clearable></el-input>
+          <el-input  type="textarea" style="width:200px" v-model="form.content"  placeholder='回复内容'  clearable></el-input>
         </el-form-item>
         <el-form-item label="用户id" prop="userId" style="display: none">
           <el-input v-model="form.userId" placeholder='用户id' clearable  ></el-input>
@@ -349,6 +357,10 @@ export default {
       openAddCategory:false,
     //   回复谁？
       rootid:'',
+    //   所属标签：
+      BelongTo:'',
+    //   总星级：
+      SumStar:'',
     //   表单：
       form:{
         urlId:'',
@@ -369,10 +381,12 @@ export default {
   mounted() {
     // this.GetAllComment();
     this.GetAllComment();
+    this.GetAllCate();
   },
   created() {
     this.UrlId = this.$route.query.uid;
     this.GetNav(this.UrlId);
+
     if(this.UrlId){
       this.ViewByTime(this.UrlId)
     }
@@ -505,7 +519,7 @@ export default {
                     type: 'success',
                     offset: 50
                   });
-                  this.reload();
+                  this.closeDialog();
                   this.form = {
                     urlId:'',
                     userId:'',
@@ -607,6 +621,22 @@ export default {
       }
     }
     ,
+    // 用户所有标签：
+    // /UrlAndCate/returnCateByUserId
+    GetAllCate(){
+      let _this = this;
+      axios.get('/api/UrlAndCate/returnCateByUserId', {
+        params: {
+          userId:_this.userId
+        }
+      }).then(function (res) {
+        Object.keys(res.data.data).forEach(key => {
+          if(res.data.data[key].id == _this.UrlObj.cateId){
+            _this.BelongTo = res.data.data[key].name;
+          }
+        })
+      })
+    },
     // 所有评论
     GetAllComment(){
       let _this = this;
@@ -619,14 +649,17 @@ export default {
         _this.form.userId = _this.userId;
         _this.form.urlId = _this.UrlId;
         _this.form.rootCommentId = 0;
-        //  算点赞数：
+        //  算星级：
         // 获取根评论
+        var sum = 0;
         Object.keys(res.data).forEach(key => {
+          sum = sum+ res.data[key].rating;
           _this.rootId_AllComment[res.data[key].id] = [];
           _this.func0(res.data[key],res.data[key].id);
         })
+        _this.SumStar = sum / _this.allcomment.length;
+        console.log(_this.SumStar);
       })
-
     },
     // 日访问：
     ViewByTime(id) {
diff --git a/src/components/setting/website/websiteManage.vue b/src/components/setting/website/websiteManage.vue
index 9ca231b..1e5ccc1 100644
--- a/src/components/setting/website/websiteManage.vue
+++ b/src/components/setting/website/websiteManage.vue
@@ -394,11 +394,11 @@ export default {
               name: this.form.name,
               weigh: this.form.weigh,
               icon:this.form.icon,
-              cate_id:this.form.cate_id,
+              cateId:this.form.cate_id,
               status: this.form.status,
               need_login: this.form.need_login,
-              is_need_agent:this.form.is_need_agent,
-              userId: this.form.userId,
+              isNeedAgent:this.form.is_need_agent,
+              url: this.form.url,
               desc: this.form.desc,
             }
           }).then(function (res) {