From 6afcf851d6f2db0de5cdaca31cad419f60895ede Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期二, 10 九月 2024 16:52:58 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 .vscode/settings.json                        |    2 +-
 pages/bibliographyList/index.wxss            |    4 ++++
 packageDomain/pages/publickBookForm/index.js |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index ff37bd1..451d977 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -32,7 +32,7 @@
   },
   "editor.tabSize": 2,
   "[wxml]": {
-    "editor.defaultFormatter": "wechat.miniprogram.wxml-language-features"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[css]": {
     "editor.defaultFormatter": "HookyQR.beautify"
diff --git a/packageDomain/pages/publickBookForm/index.js b/packageDomain/pages/publickBookForm/index.js
index e0c1a1c..97b0ed1 100644
--- a/packageDomain/pages/publickBookForm/index.js
+++ b/packageDomain/pages/publickBookForm/index.js
@@ -302,6 +302,7 @@
           "teacherInfo.targetReaders": '',
           "teacherInfo.topicImpactAndExpected": '',
           "teacherInfo.topicProgress": '',
+          "teacherInfo.topicFeatures": '',
           "teacherInfo.marketAnalysis": '',
           "teacherInfo.marketingAndPromotionPlan": '',
           "teacherInfo.digitalResourceDevelopmentPlan": '',
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index b7f88f1..58ed836 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -321,6 +321,10 @@
   margin-bottom: 16rpx;
 }
 
+.input-box .t-input--border::after {
+  height: 0 !important;
+}
+
 .input {
   --td-input-border-radius: 20rpx;
   border-radius: 20rpx;

--
Gitblit v1.9.1