From 927880e20a7ab548854b331ebc12dedbfb905d83 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Mon, 26 Feb 2024 10:58:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=AE=AD=E7=BB=83?=
 =?UTF-8?q?=E8=90=A5=E6=A8=A1=E5=9D=97=20=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/optimize.js                       |  16 ++++++--
 src/assets/optimize/images/3_88.png       | Bin 0 -> 4590 bytes
 src/views/insight/index.vue               |  12 +++---
 src/views/optimize/expertChat.vue         |  45 +++++++++++++++++++++-
 src/views/optimize/index.vue              |  24 ++++++------
 src/views/optimize/scss/index.scss        |   8 ++--
 src/views/optimize/scss/trainingcamp.scss |   8 +++-
 src/views/optimize/trainingcamp.vue       |  16 ++++++--
 8 files changed, 98 insertions(+), 31 deletions(-)
 create mode 100644 src/assets/optimize/images/3_88.png

diff --git a/src/api/optimize.js b/src/api/optimize.js
index e21f444..de4e773 100644
--- a/src/api/optimize.js
+++ b/src/api/optimize.js
@@ -4,7 +4,8 @@ export const APIOptimize = {
   getCampList, // 获取训练营列表
   getTrainingCampDetail, //获取训练营-详情-简介+内容
   getTrainingCampDetailComment, //获取训练营-详情-评论
-  comment //评论课程
+  comment, //评论课程
+  getBanner //轮播图
 };
 export default APIOptimize;
 
@@ -25,11 +26,11 @@ function getTrainingCampDetail(data) {
   });
 }
 // 获取训练营-详情-评论
-function getTrainingCampDetailComment(params) {
+function getTrainingCampDetailComment(data) {
   return request({
     url: `/api/HealthyCMS/GetTrainingCampDetailComment`,
     method: 'post',
-    data: params
+    params: data
   });
 }
 
@@ -41,3 +42,12 @@ function comment(params) {
     data: params
   });
 }
+// 轮播图
+
+function getBanner(data) {
+  return request({
+    url: `/api/HealthyCMS/GetBanner`,
+    method: 'post',
+    params: data
+  });
+}
diff --git a/src/assets/optimize/images/3_88.png b/src/assets/optimize/images/3_88.png
new file mode 100644
index 0000000000000000000000000000000000000000..4be0303844b436ab426f7c208ad3542070f86786
GIT binary patch
literal 4590
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
Y53rJds!yz~YybcN07*qoM6N<$f_Ylrng9R*

literal 0
HcmV?d00001

diff --git a/src/views/insight/index.vue b/src/views/insight/index.vue
index 8d9985d..ba58c39 100644
--- a/src/views/insight/index.vue
+++ b/src/views/insight/index.vue
@@ -284,17 +284,17 @@ export default {
     };
   },
   created() {
-    this.getAuth();
-
     this.emoName = this.psyList[this.emotionActive].name;
     this.initEchartText();
 
     /* this.getPsychologiclData('', '2023-11-21', '2023-12-21'); */
   },
