闫增涛
2024-04-09 3b22db15cfc9f3704c4654df9d694ebfc16875bf
图书详情,答题器修改
8个文件已修改
71 ■■■■■ 已修改文件
packageBookService/pages/bookServices/detail/buyResource/index.js 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/note/note.wxml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/tree/index.js 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/tree/index.wxml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.js 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/questionList/index.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/questionList/index.wxss 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -33,7 +33,6 @@
      bookId: options.bookId,
    });
    this.getResourceClass();
    console.log(options);
    this.getResourceData({
      productLinkPath: options.productLinkPath,
      refCode: options.refCode,
@@ -148,7 +147,6 @@
                loading: false,
                openLearnids: result,
              });
              console.log("教学资源", list);
            }
          } else {
            // 无数据
@@ -380,25 +378,15 @@
    let item = [];
    let selectAllId = [];
    const child = this.selectComponent("#tree");
    console.log(
      child.data.superiorPurchaseSaleMethodId,
      "superiorPurchaseSaleMethodId"
    );
    console.log(child.data.sonPurchaseSaleMethodId, "child.data");
    // console.log(child.data.selectAll, 'selectAll');
    item = child.data.superiorPurchaseSaleMethodId;
    const sonItem = child.data.sonPurchaseSaleMethodId;
    let selectAll = child.data.selectAll;
    if (selectAll) {
      // console.log(selectAll);
      selectAll.forEach((item) => {
        if (item.saleMethod != 0) {
          // console.log(item, 'item');
          selectAllId.push(item.saleMethod[0].Id);
        }
      });
      console.log(selectAllId);
      app.MG.store
        .initOrder({
          requests: selectAllId.map((id) => ({
@@ -409,8 +397,7 @@
        .then((res) => {
          if (res) {
            wx.navigateTo({
              url:
                "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber,
              url: "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber,
            });
            selectAllId = [];
            child.setData({
@@ -420,15 +407,12 @@
        });
    }
    if (item) {
      console.log(item, "sadsdasd");
      // 拿到id
      item.forEach((items) => {
        if (items.saleMethod != 0) {
          saleMethodIds.push(items.saleMethod[0].Id);
        }
      });
      console.log(saleMethodIds, "saleMethodIds");
      app.MG.store
        .initOrder({
          requests: saleMethodIds.map((id) => ({
@@ -439,8 +423,7 @@
        .then((res) => {
          if (res) {
            wx.navigateTo({
              url:
                "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber,
              url: "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber,
            });
            child.setData({
@@ -460,8 +443,7 @@
        .then((res) => {
          if (res) {
            wx.navigateTo({
              url:
                "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber,
              url: "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber,
            });
            this.setData({
              paymentPage: true,
@@ -473,4 +455,4 @@
        });
    }
  },
});
});
packageBookService/pages/bookServices/detail/components/note/note.wxml
@@ -19,7 +19,12 @@
      bind:change="handleChange"
      wx:if="{{!loading && noteList.length}}"
    >
      <t-collapse-panel value="{{item.id}}" expandIcon wx:for="{{noteList}}">
      <t-collapse-panel
        value="{{item.id}}"
        expandIcon
        wx:for="{{noteList}}"
        wx:key="id"
      >
        <view slot="header" class="collapse-header">
          <t-image
            class="note-icon"
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -72,6 +72,6 @@
    <text class="cause-title"
      >资源下载申请未通过,解决问题后可点击“申请”按钮重新提交申请</text
    >
    <view class="cause-content">原因:{{ rejectCause }}</view>
    <view class="cause-content">原因:{{ rejectCause || '-'}}</view>
  </view>
</t-dialog>
packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -166,8 +166,7 @@
          return wx.showToast({
            icon: "error",
            title: item.saleMethod[0].Price > 0 ?
              "请先购买该资源" :
              "请先点击领取查看按钮",
              "请先购买该资源" : "请先点击领取查看按钮",
          });
        }
        wx.navigateTo({
@@ -378,11 +377,20 @@
    // 子项勾选
    checkResource(e) {
      const citem = e.currentTarget.dataset.item;
      console.log(citem, "5648");
      const parent = e.currentTarget.dataset.parent
      const childrenList = parent.children.filter(item => item.id !== citem.id)
      const flag = childrenList.findIndex(item => item.checked == false)
      const updataList = this.checkResoucrceInfo(
        this.properties.treeList,
        citem.id
      );
      if (flag == -1) {
        if (citem.checked == false) {
          this.findAndUpdateItemsByIds(this.properties.treeList, [parent.id], true)
        } else {
          this.findAndUpdateItemsByIds(this.properties.treeList, [parent.id], false)
        }
      }
      if (!citem.checked) {
        //选中的时候添加id
        let sonPurchaseSaleMethodId = this.data.sonPurchaseSaleMethodId || [];
packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -61,6 +61,7 @@
                    icon="rectangle"
                    checked="{{citem.checked}}"
                    data-item="{{citem}}"
                    data-parent="{{item}}"
                    catch:change="checkResource"
                  />
                </view>
packageBookService/pages/bookServices/detail/index.js
@@ -450,7 +450,6 @@
    };
    app.MG.store.getProductList(obj).then((res) => {
      if (res.datas && res.datas.length > 0) {
        console.log(res.datas[0], 2);
        this.setData({
          bookItemDetail: res.datas[0],
          selectedIds: res.datas[0].defaultSaleMethod.id,
@@ -761,7 +760,6 @@
                loading: false,
                openTeachids: result,
              });
              console.log("教学资源", list);
            } else if (type.refCode == "jsek_cloudLearning") {
              let arr = this.handleTreeData(list).filter(
                (item) => item.saleMethod[0]
@@ -864,7 +862,7 @@
            item.disabled = true;
          }
        }
        if (item.file) {
        if (item.file && item.fileMap && item.fileMap[item.file]) {
          if (item.fileMap[item.file].protectType == "Private")
            item.disabled = true;
        }
@@ -966,10 +964,6 @@
  },
  async buyBook() {
    console.log(
      this.data.bookItemDetail.defaultSaleMethodId,
      "this.data.bookItemDetail.defaultSaleMethodId"
    );
    if (!this.data.expire) {
      let bookOrdersId = "";
      let query = {
@@ -984,7 +978,6 @@
      const res = await app.MG.store.initOrder(query);
      // 获取订单号并赋值给 orderNumber.value
      bookOrdersId = res.orderNumber;
      console.log(bookOrdersId);
      // 检查订单号是否存在
      if (bookOrdersId) {
        if (this.data.bookDetail.price == "0.00") {
@@ -1385,7 +1378,6 @@
    const isSHow = this.data.shoppingCartGetId.some(
      (item) => item == data.saleMethod[0].Id
    );
    console.log(isSHow);
    return !isSHow;
  },
  updateCloudLearning() {
@@ -1393,8 +1385,6 @@
      (item) => item.refCode == "jsek_cloudLearning"
    );
    this.getResourceData(checkData);
    debugger;
    console.log(55555);
  },
  // 遍历树结构转换为数组方法
  handleTreeData(array) {
@@ -1701,7 +1691,6 @@
      },
    };
    app.MG.store.getProductList(query).then((res) => {
      console.log("完整相关图书", res.datas);
      const Arr = res.datas.filter(
        (item) => item.id != this.data.bookDetail.id
      );
@@ -1884,7 +1873,6 @@
  //申请电子样书
  appplyElectronicBook() {
    console.log(this.data.bookDetail);
    if (
      this.data.bookDetail.isApplyBook == 2 ||
      this.data.bookDetail.isApplyBook == 4
packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -123,10 +123,10 @@
                <view
                  wx:if="{{item.optionStyle == 'TxtAndImage'}}"
                  class="fl-center"
                  style="height: min-content"
                  style="min-height: 144rpx"
                >
                  <text>{{contentItem.value}}、</text>
                  <view class="radio-textimg">{{contentItem.txt}}</view>
                  <text class="radio-textimg">{{contentItem.txt}}</text>
                  <image src="{{contentItem.img}}" mode="aspectFit" />
                </view>
                <!-- 富文本 -->
packageBookService/pages/bookServices/examination/questionList/index.wxss
@@ -228,7 +228,8 @@
}
.judge-rich-box {
  height: 100%;
  min-height: 104rpx;
  /* height: 100%; */
  display: flex;
  align-items: center;
}