diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 81f13f4..32f4dc5 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -6,6 +6,10 @@ { "launchtype" : "local" }, + "h5" : + { + "launchtype" : "local" + }, "mp-weixin" : { "launchtype" : "local" diff --git a/components/gaoyia-parse/components/wxParseAudio.vue b/components/gaoyia-parse/components/wxParseAudio.vue deleted file mode 100644 index b277717..0000000 --- a/components/gaoyia-parse/components/wxParseAudio.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseImg.vue b/components/gaoyia-parse/components/wxParseImg.vue deleted file mode 100644 index de9978b..0000000 --- a/components/gaoyia-parse/components/wxParseImg.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTable.vue b/components/gaoyia-parse/components/wxParseTable.vue deleted file mode 100644 index e1e25bf..0000000 --- a/components/gaoyia-parse/components/wxParseTable.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - \ No newline at end of file diff --git a/components/gaoyia-parse/components/wxParseTemplate0.vue b/components/gaoyia-parse/components/wxParseTemplate0.vue deleted file mode 100644 index 01bf8e1..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate0.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate1.vue b/components/gaoyia-parse/components/wxParseTemplate1.vue deleted file mode 100644 index 7054e35..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate1.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate10.vue b/components/gaoyia-parse/components/wxParseTemplate10.vue deleted file mode 100644 index 11c252c..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate10.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate11.vue b/components/gaoyia-parse/components/wxParseTemplate11.vue deleted file mode 100644 index 0d04e53..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate11.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate2.vue b/components/gaoyia-parse/components/wxParseTemplate2.vue deleted file mode 100644 index f06782a..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate2.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate3.vue b/components/gaoyia-parse/components/wxParseTemplate3.vue deleted file mode 100644 index b0943f8..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate3.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate4.vue b/components/gaoyia-parse/components/wxParseTemplate4.vue deleted file mode 100644 index 8a43756..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate4.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate5.vue b/components/gaoyia-parse/components/wxParseTemplate5.vue deleted file mode 100644 index 0c0993e..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate5.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate6.vue b/components/gaoyia-parse/components/wxParseTemplate6.vue deleted file mode 100644 index 0dca28a..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate6.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate7.vue b/components/gaoyia-parse/components/wxParseTemplate7.vue deleted file mode 100644 index b62acaf..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate7.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate8.vue b/components/gaoyia-parse/components/wxParseTemplate8.vue deleted file mode 100644 index f6fa037..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate8.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseTemplate9.vue b/components/gaoyia-parse/components/wxParseTemplate9.vue deleted file mode 100644 index 47ac81a..0000000 --- a/components/gaoyia-parse/components/wxParseTemplate9.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/components/gaoyia-parse/components/wxParseVideo.vue b/components/gaoyia-parse/components/wxParseVideo.vue deleted file mode 100644 index 7d05285..0000000 --- a/components/gaoyia-parse/components/wxParseVideo.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - diff --git a/components/gaoyia-parse/libs/html2json.js b/components/gaoyia-parse/libs/html2json.js deleted file mode 100644 index 0927382..0000000 --- a/components/gaoyia-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(//gi, ''); -} - -function getScreenInfo() { - const screen = {}; - wx.getSystemInfo({ - success: (res) => { - screen.width = res.windowWidth; - screen.height = res.windowHeight; - }, - }); - return screen; -} - -function html2json(html, customHandler, imageProp, host) { - // 处理字符串 - html = removeDOCTYPE(html); - html = trimHtml(html); - html = wxDiscode.strDiscode(html); - // 生成node节点 - const bufArray = []; - const results = { - nodes: [], - imageUrls: [], - }; - - const screen = getScreenInfo(); - function Node(tag) { - this.node = 'element'; - this.tag = tag; - - this.$screen = screen; - } - - HTMLParser(html, { - start(tag, attrs, unary) { - // node for this element - const node = new Node(tag); - - if (bufArray.length !== 0) { - const parent = bufArray[0]; - if (parent.nodes === undefined) { - parent.nodes = []; - } - } - - if (block[tag]) { - node.tagType = 'block'; - } else if (inline[tag]) { - node.tagType = 'inline'; - } else if (closeSelf[tag]) { - node.tagType = 'closeSelf'; - } - - node.attr = attrs.reduce((pre, attr) => { - const { name } = attr; - let { value } = attr; - if (name === 'class') { - node.classStr = value; - } - // has multi attibutes - // make it array of attribute - if (name === 'style') { - node.styleStr = value; - } - if (value.match(/ /)) { - value = value.split(' '); - } - - // if attr already exists - // merge it - if (pre[name]) { - if (Array.isArray(pre[name])) { - // already array, push to last - pre[name].push(value); - } else { - // single value, make it array - pre[name] = [pre[name], value]; - } - } else { - // not exist, put it - pre[name] = value; - } - - return pre; - }, {}); - - // 优化样式相关属性 - if (node.classStr) { - node.classStr += ` ${node.tag}`; - } else { - node.classStr = node.tag; - } - if (node.tagType === 'inline') { - node.classStr += ' inline'; - } - - // 对img添加额外数据 - if (node.tag === 'img') { - let imgUrl = node.attr.src; - imgUrl = wxDiscode.urlToHttpUrl(imgUrl, imageProp.domain); - Object.assign(node.attr, imageProp, { - src: imgUrl || '', - }); - if (imgUrl) { - results.imageUrls.push(imgUrl); - } - } - - // 处理a标签属性 - if (node.tag === 'a') { - node.attr.href = node.attr.href || ''; - } - - // 处理font标签样式属性 - if (node.tag === 'font') { - const fontSize = [ - 'x-small', - 'small', - 'medium', - 'large', - 'x-large', - 'xx-large', - '-webkit-xxx-large', - ]; - const styleAttrs = { - color: 'color', - face: 'font-family', - size: 'font-size', - }; - if (!node.styleStr) node.styleStr = ''; - Object.keys(styleAttrs).forEach((key) => { - if (node.attr[key]) { - const value = key === 'size' ? fontSize[node.attr[key] - 1] : node.attr[key]; - node.styleStr += `${styleAttrs[key]}: ${value};`; - } - }); - } - - // 临时记录source资源 - if (node.tag === 'source') { - results.source = node.attr.src; - } - - if (customHandler.start) { - customHandler.start(node, results); - } - - if (unary) { - // if this tag doesn't have end tag - // like - // add to parents - const parent = bufArray[0] || results; - if (parent.nodes === undefined) { - parent.nodes = []; - } - parent.nodes.push(node); - } else { - bufArray.unshift(node); - } - }, - end(tag) { - // merge into parent tag - const node = bufArray.shift(); - if (node.tag !== tag) { - console.error('invalid state: mismatch end tag'); - } - - // 当有缓存source资源时于于video补上src资源 - if (node.tag === 'video' && results.source) { - node.attr.src = results.source; - delete results.source; - } - - if (customHandler.end) { - customHandler.end(node, results); - } - - if (bufArray.length === 0) { - results.nodes.push(node); - } else { - const parent = bufArray[0]; - if (!parent.nodes) { - parent.nodes = []; - } - parent.nodes.push(node); - } - }, - chars(text) { - if (!text.trim()) return; - - const node = { - node: 'text', - text, - }; - - if (customHandler.chars) { - customHandler.chars(node, results); - } - - if (bufArray.length === 0) { - results.nodes.push(node); - } else { - const parent = bufArray[0]; - if (parent.nodes === undefined) { - parent.nodes = []; - } - parent.nodes.push(node); - } - }, - }); - - return results; -} - -export default html2json; diff --git a/components/gaoyia-parse/libs/htmlparser.js b/components/gaoyia-parse/libs/htmlparser.js deleted file mode 100644 index 2939da3..0000000 --- a/components/gaoyia-parse/libs/htmlparser.js +++ /dev/null @@ -1,156 +0,0 @@ -/** - * - * htmlParser改造自: https://github.com/blowsie/Pure-JavaScript-HTML5-Parser - * - * 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 - */ -// Regular Expressions for parsing tags and attributes - -const startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z0-9_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/; -const endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/; -const attr = /([a-zA-Z0-9_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g; - -function makeMap(str) { - const obj = {}; - const items = str.split(','); - for (let i = 0; i < items.length; i += 1) obj[items[i]] = true; - return obj; -} - -// Empty Elements - HTML 5 -const empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'); - -// Block Elements - HTML 5 -const block = makeMap('address,code,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,br,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'); - -// Attributes that have their values filled in disabled="disabled" -const fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); - -function HTMLParser(html, handler) { - let index; - let chars; - let match; - let last = html; - const stack = []; - - stack.last = () => stack[stack.length - 1]; - - function parseEndTag(tag, tagName) { - // If no tag name is provided, clean shop - let pos; - if (!tagName) { - pos = 0; - } else { - // Find the closest opened tag of the same type - tagName = tagName.toLowerCase(); - for (pos = stack.length - 1; pos >= 0; pos -= 1) { - if (stack[pos] === tagName) break; - } - } - if (pos >= 0) { - // Close all the open elements, up the stack - for (let i = stack.length - 1; i >= pos; i -= 1) { - if (handler.end) handler.end(stack[i]); - } - - // Remove the open elements from the stack - stack.length = pos; - } - } - - function parseStartTag(tag, tagName, rest, unary) { - tagName = tagName.toLowerCase(); - - if (block[tagName]) { - while (stack.last() && inline[stack.last()]) { - parseEndTag('', stack.last()); - } - } - - if (closeSelf[tagName] && stack.last() === tagName) { - parseEndTag('', tagName); - } - - unary = empty[tagName] || !!unary; - - if (!unary) stack.push(tagName); - - if (handler.start) { - const attrs = []; - - rest.replace(attr, function genAttr(matches, name) { - const value = arguments[2] || arguments[3] || arguments[4] || (fillAttrs[name] ? name : ''); - - attrs.push({ - name, - value, - escaped: value.replace(/(^|[^\\])"/g, '$1\\"'), // " - }); - }); - - if (handler.start) { - handler.start(tagName, attrs, unary); - } - } - } - - while (html) { - chars = true; - - if (html.indexOf('　'); -// str = str.replace(/ | | /g, ' '); -// str = str.replace(/"|"|"/g, "\""); -// str = str.replace(/'|'|'/g, "'"); -// str = str.replace(/´|´|´/g, "´"); -// str = str.replace(/×|×|×/g, "×"); -// str = str.replace(/÷|÷|÷/g, "÷"); -// str = str.replace(/&|&|&/g, '&'); -// str = str.replace(/<|<|</g, '<'); -// str = str.replace(/>|>|>/g, '>'); - - - - -str = str.replace(/ | | /g, " "); -str = str.replace(/ | | /g, ' '); -str = str.replace(/　|　/g, '　'); -str = str.replace(/ | | /g, ' '); -str = str.replace(/"|"|"/g, "\""); -str = str.replace(/"|'|'/g, "'"); -str = str.replace(/´|´|´/g, "´"); -str = str.replace(/×|×|×/g, "×"); -str = str.replace(/÷|÷|÷/g, "÷"); -str = str.replace(/&|&|&/g, '&'); -str = str.replace(/<|<|</g, '<'); -str = str.replace(/>|>|>/g, '>'); -return str; -} - -// HTML 支持的其他实体 -function strOtherDiscode(str) { -str = str.replace(/Œ|Œ|Œ/g, 'Œ'); -str = str.replace(/œ|œ|œ/g, 'œ'); -str = str.replace(/Š|Š|Š/g, 'Š'); -str = str.replace(/š|š|š/g, 'š'); -str = str.replace(/Ÿ|Ÿ|Ÿ/g, 'Ÿ'); -str = str.replace(/ƒ|ƒ|ƒ/g, 'ƒ'); -str = str.replace(/ˆ|ˆ|ˆ/g, 'ˆ'); -str = str.replace(/˜|˜|˜/g, '˜'); -str = str.replace(/ |$#8201;| /g, ' '); -str = str.replace(/‌|‌|‌/g, '‌'); -str = str.replace(/‍|$#8205;|‍/g, '‍'); -str = str.replace(/‎|$#8206;|‎/g, '‎'); -str = str.replace(/‏|‏|‏/g, '‏'); -str = str.replace(/–|–|–/g, '–'); -str = str.replace(/—|—|—/g, '—'); -str = str.replace(/‘|‘|‘/g, '‘'); -str = str.replace(/’|’|’/g, '’'); -str = str.replace(/‚|‚|‚/g, '‚'); -str = str.replace(/“|“|“/g, '“'); -str = str.replace(/”|”|”/g, '”'); -str = str.replace(/„|„|„/g, '„'); -str = str.replace(/†|†|†/g, '†'); -str = str.replace(/‡|‡|‡/g, '‡'); -str = str.replace(/•|•|•/g, '•'); -str = str.replace(/…|…|…/g, '…'); -str = str.replace(/‰|‰|‰/g, '‰'); -str = str.replace(/′|′|′/g, '′'); -str = str.replace(/″|″|″/g, '″'); -str = str.replace(/‹|‹|‹/g, '‹'); -str = str.replace(/›|›|›/g, '›'); -str = str.replace(/‾|‾|‾/g, '‾'); -str = str.replace(/€|€|€/g, '€'); -str = str.replace(/™|™|™/g, '™'); -str = str.replace(/←|←|←/g, '←'); -str = str.replace(/↑|↑|↑/g, '↑'); -str = str.replace(/→|→|→/g, '→'); -str = str.replace(/↓|↓|↓/g, '↓'); -str = str.replace(/↔|↔|↔/g, '↔'); -str = str.replace(/↵|↵|↵/g, '↵'); -str = str.replace(/⌈|⌈|⌈/g, '⌈'); -str = str.replace(/⌉|⌉|⌉/g, '⌉'); -str = str.replace(/⌊|⌊|⌊/g, '⌊'); -str = str.replace(/⌋|⌋|⌋/g, '⌋'); -str = str.replace(/◊|◊|◊/g, '◊'); -str = str.replace(/♠|♠|♠/g, '♠'); -str = str.replace(/♣|♣|♣/g, '♣'); -str = str.replace(/♥|♥|♥/g, '♥'); -str = str.replace(/♦|♦|♦/g, '♦'); -return str; -} - -function strDiscode(str) { - str = strNumDiscode(str); - str = strGreeceDiscode(str); - str = strcharacterDiscode(str); - str = strOtherDiscode(str); - return str; -} - -function urlToHttpUrl(url, domain) { - if (/^\/\//.test(url)) { - return `https:${url}`; - } else if (/^\//.test(url)) { - return `https://${domain}${url}`; - } - return url; -} - -export default { - strDiscode, - urlToHttpUrl, -}; diff --git a/components/gaoyia-parse/parse.css b/components/gaoyia-parse/parse.css deleted file mode 100644 index e7adce1..0000000 --- a/components/gaoyia-parse/parse.css +++ /dev/null @@ -1,258 +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 - */ -/** - * 请在全局下引入该文件，@import '/static/wxParse.css'; - */ -.wxParse { - user-select:none; - width: 100%; - font-family: Helvetica, "PingFangSC", 'Microsoft Yahei', '微软雅黑', Arial, sans-serif; - color: #333; - line-height: 1.5; - font-size: 1em; - text-align:justify;/* //左右两端对齐 */ -} -.wxParse view ,.wxParse uni-view{ - word-break: break-word; -} -.wxParse .p { - padding-bottom: 0.5em; - clear: both; - /* letter-spacing: 0;//字间距 */ -} -.wxParse .inline { - display: inline; - margin: 0; - padding: 0; -} - -.wxParse .div { - margin: 0; - padding: 0; - display: block; -} - -.wxParse .h1{ - font-size: 2em; - line-height: 1.2em; - margin: 0.67em 0; -} -.wxParse .h2{ - font-size: 1.5em; - margin: 0.83em 0; -} -.wxParse .h3{ - font-size: 1.17em; - margin: 1em 0; -} -.wxParse .h4{ - margin: 1.33em 0; -} -.wxParse .h5{ - font-size: 0.83em; - margin: 1.67em 0; -} -.wxParse .h6{ - font-size: 0.83em; - margin: 1.67em 0; -} - -.wxParse .h1, -.wxParse .h2, -.wxParse .h3, -.wxParse .h4, -.wxParse .h5, -.wxParse .h6, -.wxParse .b, -.wxParse .strong{ - font-weight: bolder; -} - -.wxParse .i, -.wxParse .cite, -.wxParse .em, -.wxParse .var, -.wxParse .address { - font-style: italic; -} -.wxParse .spaceshow{ - white-space: pre; -} -.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; - font-size: 24upx; -} -.wxParse .code { - overflow: auto; - padding: 16upx; - white-space: pre; - margin: 1em 0upx; - background: #f5f5f5; - font-size: 24upx; -} - -.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 .text, -.wxParse .span, -.wxParse .s { - display: inline; -} - -.wxParse .a { - color: deepskyblue; -} - -.wxParse .video { - text-align: center; - margin: 22upx 0; -} - -.wxParse .video-video { - width: 100%; -} -.wxParse .uni-image{ - max-width: 100%; -} -.wxParse .img { - display: block; - max-width: 100%; - margin-bottom: 0em;/* //与p标签底部padding同时修改 */ - 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: 2em; -} -.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 .tablebox{ - overflow: auto; - background-color: #f5f5f5; - background: #f5f5f5; - font-size: 13px; - padding: 8px; -} -.wxParse .table .table,.wxParse .table{ - border-collapse:collapse; - box-sizing: border-box; - /* 内边框 */ - /* width: 100%; */ - overflow: auto; - white-space: pre; -} -.wxParse .tbody{ - border-collapse:collapse; - box-sizing: border-box; - /* 内边框 */ - border: 1px solid #dadada; -} -.wxParse .table .thead, .wxParse .table .tfoot, .wxParse .table .th{ - border-collapse:collapse; - box-sizing: border-box; - background: #ececec; - font-weight: 40; -} -.wxParse .table .tr { - border-collapse:collapse; - box-sizing: border-box; - /* border: 2px solid #F0AD4E; */ - overflow:auto; -} -.wxParse .table .th, -.wxParse .table .td{ - border-collapse:collapse; - box-sizing: border-box; - border: 2upx solid #dadada; - overflow:auto; -} -.wxParse .audio, .wxParse .uni-audio-default{ - display: block; -} \ No newline at end of file diff --git a/components/gaoyia-parse/parse.vue b/components/gaoyia-parse/parse.vue deleted file mode 100644 index f255166..0000000 --- a/components/gaoyia-parse/parse.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - diff --git a/components/uni-section/uni-section.vue b/components/uni-section/uni-section.vue deleted file mode 100644 index a68c7b7..0000000 --- a/components/uni-section/uni-section.vue +++ /dev/null @@ -1,140 +0,0 @@ - - - - diff --git a/manifest.json b/manifest.json index c249f93..959a70e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "或然合伙人运营管理平台", + "name" : "职站商城", "appid" : "__UNI__2E89BA6", "description" : "", "versionName" : "1.0.0", diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue index c1c5007..fbbf6a2 100644 --- a/order/orderDetail/orderDetail.vue +++ b/order/orderDetail/orderDetail.vue @@ -68,7 +68,7 @@ - + @@ -528,7 +528,7 @@ uni.setClipboardData({ data: this.shipInfo, success() { - that.$util.sucMsg('编辑成功') + that.$util.sucMsg('复制成功') } }) }, diff --git a/order/productDetail/productDetail.vue b/order/productDetail/productDetail.vue index a77644b..d2bfb56 100644 --- a/order/productDetail/productDetail.vue +++ b/order/productDetail/productDetail.vue @@ -77,7 +77,7 @@ 产品参数 - + 下载全部 @@ -195,7 +195,7 @@ urls.push(e.filePath) }) uni.setStorageSync('files', { - copyWriting: item.fileName, + copyWriting: this.form.mall.productName, fileName, urls }) diff --git a/order/shopCart/shopCart.vue b/order/shopCart/shopCart.vue index c690ea0..2393b5a 100644 --- a/order/shopCart/shopCart.vue +++ b/order/shopCart/shopCart.vue @@ -115,12 +115,13 @@ this.checkAll = [] } } + console.log(11, checked) }, // 全选 allChange(e) { const isCheck = !!e.detail.value.length // 是否选中 const { list } = this - this.checked = isCheck ? list : [] + this.checked = isCheck ? JSON.parse(JSON.stringify(list)) : [] list.forEach(e => { e.check = isCheck ? 1 : 0 }) diff --git a/pages.json b/pages.json index c78d6ff..b782313 100644 --- a/pages.json +++ b/pages.json @@ -281,7 +281,7 @@ }, "globalStyle": { "navigationBarTextStyle": "white", - "navigationBarTitleText": "或然合伙人运营管理平台", + "navigationBarTitleText": "职站商城", "navigationBarBackgroundColor": "#007EFF", "backgroundColor": "#f5f5f5", "app-plus": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 382c6e9..f6d3c42 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,7 +3,7 @@ diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue index aa126fb..8ff68a9 100644 --- a/pages/workbench/workbench.vue +++ b/pages/workbench/workbench.vue @@ -23,11 +23,11 @@ 方案
  • - + 学习
  • - + 资讯
    • diff --git a/static/image/avatar.png b/static/image/avatar.png index 2b5ca9f..01dee60 100644 Binary files a/static/image/avatar.png and b/static/image/avatar.png differ diff --git a/static/image/index/1.png b/static/image/index/1.png index d5f41b8..2a7a8ff 100644 Binary files a/static/image/index/1.png and b/static/image/index/1.png differ diff --git a/static/image/index/2.png b/static/image/index/2.png index 07de565..e6f6b81 100644 Binary files a/static/image/index/2.png and b/static/image/index/2.png differ diff --git a/static/image/index/3.png b/static/image/index/3.png index 78701ea..b7b66ce 100644 Binary files a/static/image/index/3.png and b/static/image/index/3.png differ diff --git a/static/image/index/4.png b/static/image/index/4.png index b0724d0..0af3c84 100644 Binary files a/static/image/index/4.png and b/static/image/index/4.png differ diff --git a/static/image/index/5.png b/static/image/index/5.png index fc37368..d65619e 100644 Binary files a/static/image/index/5.png and b/static/image/index/5.png differ diff --git a/static/image/index/6.png b/static/image/index/6.png index 5df4655..d416b91 100644 Binary files a/static/image/index/6.png and b/static/image/index/6.png differ diff --git a/static/image/index/7.png b/static/image/index/7.png index 5cbf6f4..8fc2b6e 100644 Binary files a/static/image/index/7.png and b/static/image/index/7.png differ diff --git a/static/image/index/8.png b/static/image/index/8.png index f310d4a..fd81395 100644 Binary files a/static/image/index/8.png and b/static/image/index/8.png differ diff --git a/static/image/index/9.png b/static/image/index/9.png index fce7dd0..f6fcd88 100644 Binary files a/static/image/index/9.png and b/static/image/index/9.png differ diff --git a/static/image/index/banner.png b/static/image/index/banner.png new file mode 100644 index 0000000..328bde3 Binary files /dev/null and b/static/image/index/banner.png differ diff --git a/static/image/info-bg.jpg b/static/image/info-bg.jpg index 81e14be..bf0bd0c 100644 Binary files a/static/image/info-bg.jpg and b/static/image/info-bg.jpg differ diff --git a/static/image/info.png b/static/image/info.png index df3f982..cc48896 100644 Binary files a/static/image/info.png and b/static/image/info.png differ diff --git a/static/image/login1.png b/static/image/login1.png index 49f7dc1..3696454 100644 Binary files a/static/image/login1.png and b/static/image/login1.png differ diff --git a/static/image/login2.png b/static/image/login2.png index 4ecad29..bba9df6 100644 Binary files a/static/image/login2.png and b/static/image/login2.png differ diff --git a/static/image/logo.png b/static/image/logo.png index e212cde..a5ba1a7 100644 Binary files a/static/image/logo.png and b/static/image/logo.png differ diff --git a/static/image/none.png b/static/image/none.png index 66d55dd..7f26edd 100644 Binary files a/static/image/none.png and b/static/image/none.png differ diff --git a/static/image/person-bg.png b/static/image/person-bg.png index 73c9a96..c7053ab 100644 Binary files a/static/image/person-bg.png and b/static/image/person-bg.png differ diff --git a/static/image/person1.png b/static/image/person1.png index ecb9ac8..fca1656 100644 Binary files a/static/image/person1.png and b/static/image/person1.png differ diff --git a/static/image/person2.png b/static/image/person2.png index 53f90c2..9d67572 100644 Binary files a/static/image/person2.png and b/static/image/person2.png differ diff --git a/static/image/person26.png b/static/image/person26.png index 74bb126..8ecb59c 100644 Binary files a/static/image/person26.png and b/static/image/person26.png differ diff --git a/static/image/person27.png b/static/image/person27.png index fb561c0..da9f936 100644 Binary files a/static/image/person27.png and b/static/image/person27.png differ diff --git a/static/image/person3.png b/static/image/person3.png index 926aaea..5ff5353 100644 Binary files a/static/image/person3.png and b/static/image/person3.png differ diff --git a/static/image/person4.png b/static/image/person4.png index c4ca57f..f4be28c 100644 Binary files a/static/image/person4.png and b/static/image/person4.png differ diff --git a/static/image/person5.png b/static/image/person5.png index 4d508a6..7867860 100644 Binary files a/static/image/person5.png and b/static/image/person5.png differ diff --git a/static/image/person6.png b/static/image/person6.png index 9ed8244..f2e1025 100644 Binary files a/static/image/person6.png and b/static/image/person6.png differ diff --git a/static/image/person7.png b/static/image/person7.png index 16f8a7c..b3639c3 100644 Binary files a/static/image/person7.png and b/static/image/person7.png differ diff --git a/static/image/person8.png b/static/image/person8.png index 22b89f4..404ca7b 100644 Binary files a/static/image/person8.png and b/static/image/person8.png differ diff --git a/static/image/person9.png b/static/image/person9.png index 32e3b97..3b1ae92 100644 Binary files a/static/image/person9.png and b/static/image/person9.png differ diff --git a/static/image/phone.png b/static/image/phone.png index e425841..b67616a 100644 Binary files a/static/image/phone.png and b/static/image/phone.png differ diff --git a/static/image/product.png b/static/image/product.png index fa12eb2..5c32c3c 100644 Binary files a/static/image/product.png and b/static/image/product.png differ diff --git a/static/image/product/1.png b/static/image/product/1.png index e56715d..70f05e9 100644 Binary files a/static/image/product/1.png and b/static/image/product/1.png differ diff --git a/static/image/product/2.png b/static/image/product/2.png index ae8fd6d..b69e84b 100644 Binary files a/static/image/product/2.png and b/static/image/product/2.png differ diff --git a/static/image/product/3.png b/static/image/product/3.png index 8fd42ea..f4fe323 100644 Binary files a/static/image/product/3.png and b/static/image/product/3.png differ diff --git a/static/image/product/4.png b/static/image/product/4.png index 4471952..1d975c6 100644 Binary files a/static/image/product/4.png and b/static/image/product/4.png differ diff --git a/static/image/product/5.png b/static/image/product/5.png index 57dc0b2..5c98aac 100644 Binary files a/static/image/product/5.png and b/static/image/product/5.png differ diff --git a/static/image/product/6.png b/static/image/product/6.png index e7ac221..bf93532 100644 Binary files a/static/image/product/6.png and b/static/image/product/6.png differ diff --git a/static/image/product/excel.png b/static/image/product/excel.png index 613dee5..778174a 100644 Binary files a/static/image/product/excel.png and b/static/image/product/excel.png differ diff --git a/static/image/product/pdf.png b/static/image/product/pdf.png index 51a31e6..d04fdc3 100644 Binary files a/static/image/product/pdf.png and b/static/image/product/pdf.png differ diff --git a/static/image/product/ppt.png b/static/image/product/ppt.png index 5f7feb7..ddd6b10 100644 Binary files a/static/image/product/ppt.png and b/static/image/product/ppt.png differ diff --git a/static/image/product/shop-blue.png b/static/image/product/shop-blue.png index 426c807..cc79313 100644 Binary files a/static/image/product/shop-blue.png and b/static/image/product/shop-blue.png differ diff --git a/static/image/product/shop.png b/static/image/product/shop.png index 4c11ccc..38fb3f4 100644 Binary files a/static/image/product/shop.png and b/static/image/product/shop.png differ diff --git a/static/image/product/word.png b/static/image/product/word.png index afa4ecc..bedc504 100644 Binary files a/static/image/product/word.png and b/static/image/product/word.png differ diff --git a/static/image/school.png b/static/image/school.png index 93ce55d..af4535f 100644 Binary files a/static/image/school.png and b/static/image/school.png differ diff --git a/static/image/study-bg.jpg b/static/image/study-bg.jpg index 46007b1..afe399f 100644 Binary files a/static/image/study-bg.jpg and b/static/image/study-bg.jpg differ diff --git a/static/image/tab1-1.png b/static/image/tab1-1.png index 8a49c15..3c5b26c 100644 Binary files a/static/image/tab1-1.png and b/static/image/tab1-1.png differ diff --git a/static/image/tab1.png b/static/image/tab1.png index 2ecd87d..d63846b 100644 Binary files a/static/image/tab1.png and b/static/image/tab1.png differ diff --git a/static/image/tab2-1.png b/static/image/tab2-1.png index 52bc8a4..ac00685 100644 Binary files a/static/image/tab2-1.png and b/static/image/tab2-1.png differ diff --git a/static/image/tab2.png b/static/image/tab2.png index 1a49602..be8ad9e 100644 Binary files a/static/image/tab2.png and b/static/image/tab2.png differ diff --git a/static/image/tab3-1.png b/static/image/tab3-1.png index 032374e..37b6aa7 100644 Binary files a/static/image/tab3-1.png and b/static/image/tab3-1.png differ diff --git a/static/image/tab3.png b/static/image/tab3.png index 5acd4a0..99bb522 100644 Binary files a/static/image/tab3.png and b/static/image/tab3.png differ diff --git a/static/image/tab4-1.png b/static/image/tab4-1.png index 97c35f3..a6c864d 100644 Binary files a/static/image/tab4-1.png and b/static/image/tab4-1.png differ diff --git a/static/image/tab4.png b/static/image/tab4.png index f3cecfe..71b4d31 100644 Binary files a/static/image/tab4.png and b/static/image/tab4.png differ diff --git a/static/image/trash.png b/static/image/trash.png index e8d109b..eda986d 100644 Binary files a/static/image/trash.png and b/static/image/trash.png differ diff --git a/static/image/unfold.png b/static/image/unfold.png index daad3d9..62ca6e5 100644 Binary files a/static/image/unfold.png and b/static/image/unfold.png differ diff --git a/static/image/wechat.png b/static/image/wechat.png index 0527db1..9f8d946 100644 Binary files a/static/image/wechat.png and b/static/image/wechat.png differ diff --git a/static/image/workbench/index1.png b/static/image/workbench/index1.png index b15f714..bdbfa67 100644 Binary files a/static/image/workbench/index1.png and b/static/image/workbench/index1.png differ diff --git a/static/image/workbench/index10.png b/static/image/workbench/index10.png index 319f962..2153a6f 100644 Binary files a/static/image/workbench/index10.png and b/static/image/workbench/index10.png differ diff --git a/static/image/workbench/index11.png b/static/image/workbench/index11.png new file mode 100644 index 0000000..1a93aba Binary files /dev/null and b/static/image/workbench/index11.png differ diff --git a/static/image/workbench/index12.png b/static/image/workbench/index12.png new file mode 100644 index 0000000..2da7ae4 Binary files /dev/null and b/static/image/workbench/index12.png differ diff --git a/static/image/workbench/index2.png b/static/image/workbench/index2.png index 1f007f4..dd10c1b 100644 Binary files a/static/image/workbench/index2.png and b/static/image/workbench/index2.png differ diff --git a/static/image/workbench/index3.png b/static/image/workbench/index3.png index a4024d1..abe9779 100644 Binary files a/static/image/workbench/index3.png and b/static/image/workbench/index3.png differ diff --git a/static/image/workbench/index4.png b/static/image/workbench/index4.png index f7ca20f..029d403 100644 Binary files a/static/image/workbench/index4.png and b/static/image/workbench/index4.png differ diff --git a/static/image/workbench/index5.png b/static/image/workbench/index5.png index 79c9e17..a33fdb7 100644 Binary files a/static/image/workbench/index5.png and b/static/image/workbench/index5.png differ diff --git a/static/image/workbench/index6.png b/static/image/workbench/index6.png index 25ac8e3..aee4959 100644 Binary files a/static/image/workbench/index6.png and b/static/image/workbench/index6.png differ diff --git a/static/image/workbench/index7.png b/static/image/workbench/index7.png index d311da3..1fbd6c4 100644 Binary files a/static/image/workbench/index7.png and b/static/image/workbench/index7.png differ diff --git a/static/image/workbench/index8.png b/static/image/workbench/index8.png index 287d752..df914cf 100644 Binary files a/static/image/workbench/index8.png and b/static/image/workbench/index8.png differ diff --git a/static/image/workbench/index9.png b/static/image/workbench/index9.png index ea874ec..186de65 100644 Binary files a/static/image/workbench/index9.png and b/static/image/workbench/index9.png differ diff --git a/team/article/article.vue b/team/article/article.vue index 3c07f92..0d55efd 100644 --- a/team/article/article.vue +++ b/team/article/article.vue @@ -36,7 +36,6 @@