商品更新

src/components/education/education.html

@@ -2,7 +2,7 @@
 <div *ngIf="isEdu" class="signMask" (click)="closeEdu()">
     <div class="mask-content-edu" (click)="stop($event)">
         <div class="bgc_edu">
-            <img src="./assets/imgs/home/edu_mask.png" alt="">
+            <img src="./assets/imgs/home/edu_banner.png" alt="">
         </div>
         <ion-icon class="close" name="close"></ion-icon>
     </div>

src/pages/serve-pages/goods-collect/goods-cart/goods-cart.ts

@@ -87,7 +87,8 @@ export class GoodsCartPage {
         this.serveSer.shoppingCar(data).subscribe(
             (res) => {
                 this.cartList = res.list;
-                this.isLoad = false;
+                this.page.total = res.total;
+                this.page.loadMore = false;
                 this.cartList.forEach(e => {
                     e.checkbox = false;
                 })
@@ -98,7 +99,6 @@ export class GoodsCartPage {
     //下拉刷新
     doRefresh(e) {
         this.page.loadMore = true;
-        this.infiniteScrollContent.inf.enable(true);
         const data = {
             P_pageNumber: 1,
             P_pageSize: this.page.P_pageSize,
@@ -107,7 +107,8 @@ export class GoodsCartPage {
         this.serveSer.shoppingCar(data).subscribe(
             (res) => {
                 this.cartList = res.list;
-                this.page.total = res.data.total;
+                this.page.total = res.total;
+                this.page.loadMore = false;
                 timer(800).subscribe(() => {
                     this.commonSer.toast('刷新成功');
                     e.complete()
@@ -129,9 +130,9 @@ export class GoodsCartPage {
             P_pageSize: this.page.P_pageSize,
             status: 1
         };
-        this.serveSer.searchCheckList(data).subscribe(
+        this.serveSer.shoppingCar(data).subscribe(
             (res) => {
-                this.page.total = res.data.total;
+                this.page.total = res.total;
                 res.list.forEach(e => {
                     this.cartList.push(e);
                 });

src/pages/serve-pages/goods-collect/goods-collect.ts

@@ -151,9 +151,7 @@ export class GoodsCollectPage {
 
     //加载更多
     doInfinite(e) {
-        console.log("doInfinite")
         if (this.totalNum == this.goodsList.length) {
-            console.log("没有更多了")
             this.loadMore = false;
             e.enable(false);
             return false;