Merge refs/remotes/origin/master into refs/heads/master

YM

2024-09-10 6afcf851d6f2db0de5cdaca31cad419f60895ede

 packageBookService/pages/bookServices/detail/components/learnTask/index.js

@@ -66,7 +66,7 @@
        });
      } else {
        this.setData({
          userId: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).id,
          userId: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).userId,
          disabled: false
        });
      }
@@ -308,7 +308,6 @@
        this.setData({
          dataList: list
        });
        console.log(this.data.dataList, 777)
      }
    })
  },