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

litian

2024-12-24 6df96b3e7a7da1985ee875e84711e9f15c5fbff0

 packageDomain/pages/resourceDetails/document/index.wxml

@@ -8,11 +8,11 @@

-->

<view class="titleNameBox" wx:if="{{selectType != 'webpage'}}">
<view class="titleNameBox" wx:if="{{selectType != 'webpage' && learnSelectType != 'webpage'}}">
  {{titleName}}
</view>
<!-- bind:tap="onClick" -->
<view class="pictureBox" wx:if="{{selectType == 'picture'}}">
<view class="pictureBox" wx:if="{{selectType == 'picture' || learnSelectType == 'picture'}}">
  <!-- style="width: {{(newScale <= 5 ? newScale: 5) * 100}}%;" -->
  <image
    src="{{showData}}"
@@ -22,7 +22,7 @@
  />
</view>

<view wx:if="{{selectType == 'zip'}}">
<view wx:if="{{selectType == 'zip' || learnSelectType == 'zip'}}">
  <view class="zipImageBox">
    <image src="/static/images/document/zip200px.png" mode="aspectFill" />
  </view>
@@ -34,19 +34,28 @@
  </view>
</view>

<view wx:if="{{selectType == 'pdf' ||  selectType == 'document'}}">
<view wx:if="{{selectType == 'pdf' ||  selectType == 'document' || learnSelectType == 'pdf' ||  learnSelectType == 'document'}}">
  <view
    wx:for="{{naturalResources}}"
    wx:key="index"
    wx:for-item="item"
    wx:for-index="index"
    class="img-box"
  >
    <image src="{{item}}" alt="" style="min-height: 550px"></image>
    <image
      src="{{item}}"
      data-src="{{item}}"
      bind:tap="preview"
      alt=""
      style="min-height: 550px; width: 100%"
      mode="aspectFit"
    ></image>
    <view class="divider">第 {{index + 1}} 页</view>
  </view>
  <!-- <web-view src="{{pdfSrc}}" id="web-view-pdf" /> -->
</view>

<web-view wx:if="{{selectType == 'webpage'}}" src="{{webpageSrc}}"></web-view>
<web-view wx:if="{{selectType == 'webpage' || learnSelectType == 'webpage'}}" src="{{webpageSrc}}"></web-view>
<!-- <button bind:tap="handleTap">点位</button> -->

<!-- <t-button theme="primary" size="large" variant="outline" block>基础图片预览</t-button> -->