yiming
2024-03-27 feead902a64345472895b9d4d9a335574ab728ad
书展bug
13个文件已修改
384 ■■■■■ 已修改文件
packageBookService/pages/bookServices/detail/buyResource/index.js 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/buyResource/index.wxml 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/tree/index.js 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/tree/index.wxml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packagePersonal/pages/aboutUs/index.wxml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packagePersonal/pages/aboutUs/index.wxss 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bibliographyList/index.js 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bibliographyList/index.wxml 153 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionList/index.js 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionList/index.wxml 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionList/index.wxss 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/images/bookExhibitionList/zhuantitaolun.png 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -14,12 +14,14 @@
    loading: false,
    shoppingList: [],
    shoppingCartGetId: [],
    methodId: []
  },
  /**
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
    const systInfo = wx.getSystemInfoSync();
    const menu = wx.getMenuButtonBoundingClientRect(); // 胶囊信息
    const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 导航栏高度
@@ -34,7 +36,46 @@
    this.getShoppingCartProductGet()
    this.getBookInfo(options.bookId)
  },
  batchPurchase() {
    let saleMethodIds = []
    let requests = []
    const child = this.selectComponent('#tree')
    console.log(child.data.superiorPurchaseSaleMethodId, 'superiorPurchaseSaleMethodId');
    const item = child.data.superiorPurchaseSaleMethodId
    if (item) {
      item.forEach(item => {
        if (item.saleMethod != 0) {
          saleMethodIds = item.saleMethod[0].Id
          requests.push({ saleMethodIds, count: 1 })
        }
      })
      console.log(requests, 'saleMethodId');
      let query = {
        remarks: '云学习',
        requests,
      }
      // 发起订单初始化请求并等待结果
      const res = app.MG.store.initOrder(query)
      let bookOrdersId = res.orderNumber
      // 检查订单号是否存在
      if (bookOrdersId) {
        const url = '/pages/cart/paymentPage/index?orderNumber=' + bookOrdersId
        wx.navigateTo({
          url
        })
      }
    }
    // console.log(child.data.sonPurchaseSaleMethodId, 'child.data.');
    // this.data.methodId.push(child.data.sonPurchaseSaleMethodId)
  },
  /**
   * 生命周期函数--监听页面初次渲染完成
   */
@@ -365,5 +406,6 @@
  checkAll() {
    const child = this.selectComponent('#tree')
    child.checkAll()
  }
  },
})
packageBookService/pages/bookServices/detail/buyResource/index.wxml
@@ -4,12 +4,7 @@
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
  <view class="flex">
    <view>
      <t-icon
        name="chevron-left"
        size="30"
        data-name="{{item}}"
        bind:click="goBack"
      />
      <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
    </view>
    <view class="navbar-title">资源购买</view>
  </view>
@@ -19,13 +14,7 @@
<!-- 内容 -->
<view class="buy-resource" wx:if="{{!loading}}">
  <tree
    id="tree"
    treeList="{{learn}}"
    tab="{{'jsek_cloudLearning'}}"
    isShowCheck="{{true}}"
    openIds="{{openLearnids}}"
  />
  <tree id="tree" treeList="{{learn}}" tab="{{'jsek_cloudLearning'}}" isShowCheck="{{true}}" openIds="{{openLearnids}}" />
</view>
<view class="noData" wx:if="{{loading}}">
@@ -33,5 +22,5 @@
</view>
<view class="page-bottom">
  <t-button theme="primary" size="large" class="btn-buy">批量购买</t-button>
</view>
  <t-button theme="primary" size="large" class="btn-buy" bindtap="batchPurchase">批量购买</t-button>
