From f1e20feafa89c8d50af5e69c0333a9efc239ee49 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 01 四月 2024 14:09:11 +0800
Subject: [PATCH] 图书详情页bug修改,我的错题、收藏模式下答题卡添加题目类型,非单选题添加查看解析按钮

---
 packageBookService/pages/bookServices/examination/questionList/index.js      |   19 ++
 packageBookService/pages/bookServices/list/index.wxml                        |   18 +-
 packageBookService/pages/bookServices/examination/questionList/index.wxss    |    9 +
 packageBookService/pages/bookServices/examination/questionList/index.wxml    |    9 +
 static/images/bookService/detail/biji-click-icon.png                         |    0 
 static/images/bookService/detail/biji-icon-g.png                             |    0 
 static/images/bookService/detail/ebook-click.png                             |    0 
 static/images/bookService/detail/test-click-icon.png                         |    0 
 packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml |   56 +++++++-
 packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss |   17 ++
 static/images/bookService/detail/jiaoxueziyuan-click.png                     |    0 
 packageBookService/pages/bookServices/examination/questionList/index.json    |    1 
 packageBookService/pages/bookServices/examination/examination.wxml           |    1 
 static/images/bookService/detail/test-icon-g.png                             |    0 
 packageBookService/pages/bookServices/examination/questionOptions/index.wxml |    2 
 app.json                                                                     |    2 
 static/images/bookService/detail/yunxuexi.png                                |    0 
 packageBookService/pages/bookServices/examination/examination.js             |  199 +++++++++++++++++++++++----
 static/images/bookService/detail/yunxuexi-click.png                          |    0 
 static/images/bookService/detail/jiaoxueziyuan.png                           |    0 
 packageBookService/pages/bookServices/list/index.js                          |   29 ++++
 static/images/bookService/detail/ebook-g.png                                 |    0 
 static/images/bookService/detail/tushujianjie-g.png                          |    0 
 static/images/bookService/detail/tushujianjie-click.png                      |    0 
 24 files changed, 302 insertions(+), 60 deletions(-)

diff --git a/app.json b/app.json
index d2468fb..5d3f411 100644
--- a/app.json
+++ b/app.json
@@ -12,8 +12,8 @@
     "pages/personalCenter/index",
     "pages/personalCenter/feedBackSubmit/index",
     "pages/personalCenter/certificate/index",
-    "pages/testLogin/index",
     "pages/bookServices/assort/index",
