From 706a8f069ba3a6239f67441d7234a3f37bed0d75 Mon Sep 17 00:00:00 2001
From: itgaojian163 <itgaojian@163.com>
Date: Fri, 7 Feb 2025 16:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6mp-html,=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  18 +-
 app.json                                      |   5 +-
 app.wxss                                      |   4 +
 .../container-loading/container-loading.js    |  50 +-
 .../container-loading/container-loading.wxml  |   6 +-
 .../container-loading/container-loading.wxss  |  12 +
 components/content-loading/loading.wxss       |   2 +
 components/mp-html/index.js                   | 152 +++++
 components/mp-html/index.json                 |   1 +
 components/mp-html/index.wxml                 |   4 +
 components/mp-html/index.wxss                 |  11 +
 components/mp-html/node/node.js               | 147 +++++
 components/mp-html/node/node.json             |   1 +
 components/mp-html/node/node.wxml             |  34 ++
 components/mp-html/node/node.wxss             | 157 +++++
 components/mp-html/parser.js                  | 537 ++++++++++++++++++
 components/page-loading/page-loading.wxss     |   2 +
 imgs/load_err.png                             | Bin 0 -> 16724 bytes
 pages/company/company.wxml                    |   4 +-
 pages/company/company.wxss                    |   6 -
 pages/domain/domain.js                        |  38 +-
 pages/domain/domain.wxml                      |   2 +-
 pages/index/index.js                          |  38 +-
 pages/index/index.wxml                        |  28 +-
 pages/industry-area/industry-area.wxml        |   2 +-
 pages/invest-detail/invest-detail.wxml        |   2 +-
 pages/plates/plates.wxml                      |   4 +-
 pages/policy-detail/policy-detail.wxml        |   4 +-
 .../superiority-detail.wxml                   |   2 +-
 pages/unique-detail/unique-detail.wxml        |   5 +-
 project.config.json                           |   2 +-
 utils/http.js                                 |   3 +-
 32 files changed, 1189 insertions(+), 94 deletions(-)
 create mode 100644 components/mp-html/index.js
 create mode 100644 components/mp-html/index.json
 create mode 100644 components/mp-html/index.wxml
 create mode 100644 components/mp-html/index.wxss
 create mode 100644 components/mp-html/node/node.js
 create mode 100644 components/mp-html/node/node.json
 create mode 100644 components/mp-html/node/node.wxml
 create mode 100644 components/mp-html/node/node.wxss
 create mode 100644 components/mp-html/parser.js
 create mode 100644 imgs/load_err.png

diff --git a/app.js b/app.js
index d38cb27..c7274e3 100644
--- a/app.js
+++ b/app.js
@@ -1,19 +1,15 @@
 //app.js
 App({
     onLaunch() {
-        // 展示本地存储能力
-        // const logs = wx.getStorageSync('logs') || []
-        // logs.unshift(Date.now())
-        // wx.setStorageSync('logs', logs)
-        // 登录
-        wx.login({
-            success: res => {
-                // 发送 res.code 到后台换取 openId, sessionKey, unionId
-            }
-        })
+        // wx.login({
+        //     success: res => {
+        //         // 发送 res.code 到后台换取 openId, sessionKey, unionId
+        //     }
+        // })
     },
     globalData: {
         userInfo: null,
-        imgPath: 'http://106.74.34.136:8084/daqi/route/file/true/'
+        // imgPath: 'http://106.74.34.136:8084/daqi/route/file/true/'
+        imgPath: 'https://www.xzszwhy.cn/daqi/route/file/true/'
     }
 })
\ No newline at end of file
diff --git a/app.json b/app.json
index b1772ee..c402f75 100644
--- a/app.json
+++ b/app.json
@@ -15,7 +15,7 @@
     ],
     "window": {
         "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "达拉特招商",
+        "navigationBarTitleText": "达拉特旗招商",
         "navigationBarBackgroundColor": "#ffffff"
     },
     "tabBar": {
@@ -51,6 +51,7 @@
     },
     "usingComponents": {
         "page-loading": "/components/page-loading/page-loading",
-        "container-loading": "/components/container-loading/container-loading"
+        "container-loading": "/components/container-loading/container-loading",
+        "mp-html": "/components/mp-html/index"
     }
 }
\ No newline at end of file
diff --git a/app.wxss b/app.wxss
index cba2cfb..4341bbf 100644
--- a/app.wxss
+++ b/app.wxss
@@ -273,4 +273,8 @@ page::after {
     align-self: center;
     justify-content: center;
     margin-top: 70rpx;
+}
+
+.rich-text {
+    width: 100%;
 }
\ No newline at end of file
diff --git a/components/container-loading/container-loading.js b/components/container-loading/container-loading.js
index a0565e4..3b60416 100644
--- a/components/container-loading/container-loading.js
+++ b/components/container-loading/container-loading.js
@@ -1,30 +1,30 @@
 // components/container-loading/container-loading.js
 Component({
 
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    loadingState: {
-        type: Boolean,
-        value: true
-      }
-  },
-  observers: {
-    'loadingState': function (newVal) {
-      this.setData({
-        loadingVisible: newVal
-      });
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        loadingState: {
+            type: String,
+            value: 'loading'
+        }
+    },
+    observers: {
+        'loadingState': function (newVal) {
+            this.setData({
+                loadingVisible: newVal
+            });
+        }
+    },
+    data: {
+        loadingVisible: 'loading'
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
     }
-  },
-  data: {
-    loadingVisible: true
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
 })
\ No newline at end of file
diff --git a/components/container-loading/container-loading.wxml b/components/container-loading/container-loading.wxml
index 0060029..5d7cd3d 100644
--- a/components/container-loading/container-loading.wxml
+++ b/components/container-loading/container-loading.wxml
@@ -1,7 +1,9 @@
 <view class="container">
-    <view class="loading" wx:if="{{loadingVisible}}">
+    <view class="loading" wx:if="{{loadingVisible=='loading'}}"></view>
+    <view wx:elif="{{loadingVisible=='error'}}" style="align-self: center;">
+        <image src="../../imgs/load_err.png" class="loading_err"></image>
     </view>
-    <block wx:if="{{!loadingVisible}}">
+    <block wx:else="{{loadingVisible=='success'}}">
         <slot></slot>
     </block>
 </view>
\ No newline at end of file
diff --git a/components/container-loading/container-loading.wxss b/components/container-loading/container-loading.wxss
index 9289783..e144297 100644
--- a/components/container-loading/container-loading.wxss
+++ b/components/container-loading/container-loading.wxss
@@ -10,6 +10,7 @@
 .loading {
     position: relative;
     width: 40px;
+    border-radius: 20px;
     perspective: 500px;
     align-self: center;
     margin-top: 80rpx;
@@ -21,6 +22,7 @@
     width: 15px;
     height: 15px;
     content: "";
+    border-radius: 20px;
     animation: jumping 0.5s infinite alternate;
     background: rgba(0, 0, 0, 0);
 }
@@ -34,6 +36,16 @@
     animation-delay: 0.15s;
 }
 
