bug修改

闫增涛

2025-03-31 04c7b0163caeae4ab1c5da62e301fa993101cfad

 packageDomain/pages/sampleBookList/index.js

@@ -84,6 +84,7 @@
    num: 0,
    x: 280,
    y: 300,
    scrollTop: 0
  },

  /**
@@ -141,26 +142,17 @@

    // 检查登录状态
    const token = wx.getStorageSync(app.config.tokenKey)
    if (!token) {
      loginInfo(app, (data) => {
        if (data) {
          that.setData({
            userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
          })
          that.getAlreadyPBookList()
          that.getAlreadyEBookList()
          // 获取申请次数
          that.getSelectPaperBookCount()
          that.getSelectBookCount()

        }
      })
    } else {
    if (token) {
      that.setData({
        userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
      })

      const paperBookList = wx.getStorageSync('paperBookList') ? JSON.parse(wx.getStorageSync('paperBookList')).length : 0
      const electronicBookList = wx.getStorageSync('electronicBookList') ? JSON.parse(wx.getStorageSync('electronicBookList')).length : 0
      this.setData({
        num: paperBookList + electronicBookList
      })
    }
    that.getBookList(false)
  },

  /**
@@ -175,16 +167,24 @@
   */
  onShow() {
    let that = this;
    that.setData({
      page: 1,
      paperBookList: [],
      electronicBookList: []
    })
    that.getAlreadyPBookList()
    that.getAlreadyEBookList()
    // 获取申请次数
    that.getSelectPaperBookCount()
    that.getSelectBookCount()
    const token = wx.getStorageSync(app.config.tokenKey)
    if (!token) {
      loginInfo(app, (data) => {
        if (data) {
          that.setData({
            userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
          })
          that.getAlreadyPBookList()
          that.getAlreadyEBookList()
          that.getSelectPaperBookCount()
          that.getSelectBookCount()
        } else {
          wx.switchTab({
            url: '/pages/home/home',
          })
        }
      })
    }
    if (wx.getStorageSync("paperBookList") || wx.getStorageSync("electronicBookList")) {
      if (wx.getStorageSync("paperBookList")) {
        that.setData({
@@ -200,7 +200,19 @@
        num: Number(that.data.paperBookList.length) + Number(that.data.electronicBookList.length)
      })
    }
    that.getBookList(false);
    // that.getBookList(false);
    that.dataRebuild(that.data.bookList)
  },
  onHide() {
    const query = wx.createSelectorQuery()
    query.select('#scrollView').scrollOffset(res => {
      console.log(1, res);
      this.setData({
        scrollTop: res.scrollTop
      })
      console.log('隐藏', this.data.scrollTop);
    }).exec()

  },
  goBack() {
    wx.navigateBack();
@@ -422,6 +434,8 @@
        author: [],
        isbn: [],
        publicationDate: [],
        pdf: [],
        protectedEpub: [],
        isApplyBook: [],
        'isApplyBook>': ['1'],
        ...searchObj,
@@ -430,59 +444,7 @@
    app.MG.store.getProductList(query).then((res) => {
      try {
        if (res.datas.length > 0) {
          res.datas.forEach((item) => {
            item.paperDisabled = false
            item.paperChecked = false
            item.electronDisabled = false
            item.electronChecked = false
            if (item.purchasedSaleMethodIdList.indexOf(item.defaultSaleMethodId) > -1) {
              item.electronDisabled = true
              item.electronChecked = true
            }
            if (that.data.alreadyPaperBookList.length > 0) {
              that.data.alreadyPaperBookList.forEach((pBook) => {
                if (pBook.content.length > 0) {
                  pBook.content.forEach((pBookItem) => {
                    if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
                      item.paperDisabled = true
                      item.paperChecked = true
                    }
                    if (pBookItem.id === item.id && pBook.state == 'Normal') {
                      item.paperDisabled = false
                    }
                  })
                }
              })
            }

            if (that.data.alreadyElectronicBookList.length > 0) {
              that.data.alreadyElectronicBookList.forEach((eBook) => {
                if (eBook.content.length > 0) {
                  eBook.content.forEach((eBookItem) => {
                    if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
                      item.electronDisabled = true
                      item.electronChecked = true
                    }
                  })
                }
              })
            }
            if (that.data.paperBookList.length > 0) {
              for (let i = 0; i < that.data.paperBookList.length; i++) {
                if (that.data.paperBookList[i].id == item.id) {
                  item.paperChecked = true
                }
              }
            }
            if (that.data.electronicBookList.length > 0) {
              for (let i = 0; i < that.data.electronicBookList.length; i++) {
                if (that.data.electronicBookList[i].id == item.id) {
                  item.electronChecked = true
                }
              }
            }
          });
          let list = res.datas;
          let list = this.dataRebuild(res.datas);
          //触底加载新数据并保留老数据
          if (isReachBottom) {
            list = [...this.data.bookList, ...list] //将新数据加入老数据中
@@ -504,14 +466,76 @@
      }
    });
  },
  dataRebuild(list) {
    let that = this;
    console.log(list, 123)
    list.forEach((item) => {
      item.paperDisabled = false
      item.paperChecked = false
      item.electronDisabled = false
      item.electronChecked = false
      if (item.purchasedSaleMethodIdList.indexOf(item.defaultSaleMethodId) > -1) {
        item.electronDisabled = true
        item.electronChecked = true
      }
      if (that.data.alreadyPaperBookList.length > 0) {
        that.data.alreadyPaperBookList.forEach((pBook) => {
          if (pBook.content.length > 0) {
            pBook.content.forEach((pBookItem) => {
              if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
                item.paperDisabled = true
                item.paperChecked = true
              }
              if (pBookItem.id === item.id && pBook.state == 'Normal') {
                item.paperDisabled = false
              }
            })
          }
        })
      }

      if (that.data.alreadyElectronicBookList.length > 0) {
        that.data.alreadyElectronicBookList.forEach((eBook) => {
          if (eBook.content.length > 0) {
            eBook.content.forEach((eBookItem) => {
              if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
                item.electronDisabled = true
                item.electronChecked = true
              }
            })
          }
        })
      }
      if (that.data.paperBookList.length > 0) {
        for (let i = 0; i < that.data.paperBookList.length; i++) {
          if (that.data.paperBookList[i].id == item.id) {
            item.paperChecked = true
          }
        }
      }
      if (that.data.electronicBookList.length > 0) {
        for (let i = 0; i < that.data.electronicBookList.length; i++) {
          if (that.data.electronicBookList[i].id == item.id) {
            item.electronChecked = true
          }
        }
      }
    });
    return list
  },


  //高级分类选择
  onChangeIcon(e) {
    this.setData({
      skeletonLoding: true,
      bookList: [],
      'assortCheck.code': e.detail.value,
      stairCode: '',
      secondCode: '',
      path: `${e.detail.value}`,
      'iconList.value': e.detail.value,

    });
    this.getBookList(false);
    this.getStairList(this.data.assortCheck.code);
@@ -523,17 +547,20 @@
      `${this.data.assortCheck.code}\\${e.detail.value}` :
      this.data.assortCheck.code;
    this.setData({
      skeletonLoding: true,
      bookList: [],
      pathList: [],
      stairCode: e.detail.value,
      secondCode: '',
      path: path,
      'stairList.value': e.detail.value,
      'secondList.value': ""
    });
    this.getBookList(false);
    this.getSecondList(path);
  },
  // 二级分类切换
  onChangeSecond(e) {
  // 二级分类切换 
  onConfirmSecond(e) {
    const pathList = [];
    for (let index = 0; index < e.detail.value.length; index++) {
      const element = e.detail.value[index];
@@ -544,17 +571,16 @@
      });
    }
    this.setData({
      skeletonLoding: true,
      pathList: pathList,
      'secondList.value': e.detail.value,
    });

  },
  // 
  onConfirmSecond() {
    this.getBookList(false);
  },
  onResetSecond() {
    this.setData({
      skeletonLoding: true,
      pathList: [],
      'secondList.value': [],
    });
    this.getBookList(false);
@@ -657,9 +683,6 @@
        this.setData({
          alreadyElectronicBookList: list,
        });
        if (wx.getStorageSync(app.config.tokenKey)) {
          this.getBookList(false);
        }
      }
    })
  },
