列表修改细节

src/api/ajax.js

@@ -13,4 +13,11 @@ export function getLogin(MethodName, data) {
         method: 'post',
         data
     })
+}
+export function getNoToken(MethodName, data) {
+    return request({
+        url: `${MethodName}`,
+        method: 'post',
+        data
+    })
 }

src/components/common/BookAllListModule.vue

@@ -12,7 +12,7 @@
             <a class="lookmore" @click="lookmore"><span>查看全部</span><i class="el-icon-arrow-right"></i></a>
         </div> -->
       </div>
-      <div class="list">
+      <div class="list" v-if="Bookinfo.bookType!=='ZB'">
         <div
           v-for="(item,index) in Bookinfo.BookList"
           :key="index+'todayNew'"
@@ -30,11 +30,7 @@
           />
         </div>
       </div>
-      <div class="nodata" v-if="Bookinfo.BookList.length===0">
-        <img src="../../assets/nodata.png" />
-        <p>找不到文件</p>
-      </div>
-      <!-- <div class="listlive">
+      <div class="listlive" v-else>
         <div
           v-for="(item,index) in Bookinfo.BookList"
           :key="index+'todayNew'"
@@ -51,7 +47,11 @@
             :previousPage="Bookinfo.name"
           />
         </div>
-      </div> -->
+      </div>
+      <div class="nodata" v-if="Bookinfo.BookList.length===0">
+        <img src="../../assets/nodata.png" />
+        <p>找不到文件</p>
+      </div>
     </div>
   </div>
 </template>

src/components/common/BookCard.vue

@@ -35,7 +35,7 @@
                 >
                 </el-rate>
             </template> -->
-            <p class="author">{{item.shelve_date||item.typeName||item.classperiod||item.author}}</p>
+            <p class="author">{{item.shelve_date||item.typeName||item.classperiod||item.author||'暂无'}}</p>
             <template v-if="!type||type!='bookShelf'">
                 <p class="price">
                 <span class="OPPOSans">￥{{item.price_discount|cutMoneyFiter}}</span>

src/components/common/BookLiveCard.vue

@@ -1,34 +1,40 @@
 <template>
-  <div class="BookCard">
-    <el-image
-        class="image"
-        :src="item.src"
-        :fit="'cover'">
-    </el-image>
-    <div class="bottom">
-      <p class="name">{{item.name}}</p>
-      <!-- <template>
-        <el-rate
-          v-model="item.score"
-          disabled
-          show-score
-          :colors="colors"
-          :score-template="score"
-        >
-        </el-rate>
-      </template> -->
-      <div class="live-box">
-        <img src="../../assets/icon-live.png" />
-        <p>直播{{item.time}}</p>
-      </div>
-      <template>
-        <p class="price">
-          <span class="OPPOSans">￥{{item.price|cutMoneyFiter}}</span>
-          <s>￥{{item.oldprice|cutMoneyFiter}}</s>
-        </p>
-      </template>
-    </div>
+  <div>
+    <el-skeleton style="width: 282px" :loading="true" animated v-if="item.skeleton">
+            <template slot="template">
+                <el-skeleton-item
+                    variant="image"
+                    style="width: 282px; height: 174px;"
+                />
+                <div style="padding: 8px 8px 16px 8px;width: 282px;">
+                    <el-skeleton-item variant="h3" style="width: 100%; height: 24px" />
+                    <el-skeleton-item variant="text" style="margin: 4px 0 12px 0; height: 20px; width:50%;" />
+                    <el-skeleton-item variant="text" style="height: 24px; width:70%;" />
+                </div>
+            </template>
+        </el-skeleton>
+        <div class="BookCard" v-else>
+            <el-image
+                class="image"
+                :src="item.cover_image_url?item.cover_image_url:item.course_type==='baozhi'?require('../../assets/baozhi'+(Math.floor(Math.random()*2)+1)+'.png'):require('../../assets/kecheng'+(Math.floor(Math.random()*3)+1)+'.png')"
+                :fit="'cover'">
+            </el-image>
+            <div class="bottom">
+            <p class="name">{{item.name}}</p>
+            <div class="live-box">
+                <img src="../../assets/icon-live.png" />
+                <p>直播{{item.shelve_date}}</p>
+            </div>
+            <template>
+                <p class="price">
+                <span class="OPPOSans">￥{{item.price_discount|cutMoneyFiter}}</span>
+                <s>￥{{item.price|cutMoneyFiter}}</s>
+                </p>
+            </template>
+            </div>
+        </div>
   </div>
