调整样式

src/components/common/BookAllListModule.vue

@@ -17,7 +17,7 @@
           v-for="(item,index) in Bookinfo.BookList"
           :key="index+'todayNew'"
           :style="{
-              marginLeft:index==0||index%4==0?'0':'24px',
+              marginLeft:index==0||index%5==0?'0':'50px',
             }"
         >
           <BookPeruseCard
@@ -215,10 +215,15 @@ export default {
       }
     }
   }
-  .listlive,.peruselist{
+  .listlive{
     >div{
         width: 282px;
     }
   }
+  .peruselist{
+    >div{
+        // height: 200px;
+    }
+  }
 }
 </style>

src/components/common/BookListModule.vue

@@ -246,7 +246,7 @@ export default {
       overflow: hidden;
       background: #ffffff;
       &.item-jingdu{
-        width: 282px;
+        // width: 282px;
       }
       &:hover{
         box-shadow:  0px 0px 30px rgba(0,0,0,0.1);
@@ -258,12 +258,12 @@ export default {
     font-size: 0;
   }
   .baozhi-ding{
-    width: 450px;
+    width: 304px;
     height: 384px;
   }
   .baozhi-dings{
-    width: 282px;
-    height: 306px;
+    width: 304px;
+    height: 332px;
   }
 }
 </style>

src/components/common/BookPeruseCard.vue

@@ -213,7 +213,7 @@ export default {
   }
   .image {
     width: 100%;
-    height: 174px;
+    height: 200px;
   }
   .bottom {
     // height: 132px;

src/views/bookShelf/articleDetail.vue

@@ -1538,6 +1538,7 @@ export default {
                 font-size: 16px;
                 line-height: 24px;
                 color: #2F3742;
+                word-break: break-word;
             }
         }
         ul{
@@ -1572,6 +1573,7 @@ export default {
                 }
                 .title{
                     flex: 1;
+                    word-break: break-word;
                 }
                 .number,.title{
                     font-weight: 400;

src/views/bookShelf/bookItem.vue

@@ -117,13 +117,14 @@
                     <template v-else>
                         <a class="el-button" @click="handleChangeWay('wei')" :loading="createOrderLoading">立即购买</a>
                         <a class="upgrade" @click="handleChangeWay('dui')">使用兑换码</a>
+                        <a class="upgrade" v-if="bookType==='baozhi'||bookType==='huakan'" @click="linkSubscribe">多期订阅</a>
                     </template> 
                 </div>
             </div>
         </div>
     </div>
     <div class="main-center" v-if="info">
-        <el-tabs type="card" style="margin-bottom:24px;">
+        <el-tabs type="card" style="margin-bottom:24px;" v-if="info.intro||info.iss_note">
             <el-tab-pane label="简介">
                 <div v-html="info.intro||info.iss_note"></div>
             </el-tab-pane>
@@ -791,6 +792,18 @@ export default {
                 },
             });
         }
+    },
+    // 多期订阅
+    linkSubscribe(){
+        this.$router.push({
+          path: "/subscribe",
+          query: {
+            name: encodeURIComponent('报纸'),
+            type: this.bookType,
+            studyType: this.info.study_phase,
+            studyTypeName: encodeURIComponent(this.info.study_phase_name)
+          }
+        })
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -1056,7 +1069,7 @@ export default {
 }
 .sales-box{
     display: flex;
-    width: 592px;
+    // width: 592px;
     padding: 16px;
     border-radius: 4px;
     background: #F5F5F5;

src/views/bookShelf/bookPeruseItem.vue

@@ -31,7 +31,7 @@
                     <el-image
                         class="image"
                         :src="info.cover_img?info.cover_img:bookType==='baozhi'?require('../../assets/baozhi'+(Math.floor(Math.random()*2)+1)+'.png'):require('../../assets/kecheng'+(Math.floor(Math.random()*3)+1)+'.png')"
-                        :fit="'cover'">
+                        :fit="'contain'">
                     </el-image>
                 <!-- </el-carousel-item> -->
             </el-carousel>
@@ -77,13 +77,14 @@
                     <template v-else>
                         <a class="el-button" @click="handleChangeWay('wei')" :loading="createOrderLoading">立即购买</a>
                         <a class="upgrade" @click="handleChangeWay('dui')">使用兑换码</a>
+                        <a class="upgrade" @click="linkSubscribe">多期订阅</a>
                     </template> 
                 </div>
             </div>
         </div>
     </div>
     <div class="main-center" v-if="info">
-        <el-tabs type="card" style="margin-bottom:24px;">
+        <el-tabs type="card" style="margin-bottom:24px;" v-if="info.introduction">
             <el-tab-pane label="简介">
                 <div v-html="info.introduction"></div>
             </el-tab-pane>
@@ -299,6 +300,18 @@ export default {
                 peruseId: this.id
             },
         });