@@ -779,7 +802,7 @@
  },

  //选择电子样书
  onChangeElectron(e) {
  async onChangeElectron(e) {
    const item = e.currentTarget.dataset.book;
    const index = this.data.bookList.findIndex(citem => citem.id == item.id)
    let role = this.data.userInfo != null ? this.data.userInfo.role : null
@@ -787,6 +810,44 @@
      // 是教师
      if (e.detail.checked) {
        // 点击选中
        //商品有无电子书 
        const obj = {
          path: '*',
          queryType: 'SubProduct',
          sort: {
            type: 'Desc',
            field: 'CreateDate'
          },
          paging: {
            start: 0,
            size: 1
          },
          mainProductId: item.id,
          fields: {
            bookshelf_pdf: [],
            bookshelf_protectedEpub: [],
          }
        }
        const res = await app.MG.store.getProductList(obj)
        if (res.datas.length > 0) {
          if (!res.datas[0].bookshelf_pdf && !res.datas[0].bookshelf_protectedEpub) {
            wx.showToast({
              title: "暂无电子书文件,请联系管理员!",
              icon: 'none',
              duration: 1000,
            })
            return false;
          }
        } else {
          if (!item.pdf && !item.protectedEpub) {
            wx.showToast({
              title: "暂无电子书文件,请联系管理员!",
              icon: 'none',
              duration: 1000,
            })
            return false;
          }
        }
        if (this.data.ebookCount == 0) {
          wx.showToast({
            title: "您的电子样书申请次数已用尽，若要继续，请联系管理员！",
@@ -905,7 +966,6 @@
  /**
   * 用户点击右上角分享
   */
  onShareAppMessage() {

  }
  onShareAppMessage() {},
  onShareTimeline() {},
})