Merge branch 'master' of https://gitee.com/gzcnki/exhibition_page

src/views/boutique/components/jyycc/index.vue

@@ -158,8 +158,10 @@
                 <div
                   class="desc wow animate__animated animate__fadeInUp"
                   data-wow-delay="0.5s"
+                  :title="item.txt"
                 >
                   <p>{{ item.txt }}</p>
+                  <span v-if="item.txt.length > 144">...</span>
                 </div>
               </div>
               <div class="pic wow animate__animated animate__fadeInRight">
@@ -516,7 +518,7 @@ export default {
       }
       .detail {
         width: 100%;
-        background-image: url('@/assets/imgs/topic/jyycc/part1-bg.png');
+        background-image: url("@/assets/imgs/topic/jyycc/part1-bg.png");
         background-repeat: repeat;
         background-size: cover;
         > div.txt {
@@ -582,18 +584,19 @@ export default {
               position: absolute;
               top: 0;
               height: 450px;
-              max-width: 720px;
               text-align: left;
               font-size: 36px;
               line-height: 60px;
               font-family: "宋体";
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-box-orient: vertical;
-              -webkit-line-clamp: 12;
+              z-index: 1;
               > p {
                 margin: 0;
+                max-width: 720px;
+                overflow: hidden;
+              }
+              > span {
+                margin-right: -22px;
+                display: block;
               }
             }
           }

vue.config.js

@@ -62,7 +62,7 @@ module.exports = defineConfig({
         // target:'http://192.168.1.230:9563/files',//测试内网
         // target: 'http://222.85.214.245:9604/files',//测试外网
         // target: 'http://114.115.157.218:9602/files',//生产
-        target:'http://www.gzswbsy.com/files',
+        target:'https://www.gzswbsy.com/files',
         changeOrigin: true,
         pathRewrite: {
           '^/files': ''