+  
 </template>
 
 <script>
@@ -133,7 +139,7 @@ export default {
   }
   .bottom {
     // height: 132px;
-    padding: 12px;
+    padding: 8px 8px 16px 8px
   }
   p {
     margin: 0;
@@ -175,14 +181,14 @@ export default {
     align-items: flex-end;
     :nth-child(1) {
       font-weight: 700;
-      font-size: 14px;
-      line-height: 22px;
+      font-size: 16px;
+      line-height: 24px;
       color: #EC5E41;
     }
     :nth-child(2) {
       font-weight: 400;
-      font-size: 12px;
-      line-height: 20px;
+      font-size: 14px;
+      line-height: 22px;
       text-decoration-line: line-through;
       color: #929CA8;
       margin-left: 8px;

src/utils/request.js

@@ -72,7 +72,8 @@ service.interceptors.response.use(
                 duration: 0
             })
             if (process.env.NODE_ENV === 'development') {
-                router.push(`/login`)
+                // router.push(`/login`)
+                window.location.href = '/';
             } else {
                 window.location.href = '/';
             }

src/views/bookStore/all.vue

@@ -103,13 +103,24 @@
       <el-pagination
         background
         :current-page="currentPage"
-        :page-size="10"
-        :page-sizes="[1, 10, 20, 30, 40, 50]"
+        :page-size="page_capacity"
+        :page-sizes="[10, 20, 30, 40, 50]"
         :total="Bookinfo.number"
         layout="total, prev, pager, next, sizes, jumper"
-        @current-change="handleCurrentChange"
-        @size-change="handleSizeChange"
-        v-if="Bookinfo.number>0"
+        @size-change="(val)=>handleSizeChange(val,'page_capacity','currentPage')"
+        @current-change="(val)=>handleCurrentChange(val,'currentPage')"
+        v-if="Bookinfo.number>0&&Bookinfo.bookType!=='ZB'"
+      />
+      <el-pagination
+        background
+        :current-page="currentPages"
+        :page-size="page_capacitys"
+        :page-sizes="[8, 16, 24, 32, 40]"
+        :total="Bookinfo.number"
+        layout="total, prev, pager, next, sizes, jumper"
+        @size-change="(val)=>handleSizeChange(val,'page_capacitys','currentPages')"
+        @current-change="(val)=>handleCurrentChange(val,'currentPages')"
+        v-else-if="Bookinfo.number>0&&Bookinfo.bookType==='ZB'"
       />
     </div>
   </div>
@@ -165,6 +176,7 @@ export default {
         name: '',
         number: 0,
         numberstr: '',
+        bookType: null
       },
       nameTypeCn: this.$route.query.name?decodeURIComponent(this.$route.query.name):'画刊',
       itemType:this.$route.query.type?this.$route.query.type:'huakan',
@@ -203,7 +215,7 @@ export default {
       ],
       courseForm:{
         studyValue: window.localStorage.getItem("courseFormstudyValue")?window.localStorage.getItem("courseFormstudyValue")*1:-1,
-        categoryValue: window.localStorage.getItem("courseFormcategoryValue")?window.localStorage.getItem("courseFormcategoryValue"):'LB'
+        categoryValue: this.$route.query.type&&this.$route.query.type==='kecheng'?window.localStorage.getItem("courseFormcategoryValue")?window.localStorage.getItem("courseFormcategoryValue"):'LB':'LB'
       },
       baozhiForm:{
         yearValue: window.localStorage.getItem("baozhiFormyearValue")?window.localStorage.getItem("baozhiFormyearValue")*1:-1,
@@ -212,6 +224,8 @@ export default {
       },
       currentPage: 1, // 当前页码
       page_capacity: 10, // 每页条数
+      currentPages: 1,
+      page_capacitys: 8, // 每页条数
       searchValue: '',
       titleName:window.localStorage.getItem("baozhiFormstudyValueName")?window.localStorage.getItem("baozhiFormstudyValueName"):''
     }
@@ -238,13 +252,14 @@ export default {
         }
         this[form][file] = value
         this.currentPage = 1;
+        this.currentPages = 1
         this.handleData()
     },
     handleData(){
         let MethodName = "/ShopServer/Client/ShopHomeQuery/PageQueryCourseList"
         let data = {
-            page_capacity: this.page_capacity,
-            cur_page: this.currentPage,
+            page_capacity: this.courseForm.categoryValue==='ZB'?this.page_capacitys:this.page_capacity,
+            cur_page: this.courseForm.categoryValue==='ZB'?this.currentPages:this.currentPage,
             search_content: this.searchValue.trim(),
         }
         if(this.itemType==='kecheng'){
@@ -258,7 +273,8 @@ export default {
                         number: res.total_count,
                         numberstr: '共' + res.total_count + '期',
                         study: this.courseForm.studyValue,
-                        BookList: res.course_list
+                        BookList: res.course_list,
+                        bookType: this.courseForm.categoryValue
                     }
                 }
             })
