From 3946f1f19a5bdc9ebdc4baea276fa1511ea2bcd1 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Tue, 13 Aug 2024 16:54:23 +0800
Subject: [PATCH] 1
---
app.js | 2 +-
pages/message/index.wxml | 2 +-
pages/messageDetail/index.js | 12 ++++++++----
pages/messageDetail/index.wxml | 3 +--
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/app.js b/app.js
index e6dd88e..0d5fc50 100644
--- a/app.js
+++ b/app.js
@@ -70,7 +70,7 @@ if (envVersion === 'develop') {
// baseUrl = "https://test.renminshitang.com.cn/zhuchangtong/api_dev"
that.globalData.ip = 'https://test.renminshitang.com.cn/daotian/api_dev'
// that.globalData.ip = 'https://daotian.matripe.com.cn'
- // that.globalData.ip = 'https://daotian.matripe.com.cn'
+ that.globalData.ip = 'https://daotian.matripe.com.cn'
} else if (envVersion === 'trial') {
console.log('当前是体验环境');
that.globalData.ip = "https://test.renminshitang.com.cn/daotian/api_dev"
diff --git a/pages/message/index.wxml b/pages/message/index.wxml
index bcacfcc..1a34f07 100644
--- a/pages/message/index.wxml
+++ b/pages/message/index.wxml
@@ -67,7 +67,7 @@
{{item.pubTime}}
- {{item.remark}}
+ {{item.remark || '[图片]'}}
diff --git a/pages/messageDetail/index.js b/pages/messageDetail/index.js
index bfe99bc..1ac6d98 100644
--- a/pages/messageDetail/index.js
+++ b/pages/messageDetail/index.js
@@ -9,7 +9,8 @@ Page({
serviceInfo: {},
pageType: null,
currentId: null,
- currentInfo: {},
+ currentInfo: {},
+ showText:"",
tagStyle: {
p: "margin-top: 0; margin-bottom: 0;line-height: 1.8; white-space:pre-wrap;",
body: " margin: 0; color: #333; font-size: 14px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-variant: tabular-nums; line-height: 1.8; -webkit-font-feature-settings: 'tnum'; font-feature-settings: 'tnum';",
@@ -102,10 +103,13 @@ Page({
if (res.data.status == 200) {
setTimeout(() => {
// let reg = /]*href=['"]([^"]*)['"][^>]*>(.*?)<\/a>/g.exec(res.data.data.content);
- // console.log(reg);
-
+ // console.log(reg);
+
+ var s = res.data.data.content.replace(/![]()
/g, ""),
});
wx.hideLoading();
diff --git a/pages/messageDetail/index.wxml b/pages/messageDetail/index.wxml
index 09ceb49..52050fa 100644
--- a/pages/messageDetail/index.wxml
+++ b/pages/messageDetail/index.wxml
@@ -61,6 +61,5 @@
{{currentInfo.title}}
-
-
+