+.loading_err {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    width: 150px;
+    align-items: center;
+    height: 100px;
+    align-self: center;
+}
+
 @keyframes jumping {
     0% {
         transform: scale(1) translateY(0px) rotateX(0deg);
diff --git a/components/content-loading/loading.wxss b/components/content-loading/loading.wxss
index 09b5f42..a00a816 100644
--- a/components/content-loading/loading.wxss
+++ b/components/content-loading/loading.wxss
@@ -17,6 +17,7 @@
 .loading {
     position: relative;
     width: 50px;
+    border-radius: 25px;
 }
 
 .loading:before,
@@ -25,6 +26,7 @@
     width: 20px;
     height: 20px;
     content: "";
+    border-radius: 20px;
     animation: jumping 0.5s infinite alternate;
     background: rgba(0, 0, 0, 0);
 }
diff --git a/components/mp-html/index.js b/components/mp-html/index.js
new file mode 100644
index 0000000..d2cfa0a
--- /dev/null
+++ b/components/mp-html/index.js
@@ -0,0 +1,152 @@
+"use strict";
+
+function e(e, t, n) {
+    return t in e ? Object.defineProperty(e, t, {
+        value: n,
+        enumerable: !0,
+        configurable: !0,
+        writable: !0
+    }) : e[t] = n, e
+}
+/*!
+ * mp-html v2.5.0
+ * https://github.com/jin-yufeng/mp-html
+ *
+ * Released under the MIT license
+ * Author: Jin Yufeng
+ */
+var t = require("./parser"),
+    n = [];
+Component({
+    data: {
+        nodes: []
+    },
+    properties: {
+        containerStyle: String,
+        content: {
+            type: String,
+            value: "",
+            observer: function (e) {
+                this.setContent(e)
+            }
+        },
+        copyLink: {
+            type: Boolean,
+            value: !0
+        },
+        domain: String,
+        errorImg: String,
+        lazyLoad: Boolean,
+        loadingImg: String,
+        pauseVideo: {
+            type: Boolean,
+            value: !0
+        },
+        previewImg: {
+            type: null,
+            value: !0
+        },
+        scrollTable: Boolean,
+        selectable: null,
+        setTitle: {
+            type: Boolean,
+            value: !0
+        },
+        showImgMenu: {
+            type: Boolean,
+            value: !0
+        },
+        tagStyle: Object,
+        useAnchor: null
+    },
+    created: function () {
+        this.plugins = [];
+        for (var e = n.length; e--;) this.plugins.push(new n[e](this))
+    },
+    detached: function () {
+        this._hook("onDetached")
+    },
+    methods: {
+        in: function (e, t, n) {
+            e && t && n && (this._in = {
+                page: e,
+                selector: t,
+                scrollTop: n
+            })
+        },
+        navigateTo: function (t, n) {
+            var i = this;
+            return new Promise(function (o, r) {
+                if (!i.data.useAnchor) return void r(Error("Anchor is disabled"));
+                var a = wx.createSelectorQuery().in(i._in ? i._in.page : i).select((i._in ? i._in.selector : "._root") + (t ? "".concat(">>>", "#").concat(t) : "")).boundingClientRect();
+                i._in ? a.select(i._in.selector).scrollOffset().select(i._in.selector).boundingClientRect() : a.selectViewport().scrollOffset(), a.exec(function (t) {
+                    if (!t[0]) return void r(Error("Label not found"));
+                    var a = t[1].scrollTop + t[0].top - (t[2] ? t[2].top : 0) + (n || parseInt(i.data.useAnchor) || 0);
+                    i._in ? i._in.page.setData(e({}, i._in.scrollTop, a)) : wx.pageScrollTo({
+                        scrollTop: a,
+                        duration: 300
+                    }), o()
+                })
+            })
+        },
+        getText: function (e) {
+            var t = "";
+            return function e(n) {
+                for (var i = 0; i < n.length; i++) {
+                    var o = n[i];
+                    if ("text" === o.type) t += o.text.replace(/&amp;/g, "&");
+                    else if ("br" === o.name) t += "\n";
+                    else {
+                        var r = "p" === o.name || "div" === o.name || "tr" === o.name || "li" === o.name || "h" === o.name[0] && o.name[1] > "0" && o.name[1] < "7";
+                        r && t && "\n" !== t[t.length - 1] && (t += "\n"), o.children && e(o.children), r && "\n" !== t[t.length - 1] ? t += "\n" : "td" !== o.name && "th" !== o.name || (t += "\t")
+                    }
+                }
+            }(e || this.data.nodes), t
+        },
+        getRect: function () {
+            var e = this;
+            return new Promise(function (t, n) {
+                wx.createSelectorQuery().in(e).select("._root").boundingClientRect().exec(function (e) {
+                    return e[0] ? t(e[0]) : n(Error("Root label not found"))
+                })
+            })
+        },
+        pauseMedia: function () {
+            for (var e = (this._videos || []).length; e--;) this._videos[e].pause()
+        },
+        setPlaybackRate: function (e) {
+            this.playbackRate = e;
+            for (var t = (this._videos || []).length; t--;) this._videos[t].playbackRate(e)
+        },
+        setContent: function (e, n) {
+            var i = this;
+            this.imgList && n || (this.imgList = []), this._videos = [];
+            var o = {},
+                r = new t(this).parse(e);
+            if (n)
+                for (var a = this.data.nodes.length, s = r.length; s--;) o["nodes[".concat(a + s, "]")] = r[s];
+            else o.nodes = r;
+            if (this.setData(o, function () {
+                    i._hook("onLoad"), i.triggerEvent("load")
+                }), this.data.lazyLoad || this.imgList._unloadimgs < this.imgList.length / 2) {
+                var l = 0,
+                    c = function e(t) {
+                        t && t.height || (t = {}), t.height === l ? i.triggerEvent("ready", t) : (l = t.height, setTimeout(function () {
+                            i.getRect().then(e).catch(e)
+                        }, 350))
+                    };
+                this.getRect().then(c).catch(c)
+            } else this.imgList._unloadimgs || this.getRect().then(function (e) {
+                i.triggerEvent("ready", e)
+            }).catch(function () {
+                i.triggerEvent("ready", {})
+            })
+        },
+        _hook: function (e) {
+            for (var t = n.length; t--;) this.plugins[t][e] && this.plugins[t][e]()
+        },
+        _add: function (e) {
+            e.detail.root = this
+        }
+    }
+});
\ No newline at end of file
diff --git a/components/mp-html/index.json b/components/mp-html/index.json
new file mode 100644
index 0000000..36b626e
--- /dev/null
+++ b/components/mp-html/index.json
@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"node":"./node/node"}}
\ No newline at end of file
diff --git a/components/mp-html/index.wxml b/components/mp-html/index.wxml
new file mode 100644
index 0000000..9b84cb1
--- /dev/null
+++ b/components/mp-html/index.wxml
@@ -0,0 +1,4 @@
+<view class="_root {{selectable?'_select':''}}" style="{{containerStyle}}">
+    <slot wx:if="{{!nodes[0]}}" />
+    <node id="_root" childs="{{nodes}}" opts="{{[lazyLoad,loadingImg,errorImg,showImgMenu,selectable]}}" catchadd="_add" />
+</view>
\ No newline at end of file
diff --git a/components/mp-html/index.wxss b/components/mp-html/index.wxss
new file mode 100644
index 0000000..d1fbe4d
--- /dev/null
+++ b/components/mp-html/index.wxss
@@ -0,0 +1,11 @@
+._root {
+    padding: 1px 0;
+    overflow-x: auto;
+    overflow-y: hidden;
+    -webkit-overflow-scrolling: touch
+}
+
+._select {
+    -webkit-user-select: text;
+    user-select: text
+}
\ No newline at end of file
diff --git a/components/mp-html/node/node.js b/components/mp-html/node/node.js
new file mode 100644
index 0000000..e97ca31
--- /dev/null
+++ b/components/mp-html/node/node.js
@@ -0,0 +1,147 @@
+"use strict";
+
+function t(t, e) {
+    var r = Object.keys(t);
+    if (Object.getOwnPropertySymbols) {
+        var i = Object.getOwnPropertySymbols(t);
+        e && (i = i.filter(function (e) {
+            return Object.getOwnPropertyDescriptor(t, e).enumerable
+        })), r.push.apply(r, i)
+    }
+    return r
+}
+
+function e(e) {
+    for (var i = 1; i < arguments.length; i++) {
+        var o = null != arguments[i] ? arguments[i] : {};
+        i % 2 ? t(Object(o), !0).forEach(function (t) {
+            r(e, t, o[t])
+        }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(o)) : t(Object(o)).forEach(function (t) {
+            Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(o, t))
+        })
+    }
+    return e
+}
+
+function r(t, e, r) {
+    return e in t ? Object.defineProperty(t, e, {
+        value: r,
+        enumerable: !0,
+        configurable: !0,
+        writable: !0
+    }) : t[e] = r, t
+}
+Component({
+    data: {
+        ctrl: {},
+        // isiOS: wx.getSystemInfoSync().system.includes("iOS")
+        isiOS: wx.getDeviceInfo().system.includes("iOS")
+    },
+    properties: {
+        childs: Array,
+        opts: Array
+    },
+    options: {
+        addGlobalClass: !0
+    },
+    attached: function () {
+        this.triggerEvent("add", this, {
+            bubbles: !0,
+            composed: !0
+        })
+    },
+    methods: {
+        noop: function () {},
+        getNode: function (t) {
+            try {
+                for (var e = t.split("_"), r = this.data.childs[e[0]], i = 1; i < e.length; i++) r = r.children[e[i]];
+                return r
+            } catch (t) {
+                return {
+                    text: "",
+                    attrs: {},
+                    children: []
+                }
+            }
+        },
+        play: function (t) {
+            var r = t.target.dataset.i,
+                i = this.getNode(r);
+            if (this.root.triggerEvent("play", {
+                    source: i.name,
+                    attrs: e(e({}, i.attrs), {}, {
+                        src: i.src[this.data.ctrl[r] || 0]
+                    })
+                }), this.root.data.pauseVideo) {
+                for (var o = !1, s = t.target.id, a = this.root._videos.length; a--;) this.root._videos[a].id === s ? o = !0 : this.root._videos[a].pause();
+                if (!o) {
+                    var n = wx.createVideoContext(s, this);
+                    n.id = s, this.root.playbackRate && n.playbackRate(this.root.playbackRate), this.root._videos.push(n)
+                }
+            }
+        },
+        imgTap: function (t) {
+            var e = this.getNode(t.target.dataset.i);
+            if (e.a) return this.linkTap(e.a);
+            if (!e.attrs.ignore && (this.root.triggerEvent("imgtap", e.attrs), this.root.data.previewImg)) {
+                var r = this.root.imgList[e.i];
+                wx.previewImage({
+                    showmenu: this.root.data.showImgMenu,
+                    current: r,
+                    urls: this.root.imgList
+                })
+            }
+        },
+        imgLoad: function (t) {
+            var e, i = t.target.dataset.i,
+                o = this.getNode(i);
+            o.w ? (this.data.opts[1] && !this.data.ctrl[i] || -1 === this.data.ctrl[i]) && (e = 1) : e = t.detail.width, e && this.setData(r({}, "ctrl." + i, e)), this.checkReady()
+        },
+        checkReady: function () {
+            var t = this;
+            this.root.data.lazyLoad || (this.root.imgList._unloadimgs -= 1, this.root.imgList._unloadimgs || setTimeout(function () {
+                t.root.getRect().then(function (e) {
+                    t.root.triggerEvent("ready", e)
+                }).catch(function () {
+                    t.root.triggerEvent("ready", {})
+                })
+            }, 350))
+        },
+        linkTap: function (t) {
+            var e = t.currentTarget ? this.getNode(t.currentTarget.dataset.i) : {},
+                r = e.attrs || t,
+                i = r.href;
+            this.root.triggerEvent("linktap", Object.assign({
+                innerText: this.root.getText(e.children || [])
+            }, r)), i && ("#" === i[0] ? this.root.navigateTo(i.substring(1)).catch(function () {}) : i.split("?")[0].includes("://") ? this.root.data.copyLink && wx.setClipboardData({
+                data: i,
+                success: function () {
+                    return wx.showToast({
+                        title: "链接已复制"
+                    })
+                }
+            }) : wx.navigateTo({
+                url: i,
+                fail: function () {
+                    wx.switchTab({
+                        url: i,
+                        fail: function () {}
+                    })
+                }
+            }))
+        },
+        mediaError: function (t) {
+            var e = t.target.dataset.i,
+                i = this.getNode(e);
+            if ("video" === i.name || "audio" === i.name) {
+                var o = (this.data.ctrl[e] || 0) + 1;
+                if (o > i.src.length && (o = 0), o < i.src.length) return this.setData(r({}, "ctrl." + e, o))
+            } else "img" === i.name && (this.data.opts[2] && this.setData(r({}, "ctrl." + e, -1)), this.checkReady());
+            this.root && this.root.triggerEvent("error", {
+                source: i.name,
+                attrs: i.attrs,
+                errMsg: t.detail.errMsg
+            })
+        }
+    }
+});
\ No newline at end of file
diff --git a/components/mp-html/node/node.json b/components/mp-html/node/node.json
new file mode 100644
index 0000000..36f7ff7
--- /dev/null
+++ b/components/mp-html/node/node.json
@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"node":"./node"}}
\ No newline at end of file
diff --git a/components/mp-html/node/node.wxml b/components/mp-html/node/node.wxml
new file mode 100644
index 0000000..8548380
--- /dev/null
+++ b/components/mp-html/node/node.wxml
@@ -0,0 +1,34 @@
+<wxs module="isInline">
+    var e = { abbr: !0, b: !0, big: !0, code: !0, del: !0, em: !0, i: !0, ins: !0, label: !0, q: !0, small: !0, span: !0, strong: !0, sub: !0, sup: !0 }; module.exports = function (n, i) { return e[n] || -1 !== (i || "").indexOf("inline") };
+</wxs><template name="el">
+    <block wx:if="{{n.name==='img'}}">
+        <rich-text wx:if="{{n.t}}" style="display:{{n.t}}" nodes="<img class='_img' style='{{n.attrs.style}}' src='{{n.attrs.src}}'>" data-i="{{i}}" catchtap="imgTap" />
+        <block wx:else>
+            <image wx:if="{{(opts[1]&&!ctrl[i])||ctrl[i]<0}}" class="_img" style="{{n.attrs.style}}" src="{{ctrl[i]<0?opts[2]:opts[1]}}" mode="widthFix" />
+            <image id="{{n.attrs.id}}" class="_img {{n.attrs.class}}" :style="{{ctrl[i]===-1?'display:none;':''}}width:{{ctrl[i]||1}}px;height:1px;{{n.attrs.style}}" src="{{n.attrs.src}}" mode="{{!n.h?'widthFix':(!n.w?'heightFix':(n.m||'scaleToFill'))}}" lazy-load="{{opts[0]}}" webp="{{n.webp}}" show-menu-by-longpress="{{opts[3]&&!n.attrs.ignore}}" data-i="{{i}}" bindload="imgLoad" binderror="mediaError" catchtap="imgTap" bindlongpress="noop" />
+        </block>
+    </block><text wx:elif="{{n.text}}" user-select="{{opts[4]=='force'&&isiOS}}" decode>{{n.text}}</text><text wx:elif="{{n.name==='br'}}">\n</text>
+    <view wx:elif="{{n.name==='a'}}" id="{{n.attrs.id}}" class="{{n.attrs.href?'_a ':''}}{{n.attrs.class}}" hover-class="_hover" style="display:inline;{{n.attrs.style}}" data-i="{{i}}" catchtap="linkTap">
+        <node childs="{{n.children}}" opts="{{opts}}" style="display:inherit" />
+    </view><video wx:elif="{{n.name==='video'}}" id="{{n.attrs.id}}" class="{{n.attrs.class}}" style="{{n.attrs.style}}" autoplay="{{n.attrs.autoplay}}" controls="{{n.attrs.controls}}" loop="{{n.attrs.loop}}" muted="{{n.attrs.muted}}" object-fit="{{n.attrs['object-fit']}}" poster="{{n.attrs.poster}}" src="{{n.src[ctrl[i]||0]}}" data-i="{{i}}" bindplay="play" binderror="mediaError" /><audio wx:elif="{{n.name==='audio'}}" id="{{n.attrs.id}}" class="{{n.attrs.class}}" style="{{n.attrs.style}}" author="{{n.attrs.author}}" controls="{{n.attrs.controls}}" loop="{{n.attrs.loop}}" name="{{n.attrs.name}}" poster="{{n.attrs.poster}}" src="{{n.src[ctrl[i]||0]}}" data-i="{{i}}" bindplay="play" binderror="mediaError" />
+    <rich-text wx:else id="{{n.attrs.id}}" style="{{n.f}}" user-select="{{opts[4]}}" nodes="{{[n]}}" />
+</template>
+<block wx:for="{{childs}}" wx:for-item="n1" wx:for-index="i1" wx:key="i1"><template wx:if="{{!n1.c&&(!n1.children||n1.name==='a'||!isInline(n1.name,n1.attrs.style))}}" is="el" data="{{n:n1,i:''+i1,opts:opts,ctrl:ctrl}}" />
+    <view wx:else id="{{n1.attrs.id}}" class="_{{n1.name}} {{n1.attrs.class}}" style="{{n1.attrs.style}}">
+        <block wx:for="{{n1.children}}" wx:for-item="n2" wx:for-index="i2" wx:key="i2"><template wx:if="{{!n2.c&&(!n2.children||n2.name==='a'||!isInline(n2.name,n2.attrs.style))}}" is="el" data="{{n:n2,i:i1+'_'+i2,opts:opts,ctrl:ctrl}}" />
+            <view wx:else id="{{n2.attrs.id}}" class="_{{n2.name}} {{n2.attrs.class}}" style="{{n2.attrs.style}}">
+                <block wx:for="{{n2.children}}" wx:for-item="n3" wx:for-index="i3" wx:key="i3"><template wx:if="{{!n3.c&&(!n3.children||n3.name==='a'||!isInline(n3.name,n3.attrs.style))}}" is="el" data="{{n:n3,i:i1+'_'+i2+'_'+i3,opts:opts,ctrl:ctrl}}" />
+                    <view wx:else id="{{n3.attrs.id}}" class="_{{n3.name}} {{n3.attrs.class}}" style="{{n3.attrs.style}}">
+                        <block wx:for="{{n3.children}}" wx:for-item="n4" wx:for-index="i4" wx:key="i4"><template wx:if="{{!n4.c&&(!n4.children||n4.name==='a'||!isInline(n4.name,n4.attrs.style))}}" is="el" data="{{n:n4,i:i1+'_'+i2+'_'+i3+'_'+i4,opts:opts,ctrl:ctrl}}" />
+                            <view wx:else id="{{n4.attrs.id}}" class="_{{n4.name}} {{n4.attrs.class}}" style="{{n4.attrs.style}}">
+                                <block wx:for="{{n4.children}}" wx:for-item="n5" wx:for-index="i5" wx:key="i5"><template wx:if="{{!n5.c&&(!n5.children||n5.name==='a'||!isInline(n5.name,n5.attrs.style))}}" is="el" data="{{n:n5,i:i1+'_'+i2+'_'+i3+'_'+i4+'_'+i5,opts:opts,ctrl:ctrl}}" />
+                                    <node wx:else id="{{n5.attrs.id}}" class="_{{n5.name}} {{n5.attrs.class}}" style="{{n5.attrs.style}}" childs="{{n5.children}}" opts="{{opts}}" />
+                                </block>
+                            </view>
+                        </block>
+                    </view>
+                </block>
+            </view>
+        </block>
+    </view>
+</block>
\ No newline at end of file
diff --git a/components/mp-html/node/node.wxss b/components/mp-html/node/node.wxss
new file mode 100644
index 0000000..85fdb54
--- /dev/null
+++ b/components/mp-html/node/node.wxss
@@ -0,0 +1,157 @@
+._a {
+    padding: 1.5px 0 1.5px 0;
+    color: #366092;
+    word-break: break-all
+}
+
+._hover {
+    text-decoration: underline;
+    opacity: .7
+}
+
+._img {
+    width: 100%;
+    max-width: 100%;
+    -webkit-touch-callout: none
+}
+
+._b,
+._strong {
+    font-weight: 700
+}
+
+._code {
+    font-family: monospace
+}
+
+._del {
+    text-decoration: line-through
+}
+
+._em,
+._i {
+    font-style: italic
+}
+
+._h1 {
+    font-size: 2em
+}
+
+._h2 {
+    font-size: 1.5em
+}
+
+._h3 {
+    font-size: 1.17em
+}
+
+._h5 {
+    font-size: .83em
+}
+
+._h6 {
+    font-size: .67em
+}
+
+._h1,
+._h2,
+._h3,
+._h4,
+._h5,
+._h6 {
+    display: block;
+    font-weight: 700
+}
+
+._ins {
+    text-decoration: underline
+}
+
+._li {
+    display: list-item
+}
+
+._ol {
+    list-style-type: decimal
+}
+
+._ol,
+._ul {
+    display: block;
+    padding-left: 40px;
+    margin: 1em 0
+}
+
+._q::before {
+    content: '"'
+}
+
+._q::after {
+    content: '"'
+}
+
+._sub {
+    font-size: smaller;
+    vertical-align: sub
+}
+
+._sup {
+    font-size: smaller;
+    vertical-align: super
+}
+
+._tbody,
+._tfoot,
+._thead {
+    display: table-row-group
+}
+
+._tr {
+    display: table-row
+}
+
+._td,
+._th {
+    display: table-cell;
+    vertical-align: middle
+}
+
+._th {
+    font-weight: 700;
+    text-align: center
+}
+
+._ul {
+    list-style-type: disc
+}
+
+._ul ._ul {
+    margin: 0;
+    list-style-type: circle
+}
+
+._ul ._ul ._ul {
+    list-style-type: square
+}
+
+._abbr,
+._b,
+._code,
+._del,
+._em,
+._i,
+._ins,
+._label,
+._q,
+._span,
+._strong,
+._sub,
+._sup {
+    display: inline
+}
+
+._blockquote,
+._div,
+._p {
+    display: block
+}
\ No newline at end of file
diff --git a/components/mp-html/parser.js b/components/mp-html/parser.js
new file mode 100644
index 0000000..8239a3e
--- /dev/null
+++ b/components/mp-html/parser.js
@@ -0,0 +1,537 @@
+"use strict";
+
+function t(t, e) {
+    var s;
+    if ("undefined" == typeof Symbol || null == t[Symbol.iterator]) {
+        if (Array.isArray(t) || (s = i(t)) || e && t && "number" == typeof t.length) {
+            s && (t = s);
+            var n = 0,
+                a = function () {};
+            return {
+                s: a,
+                n: function () {
+                    return n >= t.length ? {
+                        done: !0
+                    } : {
+                        done: !1,
+                        value: t[n++]
+                    }
+                },
+                e: function (t) {
+                    throw t
+                },
+                f: a
+            }
+        }
+        throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")
+    }
+    var r, o = !0,
+        l = !1;
+    return {
+        s: function () {
+            s = t[Symbol.iterator]()
+        },
+        n: function () {
+            var t = s.next();
+            return o = t.done, t
+        },
+        e: function (t) {
+            l = !0, r = t
+        },
+        f: function () {
+            try {
+                o || null == s.return || s.return()
+            } finally {
+                if (l) throw r
+            }
+        }
+    }
+}
+
+function i(t, i) {
+    if (t) {
+        if ("string" == typeof t) return e(t, i);
+        var s = Object.prototype.toString.call(t).slice(8, -1);
+        return "Object" === s && t.constructor && (s = t.constructor.name), "Map" === s || "Set" === s ? Array.from(t) : "Arguments" === s || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(s) ? e(t, i) : void 0
+    }
+}
+
+function e(t, i) {
+    (null == i || i > t.length) && (i = t.length);
+    for (var e = 0, s = new Array(i); e < i; e++) s[e] = t[e];
+    return s
+}
+
+function s(t) {
+    for (var i = Object.create(null), e = t.split(","), s = e.length; s--;) i[e[s]] = !0;
+    return i
+}
+
+function n(t, i) {
+    for (var e = t.indexOf("&"); - 1 !== e;) {
+        var s = t.indexOf(";", e + 3),
+            n = void 0;
+        if (-1 === s) break;
+        "#" === t[e + 1] ? (n = parseInt(("x" === t[e + 2] ? "0" : "") + t.substring(e + 2, s)), isNaN(n) || (t = t.substr(0, e) + String.fromCharCode(n) + t.substr(s + 1))) : (n = t.substring(e + 1, s), (l.entities[n] || "amp" === n && i) && (t = t.substr(0, e) + (l.entities[n] || "&") + t.substr(s + 1))), e = t.indexOf("&", e + 1)
+    }
+    return t
+}
+
+function a(t) {
+    for (var i = t.length - 1, e = i; e >= -1; e--)(-1 === e || t[e].c || !t[e].name || "div" !== t[e].name && "p" !== t[e].name && "h" !== t[e].name[0] || (t[e].attrs.style || "").includes("inline")) && (i - e >= 5 && t.splice(e + 1, i - e, {
+        name: "div",
+        attrs: {},
+        children: t.slice(e + 1, i + 1)
+    }), i = e - 1)
+}
+
+function r(t) {
+    this.options = t.data || {}, this.tagStyle = Object.assign({}, l.tagStyle, this.options.tagStyle), this.imgList = t.imgList || [], this.imgList._unloadimgs = 0, this.plugins = t.plugins || [], this.attrs = Object.create(null), this.stack = [], this.nodes = [], this.pre = (this.options.containerStyle || "").includes("white-space") && this.options.containerStyle.includes("pre") ? 2 : 0
+}
+
+function o(t) {
+    this.handler = t
+}
+var l = {
+        trustTags: s("a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,ruby,rt,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video"),
+        blockTags: s("address,article,aside,body,caption,center,cite,footer,header,html,nav,pre,section"),
+        ignoreTags: s("area,base,canvas,embed,frame,head,iframe,input,link,map,meta,param,rp,script,source,style,textarea,title,track,wbr"),
+        voidTags: s("area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr"),
+        entities: {
+            lt: "<",
+            gt: ">",
+            quot: '"',
+            apos: "'",
+            ensp: " ",
+            emsp: " ",
+            nbsp: " ",
+            semi: ";",
+            ndash: "–",
+            mdash: "—",
+            middot: "·",
+            lsquo: "‘",
+            rsquo: "’",
+            ldquo: "“",
+            rdquo: "”",
+            bull: "•",
+            hellip: "…",
+            larr: "←",
+            uarr: "↑",
+            rarr: "→",
+            darr: "↓"
+        },
+        tagStyle: {
+            address: "font-style:italic",
+            big: "display:inline;font-size:1.2em",
+            caption: "display:table-caption;text-align:center",
+            center: "text-align:center",
+            cite: "font-style:italic",
+            dd: "margin-left:40px",
+            mark: "background-color:yellow",
+            pre: "font-family:monospace;white-space:pre",
+            s: "text-decoration:line-through",
+            small: "display:inline;font-size:0.8em",
+            strike: "text-decoration:line-through",
+            u: "text-decoration:underline"
+        },
+        svgDict: {
+            animatetransform: "animateTransform",
+            lineargradient: "linearGradient",
+            viewbox: "viewBox",
+            attributename: "attributeName",
+            repeatcount: "repeatCount",
+            repeatdur: "repeatDur",
+            foreignobject: "foreignObject"
+        }
+    },
+    h = {},
+    // c = wx.getSystemInfoSync(),
+    c = wx.getWindowInfo(),
+    d = c.windowWidth,
+    p = wx.getDeviceInfo().system,
+    u = s(" ,\r,\n,\t,\f"),
+    f = 0;
+r.prototype.parse = function (t) {
+    for (var i = this.plugins.length; i--;) this.plugins[i].onUpdate && (t = this.plugins[i].onUpdate(t, l) || t);
+    for (new o(this).parse(t); this.stack.length;) this.popNode();
+    return this.nodes.length > 50 && a(this.nodes), this.nodes
+}, r.prototype.expose = function () {
+    for (var t = this.stack.length; t--;) {
+        var i = this.stack[t];
+        if (i.c || "a" === i.name || "video" === i.name || "audio" === i.name) return;
+        i.c = 1
+    }
+}, r.prototype.hook = function (t) {
+    for (var i = this.plugins.length; i--;)
+        if (this.plugins[i].onParse && !1 === this.plugins[i].onParse(t, this)) return !1;
+    return !0
+}, r.prototype.getUrl = function (t) {
+    var i = this.options.domain;
+    return "/" === t[0] ? "/" === t[1] ? t = (i ? i.split("://")[0] : "http") + ":" + t : i && (t = i + t) : !i || t.includes("data:") || t.includes("://") || (t = i + "/" + t), t
+}, r.prototype.parseStyle = function (t) {
+    var i = t.attrs,
+        e = (this.tagStyle[t.name] || "").split(";").concat((i.style || "").split(";")),
+        s = {},
+        n = "";
+    i.id && !this.xml && (this.options.useAnchor ? this.expose() : "img" !== t.name && "a" !== t.name && "video" !== t.name && "audio" !== t.name && (i.id = void 0)), i.width && (s.width = parseFloat(i.width) + (i.width.includes("%") ? "%" : "px"), i.width = void 0), i.height && (s.height = parseFloat(i.height) + (i.height.includes("%") ? "%" : "px"), i.height = void 0);
+    for (var a = 0, r = e.length; a < r; a++) {
+        var o = e[a].split(":");
+        if (!(o.length < 2)) {
+            var l = o.shift().trim().toLowerCase(),
+                h = o.join(":").trim();
+            if ("-" === h[0] && h.lastIndexOf("-") > 0 || h.includes("safe")) n += ";".concat(l, ":").concat(h);
+            else if (!s[l] || h.includes("import") || !s[l].includes("import")) {
+                if (h.includes("url")) {
+                    var c = h.indexOf("(") + 1;
+                    if (c) {
+                        for (;
+                            '"' === h[c] || "'" === h[c] || u[h[c]];) c++;
+                        h = h.substr(0, c) + this.getUrl(h.substr(c))
+                    }
+                } else h.includes("rpx") && (h = h.replace(/[0-9.]+\s*rpx/g, function (t) {
+                    return parseFloat(t) * d / 750 + "px"
+                }));
+                s[l] = h
+            }
+        }
+    }
+    return t.attrs.style = n, s
+}, r.prototype.onTagName = function (t) {
+    this.tagName = this.xml ? t : t.toLowerCase(), "svg" === this.tagName && (this.xml = (this.xml || 0) + 1, l.ignoreTags.style = void 0)
+}, r.prototype.onAttrName = function (t) {
+    t = this.xml ? t : t.toLowerCase(), "data-" === t.substr(0, 5) ? "data-src" !== t || this.attrs.src ? "img" === this.tagName || "a" === this.tagName ? this.attrName = t : this.attrName = void 0 : this.attrName = "src" : (this.attrName = t, this.attrs[t] = "T")
+}, r.prototype.onAttrVal = function (t) {
+    var i = this.attrName || "";
+    "style" === i || "href" === i ? this.attrs[i] = n(t, !0) : i.includes("src") ? this.attrs[i] = this.getUrl(n(t, !0)) : i && (this.attrs[i] = t)
+}, r.prototype.onOpenTag = function (t) {
+    var i = Object.create(null);
+    i.name = this.tagName, i.attrs = this.attrs, this.attrs = Object.create(null);
+    var e = i.attrs,
+        s = this.stack[this.stack.length - 1],
+        n = s ? s.children : this.nodes,
+        a = this.xml ? t : l.voidTags[i.name];
+    if (h[i.name] && (e.class = h[i.name] + (e.class ? " " + e.class : "")), "embed" === i.name) {
+        var r = e.src || "";
+        r.includes(".mp4") || r.includes(".3gp") || r.includes(".m3u8") || (e.type || "").includes("video") ? i.name = "video" : (r.includes(".mp3") || r.includes(".wav") || r.includes(".aac") || r.includes(".m4a") || (e.type || "").includes("audio")) && (i.name = "audio"), e.autostart && (e.autoplay = "T"), e.controls = "T"
+    }
+    if ("video" !== i.name && "audio" !== i.name || ("video" !== i.name || e.id || (e.id = "v" + f++), e.controls || e.autoplay || (e.controls = "T"), i.src = [], e.src && (i.src.push(e.src), e.src = void 0), this.expose()), a) {
+        if (!this.hook(i) || l.ignoreTags[i.name]) return void("base" !== i.name || this.options.domain ? "source" === i.name && s && ("video" === s.name || "audio" === s.name) && e.src && s.src.push(e.src) : this.options.domain = e.href);
+        var o = this.parseStyle(i);
+        if ("img" === i.name) {
+            if (e.src && (e.src.includes("webp") && (i.webp = "T"), e.src.includes("data:") && "all" !== this.options.previewImg && !e["original-src"] && (e.ignore = "T"), !e.ignore || i.webp || e.src.includes("cloud://"))) {
+                for (var c = this.stack.length; c--;) {
+                    var p = this.stack[c];
+                    "table" !== p.name || i.webp || e.src.includes("cloud://") || (!o.display || o.display.includes("inline") ? i.t = "inline-block" : i.t = o.display, o.display = void 0);
+                    var u = p.attrs.style || "";
+                    if (!u.includes("flex:") || u.includes("flex:0") || u.includes("flex: 0") || o.width && !(parseInt(o.width) > 100))
+                        if (u.includes("flex") && "100%" === o.width)
+                            for (var g = c + 1; g < this.stack.length; g++) {
+                                var m = this.stack[g].attrs.style || "";
+                                if (!m.includes(";width") && !m.includes(" width") && 0 !== m.indexOf("width")) {
+                                    o.width = "";
+                                    break
+                                }
+                            } else u.includes("inline-block") && (o.width && "%" === o.width[o.width.length - 1] ? (p.attrs.style += ";max-width:" + o.width, o.width = "") : p.attrs.style += ";max-width:100%");
+                        else {
+                            o.width = "100% !important", o.height = "";
+                            for (var v = c + 1; v < this.stack.length; v++) this.stack[v].attrs.style = (this.stack[v].attrs.style || "").replace("inline-", "")
+                        }
+                    "a" === p.name ? i.a = p.attrs : p.c = 1
+                }
+                i.i = this.imgList.length;
+                var y = e["original-src"] || e.src;
+                if (this.imgList.includes(y)) {
+                    var b = y.indexOf("://");
+                    if (-1 !== b) {
+                        b += 3;
+                        for (var x = y.substr(0, b); b < y.length && "/" !== y[b]; b++) x += Math.random() > .5 ? y[b].toUpperCase() : y[b];
+                        x += y.substr(b), y = x
+                    }
+                }
+                this.imgList.push(y), i.t || (this.imgList._unloadimgs += 1)
+            }
+            "inline" === o.display && (o.display = ""), e.ignore && (o["max-width"] = o["max-width"] || "100%", e.style += ";-webkit-touch-callout:none"), parseInt(o.width) > d && (o.height = void 0), isNaN(parseInt(o.width)) || (i.w = "T"), !isNaN(parseInt(o.height)) && (!o.height.includes("%") || s && (s.attrs.style || "").includes("height")) && (i.h = "T"), i.w && i.h && o["object-fit"] && ("contain" === o["object-fit"] ? i.m = "aspectFit" : "cover" === o["object-fit"] && (i.m = "aspectFill"))
+        } else if ("svg" === i.name) return n.push(i), this.stack.push(i), void this.popNode();
+        for (var w in o) o[w] && (e.style += ";".concat(w, ":").concat(o[w].replace(" !important", "")));
+        e.style = e.style.substr(1) || void 0
+    } else("pre" === i.name || (e.style || "").includes("white-space") && e.style.includes("pre")) && 2 !== this.pre && (this.pre = i.pre = 1), i.children = [], this.stack.push(i);
+    n.push(i)
+}, r.prototype.onCloseTag = function (t) {
+    t = this.xml ? t : t.toLowerCase();
+    var i;
+    for (i = this.stack.length; i-- && this.stack[i].name !== t;);
+    if (-1 !== i)
+        for (; this.stack.length > i;) this.popNode();
+    else if ("p" === t || "br" === t) {
+        var e = this.stack.length ? this.stack[this.stack.length - 1].children : this.nodes;
+        e.push({
+            name: t,
+            attrs: {
+                class: h[t],
+                style: this.tagStyle[t]
+            }
+        })
+    }
+}, r.prototype.popNode = function () {
+    var i = this.stack.pop(),
+        e = i.attrs,
+        s = i.children,
+        n = this.stack[this.stack.length - 1],
+        r = n ? n.children : this.nodes;
+    if (!this.hook(i) || l.ignoreTags[i.name]) return "title" === i.name && s.length && "text" === s[0].type && this.options.setTitle && wx.setNavigationBarTitle({
+        title: s[0].text
+    }), void r.pop();
+    if (i.pre && 2 !== this.pre) {
+        this.pre = i.pre = void 0;
+        for (var o = this.stack.length; o--;) this.stack[o].pre && (this.pre = 1)
+    }
+    if ("svg" === i.name) {
+        if (this.xml > 1) return void this.xml--;
+        var h = "",
+            c = e.style;
+        return e.style = "", e.xmlns = "http://www.w3.org/2000/svg",
+            function i(e) {
+                if ("text" === e.type) return void(h += e.text);
+                var s = l.svgDict[e.name] || e.name;
+                if ("foreignObject" === s) {
+                    var n, a = t(e.children || []);
+                    try {
+                        for (a.s(); !(n = a.n()).done;) {
+                            var r = n.value;
+                            if (r.attrs && !r.attrs.xmlns) {
+                                r.attrs.xmlns = "http://www.w3.org/1999/xhtml";
+                                break
+                            }
+                        }
+                    } catch (t) {
+                        a.e(t)
+                    } finally {
+                        a.f()
+                    }
+                }
+                h += "<" + s;
+                for (var o in e.attrs) {
+                    var c = e.attrs[o];
+                    c && (h += " ".concat(l.svgDict[o] || o, '="').concat(c.replace(/"/g, ""), '"'))
+                }
+                if (e.children) {
+                    h += ">";
+                    for (var d = 0; d < e.children.length; d++) i(e.children[d]);
+                    h += "</" + s + ">"
+                } else h += "/>"
+            }(i), i.name = "img", i.attrs = {
+                src: "data:image/svg+xml;utf8," + h.replace(/#/g, "%23"),
+                style: c,
+                ignore: "T"
+            }, i.children = void 0, this.xml = !1, void(l.ignoreTags.style = !0)
+    }
+    var p = {};
+    if (e.align && ("table" === i.name ? "center" === e.align ? p["margin-inline-start"] = p["margin-inline-end"] = "auto" : p.float = e.align : p["text-align"] = e.align, e.align = void 0), e.dir && (p.direction = e.dir, e.dir = void 0), "font" === i.name && (e.color && (p.color = e.color, e.color = void 0), e.face && (p["font-family"] = e.face, e.face = void 0), e.size)) {
+        var u = parseInt(e.size);
+        isNaN(u) || (u < 1 ? u = 1 : u > 7 && (u = 7), p["font-size"] = ["x-small", "small", "medium", "large", "x-large", "xx-large", "xxx-large"][u - 1]), e.size = void 0
+    }
+    if ((e.class || "").includes("align-center") && (p["text-align"] = "center"), Object.assign(p, this.parseStyle(i)), "table" !== i.name && parseInt(p.width) > d && (p["max-width"] = "100%", p["box-sizing"] = "border-box"), l.blockTags[i.name]) i.name = "div";
+    else if (l.trustTags[i.name] || this.xml)
+        if ("a" === i.name || "ad" === i.name) this.expose();
+        else if ("video" === i.name || "audio" === i.name)(p.height || "").includes("auto") && (p.height = void 0), i.children = void 0;
+    else if ("ul" !== i.name && "ol" !== i.name || !i.c)
+        if ("table" === i.name) {
+            var f = parseFloat(e.cellpadding),
+                g = parseFloat(e.cellspacing),
+                m = parseFloat(e.border),
+                v = p["border-color"],
+                y = p["border-style"];
+            if (i.c && (isNaN(f) && (f = 2), isNaN(g) && (g = 2)), m && (e.style += ";border:".concat(m, "px ").concat(y || "solid", " ").concat(v || "gray")), i.flag && i.c) {
+                i.flag = void 0, p.display = "grid", "collapse" === p["border-collapse"] && (p["border-collapse"] = void 0, g = 0), g ? (p["grid-gap"] = g + "px", p.padding = g + "px") : m && (e.style += ";border-left:0;border-top:0");
+                var b = [],
+                    x = [],
+                    w = [],
+                    k = {};
+                ! function i(e) {
+                    for (var s = 0; s < e.length; s++)
+                        if ("tr" === e[s].name) x.push(e[s]);
+                        else if ("colgroup" === e[s].name) {
+                        var n, a = 1,
+                            r = t(e[s].children || []);
+                        try {
+                            for (r.s(); !(n = r.n()).done;) {
+                                var o = n.value;
+                                if ("col" === o.name) {
+                                    var l = o.attrs.style || "",
+                                        h = l.indexOf("width") ? l.indexOf(";width") : 0;
+                                    if (-1 !== h) {
+                                        var c = l.indexOf(";", h + 6); - 1 === c && (c = l.length), b[a] = l.substring(h ? h + 7 : 6, c)
+                                    }
+                                    a += 1
+                                }
+                            }
+                        } catch (t) {
+                            r.e(t)
+                        } finally {
+                            r.f()
+                        }
+                    } else i(e[s].children || [])
+                }(s);
+                for (var N = 1; N <= x.length; N++) {
+                    for (var T = 1, O = 0; O < x[N - 1].children.length; O++) {
+                        var j = x[N - 1].children[O];
+                        if ("td" === j.name || "th" === j.name) {
+                            for (; k[N + "." + T];) T++;
+                            j.c = 1;
+                            var S = j.attrs.style || "",
+                                C = S.indexOf("width") ? S.indexOf(";width") : 0;
+                            if (-1 !== C) {
+                                var I = S.indexOf(";", C + 6); - 1 === I && (I = S.length), j.attrs.colspan || (b[T] = S.substring(C ? C + 7 : 6, I)), S = S.substr(0, C) + S.substr(I)
+                            }
+                            if (S += ";display:flex;flex-direction:column", -1 !== (C = S.indexOf("vertical-align"))) {
+                                var A = S.substr(C + 15, 10);
+                                A.includes("middle") ? S += ";justify-content:center" : A.includes("bottom") && (S += ";justify-content:flex-end")
+                            } else S += ";justify-content:center";
+                            if (-1 !== (C = S.indexOf("text-align"))) {
+                                var L = S.substr(C + 11, 10);
+                                L.includes("center") ? S += ";justify-content: center" : L.includes("right") && (S += ";justify-content: right")
+                            }
+                            if (S = (m ? ";border:".concat(m, "px ").concat(y || "solid", " ").concat(v || "gray") + (g ? "" : ";border-right:0;border-bottom:0") : "") + (f ? ";padding:".concat(f, "px") : "") + ";" + S, j.attrs.colspan && (S += ";grid-column-start:".concat(T, ";grid-column-end:").concat(T + parseInt(j.attrs.colspan)), j.attrs.rowspan || (S += ";grid-row-start:".concat(N, ";grid-row-end:").concat(N + 1)), T += parseInt(j.attrs.colspan) - 1), j.attrs.rowspan) {
+                                S += ";grid-row-start:".concat(N, ";grid-row-end:").concat(N + parseInt(j.attrs.rowspan)), j.attrs.colspan || (S += ";grid-column-start:".concat(T, ";grid-column-end:").concat(T + 1));
+                                for (var z = 1; z < j.attrs.rowspan; z++)
+                                    for (var F = 0; F < (j.attrs.colspan || 1); F++) k[N + z + "." + (T - F)] = 1
+                            }
+                            S && (j.attrs.style = S), w.push(j), T++
+                        }
+                    }
+                    if (1 === N) {
+                        for (var U = "", q = 1; q < T; q++) U += (b[q] ? b[q] : "auto") + " ";
+                        p["grid-template-columns"] = U
+                    }
+                }
+                i.children = w
+            } else i.c && (p.display = "table"), isNaN(g) || (p["border-spacing"] = g + "px"), (m || f || i.c) && function t(e) {
+                for (var s = 0; s < e.length; s++) {
+                    var n = e[s];
+                    i.c && (n.c = 1), "th" === n.name || "td" === n.name ? (m && (n.attrs.style = "border:".concat(m, "px ").concat(y || "solid", " ").concat(v || "gray", ";").concat(n.attrs.style || "")), f && (n.attrs.style = "padding:".concat(f, "px;").concat(n.attrs.style || ""))) : n.children && t(n.children)
+                }
+            }(s);
+            if (this.options.scrollTable && !(e.style || "").includes("inline")) {
+                var V = Object.assign({}, i);
+                i.name = "div", i.attrs = {
+                    style: "overflow-x:auto;padding:1px"
+                }, i.children = [V], e = V.attrs
+            }
+        } else if (("tbody" === i.name || "tr" === i.name) && i.flag && i.c) i.flag = void 0,
+        function t(i) {
+            for (var e = 0; e < i.length; e++)
+                if ("td" === i[e].name)
+                    for (var s = 0, n = ["color", "background", "background-color"]; s < n.length; s++) {
+                        var a = n[s];
+                        p[a] && (i[e].attrs.style = a + ":" + p[a] + ";" + (i[e].attrs.style || ""))
+                    } else t(i[e].children || [])
+        }(s);
+    else if ("td" !== i.name && "th" !== i.name || !e.colspan && !e.rowspan) {
+        if ("ruby" === i.name) {
+            i.name = "span";
+            for (var D = 0; D < s.length - 1; D++) "text" === s[D].type && "rt" === s[D + 1].name && (s[D] = {
+                name: "span",
+                attrs: {
+                    style: "display:inline-block;text-align:center"
+                },
+                children: [{
+                    name: "div",
+                    attrs: {
+                        style: "font-size:50%;" + (s[D + 1].attrs.style || "")
+                    },
+                    children: s[D + 1].children
+                }, s[D]]
+            }, s.splice(D + 1, 1))
+        }
+    } else
+        for (var B = this.stack.length; B--;) "table" !== this.stack[B].name && "tbody" !== this.stack[B].name && "tr" !== this.stack[B].name || (this.stack[B].flag = 1);
+    else {
+        var M = {
+            a: "lower-alpha",
+            A: "upper-alpha",
+            i: "lower-roman",
+            I: "upper-roman"
+        };
+        M[e.type] && (e.style += ";list-style-type:" + M[e.type], e.type = void 0), i.c = 1;
+        for (var P = s.length; P--;) "li" === s[P].name && (s[P].c = 1)
+    } else i.name = "span";
+    if ((p.display || "").includes("flex") && !i.c)
+        for (var Z = s.length; Z--;) {
+            var _ = s[Z];
+            _.f && (_.attrs.style = (_.attrs.style || "") + _.f, _.f = void 0)
+        }
+    var E = n && ((n.attrs.style || "").includes("flex") || (n.attrs.style || "").includes("grid")) && !i.c && !(p.display || "").includes("inline");
+    E && (i.f = ";max-width:100%"), s.length >= 50 && i.c && !(p.display || "").includes("flex") && a(s);
+    for (var G in p)
+        if (p[G]) {
+            var W = ";".concat(G, ":").concat(p[G].replace(" !important", ""));
+            E && (G.includes("flex") && "flex-direction" !== G || "align-self" === G || G.includes("grid") || "-" === p[G][0] || G.includes("width") && W.includes("%")) ? (i.f += W, "width" === G && (e.style += ";width:100%")) : e.style += W
+        } e.style = e.style.substr(1) || void 0
+}, r.prototype.onText = function (t) {
+    if (!this.pre) {
+        for (var i, e = "", s = 0, a = t.length; s < a; s++) u[t[s]] ? (" " !== e[e.length - 1] && (e += " "), "\n" !== t[s] || i || (i = !0)) : e += t[s];
+        if (" " === e && i) return;
+        t = e
+    }
+    var r = Object.create(null);
+    if (r.type = "text", r.text = n(t), this.hook(r)) {
+        "force" === this.options.selectable && p.includes("iOS") && !wx.canIUse("rich-text.user-select") && this.expose();
+        (this.stack.length ? this.stack[this.stack.length - 1].children : this.nodes).push(r)
+    }
+}, o.prototype.parse = function (t) {
+    this.content = t || "", this.i = 0, this.start = 0, this.state = this.text;
+    for (var i = this.content.length; - 1 !== this.i && this.i < i;) this.state()
+}, o.prototype.checkClose = function (t) {
+    var i = "/" === this.content[this.i];
+    return !!(">" === this.content[this.i] || i && ">" === this.content[this.i + 1]) && (t && this.handler[t](this.content.substring(this.start, this.i)), this.i += i ? 2 : 1, this.start = this.i, this.handler.onOpenTag(i), "script" === this.handler.tagName ? (this.i = this.content.indexOf("</", this.i), -1 !== this.i && (this.i += 2, this.start = this.i), this.state = this.endTag) : this.state = this.text, !0)
+}, o.prototype.text = function () {
+    if (this.i = this.content.indexOf("<", this.i), -1 === this.i) return void(this.start < this.content.length && this.handler.onText(this.content.substring(this.start, this.content.length)));
+    var t = this.content[this.i + 1];
+    if (t >= "a" && t <= "z" || t >= "A" && t <= "Z") this.start !== this.i && this.handler.onText(this.content.substring(this.start, this.i)), this.start = ++this.i, this.state = this.tagName;
+    else if ("/" === t || "!" === t || "?" === t) {
+        this.start !== this.i && this.handler.onText(this.content.substring(this.start, this.i));
+        var i = this.content[this.i + 2];
+        if ("/" === t && (i >= "a" && i <= "z" || i >= "A" && i <= "Z")) return this.i += 2, this.start = this.i, void(this.state = this.endTag);
+        var e = "--\x3e";
+        "!" === t && "-" === this.content[this.i + 2] && "-" === this.content[this.i + 3] || (e = ">"), this.i = this.content.indexOf(e, this.i), -1 !== this.i && (this.i += e.length, this.start = this.i)
+    } else this.i++
+}, o.prototype.tagName = function () {
+    if (u[this.content[this.i]]) {
+        for (this.handler.onTagName(this.content.substring(this.start, this.i)); u[this.content[++this.i]];);
+        this.i < this.content.length && !this.checkClose() && (this.start = this.i, this.state = this.attrName)
+    } else this.checkClose("onTagName") || this.i++
+}, o.prototype.attrName = function () {
+    var t = this.content[this.i];
+    if (u[t] || "=" === t) {
+        this.handler.onAttrName(this.content.substring(this.start, this.i));
+        for (var i = "=" === t, e = this.content.length; ++this.i < e;)
+            if (t = this.content[this.i], !u[t]) {
+                if (this.checkClose()) return;
+                if (i) return this.start = this.i, void(this.state = this.attrVal);
+                if ("=" !== this.content[this.i]) return this.start = this.i, void(this.state = this.attrName);
+                i = !0
+            }
+    } else this.checkClose("onAttrName") || this.i++
+}, o.prototype.attrVal = function () {
+    var t = this.content[this.i],
+        i = this.content.length;
+    if ('"' === t || "'" === t) {
+        if (this.start = ++this.i, this.i = this.content.indexOf(t, this.i), -1 === this.i) return;
+        this.handler.onAttrVal(this.content.substring(this.start, this.i))
+    } else
+        for (; this.i < i; this.i++) {
+            if (u[this.content[this.i]]) {
+                this.handler.onAttrVal(this.content.substring(this.start, this.i));
+                break
+            }
+            if (this.checkClose("onAttrVal")) return
+        }
+    for (; u[this.content[++this.i]];);
+    this.i < i && !this.checkClose() && (this.start = this.i, this.state = this.attrName)
+}, o.prototype.endTag = function () {
+    var t = this.content[this.i];
+    if (u[t] || ">" === t || "/" === t) {
+        if (this.handler.onCloseTag(this.content.substring(this.start, this.i)), ">" !== t && (this.i = this.content.indexOf(">", this.i), -1 === this.i)) return;
+        this.start = ++this.i, this.state = this.text
+    } else this.i++
+}, module.exports = r;
\ No newline at end of file
diff --git a/components/page-loading/page-loading.wxss b/components/page-loading/page-loading.wxss
index 5a43fc7..46b486a 100644
--- a/components/page-loading/page-loading.wxss
+++ b/components/page-loading/page-loading.wxss
@@ -18,6 +18,7 @@
 .loading {
     position: relative;
     width: 50px;
+    border-radius: 25px;
 }
 
 .loading:before,
@@ -25,6 +26,7 @@
     position: absolute;
     width: 20px;
     height: 20px;
+    border-radius: 20px;
     content: "";
     animation: jumping 0.5s infinite alternate;
     background: rgba(0, 0, 0, 0);
diff --git a/imgs/load_err.png b/imgs/load_err.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c79c9e49d9c72e32f2486713130f0e4c8702521
GIT binary patch
literal 16724
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
Q#(&L`x<)!xS`IP)0|GaG*8l(j

literal 0
HcmV?d00001

diff --git a/pages/company/company.wxml b/pages/company/company.wxml
index 37f1fd7..08b3725 100644
--- a/pages/company/company.wxml
+++ b/pages/company/company.wxml
@@ -43,7 +43,7 @@
         </view>
         <view class="info-item">
             <view class="title">注册地址</view>
-            <view class="content">{{bean.zhuCeDiZhi}}</view>
+            <view class="content line-1">{{bean.zhuCeDiZhi}}</view>
         </view>
     </view>
 
@@ -73,7 +73,7 @@
     </scroll-view>
     <view class="desc-title">企业介绍</view>
     <view class="news-content mt-20" style="padding: 0rpx;">
-        <rich-text nodes="{{bean.content}}"></rich-text>
+        <mp-html content="{{bean.content}}" class="rich-text"></mp-html>
     </view>
     <view class="desc-title">联系方式</view>
     <view class="mt-20 address">地址:{{bean.lianXi.name}}</view>
diff --git a/pages/company/company.wxss b/pages/company/company.wxss
index 425ee22..c34414a 100644
--- a/pages/company/company.wxss
+++ b/pages/company/company.wxss
@@ -116,12 +116,6 @@ page {
     color: #303030;
     line-height: 27rpx;
     margin-top: 20rpx;
-    overflow: hidden;
-    /* 超出部分隐藏 */
-    white-space: nowrap;
-    /* 文本不换行 */
-    text-overflow: ellipsis;
-    /* 超出部分显示省略号 */
 }
 
 .p-tabs {
diff --git a/pages/domain/domain.js b/pages/domain/domain.js
index 384341d..91da514 100644
--- a/pages/domain/domain.js
+++ b/pages/domain/domain.js
@@ -22,10 +22,10 @@ Page({
         isAreaExpand: false,
         industryAreaList: [], //产业园区
         platesList: [], //产业图谱,
-        domainCategoryLoading: true, //特色产业
-        platesLoading: true, //产业图谱
-        keyEnterpriseLoading: true, //重点企业
-        industryLoading: true, //开发园区
+        domainCategoryLoading: 'loading', //特色产业
+        platesLoading: 'loading', //产业图谱
+        keyEnterpriseLoading: 'loading', //重点企业
+        industryLoading: 'loading', //开发园区
     },
 
     /**
@@ -94,12 +94,12 @@ Page({
     getDomainCategory() {
         var _self = this
         _self.setData({
-            domainCategoryLoading: true
+            domainCategoryLoading: 'loading'
         })
         DomainService.doGetDomainCategory()
             .then(res => {
                 _self.setData({
-                    domainCategoryLoading: false
+                    domainCategoryLoading: 'success'
                 })
                 if (res) {
                     _self.setData({
@@ -107,6 +107,9 @@ Page({
                     })
                 }
             }, err => {
+                _self.setData({
+                    domainCategoryLoading: 'error'
+                })
                 wx.showToast({
                     icon: "none",
                     title: '网络错误(domainCategory)',
@@ -123,12 +126,12 @@ Page({
     getPlates() {
         var _self = this
         _self.setData({
-            platesLoading: true
+            platesLoading: 'loading'
         })
         DomainService.doGetPlates()
             .then(res => {
                 _self.setData({
-                    platesLoading: false
+                    platesLoading: 'success'
                 })
                 if (res) {
                     _self.setData({
@@ -137,6 +140,9 @@ Page({
                 }
                 _self.countWidth()
             }, err => {
+                _self.setData({
+                    platesLoading: 'error'
+                })
                 wx.showToast({
                     icon: "none",
                     title: '网络错误(plates)',
@@ -153,12 +159,12 @@ Page({
     getKeyEnterprise() {
         var _self = this
         _self.setData({
-            keyEnterpriseLoading: true
+            keyEnterpriseLoading: 'loading'
         })
         DomainService.doGetKeyEnterprise()
             .then(res => {
                 _self.setData({
-                    keyEnterpriseLoading: false
+                    keyEnterpriseLoading: 'success'
                 })
                 if (res) {
                     _self.setData({
@@ -166,6 +172,9 @@ Page({
                     })
                 }
             }, err => {
+                _self.setData({
+                    keyEnterpriseLoading: 'error'
+                })
                 wx.showToast({
                     icon: "none",
                     title: '网络错误(domainEnterprise)',
@@ -176,12 +185,12 @@ Page({
     getIndustryArea() {
         var _self = this
         _self.setData({
-            industryLoading: true
+            industryLoading: 'loading'
         })
         DomainService.doGetIndustryArea()
             .then(res => {
                 _self.setData({
-                    industryLoading: false
+                    industryLoading: 'success'
                 })
                 if (res && res.rows) {
                     _self.setData({
@@ -189,6 +198,9 @@ Page({
                     })
                 }
             }, err => {
+                _self.setData({
+                    industryLoading: 'error'
+                })
                 wx.showToast({
                     icon: "none",
                     title: '网络错误(IndustryArea)',
@@ -202,8 +214,6 @@ Page({
         var offsetLeft = e.detail.scrollLeft
         var scale = _self.data.scrollWidth / 30
         var offsetX = offsetLeft / scale
-        console.log(`${offsetX} ${offsetLeft} ${scale}`)
-        console.log(`滚动条宽度:${_self.data.sliderWidth}---偏移量:${offsetX}`)
         _self.setData({
             sliderWidth: _self.data.defaultSliderWidth + offsetX,
             lastScrollLeft: scrollLeft
diff --git a/pages/domain/domain.wxml b/pages/domain/domain.wxml
index 26515c1..ecfdecd 100644
--- a/pages/domain/domain.wxml
+++ b/pages/domain/domain.wxml
@@ -2,7 +2,7 @@
 <view class="body">
     <!-- 产业基础 -->
     <view class="func-container">
-        <image class="desc-video" src="https://ts1.cn.mm.bing.net/th/id/R-C.9e45a633e95179a37c907fa2797999ad?rik=aMuPS4TunAh5ZA&riu=http%3a%2f%2fwww.quazero.com%2fuploads%2fallimg%2f140303%2f1-140303214Q2.jpg&ehk=P%2firfYpARc1fHht%2bWpapYR4W15p6SLABE8CBexoeon4%3d&risl=&pid=ImgRaw&r=0"></image>
+        <image class="desc-video" src="{{imgBasePath}}{{domainInfo.newsContentCoverList[0].contentCoverId}}"></image>
         <view class="desc-title">{{domainInfo.newsContentTitle}}</view>
         <view class="line-noappoint mt-20 desc-font-24" style="{{isAreaExpand?'-webkit-line-clamp: 0;':'-webkit-line-clamp: 4;'}}">
             <rich-text nodes="{{domainInfo.newsContentContent}}"></rich-text>
diff --git a/pages/index/index.js b/pages/index/index.js
index b63aba5..90c7d57 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -42,9 +42,10 @@ Page({
         imgBasePath: app.globalData.imgPath,
         superiorityList: [], //投资优势,
         investAreaList: [], //投资环境List
-        investLoading: true,
+        investLoading: 'loading',
         isLoading: true,
-        showInvestLoading: true
+        showInvestLoading: 'loading',
+        superiorityLoading: 'loading'
     },
     onLoad(e) {
         var _self = this
@@ -84,7 +85,6 @@ Page({
     },
     onReady() {
         this.videoContext = wx.createVideoContext('descVideo', this); //  创建videoContext实例
-        console.log(this.videoContext)
     },
     onShow() {
         if (this.videoContext) {
@@ -157,12 +157,12 @@ Page({
     getInvest() {
         var _self = this
         _self.setData({
-            showInvestLoading: true
+            showInvestLoading: 'loading'
         })
         IndexService.doGetInvest()
             .then(res => {
                 _self.setData({
-                    showInvestLoading: false
+                    showInvestLoading: 'success'
                 })
                 if (res) {
                     _self.setData({
@@ -170,6 +170,9 @@ Page({
                     })
                 }
             }, err => {
+                _self.setData({
+                    showInvestLoading: 'error'
+                })
                 wx.showToast({
                     icon: "none",
                     title: '网络错误(投资机会)',
@@ -186,14 +189,15 @@ Page({
     getInvestArea(id) {
         var _self = this
         _self.setData({
-            investLoading: true
+            investLoading: 'loading'
         })
         IndexService.doGetInvestArea({
                 newsDirectoriesId: id
             })
             .then(res => {
+                console.log('投资环境成功')
                 _self.setData({
-                    investLoading: false
+                    investLoading: 'success'
                 })
                 if (res) {
                     _self.setData({
@@ -201,6 +205,10 @@ Page({
                     })
                 }
             }, err => {
+                console.log('投资环境错误')
+                _self.setData({
+                    investLoading: 'error'
+                })
                 wx.showToast({
                     icon: "none",
                     title: '网络错误(InvestArea)',
@@ -210,8 +218,14 @@ Page({
     //投资优势
     getSuperiority() {
         var _self = this
+        _self.setData({
+            superiorityLoading: 'loading'
+        })
         IndexService.doGetSuperiorityList()
             .then(res => {
+                _self.setData({
+                    superiorityLoading: 'success'
+                })
                 if (res) {
                     _self.setData({
                         superiorityList: res
@@ -219,6 +233,9 @@ Page({
                 }
                 _self.countWidth()
             }, err => {
+                _self.setData({
+                    superiorityLoading: 'error'
+                })
                 wx.showToast({
                     icon: "none",
                     title: '网络错误(superiority)',
@@ -234,6 +251,9 @@ Page({
     //获取投资环境分类
     getInvestAreaCategory() {
         var _self = this
+        _self.setData({
+            investLoading: 'loading'
+        })
         IndexService.doGetInvestAreaCategory()
             .then(res => {
                 if (res) {
@@ -243,11 +263,13 @@ Page({
                     _self.getInvestArea(_self.data.investAreaId)
                 }
             }, err => {
+                _self.setData({
+                    investLoading: 'error'
+                })
                 wx.showToast({
                     icon: "none",
                     title: '网络错误(InvestCategory)',
                 })
-                console.log(err)
             })
     },
     //计算滚动框的宽度
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index da0d52e..9cc0646 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -2,7 +2,7 @@
 <view class="body">
     <!-- 视频简介 -->
     <view class="func-container">
-        <video id="descVideo" class="desc-video" object-fit="fill"  autoplay="{{false}}" src="{{descVideoUrl}}" poster="{{descVideoCover}}" />
+        <video id="descVideo" class="desc-video" object-fit="fill" autoplay="{{false}}" src="{{descVideoUrl}}" poster="{{descVideoCover}}" />
         <view class="desc-title mb-10">达拉特旗</view>
         <view class="text-expansion mt-20">
             <view class="text-expansion__text {{ isExpand ? 'text-expansion__text--expand' : '' }}">
@@ -85,19 +85,23 @@
             <image src="/imgs/ic_superiority_title.png" class="icon" />
             <text class="name">投资优势</text>
         </view>
-        <scroll-view id="plates" scroll-x="{{true}}" bindscroll="scrollPlates">
-            <view class="superiority-content">
-                <block wx:for="{{superiorityList}}" wx:key="index">
-                    <view class="superiority-item" bind:tap="goSuperiorityDetail" data-id="{{item.newsDirectoriesId}}">
-                        <image class="superiory-icon" src="{{imgBasePath}}{{item.directoriesPhoto}}"></image>
-                        <text class="superiory-txt">{{item.directoriesName}}</text>
+        <container-loading loadingState="{{superiorityLoading}}">
+            <view style="display: flex;flex-direction: column;">
+                <scroll-view id="plates" scroll-x="{{true}}" bindscroll="scrollPlates">
+                    <view class="superiority-content">
+                        <block wx:for="{{superiorityList}}" wx:key="index">
+                            <view class="superiority-item" bind:tap="goSuperiorityDetail" data-id="{{item.newsDirectoriesId}}">
+                                <image class="superiory-icon" src="{{imgBasePath}}{{item.directoriesPhoto}}.png"></image>
+                                <text class="superiory-txt">{{item.directoriesName}}</text>
+                            </view>
+                        </block>
                     </view>
-                </block>
+                </scroll-view>
+                <view class="slider-bar-box mt-20" wx:if="{{isShowDot}}">
+                    <view class="slider-bar" style="width: {{sliderWidth}}px;"></view>
+                </view>
             </view>
-        </scroll-view>
-        <view class="slider-bar-box mt-20" wx:if="{{isShowDot}}">
-            <view class="slider-bar" style="width: {{sliderWidth}}px;"></view>
-        </view>
+        </container-loading>
     </view>
     <!-- 投资机会 -->
     <view class="func-container mt-20">
diff --git a/pages/industry-area/industry-area.wxml b/pages/industry-area/industry-area.wxml
index 426408c..261c3a4 100644
--- a/pages/industry-area/industry-area.wxml
+++ b/pages/industry-area/industry-area.wxml
@@ -6,7 +6,7 @@
 
     <view class="news-content">
         <image src="{{imgBasePath}}{{bean.newsContentCoverList[0].contentCoverId}}" style="align-self: center;width: 100%;"></image>
-        <rich-text nodes="{{bean.newsContentContent}}"></rich-text>
+        <mp-html content="{{bean.newsContentContent}}" class="rich-text"></mp-html>
     </view>
 </view>
 <page-loading wx:if="{{showPageLoading}}"></page-loading>
\ No newline at end of file
diff --git a/pages/invest-detail/invest-detail.wxml b/pages/invest-detail/invest-detail.wxml
index db4810c..2f02b8d 100644
--- a/pages/invest-detail/invest-detail.wxml
+++ b/pages/invest-detail/invest-detail.wxml
@@ -23,7 +23,7 @@
             </view>
         </view>
         <view class="news-content">
-            <rich-text nodes="{{bean.content}}"></rich-text>
+            <mp-html content="{{bean.content}}" class="rich-text"></mp-html>
         </view>
 
     </view>
diff --git a/pages/plates/plates.wxml b/pages/plates/plates.wxml
index 0e41ae0..fa10e34 100644
--- a/pages/plates/plates.wxml
+++ b/pages/plates/plates.wxml
@@ -1,10 +1,10 @@
 <view class="body">
     <view class="news-title">{{bean.title}}</view>
     <view class="news-attr-box">
-        <view class="news-attr">{{bean.newsContentPublishTime}}  {{bean.newsContentAuthor}}</view>
+        <view class="news-attr">{{bean.newsContentPublishTime}} {{bean.newsContentAuthor}}</view>
     </view>
     <view class="news-content">
-        <rich-text nodes="{{bean.newsContentContent}}"></rich-text>
+        <mp-html content="{{bean.newsContentContent}}" class="rich-text"></mp-html>
     </view>
 </view>
 <page-loading wx:if="{{showPageLoading}}"></page-loading>
\ No newline at end of file
diff --git a/pages/policy-detail/policy-detail.wxml b/pages/policy-detail/policy-detail.wxml
index 0e41ae0..fa10e34 100644
--- a/pages/policy-detail/policy-detail.wxml
+++ b/pages/policy-detail/policy-detail.wxml
@@ -1,10 +1,10 @@
 <view class="body">
     <view class="news-title">{{bean.title}}</view>
     <view class="news-attr-box">
-        <view class="news-attr">{{bean.newsContentPublishTime}}  {{bean.newsContentAuthor}}</view>
+        <view class="news-attr">{{bean.newsContentPublishTime}} {{bean.newsContentAuthor}}</view>
     </view>
     <view class="news-content">
-        <rich-text nodes="{{bean.newsContentContent}}"></rich-text>
+        <mp-html content="{{bean.newsContentContent}}" class="rich-text"></mp-html>
     </view>
 </view>
 <page-loading wx:if="{{showPageLoading}}"></page-loading>
\ No newline at end of file
diff --git a/pages/superiority-detail/superiority-detail.wxml b/pages/superiority-detail/superiority-detail.wxml
index 25aa7b8..fa10e34 100644
--- a/pages/superiority-detail/superiority-detail.wxml
+++ b/pages/superiority-detail/superiority-detail.wxml
@@ -4,7 +4,7 @@
         <view class="news-attr">{{bean.newsContentPublishTime}} {{bean.newsContentAuthor}}</view>
     </view>
     <view class="news-content">
-        <rich-text nodes="{{bean.newsContentContent}}"></rich-text>
+        <mp-html content="{{bean.newsContentContent}}" class="rich-text"></mp-html>
     </view>
 </view>
 <page-loading wx:if="{{showPageLoading}}"></page-loading>
\ No newline at end of file
diff --git a/pages/unique-detail/unique-detail.wxml b/pages/unique-detail/unique-detail.wxml
index 42e6804..ac54d3e 100644
--- a/pages/unique-detail/unique-detail.wxml
+++ b/pages/unique-detail/unique-detail.wxml
@@ -1,11 +1,12 @@
 <view class="body">
     <view class="news-title">{{bean.title}}</view>
     <view class="news-attr-box">
-        <view class="news-attr">{{bean.newsContentPublishTime}}  {{bean.newsContentAuthor}}</view>
+        <view class="news-attr">{{bean.newsContentPublishTime}} {{bean.newsContentAuthor}}</view>
     </view>
+
     <view class="news-content">
         <image wx:if="{{bean.newsContentCoverList.length>0}}" src="{{imgBasePath}}{{bean.newsContentCoverList[0].contentCoverId}}" style="align-self: center;width: 100%;"></image>
-        <rich-text nodes="{{bean.newsContentContent}}"></rich-text>
+        <mp-html content="{{bean.newsContentContent}}" class="rich-text"></mp-html>
     </view>
 </view>
 <page-loading wx:if="{{showPageLoading}}"></page-loading>
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 2264bce..d9d154f 100644
--- a/project.config.json
+++ b/project.config.json
@@ -25,5 +25,5 @@
     "tabIndent": "auto",
     "tabSize": 2
   },
-  "appid": "wx501e9ce64f25c418"
+  "appid": "wx66052ca4134fddfe"
 }
\ No newline at end of file
diff --git a/utils/http.js b/utils/http.js
index f71598e..02c0a23 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -1,5 +1,6 @@
 // 定义api服务地址
-const baseUrl = 'http://106.74.34.136:8084/daqi/app';
+const baseUrl = 'https://www.xzszwhy.cn/daqi/app';
+// const baseUrl = 'http://106.74.34.136:8084/daqi/app';
 // https://8182018kg.goho.co/daqi/app/news-content/listpage?newsDirectoriesId=91a98b33-1133-4935-8c4c-9b37cc5fe63b&rows=1&page=1
 /**
  * 传入请求参数，返回Promise支持链试调用