+    "pages/testLogin/index",
     "pages/bindInfo/index"
   ],
   "subPackages": [
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml
index 85c148c..34efd92 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml
@@ -9,23 +9,65 @@
   </view>
 </t-dialog> -->
 <!-- <view class="suggest"> -->
-<t-popup visible="{{showWithInput}}" bind:visible-change="onVisibleChange" placement="center">
+<t-popup
+  visible="{{showWithInput}}"
+  bind:visible-change="onVisibleChange"
+  placement="center"
+>
   <view class="top-icon">
     <t-image src="/static/images/bookService/detail/feedback.png"></t-image>
   </view>
   <view slot="content" class="content">
     <view class="top-title">鎴戣寤鸿</view>
     <view class="demo-rate">
-      <t-rate value="{{ratevalue}}" catch:change="onChangeRate" size="{{30}}" color="#FFB400" />
+      <t-rate
+        value="{{ratevalue}}"
+        catch:change="onChangeRate"
+        size="{{30}}"
+        color="#FFB400"
+      />
     </view>
     <view class="phone-input">
-      <t-input clearable value="{{inputvalue}}" slot="content" label="" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" placeholder-class="placeholder" bind:change="inputChange" type="number" maxlength="{{11}}" class="phone" style="{{inputStyle}}" />
+      <t-input
+        clearable
+        value="{{inputvalue}}"
+        slot="content"
+        label=""
+        placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"
+        bind:change="inputChange"
+        type="number"
+        maxlength="{{11}}"
+        class="phone"
+        style="{{inputStyle}}"
+        placeholder-style="{{placeholderstyle}}"
+      />
     </view>
-    <t-textarea value="{{textvalue}}" t-class="external-class" label="" placeholder="璇疯緭鍏ュ弽棣堝唴瀹�" maxcharacter="200" disableDefaultPadding="{{true}}" indicator bind:change="textareaChange" style="{{inputStyle}}" placeholder-style="{{placeholderstyle}}" />
+    <view style="width: 100%">
+      <t-textarea
+        value="{{textvalue}}"
+        t-class="external-class"
+        label=""
+        placeholder="璇疯緭鍏ュ弽棣堝唴瀹�"
+        maxcharacter="200"
+        disableDefaultPadding="{{true}}"
+        indicator
+        bind:change="textareaChange"
+        style="{{inputStyle}}"
+        placeholder-style="{{placeholderstyle}}"
+      />
+    </view>
   </view>
   <view class="submit-btn">
-    <t-button theme="primary" size="large" block bind:tap="confirmSuggest">鎻愪氦</t-button>
+    <t-button theme="primary" size="large" block bind:tap="confirmSuggest"
+      >鎻愪氦</t-button
+    >
   </view>
-  <t-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="closeDialog" />
+  <t-icon
+    t-class="close-btn"
+    name="close-circle"
+    size="32"
+    color="#fff"
+    bind:tap="closeDialog"
+  />
 </t-popup>
-<!-- </view> -->
\ No newline at end of file
+<!-- </view> -->
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss
index ce6e254..4e10ed6 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss
@@ -60,6 +60,9 @@
 
 .content {
   position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
   border-radius: 40rpx;
   padding: 100rpx 40rpx 0rpx 40rpx;
   width: 600rpx;
@@ -68,7 +71,7 @@
 
 .demo-rate {
   width: 350rpx;
-  margin: 20rpx auto 20rpx auto;
+  margin: 20rpx 0;
 }
 
 .phone {
@@ -77,6 +80,9 @@
   border-radius: 20rpx;
 }
 
+.phone-input {
+  width: 100%;
+}
 
 .submit-btn {
   padding: 40rpx;
@@ -100,8 +106,15 @@
 
 .top-title {
   width: 160rpx;
-  margin: 0 auto;
   color: #0F1214;
   font-size: 40rpx;
   font-weight: bold;
+}
+
+.t-input__placeholder {
+  font-size: 28rpx;
+}
+
+.phone-input .t-input__placeholder {
+  font-size: 28rpx !important
 }
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index fc94dce..c90f3bc 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -253,6 +253,13 @@
       if (flag) this.handleQuestion(index)
     }
   },
+  // 鎴戠殑閿欓锛屾敹钘忔煡鐪嬭В鏋愭寜閽�
+  viewParsing() {
+    if (this.data.answerType == 'collectQuestion' || this.data.answerType == 'errorQuestion') {
+      const item = this.data.questionDataList[this.data.currentIndex]
+      if (!item.isComplete) this.handleQuestion(this.data.currentIndex)
+    }
+  },
   // 鐐瑰嚮绛旈鍗¤烦杞鐩�
   goQuestion(e) {
     const id = e.detail.id
@@ -387,7 +394,6 @@
   },
   // 鎻愪氦閫昏緫
   submitPaper() {
-
     // 鍏抽棴閫�鍑洪〉闈㈢洃鍚�
     wx.disableAlertBeforeUnload()
     this.setData({
@@ -852,7 +858,17 @@
       // 绠�绛� 缈昏瘧
       questionList[index].isRight = null
     } else if (item.questionType == 'completion') {
-      // 濉┖
+      if (item.answer == 'string') {
+        item.isRight = item.answer == item.userAnswer[0]
+      } else {
+        if (item.answer.length != item.userAnswer.length) {
+          item.isRight = false
+        } else {
+          item.isRight = item.answer.every(
+            (value, index) => value === item.userAnswer[index]
+          )
+        }
+      }
       // subjectiveGrade.value += item.score
       if (typeof item.answer == 'string') {
         questionList[index].isRight = item.answer == item.userAnswer[0]
@@ -1071,12 +1087,35 @@
   // 鑾峰彇鏀惰棌澶�
   async getCollectDataList() {
     let questionArr = []
+    // this.setData({
+    //   cardList: [{
+    //     catalogName: '鏀惰棌澶�',
+    //     infoList: []
+    //   }]
+    // })
     this.setData({
       cardList: [{
-        catalogName: '鏀惰棌澶�',
+        catalogName: '鍗曢�夐',
+        infoList: []
+      }, {
+        catalogName: '鍒ゆ柇棰�',
+        infoList: []
+      }, {
+        catalogName: '澶氶�夐',
+        infoList: []
+      }, {
+        catalogName: '濉┖棰�',
+        infoList: []
+      }, {
+        catalogName: '绠�绛旈',
         infoList: []
       }]
     })
+    let singleChoiceArr = [] // 鍗曢��
+    let judgeArr = [] // 鍒ゆ柇
+    let shortArr = [] // 绠�绛�
+    let multipleChoiceArr = [] // 澶氶��
+    let completionArr = [] // 濉┖
     let query = {
       path: '*',
       cmsPath: this.data.rootCmsItemId,
@@ -1157,25 +1196,61 @@
             if (optionItem.img) optionItem.img = getPublicImage(optionItem.img, 150)
           })
         }
-        // if (item.Embedded_QuestionBank_QuestionType == 'judge') {
-        //   topicList.value.judge.data.push(questionObj)
-        // } else if (item.Embedded_QuestionBank_QuestionType == 'singleChoice') {
-        //   topicList.value.radio.data.push(questionObj)
-        // } else if (item.Embedded_QuestionBank_QuestionType == 'multipleChoice') {
-        //   topicList.value.check.data.push(questionObj)
-        // } else if (item.Embedded_QuestionBank_QuestionType == 'completion') {
-        //   topicList.value.gap.data.push(questionObj)
-        // } else if (item.Embedded_QuestionBank_QuestionType == 'shortAnswer') {
-        //   topicList.value.short.data.push(questionObj)
-        // }
-        questionArr.push(questionObj)
-        // cardList.value[0].infoList.push(questionObj)
+        // 棰樺共瀵屾枃鏈鐞�
+        if (questionObj.stemStyle == 'RichText') {
+          // questionObj.option.txt = ''
+          questionObj.stem.stemTxt = questionObj.stem.stemTxt.replace(/\<img/gi, '<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" ').replace(/\<p/gi, '<p class="stem-rich-p"')
+
+        }
+        // 閫夐」瀵屾枃鏈鐞�
+        if (questionObj.optionStyle == 'RichText' && (questionObj.questionType == 'singleChoice' || questionObj.questionType == 'judge' || questionObj.questionType == 'multipleChoice')) {
+          questionObj.option.forEach(item => {
+            if (item.txt) item.txt = item.txt.replace(/\<img/gi, '<img class="option-rich-img"').replace(/\<p/gi, '<p class="stem-rich-p"')
+          })
+        }
+        if (item.Embedded_QuestionBank_QuestionType == 'judge') {
+          questionObj.type = '鍒ゆ柇棰�'
+          judgeArr.push(questionObj)
+        } else if (item.Embedded_QuestionBank_QuestionType == 'singleChoice') {
+          questionObj.type = '鍗曢�夐'
+          singleChoiceArr.push(questionObj)
+        } else if (item.Embedded_QuestionBank_QuestionType == 'multipleChoice') {
+          questionObj.type = '澶氶�夐'
+          multipleChoiceArr.push(questionObj)
+        } else if (item.Embedded_QuestionBank_QuestionType == 'completion') {
+          questionObj.type = '濉┖棰�'
+          completionArr.push(questionObj)
+        } else if (item.Embedded_QuestionBank_QuestionType == 'shortAnswer') {
+          questionObj.type = '绠�绛旈'
+          shortArr.push(questionObj)
+        }
+        // questionArr.push(questionObj)
       })
-      // loadings.value = false
+      // this.setData({
+      //   questionDataList: questionArr,
+      //   ['cardList[0].infoList']: questionArr,
+      //   loading: false,
+      // })
+      this.setData({
+        ['cardList[0].infoList']: singleChoiceArr,
+        ['cardList[1].infoList']: judgeArr,
+        ['cardList[2].infoList']: multipleChoiceArr,
+        ['cardList[3].infoList']: completionArr,
+        ['cardList[3].infoList']: shortArr,
+      })
+      const cardList = this.data.cardList
+      for (let index = 0; index < cardList.length; index++) {
+        const item = cardList[index];
+        for (let cindex = 0; cindex < item.infoList.length; cindex++) {
+          const citem = item.infoList[cindex]
+          citem.number = cindex + 1
+          questionArr.push(citem)
+        }
+      }
       this.setData({
         questionDataList: questionArr,
-        ['cardList[0].infoList']: questionArr,
-        loading: false,
+        cardList: cardList,
+        loading: false
       })
     })
   },