@@ -278,7 +294,8 @@ export default {
                         number: res.total_count,
                         numberstr: '共' + res.total_count + '期',
                         study: this.baozhiForm.studyValue,
-                        BookList: res.issue_list
+                        BookList: res.issue_list,
+                        bookType: 'baozhi'
                     }
                 }
             })
@@ -287,19 +304,18 @@ export default {
             }); 
         }
     },
-    // 切换每页条数
-    handleSizeChange(val) {
-      this.currentPage = 1;
-      this.page_capacity = val;
-      this.handleData()
+    handleSizeChange(val,type,page) {
+        this[type] = val
+        this[page] = 1;
+        this.handleData()
     },
-    // 切换页码
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.handleData()
+    handleCurrentChange(val,type) {
+        this[type] = val
+        this.handleData()
     },
     changeStudy(form,value){
         this.currentPage = 1;
+        this.currentPages = 1
         this[form].studyValue = value
         this.handleData()
     },

src/views/personalCenter/components/Collect.vue

@@ -86,10 +86,10 @@
             @size-change="(val)=>handleSizeChange(val,'pageSize')"
             @current-change="(val)=>handleCurrentChange(val,'pageNumber')"
             :current-page="pageNumber"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10, 20, 30, 40, 50]"
             :page-size="pageSize"
             layout="total, prev, pager, next, sizes, jumper"
-            :total="wordList.length">
+            :total="total_count">
         </el-pagination>
     </template>
     <template v-if="tabsIndex===1">
@@ -119,10 +119,10 @@
             @size-change="(val)=>handleSizeChange(val,'pageSizeP')"
             @current-change="(val)=>handleCurrentChange(val,'pageNumberP')"
             :current-page="pageNumberP"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10, 20, 30, 40, 50]"
             :page-size="pageSizeP"
             layout="total, prev, pager, next, sizes, jumper"
-            :total="phraseList.length">
+            :total="total_count_p">
         </el-pagination>
     </template>
     <template v-if="tabsIndex===2">
@@ -146,10 +146,10 @@
             @size-change="(val)=>handleSizeChange(val,'pageSizeS')"
             @current-change="(val)=>handleCurrentChange(val,'pageNumberS')"
             :current-page="pageNumberS"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10, 20, 30, 40, 50]"
             :page-size="pageSizeS"
             layout="total, prev, pager, next, sizes, jumper"
-            :total="sentenceList.length">
+            :total="total_count_s">
         </el-pagination>
     </template>
     <template v-if="tabsIndex===3">
@@ -172,10 +172,10 @@
             @size-change="(val)=>handleSizeChange(val,'pageSizeA')"
             @current-change="(val)=>handleCurrentChange(val,'pageNumberA')"
             :current-page="pageNumberA"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10, 20, 30, 40, 50]"
             :page-size="pageSizeA"
             layout="total, prev, pager, next, sizes, jumper"