+    },
+    // 多期订阅
+    linkSubscribe(){
+        this.$router.push({
+          path: "/subscribe",
+          query: {
+            name: encodeURIComponent('精读'),
+            type: 'jingdu',
+            studyType: this.info.study_phase,
+            studyTypeName: encodeURIComponent(this.info.study_phase_name)
+          }
+        })
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -354,7 +367,7 @@ export default {
             height: 440px;
             text-align: center;
             .el-image{
-                width: 297px;
+                width: 414px;
                 height: 414px;
                 border: 1px solid #F3F3F3;
             }
@@ -564,7 +577,7 @@ export default {
 }
 .sales-box{
     display: flex;
-    width: 592px;
+    // width: 592px;
     padding: 16px;
     border-radius: 4px;
     background: #F5F5F5;

src/views/bookShelf/index.vue

@@ -582,9 +582,9 @@ export default {
             background: #ffffff;
             margin: 0 25px 24px 25px;
             &.book-item-peruse{
-                width: 282px;
-                height: 270px;
-                margin-top: 82px;
+                width: 200px;
+                height: 298px;
+                margin-top: 54px;
             }
         }
         .tips{

src/views/bookStore/Subscribe.vue

@@ -251,8 +251,8 @@ export default {
         sales: null,
         salesCn: '',
         isBuy: 'false',
-        studyType: 11,
-        studyTypeName: '小学版',
+        studyType: this.$route.query.studyType?this.$route.query.studyType:11,
+        studyTypeName: this.$route.query.studyTypeName?decodeURIComponent(this.$route.query.studyTypeName):'小学版',
         orderTotalNumber: 5,
         orderList:[
             {

src/views/bookStore/all.vue

@@ -369,8 +369,8 @@ export default {
             MethodName = "/ShopServer/Client/ShopHomeQuery/PageQueryIssueList"
             data.year_label = this.baozhiForm.yearValue
             data.study_phase = this.baozhiForm.studyValue
-            data.comb_flag = this.baozhiForm.typeValue==1?null:this.baozhiForm.typeValue
-            data.album_flag = this.baozhiForm.typeValue==0?null:this.baozhiForm.typeValue
+            data.comb_flag = -1
+            data.album_flag = this.baozhiForm.typeValue
             data.goods_type = 2
             getLogin(MethodName, data)
             .then((res) => {
@@ -395,8 +395,8 @@ export default {
             MethodName = "/ShopServer/Client/ShopHomeQuery/PageQueryIssueList"
             data.year_label = this.huakanForm.yearValue
             data.study_phase = -1
-            data.comb_flag = this.huakanForm.typeValue==1?null:this.huakanForm.typeValue
-            data.album_flag = this.huakanForm.typeValue==0?null:this.huakanForm.typeValue
+            data.comb_flag = -1
+            data.album_flag = this.huakanForm.typeValue
             data.goods_type = 4
             getLogin(MethodName, data)
             .then((res) => {

src/views/bookStore/index.vue

@@ -7,8 +7,8 @@
       :LoginNavIndex="0"
     />
     <div class="banner">
-        <el-carousel height="320px" trigger="click" arrow="never">
-            <el-carousel-item v-for="item in 2" :key="item">
+        <el-carousel type="card" height="255px" trigger="click" arrow="never" indicator-position="none">
+            <el-carousel-item v-for="item in 1" :key="item">
                 <!-- 如果有跳转链接 则跳转 否则只展示 -->
                 <!-- <a v-if="item" href="#" target="_blank">
                     <el-image
@@ -24,6 +24,15 @@
                 </el-image>
             </el-carousel-item>
         </el-carousel>
+        <!-- <carousel class="service-advantage" type="card" height="320px" trigger="click" arrow="never" :interval="40000000">
+            <carousel-item v-for="item in 3" :key="item" cardwidth="1200px">
+                <el-image
+                    class="image"
+                    :src="require('../../assets/banner'+(1+item)+'.png')"
+                    :fit="'cover'">
+                </el-image>
+            </carousel-item>
+        </carousel> -->
         <!-- <img src="../../assets/banner1.png" /> -->
     </div>
     <div class="main">
@@ -80,7 +89,7 @@
         <a v-if="1==2" href="#" target="_blank">
             <img class="banner-item" src="../../assets/banner2.png" />
         </a>
-        <img v-else class="banner-item" src="../../assets/banner2.png" />
+        <img v-else class="banner-item" src="../../assets/banner4.png" />
         <div class="close-box">
             <a class="close-btn" @click="bannerFlag=false"><i class="el-icon-close"></i></a>
             <span class="close-tips">广告</span>
@@ -96,10 +105,12 @@
 import Header from "../../components/Header.vue";
 import BookListModule from "@/components/common/BookListModule.vue"
 import { getLogin } from "@/api/ajax";
+import carousel from '@/components/carousel/src/main';
+import carouselItem from '@/components/carousel/src/item';
 
 export default {
   //import引入的组件需要注入到对象中才能使用
-  components: { Header, BookListModule },
+  components: { Header, BookListModule, carousel, carouselItem },
   props: {},
   data() {
     //这里存放数据
@@ -175,7 +186,7 @@ export default {
             skeleton: true
         }
       ],
-      bannerFlag: true // 是否展示广告
+      bannerFlag: true, // 是否展示广告
     }
   },
   //计算属性 类似于data概念
@@ -247,7 +258,7 @@ export default {
     getPeruseList(){
         let MethodName = "/ShopServer/Client/ShopHomeQuery/QueryIreadArticleList";
         let data = {
-            top_n: 3
+            top_n: 4
         }
         getLogin(MethodName, data)
         .then((res) => {
@@ -261,7 +272,7 @@ export default {
         .catch(() => {
             
         }); 
-    }
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
@@ -272,7 +283,6 @@ export default {
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-
   },
   //生命周期-创建之前
   beforeCreated() { },
@@ -299,6 +309,7 @@ export default {
     width: 100%;
     padding-bottom: 40px;
     font-size: 0;
+    padding-top: 32px;
     img{
         max-width: 100%;
     }
@@ -346,4 +357,11 @@ export default {
     }
   }
 }
+</style>
+<style lang="scss">
+.el-carousel__item--card{
+    width: 80%;
+    // max-width: 1200px;
+    margin-left: -15%;
+}
 </style>

src/views/personalCenter/components/WordCard.vue

@@ -367,6 +367,8 @@ export default {
             if(this.phraseActiveIndex>0){
                 this.phraseActiveIndex--
                 this.data = this.wordList[this.phraseActiveIndex]
+                this.getInfo()
+                this.getQuerySentKwic()
             }else{
                 return
             }
@@ -374,6 +376,8 @@ export default {
             if(this.phraseActiveIndex<this.wordList.length-1){
                 this.phraseActiveIndex++
                 this.data = this.wordList[this.phraseActiveIndex]
+                this.getInfo()
+                this.getQuerySentKwic()
             }else{
                 return
             }