From 72edc07a7fe714316d318708710c150f7d247bbc Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 28 三月 2024 11:50:19 +0800
Subject: [PATCH] 图书分类、列表、详情页bug修改
---
packageBookService/pages/bookServices/list/index.wxml | 2
packageBookService/pages/bookServices/examination/questionList/index.wxss | 34 ++++
packageBookService/pages/bookServices/examination/questionList/index.wxml | 20 ++
static/images/bookService/assort/book-img.png | 0
packageBookService/pages/bookServices/detail/index.wxml | 186 +++++++++++++++++++----
packageBookService/pages/bookServices/detail/components/tree/index.wxss | 4
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 3
packageBookService/pages/bookServices/examination/examination.js | 49 ++++++
packageBookService/pages/bookServices/detail/components/testResource/testResource.js | 9 +
packageBookService/pages/bookServices/list/index.js | 1
pages/bookServices/assort/index.wxml | 107 +++++++++++-
packageBookService/pages/bookServices/detail/index.js | 14 -
pages/bookServices/assort/index.wxss | 1
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss | 5
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml | 5
static/images/default-book-img.png | 0
16 files changed, 372 insertions(+), 68 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.js b/packageBookService/pages/bookServices/detail/components/testResource/testResource.js
index ec78dac..e16efd3 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.js
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.js
@@ -127,6 +127,15 @@
wx.navigateTo({
url: `/packageBookService/pages/bookServices/examination/examination?bookId=${this.properties.bookInfo.id}&rootCmsItemId=${this.properties.bookInfo.rootCmsItemId}&answerTitle=${item.name}&answerType=${'mock'}&uuid=${item.id}&mockid=${mockid}`,
})
+ },
+ // 璐拱缁勫嵎
+ buyMock() {
+ var myEventDetail = {}
+ var myEventOption = {
+ bubbles: true,
+ composed: true
+ }
+ this.triggerEvent('buyMock', myEventDetail, myEventOption)
}
}
})
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
index 0627766..700ecc7 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
@@ -80,7 +80,10 @@
<!-- 缁勫嵎鍒楄〃 -->
<view class="mock-data" wx:if="{{radioItem == 'mock'}}">
<view wx:if="{{mockData.mockList.length}}">
- <view class="mack-num">宸茬粍鍗穥{mockData.mockList.length}}娆�</view>
+ <view class="mack-num">
+ <text>宸茬粍鍗穥{mockData.mockList.length}}娆�</text>
+ <t-button class="buy-mock-btn" bind:tap="buyMock">璐拱缁勫嵎</t-button>
+ </view>
<view class="mock-list">
<view
class="mock-list-box"
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
index de86a85..9dcae05 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
@@ -161,10 +161,15 @@
height: 100rpx;
display: flex;
align-items: center;
+ justify-content: space-between;
color: #333;
font-size: 28rpx;
}
+.mack-num button {
+ margin: 0;
+}
+
.mock-list-box {
padding: 32rpx;
background-color: #F9F9F9;
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index 39a38bf..d1f41a4 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -8,7 +8,7 @@
value="{{item.id}}"
>
<view slot="header" class="header-title">
- <view>
+ <view class="title-checkBox">
<t-checkbox
icon="rectangle"
checked="{{item.checked}}"
@@ -169,7 +169,6 @@
buyIds="{{buyIds}}"
openTeachids="{{openTeachids}}"
openLearnids="{{openLearnids}}"
-
></tree>
</view>
<!-- 鏆傛棤鏁版嵁 -->
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxss b/packageBookService/pages/bookServices/detail/components/tree/index.wxss
index 6a81a09..11dfe51 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxss
@@ -11,7 +11,9 @@
align-items: center;
--td-checkbox-vertical-padding: 0
}
-
+.title-checkBox {
+ display: flex;
+}
.t-class {
background-color: #F7F7F7;
}
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 6eb4cc2..91a8109 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1454,14 +1454,12 @@
if (this.data.tabValue == 'brief' && !this.data.bookBuy) {
this.buyBook()
}
- // else if (this.data.tabValue == 'jsek_cloudLearning') {
- // const tree = this.selectComponent('#tree')
- // tree.onCloudShoppingCart()
- // } else if (this.data.tabValue == 'questionBank') {
- // this.buyMock()
- // } else {
- // console.log(this.data.tabValue);
- // }
+ else if (this.data.tabValue == 'jsek_cloudLearning') {
+ const tree = this.selectComponent('#tree')
+ tree.onCloudShoppingCart()
+ } else {
+ console.log(this.data.tabValue);
+ }
},
goRead() {
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 630ae8b..d7403f5 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -4,30 +4,55 @@
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
<view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ <t-icon
+ name="chevron-left"
+ size="30"
+ data-name="{{item}}"
+ bind:click="goBack"
+ />
</view>
<view class="navbar-title">{{options.name}}</view>
</view>
<t-toast id="t-toast" />
- <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="book"
+ bindscrolltolower="onReachBottom"
+ >
<!-- 鍥句功璇︽儏 -->
<view class="book-box">
<view class="book-detail">
<view class="detail-left">
<view class="book-img">
- <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFill" aria-label="{{bookDetail.name}}" />
+ <image
+ loading=""
+ src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
+ mode="aspectFill"
+ aria-label="{{bookDetail.name}}"
+ />
</view>
<view class="book-use">
<view class="collect" bind:tap="setCollect">
<view>
- <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" />
- <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" />
+ <image
+ loading=""
+ src="/static/images/bookService/detail/collect.png"
+ wx:if="{{!bookDetail.isFavourite}}"
+ />
+ <image
+ loading=""
+ src="/static/images/bookService/detail/collecting.png"
+ wx:if="{{bookDetail.isFavourite}}"
+ />
</view>
<view class="use-title">鏀惰棌</view>
</view>
<view class="suggest" bind:tap="suggestBtn">
<view>
- <image loading="" src="/static/images/bookService/detail/suggest.png" />
+ <image
+ loading=""
+ src="/static/images/bookService/detail/suggest.png"
+ />
</view>
<view class="use-title">鎴戣寤鸿</view>
</view>
@@ -49,15 +74,24 @@
<view class="li-content">{{bookDetail.isbn}}</view>
</view>
<view class="message-li">
- <view class="li-title" wx:if="{{bookDetail.publicationDate}}">鍑虹増鏃堕棿锛�</view>
+ <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
+ >鍑虹増鏃堕棿锛�</view
+ >
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
- <view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
+ <view
+ class="message-li"
+ wx:if="{{bookDetail.class}}"
+ style="height: 80rpx"
+ >
<view class="li-title">鍥句功鍒嗙被锛�</view>
<view class="class-name showTow">{{bookDetail.class}}</view>
</view>
</view>
- <image src="/static/images/bookService/detail/square.png" class="right-background" />
+ <image
+ src="/static/images/bookService/detail/square.png"
+ class="right-background"
+ />
</view>
</view>
<!-- 閿�鍞俊鎭� -->
@@ -66,12 +100,17 @@
<!-- 鐢靛瓙涔﹀敭浠� -->
<view class="electron-price">
<view>
- <image src="/static/images/bookService/detail/electon-price.png" />
+ <image
+ src="/static/images/bookService/detail/electon-price.png"
+ />
</view>
<view class="price">
- <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
- bookDetail.price}}</view>
- <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}}
+ <view class="price-text"
+ >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
+ bookDetail.price}}</view
+ >
+ <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}"
+ >楼{{bookDetail.oldPrice}}
</view>
</view>
<view> </view>
@@ -81,16 +120,40 @@
<view>
<image src="/static/images/bookService/detail/paper-price.png" />
</view>
- <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
- '楼'+bookDetail.paperPrice}}</view>
+ <view class="price"
+ >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+ '楼'+bookDetail.paperPrice}}</view
+ >
</view>
</view>
<!-- 缃戝簵 -->
<view class="book-web">
- <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" />
- <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" />
- <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" />
- <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" />
+ <image
+ src="/static/images/bookService/detail/jd.png"
+ wx:if="{{bookDetail.JDLink}}"
+ bind:tap="goShop"
+ data-link="{{bookDetail.JDLink}}"
+ data-type="jd"
+ />
+ <image
+ class="tmall-image"
+ src="/static/images/bookService/detail/tmall.png"
+ bind:tap="goShop"
+ data-link="{{bookDetail.tmallLink}}"
+ wx:if="{{bookDetail.tmallLink}}"
+ />
+ <image
+ src="/static/images/bookService/detail/dangdang.png"
+ bind:tap="goShop"
+ data-link="{{bookDetail.dangdangLink}}"
+ wx:if="{{bookDetail.dangdangLink}}"
+ />
+ <image
+ src="/static/images/bookService/detail/weidian.png"
+ bind:tap="goShop"
+ data-link="{{bookDetail.weidianLink}}"
+ wx:if="{{bookDetail.weidianLink}}"
+ />
</view>
</view>
</view>
@@ -156,7 +219,12 @@
wx:if="{{teach.length}}"
></tree>
</view>
- <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading }}" />
+ <t-loading
+ theme="circular"
+ size="60rpx"
+ class="loading"
+ loading="{{loading }}"
+ />
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
@@ -168,8 +236,22 @@
style="{{tabPanelstyle}}"
>
<view wx:if="{{!loading && learn.length}}">
- <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}"></learn-resource>
- <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
+ <learn-resource
+ bind:getFreeResource="getFreeResource"
+ bind:allAddShoppiingCar="allAddShoppiingCar"
+ id="learn-resource"
+ buyResourceData="{{buyResourceData}}"
+ bookId="{{bookDetail.id}}"
+ ></learn-resource>
+ <tree
+ id="tree"
+ openIds="{{openLearnids}}"
+ bookInfo="{{bookDetail}}"
+ tab="{{tabValue}}"
+ treeList="{{learn}}"
+ buyIds="{{buyIdList}}"
+ openLearnids="{{openLearnids}}"
+ ></tree>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
@@ -182,7 +264,12 @@
style="{{tabPanelstyle}}"
>
<view wx:if="{{!loading && test.length}}">
- <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}"></test-resource>
+ <test-resource
+ list="{{test}}"
+ bookInfo="{{bookDetail}}"
+ mockData="{{mockData}}"
+ bind:buyMock="buyMock"
+ ></test-resource>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
@@ -200,13 +287,29 @@
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
- <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
+ <suggest
+ class="suggest-component"
+ id="suggest-component"
+ bookIcon="{{bookDetail.icon}}"
+ bookName="{{bookDetail.name}}"
+ ></suggest>
<!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
- <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
+ <t-dialog
+ class="teachDownloadDialog"
+ visible="{{isShowTeachDownload}}"
+ title="鎻愮ず"
+ content="璇峰墠寰�PC绔笅杞�"
+ confirm-btn="{{ confirmBtn }}"
+ bind:confirm="closeTeachDownload"
+ />
<view class="applyBox" bindtap="goApply">
<view class="box">
- <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
+ <t-image
+ src="/static/images/home/yangshuForm1.png"
+ mode="heightFix"
+ class="img"
+ />
<view class="num" wx:if="{{num > 0}}">{{num}}</view>
</view>
</view>
@@ -214,20 +317,37 @@
<view class="box-bottom">
<view class="bottom-btn" bind:tap="appplyElectronicBook">
<view>
- <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
+ <t-image
+ loading=""
+ src="/static/images/bookService/detail/ebook.png"
+ ></t-image>
</view>
<view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
</view>
<view class="bottom-btn" bind:tap="appplyPaperBook">
<view>
- <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
+ <t-image
+ src="/static/images/bookService/detail/paper-book.png"
+ ></t-image>
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view class="shopCar {{((tabValue == 'brief' && bookBuy) || tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
- <view class="buy {{((tabValue == 'brief' && bookBuy) ||tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn">绔嬪嵆璐拱</view>
- <view class="buy shopCarColor" bind:tap="goRead" wx:if="{{tabValue == 'brief' && bookBuy}}">绔嬪嵆鏌ョ湅</view>
- <view class="buy shopCarColor" bind:tap="goRead" wx:if="{{tabValue == 'brief' && !bookBuy}}">鍦ㄧ嚎璇曡</view>
+ <view class="shopCar shopCarColor" bind:tap="addBookShopcCar"
+ >鍔犲叆璐墿杞�</view
+ >
+ <view class="buy buyColor" bind:tap="buyBtn">绔嬪嵆璐拱</view>
+ <view
+ class="buy shopCarColor"
+ bind:tap="goRead"
+ wx:if="{{tabValue == 'brief' && bookBuy}}"
+ >绔嬪嵆鏌ョ湅</view
+ >
+ <view
+ class="buy shopCarColor"
+ bind:tap="goRead"
+ wx:if="{{tabValue == 'brief' && !bookBuy}}"
+ >鍦ㄧ嚎璇曡</view
+ >
</view>
-</view>
\ No newline at end of file
+</view>
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index 9d544ed..0762452 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -277,7 +277,6 @@
item.userAnswer = radioChecked
item.isUserAnswer = this.isHaveAnswer(radioChecked)
if ((item.questionType == 'singleChoice' || item.questionType == 'judge') && (this.data.answerType == 'collectQuestion' || this.data.answerType == 'errorQuestion') && !item.isComplete) {
- debugger
let index = this.data.currentIndex - 1 >= 0 ? this.data.currentIndex - 1 : 0
this.handleQuestion(index)
}
@@ -760,6 +759,18 @@
index++
}
}
+ }
+ // 棰樺共瀵屾枃鏈鐞�
+ if (questionObj.stemStyle == 'RichText') {
+ // questionObj.option.txt = ''
+ questionObj.stem.stemTxt = questionObj.stem.stemTxt.replace(/\<img/gi, '<img 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 (questionObj.stemStyle == 'Image' || questionObj.stemStyle == 'TxtAndImage') {
@@ -1536,6 +1547,17 @@
}
}
}
+ // 棰樺共瀵屾枃鏈鐞�
+ if (questionObj.stemStyle == 'RichText') {
+ // questionObj.option.txt = ''
+ questionObj.stem.stemTxt = questionObj.stem.stemTxt.replace(/\<img/gi, '<img class="stem-rich-img"')
+ }
+ // 閫夐」瀵屾枃鏈鐞�
+ 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"')
+ })
+ }
// 鑾峰彇鍥剧墖
if (questionObj.stemStyle == 'Image' || questionObj.stemStyle == 'TxtAndImage') {
questionObj.stem.stemImage = getPublicImage(questionObj.stem.stemImage, 150)
@@ -1706,5 +1728,30 @@
})
console.log('妯¤�冪瓟棰樻暟鎹凡璁板綍')
})
+ },
+
+ // 瀵屾枃鏈鐞�
+ formatRichText(html) {
+ console.log(html);
+ let newContent = html.replace(/<img[^>]*>/gi, function (match, capture) {
+ match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+ match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+ match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+ return match;
+ });
+ newContent = newContent.replace(/style="[^"]+"/gi, function (match, capture) {
+ match = match
+ .replace(/<p>/gi, '<p class="p_class">')
+ .replace(/width:[^;]+;/gi, 'max-width:100%;')
+ .replace(/width:[^;]+;/gi, 'max-width:100%;');
+ return match;
+ });
+ newContent = newContent.replace(/<br[^>]*\/>/gi, "");
+ newContent = newContent.replace(/<a>/gi, '<a class="p_class "');
+ newContent = newContent.replace(/<li>/gi, '<li class="p_class "');
+ newContent = newContent.replace(/\<p/gi, '<p class="p_class "');
+ newContent = newContent.replace(/\<span/gi, '<span class="p_class "');
+ newContent = newContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;margin-top:0;margin-bottom:0;"');
+ return newContent;
}
})
\ 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 779cf0c..0a37b80 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -50,7 +50,10 @@
wx:elif="{{item.stemStyle == 'RichText'}} "
class="title-RichText"
>
- <rich-text nodes="{{item.stem.stemTxt}}"></rich-text>
+ <rich-text
+ nodes="{{item.stem.stemTxt}}"
+ style="height: 100%"
+ ></rich-text>
</view>
<!-- 濉┖棰� -->
<view wx:if="{{item.questionType == 'completion'}}">
@@ -128,9 +131,15 @@
<t-image src="{{contentItem.img}}" />
</view>
<!-- 瀵屾枃鏈� -->
- <view wx:if="{{item.optionStyle == 'RichText'}}">
+ <view
+ wx:if="{{item.optionStyle == 'RichText'}}"
+ class="judge-rich-box"
+ >
<text>{{contentItem.value}}銆�</text>
- <rich-text nodes="{{contentItem.txt}}"></rich-text>
+ <rich-text
+ nodes="{{ contentItem.txt}}"
+ style="display: flex; align-items: center; width: 100%"
+ ></rich-text>
</view>
<text
wx:if="{{submitStatus && (item.answer == contentItem.value && item.answer == item.userAnswer)}}"
@@ -199,7 +208,10 @@
<!-- 瀵屾枃鏈� -->
<view wx:if="{{item.optionStyle == 'RichText'}}">
<text>{{contentItem.value}}銆�</text>
- <rich-text nodes="{{contentItem.txt}}"></rich-text>
+ <rich-text
+ nodes="{{contentItem.txt}}"
+ class="multipleChoice"
+ ></rich-text>
</view>
</t-checkbox>
</view>
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxss b/packageBookService/pages/bookServices/examination/questionList/index.wxss
index 9bcc3d8..6d1613c 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxss
@@ -197,4 +197,38 @@
display: flex;
justify-content: center;
align-items: center;
+}
+
+.multipleChoice img {
+ width: 40rpx !important;
+}
+
+/* .judge-rich-image {
+ max-height: 300rpx !important;
+} */
+
+
+.stem-rich-img {
+ max-width: 300rpx !important;
+ height: auto;
+ object-fit: contain;
+}
+
+.option-rich-img {
+ max-width: 180rpx !important;
+ height: auto;
+ object-fit: contain;
+}
+
+.stem-rich-p {
+ display: block;
+}
+
+.judge-rich-box {
+ display: flex;
+}
+
+.t-checkbox {
+ display: flex;
+ align-items: center;
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 9731193..868752e 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -55,7 +55,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log(options)
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index a95f792..1b7f4da 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -9,7 +9,6 @@
<view class="bookServices-list">
<view class="list-header">
- <!-- <scroll-view scroll-x="{{true}}" class="header-scroll"> -->
<view class="header-scroll">
<t-dropdown-menu style="width: 1000rpx">
<t-dropdown-item options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" />
@@ -18,7 +17,6 @@
<t-dropdown-item label="鏂板舰鎬佹暀鏉�" options="{{newTextBook.options}}" optionsColumns="2" multiple defaultValue="{{newTextBook.value}}" bind:confirm="changeNewText" bind:reset="resetNewText" />
</t-dropdown-menu>
</view>
- <!-- </scroll-view> -->
<view class="header-sort" bind:tap="sortClick">
<text class="sort-name">鎺掑簭</text>
<!-- <view class="sort-icon"> -->
diff --git a/pages/bookServices/assort/index.wxml b/pages/bookServices/assort/index.wxml
index e715594..26407f4 100644
--- a/pages/bookServices/assort/index.wxml
+++ b/pages/bookServices/assort/index.wxml
@@ -2,8 +2,21 @@
<view class="page-header">
<!-- 鎼滅储妗� -->
<view class="search">
- <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" leftIcon="" bind:submit="navToSearchPage" placeholder-style="{{placeholderstyle}}">
- <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" />
+ <t-search
+ t-class-input="t-search__input"
+ t-class-input-container="t-search__input-container"
+ placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
+ leftIcon=""
+ bind:submit="navToSearchPage"
+ placeholder-style="{{placeholderstyle}}"
+ >
+ <t-icon
+ slot="left-icon"
+ prefix="wr"
+ name="search"
+ size="40rpx"
+ color="#bbb"
+ />
</t-search>
</view>
</view>
@@ -12,7 +25,13 @@
<view class="side-bar-wrapper" wx:if="{{!loading}}">
<view class="tab-left">
<t-side-bar value="{{assortCheck.code}}" bind:change="changeAssort">
- <t-side-bar-item wx:for="{{assortList}}" wx:key="id" value="{{item.refCode}}" label="{{item.name}}" badge-props="{{item.badgeProps}}" />
+ <t-side-bar-item
+ wx:for="{{assortList}}"
+ wx:key="id"
+ value="{{item.refCode}}"
+ label="{{item.name}}"
+ badge-props="{{item.badgeProps}}"
+ />
</t-side-bar>
</view>
<view class="page-right">
@@ -20,27 +39,73 @@
<view class="side-bar-content" wx:if="{{!listLoding}}">
<!-- 涓�绾у垎绫� -->
<view class="tab-top">
- <scroll-view scroll-x="{{true}}" class="myScroll" show-scrollbar="{{false}}">
- <view wx:for="{{startList}}" wx:key="id" class="row {{startCheck.id == item.id ? 'tab-active' : ''}}" bind:tap="tabClick" data-tabData="{{item}}">{{item.name}}</view>
+ <scroll-view
+ scroll-x="{{true}}"
+ class="myScroll"
+ show-scrollbar="{{false}}"
+ >
+ <view
+ wx:for="{{startList}}"
+ wx:key="id"
+ class="row {{startCheck.id == item.id ? 'tab-active' : ''}}"
+ bind:tap="tabClick"
+ data-tabData="{{item}}"
+ >{{item.name}}</view
+ >
</scroll-view>
</view>
<!-- 鍐呭 -->
- <scroll-view scroll-y="{{true}}" class="class-list" scroll-into-view="{{ 'list' + startCheck.id}}">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="class-list"
+ scroll-into-view="{{ 'list' + startCheck.id}}"
+ >
<view wx:if="{{listLoading}}">
- <t-loading theme="spinner" size="400rpx" loading="{{listLoading}}"></t-loading>
+ <t-loading
+ theme="spinner"
+ size="400rpx"
+ loading="{{listLoading}}"
+ ></t-loading>
</view>
- <view wx:for="{{startList}}" wx:for-item="item" wx:key="id" id="{{ 'list' + item.id}}" class="class-box" wx:if="{{!listLoading}}">
+ <view
+ wx:for="{{startList}}"
+ wx:for-item="item"
+ wx:key="id"
+ id="{{ 'list' + item.id}}"
+ class="class-box"
+ wx:if="{{!listLoading}}"
+ >
<view class="class-name">{{item.name}}</view>
<view class="class-content">
- <view wx:for="{{item.children}}" wx:for-item="citem" wx:key="id" class="book-box" bind:tap="goPageList" data-stair="{{citem}}" data-tabData="{{item}}" wx:if="{{item.children.length}}">
+ <view
+ wx:for="{{item.children}}"
+ wx:for-item="citem"
+ wx:key="id"
+ class="book-box"
+ bind:tap="goPageList"
+ data-stair="{{citem}}"
+ data-tabData="{{item}}"
+ wx:if="{{item.children.length}}"
+ >
<view class="assort-img">
- <image src="{{citem.icon ? citem.icon : '/static/images/bookService/assort/book-img.png'}}" mode="widthFix" />
+ <image
+ src="{{citem.icon ? citem.icon : '/static/images/default-book-img.png'}}"
+ mode="widthFix"
+ />
</view>
<view class="classify">{{citem.name}}</view>
</view>
- <view wx:if="{{!item.children.length}}" class="book-box" bind:tap="goPageList" data-tabData="{{item}}">
+ <view
+ wx:if="{{!item.children.length}}"
+ class="book-box"
+ bind:tap="goPageList"
+ data-tabData="{{item}}"
+ >
<view class="assort-img">
- <image src="{{item.icon ? item.icon : '/static/images/bookService/assort/book-img.png'}}" mode="widthFix"></image>
+ <image
+ src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
+ mode="widthFix"
+ ></image>
</view>
<text class="classify">鍏ㄩ儴</text>
</view>
@@ -51,11 +116,23 @@
</view>
<!-- loading -->
<view class="loading-box" wx:if="{{listLoding}}">
- <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{listLoding}}" wx:if="{{listLoding}}" />
+ <t-loading
+ theme="circular"
+ size="60rpx"
+ class="wrapper"
+ loading="{{listLoding}}"
+ wx:if="{{listLoding}}"
+ />
</view>
</view>
</view>
<view class="loading-box" wx:if="{{loading}}">
- <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{loading}}" wx:if="{{loading}}" />
+ <t-loading
+ theme="circular"
+ size="60rpx"
+ class="wrapper"
+ loading="{{loading}}"
+ wx:if="{{loading}}"
+ />
</view>
-</view>
\ No newline at end of file
+</view>
diff --git a/pages/bookServices/assort/index.wxss b/pages/bookServices/assort/index.wxss
index bf4c371..a37204b 100644
--- a/pages/bookServices/assort/index.wxss
+++ b/pages/bookServices/assort/index.wxss
@@ -68,6 +68,7 @@
width: 100%;
height: 108rpx;
white-space: nowrap;
+ overflow-x: auto;
}
.myScroll .row {
diff --git a/static/images/bookService/assort/book-img.png b/static/images/bookService/assort/book-img.png
index 2aa98fd..bd40923 100644
--- a/static/images/bookService/assort/book-img.png
+++ b/static/images/bookService/assort/book-img.png
Binary files differ
diff --git a/static/images/default-book-img.png b/static/images/default-book-img.png
index 3ee5005..bd40923 100644
--- a/static/images/default-book-img.png
+++ b/static/images/default-book-img.png
Binary files differ
--
Gitblit v1.9.1