From 99dfeb5fc86bce593a5d3f43f45c26eedc00ab0a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 10 九月 2024 16:28:54 +0800
Subject: [PATCH] bug

---
 packagePersonal/pages/myOrder/index.wxml |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packagePersonal/pages/myOrder/index.wxml b/packagePersonal/pages/myOrder/index.wxml
index cee7ffd..6ba7728 100644
--- a/packagePersonal/pages/myOrder/index.wxml
+++ b/packagePersonal/pages/myOrder/index.wxml
@@ -1,15 +1,13 @@
 <view class="container">
-  <view class="page-header">
+  <view class="page-header" wx:if="{{!skeletonLoding}}">
     <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>
+      <t-search model:value="{{searchText}}" shape="round" clearable="{{false}}" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" class="navBar-search" style="width: 90%" bind:submit="onSearchOrder" />
     </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">
+  <view class="pageInfo" wx:if="{{!skeletonLoding}}">
     <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">
@@ -24,7 +22,7 @@
           </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="bookBox {{items.saleMethodLinks.length == 1 ? 'flex' : ''}}" wx:for="{{items.saleMethodLinks}}" wx:for-item="itemes" wx:for-index="idx" wx:key="idx" bindtap="goBookDetails" data-book="{{itemes}}" data-remarks="{{items.remarks}}">
                 <view class="leftCon {{items.saleMethodLinks.length == 1 ? 'fl' : ''}}">
                   <!-- 鑾峰彇鍥剧墖 -->
                   <image class="purchasedIcon" wx:if="{{itemes.icon}}" src="{{itemes.icon}}" mode="aspectFit" />
@@ -36,9 +34,10 @@
                   <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.product.cmsTypeRefCode == 'jsek_mediaBook' ? 
                       itemes.orderSaleMethod.type == 'defaultSaleMethod'
                       ? '鍥句功鏈嶅姟-鐢靛瓙涔�'
-                      : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '鍥句功鏈嶅姟-缁勫嵎' : '鍥句功鏈嶅姟-浜戝涔�'
+                      : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '鍥句功鏈嶅姟-缁勫嵎' : '鍥句功鏈嶅姟-浜戝涔�' : itemes.orderSaleMethod.product.cmsTypeRefCode == 'jsek_digitalCourses' ? '鏁板瓧璇剧▼' : '鏁板瓧鏁欐潗'
                       }}</text>
                   </view>
                 </view>
@@ -61,7 +60,8 @@
         </view>
       </view>
       <view wx:if="{{list.length == 0}}" class="empyt">
-        <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+        <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
+        <empty />
       </view>
       <view class="bottom-loading" wx:if="{{bottomLoading}}">
         <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
@@ -72,4 +72,6 @@
     </scroll-view>
   </view>
 </view>
-<t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top>
\ No newline at end of file
+<t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top>
+<import src="index.skeleton.wxml" />
+<template is="skeleton" wx:if="{{skeletonLoding}}" />
\ No newline at end of file

--
Gitblit v1.9.1