From 0bbc91dbf3a58da857ef098b34f9d2f86361c766 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 11 四月 2024 17:56:46 +0800
Subject: [PATCH] 答题器图标替换,图书分类页骨架屏样式修改
---
packageBookService/pages/bookServices/examination/questionList/index.js | 4
static/images/bookService/examination/chongzuo-w.png | 0
static/images/bookService/examination/datika-w.png | 0
packageBookService/pages/bookServices/examination/questionSchedule/index.wxss | 5 +
static/images/bookService/examination/wodeshoucang-w.png | 0
packageBookService/pages/bookServices/examination/examination.js | 8 +
packageBookService/pages/bookServices/examination/questionSchedule/index.wxml | 4
static/images/bookService/examination/setting-w.png | 0
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml | 14 ++
pages/bookServices/assort/index.skeleton.wxml | 227 ++++++++++++++++++++++++++++++++++++---------
10 files changed, 213 insertions(+), 49 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
index b6cc4e9..407e4dd 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
@@ -20,6 +20,7 @@
</view>
</t-radio>
</view>
+ <!-- 鏂紑 -->
<view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
<t-radio value="mock" icon="none" borderless style="height: 80rpx">
<view class="radio-content" slot="content">
@@ -32,6 +33,19 @@
</view>
</t-radio>
</view>
+ <!-- 鏂紑 -->
+ <!-- <view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
+ <t-radio value="mock" icon="none" borderless style="height: 80rpx">
+ <view class="radio-content" slot="content">
+ <image
+ src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
+ ></image>
+ <text style="color: {{radioItem == 'mock' ? '#fff':'#ff6c00'}};"
+ >缁勫嵎</text
+ >
+ </view>
+ </t-radio>
+ </view> -->
</t-radio-group>
<t-button
class="error-btn"
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index ba4d21c..2c5d010 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -873,6 +873,14 @@
'<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" '
);
}
+ // 鍚姏棰樹慨鏀�
+ if (questionObj.questionType == 'singleChoiceArr') {
+ questionObj.stem.stemTxt = questionObj.stem.stemTxt
+ .replace(
+ /\<audio/gi,
+ '<audio @play="play" '
+ )
+ }
// 鑾峰彇鍥剧墖
if (
questionObj.stemStyle == "Image" ||
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.js b/packageBookService/pages/bookServices/examination/questionList/index.js
index 1513d20..487bdbf 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.js
+++ b/packageBookService/pages/bookServices/examination/questionList/index.js
@@ -27,8 +27,8 @@
sliderValue: {
type: Number,
},
- noData:{
- type:Boolean,
+ noData: {
+ type: Boolean,
}
},
observers: {
diff --git a/packageBookService/pages/bookServices/examination/questionSchedule/index.wxml b/packageBookService/pages/bookServices/examination/questionSchedule/index.wxml
index 825d698..82ecfcd 100644
--- a/packageBookService/pages/bookServices/examination/questionSchedule/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionSchedule/index.wxml
@@ -22,8 +22,8 @@
wx:if="{{!submitStatus && (answerType == 'option' || answerType == 'mock')}}"
style="color: {{isNight ? '#fff' : '#000'}};"
>
- <text>鍓╀綑鏃堕棿 </text>
- <text class="parimary-color">{{showTime}}</text></view
+ <view>鍓╀綑鏃堕棿 </view>
+ <view class="parimary-color remaining-time">{{showTime}}</view></view
>
</view>
<!-- 杩涘害鏉� -->
diff --git a/packageBookService/pages/bookServices/examination/questionSchedule/index.wxss b/packageBookService/pages/bookServices/examination/questionSchedule/index.wxss
index b18978b..c85408a 100644
--- a/packageBookService/pages/bookServices/examination/questionSchedule/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionSchedule/index.wxss
@@ -20,9 +20,14 @@
}
.remainder {
+ display: flex;
color: #545C63;
}
+.remaining-time {
+ margin-left: 6rpx;
+}
+
.parimary-color {
color: #ff6c00;
}
diff --git a/pages/bookServices/assort/index.skeleton.wxml b/pages/bookServices/assort/index.skeleton.wxml
index e348b09..d8bb5d1 100644
--- a/pages/bookServices/assort/index.skeleton.wxml
+++ b/pages/bookServices/assort/index.skeleton.wxml
@@ -18,18 +18,33 @@
<template name="skeleton">
<view class="sk-container">
<page-meta style="width: 100vw; overflow: hidden">
- <view style="width: 100%; height: 47px; "></view>
- <view class="nacigationBar" style="width: 100%; height: 40px;">
- <view class="navbar-title sk-transparent sk-text-14-2857-436 sk-text" style="background-position-x: 50%;">鍥句功鏈嶅姟</view>
+ <view style="width: 100%; height: 47px"></view>
+ <view class="nacigationBar" style="width: 100%; height: 40px">
+ <view
+ class="navbar-title sk-transparent sk-text-14-2857-436 sk-text"
+ style="background-position-x: 50%"
+ >鍥句功鏈嶅姟</view
+ >
</view>
<view class="page-header">
<view class="search">
- <view class=" t-search search--t-search " style="true">
- <view class="t-search__input-box search--t-search__input-box t-not-focused search--t-not-focused t-search__input-box-- search--t-search__input-box-- t-search__input-box--square search--t-search__input-box--square t-search__input-container">
- <view class="wr icon--wr " style="color: #bbb; font-size: 20px;">
- <label class="wr-search icon--wr-search t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
+ <view class="t-search search--t-search" style="true">
+ <view
+ class="t-search__input-box search--t-search__input-box t-not-focused search--t-not-focused t-search__input-box-- search--t-search__input-box-- t-search__input-box--square search--t-search__input-box--square t-search__input-container"
+ >
+ <view class="wr icon--wr" style="color: #bbb; font-size: 20px">
+ <label
+ class="wr-search icon--wr-search t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"
+ ></label>
</view>
- <view class="t-input__keyword search--t-input__keyword t-search__input sk-image" name="input" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" placeholder-class="t-search__placeholder t-search__placeholder--normal" type="text" value="true"></view>
+ <view
+ class="t-input__keyword search--t-input__keyword t-search__input sk-image"
+ name="input"
+ placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
+ placeholder-class="t-search__placeholder t-search__placeholder--normal"
+ type="text"
+ value="true"
+ ></view>
</view>
</view>
</view>
@@ -37,18 +52,54 @@
<view class="page-container">
<view class="side-bar-wrapper">
<view class="tab-left">
- <view class="t-side-bar bar--t-side-bar " style="true">
- <view class="t-side-bar-item item--t-side-bar-item t-side-bar-item--active item--t-side-bar-item--active sk-transparent sk-button" style="true">
- <view class="t-side-bar-item__line item--t-side-bar-item__line"></view>
- <view class="t-side-bar-item__prefix item--t-side-bar-item__prefix sk-pseudo sk-pseudo-circle"></view>
- <view class="t-side-bar-item__suffix item--t-side-bar-item__suffix sk-pseudo sk-pseudo-circle"></view>楂樼瓑鏁欒偛</view>
- <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">鑱屼笟鏁欒偛</view>
- <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">鏁欏笀鏁欒偛</view>
- <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">灏戝効鏁欒偛</view>
- <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">鑰冭瘯鍩硅</view>
- <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">涓婚鍑虹増</view>
- <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">瀛︽湳钁椾綔</view>
- <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">澶т紬璇荤墿</view>
+ <view class="t-side-bar bar--t-side-bar" style="true">
+ <view
+ class="t-side-bar-item item--t-side-bar-item t-side-bar-item--active item--t-side-bar-item--active sk-transparent sk-button"
+ style="true"
+ >
+ <view
+ class="t-side-bar-item__prefix item--t-side-bar-item__prefix sk-pseudo sk-pseudo-circle"
+ ></view>
+ <view
+ class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
+ ></view
+ >楂樼瓑鏁欒偛</view
+ >
+ <view
+ class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
+ style="true"
+ >鑱屼笟鏁欒偛</view
+ >
+ <view
+ class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
+ style="true"
+ >鏁欏笀鏁欒偛</view
+ >
+ <view
+ class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
+ style="true"
+ >灏戝効鏁欒偛</view
+ >
+ <view
+ class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
+ style="true"
+ >鑰冭瘯鍩硅</view
+ >
+ <view
+ class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
+ style="true"
+ >涓婚鍑虹増</view
+ >
+ <view
+ class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
+ style="true"
+ >瀛︽湳钁椾綔</view
+ >
+ <view
+ class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
+ style="true"
+ >澶т紬璇荤墿</view
+ >
<view class="t-side-bar__padding bar--t-side-bar__padding"></view>
</view>
</view>
@@ -56,69 +107,155 @@
<view class="side-bar-content">
<view class="tab-top">
<view class="myScroll">
- <view class="row tab-active sk-transparent sk-text-14-2857-470 sk-text" data-tabdata="[object Object]">鍏叡鍩虹绫�</view>
- <view class="row sk-transparent sk-text-14-2857-274 sk-text" data-tabdata="[object Object]">鍝插</view>
- <view class="row sk-transparent sk-text-14-2857-868 sk-text" data-tabdata="[object Object]">娉曞</view>
- <view class="row sk-transparent sk-text-14-2857-149 sk-text" data-tabdata="[object Object]">缁忔祹瀛�</view>
- <view class="row sk-transparent sk-text-14-2857-66 sk-text" data-tabdata="[object Object]">绠＄悊瀛�</view>
+ <view
+ class="row sk-transparent sk-text-14-2857-470 sk-text"
+ data-tabdata="[object Object]"
+ >鍏叡鍩虹绫�</view
+ >
+ <view
+ class="row sk-transparent sk-text-14-2857-274 sk-text"
+ data-tabdata="[object Object]"
+ >鍝插</view
+ >
+ <view
+ class="row sk-transparent sk-text-14-2857-868 sk-text"
+ data-tabdata="[object Object]"
+ >娉曞</view
+ >
+ <view
+ class="row sk-transparent sk-text-14-2857-149 sk-text"
+ data-tabdata="[object Object]"
+ >缁忔祹瀛�</view
+ >
+ <view
+ class="row sk-transparent sk-text-14-2857-66 sk-text"
+ data-tabdata="[object Object]"
+ >绠＄悊瀛�</view
+ >
</view>
</view>
- <scroll-view class="class-list" scroll-into-view="list405" scroll-y="true">
+ <scroll-view
+ class="class-list"
+ scroll-into-view="list405"
+ scroll-y="true"
+ >
<view class="class-box" id="list405">
- <view class="class-name sk-transparent sk-text-14-2857-360 sk-text">鍏叡鍩虹绫�</view>
+ <view
+ class="class-name sk-transparent sk-text-14-2857-360 sk-text"
+ >鍏叡鍩虹绫�</view
+ >
<view class="class-content">
- <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
+ <view
+ class="book-box"
+ data-stair="[object Object]"
+ data-tabdata="[object Object]"
+ >
<view class="assort-img">
<image mode="aspectFit" class="sk-image"></image>
</view>
- <view class="classify sk-transparent sk-text-14-2857-787 sk-text">澶у璇枃绫�</view>
+ <view
+ class="classify sk-transparent sk-text-14-2857-787 sk-text"
+ >澶у璇枃绫�</view
+ >
</view>
- <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
+ <view
+ class="book-box"
+ data-stair="[object Object]"
+ data-tabdata="[object Object]"
+ >
<view class="assort-img">
<image mode="aspectFit" class="sk-image"></image>
</view>
- <view class="classify sk-transparent sk-text-14-2857-115 sk-text">楂樼瓑鏁板绫�</view>
+ <view
+ class="classify sk-transparent sk-text-14-2857-115 sk-text"
+ >楂樼瓑鏁板绫�</view
+ >
</view>
- <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
+ <view
+ class="book-box"
+ data-stair="[object Object]"
+ data-tabdata="[object Object]"
+ >
<view class="assort-img">
<image mode="aspectFit" class="sk-image"></image>
</view>
- <view class="classify sk-transparent sk-text-14-2857-469 sk-text">灏变笟銆佸垱鏂颁笌鍒涗笟绫�</view>
+ <view
+ class="classify sk-transparent sk-text-14-2857-469 sk-text"
+ >灏变笟銆佸垱鏂颁笌鍒涗笟绫�</view
+ >
</view>
- <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
+ <view
+ class="book-box"
+ data-stair="[object Object]"
+ data-tabdata="[object Object]"
+ >
<view class="assort-img">
<image mode="aspectFit" class="sk-image"></image>
</view>
- <view class="classify sk-transparent sk-text-14-2857-515 sk-text">搴旂敤鏂囧啓浣滅被</view>
+ <view
+ class="classify sk-transparent sk-text-14-2857-515 sk-text"
+ >搴旂敤鏂囧啓浣滅被</view
+ >
</view>
- <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
+ <view
+ class="book-box"
+ data-stair="[object Object]"
+ data-tabdata="[object Object]"
+ >
<view class="assort-img">
<image mode="aspectFit" class="sk-image"></image>
</view>
- <view class="classify sk-transparent sk-text-14-2857-824 sk-text">蹇冪悊鍋ュ悍鏁欒偛绫�</view>
+ <view
+ class="classify sk-transparent sk-text-14-2857-824 sk-text"
+ >蹇冪悊鍋ュ悍鏁欒偛绫�</view
+ >
</view>
- <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
+ <view
+ class="book-box"
+ data-stair="[object Object]"
+ data-tabdata="[object Object]"
+ >
<view class="assort-img">
<image mode="aspectFit" class="sk-image"></image>
</view>
- <view class="classify sk-transparent sk-text-14-2857-988 sk-text">浣撹偛绫�</view>
+ <view
+ class="classify sk-transparent sk-text-14-2857-988 sk-text"
+ >浣撹偛绫�</view
+ >
</view>
- <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
+ <view
+ class="book-box"
+ data-stair="[object Object]"
+ data-tabdata="[object Object]"
+ >
<view class="assort-img">
<image mode="aspectFit" class="sk-image"></image>
</view>
- <view class="classify sk-transparent sk-text-14-2857-89 sk-text">鐢熸动瑙勫垝绫�</view>
+ <view
+ class="classify sk-transparent sk-text-14-2857-89 sk-text"
+ >鐢熸动瑙勫垝绫�</view
+ >
</view>
- <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
+ <view
+ class="book-box"
+ data-stair="[object Object]"
+ data-tabdata="[object Object]"
+ >
<view class="assort-img">
<image mode="aspectFit" class="sk-image"></image>
</view>
- <view class="classify sk-transparent sk-text-14-2857-188 sk-text">鍏朵粬绫�</view>
+ <view
+ class="classify sk-transparent sk-text-14-2857-188 sk-text"
+ >鍏朵粬绫�</view
+ >
</view>
</view>
</view>
<view class="class-box" id="list406">
- <view class="class-name sk-transparent sk-text-14-2857-674 sk-text">鍝插</view>
+ <view
+ class="class-name sk-transparent sk-text-14-2857-674 sk-text"
+ >鍝插</view
+ >
</view>
</scroll-view>
</view>
@@ -127,4 +264,4 @@
</view>
</page-meta>
</view>
-</template>
\ No newline at end of file
+</template>
diff --git a/static/images/bookService/examination/chongzuo-w.png b/static/images/bookService/examination/chongzuo-w.png
index 4e939e8..ec23cf6 100644
--- a/static/images/bookService/examination/chongzuo-w.png
+++ b/static/images/bookService/examination/chongzuo-w.png
Binary files differ
diff --git a/static/images/bookService/examination/datika-w.png b/static/images/bookService/examination/datika-w.png
index 122620c..7c2523d 100644
--- a/static/images/bookService/examination/datika-w.png
+++ b/static/images/bookService/examination/datika-w.png
Binary files differ
diff --git a/static/images/bookService/examination/setting-w.png b/static/images/bookService/examination/setting-w.png
index ca24d1f..76b3e5c 100644
--- a/static/images/bookService/examination/setting-w.png
+++ b/static/images/bookService/examination/setting-w.png
Binary files differ
diff --git a/static/images/bookService/examination/wodeshoucang-w.png b/static/images/bookService/examination/wodeshoucang-w.png
index 647cd15..7106f76 100644
--- a/static/images/bookService/examination/wodeshoucang-w.png
+++ b/static/images/bookService/examination/wodeshoucang-w.png
Binary files differ
--
Gitblit v1.9.1