From dce885689d308043450f199981722b5c80360fe7 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 28 十一月 2024 10:21:29 +0800
Subject: [PATCH] 题库购买

---
 packagePersonal/pages/myOrder/index.wxml                                               |  174 ++++++++++++++++++++----
 pages/cart/paymentPage/index.js                                                        |    4 
 packageBookService/pages/bookServices/detail/components/testResource/testResource.js   |   20 ++
 packageBookService/pages/bookServices/detail/index.wxml                                |    3 
 packagePersonal/pages/myOrder/index.js                                                 |    7 
 packageBookService/pages/bookServices/detail/index.js                                  |   66 ++++++++
 packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss |   13 +
 packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml |  113 +++++++++++++--
 8 files changed, 342 insertions(+), 58 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.js b/packageBookService/pages/bookServices/detail/components/testResource/testResource.js
index c215457..08fd300 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.js
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.js
@@ -5,6 +5,12 @@
    * 缁勪欢鐨勫睘鎬у垪琛�
    */
   properties: {
+    isBuyBank: {
+      type: Boolean
+    },
+    bankSaleData: {
+      type: Object
+    },
     list: {
       type: Array,
       value: [],
@@ -70,12 +76,15 @@
           },
         });
       }
+      if (!this.data.isBuyBank) return wx.showToast({
+        icon: 'error',
+        title: '璇峰厛璐拱棰樺簱',
+      })
       wx.showLoading({
         title: "鍔犺浇涓�",
       });
       // 鑾峰彇绔犺妭涓嬫槸鍚︽湁棰樼洰
       let idPathList = [];
-
       if (this.properties.storeInfo || this.properties.jslx) {
         idPathList.push({
           id: this.properties.bookInfo.id,
@@ -197,5 +206,14 @@
         loading: type,
       });
     },
+    // 棰樺簱璐拱
+    buyBank() {
+      var myEventDetail = {} // detail瀵硅薄锛屾彁渚涚粰浜嬩欢鐩戝惉鍑芥暟
+      var myEventOption = {
+        bubbles: true,
+        composed: true
+      } // 瑙﹀彂浜嬩欢鐨勯�夐」
+      this.triggerEvent('buyBank', myEventDetail, myEventOption)
+    }
   },
 });
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
index f29a0e0..8319c03 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
@@ -2,15 +2,27 @@
 <view class="test-resource">
   <view class="top-btn">
     <view class="test-radio">
-      <view class="test-btn card {{radioItem == 'test' ? 'card--active' : ''}}" bind:tap="testBtn">
+      <view
+        class="test-btn card {{radioItem == 'test' ? 'card--active' : ''}}"
+        bind:tap="testBtn"
+      >
         <view class="image-box">
-          <image class="test-icon" src="{{ radioItem == 'test' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}" mode="aspectFit"></image>
+          <image
+            class="test-icon"
+            src="{{ radioItem == 'test' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"
+            mode="aspectFit"
+          ></image>
         </view>
         <view class="btn-content-text">缁冧範</view>
       </view>
-      <view class="test-btn card {{radioItem == 'mock' ? 'card--active' : ''}}" bind:tap="mockBtn">
+      <view
+        class="test-btn card {{radioItem == 'mock' ? 'card--active' : ''}}"
+        bind:tap="mockBtn"
+      >
         <view class="image-box">
-          <image src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"></image>
+          <image
+            src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
+          ></image>
         </view>
         <view class="btn-content-text">缁勫嵎</view>
       </view>
@@ -48,15 +60,31 @@
       </view>
     </t-radio-group> -->
     <view class="btn-box">
-      <t-button class="error-btn" theme="default" size="medium" style="padding: 0 12rpx" bind:tap="goMycollect" data-answerType="errorQuestion">
+      <t-button
+        class="error-btn"
+        theme="default"
+        size="medium"
+        style="padding: 0 12rpx"
+        bind:tap="goMycollect"
+        data-answerType="errorQuestion"
+      >
         <view slot="content" class="btn-content">
           <image src="/static/images/bookService/detail/cuoti.png"></image>
           <text class="primary-color">鎴戠殑閿欓</text>
         </view>
       </t-button>
