1

1 year ago · 3946f1f19a
parent ba05c104d1
commit 3946f1f19a
4 changed files with 11 additions and 8 deletions
--- 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"
--- a/pages/message/index.wxml
+++ b/pages/message/index.wxml
@ -67,7 +67,7 @@
      </view>
      <view class="fw400" hover-class="none" hover-stop-propagation="false">{{item.pubTime}}</view>
    </view>
-    <view class="f14 c9 oelps" style="width:100%">{{item.remark}}</view>
+    <view class="f14 c9 oelps" style="width:100%">{{item.remark || '[图片]'}}</view>
  </view>
  <view class wx:if="{{infoList.length <= 0}}" style="text-align:center" hover-class="none" hover-stop-propagation="false">
    <view class="t-icon t-icon-zanwu" style="width:80px;height:80px;margin:60px auto 20px;"></view>
--- a/pages/messageDetail/index.js
+++ b/pages/messageDetail/index.js
@ -10,6 +10,7 @@ Page({
 		pageType: null,
 		currentId: null,
    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';",
@ -104,8 +105,11 @@ Page({
 						// let reg = /<a[^>]*href=['"]([^"]*)['"][^>]*>(.*?)<\/a>/g.exec(res.data.data.content);
            // console.log(reg);
          
+            var s = res.data.data.content.replace(/<img/g, '<img style="max-width:100% !important;height:auto !important;margin-top:10px;"')
+            console.log(s)
 						that.setData({
              currentInfo: res.data.data,
+              showText:s,
 							html: res.data.data.content.replace(/<!doctype html>/g, ""),
 						});
 						wx.hideLoading();
--- a/pages/messageDetail/index.wxml
+++ b/pages/messageDetail/index.wxml
@ -61,6 +61,5 @@
 </view>
 <view class="content" wx:else hover-class="none" hover-stop-propagation="false">
  <view class="title f18 fw500">{{currentInfo.title}}</view>
-  <!-- <mp-html content="{{html}}" tag-style="{{tagStyle}}" container-style="font-size:14px;color:#333"  scroll-table="true"/> -->
-  <!-- <rich-text class="info f14" space='nbsp'>{{currentInfo.content}}</rich-text> -->
+  <rich-text class="info f14" space='nbsp' nodes="{{showText}}"></rich-text>
 </view>