Merge branch 'master' of http://123.60.98.226:3000/litiange/jundaosuzhou_wechatxcx

app.wxss

@@ -124,7 +124,7 @@ page{
   text-overflow: ellipsis;
 }
 .sz-xcx-fwb-img {
-  max-width: 100%;
+  max-width: 100% !important;
   height: auto;
   object-fit: cover;
 }

utils/filter.wxs

@@ -1,19 +1,45 @@
-var formateRichText = function(str){
-  if(!str){
-    return "";
+var formateRichText = function(str) {
+  if (!str) {
+    return ""; // 正确：函数内部的return
   }
-  var reg = getRegExp("<img","g");
-  str = str.replace(reg, "<img class='sz-xcx-fwb-img' width='100%'")
-  reg = getRegExp("<IMG","g");
-  str = str.replace(reg, "<img class='sz-xcx-fwb-img' width='100%'")
-  reg = getRegExp("&nbsp;","g");
-  str = str.replace(reg, '<span style="width: 8rpx;display: inline-block;"></span>')
-  reg = getRegExp("section","g");
-  str = str.replace(reg, 'div');
-  reg = getRegExp("↵","g");
-  str = str.replace(reg, '<br />');
+  
+  // 处理img标签
+  var reg = getRegExp("<img", "g");
+  str = str.replace(reg, '<img class="sz-xcx-fwb-img" style="width:100%!important;height:auto!important;"');
+  
+  reg = getRegExp("<IMG", "g");
+  str = str.replace(reg, '<img class="sz-xcx-fwb-img" style="width:100%!important;height:auto!important;"');
+  
+  // 移除width和height属性
+  reg = getRegExp('width="[^"]*"', "gi");
+  str = str.replace(reg, "");
+  
+  reg = getRegExp('height="[^"]*"', "gi");
+  str = str.replace(reg, "");
+  
+  // 清除style中的宽高样式
+  reg = getRegExp('width:[^;]+;', "gi");
+  str = str.replace(reg, "");
+  reg = getRegExp('height:[^;]+;', "gi");
+  str = str.replace(reg, "");
+  reg = getRegExp('width:[^;]+', "gi");
+  str = str.replace(reg, "");
+  reg = getRegExp('height:[^;]+', "gi");
+  str = str.replace(reg, "");
+  
+  // 处理其他标签
+  reg = getRegExp("&nbsp;", "g");
+  str = str.replace(reg, '<span style="width: 8rpx;display: inline-block;"></span>');
+  
+  reg = getRegExp("section", "g");
+  str = str.replace(reg, "div");
+  
+  reg = getRegExp("↵", "g");
+  str = str.replace(reg, "<br />");
+  
   return str;
-}
+};
+
 var gotoUrl = function(item){
   var str = "/pages/info/"
   if(item.frontShowModel=='multisku'){