-      <t-button class="collect-btn" theme="default" size="medium" style="padding: 0 12rpx" bind:tap="goMycollect" data-answerType="collectQuestion">
+      <t-button
+        class="collect-btn"
+        theme="default"
+        size="medium"
+        style="padding: 0 12rpx"
+        bind:tap="goMycollect"
+        data-answerType="collectQuestion"
+      >
         <view slot="content" class="btn-content">
-          <image src="/static/images/bookService/detail/wodeshoucang.png"></image>
+          <image
+            src="/static/images/bookService/detail/wodeshoucang.png"
+          ></image>
           <text class="primary-color"> 鎴戠殑鏀惰棌</text>
         </view>
       </t-button>
@@ -74,16 +102,41 @@
   </view> -->
   <!-- 缁冧範鍒楄〃鏍戠粨鏋� -->
   <view wx:if="{{radioItem == 'test'}}">
-    <tree id="test-tree" openIds="{{openIds}}" bookInfo="{{bookInfo}}" tab="{{tab}}" treeList="{{list}}" bind:goTest="goTest"></tree>
+    <view class="buy-question-btn" wx:if="{{!isBuyBank}}">
+      <t-button
+        class="error-btn"
+        theme="default"
+        size="medium"
+        style="padding: 0 12rpx"
+        bind:tap="buyBank"
+        data-answerType="errorQuestion"
+      >
+        <view slot="content" class="btn-content">
+          <image src="/static/images/bookService/detail/yijiangoumai.png" />
+          <text class="primary-color"
+            >{{bankSaleData.Price > 0 ? "鍏ㄩ儴璐拱" : "鍏嶈垂棰嗗彇"}}</text
+          >
+        </view>
+      </t-button>
+    </view>
+    <tree
+      id="test-tree"
+      openIds="{{openIds}}"
+      bookInfo="{{bookInfo}}"
+      tab="{{tab}}"
+      treeList="{{list}}"
+      bind:goTest="goTest"
+    ></tree>
   </view>
-  <view wx:if="{{noResources}}" class="noData" wx:if="{{radioItem == 'test' && !list.length}}">
+  <view
+    wx:if="{{noResources}}"
+    class="noData"
+    wx:if="{{radioItem == 'test' && !list.length}}"
+  >
     <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
     <empty />
   </view>
 </view>
-
-
-
 
 <!-- 缁勫嵎鍒楄〃 -->
 <view class="mock-data" wx:if="{{radioItem == 'mock'}}">
@@ -93,29 +146,49 @@
       <t-button class="buy-mock-btn" bind:tap="buyMock">璐拱缁勫嵎</t-button>
     </view>
     <view class="mock-list" wx:if="{{mockData.mockList.length}}">
-      <view class="mock-list-box" wx:for="{{mockData.mockList}}" wx:key="id" data-item="{{item}}" bind:tap="goMackPaper">
+      <view
+        class="mock-list-box"
+        wx:for="{{mockData.mockList}}"
+        wx:key="id"
+        data-item="{{item}}"
+        bind:tap="goMackPaper"
+      >
         <view class="mock-title">{{item.name}}</view>
         <view class="mock-message">
           <view class="message-box">
             <view class="mack-state">
-              <text wx:if="{{item.state == '3'}}" class="complete state-pad">宸插畬鎴�</text>
-              <text wx:elif="{{item.state == '2' || item.state == '1'}}" class="Incomplete state-pad">鏈畬鎴�</text>
+              <text wx:if="{{item.state == '3'}}" class="complete state-pad"
+                >宸插畬鎴�</text
+              >
+              <text
+                wx:elif="{{item.state == '2' || item.state == '1'}}"
+                class="Incomplete state-pad"
+                >鏈畬鎴�</text
+              >
               <text wx:else class="Incomplete state-pad">鏈紑濮�</text>
             </view>
             <view class="mock-time">{{item.createDate}}</view>
           </view>