@@ -1217,12 +1292,35 @@
   },
   // 鑾峰彇閿欓闆�
   async getErrorDataList() {
+    // this.setData({
+    //   cardList: [{
+    //     catalogName: '閿欓闆�',
+    //     infoList: []
+    //   }]
+    // })
     this.setData({
       cardList: [{
-        catalogName: '閿欓闆�',
+        catalogName: '鍗曢�夐',
+        infoList: []
+      }, {
+        catalogName: '鍒ゆ柇棰�',
+        infoList: []
+      }, {
+        catalogName: '澶氶�夐',
+        infoList: []
+      }, {
+        catalogName: '濉┖棰�',
+        infoList: []
+      }, {
+        catalogName: '绠�绛旈',
         infoList: []
       }]
     })
+    let singleChoiceArr = [] // 鍗曢��
+    let judgeArr = [] // 鍒ゆ柇
+    let shortArr = [] // 绠�绛�
+    let multipleChoiceArr = [] // 澶氶��
+    let completionArr = [] // 濉┖
     let query = {
       path: '*',
       cmsPath: this.data.rootCmsItemId,
@@ -1303,22 +1401,57 @@
             if (optionItem.img) optionItem.img = getPublicImage(optionItem.img, 150)
           })
         }
-        // if (item.Embedded_QuestionBank_QuestionType == 'judge') {
-        //   topicList.value.judge.data.push(questionObj)
-        // } else if (item.Embedded_QuestionBank_QuestionType == 'singleChoice') {
-        //   topicList.value.radio.data.push(questionObj)
-        // } else if (item.Embedded_QuestionBank_QuestionType == 'multipleChoice') {
-        //   topicList.value.check.data.push(questionObj)
-        // } else if (item.Embedded_QuestionBank_QuestionType == 'completion') {
-        //   topicList.value.gap.data.push(questionObj)
-        // } else if (item.Embedded_QuestionBank_QuestionType == 'shortAnswer') {
-        //   topicList.value.short.data.push(questionObj)
-        // }
-        questionArr.push(questionObj)
+        // 棰樺共瀵屾枃鏈鐞�
+        if (questionObj.stemStyle == 'RichText') {
+          // questionObj.option.txt = ''
+          questionObj.stem.stemTxt = questionObj.stem.stemTxt.replace(/\<img/gi, '<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" ').replace(/\<p/gi, '<p class="stem-rich-p"')
+
+        }
+        // 閫夐」瀵屾枃鏈鐞�
+        if (questionObj.optionStyle == 'RichText' && (questionObj.questionType == 'singleChoice' || questionObj.questionType == 'judge' || questionObj.questionType == 'multipleChoice')) {
+          questionObj.option.forEach(item => {
+            if (item.txt) item.txt = item.txt.replace(/\<img/gi, '<img class="option-rich-img"').replace(/\<p/gi, '<p class="stem-rich-p"')
+          })
+        }
+        if (item.Embedded_QuestionBank_QuestionType == 'judge') {
+          questionObj.type = '鍒ゆ柇棰�'
+          judgeArr.push(questionObj)
+        } else if (item.Embedded_QuestionBank_QuestionType == 'singleChoice') {
+          questionObj.type = '鍗曢�夐'
+          singleChoiceArr.push(questionObj)
+        } else if (item.Embedded_QuestionBank_QuestionType == 'multipleChoice') {
+          questionObj.type = '澶氶�夐'
+          multipleChoiceArr.push(questionObj)
+        } else if (item.Embedded_QuestionBank_QuestionType == 'completion') {
+          questionObj.type = '濉┖棰�'
+          completionArr.push(questionObj)
+        } else if (item.Embedded_QuestionBank_QuestionType == 'shortAnswer') {
+          questionObj.type = '绠�绛旈'
+          shortArr.push(questionObj)
+        }
+        // questionArr.push(questionObj)
       })
       this.setData({
+        // questionDataList: questionArr,
+        ['cardList[0].infoList']: singleChoiceArr,
+        ['cardList[1].infoList']: judgeArr,
+        ['cardList[2].infoList']: multipleChoiceArr,
+        ['cardList[3].infoList']: completionArr,
+        ['cardList[3].infoList']: shortArr,
+        // loading: false
+      })
+      const cardList = this.data.cardList
+      for (let index = 0; index < cardList.length; index++) {
+        const item = cardList[index];
+        for (let cindex = 0; cindex < item.infoList.length; cindex++) {
+          const citem = item.infoList[cindex]
+          citem.number = cindex + 1
+          questionArr.push(citem)
+        }
+      }
+      this.setData({
         questionDataList: questionArr,
-        ['cardList[0].infoList']: questionArr,
+        cardList: cardList,
         loading: false
       })
     })