-  mounted() {
-    this.initData();
-    this.getPsychologiclData();
-
+  async mounted() {
+    const isExistToken = await this.getAuth();
+    if (isExistToken) {
+      this.initData();
+      this.getPsychologiclData();
+    }
   },
   watch: {
     active(val) {
diff --git a/src/views/optimize/expertChat.vue b/src/views/optimize/expertChat.vue
index 95e6f63..84b7606 100644
--- a/src/views/optimize/expertChat.vue
+++ b/src/views/optimize/expertChat.vue
@@ -59,7 +59,7 @@
         <div class="send">
             <div class="left">
                 <van-cell-group>
-                    <van-field v-model="chat" placeholder="说点什么" />
+                    <van-field v-model="chat" placeholder="说点什么" maxlength="50" />
                 </van-cell-group>
             </div>
             <div class="right" @click="onSend">
@@ -71,6 +71,8 @@
 
 <script>
 import NavBar from '@/components/NavBar';
+import { isNull } from '@/services/utils-service';
+import APIOptimize from '@/api/optimize';
 export default {
     components: {
         NavBar,
@@ -217,6 +219,12 @@ export default {
             this.chat = item.name;
         },
         onSend() {
+            if (isNull(this.chat)) {
+                return this.$toast.fail({
+                    message: '评论不能为空'
+                })
+            }
+            this.onComment();
             /* let message = {
                 time: '2024-02-24',
                 text: this.chat,
@@ -226,6 +234,41 @@ export default {
             };
             this.chatList.push(message); */
             // TODO,调取接口
+        },
+        // 发送评论
+        onComment() {
+            this.$toast.loading();
+            let reqBody = {
+                lessonId: Number(this.$route.query.lessonId),
+                content: this.chat,
+                shortcutCode: ""
+            };
+            APIOptimize.comment(reqBody).then(res => {
+                console.log("评论详情", res);
+                const data = res.data;
+                if (data.stateCode === 1) {
+                    this.$toast.success({
+                        message: '评论成功'
+                    });
+                    setTimeout(() => {
+                        this.$router.push({
+                            name: 'trainingcamp',
+
+                        });
+                    })
+                } else {
+                    this.$dialog.confirm({
+                        message: `${data.message}`,
+                        showCancelButton: false
+                    })
+                }
+            }).catch((e) => {
+                this.$dialog.confirm({
+                    message: `${e.message}`
+                })
+            }).finally(() => {
+                /* this.$toast.clear() */
+            })
         }
     },
 }
diff --git a/src/views/optimize/index.vue b/src/views/optimize/index.vue
index d00acfd..b140f1f 100644
--- a/src/views/optimize/index.vue
+++ b/src/views/optimize/index.vue
@@ -4,9 +4,8 @@
     <!-- 专家介绍 -->
     <div class="expert-box">
       <van-swipe indicator-color="white">
-        <van-swipe-item v-for="(item, index) in expertImages" :key="index" @click="goExperts(item.id)">
-          <img v-lazy="item.image" />
-          <!-- <p>了解详情</p> -->
+        <van-swipe-item v-for="(item, index) in expertImages" :key="index">
+          <img v-lazy="item.cover" />
         </van-swipe-item>
       </van-swipe>
     </div>
@@ -128,7 +127,6 @@
 <script>
 import Vue from 'vue';
 import TabBar from '@/components/TabBar';
-import expertImage from '@/assets/optimize/images/3_08.png';
 import { Swipe, SwipeItem, Lazyload } from 'vant';
 import APIOptimize from '@/api/optimize';
 Vue.use(Lazyload);
@@ -145,14 +143,7 @@ export default {
   data() {
     return {
       expertImages: [
-        {
-          id: 1,
-          image: expertImage
-        },
-        {
-          id: 2,
-          image: expertImage
-        }
+
       ],
       campList: []
     };
@@ -160,6 +151,7 @@ export default {
   created() { },
   mounted() {
     this.$nextTick(() => {
+      this.getBanner();
       this.getCampList();
     })
   },
@@ -189,6 +181,14 @@ export default {
           id: item.id
         }
       });
+    },
+    getBanner() {
+      APIOptimize.getBanner().then(res => {
+        console.log("轮播图", res);
+        let data = res.data.data;
+        this.expertImages = data;
+        console.log("this.expertImages", this.expertImages);
+      })
     }
   }
 };
diff --git a/src/views/optimize/scss/index.scss b/src/views/optimize/scss/index.scss
index 73438b3..a6ef870 100644
--- a/src/views/optimize/scss/index.scss
+++ b/src/views/optimize/scss/index.scss
@@ -337,15 +337,15 @@
                         }
 
                         span {
-                            color: $com_light_green;
-                            font-size: 28px;
+                            color: #179B3B;
+                            font-size: 32px;
                             margin-left: 10px;
                         }
                     }
 
                     .price-strike {
-                        font-size: 54px;
-                        color: #179b3b;
+                        font-size: 58px;
+                        color: #98c530;
                         font-weight: bold;
                         position: relative;
 
diff --git a/src/views/optimize/scss/trainingcamp.scss b/src/views/optimize/scss/trainingcamp.scss
index 3fa2be0..9dc8189 100644
--- a/src/views/optimize/scss/trainingcamp.scss
+++ b/src/views/optimize/scss/trainingcamp.scss
@@ -62,10 +62,16 @@
 
                 .customer {
                     height: 100%;
-                    padding: 0 20px;
+                    padding-right: 20px;
                     @include center();
                     font-size: 28px;
                     color: #000;
+
+                    img {
+                        height: 78px;
+                        width: 53px;
+                        object-fit: contain;
+                    }
                 }
 
                 .price {
diff --git a/src/views/optimize/trainingcamp.vue b/src/views/optimize/trainingcamp.vue
index 6cd74a2..f2de29f 100644
--- a/src/views/optimize/trainingcamp.vue
+++ b/src/views/optimize/trainingcamp.vue
@@ -27,7 +27,7 @@
         </div>
         <div class="bottom">
           <div class="customer">
-            <p>客服</p>
+            <img :src="customerImg" />
           </div>
           <div class="price">
             <div class="left">
@@ -59,12 +59,12 @@
             <div class="top">
               <img src="@/assets/optimize/icons/3_55.png" alt="" />
               <div>
-                <p>{{ item.nickName }}</p>
+                <p>{{ item.nickName || '匿名' }}</p>
                 <span>{{ item.createdAt }} {{ item.address }}</span>
               </div>
             </div>
             <p>{{ item.content }}</p>
-            <span>{{ item.videoName }}</span>
+            <span>{{ item.title }}</span>
           </div>
         </div>
       </div>
@@ -95,6 +95,7 @@ export default {
     return {
       active: 'brief',
       campList: [],
+      customerImg: require('@/assets/optimize/images/3_88.png'),
       info: {
         videoList: [
           /* {
@@ -184,7 +185,14 @@ export default {
       })
     },
     getTrainingCampDetailComment() {
-
+      let reqParams = {
+        courseId: Number(this.$store.getters.campId)
+      };
+      APIOptimize.getTrainingCampDetailComment(reqParams).then(res => {
+        let data = res.data.data;
+        console.log("data", data);
+        this.info.evaluate = data;
+      })
     },
     // 返回
     onNavBack() {