-          <view class="mock-score" wx:if="{{item.state == '3'}}">{{item.report.userScore}}鍒�</view>
+          <view class="mock-score" wx:if="{{item.state == '3'}}"
+            >{{item.report.userScore}}鍒�</view
+          >
         </view>
       </view>
     </view>
     <view wx:else class="not-mock">
-      <image src="/static/images/bookService/examination/zhuangtai-icon.png"></image>
-      <view class="not-mock-message note-mock-text">缁勫嵎鏄敹璐瑰姛鑳斤紝璇疯喘涔板悗浣跨敤锛�</view>
-      <view class="note-mock-price note-mock-text">浠锋牸锛�<text class="mock-price">锟{mockData.price}}</text> 鍏�/娆�</view>
+      <image
+        src="/static/images/bookService/examination/zhuangtai-icon.png"
+      ></image>
+      <view class="not-mock-message note-mock-text"
+        >缁勫嵎鏄敹璐瑰姛鑳斤紝璇疯喘涔板悗浣跨敤锛�</view
+      >
+      <view class="note-mock-price note-mock-text"
+        >浠锋牸锛�<text class="mock-price">锟{mockData.price}}</text> 鍏�/娆�</view
+      >
       <t-button class="buy-mock-btn" bind:tap="buyMock">璐拱缁勫嵎</t-button>
     </view>
   </view>
   <view class="loading-box" wx:if="{{}}">
     <t-loading loading="{{}}" />
   </view>
-</view>
\ No newline at end of file
+</view>
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
index 61e67c9..f849208 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
@@ -66,7 +66,8 @@
   margin-right: 4rpx;
 }
 
-.btn-box image {
+.btn-box image,
+.buy-question-btn image {
   width: 36rpx;
   height: 36rpx;
 }
@@ -290,4 +291,14 @@
 
 .t-radio__description {
   width: 102%;
+}
+
+.buy-question-btn {
+  padding-right: 5rpx;
+  display: flex;
+  justify-content: flex-end;
+}
+
+.buy-question-btn image {
+  margin-right: 4rpx;
 }
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index e66a428..0228268 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -74,6 +74,8 @@
       residue: 0, // 缁勫嵎鍓╀綑娆℃暟
       mockList: [], // 鐢ㄦ埛缁勫嵎鎻愪氦淇℃伅
     },
+    isBuyBank: false,
+    bankSaleData: null,
     relatedBookLoading: false,
     noRelatedBookData: false,
     relatedBookPath: "", // 鐩稿叧鍥句功path