diff --git a/packageBookService/pages/bookServices/examination/examination.wxml b/packageBookService/pages/bookServices/examination/examination.wxml
index 3d3051b..6d08914 100644
--- a/packageBookService/pages/bookServices/examination/examination.wxml
+++ b/packageBookService/pages/bookServices/examination/examination.wxml
@@ -54,6 +54,7 @@
     bind:onChangeRadio="onChangeRadio"
     bind:onChangeInput="onChangeInput"
     bind:changeSwiper="changeSwiper"
+    bind:viewParsing="viewParsing"
   ></question-list>
   <view class="lodaing-box" wx:if="{{loading}}">
     <t-loading
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.js b/packageBookService/pages/bookServices/examination/questionList/index.js
index ec3a161..2b484c8 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.js
+++ b/packageBookService/pages/bookServices/examination/questionList/index.js
@@ -48,7 +48,9 @@
     duration: 500,
     interval: 5000,
     paginationPosition: 'bottom-right',
-    navigation: { type: 'fraction' },
+    navigation: {
+      type: 'fraction'
+    },
     showIndex: 0,
   },
 
@@ -63,11 +65,11 @@
       })
       var myEventDetail = {
         index: e.detail.current
-      } // detail瀵硅薄锛屾彁渚涚粰浜嬩欢鐩戝惉鍑芥暟
+      }
       var myEventOption = {
         bubbles: true,
         composed: true,
-      } // 瑙﹀彂浜嬩欢鐨勯�夐」
+      }
       this.triggerEvent('changeSwiper', myEventDetail, myEventOption)
     },
     // 鍗曢��  瀵屾枃鏈杈撳叆  瑙﹀彂
