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

yiming

2024-03-26 09905b43ec2a249ef0e6057d148b8620cfaa1506

 packagePersonal/pages/myOrder/index.wxml

@@ -1,73 +1,75 @@
<view class="page-header">
  <view class="search">
    <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="请输入订单编号" leftIcon="">
      <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="navToSearchPage" />
    </t-search>
  </view>
  <t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabBookClick">
    <t-tab-panel wx:for="{{tabList}}" wx:for-index="index" wx:key="index" label="{{item.label}}" value="{{index}}" />
  </t-tabs>
</view>
<view class="pageInfo">
  <scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
    <view slot="refresher" class="refresh-container">
      <view class="loading">
        <t-loading theme="circular" size="40rpx" text="正在刷新..." class="wrapper" />
      </view>
<view class="container">
  <view class="page-header">
    <view class="search">
      <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="请输入订单编号" leftIcon="">
        <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="navToSearchPage" />
      </t-search>
    </view>
    <view class="list" wx:if="{{list.length > 0}}">
      <view class="content-item" wx:for="{{list}}" wx:for-item="items" wx:for-index="index" wx:key="index">
        <view class="order-cent">
          <text class="order-cent-one">订单号: {{items.orderNumber}}</text>
          <text class="right {{items.colorName}}">{{items.CustomState}}</text>
    <t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabBookClick">
      <t-tab-panel wx:for="{{tabList}}" wx:for-index="index" wx:key="index" label="{{item.label}}" value="{{index}}" />
    </t-tabs>
  </view>
  <view class="pageInfo">
    <scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
      <view slot="refresher" class="refresh-container">
        <view class="loading">
          <t-loading theme="circular" size="40rpx" text="正在刷新..." class="wrapper" />
        </view>
        <view class="order-centent">
          <scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
            <view class="bookBox {{items.saleMethodLinks.length == 1 ? 'flex' : ''}}" wx:for="{{items.saleMethodLinks}}" wx:for-item="itemes" wx:for-index="idx" wx:key="idx" bindtap="onOrderDetail" data-info="{{itemes}}">
              <view class="leftCon {{items.saleMethodLinks.length == 1 ? 'fl' : ''}}">
                <!-- 获取图片 -->
                <image class="purchasedIcon" wx:if="{{itemes.icon}}" src="{{itemes.icon}}" mode="aspectFit" />
                <image class="purchasedIcon" wx:else src="/static/images/default-book-img.png" mode="aspectFit" />
              </view>
              <!-- 获取名称 -->
              <view class="rightCon">
                <view class="productTitle">{{itemes.name}}</view>
                <view class="cmsName" wx:if="{{itemes.orderSaleMethod.type != 'defaultSaleMethod'}}">{{itemes.orderSaleMethod.cmsItemList[0].name}}</view>
                <view class="{{items.saleMethodLinks.length == 1 ? 'top' : ''}}">
                  <text class="typeBox">{{
                    itemes.orderSaleMethod.type == 'defaultSaleMethod'
                    ? '图书服务-电子书'
                    : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '图书服务-组卷' : '图书服务-云学习'
                    }}</text>
      </view>
      <view class="list" wx:if="{{list.length > 0}}">
        <view class="content-item" wx:for="{{list}}" wx:for-item="items" wx:for-index="index" wx:key="index">
          <view class="order-cent">
            <text class="order-cent-one">订单号: {{items.orderNumber}}</text>
            <text class="right {{items.colorName}}">{{items.CustomState}}</text>
          </view>
          <view class="order-centent">
            <scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
              <view class="bookBox {{items.saleMethodLinks.length == 1 ? 'flex' : ''}}" wx:for="{{items.saleMethodLinks}}" wx:for-item="itemes" wx:for-index="idx" wx:key="idx" bindtap="onOrderDetail" data-info="{{itemes}}">
                <view class="leftCon {{items.saleMethodLinks.length == 1 ? 'fl' : ''}}">
                  <!-- 获取图片 -->
                  <image class="purchasedIcon" wx:if="{{itemes.icon}}" src="{{itemes.icon}}" mode="aspectFit" />
                  <image class="purchasedIcon" wx:else src="/static/images/default-book-img.png" mode="aspectFit" />
                </view>
                <!-- 获取名称 -->
                <view class="rightCon">
                  <view class="productTitle">{{itemes.name}}</view>
                  <view class="cmsName" wx:if="{{itemes.orderSaleMethod.type != 'defaultSaleMethod'}}">{{itemes.orderSaleMethod.cmsItemList[0].name}}</view>
                  <view class="{{items.saleMethodLinks.length == 1 ? 'top' : ''}}">
                    <text class="typeBox">{{
                      itemes.orderSaleMethod.type == 'defaultSaleMethod'
                      ? '图书服务-电子书'
                      : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '图书服务-组卷' : '图书服务-云学习'
                      }}</text>
                  </view>
                </view>
              </view>
            </scroll-view>
            <view class="count">
              <text wx:if="{{items.saleMethodLinks.length > 1 }}">共{{items.saleMethodLinks.length}}件</text>
              <text wx:if="{{items.saleMethodLinks.length == 1 }}">￥{{items.payPrice}}</text>
            </view>
          </scroll-view>
          <view class="count">
            <text wx:if="{{items.saleMethodLinks.length > 1 }}">共{{items.saleMethodLinks.length}}件</text>
            <text wx:if="{{items.saleMethodLinks.length == 1 }}">￥{{items.payPrice}}</text>
          </view>
        </view>
        <view class="order-top">
          <text class="finishedDate" wx:if="{{items.state == 'Success'}}">{{items.finishedDate}}</text>
          <text class="order-top-price" wx:if="{{items.state == 'WaitPay'}}">应付：<text class="">￥{{items.payPrice}}</text></text>
          <view class="button-example" wx:if="{{items.state == 'WaitPay'}}">
            <button class="button" bindtap="onCancel" data-order-num="{{items.orderNumber}}">取消订单</button>
            <button class="unfollow" bindtap="onPayment" data-order-num="{{items.orderNumber}}">立即支付</button>
          <view class="order-top">
            <text class="finishedDate" wx:if="{{items.state == 'Success'}}">{{items.finishedDate}}</text>
            <text class="order-top-price" wx:if="{{items.state == 'WaitPay'}}">应付：<text class="">￥{{items.payPrice}}</text></text>
            <view class="button-example" wx:if="{{items.state == 'WaitPay'}}">
              <button class="button" bindtap="onCancel" data-order-num="{{items.orderNumber}}">取消订单</button>
              <button class="unfollow" bindtap="onPayment" data-order-num="{{items.orderNumber}}">立即支付</button>
            </view>
            <view wx:if="{{items.state == 'Cancel'}}" class="button-bottem">总计：<text class="price">￥{{items.payPrice}}</text> </view>
          </view>
          <view wx:if="{{items.state == 'Cancel'}}" class="button-bottem">总计：<text class="price">￥{{items.payPrice}}</text> </view>
        </view>
      </view>
    </view>
    <view wx:if="{{list.length == 0}}" class="empyt">
      <t-empty icon="folder-open" description="暂无数据" />
    </view>
    <view class="bottom-loading" wx:if="{{bottomLoading}}">
      <t-loading theme="circular" size="40rpx" text="加载中..." class="wrapper" />
    </view>
    <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
      <text>没有更多了</text>
    </view>
  </scroll-view>
      <view wx:if="{{list.length == 0}}" class="empyt">
        <t-empty icon="folder-open" description="暂无数据" />
      </view>
      <view class="bottom-loading" wx:if="{{bottomLoading}}">
        <t-loading theme="circular" size="40rpx" text="加载中..." class="wrapper" />
      </view>
      <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
        <text>没有更多了</text>
      </view>
    </scroll-view>
  </view>
</view>
<t-back-top theme="round" wx:if="{{isBackTop}}" text="顶部" bind:to-top="onToTop"></t-back-top>