@@ -275,7 +277,7 @@
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
-  onShow() {
+  onShow(options) {
     if (wx.getStorageSync("paperBookList")) {
       this.setData({
         paperBookList: JSON.parse(wx.getStorageSync("paperBookList")),
@@ -289,6 +291,9 @@
     this.setData({
       num: Number(this.data.paperBookList.length) + Number(this.data.electronicBookList.length),
     });
+    if (this.data.bookDetail) {
+      this.getBookInfo(this.data.bookDetail.id)
+    }
   },
 
   /**
@@ -526,9 +531,24 @@
       }
     }
     app.MG.store.getProductDetail(query).then((res) => {
+      console.log(111, res.datas.cmsDatas[0].datas);
+      let isBuyBank = true
+      let bankSaleData = null
+      // 鍒ゆ柇棰樺簱鏄惁鏁翠綋璐拱
+      const bank = res.datas.cmsDatas[0].datas.find((item) => item.refCode == 'questionBank')
+      if (bank) {
+        if (bank.saleMethod.length) {
+          bankSaleData = bank.saleMethod.find((item) => item.SaleType == 'Normal')
+          if (bankSaleData) {
+            isBuyBank = this.data.buyIdList.includes(bankSaleData.Id)
+          }
+        }
+      }
       this.setData({
         resourceCodeList: res.datas.cmsDatas[0].datas,
-        learnTaskData: res.datas.cmsDatas[0].datas.filter((item) => item.refCode == 'jsek_learningTasks')[0]
+        learnTaskData: res.datas.cmsDatas[0].datas.filter((item) => item.refCode == 'jsek_learningTasks')[0],
+        isBuyBank,
+        bankSaleData
       })
       if (res.datas.cmsDatas[0].datas.length) this.setData({
         learnMenu: res.datas.cmsDatas[0].datas.find(item => item.refCode == 'jsek_cloudLearning')
@@ -876,7 +896,7 @@
         }
         // newArr.push(item)
         // 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
-        newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item)
+        newArr = this.insertAndSortObjectsById(newArr, item)
         // 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄�
         rootList = rootList.filter(nitem => nitem.id != item.id)
       }
@@ -908,8 +928,8 @@
     return tree
   },
 
-  // 鎺掑簭鏁扮粍 鎸夌収productLinkPath
-  insertAndSortObjectsByProductLinkPath(array, newObj) {
+  // 鎺掑簭鏁扮粍 鎸夌収id
+  insertAndSortObjectsById(array, newObj) {
     // 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆  
     let insertIndex = array.findIndex(obj => newObj.id < obj.id);
     // 濡傛灉娌℃湁鎵惧埌鍚堥�傜殑浣嶇疆锛屽垯鏀惧湪鏁扮粍鏈熬  
@@ -1907,6 +1927,42 @@
   handleTrue() {
     // findAndUpdateItemsByIds(this.date.)
   },
+
+  // 棰樺簱璐拱
+  async buyBank() {
+    console.log(11, this.data.bankSaleData);
+    let query = {
+      remarks: '浜戞祴璇�',
+      requests: [{
+        saleMethodId: this.data.bankSaleData.Id,
+        count: 1
+      }]
+    }
+    const initOrderRes = await app.MG.store.initOrder(query)
+    if (this.data.bankSaleData.Price) {
+      // 璐拱
+      const url = "/pages/cart/paymentPage/index?orderNumber=" + initOrderRes.orderNumber + '&onNorderSaleMethod=' + initOrderRes.saleMethodLinks[0].orderSaleMethod.id;
+      wx.navigateTo({
+        url,
+      });
+    } else {
+      // 鍏嶈垂棰嗗彇
+      app.MG.store
+        .confirmOrder({
+          orderNum: initOrderRes.orderNumber,
+        })
+        .then((res) => {
+          if (res) {
+            wx.showToast({
+              title: "棰嗗彇鎴愬姛",
+              icon: "none",
+              duration: 1000,
+            });
+            this.getBookInfo(this.data.bookDetail.id);
+          }
+        });
+    }
+  },
   // 缁勫嵎鏍煎紡鍖栨棩鏈熸樉绀�
   DateFormat(date, fmt) {
     if (date && fmt) {
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 6cb3280..6288aa1 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -290,6 +290,8 @@
               <test-resource
                 id="test-resource"
                 list="{{test}}"
+                bankSaleData="{{bankSaleData}}"
+                isBuyBank="{{isBuyBank}}"
                 bookInfo="{{bookDetail}}"
                 openIds="{{openLearnids}}"
                 mockData="{{mockData}}"
@@ -297,6 +299,7 @@
                 storeInfo="{{options.storeInfo}}"
                 jslx="{{jslx}}"
                 bind:buyMock="buyMock"
+                bind:buyBank="buyBank"
               ></test-resource>
             </view>
           </t-tab-panel>
diff --git a/packagePersonal/pages/myOrder/index.js b/packagePersonal/pages/myOrder/index.js
index 365419e..f2414aa 100644
--- a/packagePersonal/pages/myOrder/index.js
+++ b/packagePersonal/pages/myOrder/index.js
@@ -356,7 +356,12 @@
       } else if (book.orderSaleMethod.type == 'createProductSaleMethod' && book.orderSaleMethod.cmsItemList == 0) {
         title = '鍥句功鏈嶅姟-缁勫嵎'
       } else {
-        title = '鍥句功鏈嶅姟-浜戝涔�'
+        debugger
+        if (book.orderSaleMethod.cmsItemList.length && book.orderSaleMethod.cmsItemList[0].type == "questionBankFolder") {
+          title = '鍥句功鏈嶅姟-浜戞祴璇�'
+        } else {
+          title = '鍥句功鏈嶅姟-浜戝涔�'
+        }
       }
     } else if (type == 'jsek_digitalCourses') {
       title = '鏁板瓧鏁欐潗'
diff --git a/packagePersonal/pages/myOrder/index.wxml b/packagePersonal/pages/myOrder/index.wxml
index 6ba7728..192e553 100644
--- a/packagePersonal/pages/myOrder/index.wxml
+++ b/packagePersonal/pages/myOrder/index.wxml
@@ -1,61 +1,161 @@
 <view class="container">
   <view class="page-header" wx:if="{{!skeletonLoding}}">
     <view class="search">
-      <t-search model:value="{{searchText}}" shape="round" clearable="{{false}}" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" class="navBar-search" style="width: 90%" bind:submit="onSearchOrder" />
+      <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
+      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" 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">
+    <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" />
+          <t-loading
+            theme="circular"
+            size="40rpx"
+            text="姝ｅ湪鍒锋柊..."
+            class="wrapper"
+          />
         </view>
       </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="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="goBookDetails" data-book="{{itemes}}" data-remarks="{{items.remarks}}">
-                <view class="leftCon {{items.saleMethodLinks.length == 1 ? 'fl' : ''}}">
+            <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="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" />
-                  <image class="purchasedIcon" wx:else src="/static/images/default-book-img.png" mode="aspectFit" />
+                  <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.product.cmsTypeRefCode == 'jsek_mediaBook' ? 
-                      itemes.orderSaleMethod.type == 'defaultSaleMethod'
-                      ? '鍥句功鏈嶅姟-鐢靛瓙涔�'
-                      : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '鍥句功鏈嶅姟-缁勫嵎' : '鍥句功鏈嶅姟-浜戝涔�' : itemes.orderSaleMethod.product.cmsTypeRefCode == 'jsek_digitalCourses' ? '鏁板瓧璇剧▼' : '鏁板瓧鏁欐潗'
-                      }}</text>
+                  <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.cmsItemList.length &&
+                      itemes.orderSaleMethod.cmsItemList[0].type ==
+                      "questionBankFolder" ? '鍥句功鏈嶅姟-浜戞祴璇�' :
+                      '鍥句功鏈嶅姟-浜戝涔�' :
+                      itemes.orderSaleMethod.product.cmsTypeRefCode ==
+                      'jsek_digitalCourses' ? '鏁板瓧璇剧▼' : '鏁板瓧鏁欐潗' }}</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>
+              <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>
+            <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>
+              <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 wx:if="{{items.state == 'Cancel'}}" class="button-bottem"
+              >鎬昏锛�<text class="price">锟{items.payPrice}}</text>
+            </view>
           </view>
         </view>
       </view>
@@ -64,14 +164,28 @@
         <empty />
       </view>
       <view class="bottom-loading" wx:if="{{bottomLoading}}">
-        <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+        <t-loading
+          theme="circular"
+          size="40rpx"
+          text="鍔犺浇涓�..."
+          class="wrapper"
+        />
       </view>
-      <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
+      <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>
+<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
+<template is="skeleton" wx:if="{{skeletonLoding}}" />
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index 21f05fd..8a28a08 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -177,6 +177,10 @@
             item.typeTxt = '浜戝涔�'
             item.productType = "鍥句功鏈嶅姟-浜戝涔�"
           }
+          if (item.orderSaleMethod.cmsItemList.length && item.orderSaleMethod.cmsItemList[0].type == "questionBankFolder") {
+            item.typeTxt = '棰樺簱'
+            item.productType = "鍥句功鏈嶅姟-浜戞祴璇�"
+          }
         }
       })
       this.setData({

--
Gitblit v1.9.1