@@ -103,5 +105,14 @@
       } // 瑙﹀彂浜嬩欢鐨勯�夐」
       this.triggerEvent('onChangeInput', myEventDetail, myEventOption)
     },
+    // 鎴戠殑閿欓锛屾敹钘忔煡鐪嬭В鏋愭寜閽�
+    viewParsing() {
+      var myEventDetail = {}
+      var myEventOption = {
+        bubbles: true,
+        composed: true,
+      }
+      this.triggerEvent('viewParsing', myEventDetail, myEventOption)
+    }
   }
-})
+})
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.json b/packageBookService/pages/bookServices/examination/questionList/index.json
index a447ca6..aa6c4c4 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.json
+++ b/packageBookService/pages/bookServices/examination/questionList/index.json
@@ -11,6 +11,7 @@
     "t-checkbox-group": "tdesign-miniprogram/checkbox-group/checkbox-group",
     "t-textarea": "tdesign-miniprogram/textarea/textarea",
     "t-empty": "tdesign-miniprogram/empty/empty",
+    "t-button": "tdesign-miniprogram/button/button",
     "mp-html": "mp-html"
   }
 }
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index 22ae54e..d84f477 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -10,7 +10,10 @@
     style="background-color:{{isNight ? '#222' : '#fff'}}"
   >
     <text class="title-name">{{questionList[showIndex].type}}</text
