diff --git a/app.json b/app.json
index c9b29ca..3069966 100644
--- a/app.json
+++ b/app.json
@@ -32,7 +32,8 @@
"pages/shop/sellGoods/sellGoods",
"pages/shop/purchaseGoods/purchaseGoods",
"pages/shop/betrayGoods/betrayGoods",
- "pages/shop/goodsDetail/goodsDetail"
+ "pages/shop/goodsDetail/goodsDetail",
+ "pages/shop/sellGoodsDetail/sellGoodsDetail"
],
"window": {
"navigationBarTextStyle": "black",
diff --git a/app.wxss b/app.wxss
index c695ccb..7b59f14 100644
--- a/app.wxss
+++ b/app.wxss
@@ -118,6 +118,7 @@ swiper-item {
padding: var(--page-padding) var(--page-padding) 50rpx;
width: 100%;
box-sizing: border-box;
+ z-index: 1;
}
.bottom-btn-green {
@@ -135,6 +136,27 @@ swiper-item {
color: var(--text-brown-color);
}
+.bottom-btn-blue {
+ background-color: var(--btn-blue-color);
+ color: var(--white-color);
+ font-size: 16px;
+ height: 80rpx;
+ line-height: 80rpx;
+ border-radius: 5px;
+ text-align: center;
+}
+
+.bottom-btn-blue:active {
+ background-color: var(--btn-blue-color-active);
+ color: var(--white-color);
+}
+
+.bottom-btn-blue.active {
+ background-color: var(--gray-bg-color);
+ color: var(--text-brown-color);
+}
+
+
.ml-10 {
margin-left: 10rpx;
}
diff --git a/components/empty/empty.js b/components/empty/empty.js
deleted file mode 100644
index 9fe184b..0000000
--- a/components/empty/empty.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// components/empty/empty.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
diff --git a/components/empty/empty.json b/components/empty/empty.json
deleted file mode 100644
index 7e37c03..0000000
--- a/components/empty/empty.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "component": true,
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/components/empty/empty.wxml b/components/empty/empty.wxml
deleted file mode 100644
index 5c056ae..0000000
--- a/components/empty/empty.wxml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
- 暂无数据
-
\ No newline at end of file
diff --git a/components/empty/empty.wxss b/components/empty/empty.wxss
deleted file mode 100644
index d7792cf..0000000
--- a/components/empty/empty.wxss
+++ /dev/null
@@ -1,24 +0,0 @@
-/* components/empty/empty.wxss */
-.data-empty {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- text-align: center;
- align-self: center;
-
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translateX(-50%)translateY(-50%);
-}
-
-.data-empty image {
- width: 180rpx;
- height: 120rpx;
-}
-
-.data-empty .hint {
- margin-top: 30rpx;
- font-size: 32rpx;
-}
\ No newline at end of file
diff --git a/components/fui-bottom-popup/fui-bottom-popup.js b/components/fui-bottom-popup/fui-bottom-popup.js
deleted file mode 100755
index 59351fc..0000000
--- a/components/fui-bottom-popup/fui-bottom-popup.js
+++ /dev/null
@@ -1,40 +0,0 @@
-Component({
- properties: {
- show: {
- type: Boolean,
- value: false
- },
- //背景颜色
- background: {
- type: String,
- value: '#fff'
- },
- //圆角
- radius: {
- type: Number,
- optionalTypes: [String],
- value: 24
- },
- zIndex: {
- type: Number,
- optionalTypes: [String],
- value: 1001
- },
- //点击遮罩 是否可关闭
- maskClosable: {
- type: Boolean,
- value: true
- },
- maskBackground: {
- type: String,
- value: 'rgba(0,0,0,.6)'
- }
- },
- methods: {
- handleClose(e) {
- if (!this.data.maskClosable) return;
- this.triggerEvent('close', {});
- },
- stop(e) {}
- }
-})
\ No newline at end of file
diff --git a/components/fui-bottom-popup/fui-bottom-popup.json b/components/fui-bottom-popup/fui-bottom-popup.json
deleted file mode 100755
index 32640e0..0000000
--- a/components/fui-bottom-popup/fui-bottom-popup.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "component": true
-}
\ No newline at end of file
diff --git a/components/fui-bottom-popup/fui-bottom-popup.wxml b/components/fui-bottom-popup/fui-bottom-popup.wxml
deleted file mode 100755
index 81c5a4a..0000000
--- a/components/fui-bottom-popup/fui-bottom-popup.wxml
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/components/fui-bottom-popup/fui-bottom-popup.wxss b/components/fui-bottom-popup/fui-bottom-popup.wxss
deleted file mode 100755
index e352b42..0000000
--- a/components/fui-bottom-popup/fui-bottom-popup.wxss
+++ /dev/null
@@ -1,36 +0,0 @@
-.fui-bottom__popup-wrap {
- position: fixed;
- left: 0;
- right: 0;
- top: 0;
- bottom: 0;
- z-index: 1001;
- display: flex;
- flex-direction: row;
- align-items: flex-end;
- justify-content: center;
- transition: all ease-in-out .2s;
- visibility: hidden;
- opacity: 0;
- overflow: hidden;
-}
-
-.fui-bottom__popwrap-show {
- opacity: 1;
- visibility: visible;
-}
-
-.fui-bottom__popup {
- width: 100%;
- transform: translate3d(0, 100%, 0);
- transition: all 0.3s ease-in-out;
- min-height: 20rpx;
- padding-bottom: constant(safe-area-inset-bottom);
- padding-bottom: env(safe-area-inset-bottom);
- flex: 1;
- overflow: hidden;
-}
-
-.fui-bottom__popup-show {
- transform: translate3d(0, 0, 0);
-}
\ No newline at end of file
diff --git a/components/mp-html/index.js b/components/mp-html/index.js
deleted file mode 100644
index d2cfa0a..0000000
--- a/components/mp-html/index.js
+++ /dev/null
@@ -1,152 +0,0 @@
-"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(/&/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
deleted file mode 100644
index 36b626e..0000000
--- a/components/mp-html/index.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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
deleted file mode 100644
index 9b84cb1..0000000
--- a/components/mp-html/index.wxml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/components/mp-html/index.wxss b/components/mp-html/index.wxss
deleted file mode 100644
index d1fbe4d..0000000
--- a/components/mp-html/index.wxss
+++ /dev/null
@@ -1,11 +0,0 @@
-._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
deleted file mode 100644
index e97ca31..0000000
--- a/components/mp-html/node/node.js
+++ /dev/null
@@ -1,147 +0,0 @@
-"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
deleted file mode 100644
index 36f7ff7..0000000
--- a/components/mp-html/node/node.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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
deleted file mode 100644
index 8548380..0000000
--- a/components/mp-html/node/node.wxml
+++ /dev/null
@@ -1,34 +0,0 @@
-
- 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") };
-
-
-
-
-
-
-
- {{n.text}}\n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/mp-html/node/node.wxss b/components/mp-html/node/node.wxss
deleted file mode 100644
index 85fdb54..0000000
--- a/components/mp-html/node/node.wxss
+++ /dev/null
@@ -1,157 +0,0 @@
-._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
deleted file mode 100644
index 8239a3e..0000000
--- a/components/mp-html/parser.js
+++ /dev/null
@@ -1,537 +0,0 @@
-"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 += ""
- } 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("= "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.js b/components/page-loading/page-loading.js
deleted file mode 100644
index def21bf..0000000
--- a/components/page-loading/page-loading.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// components/page-loading/page-loading.js
-Component({
-
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
\ No newline at end of file
diff --git a/components/page-loading/page-loading.wxml b/components/page-loading/page-loading.wxml
deleted file mode 100644
index 61243fc..0000000
--- a/components/page-loading/page-loading.wxml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/components/page-loading/page-loading.wxss b/components/page-loading/page-loading.wxss
deleted file mode 100644
index 46b486a..0000000
--- a/components/page-loading/page-loading.wxss
+++ /dev/null
@@ -1,55 +0,0 @@
-/* components/page-loading/page-loading.wxss */
-.page-body {
- width: 100vw;
- height: 100vh;
- background-color: rgba(255, 255, 255, 1);
- height: 100%;
- width: 100%;
- position: fixed;
- z-index: 1;
- margin-top: 0px;
- top: 0px;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
-
-.loading {
- position: relative;
- width: 50px;
- border-radius: 25px;
-}
-
-.loading:before,
-.loading:after {
- position: absolute;
- width: 20px;
- height: 20px;
- border-radius: 20px;
- content: "";
- animation: jumping 0.5s infinite alternate;
- background: rgba(0, 0, 0, 0);
-}
-
-.loading:before {
- left: 0;
-}
-
-.loading:after {
- right: 0;
- animation-delay: 0.15s;
-}
-
-@keyframes jumping {
- 0% {
- transform: scale(1) translateY(0px) rotateX(0deg);
- box-shadow: 0 0 0 rgba(0, 0, 0, 0);
- }
-
- 100% {
- transform: scale(1.2) translateY(-25px) rotateX(45deg);
- background: #256742;
- box-shadow: 0 25px 40px #256742;
- }
-}
\ No newline at end of file
diff --git a/pages/shop/publishCopyright/publishCopyright.js b/pages/shop/publishCopyright/publishCopyright.js
index c817ce5..7dadfae 100644
--- a/pages/shop/publishCopyright/publishCopyright.js
+++ b/pages/shop/publishCopyright/publishCopyright.js
@@ -56,11 +56,11 @@ Page({
*/
onLoad(options) {
wx.setNavigationBarTitle({
- title: '软著发布',
+ title: '我要卖软著',
})
wx.setNavigationBarColor({
frontColor: '#000000', // 必写项，字体颜色仅支持#ffffff和#000000
- backgroundColor: '#F0F0F0', // 传递的颜色值，仅支持十六进制颜色
+ backgroundColor: '#FFFFFF', // 传递的颜色值，仅支持十六进制颜色
animation: { // 可选项
duration: 500,
timingFunc: 'easeIn'
@@ -78,11 +78,21 @@ Page({
rightName: e.detail.value
})
},
+ doClearRightName() {
+ this.setData({
+ rightName: ''
+ })
+ },
inputRightPrice(e) {
this.setData({
rightPrice: e.detail.value
})
},
+ doClearPrice() {
+ this.setData({
+ rightPrice: 0
+ })
+ },
inputOrgName(e) {
this.setData({
orgName: e.detail.value
@@ -226,6 +236,11 @@ Page({
orgPhone: e.detail.value
})
},
+ doClearPhone() {
+ this.setData({
+ orgPhone: ''
+ })
+ },
getDic() {
const _self = this
const cre = Shop.doGetGoodsDic('0b00884a-f7a2-425f-93e5-599fbaad4bde') //软著分类
@@ -335,7 +350,7 @@ Page({
msgShow: true
})
setTimeout(() => {
- wx.navigateBack()
+ _self.backPageRefresh()
}, 1500);
})
.catch(err => {
@@ -445,5 +460,13 @@ Page({
goodsType: this.data.selRightType.dataId
}
return data
+ },
+ backPageRefresh() {
+ let pages = getCurrentPages();
+ let beforePage = pages[pages.length - 2];
+ beforePage.setData({
+ needRefresh: true
+ })
+ wx.navigateBack()
}
})
\ No newline at end of file
diff --git a/pages/shop/publishCopyright/publishCopyright.wxml b/pages/shop/publishCopyright/publishCopyright.wxml
index 983da40..f827967 100644
--- a/pages/shop/publishCopyright/publishCopyright.wxml
+++ b/pages/shop/publishCopyright/publishCopyright.wxml
@@ -1,120 +1,120 @@
-
+
- 软著信息
-
-
-
- 软著名称
-
-
-
-
-
- 软著分类
-
-
- 请选择软著分类
-
-
-
- {{item.dataName}}
-
-
-
-
-
-
-
-
-
-
-
-
- 售卖价格
-
-
-
-
-
- 截止售卖日期
-
-
- {{rightStopDate != ''? rightStopDate:'请选择截止售卖日期'}}
-
-
-
-
-
-
-
-
- 软著图片
-
-
-
-
+
+
-
-
- 著作权人信息
-
-
-
- 类别
-
-
- {{selPersonType != null? selPersonType.dataName:'请选择类别'}}
-
-
-
-
+
+
+ 软著信息
+
+
+
+ 软著名称
+
+
+
+
+
+
+ 软著分类
+
+
+ 请选择软著分类
+
+
+
+ {{item.dataName}}
+
+
+
+
+
+
+
+
+
+
+
+ 售卖价格
+
+
+
+
+
+
+ 截止售卖日期
+
+
+ {{rightStopDate != ''? rightStopDate:'请选择截止售卖日期'}}
+
+
+
+
+
-
- 姓名或机构名称
-
-
-
-
-
- 所在省市
-
- {{selArea != null? selArea.areaName+'/'+selCity.areaName:'请选择所在省市'}}
-
-
-
+ 著作权人信息
+
+
+
+ 类别
+
+
+ {{selPersonType != null? selPersonType.dataName:'请选择类别'}}
+
+
+
+
+
-
-
- 联系电话
-
-
-
-
-
- 证件类型
-
-
- {{selCreType != null? selCreType.dataName:'请选择证件类型'}}
-
-
-
-
+
+ 姓名或机构名称
+
+
-
-
- 证件号码
-
-
+
+ 省市
+
+ {{selArea != null? selArea.areaName+'/'+selCity.areaName:'请选择所在省市'}}
+
+
+
+
+
+
+
+ 联系电话
+
+
+
+
+
+
+ 证件类型
+
+
+ {{selCreType != null? selCreType.dataName:'请选择证件类型'}}
+
+
+
+
+
+
+
+
+ 证件号码
+
+
+
diff --git a/pages/shop/publishCopyright/publishCopyright.wxss b/pages/shop/publishCopyright/publishCopyright.wxss
index 880c8fe..888beb1 100644
--- a/pages/shop/publishCopyright/publishCopyright.wxss
+++ b/pages/shop/publishCopyright/publishCopyright.wxss
@@ -2,9 +2,22 @@
.content-box {
border-radius: 20rpx;
- padding: 20rpx;
- background-color: var(--white-color);
- margin-top: 20rpx;
+ margin-top: -10rpx;
+}
+
+.upload-img-box {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+}
+
+.content-container {
+ margin: 0rpx -30rpx 80rpx -30rpx;
+ background-color: white;
+ display: flex;
+ flex-direction: column;
+ padding: 30rpx;
}
.info-title {
@@ -15,13 +28,13 @@
align-items: center;
}
+
.info-title::before {
content: "";
width: 10rpx;
height: 36rpx;
- margin-right: 8rpx;
- border-left: 10rpx solid var(--primary-color);
- border-radius: 4rpx;
+ margin-right: 5rpx;
+ border-left: 15rpx solid var(--blue-color);
vertical-align: middle;
}
@@ -60,8 +73,8 @@
min-height: 70rpx;
flex-direction: row;
border-radius: 5rpx;
- background-color: var(--bg-gray-input-color);
- padding: 0rpx 15rpx;
+ padding: 0rpx 15rpx 10rpx 10rpx;
+ border-bottom: 1rpx solid var(--divider-color);
}
.select-content-item {
@@ -72,8 +85,8 @@
height: 70rpx;
flex-direction: row;
border-radius: 5rpx;
- background-color: var(--bg-gray-input-color);
- padding: 0rpx 15rpx;
+ padding: 0rpx 15rpx 10rpx 15rpx;
+ border-bottom: 1rpx solid var(--divider-color);
}
.select-item-box {
@@ -91,10 +104,12 @@
background-color: var(--divider-color);
padding: 5rpx 15rpx;
border-radius: 5rpx;
+ font-size: 24rpx;
+ color: var(--text-color);
}
-.select-item-item:nth-of-type(n+1) {
- margin: 8rpx;
+.select-item-item:nth-of-type(n+2) {
+ margin-left: 10rpx;
}
.desc {
@@ -167,14 +182,15 @@
}
.weui-uploader__input-box {
- width: 65px;
- height: 65px;
+ width: 280rpx;
+ height: 380rpx;
border-radius: 5px;
+ background-color: transparent;
}
.weui-uploader__file {
- width: 65px;
- height: 65px;
+ width: 280rpx;
+ height: 380rpx;
border-radius: 5px;
}
@@ -190,6 +206,6 @@
}
.weui-uploader__input-box {
- background: white;
- border: 1px solid var(--divider-color);
+ border: 1rpx solid var(--bg-bottom-color);
+ background-color: transparent;
}
\ No newline at end of file
diff --git a/pages/shop/sellGoods/sellGoods.js b/pages/shop/sellGoods/sellGoods.js
index fb6f218..84dd72b 100644
--- a/pages/shop/sellGoods/sellGoods.js
+++ b/pages/shop/sellGoods/sellGoods.js
@@ -45,7 +45,8 @@ Page({
msgHint: '',
msgShow: false,
isScrolling: false,
- scrollTimer: null
+ scrollTimer: null,
+ needRefresh: false
},
/**
@@ -66,6 +67,14 @@ Page({
this.doGetDic()
this.doRefreshList()
},
+ onShow() {
+ if (this.data.needRefresh) {
+ this.setData({
+ needRefresh: false
+ })
+ this.doRefreshList()
+ }
+ },
inputKeywords(e) {
this.setData({
keywords: e.detail.value
@@ -222,7 +231,7 @@ Page({
doDetail(e) {
const id = e.currentTarget.dataset.value
wx.navigateTo({
- url: '/pages/shop/goodsDetail/goodsDetail?id=' + id,
+ url: '/pages/shop/sellGoodsDetail/sellGoodsDetail?id=' + id,
animation: 'fade'
})
},
diff --git a/pages/shop/sellGoods/sellGoods.wxml b/pages/shop/sellGoods/sellGoods.wxml
index 2f2ae96..18ecbed 100644
--- a/pages/shop/sellGoods/sellGoods.wxml
+++ b/pages/shop/sellGoods/sellGoods.wxml
@@ -51,6 +51,7 @@
截止:{{item.goodsLastTime}}
+ {{tools.goodsStatus(item.goodsCheckStatus,item.goodsStatus)}}
特价
diff --git a/pages/shop/sellGoods/sellGoods.wxss b/pages/shop/sellGoods/sellGoods.wxss
index 99aad2c..984a13c 100644
--- a/pages/shop/sellGoods/sellGoods.wxss
+++ b/pages/shop/sellGoods/sellGoods.wxss
@@ -237,6 +237,31 @@
margin-left: 20rpx;
}
+.status-tag {
+ display: inline-block;
+ padding: 0rpx 20rpx;
+ background-color: var(--primary-color);
+ color: #fff;
+ font-size: 22rpx;
+ line-height: 40rpx;
+ height: 40rpx;
+ text-align: center;
+ border-bottom-right-radius: 30rpx;
+ border-top-right-radius: 30rpx;
+ position: absolute;
+ top: 0rpx;
+ left: 0rpx;
+}
+
+.status-tag::before {
+ content: '';
+ position: absolute;
+ left: 0rpx;
+ bottom: -15rpx;
+ border-width: 18rpx 18rpx 0 0rpx;
+ border-style: solid;
+ border-color: var(--primary-color) transparent transparent transparent;
+}
.special-tag {
display: inline-block;
diff --git a/pages/shop/sellGoodsDetail/sellGoodsDetail.js b/pages/shop/sellGoodsDetail/sellGoodsDetail.js
new file mode 100644
index 0000000..c33294e
--- /dev/null
+++ b/pages/shop/sellGoodsDetail/sellGoodsDetail.js
@@ -0,0 +1,66 @@
+// pages/shop/sellGoodsDetail/sellGoodsDetail.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/components/page-loading/page-loading.json b/pages/shop/sellGoodsDetail/sellGoodsDetail.json
similarity index 54%
rename from components/page-loading/page-loading.json
rename to pages/shop/sellGoodsDetail/sellGoodsDetail.json
index e8cfaaf..8835af0 100644
--- a/components/page-loading/page-loading.json
+++ b/pages/shop/sellGoodsDetail/sellGoodsDetail.json
@@ -1,4 +1,3 @@
{
- "component": true,
"usingComponents": {}
}
\ No newline at end of file
diff --git a/pages/shop/sellGoodsDetail/sellGoodsDetail.wxml b/pages/shop/sellGoodsDetail/sellGoodsDetail.wxml
new file mode 100644
index 0000000..71725de
--- /dev/null
+++ b/pages/shop/sellGoodsDetail/sellGoodsDetail.wxml
@@ -0,0 +1,2 @@
+
+pages/shop/sellGoodsDetail/sellGoodsDetail.wxml
\ No newline at end of file
diff --git a/pages/shop/sellGoodsDetail/sellGoodsDetail.wxss b/pages/shop/sellGoodsDetail/sellGoodsDetail.wxss
new file mode 100644
index 0000000..2cbced3
--- /dev/null
+++ b/pages/shop/sellGoodsDetail/sellGoodsDetail.wxss
@@ -0,0 +1 @@
+/* pages/shop/sellGoodsDetail/sellGoodsDetail.wxss */
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 4ebea68..5fea165 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -5,5 +5,5 @@
"compileHotReLoad": true,
"urlCheck": false
},
- "libVersion": "3.8.3"
+ "libVersion": "3.8.7"
}
\ No newline at end of file
diff --git a/static/style/icon.wxss b/static/style/icon.wxss
index e310ec0..e0bb2ba 100644
--- a/static/style/icon.wxss
+++ b/static/style/icon.wxss
@@ -31,7 +31,8 @@
background-repeat: no-repeat;
background-size: contain;
}
-.icon-arrow-white-left-line{
+
+.icon-arrow-white-left-line {
background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ5NDYzNjkwOTY5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQyNzYiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTYwOCA3MzZjLTYuNCAwLTE5LjIgMC0yNS42LTYuNGwtMTkyLTE5MkMzODQgNTI0LjggMzg0IDQ5OS4yIDM5MC40IDQ4Ni40bDE5Mi0xOTJjMTIuOC0xMi44IDMyLTEyLjggNDQuOCAwczEyLjggMzIgMCA0NC44TDQ2MC44IDUxMmwxNjYuNCAxNjYuNGMxMi44IDEyLjggMTIuOCAzMiAwIDQ0LjhDNjI3LjIgNzM2IDYxNC40IDczNiA2MDggNzM2eiIgZmlsbD0iI2ZmZmZmZiIgcC1pZD0iNDI3NyI+PC9wYXRoPjwvc3ZnPg==');
background-repeat: no-repeat;
background-size: contain;
@@ -91,6 +92,12 @@
background-repeat: no-repeat;
}
+.icon-clear-line {
+ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ5NjA3NTM5MDgwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQ0MjQiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTgwOS45ODQgMjc0LjAwNTMzM2wtMjM3Ljk5NDY2NyAyMzcuOTk0NjY3IDIzNy45OTQ2NjcgMjM3Ljk5NDY2Ny01OS45ODkzMzMgNTkuOTg5MzMzLTIzNy45OTQ2NjctMjM3Ljk5NDY2Ny0yMzcuOTk0NjY3IDIzNy45OTQ2NjctNTkuOTg5MzMzLTU5Ljk4OTMzMyAyMzcuOTk0NjY3LTIzNy45OTQ2NjctMjM3Ljk5NDY2Ny0yMzcuOTk0NjY3IDU5Ljk4OTMzMy01OS45ODkzMzMgMjM3Ljk5NDY2NyAyMzcuOTk0NjY3IDIzNy45OTQ2NjctMjM3Ljk5NDY2N3oiIGZpbGw9IiNjZGNkY2QiIHAtaWQ9IjQ0MjUiPjwvcGF0aD48L3N2Zz4=');
+ background-size: cover;
+ background-repeat: no-repeat;
+}
+
.icon-up-circle {
background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1MzcxODA0NjI3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI2MDIiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTY0IDUxMkE0NDggNDQ4IDAgMSAwIDUxMiA2NCA0NDggNDQ4IDAgMCAwIDY0IDUxMnogbTQ5Ny4yOC0yMTAuMjRhNzI5LjYgNzI5LjYgMCAwIDEgMjI0IDIyNCA5NiA5NiAwIDEgMS0xNjQuNDggOTguODggNDk2IDQ5NiAwIDAgMC0xMDguOC0xMjIuNTYgNTY0LjggNTY0LjggMCAwIDAtMTA5LjEyIDEyMy41MiA5NiA5NiAwIDEgMS0xNjQuNDgtOTguODggNzI5LjYgNzI5LjYgMCAwIDEgMjI0LTIyNCA5NiA5NiAwIDAgMSA5OC44OC0wLjk2eiIgZmlsbD0iI0ZFOTk0NCIgcC1pZD0iMjYwMyI+PC9wYXRoPjwvc3ZnPg==');
background-size: cover;
diff --git a/utils/comm.wxs b/utils/comm.wxs
index e6d0835..dd71743 100644
--- a/utils/comm.wxs
+++ b/utils/comm.wxs
@@ -112,6 +112,33 @@ var goodsOrderStatus = function (status) {
}
return str
}
+//软件审核状态(0不通过,1审核中,2通过) 软件上架状态(1上架,0未上架)
+var goodsStatus = function (check, status) {
+ var statusMap = {
+ '': '未提交',
+ '0': '审核不通过',
+ '1': '审核中',
+ '2': status === '1' ? '已上架' : '审核通过(未上架)'
+ };
+ return statusMap[check] || '未知状态';
+}
+// var goodsStatus = function (check, status) {
+// var str = '未提交'
+// if (check == '') {
+// //为提交
+// } else if (check == '0') {
+// //不通过
+// } else if (check == '1') {
+// //审核中
+// } else if (check == '2') {
+// //审核通过
+// if (status == '1') {
+// //上架
+// } else if (status == '0') {
+// //未上架
+// }
+// }
+// }
var goodsOrderColor = function (status) {
var str = 'col-gray'
switch (status) {
@@ -424,5 +451,6 @@ module.exports = {
phoneNum: phoneNum,
includes: includes,
goodsOrderStatus: goodsOrderStatus,
- goodsOrderColor: goodsOrderColor
+ goodsOrderColor: goodsOrderColor,
+ goodsStatus: goodsStatus
};
\ No newline at end of file