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

litian

2024-03-15 3f1ea0a8e4bb02bf7544df8660b15cfa69d6b84a

 pages/cart/paymentPage/index.wxml

@@ -1,4 +1,5 @@
<!--pages/cart/paymentPage/index.wxml-->
<!-- 头部 -->
<view class="titleBox">
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
  <view>
@@ -6,21 +7,10 @@
  </view>
  <view class="navbar-title">提交订单</view>
</view>
</view>





<view class="paymentPageBox">
<view class="content">





  <!-- 
  <t-button t-class="wrapper" theme="primary" size="large" variant="outline" data-key="showCloseBtn" bind:tap="showDialog" block>
    带关闭按钮
  </t-button> -->
  <t-dialog visible="{{showCloseBtn}}" close-btn bind:confirm="closeDialog" bind:cancel="closeDialog">
    <view slot="content" class="slotContent">
      <view class="myQrcodeBox">
@@ -30,25 +20,32 @@
    </view>
  </t-dialog>





  <view class="shoppingCartList">
    <view class="cartList" wx:for="{{productList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
      <image src="{{item.paymentIcon }}" mode="" />
        <view class="imageBox">
          <image src="{{item.paymentIcon }}" mode="aspectFill" />
        </view>

      <view class="cartListContent">
        <view class="cartListDetails">{{item.orderSaleMethod.product.name}}</view>
        <view class="textBox">图书服务-电子书</view>


          <view class="cartListDetails">
            <view class="labelBox">
              <view class="eBook" wx:if="{{type == 'product'}}">电子书</view>
              <view wx:if="{{type == 'item'}}" class="cloudLearning">云学习</view>
            </view>

            <view class="boosName">
              {{item.orderSaleMethod.product.name}}
            </view>

          </view>
          <view class="textBox" wx:if="{{type == 'product'}}">图书服务-电子书</view>
          <view class="textBox" wx:if="{{type == 'item'}}">图书服务-云学习</view>
        <view class="priceBox">￥{{item.payPrice}}</view>

      </view>

    </view>


  </view>

  <view class="priceBreakdown">
    <view class="priceBreakdownContent">价格明细</view>
    <view class="amountMoney">
@@ -60,15 +57,12 @@
    </view>
  </view>



  <view class="interval"></view>

  </view>
  <!-- <view class="interval"></view> -->
  <view class="paymentBox">
    <view class="residue">待支付：<text class="residueTextBox">￥{{payPrice}}</text></view>
    <view>
      <t-button class="buttonBox" shape="round" bind:tap="confirmOrderGet">微信支付</t-button>
    </view>
  </view>

</view>