-    ><text class="title-score" style="color: {{isNight ? '#fff' : '#000'}};"
+    ><text
+      wx:if="{{questionList[showIndex].score}}"
+      class="title-score"
+      style="color: {{isNight ? '#fff' : '#000'}};"
       >(姣忛{{questionList[showIndex].score}}鍒�)</text
     >
   </view>
@@ -246,7 +249,9 @@
       <view
         wx:if="{{(answerType == 'collectQuestion' || answerType ==  'errorQuestion') && (item.questionType == 'multipleChoice' || item.questionType ==  'completion' || item.questionType == 'shortAnswer')}}"
       >
-        鏌ョ湅瑙f瀽
+        <t-button theme="primary" class="view-parsing" bind:tap="viewParsing"
+          >鏌ョ湅瑙f瀽</t-button
+        >
       </view>
       <!-- 鍗曢�夈�佸閫夎В鏋� -->
       <view
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxss b/packageBookService/pages/bookServices/examination/questionList/index.wxss
index 8b7b3b5..8e4d201 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxss
@@ -254,4 +254,13 @@
 .check-text-box {
   display: inline-block;
   width: calc(100% - 25px);
+}
+
+.view-parsing {
+  margin-top: 40rpx;
+  --td-button-primary-bg-color: #fff;
+  --td-button-primary-color: #ff6c00;
+  --td-button-primary-active-bg-color: #fff0e6;
+  --td-button-primary-border-color: #ff6c00;
+  --td-button-primary-active-border-color: #ff6c00;
 }
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
index 804220a..ed07b9f 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -79,7 +79,7 @@
     <view class="question-card-list">
       <view wx:for="{{cardList}}" wx:key="index" class="card-box">
         <!-- 棰樺瀷 -->
-        <view class="question-title">
+        <view class="question-title" wx:if="{{item.infoList.length}}">
           <text class="color-box"></text>
           <text class="title-text">{{item.catalogName}}</text>
         </view>
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index f8279a2..9409fb6 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -38,6 +38,29 @@
       value: [],
       options: [],
     },
+    sortList: {
+      value: '',
+      options: [{
+          value: '',
+          label: '缁煎悎鎺掑簭',
+        }, {
+          value: '1',
+          label: '鍚嶇О姝e簭'
+        },
+        {
+          value: '2',
+          label: '鍚嶇О鍊掑彊'
+        },
+        {
+          value: '3',
+          label: '鍑虹増鏃堕棿姝e簭'
+        },
+        {
+          value: '3',
+          label: '鍑虹増鏃堕棿鍊掑彊'
+        }
+      ],
+    },
     newTextBook: {
       value: [],
       options: [],
@@ -469,6 +492,12 @@
     });
     this.getBookList(this.data.path);
   },
