diff --git a/common/mixin.js b/common/mixin.js
index 68b01bb..b7b1ec7 100644
--- a/common/mixin.js
+++ b/common/mixin.js
@@ -2,11 +2,17 @@ export default{
data(){
return {
pageScrollTop: 0, // 页面距离顶部的距离
+ _mergeParam: {}
}
},
onPageScroll(res) {
this.pageScrollTop = res.scrollTop;
},
+ onLoad(options){
+ if(options){
+ this._mergeParam = options;
+ }
+ },
methods: {
// 判断对错/是否显示,万能校验
$isRight(obj){
diff --git a/components/u-parse/components/wxParseAudio.vue b/components/u-parse/components/wxParseAudio.vue
deleted file mode 100644
index 86df246..0000000
--- a/components/u-parse/components/wxParseAudio.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
diff --git a/components/u-parse/components/wxParseImg.vue b/components/u-parse/components/wxParseImg.vue
deleted file mode 100644
index 00747e4..0000000
--- a/components/u-parse/components/wxParseImg.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate0.vue b/components/u-parse/components/wxParseTemplate0.vue
deleted file mode 100644
index 0c76e74..0000000
--- a/components/u-parse/components/wxParseTemplate0.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate1.vue b/components/u-parse/components/wxParseTemplate1.vue
deleted file mode 100644
index a864f23..0000000
--- a/components/u-parse/components/wxParseTemplate1.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate10.vue b/components/u-parse/components/wxParseTemplate10.vue
deleted file mode 100644
index 9a8d8b6..0000000
--- a/components/u-parse/components/wxParseTemplate10.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate11.vue b/components/u-parse/components/wxParseTemplate11.vue
deleted file mode 100644
index 1402d11..0000000
--- a/components/u-parse/components/wxParseTemplate11.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
-
- \n
-
-
-
-
-
- {{node.text}}
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate2.vue b/components/u-parse/components/wxParseTemplate2.vue
deleted file mode 100644
index d6d027d..0000000
--- a/components/u-parse/components/wxParseTemplate2.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate3.vue b/components/u-parse/components/wxParseTemplate3.vue
deleted file mode 100644
index f899edd..0000000
--- a/components/u-parse/components/wxParseTemplate3.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate4.vue b/components/u-parse/components/wxParseTemplate4.vue
deleted file mode 100644
index 9bd558c..0000000
--- a/components/u-parse/components/wxParseTemplate4.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate5.vue b/components/u-parse/components/wxParseTemplate5.vue
deleted file mode 100644
index 4f6cc27..0000000
--- a/components/u-parse/components/wxParseTemplate5.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate6.vue b/components/u-parse/components/wxParseTemplate6.vue
deleted file mode 100644
index 4781c64..0000000
--- a/components/u-parse/components/wxParseTemplate6.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate7.vue b/components/u-parse/components/wxParseTemplate7.vue
deleted file mode 100644
index 1efc4dc..0000000
--- a/components/u-parse/components/wxParseTemplate7.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate8.vue b/components/u-parse/components/wxParseTemplate8.vue
deleted file mode 100644
index 2ac546f..0000000
--- a/components/u-parse/components/wxParseTemplate8.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseTemplate9.vue b/components/u-parse/components/wxParseTemplate9.vue
deleted file mode 100644
index c771e5f..0000000
--- a/components/u-parse/components/wxParseTemplate9.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{node.text}}
-
-
-
-
diff --git a/components/u-parse/components/wxParseVideo.vue b/components/u-parse/components/wxParseVideo.vue
deleted file mode 100644
index a952f58..0000000
--- a/components/u-parse/components/wxParseVideo.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/components/u-parse/libs/html2json.js b/components/u-parse/libs/html2json.js
deleted file mode 100644
index 0927382..0000000
--- a/components/u-parse/libs/html2json.js
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * html2Json 改造来自: https://github.com/Jxck/html2json
- *
- *
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- * 垂直微信小程序开发交流社区
- *
- * github地址: https://github.com/icindy/wxParse
- *
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
-
-import wxDiscode from './wxDiscode';
-import HTMLParser from './htmlparser';
-
-function makeMap(str) {
- const obj = {};
- const items = str.split(',');
- for (let i = 0; i < items.length; i += 1) obj[items[i]] = true;
- return obj;
-}
-
-// Block Elements - HTML 5
-const block = makeMap('br,code,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video');
-
-// Inline Elements - HTML 5
-const inline = makeMap('a,abbr,acronym,applet,b,basefont,bdo,big,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var');
-
-// Elements that you can, intentionally, leave open
-// (and which close themselves)
-const closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr');
-
-function removeDOCTYPE(html) {
- const isDocument = /
([^]*)<\/body>/.test(html);
- return isDocument ? RegExp.$1 : html;
-}
-
-function trimHtml(html) {
- return html
- .replace(//gi, '')
- .replace(/\/\*.*?\*\//gi, '')
- .replace(/[ ]+/gi, '')
- .replace(/
-```
-
-
-## 渲染 Markdown
-
-> 先将 markdown 转换为 html 即可
-
-```
-npm install marked
-```
-
-``` js
-import marked from 'marked'
-import uParse from '@/components/u-parse/u-parse.vue'
-
-export default {
- components: {
- uParse
- },
- data () {
- return {
- article: marked(`#hello, markdown!`)
- }
- }
-}
-```
diff --git a/components/u-parse/u-parse.css b/components/u-parse/u-parse.css
deleted file mode 100644
index 691993a..0000000
--- a/components/u-parse/u-parse.css
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- * 垂直微信小程序开发交流社区
- *
- * github地址: https://github.com/icindy/wxParse
- *
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
-
-.wxParse {
- width: 100%;
- font-family: Helvetica, sans-serif;
- font-size: 30upx;
- color: #666;
- line-height: 1.8;
-}
-
-.wxParse view {
- word-break: hyphenate;
-}
-
-.wxParse .inline {
- display: inline;
- margin: 0;
- padding: 0;
-}
-
-.wxParse .div {
- margin: 0;
- padding: 0;
-}
-
-.wxParse .h1 .text {
- font-size: 2em;
- margin: 0.67em 0;
-}
-.wxParse .h2 .text {
- font-size: 1.5em;
- margin: 0.83em 0;
-}
-.wxParse .h3 .text {
- font-size: 1.17em;
- margin: 1em 0;
-}
-.wxParse .h4 .text {
- margin: 1.33em 0;
-}
-.wxParse .h5 .text {
- font-size: 0.83em;
- margin: 1.67em 0;
-}
-.wxParse .h6 .text {
- font-size: 0.67em;
- margin: 2.33em 0;
-}
-
-.wxParse .h1 .text,
-.wxParse .h2 .text,
-.wxParse .h3 .text,
-.wxParse .h4 .text,
-.wxParse .h5 .text,
-.wxParse .h6 .text,
-.wxParse .b,
-.wxParse .strong {
- font-weight: bolder;
-}
-
-
-.wxParse .p {
- margin: 1em 0;
-}
-
-.wxParse .i,
-.wxParse .cite,
-.wxParse .em,
-.wxParse .var,
-.wxParse .address {
- font-style: italic;
-}
-
-.wxParse .pre,
-.wxParse .tt,
-.wxParse .code,
-.wxParse .kbd,
-.wxParse .samp {
- font-family: monospace;
-}
-.wxParse .pre {
- overflow: auto;
- background: #f5f5f5;
- padding: 16upx;
- white-space: pre;
- margin: 1em 0upx;
-}
-.wxParse .code {
- display: inline;
- background: #f5f5f5;
-}
-
-.wxParse .big {
- font-size: 1.17em;
-}
-
-.wxParse .small,
-.wxParse .sub,
-.wxParse .sup {
- font-size: 0.83em;
-}
-
-.wxParse .sub {
- vertical-align: sub;
-}
-.wxParse .sup {
- vertical-align: super;
-}
-
-.wxParse .s,
-.wxParse .strike,
-.wxParse .del {
- text-decoration: line-through;
-}
-
-.wxParse .strong,
-.wxParse .s {
- display: inline;
-}
-
-.wxParse .a {
- color: deepskyblue;
-}
-
-.wxParse .video {
- text-align: center;
- margin: 22upx 0;
-}
-
-.wxParse .video-video {
- width: 100%;
-}
-
-.wxParse .img {
- display: inline-block;
- width: 0;
- height: 0;
- max-width: 100%;
- overflow: hidden;
-}
-
-.wxParse .blockquote {
- margin: 10upx 0;
- padding: 22upx 0 22upx 22upx;
- font-family: Courier, Calibri, "宋体";
- background: #f5f5f5;
- border-left: 6upx solid #dbdbdb;
-}
-.wxParse .blockquote .p {
- margin: 0;
-}
-
-.wxParse .ul, .wxParse .ol {
- display: block;
- margin: 1em 0;
- padding-left: 33upx;
-}
-.wxParse .ol {
- list-style-type: disc;
-}
-.wxParse .ol {
- list-style-type: decimal;
-}
-.wxParse .ol>weixin-parse-template,.wxParse .ul>weixin-parse-template {
- display: list-item;
- align-items: baseline;
- text-align: match-parent;
-}
-
-.wxParse .ol>.li,.wxParse .ul>.li {
- display: list-item;
- align-items: baseline;
- text-align: match-parent;
-}
-.wxParse .ul .ul, .wxParse .ol .ul {
- list-style-type: circle;
-}
-.wxParse .ol .ol .ul, .wxParse .ol .ul .ul, .wxParse .ul .ol .ul, .wxParse .ul .ul .ul {
- list-style-type: square;
-}
-
-.wxParse .u {
- text-decoration: underline;
-}
-.wxParse .hide {
- display: none;
-}
-.wxParse .del {
- display: inline;
-}
-.wxParse .figure {
- overflow: hidden;
-}
-
-.wxParse .table {
- width: 100%;
-}
-.wxParse .thead, .wxParse .tfoot, .wxParse .tr {
- display: flex;
- flex-direction: row;
-}
-.wxParse .tr {
- width:100%;
- display: flex;
- border-right: 2upx solid #e0e0e0;
- border-bottom: 2upx solid #e0e0e0;
-}
-.wxParse .th,
-.wxParse .td {
- display: flex;
- width: 1276upx;
- overflow: auto;
- flex: 1;
- padding: 11upx;
- border-left: 2upx solid #e0e0e0;
-}
-.wxParse .td:last {
- border-top: 2upx solid #e0e0e0;
-}
-.wxParse .th {
- background: #f0f0f0;
- border-top: 2upx solid #e0e0e0;
-}
diff --git a/components/u-parse/u-parse.vue b/components/u-parse/u-parse.vue
deleted file mode 100644
index 494e60c..0000000
--- a/components/u-parse/u-parse.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/config/index.js b/config/index.js
index d978039..50f5102 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,7 +11,7 @@ module.exports = (() => {
config.Timeout = 10000 // 请求超时时间,单位 ms
// 基础服务器地址
- // config.BASE_URL = '' // 开发环境
+ config.BASE_URL = 'http://127.0.0.1' // 开发环境
// config.BASE_URL = '' // 生产环境
diff --git a/packages/article/article.vue b/packages/article/article.vue
index b4441c3..93b5431 100644
--- a/packages/article/article.vue
+++ b/packages/article/article.vue
@@ -1,15 +1,11 @@
-
+