-            :total="articleList.length">
+            :total="total_count_a">
         </el-pagination>
     </template>
     <el-dialog
@@ -351,6 +351,10 @@ export default {
             }
         ],
         sortField: "scsj",
+        total_count: 0,
+        total_count_p: 0,
+        total_count_s: 0,
+        total_count_a: 0
     }
   },
   //计算属性 类似于data概念

src/views/personalCenter/components/ConversionCode.vue

@@ -45,10 +45,10 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="pageNumber"
-        :page-sizes="[10, 20, 30, 40]"
+        :page-sizes="[10, 20, 30, 40, 50]"
         :page-size="pageSize"
         layout="total, prev, pager, next, sizes, jumper"
-        :total="dataList.length">
+        :total="total_count">
     </el-pagination>
   </div>
 </template>
@@ -104,7 +104,8 @@ export default {
                     '2021 年高三版专辑','2022 年高三版专辑','2023 年高三版专辑'
                 ]
             },
-        ]
+        ],
+        total_count: 0
     }
   },
   //计算属性 类似于data概念

src/views/personalCenter/components/MyShare.vue

@@ -80,10 +80,10 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="pageNumber"
-        :page-sizes="[10, 20, 30, 40]"
+        :page-sizes="[10, 20, 30, 40, 50]"
         :page-size="pageSize"
         layout="total, prev, pager, next, sizes, jumper"
-        :total="data.length">
+        :total="total_count">
     </el-pagination>
   </div>
 </template>
@@ -126,7 +126,8 @@ export default {
             }
         ],
         searchInput:'',
-        searchSelect:''
+        searchSelect:'',
+        total_count: 0
     }
   },
   //计算属性 类似于data概念

src/views/personalCenter/components/OrderList.vue

@@ -109,10 +109,10 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="pageNumber"
-        :page-sizes="[10, 20, 30, 40]"
+        :page-sizes="[10, 20, 30, 40, 50]"
         :page-size="pageSize"
         layout="total, prev, pager, next, sizes, jumper"
-        :total="orderList.length">
+        :total="total_count">
     </el-pagination>
   </div>
 </template>
@@ -264,7 +264,7 @@ export default {
                 operate:'1',//退款中 
             }
         ],
-
+        total_count: 0
     }
   },
   //计算属性 类似于data概念

src/views/personalCenter/components/PersonalInfo.vue

@@ -97,10 +97,10 @@
                 @size-change="(val)=>handleSizeChange(val,'pageSize')"
                 @current-change="(val)=>handleCurrentChange(val,'pageNumber')"
                 :current-page="pageNumber"
-                :page-sizes="[10, 20, 30, 40]"
+                :page-sizes="[10, 20, 30, 40, 50]"
                 :page-size="pageSize"
                 layout="total, prev, pager, next, sizes, jumper"
-                :total="articleList.length">
+                :total="total_count_a">
             </el-pagination>
         </template>
         <template v-if="tabsIndex===1">
@@ -164,10 +164,10 @@
                 @size-change="(val)=>handleSizeChange(val,'pageSizes')"
                 @current-change="(val)=>handleCurrentChange(val,'pageNumbers')"
                 :current-page="pageNumbers"
-                :page-sizes="[10, 20, 30, 40]"
+                :page-sizes="[10, 20, 30, 40, 50]"
                 :page-size="pageSizes"
                 layout="total, prev, pager, next, sizes, jumper"
-                :total="wordList.length">
+                :total="total_count_w">
             </el-pagination>
         </template>
     </div>
@@ -328,6 +328,8 @@ export default {
             }
         ],
         filterTypeArr: [],
+        total_count_a: 0,
+        total_count_w: 0
     }
   },
   //计算属性 类似于data概念

src/views/search/searchDetail.vue

@@ -80,8 +80,8 @@
                 <el-pagination
                     background
                     :current-page="currentPage"
-                    :page-size="10"
-                    :page-sizes="[1, 10, 20, 30, 40, 50]"
+                    :page-size="page_capacity"
+                    :page-sizes="[10, 20, 30, 40, 50]"
                     :total="courseTotal"
                     layout="sizes, prev, pager, next, jumper"
                     @current-change="handleCurrentChange"