</view>
packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -37,6 +37,8 @@
    }
  },
  data: {
    sonPurchaseSaleMethodId: '',
    superiorPurchaseSaleMethodId: [],
    activeValues: [1, 2],
    webpageSrc: '',
    cloudShoppingCart: []
@@ -285,17 +287,25 @@
    // 章节勾选
    checkResourceTitle(e) {
      // 这个时候checked的值是fals
      let checkResourceTitleList = []
      const item = e.currentTarget.dataset.item
      //
      let list = this.flattenTree([item])
      let ids = []
      list.forEach(item => {
        ids.push(item.id)
      })
      // console.log(list, 'list789');
      const updatedTreeList = this.findAndUpdateItemsByIds(this.properties.treeList, ids);
      this.setData({
        treeList: updatedTreeList  // 更新 treeList 数据
      });
      console.log(list, 'list');
      this.setData({
        superiorPurchaseSaleMethodId: list
      })
      console.log(this.data.superiorPurchaseSaleMethodId, 'superiorPurchaseSaleMethodId');
      list.forEach(items => {
        console.log(items.checked, 'itesasd');
        if (!items.checked) {
@@ -309,12 +319,16 @@
    // 子项勾选
    checkResource(e) {
      const citem = e.currentTarget.dataset.item
      console.log(e);
      // console.log(e);
      const updataList = this.checkResoucrceInfo(this.properties.treeList, citem.id)
      console.log(updataList);
      this.setData({
        treeList: updataList
        treeList: updataList,
        sonPurchaseSaleMethodId: citem.saleMethod[0].Id
      })
    },
    // 加入购物车
    async onCloudShoppingCart() {
@@ -348,8 +362,8 @@
    },
  },
  onCheckAllChange(e) {
    debugger
    console.log('checkbox', e.detail.value);
    // debugger
    // console.log('checkbox', e.detail.value);
    // this.setData({
    //   checkAllValues: event.detail,
    // });
packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -176,6 +176,7 @@
          buyIds="{{buyIds}}"
          openTeachids="{{openTeachids}}"
          openLearnids="{{openLearnids}}"
        ></tree>
      </view>
      <view class="listItems" wx:if="{{children.length <= 0 && !loading}}">
packageBookService/pages/bookServices/detail/index.js
@@ -802,6 +802,7 @@
  },
  async buyBook() {
    console.log(this.data.bookItemDetail.defaultSaleMethodId, 'this.data.bookItemDetail.defaultSaleMethodId');
    if (!this.data.expire) {
      let bookOrdersId = ''
      let query = {
packagePersonal/pages/aboutUs/index.wxml
@@ -11,10 +11,14 @@
  </view>
  <view class="aboutUs">
  <view wx:if="{{types == 'jsek_aboutUs'}}" class="aboutUs">
    <view class="aboutText">
      <rich-text nodes="{{aboutText}}"></rich-text>
    <view class="aboutText ">
      <rich-text nodes="{{aboutText}}" space="emsp"></rich-text>
    </view>
  </view>
  <view wx:else class="aboutText ">
    <rich-text style="width: 100%;" nodes="{{aboutText}}"></rich-text>
  </view>
</view>
packagePersonal/pages/aboutUs/index.wxss
@@ -37,9 +37,7 @@
  padding-bottom: 100rpx;
}
.aboutUsBox {
  /* position: relative; */
}
.titleBox {
  position: sticky;
pages/bibliographyList/index.js
@@ -18,7 +18,8 @@
      BarHeight: '',
      navBarHeight: '',
      start: 1,
      tabValue: ''
      tabValue: '',
      keyword: ''
    },
    /**
@@ -126,6 +127,7 @@
    //高等教育
    higherGet(keyword) {
      console.log(keyword, 'keyword');
      let searchObj = {
        'Name*': keyword,
        '||author*': keyword,
@@ -288,6 +290,7 @@
      this.higherGet(keyword)
      this.vocationalGet(keyword)
      this.teacherGet(keyword)
    },
@@ -360,15 +363,21 @@
    },
    onPullDownRefresh() {
      let keyword = this.data.value
      this.setData({
        start: 1
        start: 1,
      })
      this.vocationalGet()
      this.higherGet()
      this.teacherGet()
      this.higherGet(keyword)
      this.vocationalGet(keyword)
      this.teacherGet(keyword)
    },
pages/bibliographyList/index.wxml
@@ -1,101 +1,86 @@
<!--pages/bibliographyList/index.wxml-->
<view class="bibliographyListBox">
  <view class="titleBox">
    <view style="width: 100%; height: {{barHeight}}px; "></view>
    <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
      <view>
        <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
      </view>
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
  <view>
    <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
  </view>
  <view class="example-search">
    <t-search model:value="{{value}}" placeholder="请输入书目名称" bind:submit="onSearchSubmit" />
  </view>
</view>
<!--状态栏高度 -->
<!-- <view style="width: 100%; height:{{BarHeight}}px;"></view>
<view style="width: 70%; height:{{navBarHeight}}px;">
  <view style="position: relative; padding-top: 10rpx;">
    <view class="iconfont icon-sousuo search_icones"></view>
    <input class="nav_input" model:value="{{ name }}" placeholder-class="placeholder_class" maxlength="30" bindfocus="bindfocus" bindconfirm="doSearch" placeholder="输入充电站" />
  </view>
</view> -->
<t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
  <t-tab-panel label="高等教育({{higherTotal}})" value="0">
    <view class="outsideHigherBox">
      <view class="higherBox" wx:for="{{higherList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
        <view class="outsideHigherImageBox">
          <image class="higherImageBox" src="{{item.icon}}" mode="" />
          <view class="downloadIcon" bind:tap="downloadData" data-item="{{item}}">
            <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/downloadshiftin.png" mode="" />
            <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/download.png" mode="" />
          </view>
        </view>
        <view class="higherTextBox">{{item.name}}</view>
      <view class="example-search">
        <t-search model:value="{{value}}" placeholder="请输入书目名称" bind:submit="onSearchSubmit" />
      </view>
    </view>
    <view class="bottom-box">
      <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
      <text wx:if="{{isMore == false}}">没有更多了</text>
    </view>
  </t-tab-panel>
  <t-tab-panel label="职业教育({{vocationalTotal}})" value="1">
    <view class="outsideHigherBox">
      <view class="higherBox" wx:for="{{vocationalList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
        <view class="outsideHigherImageBox">
          <image class="higherImageBox" src="{{item.icon}}" mode="" />
          <view class="downloadIcon" bind:tap="downloadData" data-item="{{item}}">
  </view>
            <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/downloadshiftin.png" mode="" />
            <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/download.png" mode="" />
  <t-tabs class="contentBox" defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
    <t-tab-panel label="高等教育({{higherTotal}})" value="0">
      <view class="outsideHigherBox">
        <view class="higherBox" wx:for="{{higherList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
          <view class="outsideHigherImageBox">
            <image class="higherImageBox" src="{{item.icon}}" mode="" />
            <view class="downloadIcon" bind:tap="downloadData" data-item="{{item}}">
              <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/downloadshiftin.png" mode="" />
              <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/download.png" mode="" />
            </view>
          </view>
          <view class="higherTextBox">{{item.name}}</view>
        </view>
        <view class="higherTextBox">{{item.name}}</view>
      </view>
      <view class="bottom-box">
        <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
        <text wx:if="{{isMore == false}}">没有更多了</text>
      </view>
    </t-tab-panel>
    <t-tab-panel label="职业教育({{vocationalTotal}})" value="1">
      <view class="outsideHigherBox">
        <view class="higherBox" wx:for="{{vocationalList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
          <view class="outsideHigherImageBox">
            <image class="higherImageBox" src="{{item.icon}}" mode="" />
            <view class="downloadIcon" bind:tap="downloadData" data-item="{{item}}">
    </view>
    <view class="bottom-box">
      <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
      <text wx:if="{{isMore == false}}">没有更多了</text>
    </view>
  </t-tab-panel>
  <t-tab-panel label="教师教育({{teacherTotal}})" value="2">
    <view class="outsideHigherBox">
      <view class="higherBox" wx:for="{{teacherList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
        <view class="outsideHigherImageBox">
          <image class="higherImageBox" src="{{item.icon}}" mode="" />
          <view class="downloadIcon" bind:tap="downloadData" data-item="{{item}}">
            <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/downloadshiftin.png" mode="" />
            <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/download.png" mode="" />
              <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/downloadshiftin.png" mode="" />
              <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/download.png" mode="" />
            </view>
          </view>
          <view class="higherTextBox">{{item.name}}</view>
        </view>
        <view class="higherTextBox">{{item.name}}</view>
      </view>
      <view class="bottom-box">
        <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
        <text wx:if="{{isMore == false}}">没有更多了</text>
      </view>
    </view>
    <view class="bottom-box">
      <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
      <text wx:if="{{isMore == false}}">没有更多了</text>
    </view>
  </t-tab-panel>
    </t-tab-panel>
    <t-tab-panel label="教师教育({{teacherTotal}})" value="2">
      <view class="outsideHigherBox">
        <view class="higherBox" wx:for="{{teacherList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
          <view class="outsideHigherImageBox">
            <image class="higherImageBox" src="{{item.icon}}" mode="" />
            <view class="downloadIcon" bind:tap="downloadData" data-item="{{item}}">
</t-tabs>
              <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/downloadshiftin.png" mode="" />
              <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/download.png" mode="" />
            </view>
          </view>
          <view class="higherTextBox">{{item.name}}</view>
        </view>
      </view>
      <view class="bottom-box">
        <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
        <text wx:if="{{isMore == false}}">没有更多了</text>
      </view>
    </t-tab-panel>
  </t-tabs>
</view>
pages/bookExhibitionList/index.js
@@ -59,6 +59,7 @@
    navBarHeight: '',
    barHeight: '',
    windowHeight: '',
  },
@@ -100,12 +101,14 @@
    console.log(this.data.bookExhibitionList.length, 'this.data.bookExhibitionList.length');
    // 更新数据
    this.setData({
      'multipleSelect.options': singleSelectOptions,
    });
    //
  },
  /**
@@ -120,8 +123,8 @@
   */
  onShow() {
    this.bookExhibitionGet()
    this.keyProjectsGet()
  },
  /**
@@ -222,12 +225,24 @@
      console.log(res, 'item');
      this.data.total = res.total
      //  list.push(res.datas)
      // list.push(res.datas)
      console.log(res.datas.length);
      if (res.datas.length == 0) {
        this.setData({
          keynoteDisabled: true
        })
      }
      const list = [...res.datas]
      this.setData({
        bookExhibitionList: list
      })
      // 判断数据长度
      console.log(list.length, 'list.length');
      //取消
      wx.hideLoading()
@@ -296,12 +311,12 @@
    if (this.data.keynoteValue) {
      //如果有数据就清空并刷新页面
      this.data.keynoteValue = []
      this.bookExhibitionGet(newValue)
      this.onLoad()
      console.log('true');
    }
  },
  // 重点项目
pages/bookExhibitionList/index.wxml
@@ -2,71 +2,66 @@
<!-- 弹出框 禁止 -->
<t-toast id="t-toast" />
<view class="bigTitleBox">
  <view style="width: 100%; height: {{barHeight}}px; "></view>
  <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
    <view>
      <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
    </view>
    <view class="example-search">
      <t-search model:value="{{value}}" placeholder="请输入书展名称" bind:submit="onSearchSubmit" />
<view class="outsideBigTitleBox">
  <view class="bigTitleBox">
    <view style="width: 100%; height: {{barHeight}}px; "></view>
    <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
      <view>
        <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
      </view>
      <view class="example-search">
        <t-search model:value="{{value}}" placeholder="请输入书展名称" bind:submit="onSearchSubmit" />
      </view>
    </view>
  </view>
</view>
<view>
</view>
<view class="outsideMenuBox">
  <view class="menuBox">
    <t-dropdown-menu class="classification">
      <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
      <t-dropdown-item disabled="{{keynoteDisabled}}" label=" 重点项目" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" />
  <view class="outsideMenuBox">
    <view class="menuBox">
      <t-dropdown-menu class="classification">
        <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
        <t-dropdown-item class="{{keynoteDisabled ? 'disableds' : ' '}}" disabled="{{keynoteDisabled}}" label=" 重点项目" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" show-overlay="{{true}}">
    </t-dropdown-menu>
        </t-dropdown-item>
      </t-dropdown-menu>
    <view class="outsideSortBox">
      <view class="sortBox" bind:tap="onSwapRight">
        <text>排序</text>
        <view class="iconBox">
          <t-icon class="swapRight" name="swap-right" size="35rpx" color="{{nameSort == 'Asc' ? '#ff6c00' : ''}}" />
          <t-icon class="swapLeft" name="swap-right" size="35rpx" color="{{nameSort == 'Desc' ? '#ff6c00' : ''}}" />
      <view class="outsideSortBox">
        <view class="sortBox" bind:tap="onSwapRight">
          <text>排序</text>
          <view class="iconBox">
            <t-icon class="swapRight" name="swap-right" size="35rpx" color="{{nameSort == 'Asc' ? '#ff6c00' : ''}}" />
            <t-icon class="swapLeft" name="swap-right" size="35rpx" color="{{nameSort == 'Desc' ? '#ff6c00' : ''}}" />
          </view>
        </view>
      </view>
    </view>
  </view>
</view>
<view class="assembleContent">
  <view class="titleBox">
    <view class="frameBox"></view>
    <view class="titleTextBox">
      <image src="/static/images/bookExhibitionList/zhuantitaolun.png" mode="heightFix" />
      <image src="/static/images/bookExhibitionList/zhuantitaolun.png" mode="aspectFit" />
    </view>
  </view>
  <view class="outside">
    <view wx:if="{{!bookExhibitionList.length }}" class="noData">
      <t-empty icon="folder-open" description="暂无数据" />
    </view>
    <view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
      <view class="imageBox">
        <image wx:if="{{item.icon}}" src="{{item.icon}}" mode="widthFix" />
        <image wx:else src="/static/images/bookExhibitionList/banner.png" mode="heightFix" />
        <image wx:if="{{item.icon}}" src="{{item.icon}}" mode="aspectFill" />
        <image wx:else src="/static/images/bookExhibitionList/banner.png" mode="aspectFill" />
      </view>
      <view class="textBox" title="{{item.subtitleName}}"> <text>{{item.subtitleName}}</text></view>
    </view>
  </view>
</view>
pages/bookExhibitionList/index.wxss
@@ -116,8 +116,8 @@
.titleTextBox {
  margin-left: 5px;
  width: 200rpx;
  height: 37rpx;
  width: 180rpx;
  height: 36rpx;
  /*宽 3.7   高1 */
}
@@ -140,6 +140,8 @@
.assembleContent {
  background-color: #F2F3F8;
  min-height: 90vh;
  margin-top: 270rpx;
}
.t-dropdown-menu:after,
@@ -217,4 +219,15 @@
.t-checkbox--tag.t-checkbox--checked {
  color: var(--td-checkbox-tag-active-color, var(--td-brand-color, var(--td-primary-color-7, #fff))) !important;
  background-color: var(--td-checkbox-tag-active-bg-color, var(--td-brand-color-light, var(--td-primary-color-1, #FF6C00))) !important;
}
.outsideBigTitleBox {
  position: fixed;
  top: 0px;
  background-color: #fff;
  height: 135px;
}
.disableds {
  color: var(--td-dropdown-menu-disabled-colorm, var(--td-font-gray-4, rgba(0, 0, 0, 0.26))) !important;
}
static/images/bookExhibitionList/zhuantitaolun.png