From 0b7803920728865e2b7c2178481a3afce7302ce3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 17 四月 2024 09:20:19 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/examination/questionList/index.wxss | 9
packageBookService/pages/bookServices/examination/questionList/index.wxml | 14
packageBookService/pages/bookServices/detail/buyResource/index.js | 37 ++
packageBookService/pages/bookServices/detail/index.wxss | 4
packageBookService/pages/bookServices/examination/examination.json | 2
packageBookService/pages/bookServices/examination/examination.wxml | 6
packageBookService/pages/bookServices/examination/questionOptions/index.wxss | 4
packageBookService/pages/bookServices/examination/questionOptions/index.wxml | 3
packageBookService/pages/bookServices/examination/examination.wxss | 2
packageBookService/pages/bookServices/examination/examination.js | 97 ++++++---
packageBookService/pages/bookServices/examination/examination.skeleton.wxml | 47 +--
packageBookService/pages/bookServices/detail/components/tree/index.js | 83 ++++++++
packageBookService/pages/bookServices/examination/examination.skeleton.wxss | 206 +++++++++++---------
packageBookService/pages/bookServices/detail/buyResource/index.wxss | 3
packageBookService/pages/bookServices/detail/index.js | 2
pages/retrievalPage/index.js | 2
packageBookService/pages/bookServices/detail/components/teachResource/index.js | 13
pages/bookExhibitionDetails/index.wxml | 2
pages/cart/index.wxss | 6
pages/cart/index.wxml | 2
packageBookService/pages/bookServices/detail/components/teachResource/index.wxss | 4
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml | 5
packageBookService/pages/bookServices/examination/questionOptions/index.js | 8
packageDomain/pages/resourceDetails/myAudio/index.js | 4
packageBookService/pages/bookServices/detail/components/tree/index.wxss | 1
pages/bibliographyList/index.wxml | 2
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss | 2
27 files changed, 365 insertions(+), 205 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js
index 34db152..8ec26df 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.js
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -17,12 +17,15 @@
paymentPage: false,
superior: false,
checkAllState: true,
+ productLinkPath: '',
+ refCode: ''
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
+ this.getBookInfo(options.bookId);
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight =
@@ -31,14 +34,11 @@
barHeight: systInfo.statusBarHeight,
navBarHeight: navBarHeight,
bookId: options.bookId,
+ productLinkPath: options.productLinkPath,
+ refCode: options.refCode
});
this.getResourceClass();
- this.getResourceData({
- productLinkPath: options.productLinkPath,
- refCode: options.refCode,
- });
this.getShoppingCartProductGet();
- this.getBookInfo(options.bookId);
},
/**
@@ -226,12 +226,12 @@
});
data.datas.cmsDatas[0].datas.forEach((item) => {
item.checked = false;
- item.isbuy = this.resourceIsBuy(item);
+ item.isbuy = this.isShowNeedBuy(item);
item.isShopCar = this.isShoppingCart(item);
});
return data.datas.cmsDatas[0].datas;
},
- getBookInfo(id) {
+ async getBookInfo(id) {
this.setData({
"mockData'.id": 0,
"mockData.price": 0,
@@ -269,12 +269,17 @@
freeEpubPage: [], //epub璇曡鐧惧垎姣�
},
};
- app.MG.store.getProductDetail(query).then(async (res) => {
+ await app.MG.store.getProductDetail(query).then(async (res) => {
this.setData({
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
});
+ this.getResourceData({
+ productLinkPath: this.data.productLinkPath,
+ refCode: this.data.refCode,
+ });
});
+
},
// 鑾峰彇宸茶喘涔板晢鍝�
getShoppingCartProductGet() {
@@ -306,6 +311,22 @@
return false;
}
},
+
+ isShowNeedBuy(data) {
+ if (data.saleMethod && data.saleMethod.length) {
+ const isSHow = this.data.buyIdList.some(
+ (item) => item == data.saleMethod[0].Id
+ );
+ if (isSHow) {
+ return false;
+ } else {
+ return data.saleMethod[0].price > 0 ? true : false;
+ }
+ return !isSHow;
+ } else {
+ return false;
+ }
+ },
// 鍒ゆ柇璧勬簮鍔犲叆璐墿杞︽寜閽槸鍚︽樉绀�
isShoppingCart(data) {
if (data.saleMethod && data.saleMethod.length) {
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.wxss b/packageBookService/pages/bookServices/detail/buyResource/index.wxss
index 6802dd9..baad269 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.wxss
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.wxss
@@ -1,5 +1,6 @@
/* packageBookService/pages/bookServices/detail/buyResource/index.wxss */
@import "./index.skeleton.wxss";
+
.nacigationBar {
background-color: #fff;
display: flex;
@@ -42,7 +43,7 @@
position: fixed;
bottom: env(safe-area-inset-bottom);
width: 100%;
- height: 100rpx;
+ /* height: 100rpx; */
display: flex;
justify-content: center锛�
}
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.js b/packageBookService/pages/bookServices/detail/components/teachResource/index.js
index ec299ce..a515c77 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.js
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.js
@@ -19,14 +19,19 @@
},
data: {
showRejectDialog: false,
- confirmBtn: { content: "鐭ラ亾浜�", variant: "base" },
+ confirmBtn: {
+ content: "鐭ラ亾浜�",
+ variant: "base"
+ },
},
methods: {
copy() {
wx.setClipboardData({
- data: "http://182.92.203.7:3007/jsek/website/#/home/index",
+ data: "https://jsek.bnuic.com/home/#/home/index",
success: function (res) {
- wx.showToast({ title: "澶嶅埗鎴愬姛" });
+ wx.showToast({
+ title: "澶嶅埗鎴愬姛"
+ });
},
fail: function (res) {
console.log(res);
@@ -52,4 +57,4 @@
});
},
},
-});
+});
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
index 82a7249..0959ce7 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -29,10 +29,7 @@
></view
>
<view style="display: flex; align-items: center; margin-top: 10rpx">
- <text>涓嬭浇璧勬簮璇峰埌PC绔含甯圗璇�</text>
- <t-button style="font-size: 24rpx; height: 50rpx" bind:tap="copy"
- >澶嶅埗</t-button
- >
+ <text>涓嬭浇璧勬簮璇峰埌PC绔含甯圗璇�</text> <text bind:tap="copy" class="copy-text">澶嶅埗</text>
</view>
</view>
<view wx:if="{{applyState == 'Reject'}}"
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
index 180e822..588f6d6 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
@@ -22,6 +22,10 @@
margin-top: 20rpx;
}
+.copy-text {
+ margin-left: 20rpx;
+ color: #FF6C00;
+}
.applyResult {
padding: 0 10rpx;
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
index 670cc67..2e09a5a 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
@@ -191,7 +191,7 @@
.mack-num {
width: 100%;
- height: 100rpx;
+ height: 106rpx;
display: flex;
align-items: center;
justify-content: space-between;
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 5d4a08b..ef5aa5a 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -165,6 +165,8 @@
wx.navigateTo({
url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parentProductLinkPath}&parentName=${parentName}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}&formPath=${this.properties.tab}`,
});
+
+
if (item.selectType == "document" || item.selectType == "pdf") {
const fileLink =
app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.file;
@@ -173,7 +175,7 @@
util.showLoading();
// 鍗曟涓嬭浇鍏佽鐨勬渶澶ф枃浠朵负 200MB
wx.downloadFile({
- url: fileLink, // 鍦板潃宸叉墦鐮侊紝鑷繁鎹釜鍏朵粬鐨勫湴鍧�锛�"https://www.xxxxx.com/file/娴嬭瘯閫氱煡.pdf"锛�
+ url: fileLink,
success: function (res) {
console.log(res, "wx.downloadFile success res");
if (res.statusCode != 200) {
@@ -196,6 +198,84 @@
},
});
}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ // if (item.selectType == "document" || item.selectType == "pdf") {
+ // const fileLink = app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.file;
+
+ // let filePath = wx.env.USER_DATA_PATH + '/' + item.name
+ // console.log(filePath, 'filePath');
+ // //鎻愮ず鍔犺浇涓�
+ // util.showLoading();
+ // // 鍗曟涓嬭浇鍏佽鐨勬渶澶ф枃浠朵负 200MB
+ // wx.downloadFile({
+ // url: fileLink,
+ // success: function (res) {
+
+ // if (res.statusCode != 200) {
+ // util.hideLoadingWithErrorTips();
+ // return false;
+ // }
+ // var Path = res.tempFilePath; //杩斿洖鐨勬枃浠朵复鏃跺湴鍧�锛岀敤浜庡悗闈㈡墦寮�鏈湴棰勮鎵�鐢�
+
+ // wx.saveFile({
+ // tempFilePath: Path,
+ // success: function (res) {
+ // var savedFilePath = res.savedFilePath;
+ // // 灏嗘枃浠朵繚瀛樹负 item.name
+ // wx.saveFile({
+ // tempFilePath: savedFilePath,
+ // filePath: wx.env.USER_DATA_PATH + '/' + item.name,
+ // success: function (res) {
+ // wx.openDocument({
+ // filePath: res.savedFilePath,
+ // showMenu: true,
+ // success: function (res) {
+ // util.hideLoading();
+ // },
+ // });
+ // },
+ // fail: function (err) {
+ // util.hideLoadingWithErrorTips();
+ // }
+ // });
+ // },
+ // fail: function (err) {
+ // util.hideLoadingWithErrorTips();
+ // }
+ // });
+ // },
+ // fail: function (err) {
+ // util.hideLoadingWithErrorTips();
+ // },
+ // });
+ // }
+
+
+
+
+
if (item.selectType == "webpage") {
this.setData({
webpageSrc: item.jsek_link,
@@ -204,6 +284,7 @@
}
}
},
+
// 鎷垮埌鎵�鏈夐」
getAllChildren(id) {
let result = [];
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxss b/packageBookService/pages/bookServices/detail/components/tree/index.wxss
index b79a80b..64c43c0 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxss
@@ -3,7 +3,6 @@
--td-collapse-header-text-color: #ff6C00;
--td-collapse-icon-color: #ff6c00;
--td-collapse-header-height: min-content;
- padding-bottom: 50rpx;
}
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 4399b17..a48be21 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -381,7 +381,6 @@
this.setData({
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
-
});
if (res.datas.cmsDatas && res.datas.cmsDatas.length) {
this.setData({
@@ -794,6 +793,7 @@
loading: false,
openLearnids: result,
});
+ console.log('浜戝涔�', list);
}
} else {
// 鏃犳暟鎹�
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 90b4967..e87ac75 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -222,7 +222,7 @@
/* 鍥句功璧勬簮 */
.book-resource {
- min-height: calc(100vh - 900rpx);
+ min-height: calc(100% - 637rpx);
margin-top: 20rpx;
background-color: #fff !important;
--td-tab-item-height: 140rpx;
@@ -436,7 +436,7 @@
.t-tabs__item-inner .t-icon {
- margin-bottom: 12rpx;
+ margin-bottom: 20rpx;
}
.t-tabs__item-inner .t-icon__image {
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index ceac28b..19c8ee5 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -47,7 +47,8 @@
sliderValue: 0, // 瀛椾綋婊戝潡
startTime: "", //杩涘叆椤甸潰褰撳墠鏃堕棿
pauseTime: 0, //鏆傚仠鏃堕棿
- showDialog: false // 鏈彁浜ら��鍑烘嫤鎴脊绐�
+ showDialog: false, // 鏈彁浜ら��鍑烘嫤鎴脊绐�
+ showId: ''
},
/**
@@ -68,9 +69,9 @@
idPathList: options.idPathList ? JSON.parse(options.idPathList) : [],
answerType: options.answerType,
});
- // wx.setNavigationBarTitle({
- // title: options.answerTitle,
- // })
+ wx.setNavigationBarTitle({
+ title: options.answerTitle,
+ })
if (this.data.answerType == "mock") {
this.setData({
uuid: options.uuid,
@@ -198,7 +199,20 @@
},
});
},
-
+ // 淇敼nav棰滆壊
+ changeNavBarColor(e) {
+ if (type == 'night') {
+ wx.setNavigationBarColor({
+ backgroundColor: '#000000',
+ frontColor: '#ffffff',
+ })
+ } else {
+ wx.setNavigationBarColor({
+ backgroundColor: '#ffffff',
+ frontColor: '#000000',
+ })
+ }
+ },
// 姝ｅ垯鎵惧嚭鍚姏src
extractSourceSrc(htmlString) {
// 姝ｅ垯琛ㄨ揪寮忓尮閰�<source>鏍囩涓殑src灞炴�у��
@@ -235,26 +249,28 @@
},
// 杩斿洖鎷︽埅
beforeleave() {
- wx.showModal({
- title: "鎻愮ず",
- content: "鏈彁浜わ紝鏄惁閫�鍑虹瓟棰�",
- confirmColor: "#ff6c00",
- cancelColor: "#949494",
- complete: (res) => {
- if (res.cancel) {
- this.setData({
- showDialog: true
- })
- }
- if (res.confirm) {
- this.setData({
- submitStatus: true,
- showDialog: false
- });
- wx.navigateBack();
- }
- },
- });
+ if ((this.data.answerType == 'option' || this.data.answerType == 'mock') && !this.data.submitStatus) {
+ wx.showModal({
+ title: "鎻愮ず",
+ content: "鏈彁浜わ紝鏄惁閫�鍑虹瓟棰�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
+ complete: (res) => {
+ if (res.cancel) {
+ this.setData({
+ showDialog: true
+ })
+ }
+ if (res.confirm) {
+ this.setData({
+ submitStatus: true,
+ showDialog: false
+ });
+ wx.navigateBack();
+ }
+ },
+ });
+ }
},
onChangeSlider(e) {
this.setData({
@@ -269,9 +285,21 @@
},
//璁剧疆鑳屾櫙鑹�
changeBGColor(e) {
+ const flag = e.detail.value
this.setData({
- isNight: e.detail.value,
+ isNight: flag,
});
+ if (flag) {
+ wx.setNavigationBarColor({
+ backgroundColor: '#000000',
+ frontColor: '#ffffff',
+ })
+ } else {
+ wx.setNavigationBarColor({
+ backgroundColor: '#ffffff',
+ frontColor: '#000000',
+ })
+ }
},
// 鑾峰彇淇濆瓨鐨勫�掕鏃舵椂闂�
getSavedTime() {
@@ -329,11 +357,13 @@
},
// 鍒囨崲棰樼洰
changeSwiper(e) {
- this.setData({
- currentIndex: e.detail.index,
- });
let index = e.detail.index - 1 >= 0 ? e.detail.index - 1 : 0;
const item = this.data.questionDataList[index];
+ const lastItem = this.data.questionDataList[index + 1];
+ this.setData({
+ currentIndex: e.detail.index,
+ showId: lastItem.id
+ });
if (
(this.data.answerType == "collectQuestion" ||
this.data.answerType == "errorQuestion") &&
@@ -496,7 +526,6 @@
// 鎻愪氦閫昏緫
submitPaper() {
this.setData({
- showDialog: false,
submitStatus: true,
loading: true,
});
@@ -563,6 +592,7 @@
}
this.setData({
loading: false,
+ showDialog: false,
});
},
// 鍒濆鍖栧嚱鏁�
@@ -662,6 +692,7 @@
subjectiveNum: 0,
currentIndex: 0,
submitStatus: false,
+ showDialog: true
});
if (this.data.answerType == "option") {
this.setData({
@@ -1007,6 +1038,7 @@
}
this.setData({
loading: false,
+ showId: this.data.questionDataList[0].id
});
},
// 鎵规敼棰樼洰 锛堢粌涔狅紝鎴戠殑閿欓锛屾垜鐨勬敹钘�,锛岀粍鍗凤級
@@ -1198,7 +1230,6 @@
}
}
}
-
this.setAnswerInfo(setInfoData);
},
// 鎻愪氦绛旈鏁版嵁
@@ -1480,6 +1511,7 @@
}
this.setData({
questionDataList: questionArr,
+ showId: questionArr[0].id,
cardList: cardList,
loading: false,
});
@@ -1728,11 +1760,11 @@
}
this.setData({
questionDataList: questionArr,
+ showId: questionArr[0].id,
cardList: cardList,
loading: false,
});
});
- // loadings.value = false
},
// 鑾峰彇缁勫嵎缁撴灉
async getEduQuizConfig() {
@@ -2011,6 +2043,7 @@
}
this.setData({
loading: false,
+ showId: this.data.questionDataList[0].id
});
},
// 鑾峰彇缁勫嵎鏁版嵁
diff --git a/packageBookService/pages/bookServices/examination/examination.json b/packageBookService/pages/bookServices/examination/examination.json
index 5a645f7..dd31697 100644
--- a/packageBookService/pages/bookServices/examination/examination.json
+++ b/packageBookService/pages/bookServices/examination/examination.json
@@ -8,7 +8,5 @@
"t-button": "tdesign-miniprogram/button/button",
"t-loading": "tdesign-miniprogram/loading/loading"
},
- "navigationStyle": "custom",
- "navigationBarBackgroundColor": "#010101",
"disableScroll": true
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/examination.skeleton.wxml b/packageBookService/pages/bookServices/examination/examination.skeleton.wxml
index 356eaae..705a62b 100644
--- a/packageBookService/pages/bookServices/examination/examination.skeleton.wxml
+++ b/packageBookService/pages/bookServices/examination/examination.skeleton.wxml
@@ -1,5 +1,5 @@
<!--
-姝ゆ枃浠朵负寮�鍙戣�呭伐鍏风敓鎴愶紝鐢熸垚鏃堕棿: 2024/4/11涓嬪崍3:00:46
+姝ゆ枃浠朵负寮�鍙戣�呭伐鍏风敓鎴愶紝鐢熸垚鏃堕棿: 2024/4/16涓嬪崍2:23:24
浣跨敤鏂规硶锛�
鍦� D:\WebData\project\2024\jsek-applet\packageBookService\pages\bookServices\examination\examination.wxml 寮曞叆妯℃澘
@@ -17,33 +17,24 @@
-->
<template name="skeleton">
<view class="sk-container">
- <view style="width: 100%; height: 47px;background-color: #fff "></view>
- <view class="nacigationBar" style="width: 100%; height: 40px; background-color: #fff">
- <view>
- <view class="t-icon icon--t-icon " style="color: #000; font-size: 30px;">
- <label class="t-icon-chevron-left icon--t-icon-chevron-left t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
- </view>
- </view>
- <view class="navbar-title sk-transparent sk-text-14-2857-257 sk-text" style="color: #000;">绗笁绔犲湪绾挎祴璇�</view>
- </view>
- <view class="page-content" >
+ <view class="page-content" style="background-color:">
<view is="packageBookService/pages/bookServices/examination/questionSchedule/index" id="countDownRef">
- <view class="questionSchedule-index--schedule" id="f88d4fe7--schedule" style="background-color:#fff">
+ <view class="questionSchedule-index--schedule" id="401ba865--schedule" style="background-color:#fff">
<view class="questionSchedule-index--schedule-top">
<view class="questionSchedule-index--question-schedule sk-transparent" style="color: #000;">绛旈杩涘害
<text class="questionSchedule-index--parimary-color questionSchedule-index--question-num sk-transparent sk-opacity">0</text>
- <text class="sk-transparent sk-text-14-2857-497 sk-text">/35</text>
+ <text class="sk-transparent sk-text-14-2857-972 sk-text">/31</text>
</view>
<view class="questionSchedule-index--remainder" style="color: #000;">
- <text class="sk-transparent sk-text-14-2857-252 sk-text">鍓╀綑鏃堕棿 </text>
- <text class="questionSchedule-index--parimary-color sk-transparent sk-text-14-2857-835 sk-text">01:59:51</text>
+ <view class="questionSchedule-index--remainder-text sk-transparent sk-text-14-2857-676 sk-text">鍓╀綑鏃堕棿 </view>
+ <view class="questionSchedule-index--parimary-color questionSchedule-index--remaining-time sk-transparent sk-text-14-2857-756 sk-text">01:59:53</view>
</view>
</view>
<view class="questionSchedule-index--schedule-progress">
- <view class="t-progress progress--t-progress ">
+ <view class="t-progress progress--t-progress " style="true">
<view class="t-progress--thin progress--t-progress--thin t-progress--status-- progress--t-progress--status-- ">
<view class="t-progress__bar progress--t-progress__bar" >
- <view ></view>
+ <view class="t-progress__inner progress--t-progress__inner " style="background-color: #efefef;"></view>
</view>
</view>
</view>
@@ -53,23 +44,23 @@
<view is="packageBookService/pages/bookServices/examination/questionList/index">
<view class="questionList-index--question-list" style="background-color:#fff">
<view class="questionList-index--question-title" style="background-color:#fff">
- <text class="questionList-index--title-name sk-transparent sk-text-14-2857-37 sk-text">鍒ゆ柇棰�</text>
- <text class="questionList-index--title-score sk-transparent sk-text-14-2857-760 sk-text" style="color: #000;">(姣忛2鍒�)</text>
+ <text class="questionList-index--title-name sk-transparent sk-text-14-2857-835 sk-text">鍒ゆ柇棰�</text>
+ <text class="questionList-index--title-score sk-transparent sk-text-14-2857-843 sk-text" style="color: #000;">(姣忛2鍒�)</text>
</view>
- <swiper class="questionList-index--swiper" current="0" autoplay="false">
+ <swiper class="questionList-index--swiper" autoplay="false">
<swiper-item style="overflow-y: auto; position: absolute; width: 100%; height: 100%; transform: translate(0%, 0px) translateZ(0px);">
<view class="questionList-index--question-stem questionList-index--title-score" style="color: #000; font-size: 16px;">
- <text class="sk-transparent sk-text-14-2857-517 sk-text">1.</text>
- <view class="questionList-index--title-content sk-transparent sk-text-14-2857-70 sk-text">鏈姝ｇ‘绛旀鏄</view>
+ <text class="sk-transparent sk-text-14-2857-731 sk-text">1.</text>
+ <view class="questionList-index--title-content sk-transparent sk-text-14-2857-317 sk-text">鏀剧儹鍖栧鍙嶅簲閮借兘鑷姩杩涜銆�</view>
</view>
<view class="questionList-index--question-answer">
- <view class="t-radio-group radio-group--t-radio-group questionList-index--radio-group " >
+ <view class="t-radio-group radio-group--t-radio-group questionList-index--radio-group " style="true">
<view>
- <view class="t-radio radio--t-radio t-radio--right radio--t-radio--right t-radio--block radio--t-radio--block " style="background-color: #fff;" tabindex="0">
+ <view class="t-radio radio--t-radio t-radio--right radio--t-radio--right t-radio--block radio--t-radio--block " >
<view class="t-radio__content radio--t-radio__content" data-target="text">
<view class="t-radio__title radio--t-radio__title sk-transparent" style="-webkit-line-clamp:3">
<view class="questionList-index--radio-item" style="font-size: 16px;">
- <text class="sk-transparent sk-text-16-6667-815 sk-text">A銆佸</text>
+ <text class="sk-transparent sk-text-16-6667-394 sk-text">A銆佸</text>
</view>
</view>
</view>
@@ -80,7 +71,7 @@
<view class="t-radio__content radio--t-radio__content" data-target="text">
<view class="t-radio__title radio--t-radio__title sk-transparent" style="-webkit-line-clamp:3">
<view class="questionList-index--radio-item" style="font-size: 16px;">
- <text class="sk-transparent sk-text-16-6667-544 sk-text">B銆侀敊</text>
+ <text class="sk-transparent sk-text-16-6667-51 sk-text">B銆侀敊</text>
</view>
</view>
</view>
@@ -93,7 +84,7 @@
</view>
</view>
</view>
- <view class="page-bottom" >
+ <view class="page-bottom" style="background-color:">
<view is="packageBookService/pages/bookServices/examination/questionOptions/index" id="question-options">
<view class="questionOptions-index--page-bottom" style="color: #000; background-color:#fff">
<view class="questionOptions-index--li-option sk-transparent" style="color: #000;">
@@ -115,7 +106,7 @@
<view class="questionOptions-index--bottom-submit">
<button app-parameter="true" data-custom="null" form-type="true" hover-class="t-button--hover" hover-start-time="20" hover-stay-time="70" lang="en" open-type="true" send-message-img="true" send-message-path="true" send-message-title="true" session-from="true"
style="width:166px;border-radius:31px;" class="t-button button--t-button t-button--base button--t-button--base t-button--primary button--t-button--primary t-button--rectangle button--t-button--rectangle t-button--size-large button--t-button--size-large sk-button sk-pseudo sk-pseudo-circle">
- <view class="t-button__content button--t-button__content sk-transparent sk-text-33-6735-780 sk-text" style="background-position-x: 50%;">鎻愪氦</view>
+ <view class="t-button__content button--t-button__content sk-transparent sk-text-33-6735-471 sk-text" style="background-position-x: 50%;">鎻愪氦</view>
</button>
</view>
</view>
diff --git a/packageBookService/pages/bookServices/examination/examination.skeleton.wxss b/packageBookService/pages/bookServices/examination/examination.skeleton.wxss
index d26b3c3..c443a14 100644
--- a/packageBookService/pages/bookServices/examination/examination.skeleton.wxss
+++ b/packageBookService/pages/bookServices/examination/examination.skeleton.wxss
@@ -1,5 +1,5 @@
/*
-姝ゆ枃浠朵负寮�鍙戣�呭伐鍏风敓鎴愶紝鐢熸垚鏃堕棿: 2024/4/11涓嬪崍3:00:46
+姝ゆ枃浠朵负寮�鍙戣�呭伐鍏风敓鎴愶紝鐢熸垚鏃堕棿: 2024/4/16涓嬪崍2:23:24
鍦� D:\WebData\project\2024\jsek-applet\packageBookService\pages\bookServices\examination\examination.wxss 涓紩鍏ユ牱寮�
```
@@ -9,100 +9,120 @@
鏇村璇︾粏淇℃伅鍙互鍙傝�冩枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
*/
.sk-transparent {
- color: transparent !important;
- }
-.sk-text-14-2857-257 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 53.8462rpx;
- position: relative !important;
- }
-.sk-text {
- background-origin: content-box !important;
- background-clip: content-box !important;
- background-color: transparent !important;
- color: transparent !important;
- background-repeat: repeat-y !important;
- }
+ color: transparent !important;
+}
+
.sk-opacity {
- opacity: 0 !important;
- }
-.sk-text-14-2857-497 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 37.6923rpx;
- position: relative !important;
- }
-.sk-text-14-2857-252 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 37.6923rpx;
- position: relative !important;
- }
+ opacity: 0 !important;
+}
+
+.sk-text-14-2857-972 {
+ background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+ background-size: 100% 37.6923rpx;
+ position: relative !important;
+}
+
+.sk-text {
+ background-origin: content-box !important;
+ background-clip: content-box !important;
+ background-color: transparent !important;
+ color: transparent !important;
+ background-repeat: repeat-y !important;
+}
+
+.sk-text-14-2857-676 {
+ background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+ background-size: 100% 37.6923rpx;
+ position: relative !important;
+}
+
+.sk-text-14-2857-756 {
+ background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+ background-size: 100% 37.6923rpx;
+ position: relative !important;
+}
+
.sk-text-14-2857-835 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 37.6923rpx;
- position: relative !important;
- }
-.sk-text-14-2857-37 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 37.6923rpx;
- position: relative !important;
- }
-.sk-text-14-2857-760 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 37.6923rpx;
- position: relative !important;
- }
-.sk-text-14-2857-517 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 43.0769rpx;
- position: relative !important;
- }
-.sk-text-14-2857-70 {
- background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
- background-size: 100% 43.0769rpx;
- position: relative !important;
- }
-.sk-text-16-6667-815 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 46.1538rpx;
- position: relative !important;
- }
-.sk-text-16-6667-544 {
- background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
- background-size: 100% 46.1538rpx;
- position: relative !important;
- }
-.sk-text-33-6735-780 {
- background-image: linear-gradient(transparent 33.6735%, #EEEEEE 0%, #EEEEEE 66.3265%, transparent 0%) !important;
- background-size: 100% 94.2308rpx;
- position: relative !important;
- }
+ background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+ background-size: 100% 37.6923rpx;
+ position: relative !important;
+}
+
+.sk-text-14-2857-843 {
+ background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+ background-size: 100% 37.6923rpx;
+ position: relative !important;
+}
+
+.sk-text-14-2857-731 {
+ background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+ background-size: 100% 43.0769rpx;
+ position: relative !important;
+}
+
+.sk-text-14-2857-317 {
+ background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+ background-size: 100% 43.0769rpx;
+ position: relative !important;
+}
+
+.sk-text-16-6667-394 {
+ background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
+ background-size: 100% 46.1538rpx;
+ position: relative !important;
+}
+
+.sk-text-16-6667-51 {
+ background-image: linear-gradient(transparent 16.6667%, #EEEEEE 0%, #EEEEEE 83.3333%, transparent 0%) !important;
+ background-size: 100% 46.1538rpx;
+ position: relative !important;
+}
+
+.sk-text-33-6735-471 {
+ background-image: linear-gradient(transparent 33.6735%, #EEEEEE 0%, #EEEEEE 66.3265%, transparent 0%) !important;
+ background-size: 100% 94.2308rpx;
+ position: relative !important;
+}
+
.sk-button {
- color: #EFEFEF !important;
- background: #EFEFEF !important;
- border: none !important;
- box-shadow: none !important;
- }
+ color: #EFEFEF !important;
+ background: #EFEFEF !important;
+ border: none !important;
+ box-shadow: none !important;
+}
+
.sk-image {
- background: #EFEFEF !important;
- }
-.sk-pseudo::before, .sk-pseudo::after {
- background: #EFEFEF !important;
- background-image: none !important;
- color: transparent !important;
- border-color: transparent !important;
- }
-.sk-pseudo-rect::before, .sk-pseudo-rect::after {
- border-radius: 0 !important;
- }
-.sk-pseudo-circle::before, .sk-pseudo-circle::after {
- border-radius: 50% !important;
- }
+ background: #EFEFEF !important;
+}
+
+.sk-pseudo::before,
+.sk-pseudo::after {
+ background: #EFEFEF !important;
+ background-image: none !important;
+ color: transparent !important;
+ border-color: transparent !important;
+}
+
+.sk-pseudo-rect::before,
+.sk-pseudo-rect::after {
+ border-radius: 0 !important;
+}
+
+.sk-pseudo-circle::before,
+.sk-pseudo-circle::after {
+ border-radius: 50% !important;
+}
+
.sk-container {
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- overflow: hidden;
- background-color: transparent;
- }
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ background-color: transparent;
+}
+
+.t-progress__inner {
+ background-color: #efefef;
+}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/examination.wxml b/packageBookService/pages/bookServices/examination/examination.wxml
index 42e68cc..667b280 100644
--- a/packageBookService/pages/bookServices/examination/examination.wxml
+++ b/packageBookService/pages/bookServices/examination/examination.wxml
@@ -4,7 +4,7 @@
<template is="skeleton" wx:if="{{loading}}" />
<!--瀵艰埅鍖哄煙 -->
-<view
+<!-- <view
style="width: 100%; height: {{barHeight}}px;background-color: {{isNight ? '#191919' : '#fff'}} "
></view>
<view
@@ -23,7 +23,7 @@
<view class="navbar-title" style="color: {{isNight ? '#fff' : '#000'}};"
>{{answerTitle}}</view
>
-</view>
+</view> -->
<view class="page-content" style="background-color:{{isNight ? '#222' : ''}}">
<question-schedule
@@ -82,6 +82,7 @@
subjectiveGrade="{{subjectiveGrade}}"
correctNum="{{correctNum}}"
mockSumTime="{{mockData.sumTime}}"
+ showId="{{showId}}"
bind:setCollect="setCollect"
bind:submitPaper="submitPaper"
bind:restart="restart"
@@ -89,6 +90,7 @@
bind:changeBGColor="changeBGColor"
bind:onChangeSlider="onChangeSlider"
bind:changeLoadingState="changeLoadingState"
+ bind:changeNavBarColor="changeNavBarColor"
></question-options>
</view>
diff --git a/packageBookService/pages/bookServices/examination/examination.wxss b/packageBookService/pages/bookServices/examination/examination.wxss
index acf7f28..1be5efb 100644
--- a/packageBookService/pages/bookServices/examination/examination.wxss
+++ b/packageBookService/pages/bookServices/examination/examination.wxss
@@ -26,7 +26,7 @@
.page-content {
box-sizing: border-box;
width: 100%;
- height: 78vh;
+ height: calc(100vh - env(safe-area-inset-bottom) - 73px);
padding: 20rpx;
background-color: #F2F3F8;
}
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index 4820cd7..fcd9f89 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -49,7 +49,7 @@
<!-- 浠呮枃瀛� -->
<view
- class="title-content"
+ class="title-content text-space"
wx:elif="{{item.stemStyle == 'Txt' && item.questionType != 'completion'}}"
>{{item.stem.stemTxt}}</view
>
@@ -60,7 +60,7 @@
<!-- 鍥剧墖鍔犳枃瀛� -->
<view
wx:elif="{{item.stemStyle == 'TxtAndImage'}}"
- class="title-content"
+ class="title-content text-space"
>
<view>{{item.stem.stemTxt}}</view>
<image src="{{item.stem.stemImage}}" mode="aspectFit" />
@@ -91,7 +91,7 @@
placeholder="璇疯緭鍏ユ枃瀛�"
value="{{item.userAnswer[inputItem.num]}}"
></t-input>
- <text wx:else>{{inputItem}}</text>
+ <text wx:else class="text-space">{{inputItem}}</text>
</view>
</view>
</view>
@@ -127,7 +127,7 @@
class="radio-item {{(answerType == 'option' || answerType == 'mock' ) && !submitStatus && item.userAnswer == contentItem.value ? 'radio-active' : isNight ? 'night' :''}} {{item.userAnswer == contentItem.value && submitStatus ? item.isRight ? 'radio-correct' : 'radio-error' :''}}"
>
<!-- 浠呮枃瀛� -->
- <text wx:if="{{item.optionStyle == 'Txt'}}"
+ <text wx:if="{{item.optionStyle == 'Txt'}}" class="text-space"
>{{contentItem.value}}銆亄{contentItem.txt}}</text
>
<!-- 浠呭浘鐗� -->
@@ -141,7 +141,7 @@
class="fl-center"
class="TxtAndImage-box"
>
- <text>{{contentItem.value}}銆�</text>
+ <text class="text-space">{{contentItem.value}}銆�</text>
<view class="radio-textimg">{{contentItem.txt}}</view>
<image src="{{contentItem.img}}" mode="aspectFit" />
</view>
@@ -195,7 +195,7 @@
>
<!-- 浠呮枃瀛� -->
<view
- class="fl-center mh"
+ class="fl-center mh text-space"
wx:if="{{item.optionStyle == 'Txt'}}"
style="color:{{ isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 32}}rpx;"
>
@@ -217,7 +217,7 @@
<!-- 鏂囧瓧鍔犲浘鐗� -->
<view
wx:if="{{item.optionStyle == 'TxtAndImage'}}"
- class="fl-center mh"
+ class="fl-center mh text-space"
>
<text
style="color:{{ isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 32}}rpx;"
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxss b/packageBookService/pages/bookServices/examination/questionList/index.wxss
index 5e7c018..3260ba0 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxss
@@ -1,7 +1,7 @@
/* pages/bookServices/examination/questionList/index.wxss */
.question-list {
width: 95%;
- height: calc(100vh - 300px);
+ height: calc(100% - 90px);
padding: 20rpx;
background-color: #ffffff;
@@ -12,6 +12,11 @@
.question-title {
font-size: 28rpx;
margin-bottom: 20rpx;
+}
+
+.text-space {
+ letter-spacing: 2rpx;
+ line-height: 1.5;
}
.title-content {
@@ -229,6 +234,8 @@
}
.stem-rich-p {
+ letter-spacing: 2rpx;
+ line-height: 1.5;
display: block;
}
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.js b/packageBookService/pages/bookServices/examination/questionOptions/index.js
index 71e18a6..f807034 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.js
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.js
@@ -52,6 +52,9 @@
type: Boolean,
value: false,
},
+ showId: {
+ type: String
+ }
},
/**
@@ -188,11 +191,6 @@
radioItem: e.detail.value,
});
const value = e.detail.value == "night" ? true : false;
- wx.setNavigationBarColor({
- backgroundColor: "#222",
- frontColor: "#222",
- });
-
this.triggerEvent("changeBGColor", {
value
});
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
index 270bd18..1c50948 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -117,7 +117,8 @@
wx:for-item="citem"
wx:for-index="cindex"
wx:key="cindex"
- class="question-box {{ citem.isUserAnswer ? 'answered' : 'un-answered' }} {{ ( ((answerType == 'option' || answerType == 'mock') && submitStatus || answerType == 'collectQuestion' || answerType == 'errorQuestion') && citem.questionType !== 'shortAnswer' ) ? citem.isRight ? 'correct-box-color' : 'error-box-color' : ''}} "
+ style="border: {{showId == citem.id ? '1px solid #ff6c00' : ''}}"
+ class="question-box {{ citem.isUserAnswer ? 'answered' : 'un-answered' }} {{ ( ((answerType == 'option' || answerType == 'mock') && submitStatus || answerType == 'collectQuestion' || answerType == 'errorQuestion') && citem.questionType !== 'shortAnswer' ) ? citem.isRight && citem.isComplete ? 'correct-box-color' : citem.isComplete && !citem.isRight ? 'error-box-color' : '' :''}} "
>
{{citem.number}}
</view>
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxss b/packageBookService/pages/bookServices/examination/questionOptions/index.wxss
index 7187b0a..cd5ee68 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxss
@@ -18,6 +18,10 @@
color: #010101;
}
+.li-option image {
+ margin-bottom: 16rpx;
+}
+
.page-bottom image {
width: 36rpx;
height: 36rpx;
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 9a00794..f8a4e1d 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -283,7 +283,7 @@
showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + datas.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey);
} else {
console.log(datas);
- showDataUrl = app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file;
+ showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
}
titleName = datas.name;
}
@@ -326,7 +326,7 @@
} else {
this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
+ showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile
})
this.pubulicPlayFun()
}
diff --git a/pages/bibliographyList/index.wxml b/pages/bibliographyList/index.wxml
index 1e1c12a..d0cbda9 100644
--- a/pages/bibliographyList/index.wxml
+++ b/pages/bibliographyList/index.wxml
@@ -22,8 +22,6 @@
<view class="example-search">
<t-search model:value="{{value}}" placeholder="璇疯緭鍏ヤ功鐩悕绉�" bind:submit="onSearchSubmit">
-
-
</t-search>
<!-- <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" /> -->
diff --git a/pages/bookExhibitionDetails/index.wxml b/pages/bookExhibitionDetails/index.wxml
index 17c5865..1a3528d 100644
--- a/pages/bookExhibitionDetails/index.wxml
+++ b/pages/bookExhibitionDetails/index.wxml
@@ -9,7 +9,9 @@
<view>
<t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
+
<view class="navbar-title">{{subtitleName}}</view>
+
</view>
<view class="headBox">
diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index 1a15a72..8d664f4 100644
--- a/pages/cart/index.wxml
+++ b/pages/cart/index.wxml
@@ -72,7 +72,7 @@
<view class="settlementBox">
<view class="totalPrice">鎬讳环:<text class="totalPriceText">锟{totalPrice}}</text></view>
<view class="buttonBox">
- <t-button class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage">鍘荤粨绠�({{selectedCount}})</t-button>
+ <t-button class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage"> <view >鍘荤粨绠�({{selectedCount}})</view> </t-button>
</view>
</view>
</view>
diff --git a/pages/cart/index.wxss b/pages/cart/index.wxss
index 0b2b1df..b5877c9 100644
--- a/pages/cart/index.wxss
+++ b/pages/cart/index.wxss
@@ -186,9 +186,9 @@
padding: 0 !important;
}
-.t-button--default {
- /* background-color: #FF6C00 !important; */
-}
+/* .t-button--default {
+ background-color: #FF6C00 !important;
+} */
.noDataBox {
width: 100%;
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 659db87..3ea3558 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -62,7 +62,6 @@
this.bibliographyGet()
let event = {
detail: {
-
value: "0"
}
}
@@ -142,7 +141,6 @@
tabValue: value,
isMore: false
})
-
} else if (value === '1') {
console.log(value, 'tab');
this.setData({
--
Gitblit v1.9.1