+  // 鎺掑簭鍒囨崲
+  onSortChange(e) {
+    this.setData({
+      'sortList.value': e.detail.value
+    })
+  },
   changeNewText(e) {
     this.setData({
       'newTextBook.value': e.detail.value,
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 95db35c..d633095 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -67,7 +67,6 @@
       </view>
       <view class="header-sort" bind:tap="sortClick">
         <text class="sort-name">鎺掑簭</text>
-        <!-- <view class="sort-icon"> -->
         <t-icon
           name="swap-left"
           size="28rpx"
@@ -80,17 +79,16 @@
           class="icon-left"
           color="{{sort == 'Desc' ? '#ff6c00' : ''}}"
         />
-        <!-- </view> -->
+        <!-- <t-dropdown-menu>
+          <t-dropdown-item
+            label="鎺掑簭"
+            options="{{sortList.options}}"
+            value="{{sortList.value}}"
+            bindchange="onSortChange"
+          />
+        </t-dropdown-menu> -->
       </view>
     </view>
-    <!-- <t-pull-down-refresh
-      value="{{enable}}"
-      loadingProps="{{loadingProps}}"
-      loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝e湪鍒锋柊', '鍒锋柊瀹屾垚']}}"
-      bind:refresh="onRefresh"
-      class="down-refresh"
-    >
-    </t-pull-down-refresh> -->
     <scroll-view
       scroll-y="{{true}}"
       refresher-enabled="{{true}}"
diff --git a/static/images/bookService/detail/biji-click-icon.png b/static/images/bookService/detail/biji-click-icon.png
index 3096a1e..33f264f 100644
--- a/static/images/bookService/detail/biji-click-icon.png
+++ b/static/images/bookService/detail/biji-click-icon.png
Binary files differ
diff --git a/static/images/bookService/detail/biji-icon-g.png b/static/images/bookService/detail/biji-icon-g.png
index af55223..8e8635c 100644
--- a/static/images/bookService/detail/biji-icon-g.png
+++ b/static/images/bookService/detail/biji-icon-g.png
Binary files differ
diff --git a/static/images/bookService/detail/ebook-click.png b/static/images/bookService/detail/ebook-click.png
index 95be9be..5a6e91b 100644
--- a/static/images/bookService/detail/ebook-click.png
+++ b/static/images/bookService/detail/ebook-click.png
Binary files differ
diff --git a/static/images/bookService/detail/ebook-g.png b/static/images/bookService/detail/ebook-g.png
index 09ce211..ea71d79 100644
--- a/static/images/bookService/detail/ebook-g.png
+++ b/static/images/bookService/detail/ebook-g.png
Binary files differ
diff --git a/static/images/bookService/detail/jiaoxueziyuan-click.png b/static/images/bookService/detail/jiaoxueziyuan-click.png
index 4a59435..876abc0 100644
--- a/static/images/bookService/detail/jiaoxueziyuan-click.png
+++ b/static/images/bookService/detail/jiaoxueziyuan-click.png
Binary files differ
diff --git a/static/images/bookService/detail/jiaoxueziyuan.png b/static/images/bookService/detail/jiaoxueziyuan.png
index c9a38ae..c45fefb 100644
--- a/static/images/bookService/detail/jiaoxueziyuan.png
+++ b/static/images/bookService/detail/jiaoxueziyuan.png
Binary files differ
diff --git a/static/images/bookService/detail/test-click-icon.png b/static/images/bookService/detail/test-click-icon.png
index 2e41a97..3a73b04 100644
--- a/static/images/bookService/detail/test-click-icon.png
+++ b/static/images/bookService/detail/test-click-icon.png
Binary files differ
diff --git a/static/images/bookService/detail/test-icon-g.png b/static/images/bookService/detail/test-icon-g.png
index 7ffce54..d709290 100644
--- a/static/images/bookService/detail/test-icon-g.png
+++ b/static/images/bookService/detail/test-icon-g.png
Binary files differ
diff --git a/static/images/bookService/detail/tushujianjie-click.png b/static/images/bookService/detail/tushujianjie-click.png
index 9adbaf1..699bea9 100644
--- a/static/images/bookService/detail/tushujianjie-click.png
+++ b/static/images/bookService/detail/tushujianjie-click.png
Binary files differ
diff --git a/static/images/bookService/detail/tushujianjie-g.png b/static/images/bookService/detail/tushujianjie-g.png
index 535402f..34295ff 100644
--- a/static/images/bookService/detail/tushujianjie-g.png
+++ b/static/images/bookService/detail/tushujianjie-g.png
Binary files differ
diff --git a/static/images/bookService/detail/yunxuexi-click.png b/static/images/bookService/detail/yunxuexi-click.png
index 89b9e28..95e529e 100644
--- a/static/images/bookService/detail/yunxuexi-click.png
+++ b/static/images/bookService/detail/yunxuexi-click.png
Binary files differ
diff --git a/static/images/bookService/detail/yunxuexi.png b/static/images/bookService/detail/yunxuexi.png
index f69a677..df61282 100644
--- a/static/images/bookService/detail/yunxuexi.png
+++ b/static/images/bookService/detail/yunxuexi.png
Binary files differ

--
Gitblit v1.9.1