diff --git a/App.vue b/App.vue index 7ae8456..177303f 100644 --- a/App.vue +++ b/App.vue @@ -16,4 +16,8 @@ /*每个页面公共css */ @import "@/static/styles/main.css"; @import "uview-ui/index.scss"; + + page { + background-color: #F8F8F8; + } diff --git a/components/certifiedCj/certifiedCj.vue b/components/certifiedCj/certifiedCj.vue new file mode 100644 index 0000000..ba56e59 --- /dev/null +++ b/components/certifiedCj/certifiedCj.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/components/myAvatar/myAvatar.vue b/components/myAvatar/myAvatar.vue new file mode 100644 index 0000000..49bc3ef --- /dev/null +++ b/components/myAvatar/myAvatar.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/components/myForm/myForm.vue b/components/myForm/myForm.vue new file mode 100644 index 0000000..e1cee44 --- /dev/null +++ b/components/myForm/myForm.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/components/news/news.vue b/components/news/news.vue new file mode 100644 index 0000000..887949c --- /dev/null +++ b/components/news/news.vue @@ -0,0 +1,59 @@ + + + diff --git a/components/products/products.vue b/components/products/products.vue new file mode 100644 index 0000000..9c3e2aa --- /dev/null +++ b/components/products/products.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/components/u-parse/components/wxParseAudio.vue b/components/u-parse/components/wxParseAudio.vue new file mode 100644 index 0000000..86df246 --- /dev/null +++ b/components/u-parse/components/wxParseAudio.vue @@ -0,0 +1,27 @@ + + + diff --git a/components/u-parse/components/wxParseImg.vue b/components/u-parse/components/wxParseImg.vue new file mode 100644 index 0000000..00747e4 --- /dev/null +++ b/components/u-parse/components/wxParseImg.vue @@ -0,0 +1,86 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate0.vue b/components/u-parse/components/wxParseTemplate0.vue new file mode 100644 index 0000000..0c76e74 --- /dev/null +++ b/components/u-parse/components/wxParseTemplate0.vue @@ -0,0 +1,107 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate1.vue b/components/u-parse/components/wxParseTemplate1.vue new file mode 100644 index 0000000..a864f23 --- /dev/null +++ b/components/u-parse/components/wxParseTemplate1.vue @@ -0,0 +1,99 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate10.vue b/components/u-parse/components/wxParseTemplate10.vue new file mode 100644 index 0000000..9a8d8b6 --- /dev/null +++ b/components/u-parse/components/wxParseTemplate10.vue @@ -0,0 +1,97 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate11.vue b/components/u-parse/components/wxParseTemplate11.vue new file mode 100644 index 0000000..1402d11 --- /dev/null +++ b/components/u-parse/components/wxParseTemplate11.vue @@ -0,0 +1,87 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate2.vue b/components/u-parse/components/wxParseTemplate2.vue new file mode 100644 index 0000000..d6d027d --- /dev/null +++ b/components/u-parse/components/wxParseTemplate2.vue @@ -0,0 +1,98 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate3.vue b/components/u-parse/components/wxParseTemplate3.vue new file mode 100644 index 0000000..f899edd --- /dev/null +++ b/components/u-parse/components/wxParseTemplate3.vue @@ -0,0 +1,98 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate4.vue b/components/u-parse/components/wxParseTemplate4.vue new file mode 100644 index 0000000..9bd558c --- /dev/null +++ b/components/u-parse/components/wxParseTemplate4.vue @@ -0,0 +1,98 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate5.vue b/components/u-parse/components/wxParseTemplate5.vue new file mode 100644 index 0000000..4f6cc27 --- /dev/null +++ b/components/u-parse/components/wxParseTemplate5.vue @@ -0,0 +1,98 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate6.vue b/components/u-parse/components/wxParseTemplate6.vue new file mode 100644 index 0000000..4781c64 --- /dev/null +++ b/components/u-parse/components/wxParseTemplate6.vue @@ -0,0 +1,98 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate7.vue b/components/u-parse/components/wxParseTemplate7.vue new file mode 100644 index 0000000..1efc4dc --- /dev/null +++ b/components/u-parse/components/wxParseTemplate7.vue @@ -0,0 +1,98 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate8.vue b/components/u-parse/components/wxParseTemplate8.vue new file mode 100644 index 0000000..2ac546f --- /dev/null +++ b/components/u-parse/components/wxParseTemplate8.vue @@ -0,0 +1,98 @@ + + + diff --git a/components/u-parse/components/wxParseTemplate9.vue b/components/u-parse/components/wxParseTemplate9.vue new file mode 100644 index 0000000..c771e5f --- /dev/null +++ b/components/u-parse/components/wxParseTemplate9.vue @@ -0,0 +1,98 @@ + + + diff --git a/components/u-parse/components/wxParseVideo.vue b/components/u-parse/components/wxParseVideo.vue new file mode 100644 index 0000000..a952f58 --- /dev/null +++ b/components/u-parse/components/wxParseVideo.vue @@ -0,0 +1,15 @@ + + + diff --git a/components/u-parse/libs/html2json.js b/components/u-parse/libs/html2json.js new file mode 100644 index 0000000..0927382 --- /dev/null +++ b/components/u-parse/libs/html2json.js @@ -0,0 +1,261 @@ +/** + * 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/u-parse/libs/htmlparser.js b/components/u-parse/libs/htmlparser.js new file mode 100644 index 0000000..2939da3 --- /dev/null +++ b/components/u-parse/libs/htmlparser.js @@ -0,0 +1,156 @@ +/** + * + * 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, '•'); + + 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(/ /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, '⌋'); + 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/u-parse/readme.md b/components/u-parse/readme.md new file mode 100644 index 0000000..f79b9c3 --- /dev/null +++ b/components/u-parse/readme.md @@ -0,0 +1,102 @@ +## uParse 适用于 uni-app/mpvue 的富文本解析组件 + +> 支持 Html、Markdown 解析,Fork自: [mpvue-wxParse](https://github.com/F-loat/mpvue-wxParse) + + +## 属性 + +| 名称 | 类型 | 默认值 | 描述 | +| -----------------|--------------- | ------------- | ---------------- | +| loading | Boolean | false | 数据加载状态 | +| className | String | — | 自定义 class 名称 | +| content | String | — | 渲染内容 | +| noData | String | 数据不能为空 | 空数据时的渲染展示 | +| startHandler | Function | 见源码 | 自定义 parser 函数 | +| endHandler | Function | null | 自定义 parser 函数 | +| charsHandler | Function | null | 自定义 parser 函数 | +| imageProp | Object | 见下文 | 图片相关参数 | + +### 自定义 parser 函数具体介绍 + +* 传入的参数为当前节点 `node` 对象及解析结果 `results` 对象,例如 `startHandler(node, results)` +* 无需返回值,通过对传入的参数直接操作来完成需要的改动 +* 自定义函数会在原解析函数处理之后执行 + +### imageProp 对象具体属性 + +| 名称 | 类型 | 默认值 | 描述 | +| -----------------|--------------- | ------------- | ------------------ | +| mode | String | 'aspectFit' | 图片裁剪、缩放的模式 | +| padding | Number | 0 | 图片内边距 | +| lazyLoad | Boolean | false | 图片懒加载 | +| domain | String | '' | 图片服务域名 | + +## 事件 + +| 名称 | 参数 | 描述 | +| -----------------|----------------- | ---------------- | +| preview | 图片地址,原始事件 | 预览图片时触发 | +| navigate | 链接地址,原始事件 | 点击链接时触发 | + +## 基本使用方法 + + +``` vue + + + + + +``` + + +## 渲染 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 new file mode 100644 index 0000000..691993a --- /dev/null +++ b/components/u-parse/u-parse.css @@ -0,0 +1,232 @@ +/** + * 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 new file mode 100644 index 0000000..494e60c --- /dev/null +++ b/components/u-parse/u-parse.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/pages.json b/pages.json index 37a8d05..0838b99 100644 --- a/pages.json +++ b/pages.json @@ -7,7 +7,8 @@ "^customer-(.*)": "@/components/uni-$1.vue" // 匹配components目录内的vue文件 } }, - "pages": [{ + "pages": [ + { "path": "pages/index/index", "style": { "navigationBarTitleText": "食瞳", @@ -16,7 +17,7 @@ //导航栏取消 // "navigationStyle": "custom", //是否开启下拉刷新 - "enablePullDownRefresh": false + "enablePullDownRefresh": true } }, { @@ -42,6 +43,65 @@ "style": { "navigationBarTitleText": "我的", "navigationBarTextStyle": "white", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/report/news/news", + "style": { + "navigationBarTitleText": "行内新闻", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + }, { + "path": "pages/report/certifiedCj/certifiedCj", + "style": { + "navigationBarTitleText": "认证厂家", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + }, { + "path": "pages/detail/xwDetail/xwDetail", + "style": { + "navigationBarTitleText": "行业新闻详情", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + }, { + "path": "pages/detail/productsDetail/productsDetail", + "style": { + "navigationBarTitleText": "商品详情", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + }, { + "path": "pages/detail/certifiedCjDetail/certifiedCjDetail", + "style": { + "navigationBarTitleText": "厂家信息", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/my/bindCompony/bindCompony", + "style": { + "navigationBarTitleText": "绑定公司", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/my/browseHistory/browseHistory", + "style": { + "navigationBarTitleText": "浏览记录", + "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#12CA64", "enablePullDownRefresh": false } @@ -64,6 +124,14 @@ "navigationBarBackgroundColor": "#12CA64", "enablePullDownRefresh": false, "navigationStyle": "custom" + } + }, { + "path": "pages/my/memberCenter/memberCenter", + "style": { + "navigationBarTitleText": "会员中心", + "navigationBarTextStyle": "white", + "navigationStyle": "custom", + "enablePullDownRefresh": false } } ], diff --git a/pages/detail/certifiedCjDetail/certifiedCjDetail.vue b/pages/detail/certifiedCjDetail/certifiedCjDetail.vue new file mode 100644 index 0000000..acb6186 --- /dev/null +++ b/pages/detail/certifiedCjDetail/certifiedCjDetail.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/pages/detail/productsDetail/productsDetail.vue b/pages/detail/productsDetail/productsDetail.vue new file mode 100644 index 0000000..c0f092f --- /dev/null +++ b/pages/detail/productsDetail/productsDetail.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/pages/detail/xwDetail/xwDetail.vue b/pages/detail/xwDetail/xwDetail.vue new file mode 100644 index 0000000..1c2a730 --- /dev/null +++ b/pages/detail/xwDetail/xwDetail.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index ea07eb0..b1dafc5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,41 +1,119 @@ - + + .content { + + //分类模块 + .classify { + height: 350rpx; + background: #FFFFFF; + border-radius: 24rpx; + + box-shadow: 0px 2px 4px 0px rgba(206, 206, 206, 0.5); + + .u-grid { + padding-top: 30rpx; + + .grid-text { + padding-top: 8rpx; + font-size: 24rpx; + } + + .u-grid-item { + padding-bottom: 38rpx; + } + } + } + + //轮播图 + .u-swiper__wrapper__item__wrapper { + margin-top: 20rpx; + height: 290rpx; + } + + .u-swiper-indicator__wrapper { + display: none !important; + } + + // 选项卡 + .u-tabs__wrapper__nav { + background-color: #FFFFFF; + + .u-tabs__wrapper__nav__item { + padding: 0 !important; + flex: 1; + } + } + + + } + \ No newline at end of file diff --git a/pages/my/bindCompony/bindCompony.vue b/pages/my/bindCompony/bindCompony.vue new file mode 100644 index 0000000..a8b567a --- /dev/null +++ b/pages/my/bindCompony/bindCompony.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/pages/my/browseHistory/browseHistory.vue b/pages/my/browseHistory/browseHistory.vue new file mode 100644 index 0000000..748a6e1 --- /dev/null +++ b/pages/my/browseHistory/browseHistory.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/pages/my/memberCenter/memberCenter.vue b/pages/my/memberCenter/memberCenter.vue new file mode 100644 index 0000000..ddf81c7 --- /dev/null +++ b/pages/my/memberCenter/memberCenter.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/pages/my/my.vue b/pages/my/my.vue index 9b753b3..92af0cf 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -1,6 +1,163 @@ + + + diff --git a/pages/report/certifiedCj/certifiedCj.vue b/pages/report/certifiedCj/certifiedCj.vue new file mode 100644 index 0000000..437fdef --- /dev/null +++ b/pages/report/certifiedCj/certifiedCj.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/pages/report/news/news.vue b/pages/report/news/news.vue new file mode 100644 index 0000000..7e115ec --- /dev/null +++ b/pages/report/news/news.vue @@ -0,0 +1,34 @@ + + + + + diff --git a/pages/report/report.vue b/pages/report/report.vue index 6ce9d63..56139b0 100644 --- a/pages/report/report.vue +++ b/pages/report/report.vue @@ -1,5 +1,134 @@ + + + + diff --git a/static/classify/sy_icon_cy.png b/static/classify/sy_icon_cy.png new file mode 100644 index 0000000..a2acfcd Binary files /dev/null and b/static/classify/sy_icon_cy.png differ diff --git a/static/classify/sy_icon_gs.png b/static/classify/sy_icon_gs.png new file mode 100644 index 0000000..8f44e63 Binary files /dev/null and b/static/classify/sy_icon_gs.png differ diff --git a/static/classify/sy_icon_hp.png b/static/classify/sy_icon_hp.png new file mode 100644 index 0000000..48dee17 Binary files /dev/null and b/static/classify/sy_icon_hp.png differ diff --git a/static/classify/sy_icon_hz.png b/static/classify/sy_icon_hz.png new file mode 100644 index 0000000..c97a1bd Binary files /dev/null and b/static/classify/sy_icon_hz.png differ diff --git a/static/classify/sy_icon_ls.png b/static/classify/sy_icon_ls.png new file mode 100644 index 0000000..06e04a0 Binary files /dev/null and b/static/classify/sy_icon_ls.png differ diff --git a/static/classify/sy_icon_np.png b/static/classify/sy_icon_np.png new file mode 100644 index 0000000..862c400 Binary files /dev/null and b/static/classify/sy_icon_np.png differ diff --git a/static/classify/sy_icon_rs.png b/static/classify/sy_icon_rs.png new file mode 100644 index 0000000..bc436ed Binary files /dev/null and b/static/classify/sy_icon_rs.png differ diff --git a/static/classify/sy_icon_sj.png b/static/classify/sy_icon_sj.png new file mode 100644 index 0000000..6d98d0d Binary files /dev/null and b/static/classify/sy_icon_sj.png differ diff --git a/static/classify/sy_icon_tw.png b/static/classify/sy_icon_tw.png new file mode 100644 index 0000000..b36813d Binary files /dev/null and b/static/classify/sy_icon_tw.png differ diff --git a/static/classify/sy_icon_yp.png b/static/classify/sy_icon_yp.png new file mode 100644 index 0000000..7ed9d2a Binary files /dev/null and b/static/classify/sy_icon_yp.png differ diff --git a/static/detail/cj_bg.png b/static/detail/cj_bg.png new file mode 100644 index 0000000..c5ba857 Binary files /dev/null and b/static/detail/cj_bg.png differ diff --git a/static/detail/xiangqing_icon_shoucang.png b/static/detail/xiangqing_icon_shoucang.png new file mode 100644 index 0000000..09508db Binary files /dev/null and b/static/detail/xiangqing_icon_shoucang.png differ diff --git a/static/detail/xp_icon_ysc.png b/static/detail/xp_icon_ysc.png new file mode 100644 index 0000000..5f09e18 Binary files /dev/null and b/static/detail/xp_icon_ysc.png differ diff --git a/static/detail/zhanwei_xppx.png b/static/detail/zhanwei_xppx.png new file mode 100644 index 0000000..2b2ef7e Binary files /dev/null and b/static/detail/zhanwei_xppx.png differ diff --git a/static/my/avatar.png b/static/my/avatar.png new file mode 100644 index 0000000..c961de7 Binary files /dev/null and b/static/my/avatar.png differ diff --git a/static/my/wo_icon_bd.png b/static/my/wo_icon_bd.png new file mode 100644 index 0000000..51a449c Binary files /dev/null and b/static/my/wo_icon_bd.png differ diff --git a/static/my/wo_icon_bj1.png b/static/my/wo_icon_bj1.png new file mode 100644 index 0000000..e288518 Binary files /dev/null and b/static/my/wo_icon_bj1.png differ diff --git a/static/my/wo_icon_hyzx.png b/static/my/wo_icon_hyzx.png new file mode 100644 index 0000000..9bf8914 Binary files /dev/null and b/static/my/wo_icon_hyzx.png differ diff --git a/static/my/wo_icon_hyzxbj.png b/static/my/wo_icon_hyzxbj.png new file mode 100644 index 0000000..17825ec Binary files /dev/null and b/static/my/wo_icon_hyzxbj.png differ diff --git a/static/my/wo_icon_lljl.png b/static/my/wo_icon_lljl.png new file mode 100644 index 0000000..124d9a0 Binary files /dev/null and b/static/my/wo_icon_lljl.png differ diff --git a/static/my/wo_icon_lxkf.png b/static/my/wo_icon_lxkf.png new file mode 100644 index 0000000..87cf133 Binary files /dev/null and b/static/my/wo_icon_lxkf.png differ diff --git a/static/my/wo_icon_pthy.png b/static/my/wo_icon_pthy.png new file mode 100644 index 0000000..623fe0d Binary files /dev/null and b/static/my/wo_icon_pthy.png differ diff --git a/static/my/wo_icon_sc.png b/static/my/wo_icon_sc.png new file mode 100644 index 0000000..45db566 Binary files /dev/null and b/static/my/wo_icon_sc.png differ diff --git a/static/my/wo_icon_vip.png b/static/my/wo_icon_vip.png new file mode 100644 index 0000000..4bb24bf Binary files /dev/null and b/static/my/wo_icon_vip.png differ diff --git a/static/products/sy_bb(1).png b/static/products/sy_bb(1).png new file mode 100644 index 0000000..4470d25 Binary files /dev/null and b/static/products/sy_bb(1).png differ diff --git a/static/products/sy_bb.png b/static/products/sy_bb.png new file mode 100644 index 0000000..2e2732f Binary files /dev/null and b/static/products/sy_bb.png differ diff --git a/static/products/sy_bg.png b/static/products/sy_bg.png new file mode 100644 index 0000000..5da1716 Binary files /dev/null and b/static/products/sy_bg.png differ diff --git a/static/products/sy_icon_sjf.png b/static/products/sy_icon_sjf.png new file mode 100644 index 0000000..1ccc04f Binary files /dev/null and b/static/products/sy_icon_sjf.png differ diff --git a/static/products/zhanwei_dg(1).png b/static/products/zhanwei_dg(1).png new file mode 100644 index 0000000..3d09e13 Binary files /dev/null and b/static/products/zhanwei_dg(1).png differ diff --git a/static/products/zhanwei_dg(2).png b/static/products/zhanwei_dg(2).png new file mode 100644 index 0000000..b2bed95 Binary files /dev/null and b/static/products/zhanwei_dg(2).png differ diff --git a/static/products/zhanwei_dg(3).png b/static/products/zhanwei_dg(3).png new file mode 100644 index 0000000..8fc39c3 Binary files /dev/null and b/static/products/zhanwei_dg(3).png differ diff --git a/static/products/zhanwei_dg.png b/static/products/zhanwei_dg.png new file mode 100644 index 0000000..6f08046 Binary files /dev/null and b/static/products/zhanwei_dg.png differ diff --git a/static/report/hy_icon_cj.png b/static/report/hy_icon_cj.png new file mode 100644 index 0000000..e5ac364 Binary files /dev/null and b/static/report/hy_icon_cj.png differ diff --git a/static/report/hy_icon_cjx.png b/static/report/hy_icon_cjx.png new file mode 100644 index 0000000..665f129 Binary files /dev/null and b/static/report/hy_icon_cjx.png differ diff --git a/static/report/hy_icon_fu.png b/static/report/hy_icon_fu.png new file mode 100644 index 0000000..034f4d4 Binary files /dev/null and b/static/report/hy_icon_fu.png differ diff --git a/static/report/hy_icon_fux.png b/static/report/hy_icon_fux.png new file mode 100644 index 0000000..59b20c3 Binary files /dev/null and b/static/report/hy_icon_fux.png differ diff --git a/static/report/hy_icon_xw.png b/static/report/hy_icon_xw.png new file mode 100644 index 0000000..73b7e03 Binary files /dev/null and b/static/report/hy_icon_xw.png differ diff --git a/static/report/hy_icon_xwx.png b/static/report/hy_icon_xwx.png new file mode 100644 index 0000000..f40164f Binary files /dev/null and b/static/report/hy_icon_xwx.png differ diff --git a/static/report/zhanwei_xf(1).png b/static/report/zhanwei_xf(1).png new file mode 100644 index 0000000..2a89e03 Binary files /dev/null and b/static/report/zhanwei_xf(1).png differ diff --git a/static/report/zhanwei_xf(2).png b/static/report/zhanwei_xf(2).png new file mode 100644 index 0000000..481845d Binary files /dev/null and b/static/report/zhanwei_xf(2).png differ diff --git a/static/report/zhanwei_xf.png b/static/report/zhanwei_xf.png new file mode 100644 index 0000000..f694e12 Binary files /dev/null and b/static/report/zhanwei_xf.png differ diff --git a/static/report/zhanwei_zh.png b/static/report/zhanwei_zh.png new file mode 100644 index 0000000..d12609c Binary files /dev/null and b/static/report/zhanwei_zh.png differ diff --git a/static/styles/form.scss b/static/styles/form.scss new file mode 100644 index 0000000..04de5ce --- /dev/null +++ b/static/styles/form.scss @@ -0,0 +1,22 @@ +.u-form { + margin-top: 20rpx; + } + + .u-form-item__body__left { + width: auto !important; + color: #3E3E3E; + margin-left: 20rpx; + margin-right: 50rpx; + } + + .u-form-item__body { + padding: 24rpx 0 !important; + } + + .u-form-item__body__left__content__label { + font-size: 24rpx !important; + } + + .u-form-item { + background-color: #fff; + } diff --git a/static/styles/myAvatar.scss b/static/styles/myAvatar.scss new file mode 100644 index 0000000..a5fd1c0 --- /dev/null +++ b/static/styles/myAvatar.scss @@ -0,0 +1,35 @@ +.u-status-bar { + background-color: transparent !important; + } + + .u-navbar__content { + background-color: transparent !important; + } + + .u-navbar__content__title { + color: #fff !important; + } + + .uicon-arrow-left { + // display: none !important; + color: #fff !important; + } + + .my_avatar { + position: absolute; + right: 325rpx; + top: 148rpx; + display: flex; + flex-direction: column; + align-items: center; + + + text { + font-size: 26rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #FFFFFF; + line-height: 37rpx; + + } + } \ No newline at end of file diff --git a/static/styles/news.scss b/static/styles/news.scss new file mode 100644 index 0000000..960be63 --- /dev/null +++ b/static/styles/news.scss @@ -0,0 +1,48 @@ + .xw_content { + background: #FFFFFF; + border: 1rpx solid #EEEEEE; + display: flex; + padding: 29rpx 19rpx; + + .xw_right { + padding-left: 19rpx; + display: flex; + flex-direction: column; + + .xw_title { + font-size: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: bold; + color: #3E3E3E; + line-height: 42rpx; + -webkit-line-clamp: 2; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } + + .xw_time { + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #969696; + line-height: 33rpx; + + } + + .xw_place { + padding-left: 20rpx; + } + + .cj_tags { + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #969696; + line-height: 33rpx; + padding-right: 10rpx; + margin-top: 35rpx; + } + } + } \ No newline at end of file diff --git a/static/styles/products.scss b/static/styles/products.scss new file mode 100644 index 0000000..a2a7c32 --- /dev/null +++ b/static/styles/products.scss @@ -0,0 +1,97 @@ +.products_box { + padding: 10rpx; + + .u-grid-item { + position: relative; + + .bgContent { + position: absolute; + right: 0; + top: 0; + + .u-image__image { + margin-left: 6px; + } + + .img_tag { + position: absolute; + padding: 2rpx 8rpx; + right: 5px; + top: 30rpx; + border-radius: 54rpx 0px 0px 54rpx; + box-shadow: 0px 2rpx 4rpx 0px #078C42; + background: linear-gradient(135deg, #0DB658 0%, #16DD6D 100%); + font-size: 20rpx; + color: #FFFFFF; + line-height: 28rpx; + } + + + .title_box { + position: relative; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + + .title { + width: 186rpx; + font-size: 26rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: bold; + color: #0EBB5B; + line-height: 37rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + .u-tag { + height: 26rpx; + line-height: 26rpx; + background: linear-gradient(124deg, #FEAA19 0%, #FDCF3A 100%); + + .u-tag__text { + font-size: 20rpx; + } + + } + } + + .product_desc { + font-size: 22rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #3E3E3E; + line-height: 26rpx; + margin-top: 24rpx; + margin-bottom: 20rpx; + -webkit-line-clamp: 2; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } + + .releaseDate { + font-size: 22rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A3A3A3; + line-height: 26rpx; + display: flex; + align-items: center; + padding-bottom: 25rpx; + + image { + margin-left: 0; + } + + .release { + padding: 0 10rpx 0 5rpx; + } + } + } + + } +} diff --git a/static/tabBar/sy_icon_cp.png b/static/tabBar/sy_icon_cp.png deleted file mode 100644 index 7d03891..0000000 Binary files a/static/tabBar/sy_icon_cp.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cp@2x.png b/static/tabBar/sy_icon_cp@2x.png deleted file mode 100644 index 58a2e16..0000000 Binary files a/static/tabBar/sy_icon_cp@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cph.png b/static/tabBar/sy_icon_cph.png deleted file mode 100644 index 0630473..0000000 Binary files a/static/tabBar/sy_icon_cph.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cph@2x.png b/static/tabBar/sy_icon_cph@2x.png deleted file mode 100644 index f8d69dc..0000000 Binary files a/static/tabBar/sy_icon_cph@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cy@2x.png b/static/tabBar/sy_icon_cy@2x.png deleted file mode 100644 index 2234b62..0000000 Binary files a/static/tabBar/sy_icon_cy@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cyh@2x.png b/static/tabBar/sy_icon_cyh@2x.png deleted file mode 100644 index a27a843..0000000 Binary files a/static/tabBar/sy_icon_cyh@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_hyh@2x.png b/static/tabBar/sy_icon_hyh@2x.png deleted file mode 100644 index 90f2be3..0000000 Binary files a/static/tabBar/sy_icon_hyh@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_sy@2x(1).png b/static/tabBar/sy_icon_sy@2x(1).png deleted file mode 100644 index ecc038c..0000000 Binary files a/static/tabBar/sy_icon_sy@2x(1).png and /dev/null differ diff --git a/static/tabBar/sy_icon_sy@2x.png b/static/tabBar/sy_icon_sy@2x.png deleted file mode 100644 index c982d1c..0000000 Binary files a/static/tabBar/sy_icon_sy@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_syh@2x.png b/static/tabBar/sy_icon_syh@2x.png deleted file mode 100644 index 7d9e4e7..0000000 Binary files a/static/tabBar/sy_icon_syh@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_wd@2x.png b/static/tabBar/sy_icon_wd@2x.png deleted file mode 100644 index 8d6ce58..0000000 Binary files a/static/tabBar/sy_icon_wd@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_wdh@2x.png b/static/tabBar/sy_icon_wdh@2x.png deleted file mode 100644 index 7b62bf3..0000000 Binary files a/static/tabBar/sy_icon_wdh@2x.png and /dev/null differ diff --git a/uni.scss b/uni.scss index 4bbd5fd..273cdc3 100644 --- a/uni.scss +++ b/uni.scss @@ -12,7 +12,10 @@ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件 */ @import 'uview-ui/theme.scss'; - +@import 'static/styles/products.scss'; +@import 'static/styles/news.scss'; +@import 'static/styles/myAvatar.scss'; +@import 'static/styles/form.scss'; /* 颜色变量 */