From 2f1a9a39d6bde43d8c73236f822b3bc79cc96af6 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 06 九月 2024 16:19:57 +0800
Subject: [PATCH] 联系我们修改
---
app.json | 7 +--
packagePersonal/pages/aboutUs/index.js | 24 -----------
.vscode/settings.json | 2
packagePersonal/pages/myMassage/index.js | 1
package.json | 2
custom-tab-bar/index.js | 2
packagePersonal/pages/aboutUs/index.wxss | 54 +++++++--------------------
7 files changed, 20 insertions(+), 72 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/app.json b/app.json
index 0ab99af..957797f 100644
--- a/app.json
+++ b/app.json
@@ -77,13 +77,10 @@
"pages/bookServices/webpage/index",
"pages/components/webView/index",
"pages/bookServices/detail/buyResource/index",
-<<<<<<< Updated upstream
- "pages/bookServices/detail/components/learnTask/index"
-=======
+ "pages/bookServices/detail/components/learnTask/index",
"pages/bookServices/linkPage/index"
->>>>>>> Stashed changes
]
- }
+ }
],
"tabBar": {
"custom": true,
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 12e886b..edef97d 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -12,4 +12,4 @@
});
}
},
-});
+});
\ No newline at end of file
diff --git a/package.json b/package.json
index e365cc6..261fc89 100644
--- a/package.json
+++ b/package.json
@@ -46,4 +46,4 @@
"lint-staged": "^10.0.8",
"prettier": "^2.1.2"
}
-}
+}
\ No newline at end of file
diff --git a/packagePersonal/pages/aboutUs/index.js b/packagePersonal/pages/aboutUs/index.js
index 0177cca..e5af99e 100644
--- a/packagePersonal/pages/aboutUs/index.js
+++ b/packagePersonal/pages/aboutUs/index.js
@@ -36,7 +36,6 @@
barHeight: systInfo.statusBarHeight,
types: options.types
})
- // this.getBanner()
this.getAboutText()
},
@@ -88,25 +87,6 @@
onShareAppMessage() {
},
- //杞挱鍥�
- getBanner() {
- app.MG.resource.getItem({
- path: 'jsek_banner\\jsek_aboutUsBanner',
- paging: {
- start: 0,
- size: 9
- },
- fields: {
- jsek_link: []
- }
- }).then(res => {
- this.setData({
- bannerList: res.datas[0].icon,
- swiperList: res.datas[0].icon
- })
- })
- },
-
//鏂囧瓧 jsek_aboutUs 鍏充簬鎴戜滑
//jsek_contactUs 鑱旂郴鎴戜滑
getAboutText() {
@@ -119,10 +99,8 @@
width: 750
},
}).then(res => {
- // console.log(res.datas[0].content);
- // 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"')
+ modifiedContent = modifiedContent.replace(/<table/g, '<table class="table"').replace(/<tr/g, '<tr class="tr"').replace(/<td/g, '<td class="td"')
this.setData({
aboutText: modifiedContent,
loading: false,
diff --git a/packagePersonal/pages/aboutUs/index.wxss b/packagePersonal/pages/aboutUs/index.wxss
index 64c9dd2..dedf20b 100644
--- a/packagePersonal/pages/aboutUs/index.wxss
+++ b/packagePersonal/pages/aboutUs/index.wxss
@@ -39,6 +39,7 @@
height: calc(100vh - env(safe-area-inset-bottom) - 200rpx);
overflow-y: auto;
padding: 0 20rpx;
+ padding-bottom: 100rpx;
}
.titleBox {
@@ -52,46 +53,6 @@
.titleTextBox {
margin: 0 auto;
}
-
-
-/* 瀵屾枃鏈垵濮嬪寲鏍峰紡 */
-/* .richTextBox {
- line-height: 1.4 !important;
- font-size: 14px !important;
-} */
-
-/* .richTextBox {
- margin: revert !important;
- padding: revert !important;
- border: revert !important;
- font: revert !important;
- vertical-align: revert !important;
- color: #000 !important;
-} */
-
-/*
-.richTextBox 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;
-} */
-
-/* .richTextBox td {
- border-bottom: 1px dashed !important;
- border-right: 1px dashed !important;
- border-width: 1px !important;
-} */
-
-/*
-.richTextBox table {
- border-width: 2rpx !important;
-} */
.aboutUs-rich-p {
@@ -114,4 +75,17 @@
.aboutUs-rich-table {
border-width: 2px !important;
+}
+
+
+
+
+.table {
+ border-collapse: collapse;
+ /* 杈规鍚堝苟 */
+}
+
+.td {
+ text-align: center;
+ border: 1px dashed #ccc;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/myMassage/index.js b/packagePersonal/pages/myMassage/index.js
index 39b0569..1336b10 100644
--- a/packagePersonal/pages/myMassage/index.js
+++ b/packagePersonal/pages/myMassage/index.js
@@ -16,7 +16,6 @@
isBackTop: false,
setScrollValue: 0,
skeletonLoding: true,
-
},
/**
--
Gitblit v1.9.1