From 813e3b6030ecfc86e4e71db31173e5cb77ee8c40 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 10 五月 2024 09:29:35 +0800
Subject: [PATCH] bug修改
---
packagePersonal/pages/aboutUs/index.js | 13 +-----
packageBookService/pages/bookServices/detail/components/tree/index.wxss | 2
packagePersonal/pages/activateProduct/index.js | 5 --
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 5 ++
packageBookService/pages/bookServices/list/index.wxss | 2
packageDomain/pages/sampleBookList/index.wxss | 4 ++
packageBookService/pages/bookServices/detail/components/tree/index.js | 3 +
pages/bookExhibitionList/index.wxss | 2
packagePersonal/pages/aboutUs/index.wxss | 25 +++++++++++-
packagePersonal/pages/aboutUs/index.wxml | 26 ++++++++----
10 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index c2f07e2..a877b45 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -139,6 +139,7 @@
if (token) {
const item = e.currentTarget.dataset.item;
const parent = e.currentTarget.dataset.parent;
+ console.log('item', item);
const parentProductLinkPath = parent ?
parent.productLinkPath :
wx.getStorageSync("teachResourcesPath");
@@ -198,7 +199,7 @@
title: "璧勬簮涓嶅彲鐢紝璇疯仈绯荤鐞嗗憳",
});
}
- } else if ((this.properties.tab == "jsek_teachingResources" || this.properties.tab == "jsek_cloudLearning") && (!item.file || !item.freeFile || !item.protectedFile)) {
+ } else if ((this.properties.tab == "jsek_teachingResources" || this.properties.tab == "jsek_cloudLearning") && (!item.file && !item.freeFile && !item.protectedFile)) {
return wx.showToast({
icon: 'error',
title: '鏆傛棤璧勬簮',
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index c74bc23..6f8344d 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -260,7 +260,10 @@
>
</view>
<!-- 鏁欏璧勬簮绫诲瀷 -->
- <view class="teachClass fl-cn" wx:if="{{citem.resourceClass}}">
+ <view
+ class="teachClass fl-cn"
+ wx:if="{{citem.resourceClass && tab == 'jsek_teachingResources'}}"
+ >
{{citem.resourceClass}}
</view>
<view wx:if="{{tab == 'jsek_cloudLearning'}}">
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxss b/packageBookService/pages/bookServices/detail/components/tree/index.wxss
index a4e195a..fd8e1e5 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxss
@@ -1,5 +1,5 @@
.tree {
- --td-collapse-content-padding: 0rpx 12rpx 32rpx 12rpx;
+ --td-collapse-content-padding: 0rpx 12rpx 0rpx 12rpx;
--td-collapse-header-text-color: #ff6c00;
--td-collapse-icon-color: #ff6c00;
--td-collapse-header-height: min-content;
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index 57de768..4eec494 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -261,5 +261,5 @@
}
.t-icon-base {
- font-size: 44rpx;
+ font-size: 38rpx;
}
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index c136bf1..1ebdacb 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -336,4 +336,8 @@
position: absolute;
top: 30rpx;
left: 118rpx;
+}
+
+.t-icon-base {
+ font-size: 38rpx;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/aboutUs/index.js b/packagePersonal/pages/aboutUs/index.js
index 9b0f351..0177cca 100644
--- a/packagePersonal/pages/aboutUs/index.js
+++ b/packagePersonal/pages/aboutUs/index.js
@@ -28,21 +28,14 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
-
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
-
this.setData({
navBarHeight: navBarHeight,
barHeight: systInfo.statusBarHeight,
types: options.types
})
-
- console.log(this.data.types);
-
-
// this.getBanner()
this.getAboutText()
},
@@ -127,9 +120,9 @@
},
}).then(res => {
// console.log(res.datas[0].content);
- let modifiedContent = `<div class="richTextBox">${res.datas[0].content}</div>`;
- // modifiedContent = modifiedContent.replace(/\<table/gi, '<table class="aboutUs-rich-table"').replace(/\<td/gi, '<table class="aboutUs-rich-td"').replace(/\<p/gi, '<p class="aboutUs-rich-p"')
- console.log(modifiedContent);
+ // let modifiedContent = `<div class="richTextBox">${res.datas[0].content}</div>`;
+ let modifiedContent = res.datas[0].content
+ // modifiedContent = modifiedContent.replace(/\<table/gi, '<table class="aboutUs-rich-table"').replace(/\<td/gi, '<table class="aboutUs-rich-td"').replace(/\<tr/gi, '<tr class="aboutUs-rich-tr"').replace(/\<p/gi, '<p class="aboutUs-rich-p"')
this.setData({
aboutText: modifiedContent,
loading: false,
diff --git a/packagePersonal/pages/aboutUs/index.wxml b/packagePersonal/pages/aboutUs/index.wxml
index 163b54c..34d03b0 100644
--- a/packagePersonal/pages/aboutUs/index.wxml
+++ b/packagePersonal/pages/aboutUs/index.wxml
@@ -1,31 +1,39 @@
<import src="index.skeleton.wxml" />
<template is="skeleton" wx:if="{{loading}}" />
-
<view class="aboutUsBox" hidden="{{hidden}}">
<view class="titleBox">
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 90%; 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="titleTextBox">
- <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title">鍏充簬鎴戜滑</view>
+ <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title"
+ >鍏充簬鎴戜滑</view
+ >
<view wx:else class="navbar-title">鑱旂郴鎴戜滑</view>
</view>
-
</view>
</view>
-
<view wx:if="{{types == 'jsek_aboutUs'}}" class="aboutUs">
<view class="aboutText aboutUs">
<rich-text nodes="{{aboutText}}" space="emsp"></rich-text>
</view>
</view>
- <view wx:else class="aboutText richTextBox" style="margin: 5rpx;">
- <rich-text style="width: 100%;" space="emsp" nodes="{{aboutText}}" mode="compat"></rich-text>
+ <view wx:else class="aboutText richTextBox" style="margin: 5rpx">
+ <rich-text
+ style="width: 100%"
+ space="emsp"
+ nodes="{{aboutText}}"
+ mode="compat"
+ ></rich-text>
</view>
-</view>
\ No newline at end of file
+</view>
diff --git a/packagePersonal/pages/aboutUs/index.wxss b/packagePersonal/pages/aboutUs/index.wxss
index 8103da5..f0c0354 100644
--- a/packagePersonal/pages/aboutUs/index.wxss
+++ b/packagePersonal/pages/aboutUs/index.wxss
@@ -39,8 +39,6 @@
padding-bottom: 100rpx;
}
-
-
.titleBox {
position: sticky;
top: 0px;
@@ -55,7 +53,7 @@
/* 瀵屾枃鏈垵濮嬪寲鏍峰紡 */
-.richTextBox {
+/* .richTextBox {
line-height: 1.4 !important;
font-size: 14px !important;
}
@@ -90,4 +88,25 @@
.richTextBox table {
border-width: 2px !important;
+} */
+.aboutUs-rich-p {
+ display: block !important;
+ -webkit-margin-before: 1em !important;
+ margin-block-start: 1em !important;
+ -webkit-margin-after: 1em !important;
+ margin-block-end: 1em !important;
+ -webkit-margin-start: 0 !important;
+ margin-inline-start: 0 !important;
+ -webkit-margin-end: 0 !important;
+ margin-inline-end: 0 !important;
+}
+
+.aboutUs-rich-td {
+ border-bottom: 1px dashed !important;
+ border-right: 1px dashed !important;
+ border-width: 1px !important;
+}
+
+.aboutUs-rich-table {
+ border-width: 2px !important;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/activateProduct/index.js b/packagePersonal/pages/activateProduct/index.js
index 3247c02..8328d73 100644
--- a/packagePersonal/pages/activateProduct/index.js
+++ b/packagePersonal/pages/activateProduct/index.js
@@ -70,13 +70,9 @@
}, 1000) //寤惰繜鏃堕棿
}
})
-
-
});
}
}
-
-
},
//鍟嗗搧鍒楄〃
getDataList(isReachBottom) {
@@ -90,6 +86,7 @@
}).then((res) => {
try {
if (res.datas.length > 0) {
+ console.log(res.datas);
res.datas.forEach((item, index) => {
item.createDate = moment(item.createDate).format("YYYY-MM-DD HH:mm:ss");
let oldlist = [];
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 7ffe56a..d97d290 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -287,5 +287,5 @@
}
.t-icon-base {
- font-size: 44rpx;
+ font-size: 38rpx;
}
\ No newline at end of file
--
Gitblit v1.9.1