diff --git a/litemall-wx_uni/.hbuilderx/launch.json b/litemall-wx_uni/.hbuilderx/launch.json new file mode 100644 index 0000000000000000000000000000000000000000..32f4dc599fab99484f6d736d7e48460af54b1ac8 --- /dev/null +++ b/litemall-wx_uni/.hbuilderx/launch.json @@ -0,0 +1,20 @@ +{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 + "version": "0.0", + "configurations": [{ + "default" : + { + "launchtype" : "local" + }, + "h5" : + { + "launchtype" : "local" + }, + "mp-weixin" : + { + "launchtype" : "local" + }, + "type" : "uniCloud" + } + ] +} diff --git a/litemall-wx_uni/App.vue b/litemall-wx_uni/App.vue new file mode 100644 index 0000000000000000000000000000000000000000..1b42a661f380fc6f89394f47462231277bbe2697 --- /dev/null +++ b/litemall-wx_uni/App.vue @@ -0,0 +1,57 @@ + + diff --git a/litemall-wx_uni/app.css b/litemall-wx_uni/app.css new file mode 100644 index 0000000000000000000000000000000000000000..b634376332d896ef8f81808d85a9908e728cee91 --- /dev/null +++ b/litemall-wx_uni/app.css @@ -0,0 +1,23 @@ +/**app.wxss**/ + +.container { + box-sizing: border-box; + background-color: #f4f4f4; + font-family: PingFangSC-Light, helvetica, 'Heiti SC'; +} + +view, +image, +text, +navigator { + box-sizing: border-box; + padding: 0; + margin: 0; +} + +view, +text { + font-family: PingFangSC-Light, helvetica, 'Heiti SC'; + font-size: 29rpx; + color: #333; +} diff --git a/litemall-wx_uni/config/api.js b/litemall-wx_uni/config/api.js new file mode 100644 index 0000000000000000000000000000000000000000..bb3984db4514ce3d60400d302ed338ce6834d71d --- /dev/null +++ b/litemall-wx_uni/config/api.js @@ -0,0 +1,154 @@ +// 以下是业务服务器API地址 +// 本机开发时使用 +var WxApiRoot = 'http://127.0.0.1/wx/'; // 局域网测试使用 +// var WxApiRoot = 'http://192.168.1.3:8080/wx/'; +// 云平台部署时使用 +// var WxApiRoot = 'http://122.51.199.160:8080/wx/'; +// 云平台上线时使用 +// var WxApiRoot = 'https://www.menethil.com.cn/wx/'; + +module.exports = { + IndexUrl: WxApiRoot + 'home/index', + //首页数据接口 + AboutUrl: WxApiRoot + 'home/about', + //介绍信息 + CatalogList: WxApiRoot + 'catalog/index', + //分类目录全部分类数据接口 + CatalogCurrent: WxApiRoot + 'catalog/current', + //分类目录当前分类数据接口 + AuthLoginByWeixin: WxApiRoot + 'auth/login_by_weixin', + //微信登录 + AuthLoginByAccount: WxApiRoot + 'auth/login', + //账号登录 + AuthLogout: WxApiRoot + 'auth/logout', + //账号登出 + AuthRegister: WxApiRoot + 'auth/register', + //账号注册 + AuthReset: WxApiRoot + 'auth/reset', + //账号密码重置 + AuthRegisterCaptcha: WxApiRoot + 'auth/regCaptcha', + //验证码 + AuthBindPhone: WxApiRoot + 'auth/bindPhone', + //绑定微信手机号 + GoodsCount: WxApiRoot + 'goods/count', + //统计商品总数 + GoodsList: WxApiRoot + 'goods/list', + //获得商品列表 + GoodsCategory: WxApiRoot + 'goods/category', + //获得分类数据 + GoodsDetail: WxApiRoot + 'goods/detail', + //获得商品的详情 + GoodsRelated: WxApiRoot + 'goods/related', + //商品详情页的关联商品（大家都在看） + BrandList: WxApiRoot + 'brand/list', + //品牌列表 + BrandDetail: WxApiRoot + 'brand/detail', + //品牌详情 + CartList: WxApiRoot + 'cart/index', + //获取购物车的数据 + CartAdd: WxApiRoot + 'cart/add', + // 添加商品到购物车 + CartFastAdd: WxApiRoot + 'cart/fastadd', + // 立即购买商品 + CartUpdate: WxApiRoot + 'cart/update', + // 更新购物车的商品 + CartDelete: WxApiRoot + 'cart/delete', + // 删除购物车的商品 + CartChecked: WxApiRoot + 'cart/checked', + // 选择或取消选择商品 + CartGoodsCount: WxApiRoot + 'cart/goodscount', + // 获取购物车商品件数 + CartCheckout: WxApiRoot + 'cart/checkout', + // 下单前信息确认 + CollectList: WxApiRoot + 'collect/list', + //收藏列表 + CollectAddOrDelete: WxApiRoot + 'collect/addordelete', + //添加或取消收藏 + CommentList: WxApiRoot + 'comment/list', + //评论列表 + CommentCount: WxApiRoot + 'comment/count', + //评论总数 + CommentPost: WxApiRoot + 'comment/post', + //发表评论 + TopicList: WxApiRoot + 'topic/list', + //专题列表 + TopicDetail: WxApiRoot + 'topic/detail', + //专题详情 + TopicRelated: WxApiRoot + 'topic/related', + //相关专题 + SearchIndex: WxApiRoot + 'search/index', + //搜索关键字 + SearchResult: WxApiRoot + 'search/result', + //搜索结果 + SearchHelper: WxApiRoot + 'search/helper', + //搜索帮助 + SearchClearHistory: WxApiRoot + 'search/clearhistory', + //搜索历史清楚 + AddressList: WxApiRoot + 'address/list', + //收货地址列表 + AddressDetail: WxApiRoot + 'address/detail', + //收货地址详情 + AddressSave: WxApiRoot + 'address/save', + //保存收货地址 + AddressDelete: WxApiRoot + 'address/delete', + //保存收货地址 + ExpressQuery: WxApiRoot + 'express/query', + //物流查询 + RegionList: WxApiRoot + 'region/list', + //获取区域列表 + OrderSubmit: WxApiRoot + 'order/submit', + // 提交订单 + OrderPrepay: WxApiRoot + 'order/prepay', + // 订单的预支付会话 + OrderList: WxApiRoot + 'order/list', + //订单列表 + OrderDetail: WxApiRoot + 'order/detail', + //订单详情 + OrderCancel: WxApiRoot + 'order/cancel', + //取消订单 + OrderRefund: WxApiRoot + 'order/refund', + //退款取消订单 + OrderDelete: WxApiRoot + 'order/delete', + //删除订单 + OrderConfirm: WxApiRoot + 'order/confirm', + //确认收货 + OrderGoods: WxApiRoot + 'order/goods', + // 代评价商品信息 + OrderComment: WxApiRoot + 'order/comment', + // 评价订单商品信息 + AftersaleSubmit: WxApiRoot + 'aftersale/submit', + // 提交售后申请 + AftersaleList: WxApiRoot + 'aftersale/list', + // 售后列表 + AftersaleDetail: WxApiRoot + 'aftersale/detail', + // 售后详情 + FeedbackAdd: WxApiRoot + 'feedback/submit', + //添加反馈 + FootprintList: WxApiRoot + 'footprint/list', + //足迹列表 + FootprintDelete: WxApiRoot + 'footprint/delete', + //删除足迹 + GroupOnList: WxApiRoot + 'groupon/list', + //团购列表 + GroupOnMy: WxApiRoot + 'groupon/my', + //团购API-我的团购 + GroupOnDetail: WxApiRoot + 'groupon/detail', + //团购API-详情 + GroupOnJoin: WxApiRoot + 'groupon/join', + //团购API-详情 + CouponList: WxApiRoot + 'coupon/list', + //优惠券列表 + CouponMyList: WxApiRoot + 'coupon/mylist', + //我的优惠券列表 + CouponSelectList: WxApiRoot + 'coupon/selectlist', + //当前订单可用优惠券列表 + CouponReceive: WxApiRoot + 'coupon/receive', + //优惠券领取 + CouponExchange: WxApiRoot + 'coupon/exchange', + //优惠券兑换 + StorageUpload: WxApiRoot + 'storage/upload', + //图片上传, + UserIndex: WxApiRoot + 'user/index', + //个人页面用户相关信息 + IssueList: WxApiRoot + 'issue/list' //帮助信息 +}; diff --git a/litemall-wx_uni/lib/wxParse/html2json.js b/litemall-wx_uni/lib/wxParse/html2json.js new file mode 100644 index 0000000000000000000000000000000000000000..2370bcb474819e7a1d47a955b2191573c3d3f644 --- /dev/null +++ b/litemall-wx_uni/lib/wxParse/html2json.js @@ -0,0 +1,261 @@ +/** + * 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 + */ +var __placeImgeUrlHttps = 'https'; +var __emojisReg = ''; +var __emojisBaseSrc = ''; +var __emojis = {}; + +var wxDiscode = require('./wxDiscode.js'); + +var HTMLParser = require('./htmlparser.js'); // Empty Elements - HTML 5 + +var empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'); // Block Elements - HTML 5 + +var block = makeMap( + 'br,a,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 + +var inline = makeMap( + '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) + +var closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled" + +var fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); // Special Elements (can contain anything) + +var special = makeMap('wxxxcode-style,script,style,view,scroll-view,block'); + +function makeMap(str) { + var obj = {}; + var items = str.split(','); + for (var i = 0; i < items.length; i++) { + obj[items[i]] = true; + } + + return obj; +} + +function q(v) { + return '"' + v + '"'; +} + +function removeDOCTYPE(html) { + return html + .replace(/<\?xml.*\?>\n/, '') + .replace(/\n/, '') + .replace(/\n/, ''); +} + +function html2json(html, bindName) { + //处理字符串 + html = removeDOCTYPE(html); + html = wxDiscode.strDiscode(html); //生成node节点 + + var bufArray = []; + var results = { + node: bindName, + nodes: [], + images: [], + imageUrls: [] + }; + HTMLParser(html, { + start: function (tag, attrs, unary) { + //debug(tag, attrs, unary); + // node for this element + var node = { + node: 'element', + tag: tag + }; + + if (block[tag]) { + node.tagType = 'block'; + } else { + if (inline[tag]) { + node.tagType = 'inline'; + } else { + if (closeSelf[tag]) { + node.tagType = 'closeSelf'; + } + } + } + + if (attrs.length !== 0) { + node.attr = attrs.reduce(function (pre, attr) { + var name = attr.name; + var value = attr.value; + + if (name == 'class') { + // console.dir(value); + // value = value.join("") + node.classStr = value; + } // has multi attibutes + // make it array of attribute + + if (name == 'style') { + // console.dir(value); + // value = value.join("") + 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; + }, {}); + } //对img添加额外数据 + + if (node.tag === 'img') { + node.imgIndex = results.images.length; + var imgUrl = node.attr.src; + imgUrl = wxDiscode.urlToHttpUrl(imgUrl, __placeImgeUrlHttps); + node.attr.src = imgUrl; + node.from = bindName; + results.images.push(node); + results.imageUrls.push(imgUrl); + } + + if (unary) { + // if this tag dosen't have end tag + // like + // add to parents + var parent = bufArray[0] || results; + + if (parent.nodes === undefined) { + parent.nodes = []; + } + + parent.nodes.push(node); + } else { + bufArray.unshift(node); + } + }, + end: function (tag) { + //debug(tag); + // merge into parent tag + var node = bufArray.shift(); + + if (node.tag !== tag) { + console.error('invalid state: mismatch end tag'); + } + + if (bufArray.length === 0) { + results.nodes.push(node); + } else { + var parent = bufArray[0]; + + if (parent.nodes === undefined) { + parent.nodes = []; + } + + parent.nodes.push(node); + } + }, + chars: function (text) { + //debug(text); + var node = { + node: 'text', + text: text, + textArray: transEmojiStr(text) + }; + + if (bufArray.length === 0) { + results.nodes.push(node); + } else { + var parent = bufArray[0]; + + if (parent.nodes === undefined) { + parent.nodes = []; + } + + parent.nodes.push(node); + } + }, + comment: function (text) { + //debug(text); + var node = { + node: 'comment', + text: text + }; + var parent = bufArray[0]; + + if (parent.nodes === undefined) { + parent.nodes = []; + } + + parent.nodes.push(node); + } + }); + return results; +} + +function transEmojiStr(str) { + // var eReg = new RegExp("["+__reg+' '+"]"); + // str = str.replace(/\[([^\[\]]+)\]/g,':$1:') + var emojiObjs = []; //如果正则表达式为空 + + if (__emojisReg.length == 0 || !__emojis) { + var emojiObj = {}; + emojiObj.node = 'text'; + emojiObj.text = str; + array = [emojiObj]; + return array; + } //这个地方需要调整 + + str = str.replace(/\[([^\[\]]+)\]/g, ':$1:'); + var eReg = new RegExp('[:]'); + var array = str.split(eReg); + + for (var i = 0; i < array.length; i++) { + var ele = array[i]; + var emojiObj = {}; + + if (__emojis[ele]) { + emojiObj.node = 'element'; + emojiObj.tag = 'emoji'; + emojiObj.text = __emojis[ele]; + emojiObj.baseSrc = __emojisBaseSrc; + } else { + emojiObj.node = 'text'; + emojiObj.text = ele; + } + + emojiObjs.push(emojiObj); + } + + return emojiObjs; +} + +function emojisInit(reg = '', baseSrc = '/wxParse/emojis/', emojis) { + __emojisReg = reg; + __emojisBaseSrc = baseSrc; + __emojis = emojis; +} + +module.exports = { + html2json: html2json, + emojisInit: emojisInit +}; diff --git a/litemall-wx_uni/lib/wxParse/htmlparser.js b/litemall-wx_uni/lib/wxParse/htmlparser.js new file mode 100644 index 0000000000000000000000000000000000000000..abb8939a080948d60e829effc97533b39e6c0327 --- /dev/null +++ b/litemall-wx_uni/lib/wxParse/htmlparser.js @@ -0,0 +1,188 @@ +var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/; +var endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/; +var attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g; // Empty Elements - HTML 5 + +/** + * 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 +var empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'); // Block Elements - HTML 5 + +var block = makeMap( + 'a,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 + +var inline = makeMap( + '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) + +var closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled" + +var fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); // Special Elements (can contain anything) + +var special = makeMap('wxxxcode-style,script,style,view,scroll-view,block'); + +function HTMLParser(html, handler) { + var index; + var chars; + var match; + var stack = []; + var last = html; + stack.last = function () { + return this[this.length - 1]; + }; + + while (html) { + chars = true; // Make sure we're not in a script or style element + + if (!stack.last() || !special[stack.last()]) { + // Comment + if (html.indexOf(''); + + if (index >= 0) { + if (handler.comment) { + handler.comment(html.substring(4, index)); + } + + html = html.substring(index + 3); + chars = false; + } // end tag + } else { + if (html.indexOf(']*>'), function (all, text) { + text = text.replace(/|/g, '$1$2'); + + if (handler.chars) { + handler.chars(text); + } + + return ''; + }); + parseEndTag('', stack.last()); + } + + if (html == last) { + throw 'Parse Error: ' + html; + } + + last = html; + } // Clean up any remaining tags + + parseEndTag(); + + 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) { + var attrs = []; + rest.replace(attr, function (match, name) { + var value = arguments[2] ? arguments[2] : arguments[3] ? arguments[3] : arguments[4] ? arguments[4] : fillAttrs[name] ? name : ''; + attrs.push({ + name: name, + value: value, + escaped: value.replace(/(^|[^\\])"/g, '$1\\"') //" + }); + }); + + if (handler.start) { + handler.start(tagName, attrs, unary); + } + } + } + + function parseEndTag(tag, tagName) { + // If no tag name is provided, clean shop + if (!tagName) { + var pos = 0; // Find the closest opened tag of the same type + } else { + for (var pos = stack.length - 1; pos >= 0; pos--) { + if (stack[pos] == tagName) { + break; + } + } + } + + if (pos >= 0) { + // Close all the open elements, up the stack + for (var i = stack.length - 1; i >= pos; i--) { + if (handler.end) { + handler.end(stack[i]); + } + } // Remove the open elements from the stack + + stack.length = pos; + } + } +} + +function makeMap(str) { + var obj = {}; + var items = str.split(','); + for (var i = 0; i < items.length; i++) { + obj[items[i]] = true; + } + + return obj; +} + +module.exports = HTMLParser; diff --git a/litemall-wx_uni/lib/wxParse/showdown.js b/litemall-wx_uni/lib/wxParse/showdown.js new file mode 100644 index 0000000000000000000000000000000000000000..980d39c986350b66dc31eee8d1a2036756db7eb9 --- /dev/null +++ b/litemall-wx_uni/lib/wxParse/showdown.js @@ -0,0 +1,2546 @@ +/** + * 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 + */ +function getDefaultOpts(simple) { + 'use strict'; + + var defaultOptions = { + omitExtraWLInCodeBlocks: { + defaultValue: false, + describe: 'Omit the default extra whiteline added to code blocks', + type: 'boolean' + }, + noHeaderId: { + defaultValue: false, + describe: 'Turn on/off generated header id', + type: 'boolean' + }, + prefixHeaderId: { + defaultValue: false, + describe: 'Specify a prefix to generated header ids', + type: 'string' + }, + headerLevelStart: { + defaultValue: false, + describe: 'The header blocks level start', + type: 'integer' + }, + parseImgDimensions: { + defaultValue: false, + describe: 'Turn on/off image dimension parsing', + type: 'boolean' + }, + simplifiedAutoLink: { + defaultValue: false, + describe: 'Turn on/off GFM autolink style', + type: 'boolean' + }, + literalMidWordUnderscores: { + defaultValue: false, + describe: 'Parse midword underscores as literal underscores', + type: 'boolean' + }, + strikethrough: { + defaultValue: false, + describe: 'Turn on/off strikethrough support', + type: 'boolean' + }, + tables: { + defaultValue: false, + describe: 'Turn on/off tables support', + type: 'boolean' + }, + tablesHeaderId: { + defaultValue: false, + describe: 'Add an id to table headers', + type: 'boolean' + }, + ghCodeBlocks: { + defaultValue: true, + describe: 'Turn on/off GFM fenced code blocks support', + type: 'boolean' + }, + tasklists: { + defaultValue: false, + describe: 'Turn on/off GFM tasklist support', + type: 'boolean' + }, + smoothLivePreview: { + defaultValue: false, + describe: 'Prevents weird effects in live previews due to incomplete input', + type: 'boolean' + }, + smartIndentationFix: { + defaultValue: false, + description: 'Tries to smartly fix identation in es6 strings', + type: 'boolean' + } + }; + + if (simple === false) { + return JSON.parse(JSON.stringify(defaultOptions)); + } + + var ret = {}; + + for (var opt in defaultOptions) { + if (defaultOptions.hasOwnProperty(opt)) { + ret[opt] = defaultOptions[opt].defaultValue; + } + } + + return ret; +} +/** + * Created by Tivie on 06-01-2015. + */ +// Private properties + +var showdown = {}; +var parsers = {}; +var extensions = {}; +var globalOptions = getDefaultOpts(true); +var flavor = { + github: { + omitExtraWLInCodeBlocks: true, + prefixHeaderId: 'user-content-', + simplifiedAutoLink: true, + literalMidWordUnderscores: true, + strikethrough: true, + tables: true, + tablesHeaderId: true, + ghCodeBlocks: true, + tasklists: true + }, + vanilla: getDefaultOpts(true) +}; +/** + * helper namespace + * @type {{}} + */ + +showdown.helper = {}; +/** + * TODO LEGACY SUPPORT CODE + * @type {{}} + */ + +showdown.extensions = {}; +/** + * Set a global option + * @static + * @param {string} key + * @param {*} value + * @returns {showdown} + */ + +showdown.setOption = function (key, value) { + 'use strict'; + + globalOptions[key] = value; + return this; +}; +/** + * Get a global option + * @static + * @param {string} key + * @returns {*} + */ + +showdown.getOption = function (key) { + 'use strict'; + + return globalOptions[key]; +}; +/** + * Get the global options + * @static + * @returns {{}} + */ + +showdown.getOptions = function () { + 'use strict'; + + return globalOptions; +}; +/** + * Reset global options to the default values + * @static + */ + +showdown.resetOptions = function () { + 'use strict'; + + globalOptions = getDefaultOpts(true); +}; +/** + * Set the flavor showdown should use as default + * @param {string} name + */ + +showdown.setFlavor = function (name) { + 'use strict'; + + if (flavor.hasOwnProperty(name)) { + var preset = flavor[name]; + + for (var option in preset) { + if (preset.hasOwnProperty(option)) { + globalOptions[option] = preset[option]; + } + } + } +}; +/** + * Get the default options + * @static + * @param {boolean} [simple=true] + * @returns {{}} + */ + +showdown.getDefaultOptions = function (simple) { + 'use strict'; + + return getDefaultOpts(simple); +}; +/** + * Get or set a subParser + * + * subParser(name) - Get a registered subParser + * subParser(name, func) - Register a subParser + * @static + * @param {string} name + * @param {function} [func] + * @returns {*} + */ + +showdown.subParser = function (name, func) { + 'use strict'; + + if (showdown.helper.isString(name)) { + if (typeof func !== 'undefined') { + parsers[name] = func; + } else { + if (parsers.hasOwnProperty(name)) { + return parsers[name]; + } else { + throw Error('SubParser named ' + name + ' not registered!'); + } + } + } +}; +/** + * Gets or registers an extension + * @static + * @param {string} name + * @param {object|function=} ext + * @returns {*} + */ + +showdown.extension = function (name, ext) { + 'use strict'; + + if (!showdown.helper.isString(name)) { + throw Error("Extension 'name' must be a string"); + } + + name = showdown.helper.stdExtName(name); // Getter + + if (showdown.helper.isUndefined(ext)) { + if (!extensions.hasOwnProperty(name)) { + throw Error('Extension named ' + name + ' is not registered!'); + } + + return extensions[name]; // Setter + } else { + // Expand extension if it's wrapped in a function + if (typeof ext === 'function') { + ext = ext(); + } // Ensure extension is an array + + if (!showdown.helper.isArray(ext)) { + ext = [ext]; + } + + var validExtension = validate(ext, name); + + if (validExtension.valid) { + extensions[name] = ext; + } else { + throw Error(validExtension.error); + } + } +}; +/** + * Gets all extensions registered + * @returns {{}} + */ + +showdown.getAllExtensions = function () { + 'use strict'; + + return extensions; +}; +/** + * Remove an extension + * @param {string} name + */ + +showdown.removeExtension = function (name) { + 'use strict'; + + delete extensions[name]; +}; +/** + * Removes all extensions + */ + +showdown.resetExtensions = function () { + 'use strict'; + + extensions = {}; +}; +/** + * Validate extension + * @param {array} extension + * @param {string} name + * @returns {{valid: boolean, error: string}} + */ + +function validate(extension, name) { + 'use strict'; + + var errMsg = name ? 'Error in ' + name + ' extension->' : 'Error in unnamed extension'; + var ret = { + valid: true, + error: '' + }; + if (!showdown.helper.isArray(extension)) { + extension = [extension]; + } + + for (var i = 0; i < extension.length; ++i) { + var baseMsg = errMsg + ' sub-extension ' + i + ': '; + var ext = extension[i]; + if (typeof ext !== 'object') { + ret.valid = false; + ret.error = baseMsg + 'must be an object, but ' + typeof ext + ' given'; + return ret; + } + + if (!showdown.helper.isString(ext.type)) { + ret.valid = false; + ret.error = baseMsg + 'property "type" must be a string, but ' + typeof ext.type + ' given'; + return ret; + } + + var type = (ext.type = ext.type.toLowerCase()); // normalize extension type + + if (type === 'language') { + type = ext.type = 'lang'; + } + + if (type === 'html') { + type = ext.type = 'output'; + } + + if (type !== 'lang' && type !== 'output' && type !== 'listener') { + ret.valid = false; + ret.error = baseMsg + 'type ' + type + ' is not recognized. Valid values: "lang/language", "output/html" or "listener"'; + return ret; + } + + if (type === 'listener') { + if (showdown.helper.isUndefined(ext.listeners)) { + ret.valid = false; + ret.error = baseMsg + '. Extensions of type "listener" must have a property called "listeners"'; + return ret; + } + } else { + if (showdown.helper.isUndefined(ext.filter) && showdown.helper.isUndefined(ext.regex)) { + ret.valid = false; + ret.error = baseMsg + type + ' extensions must define either a "regex" property or a "filter" method'; + return ret; + } + } + + if (ext.listeners) { + if (typeof ext.listeners !== 'object') { + ret.valid = false; + ret.error = baseMsg + '"listeners" property must be an object but ' + typeof ext.listeners + ' given'; + return ret; + } + + for (var ln in ext.listeners) { + if (ext.listeners.hasOwnProperty(ln)) { + if (typeof ext.listeners[ln] !== 'function') { + ret.valid = false; + ret.error = + baseMsg + + '"listeners" property must be an hash of [event name]: [callback]. listeners.' + + ln + + ' must be a function but ' + + typeof ext.listeners[ln] + + ' given'; + return ret; + } + } + } + } + + if (ext.filter) { + if (typeof ext.filter !== 'function') { + ret.valid = false; + ret.error = baseMsg + '"filter" must be a function, but ' + typeof ext.filter + ' given'; + return ret; + } + } else { + if (ext.regex) { + if (showdown.helper.isString(ext.regex)) { + ext.regex = new RegExp(ext.regex, 'g'); + } + + if (!ext.regex instanceof RegExp) { + ret.valid = false; + ret.error = baseMsg + '"regex" property must either be a string or a RegExp object, but ' + typeof ext.regex + ' given'; + return ret; + } + + if (showdown.helper.isUndefined(ext.replace)) { + ret.valid = false; + ret.error = baseMsg + '"regex" extensions must implement a replace string or function'; + return ret; + } + } + } + } + + return ret; +} +/** + * Validate extension + * @param {object} ext + * @returns {boolean} + */ + +showdown.validateExtension = function (ext) { + 'use strict'; + + var validateExtension = validate(ext, null); + + if (!validateExtension.valid) { + console.warn(validateExtension.error); + return false; + } + + return true; +}; +/** + * showdownjs helper functions + */ + +if (!showdown.hasOwnProperty('helper')) { + showdown.helper = {}; +} +/** + * Check if var is string + * @static + * @param {string} a + * @returns {boolean} + */ + +showdown.helper.isString = function isString(a) { + 'use strict'; + + return typeof a === 'string' || a instanceof String; +}; +/** + * Check if var is a function + * @static + * @param {string} a + * @returns {boolean} + */ + +showdown.helper.isFunction = function isFunction(a) { + 'use strict'; + + var getType = {}; + return a && getType.toString.call(a) === '[object Function]'; +}; +/** + * ForEach helper function + * @static + * @param {*} obj + * @param {function} callback + */ + +showdown.helper.forEach = function forEach(obj, callback) { + 'use strict'; + + if (typeof obj.forEach === 'function') { + obj.forEach(callback); + } else { + for (var i = 0; i < obj.length; i++) { + callback(obj[i], i, obj); + } + } +}; +/** + * isArray helper function + * @static + * @param {*} a + * @returns {boolean} + */ + +showdown.helper.isArray = function isArray(a) { + 'use strict'; + + return a.constructor === Array; +}; +/** + * Check if value is undefined + * @static + * @param {*} value The value to check. + * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`. + */ + +showdown.helper.isUndefined = function isUndefined(value) { + 'use strict'; + + return typeof value === 'undefined'; +}; +/** + * Standardidize extension name + * @static + * @param {string} s extension name + * @returns {string} + */ + +showdown.helper.stdExtName = function (s) { + 'use strict'; + + return s.replace(/[_-]||\s/g, '').toLowerCase(); +}; + +function escapeCharactersCallback(wholeMatch, m1) { + 'use strict'; + + var charCodeToEscape = m1.charCodeAt(0); + return '~E' + charCodeToEscape + 'E'; +} +/** + * Callback used to escape characters when passing through String.replace + * @static + * @param {string} wholeMatch + * @param {string} m1 + * @returns {string} + */ + +showdown.helper.escapeCharactersCallback = escapeCharactersCallback; +/** + * Escape characters in a string + * @static + * @param {string} text + * @param {string} charsToEscape + * @param {boolean} afterBackslash + * @returns {XML|string|void|*} + */ + +showdown.helper.escapeCharacters = function escapeCharacters(text, charsToEscape, afterBackslash) { + 'use strict'; // First we have to escape the escape characters so that + // we can build a character class out of them + + var regexString = '([' + charsToEscape.replace(/([\[\]\\])/g, '\\$1') + '])'; + + if (afterBackslash) { + regexString = '\\\\' + regexString; + } + + var regex = new RegExp(regexString, 'g'); + text = text.replace(regex, escapeCharactersCallback); + return text; +}; + +var rgxFindMatchPos = function (str, left, right, flags) { + 'use strict'; + + var f = flags || ''; + var g = f.indexOf('g') > -1; + var x = new RegExp(left + '|' + right, 'g' + f.replace(/g/g, '')); + var l = new RegExp(left, f.replace(/g/g, '')); + var pos = []; + var t; + var s; + var m; + var start; + var end; + do { + t = 0; + + while ((m = x.exec(str))) { + if (l.test(m[0])) { + if (!t++) { + s = x.lastIndex; + start = s - m[0].length; + } + } else { + if (t) { + if (!--t) { + end = m.index + m[0].length; + var obj = { + left: { + start: start, + end: s + }, + match: { + start: s, + end: m.index + }, + right: { + start: m.index, + end: end + }, + wholeMatch: { + start: start, + end: end + } + }; + pos.push(obj); + + if (!g) { + return pos; + } + } + } + } + } + } while (t && (x.lastIndex = s)); + + return pos; +}; +/** + * matchRecursiveRegExp + * + * (c) 2007 Steven Levithan + * MIT License + * + * Accepts a string to search, a left and right format delimiter + * as regex patterns, and optional regex flags. Returns an array + * of matches, allowing nested instances of left/right delimiters. + * Use the "g" flag to return all matches, otherwise only the + * first is returned. Be careful to ensure that the left and + * right format delimiters produce mutually exclusive matches. + * Backreferences are not supported within the right delimiter + * due to how it is internally combined with the left delimiter. + * When matching strings whose format delimiters are unbalanced + * to the left or right, the output is intentionally as a + * conventional regex library with recursion support would + * produce, e.g. "<" and ">" both produce ["x"] when using + * "<" and ">" as the delimiters (both strings contain a single, + * balanced instance of ""). + * + * examples: + * matchRecursiveRegExp("test", "\\(", "\\)") + * returns: [] + * matchRecursiveRegExp(">>t<>", "<", ">", "g") + * returns: ["t<>", ""] + * matchRecursiveRegExp("
test
", "]*>", "", "gi") + * returns: ["test"] + */ + +showdown.helper.matchRecursiveRegExp = function (str, left, right, flags) { + 'use strict'; + + var matchPos = rgxFindMatchPos(str, left, right, flags); + var results = []; + for (var i = 0; i < matchPos.length; ++i) { + results.push([ + str.slice(matchPos[i].wholeMatch.start, matchPos[i].wholeMatch.end), + str.slice(matchPos[i].match.start, matchPos[i].match.end), + str.slice(matchPos[i].left.start, matchPos[i].left.end), + str.slice(matchPos[i].right.start, matchPos[i].right.end) + ]); + } + + return results; +}; +/** + * + * @param {string} str + * @param {string|function} replacement + * @param {string} left + * @param {string} right + * @param {string} flags + * @returns {string} + */ + +showdown.helper.replaceRecursiveRegExp = function (str, replacement, left, right, flags) { + 'use strict'; + + if (!showdown.helper.isFunction(replacement)) { + var repStr = replacement; + + replacement = function () { + return repStr; + }; + } + + var matchPos = rgxFindMatchPos(str, left, right, flags); + var finalStr = str; + var lng = matchPos.length; + if (lng > 0) { + var bits = []; + + if (matchPos[0].wholeMatch.start !== 0) { + bits.push(str.slice(0, matchPos[0].wholeMatch.start)); + } + + for (var i = 0; i < lng; ++i) { + bits.push( + replacement( + str.slice(matchPos[i].wholeMatch.start, matchPos[i].wholeMatch.end), + str.slice(matchPos[i].match.start, matchPos[i].match.end), + str.slice(matchPos[i].left.start, matchPos[i].left.end), + str.slice(matchPos[i].right.start, matchPos[i].right.end) + ) + ); + + if (i < lng - 1) { + bits.push(str.slice(matchPos[i].wholeMatch.end, matchPos[i + 1].wholeMatch.start)); + } + } + + if (matchPos[lng - 1].wholeMatch.end < str.length) { + bits.push(str.slice(matchPos[lng - 1].wholeMatch.end)); + } + + finalStr = bits.join(''); + } + + return finalStr; +}; +/** + * POLYFILLS + */ + +if (showdown.helper.isUndefined(console)) { + console = { + warn: function (msg) { + 'use strict'; + + alert(msg); + }, + log: function (msg) { + 'use strict'; + + alert(msg); + }, + error: function (msg) { + 'use strict'; + + throw msg; + } + }; +} +/** + * Created by Estevao on 31-05-2015. + */ + +/** + * Showdown Converter class + * @class + * @param {object} [converterOptions] + * @returns {Converter} + */ + +showdown.Converter = function (converterOptions) { + 'use strict'; + + var /** + * Options used by this converter + * @private + * @type {{}} + */ + options = {}; + var /** + * Language extensions used by this converter + * @private + * @type {Array} + */ + langExtensions = []; + var /** + * Output modifiers extensions used by this converter + * @private + * @type {Array} + */ + outputModifiers = []; + var /** + * Event listeners + * @private + * @type {{}} + */ + listeners = {}; + _constructor(); + /** + * Converter constructor + * @private + */ + + function _constructor() { + converterOptions = converterOptions || {}; + + for (var gOpt in globalOptions) { + if (globalOptions.hasOwnProperty(gOpt)) { + options[gOpt] = globalOptions[gOpt]; + } + } // Merge options + + if (typeof converterOptions === 'object') { + for (var opt in converterOptions) { + if (converterOptions.hasOwnProperty(opt)) { + options[opt] = converterOptions[opt]; + } + } + } else { + throw Error('Converter expects the passed parameter to be an object, but ' + typeof converterOptions + ' was passed instead.'); + } + + if (options.extensions) { + showdown.helper.forEach(options.extensions, _parseExtension); + } + } + /** + * Parse extension + * @param {*} ext + * @param {string} [name=''] + * @private + */ + + function _parseExtension(ext, name) { + name = name || null; // If it's a string, the extension was previously loaded + + if (showdown.helper.isString(ext)) { + ext = showdown.helper.stdExtName(ext); + name = ext; // LEGACY_SUPPORT CODE + + if (showdown.extensions[ext]) { + console.warn( + 'DEPRECATION WARNING: ' + + ext + + ' is an old extension that uses a deprecated loading method.' + + 'Please inform the developer that the extension should be updated!' + ); + legacyExtensionLoading(showdown.extensions[ext], ext); + return; // END LEGACY SUPPORT CODE + } else { + if (!showdown.helper.isUndefined(extensions[ext])) { + ext = extensions[ext]; + } else { + throw Error('Extension "' + ext + '" could not be loaded. It was either not found or is not a valid extension.'); + } + } + } + + if (typeof ext === 'function') { + ext = ext(); + } + + if (!showdown.helper.isArray(ext)) { + ext = [ext]; + } + + var validExt = validate(ext, name); + + if (!validExt.valid) { + throw Error(validExt.error); + } + + for (var i = 0; i < ext.length; ++i) { + switch (ext[i].type) { + case 'lang': + langExtensions.push(ext[i]); + break; + + case 'output': + outputModifiers.push(ext[i]); + break; + } + + if (ext[i].hasOwnProperty(listeners)) { + for (var ln in ext[i].listeners) { + if (ext[i].listeners.hasOwnProperty(ln)) { + listen(ln, ext[i].listeners[ln]); + } + } + } + } + } + /** + * LEGACY_SUPPORT + * @param {*} ext + * @param {string} name + */ + + function legacyExtensionLoading(ext, name) { + if (typeof ext === 'function') { + ext = ext(new showdown.Converter()); + } + + if (!showdown.helper.isArray(ext)) { + ext = [ext]; + } + + var valid = validate(ext, name); + + if (!valid.valid) { + throw Error(valid.error); + } + + for (var i = 0; i < ext.length; ++i) { + switch (ext[i].type) { + case 'lang': + langExtensions.push(ext[i]); + break; + + case 'output': + outputModifiers.push(ext[i]); + break; + + default: + // should never reach here + throw Error('Extension loader error: Type unrecognized!!!'); + } + } + } + /** + * Listen to an event + * @param {string} name + * @param {function} callback + */ + + function listen(name, callback) { + if (!showdown.helper.isString(name)) { + throw Error('Invalid argument in converter.listen() method: name must be a string, but ' + typeof name + ' given'); + } + + if (typeof callback !== 'function') { + throw Error('Invalid argument in converter.listen() method: callback must be a function, but ' + typeof callback + ' given'); + } + + if (!listeners.hasOwnProperty(name)) { + listeners[name] = []; + } + + listeners[name].push(callback); + } + + function rTrimInputText(text) { + var rsp = text.match(/^\s*/)[0].length; + var rgx = new RegExp('^\\s{0,' + rsp + '}', 'gm'); + return text.replace(rgx, ''); + } + /** + * Dispatch an event + * @private + * @param {string} evtName Event name + * @param {string} text Text + * @param {{}} options Converter Options + * @param {{}} globals + * @returns {string} + */ + + this._dispatch = function dispatch(evtName, text, options, globals) { + if (listeners.hasOwnProperty(evtName)) { + for (var ei = 0; ei < listeners[evtName].length; ++ei) { + var nText = listeners[evtName][ei](evtName, text, this, options, globals); + + if (nText && typeof nText !== 'undefined') { + text = nText; + } + } + } + + return text; + }; + /** + * Listen to an event + * @param {string} name + * @param {function} callback + * @returns {showdown.Converter} + */ + + this.listen = function (name, callback) { + listen(name, callback); + return this; + }; + /** + * Converts a markdown string into HTML + * @param {string} text + * @returns {*} + */ + + this.makeHtml = function (text) { + //check if text is not falsy + if (!text) { + return text; + } + + var globals = { + gHtmlBlocks: [], + gHtmlMdBlocks: [], + gHtmlSpans: [], + gUrls: {}, + gTitles: {}, + gDimensions: {}, + gListLevel: 0, + hashLinkCounts: {}, + langExtensions: langExtensions, + outputModifiers: outputModifiers, + converter: this, + ghCodeBlocks: [] + }; // attacklab: Replace ~ with ~T + // This lets us use tilde as an escape char to avoid md5 hashes + // The choice of character is arbitrary; anything that isn't + // magic in Markdown will work. + + text = text.replace(/~/g, '~T'); // attacklab: Replace $ with ~D + // RegExp interprets $ as a special character + // when it's in a replacement string + + text = text.replace(/\$/g, '~D'); // Standardize line endings + + text = text.replace(/\r\n/g, '\n'); // DOS to Unix + + text = text.replace(/\r/g, '\n'); // Mac to Unix + + if (options.smartIndentationFix) { + text = rTrimInputText(text); + } // Make sure text begins and ends with a couple of newlines: + //text = '\n\n' + text + '\n\n'; + + text = text; // detab + + text = showdown.subParser('detab')(text, options, globals); // stripBlankLines + + text = showdown.subParser('stripBlankLines')(text, options, globals); //run languageExtensions + + showdown.helper.forEach(langExtensions, function (ext) { + text = showdown.subParser('runExtension')(ext, text, options, globals); + }); // run the sub parsers + + text = showdown.subParser('hashPreCodeTags')(text, options, globals); + text = showdown.subParser('githubCodeBlocks')(text, options, globals); + text = showdown.subParser('hashHTMLBlocks')(text, options, globals); + text = showdown.subParser('hashHTMLSpans')(text, options, globals); + text = showdown.subParser('stripLinkDefinitions')(text, options, globals); + text = showdown.subParser('blockGamut')(text, options, globals); + text = showdown.subParser('unhashHTMLSpans')(text, options, globals); + text = showdown.subParser('unescapeSpecialChars')(text, options, globals); // attacklab: Restore dollar signs + + text = text.replace(/~D/g, '$$'); // attacklab: Restore tildes + + text = text.replace(/~T/g, '~'); // Run output modifiers + + showdown.helper.forEach(outputModifiers, function (ext) { + text = showdown.subParser('runExtension')(ext, text, options, globals); + }); + return text; + }; + /** + * Set an option of this Converter instance + * @param {string} key + * @param {*} value + */ + + this.setOption = function (key, value) { + options[key] = value; + }; + /** + * Get the option of this Converter instance + * @param {string} key + * @returns {*} + */ + + this.getOption = function (key) { + return options[key]; + }; + /** + * Get the options of this Converter instance + * @returns {{}} + */ + + this.getOptions = function () { + return options; + }; + /** + * Add extension to THIS converter + * @param {{}} extension + * @param {string} [name=null] + */ + + this.addExtension = function (extension, name) { + name = name || null; + + _parseExtension(extension, name); + }; + /** + * Use a global registered extension with THIS converter + * @param {string} extensionName Name of the previously registered extension + */ + + this.useExtension = function (extensionName) { + _parseExtension(extensionName); + }; + /** + * Set the flavor THIS converter should use + * @param {string} name + */ + + this.setFlavor = function (name) { + if (flavor.hasOwnProperty(name)) { + var preset = flavor[name]; + + for (var option in preset) { + if (preset.hasOwnProperty(option)) { + options[option] = preset[option]; + } + } + } + }; + /** + * Remove an extension from THIS converter. + * Note: This is a costly operation. It's better to initialize a new converter + * and specify the extensions you wish to use + * @param {Array} extension + */ + + this.removeExtension = function (extension) { + if (!showdown.helper.isArray(extension)) { + extension = [extension]; + } + + for (var a = 0; a < extension.length; ++a) { + var ext = extension[a]; + + for (var i = 0; i < langExtensions.length; ++i) { + if (langExtensions[i] === ext) { + langExtensions[i].splice(i, 1); + } + } + + for (var ii = 0; ii < outputModifiers.length; ++i) { + if (outputModifiers[ii] === ext) { + outputModifiers[ii].splice(i, 1); + } + } + } + }; + /** + * Get all extension of THIS converter + * @returns {{language: Array, output: Array}} + */ + + this.getAllExtensions = function () { + return { + language: langExtensions, + output: outputModifiers + }; + }; +}; +/** + * Turn Markdown link shortcuts into XHTML tags. + */ + +showdown.subParser('anchors', function (text, options, globals) { + 'use strict'; + + text = globals.converter._dispatch('anchors.before', text, options, globals); + + var writeAnchorTag = function (wholeMatch, m1, m2, m3, m4, m5, m6, m7) { + if (showdown.helper.isUndefined(m7)) { + m7 = ''; + } + + wholeMatch = m1; + var linkText = m2; + var linkId = m3.toLowerCase(); + var url = m4; + var title = m7; + if (!url) { + if (!linkId) { + // lower-case and turn embedded newlines into spaces + linkId = linkText.toLowerCase().replace(/ ?\n/g, ' '); + } + + url = '#' + linkId; + + if (!showdown.helper.isUndefined(globals.gUrls[linkId])) { + url = globals.gUrls[linkId]; + + if (!showdown.helper.isUndefined(globals.gTitles[linkId])) { + title = globals.gTitles[linkId]; + } + } else { + if (wholeMatch.search(/\(\s*\)$/m) > -1) { + // Special case for explicit empty url + url = ''; + } else { + return wholeMatch; + } + } + } + + url = showdown.helper.escapeCharacters(url, '*_', false); + var result = ''; + return result; + }; // First, handle reference-style links: [link text] [id] + + /* + text = text.replace(/ + ( // wrap whole match in $1 + \[ + ( + (?: + \[[^\]]*\] // allow brackets nested one level + | + [^\[] // or anything else + )* + ) + \] + [ ]? // one optional space + (?:\n[ ]*)? // one optional newline followed by spaces + \[ + (.*?) // id = $3 + \] + )()()()() // pad remaining backreferences + /g,_DoAnchors_callback); + */ + + text = text.replace(/(\[((?:\[[^\]]*]|[^\[\]])*)][ ]?(?:\n[ ]*)?\[(.*?)])()()()()/g, writeAnchorTag); // + // Next, inline-style links: [link text](url "optional title") + // + + /* + text = text.replace(/ + ( // wrap whole match in $1 + \[ + ( + (?: + \[[^\]]*\] // allow brackets nested one level + | + [^\[\]] // or anything else + ) + ) + \] + \( // literal paren + [ \t]* + () // no id, so leave $3 empty + ? // href = $4 + [ \t]* + ( // $5 + (['"]) // quote char = $6 + (.*?) // Title = $7 + \6 // matching quote + [ \t]* // ignore any spaces/tabs between closing quote and ) + )? // title is optional + \) + ) + /g,writeAnchorTag); + */ + + text = text.replace(/(\[((?:\[[^\]]*]|[^\[\]])*)]\([ \t]*()?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g, writeAnchorTag); // + // Last, handle reference-style shortcuts: [link text] + // These must come last in case you've also got [link test][1] + // or [link test](/foo) + // + + /* + text = text.replace(/ + ( // wrap whole match in $1 + \[ + ([^\[\]]+) // link text = $2; can't contain '[' or ']' + \] + )()()()()() // pad rest of backreferences + /g, writeAnchorTag); + */ + + text = text.replace(/(\[([^\[\]]+)])()()()()()/g, writeAnchorTag); + text = globals.converter._dispatch('anchors.after', text, options, globals); + return text; +}); +showdown.subParser('autoLinks', function (text, options, globals) { + 'use strict'; + + text = globals.converter._dispatch('autoLinks.before', text, options, globals); + var simpleURLRegex = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)(?=\s|$)(?!["<>])/gi; + var delimUrlRegex = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)>/gi; + var simpleMailRegex = /(?:^|[ \n\t])([A-Za-z0-9!#$%&'*+-/=?^_`\{|}~\.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?:$|[ \n\t])/gi; + var delimMailRegex = /<(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi; + text = text.replace(delimUrlRegex, replaceLink); + text = text.replace(delimMailRegex, replaceMail); // simpleURLRegex = /\b(((https?|ftp|dict):\/\/|www\.)[-.+~:?#@!$&'()*,;=[\]\w]+)\b/gi, + // Email addresses: + + if (options.simplifiedAutoLink) { + text = text.replace(simpleURLRegex, replaceLink); + text = text.replace(simpleMailRegex, replaceMail); + } + + function replaceLink(wm, link) { + var lnkTxt = link; + + if (/^www\./i.test(link)) { + link = link.replace(/^www\./i, 'http://www.'); + } + + return '' + lnkTxt + ''; + } + + function replaceMail(wholeMatch, m1) { + var unescapedStr = showdown.subParser('unescapeSpecialChars')(m1); + return showdown.subParser('encodeEmailAddress')(unescapedStr); + } + + text = globals.converter._dispatch('autoLinks.after', text, options, globals); + return text; +}); +/** + * These are all the transformations that form block-level + * tags like paragraphs, headers, and list items. + */ + +showdown.subParser('blockGamut', function (text, options, globals) { + 'use strict'; + + text = globals.converter._dispatch('blockGamut.before', text, options, globals); // we parse blockquotes first so that we can have headings and hrs + // inside blockquotes + + text = showdown.subParser('blockQuotes')(text, options, globals); + text = showdown.subParser('headers')(text, options, globals); // Do Horizontal Rules: + + var key = showdown.subParser('hashBlock')('
', options, globals); + text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm, key); + text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm, key); + text = text.replace(/^[ ]{0,2}([ ]?_[ ]?){3,}[ \t]*$/gm, key); + text = showdown.subParser('lists')(text, options, globals); + text = showdown.subParser('codeBlocks')(text, options, globals); + text = showdown.subParser('tables')(text, options, globals); // We already ran _HashHTMLBlocks() before, in Markdown(), but that + // was to escape raw HTML in the original Markdown source. This time, + // we're escaping the markup we've just created, so that we don't wrap + //

tags around block-level tags. + + text = showdown.subParser('hashHTMLBlocks')(text, options, globals); + text = showdown.subParser('paragraphs')(text, options, globals); + text = globals.converter._dispatch('blockGamut.after', text, options, globals); + return text; +}); +showdown.subParser('blockQuotes', function (text, options, globals) { + 'use strict'; + + text = globals.converter._dispatch('blockQuotes.before', text, options, globals); + /* + text = text.replace(/ + ( // Wrap whole match in $1 + ( + ^[ \t]*>[ \t]? // '>' at the start of a line + .+\n // rest of the first line + (.+\n)* // subsequent consecutive lines + \n* // blanks + )+ + ) + /gm, function(){...}); + */ + + text = text.replace(/((^[ \t]{0,3}>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) { + var bq = m1; // attacklab: hack around Konqueror 3.5.4 bug: + // "----------bug".replace(/^-/g,"") == "bug" + + bq = bq.replace(/^[ \t]*>[ \t]?/gm, '~0'); // trim one level of quoting + // attacklab: clean up hack + + bq = bq.replace(/~0/g, ''); + bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines + + bq = showdown.subParser('githubCodeBlocks')(bq, options, globals); + bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse + + bq = bq.replace(/(^|\n)/g, '$1 '); // These leading spaces screw with 

 content, so we need to fix that:
+
+        bq = bq.replace(/(\s*
[^\r]+?<\/pre>)/gm, function (wholeMatch, m1) {
+            var pre = m1; // attacklab: hack around Konqueror 3.5.4 bug:
+
+            pre = pre.replace(/^  /gm, '~0');
+            pre = pre.replace(/~0/g, '');
+            return pre;
+        });
+        return showdown.subParser('hashBlock')('
\n' + bq + '\n
', options, globals);
+    });
+    text = globals.converter._dispatch('blockQuotes.after', text, options, globals);
+    return text;
+});
+/**
+ * Process Markdown `
` blocks.
+ */
+
+showdown.subParser('codeBlocks', function (text, options, globals) {
+    'use strict';
+
+    text = globals.converter._dispatch('codeBlocks.before', text, options, globals);
+    /*
+   text = text.replace(text,
+   /(?:\n\n|^)
+   (								// $1 = the code block -- one or more lines, starting with a space/tab
+   (?:
+   (?:[ ]{4}|\t)			// Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
+   .*\n+
+   )+
+   )
+   (\n*[ ]{0,3}[^ \t\n]|(?=~0))	// attacklab: g_tab_width
+   /g,function(){...});
+   */
+    // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+
+    text += '~0';
+    var pattern = /(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g;
+    text = text.replace(pattern, function (wholeMatch, m1, m2) {
+        var codeblock = m1;
+        var nextChar = m2;
+        var end = '\n';
+        codeblock = showdown.subParser('outdent')(codeblock);
+        codeblock = showdown.subParser('encodeCode')(codeblock);
+        codeblock = showdown.subParser('detab')(codeblock);
+        codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
+
+        codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing newlines
+
+        if (options.omitExtraWLInCodeBlocks) {
+            end = '';
+        }
+
+        codeblock = '
' + codeblock + end + '
';
+        return showdown.subParser('hashBlock')(codeblock, options, globals) + nextChar;
+    }); // attacklab: strip sentinel
+
+    text = text.replace(/~0/, '');
+    text = globals.converter._dispatch('codeBlocks.after', text, options, globals);
+    return text;
+});
+/**
+ *
+ *   *  Backtick quotes are used for  spans.
+ *
+ *   *  You can use multiple backticks as the delimiters if you want to
+ *     include literal backticks in the code span. So, this input:
+ *
+ *         Just type ``foo `bar` baz`` at the prompt.
+ *
+ *       Will translate to:
+ *
+ *         
Just type foo `bar` baz at the prompt.

+ *
+ *    There's no arbitrary limit to the number of backticks you
+ *    can use as delimters. If you need three consecutive backticks
+ *    in your code, use four for delimiters, etc.
+ *
+ *  *  You can use spaces to get literal backticks at the edges:
+ *
+ *         ... type `` `bar` `` ...
+ *
+ *       Turns to:
+ *
+ *         ... type `bar` ...
+ */
+
+showdown.subParser('codeSpans', function (text, options, globals) {
+    'use strict';
+
+    text = globals.converter._dispatch('codeSpans.before', text, options, globals);
+    /*
+   text = text.replace(/
+   (^|[^\\])					// Character before opening ` can't be a backslash
+   (`+)						// $2 = Opening run of `
+   (							// $3 = The code block
+   [^\r]*?
+   [^`]					// attacklab: work around lack of lookbehind
+   )
+   \2							// Matching closer
+   (?!`)
+   /gm, function(){...});
+   */
+
+    if (typeof text === 'undefined') {
+        text = '';
+    }
+
+    text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm, function (wholeMatch, m1, m2, m3) {
+        var c = m3;
+        c = c.replace(/^([ \t]*)/g, ''); // leading whitespace
+
+        c = c.replace(/[ \t]*$/g, ''); // trailing whitespace
+
+        c = showdown.subParser('encodeCode')(c);
+        return m1 + '' + c + '';
+    });
+    text = globals.converter._dispatch('codeSpans.after', text, options, globals);
+    return text;
+});
+/**
+ * Convert all tabs to spaces
+ */
+
+showdown.subParser('detab', function (text) {
+    'use strict'; // expand first n-1 tabs
+
+    text = text.replace(/\t(?=\t)/g, '    '); // g_tab_width
+    // replace the nth with two sentinels
+
+    text = text.replace(/\t/g, '~A~B'); // use the sentinel to anchor our regex so it doesn't explode
+
+    text = text.replace(/~B(.+?)~A/g, function (wholeMatch, m1) {
+        var leadingText = m1;
+        var numSpaces = 4 - (leadingText.length % 4); // g_tab_width
+        // there *must* be a better way to do this:
+
+        for (var i = 0; i < numSpaces; i++) {
+            leadingText += ' ';
+        }
+
+        return leadingText;
+    }); // clean up sentinels
+
+    text = text.replace(/~A/g, '    '); // g_tab_width
+
+    text = text.replace(/~B/g, '');
+    return text;
+});
+/**
+ * Smart processing for ampersands and angle brackets that need to be encoded.
+ */
+
+showdown.subParser('encodeAmpsAndAngles', function (text) {
+    'use strict'; // Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
+    // http://bumppo.net/projects/amputator/
+
+    text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, '&'); // Encode naked <'s
+
+    text = text.replace(/<(?![a-z\/?\$!])/gi, '<');
+    return text;
+});
+/**
+ * Returns the string, with after processing the following backslash escape sequences.
+ *
+ * attacklab: The polite way to do this is with the new escapeCharacters() function:
+ *
+ *    text = escapeCharacters(text,"\\",true);
+ *    text = escapeCharacters(text,"`*_{}[]()>#+-.!",true);
+ *
+ * ...but we're sidestepping its use of the (slow) RegExp constructor
+ * as an optimization for Firefox.  This function gets called a LOT.
+ */
+
+showdown.subParser('encodeBackslashEscapes', function (text) {
+    'use strict';
+
+    text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
+    text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g, showdown.helper.escapeCharactersCallback);
+    return text;
+});
+/**
+ * Encode/escape certain characters inside Markdown code runs.
+ * The point is that in code, these characters are literals,
+ * and lose their special Markdown meanings.
+ */
+
+showdown.subParser('encodeCode', function (text) {
+    'use strict'; // Encode all ampersands; HTML entities are not
+    // entities within a Markdown code span.
+
+    text = text.replace(/&/g, '&'); // Do the angle bracket song and dance:
+
+    text = text.replace(//g, '>'); // Now, escape characters that are magic in Markdown:
+
+    text = showdown.helper.escapeCharacters(text, '*_{}[]\\', false); // jj the line above breaks this:
+    //---
+    //* Item
+    //   1. Subitem
+    //            special char: *
+    // ---
+
+    return text;
+});
+/**
+ *  Input: an email address, e.g. "foo@example.com"
+ *
+ *  Output: the email address as a mailto link, with each character
+ *    of the address encoded as either a decimal or hex entity, in
+ *    the hopes of foiling most address harvesting spam bots. E.g.:
+ *
+ *    foo
+ *       @example.com
+ *
+ *  Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
+ *  mailing list: 
+ *
+ */
+
+showdown.subParser('encodeEmailAddress', function (addr) {
+    'use strict';
+
+    var encode = [
+        function (ch) {
+            return '&#' + ch.charCodeAt(0) + ';';
+        },
+        function (ch) {
+            return '&#x' + ch.charCodeAt(0).toString(16) + ';';
+        },
+        function (ch) {
+            return ch;
+        }
+    ];
+    addr = 'mailto:' + addr;
+    addr = addr.replace(/./g, function (ch) {
+        if (ch === '@') {
+            // this *must* be encoded. I insist.
+            ch = encode[Math.floor(Math.random() * 2)](ch);
+        } else {
+            if (ch !== ':') {
+                // leave ':' alone (to spot mailto: later)
+                var r = Math.random(); // roughly 10% raw, 45% hex, 45% dec
+
+                if (r > 0.9) {
+                    ch = encode[2](ch);
+                } else {
+                    if (r > 0.45) {
+                        ch = encode[1](ch);
+                    } else {
+                        ch = encode[0](ch);
+                    }
+                }
+            }
+        }
+
+        return ch;
+    });
+    addr = '' + addr + '';
+    addr = addr.replace(/">.+:/g, '">'); // strip the mailto: from the visible part
+
+    return addr;
+});
+/**
+ * Within tags -- meaning between < and > -- encode [\ ` * _] so they
+ * don't conflict with their use in Markdown for code, italics and strong.
+ */
+
+showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text) {
+    'use strict'; // Build a regex to find HTML tags and comments.  See Friedl's
+    // "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
+
+    var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|)/gi;
+    text = text.replace(regex, function (wholeMatch) {
+        var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g, '$1`');
+        tag = showdown.helper.escapeCharacters(tag, '\\`*_', false);
+        return tag;
+    });
+    return text;
+});
+/**
+ * Handle github codeblocks prior to running HashHTML so that
+ * HTML contained within the codeblock gets escaped properly
+ * Example:
+ * ```ruby
+ *     def hello_world(x)
+ *       puts "Hello, #{x}"
+ *     end
+ * ```
+ */
+
+showdown.subParser('githubCodeBlocks', function (text, options, globals) {
+    'use strict'; // early exit if option is not enabled
+
+    if (!options.ghCodeBlocks) {
+        return text;
+    }
+
+    text = globals.converter._dispatch('githubCodeBlocks.before', text, options, globals);
+    text += '~0';
+    text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g, function (wholeMatch, language, codeblock) {
+        var end = options.omitExtraWLInCodeBlocks ? '' : '\n'; // First parse the github code block
+
+        codeblock = showdown.subParser('encodeCode')(codeblock);
+        codeblock = showdown.subParser('detab')(codeblock);
+        codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
+
+        codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
+
+        codeblock = '
' + codeblock + end + '
';
+        codeblock = showdown.subParser('hashBlock')(codeblock, options, globals); // Since GHCodeblocks can be false positives, we need to
+        // store the primitive text and the parsed text in a global var,
+        // and then return a token
+
+        return (
+            '\n\n~G' +
+            (globals.ghCodeBlocks.push({
+                text: wholeMatch,
+                codeblock: codeblock
+            }) -
+                1) +
+            'G\n\n'
+        );
+    }); // attacklab: strip sentinel
+
+    text = text.replace(/~0/, '');
+    return globals.converter._dispatch('githubCodeBlocks.after', text, options, globals);
+});
+showdown.subParser('hashBlock', function (text, options, globals) {
+    'use strict';
+
+    text = text.replace(/(^\n+|\n+$)/g, '');
+    return '\n\n~K' + (globals.gHtmlBlocks.push(text) - 1) + 'K\n\n';
+});
+showdown.subParser('hashElement', function (text, options, globals) {
+    'use strict';
+
+    return function (wholeMatch, m1) {
+        var blockText = m1; // Undo double lines
+
+        blockText = blockText.replace(/\n\n/g, '\n');
+        blockText = blockText.replace(/^\n/, ''); // strip trailing blank lines
+
+        blockText = blockText.replace(/\n+$/g, ''); // Replace the element text with a marker ("~KxK" where x is its key)
+
+        blockText = '\n\n~K' + (globals.gHtmlBlocks.push(blockText) - 1) + 'K\n\n';
+        return blockText;
+    };
+});
+showdown.subParser('hashHTMLBlocks', function (text, options, globals) {
+    'use strict';
+
+    var blockTags = [
+        'pre',
+        'div',
+        'h1',
+        'h2',
+        'h3',
+        'h4',
+        'h5',
+        'h6',
+        'blockquote',
+        'table',
+        'dl',
+        'ol',
+        'ul',
+        'script',
+        'noscript',
+        'form',
+        'fieldset',
+        'iframe',
+        'math',
+        'style',
+        'section',
+        'header',
+        'footer',
+        'nav',
+        'article',
+        'aside',
+        'address',
+        'audio',
+        'canvas',
+        'figure',
+        'hgroup',
+        'output',
+        'video',
+        'p'
+    ];
+
+    var repFunc = function (wholeMatch, match, left, right) {
+        var txt = wholeMatch; // check if this html element is marked as markdown
+        // if so, it's contents should be parsed as markdown
+
+        if (left.search(/\bmarkdown\b/) !== -1) {
+            txt = left + globals.converter.makeHtml(match) + right;
+        }
+
+        return '\n\n~K' + (globals.gHtmlBlocks.push(txt) - 1) + 'K\n\n';
+    };
+
+    for (var i = 0; i < blockTags.length; ++i) {
+        text = showdown.helper.replaceRecursiveRegExp(text, repFunc, '^(?: |\\t){0,3}<' + blockTags[i] + '\\b[^>]*>', '', 'gim');
+    } // HR SPECIAL CASE
+
+    text = text.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g, showdown.subParser('hashElement')(text, options, globals)); // Special case for standalone HTML comments:
+
+    text = text.replace(/()/g, showdown.subParser('hashElement')(text, options, globals)); // PHP and ASP-style processor instructions ( and <%...%>)
+
+    text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g, showdown.subParser('hashElement')(text, options, globals));
+    return text;
+});
+/**
+ * Hash span elements that should not be parsed as markdown
+ */
+
+showdown.subParser('hashHTMLSpans', function (text, config, globals) {
+    'use strict';
+
+    var matches = showdown.helper.matchRecursiveRegExp(text, ']*>', '', 'gi');
+
+    for (var i = 0; i < matches.length; ++i) {
+        text = text.replace(matches[i][0], '~L' + (globals.gHtmlSpans.push(matches[i][0]) - 1) + 'L');
+    }
+
+    return text;
+});
+/**
+ * Unhash HTML spans
+ */
+
+showdown.subParser('unhashHTMLSpans', function (text, config, globals) {
+    'use strict';
+
+    for (var i = 0; i < globals.gHtmlSpans.length; ++i) {
+        text = text.replace('~L' + i + 'L', globals.gHtmlSpans[i]);
+    }
+
+    return text;
+});
+/**
+ * Hash span elements that should not be parsed as markdown
+ */
+
+showdown.subParser('hashPreCodeTags', function (text, config, globals) {
+    'use strict';
+
+    var repFunc = function (wholeMatch, match, left, right) {
+        // encode html entities
+        var codeblock = left + showdown.subParser('encodeCode')(match) + right;
+        return (
+            '\n\n~G' +
+            (globals.ghCodeBlocks.push({
+                text: wholeMatch,
+                codeblock: codeblock
+            }) -
+                1) +
+            'G\n\n'
+        );
+    };
+
+    text = showdown.helper.replaceRecursiveRegExp(text, repFunc, '^(?: |\\t){0,3}]*>\\s*]*>', '^(?: |\\t){0,3}\\s*
', 'gim');
+    return text;
+});
+showdown.subParser('headers', function (text, options, globals) {
+    'use strict';
+
+    text = globals.converter._dispatch('headers.before', text, options, globals);
+    var prefixHeader = options.prefixHeaderId;
+    var headerLevelStart = isNaN(parseInt(options.headerLevelStart)) ? 1 : parseInt(options.headerLevelStart);
+    var // Set text-style headers:
+        //	Header 1
+        //	========
+        //
+        //	Header 2
+        //	--------
+        //
+        setextRegexH1 = options.smoothLivePreview ? /^(.+)[ \t]*\n={2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n=+[ \t]*\n+/gm;
+    var setextRegexH2 = options.smoothLivePreview ? /^(.+)[ \t]*\n-{2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n-+[ \t]*\n+/gm;
+    text = text.replace(setextRegexH1, function (wholeMatch, m1) {
+        var spanGamut = showdown.subParser('spanGamut')(m1, options, globals);
+        var hID = options.noHeaderId ? '' : ' id="' + headerId(m1) + '"';
+        var hLevel = headerLevelStart;
+        var hashBlock = '' + spanGamut + '';
+        return showdown.subParser('hashBlock')(hashBlock, options, globals);
+    });
+    text = text.replace(setextRegexH2, function (matchFound, m1) {
+        var spanGamut = showdown.subParser('spanGamut')(m1, options, globals);
+        var hID = options.noHeaderId ? '' : ' id="' + headerId(m1) + '"';
+        var hLevel = headerLevelStart + 1;
+        var hashBlock = '' + spanGamut + '';
+        return showdown.subParser('hashBlock')(hashBlock, options, globals);
+    }); // atx-style headers:
+    //  # Header 1
+    //  ## Header 2
+    //  ## Header 2 with closing hashes ##
+    //  ...
+    //  ###### Header 6
+    //
+
+    text = text.replace(/^(#{1,6})[ \t]*(.+?)[ \t]*#*\n+/gm, function (wholeMatch, m1, m2) {
+        var span = showdown.subParser('spanGamut')(m2, options, globals);
+        var hID = options.noHeaderId ? '' : ' id="' + headerId(m2) + '"';
+        var hLevel = headerLevelStart - 1 + m1.length;
+        var header = '' + span + '';
+        return showdown.subParser('hashBlock')(header, options, globals);
+    });
+
+    function headerId(m) {
+        var title;
+        var escapedId = m.replace(/[^\w]/g, '').toLowerCase();
+        if (globals.hashLinkCounts[escapedId]) {
+            title = escapedId + '-' + globals.hashLinkCounts[escapedId]++;
+        } else {
+            title = escapedId;
+            globals.hashLinkCounts[escapedId] = 1;
+        } // Prefix id to prevent causing inadvertent pre-existing style matches.
+
+        if (prefixHeader === true) {
+            prefixHeader = 'section';
+        }
+
+        if (showdown.helper.isString(prefixHeader)) {
+            return prefixHeader + title;
+        }
+
+        return title;
+    }
+
+    text = globals.converter._dispatch('headers.after', text, options, globals);
+    return text;
+});
+/**
+ * Turn Markdown image shortcuts into  tags.
+ */
+
+showdown.subParser('images', function (text, options, globals) {
+    'use strict';
+
+    text = globals.converter._dispatch('images.before', text, options, globals);
+    var inlineRegExp = /!\[(.*?)]\s?\([ \t]*()?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*(?:(['"])(.*?)\6[ \t]*)?\)/g;
+    var referenceRegExp = /!\[([^\]]*?)] ?(?:\n *)?\[(.*?)]()()()()()/g;
+    function writeImageTag(wholeMatch, altText, linkId, url, width, height, m5, title) {
+        var gUrls = globals.gUrls;
+        var gTitles = globals.gTitles;
+        var gDims = globals.gDimensions;
+        linkId = linkId.toLowerCase();
+
+        if (!title) {
+            title = '';
+        }
+
+        if (url === '' || url === null) {
+            if (linkId === '' || linkId === null) {
+                // lower-case and turn embedded newlines into spaces
+                linkId = altText.toLowerCase().replace(/ ?\n/g, ' ');
+            }
+
+            url = '#' + linkId;
+
+            if (!showdown.helper.isUndefined(gUrls[linkId])) {
+                url = gUrls[linkId];
+
+                if (!showdown.helper.isUndefined(gTitles[linkId])) {
+                    title = gTitles[linkId];
+                }
+
+                if (!showdown.helper.isUndefined(gDims[linkId])) {
+                    width = gDims[linkId].width;
+                    height = gDims[linkId].height;
+                }
+            } else {
+                return wholeMatch;
+            }
+        }
+
+        altText = altText.replace(/"/g, '"');
+        altText = showdown.helper.escapeCharacters(altText, '*_', false);
+        url = showdown.helper.escapeCharacters(url, '*_', false);
+        var result = '' + altText + 'x "optional title")
+
+    text = text.replace(inlineRegExp, writeImageTag);
+    text = globals.converter._dispatch('images.after', text, options, globals);
+    return text;
+});
+showdown.subParser('italicsAndBold', function (text, options, globals) {
+    'use strict';
+
+    text = globals.converter._dispatch('italicsAndBold.before', text, options, globals);
+
+    if (options.literalMidWordUnderscores) {
+        //underscores
+        // Since we are consuming a \s character, we need to add it
+        text = text.replace(/(^|\s|>|\b)__(?=\S)([\s\S]+?)__(?=\b|<|\s|$)/gm, '$1$2');
+        text = text.replace(/(^|\s|>|\b)_(?=\S)([\s\S]+?)_(?=\b|<|\s|$)/gm, '$1$2'); //asterisks
+
+        text = text.replace(/(\*\*)(?=\S)([^\r]*?\S[*]*)\1/g, '$2');
+        text = text.replace(/(\*)(?=\S)([^\r]*?\S)\1/g, '$2');
+    } else {
+        //  must go first:
+        text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g, '$2');
+        text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g, '$2');
+    }
+
+    text = globals.converter._dispatch('italicsAndBold.after', text, options, globals);
+    return text;
+});
+/**
+ * Form HTML ordered (numbered) and unordered (bulleted) lists.
+ */
+
+showdown.subParser('lists', function (text, options, globals) {
+    'use strict';
+
+    text = globals.converter._dispatch('lists.before', text, options, globals);
+    /**
+     * Process the contents of a single ordered or unordered list, splitting it
+     * into individual list items.
+     * @param {string} listStr
+     * @param {boolean} trimTrailing
+     * @returns {string}
+     */
+
+    function processListItems(listStr, trimTrailing) {
+        // The $g_list_level global keeps track of when we're inside a list.
+        // Each time we enter a list, we increment it; when we leave a list,
+        // we decrement. If it's zero, we're not in a list anymore.
+        //
+        // We do this because when we're not inside a list, we want to treat
+        // something like this:
+        //
+        //    I recommend upgrading to version
+        //    8. Oops, now this line is treated
+        //    as a sub-list.
+        //
+        // As a single paragraph, despite the fact that the second line starts
+        // with a digit-period-space sequence.
+        //
+        // Whereas when we're inside a list (or sub-list), that line will be
+        // treated as the start of a sub-list. What a kludge, huh? This is
+        // an aspect of Markdown's syntax that's hard to parse perfectly
+        // without resorting to mind-reading. Perhaps the solution is to
+        // change the syntax rules such that sub-lists must start with a
+        // starting cardinal number; e.g. "1." or "a.".
+        globals.gListLevel++; // trim trailing blank lines:
+
+        listStr = listStr.replace(/\n{2,}$/, '\n'); // attacklab: add sentinel to emulate \z
+
+        listStr += '~0';
+        var rgx = /(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+((\[(x|X| )?])?[ \t]*[^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm;
+        var isParagraphed = /\n[ \t]*\n(?!~0)/.test(listStr);
+        listStr = listStr.replace(rgx, function (wholeMatch, m1, m2, m3, m4, taskbtn, checked) {
+            checked = checked && checked.trim() !== '';
+            var item = showdown.subParser('outdent')(m4, options, globals);
+            var bulletStyle = ''; // Support for github tasklists
+            if (taskbtn && options.tasklists) {
+                bulletStyle = ' class="task-list-item" style="list-style-type: none;"';
+                item = item.replace(/^[ \t]*\[(x|X| )?]/m, function () {
+                    var otp = ' -1) {
+                item = showdown.subParser('githubCodeBlocks')(item, options, globals);
+                item = showdown.subParser('blockGamut')(item, options, globals);
+            } else {
+                // Recursion for sub-lists:
+                item = showdown.subParser('lists')(item, options, globals);
+                item = item.replace(/\n$/, ''); // chomp(item)
+
+                if (isParagraphed) {
+                    item = showdown.subParser('paragraphs')(item, options, globals);
+                } else {
+                    item = showdown.subParser('spanGamut')(item, options, globals);
+                }
+            }
+
+            item = '\n' + item + '\n';
+            return item;
+        }); // attacklab: strip sentinel
+
+        listStr = listStr.replace(/~0/g, '');
+        globals.gListLevel--;
+
+        if (trimTrailing) {
+            listStr = listStr.replace(/\s+$/, '');
+        }
+
+        return listStr;
+    }
+    /**
+     * Check and parse consecutive lists (better fix for issue #142)
+     * @param {string} list
+     * @param {string} listType
+     * @param {boolean} trimTrailing
+     * @returns {string}
+     */
+
+    function parseConsecutiveLists(list, listType, trimTrailing) {
+        var counterRxg = listType === 'ul' ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm;
+        var subLists = [];
+        var result = '';
+        // check if we caught 2 or more consecutive lists by mistake
+        // we use the counterRgx, meaning if listType is UL we look for UL and vice versa
+        if (list.search(counterRxg) !== -1) {
+            (function parseCL(txt) {
+                var pos = txt.search(counterRxg);
+
+                if (pos !== -1) {
+                    // slice
+                    result += '\n\n<' + listType + '>' + processListItems(txt.slice(0, pos), !!trimTrailing) + '\n\n'; // invert counterType and listType
+
+                    if (listType === 'ul') {
+                        listType = 'ol';
+                    } else {
+                        listType = 'ul';
+                    }
+
+                    if (listType === 'ul') {
+                        counterRxg = /^ {0,2}\d+\.[ \t]/gm;
+                    } else {
+                        counterRxg = /^ {0,2}[*+-][ \t]/gm;
+                    } //recurse
+
+                    parseCL(txt.slice(pos));
+                } else {
+                    result += '\n\n<' + listType + '>' + processListItems(txt, !!trimTrailing) + '\n\n';
+                }
+            })(list);
+
+            for (var i = 0; i < subLists.length; ++i) {}
+        } else {
+            result = '\n\n<' + listType + '>' + processListItems(list, !!trimTrailing) + '\n\n';
+        }
+
+        return result;
+    } // attacklab: add sentinel to hack around khtml/safari bug:
+    // http://bugs.webkit.org/show_bug.cgi?id=11231
+
+    text += '~0'; // Re-usable pattern to match any entire ul or ol list:
+
+    var wholeList = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
+
+    if (globals.gListLevel) {
+        text = text.replace(wholeList, function (wholeMatch, list, m2) {
+            var listType = m2.search(/[*+-]/g) > -1 ? 'ul' : 'ol';
+            return parseConsecutiveLists(list, listType, true);
+        });
+    } else {
+        wholeList = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm; //wholeList = /(\n\n|^\n?)( {0,3}([*+-]|\d+\.)[ \t]+[\s\S]+?)(?=(~0)|(\n\n(?!\t| {2,}| {0,3}([*+-]|\d+\.)[ \t])))/g;
+
+        text = text.replace(wholeList, function (wholeMatch, m1, list, m3) {
+            var listType = m3.search(/[*+-]/g) > -1 ? 'ul' : 'ol';
+            return parseConsecutiveLists(list, listType);
+        });
+    } // attacklab: strip sentinel
+
+    text = text.replace(/~0/, '');
+    text = globals.converter._dispatch('lists.after', text, options, globals);
+    return text;
+});
+/**
+ * Remove one level of line-leading tabs or spaces
+ */
+
+showdown.subParser('outdent', function (text) {
+    'use strict'; // attacklab: hack around Konqueror 3.5.4 bug:
+    // "----------bug".replace(/^-/g,"") == "bug"
+
+    text = text.replace(/^(\t|[ ]{1,4})/gm, '~0'); // attacklab: g_tab_width
+    // attacklab: clean up hack
+
+    text = text.replace(/~0/g, '');
+    return text;
+});
+/**
+ *
+ */
+
+showdown.subParser('paragraphs', function (text, options, globals) {
+    'use strict';
+
+    text = globals.converter._dispatch('paragraphs.before', text, options, globals); // Strip leading and trailing lines:
+
+    text = text.replace(/^\n+/g, '');
+    text = text.replace(/\n+$/g, '');
+    var grafs = text.split(/\n{2,}/g);
+    var grafsOut = [];
+    var end = grafs.length; // Wrap 
 tags
+    for (var i = 0; i < end; i++) {
+        var str = grafs[i]; // if this is an HTML marker, copy it
+
+        if (str.search(/~(K|G)(\d+)\1/g) >= 0) {
+            grafsOut.push(str);
+        } else {
+            str = showdown.subParser('spanGamut')(str, options, globals);
+            str = str.replace(/^([ \t]*)/g, '
');
+            str += '
';
+            grafsOut.push(str);
+        }
+    }
+    /** Unhashify HTML blocks */
+
+    end = grafsOut.length;
+
+    for (i = 0; i < end; i++) {
+        var blockText = '';
+        var grafsOutIt = grafsOut[i];
+        var codeFlag = false; // if this is a marker for an html block...
+        while (grafsOutIt.search(/~(K|G)(\d+)\1/) >= 0) {
+            var delim = RegExp.$1;
+            var num = RegExp.$2;
+            if (delim === 'K') {
+                blockText = globals.gHtmlBlocks[num];
+            } else {
+                // we need to check if ghBlock is a false positive
+                if (codeFlag) {
+                    // use encoded version of all text
+                    blockText = showdown.subParser('encodeCode')(globals.ghCodeBlocks[num].text);
+                } else {
+                    blockText = globals.ghCodeBlocks[num].codeblock;
+                }
+            }
+
+            blockText = blockText.replace(/\$/g, '$$$$'); // Escape any dollar signs
+
+            grafsOutIt = grafsOutIt.replace(/(\n\n)?~(K|G)\d+\2(\n\n)?/, blockText); // Check if grafsOutIt is a pre->code
+
+            if (/^]*>\s*]*>/.test(grafsOutIt)) {
+                codeFlag = true;
+            }
+        }
+
+        grafsOut[i] = grafsOutIt;
+    }
+
+    text = grafsOut.join('\n\n'); // Strip leading and trailing lines:
+
+    text = text.replace(/^\n+/g, '');
+    text = text.replace(/\n+$/g, '');
+    return globals.converter._dispatch('paragraphs.after', text, options, globals);
+});
+/**
+ * Run extension
+ */
+
+showdown.subParser('runExtension', function (ext, text, options, globals) {
+    'use strict';
+
+    if (ext.filter) {
+        text = ext.filter(text, globals.converter, options);
+    } else {
+        if (ext.regex) {
+            // TODO remove this when old extension loading mechanism is deprecated
+            var re = ext.regex;
+
+            if (!re instanceof RegExp) {
+                re = new RegExp(re, 'g');
+            }
+
+            text = text.replace(re, ext.replace);
+        }
+    }
+
+    return text;
+});
+/**
+ * These are all the transformations that occur *within* block-level
+ * tags like paragraphs, headers, and list items.
+ */
+
+showdown.subParser('spanGamut', function (text, options, globals) {
+    'use strict';
+
+    text = globals.converter._dispatch('spanGamut.before', text, options, globals);
+    text = showdown.subParser('codeSpans')(text, options, globals);
+    text = showdown.subParser('escapeSpecialCharsWithinTagAttributes')(text, options, globals);
+    text = showdown.subParser('encodeBackslashEscapes')(text, options, globals); // Process anchor and image tags. Images must come first,
+    // because ![foo][f] looks like an anchor.
+
+    text = showdown.subParser('images')(text, options, globals);
+    text = showdown.subParser('anchors')(text, options, globals); // Make links out of things like ``
+    // Must come after _DoAnchors(), because you can use < and >
+    // delimiters in inline links like [this]().
+
+    text = showdown.subParser('autoLinks')(text, options, globals);
+    text = showdown.subParser('encodeAmpsAndAngles')(text, options, globals);
+    text = showdown.subParser('italicsAndBold')(text, options, globals);
+    text = showdown.subParser('strikethrough')(text, options, globals); // Do hard breaks:
+
+    text = text.replace(/  +\n/g, ' 
\n');
+    text = globals.converter._dispatch('spanGamut.after', text, options, globals);
+    return text;
+});
+showdown.subParser('strikethrough', function (text, options, globals) {
+    'use strict';
+
+    if (options.strikethrough) {
+        text = globals.converter._dispatch('strikethrough.before', text, options, globals);
+        text = text.replace(/(?:~T){2}([\s\S]+?)(?:~T){2}/g, '$1');
+        text = globals.converter._dispatch('strikethrough.after', text, options, globals);
+    }
+
+    return text;
+});
+/**
+ * Strip any lines consisting only of spaces and tabs.
+ * This makes subsequent regexs easier to write, because we can
+ * match consecutive blank lines with /\n+/ instead of something
+ * contorted like /[ \t]*\n+/
+ */
+
+showdown.subParser('stripBlankLines', function (text) {
+    'use strict';
+
+    return text.replace(/^[ \t]+$/gm, '');
+});
+/**
+ * Strips link definitions from text, stores the URLs and titles in
+ * hash references.
+ * Link defs are in the form: ^[id]: url "optional title"
+ *
+ * ^[ ]{0,3}\[(.+)\]: // id = $1  attacklab: g_tab_width - 1
+ * [ \t]*
+ * \n?                  // maybe *one* newline
+ * [ \t]*
+ * ?          // url = $2
+ * [ \t]*
+ * \n?                // maybe one newline
+ * [ \t]*
+ * (?:
+ * (\n*)              // any lines skipped = $3 attacklab: lookbehind removed
+ * ["(]
+ * (.+?)              // title = $4
+ * [")]
+ * [ \t]*
+ * )?                 // title is optional
+ * (?:\n+|$)
+ * /gm,
+ * function(){...});
+ *
+ */
+
+showdown.subParser('stripLinkDefinitions', function (text, options, globals) {
+    'use strict';
+
+    var regex = /^ {0,3}\[(.+)]:[ \t]*\n?[ \t]*?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*\n?[ \t]*(?:(\n*)["|'(](.+?)["|')][ \t]*)?(?:\n+|(?=~0))/gm; // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+
+    text += '~0';
+    text = text.replace(regex, function (wholeMatch, linkId, url, width, height, blankLines, title) {
+        linkId = linkId.toLowerCase();
+        globals.gUrls[linkId] = showdown.subParser('encodeAmpsAndAngles')(url); // Link IDs are case-insensitive
+
+        if (blankLines) {
+            // Oops, found blank lines, so it's not a title.
+            // Put back the parenthetical statement we stole.
+            return blankLines + title;
+        } else {
+            if (title) {
+                globals.gTitles[linkId] = title.replace(/"|'/g, '"');
+            }
+
+            if (options.parseImgDimensions && width && height) {
+                globals.gDimensions[linkId] = {
+                    width: width,
+                    height: height
+                };
+            }
+        } // Completely remove the definition from the text
+
+        return '';
+    }); // attacklab: strip sentinel
+
+    text = text.replace(/~0/, '');
+    return text;
+});
+showdown.subParser('tables', function (text, options, globals) {
+    'use strict';
+
+    if (!options.tables) {
+        return text;
+    }
+
+    var tableRgx = /^[ \t]{0,3}\|?.+\|.+\n[ \t]{0,3}\|?[ \t]*:?[ \t]*(?:-|=){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:-|=){2,}[\s\S]+?(?:\n\n|~0)/gm;
+
+    function parseStyles(sLine) {
+        if (/^:[ \t]*--*$/.test(sLine)) {
+            return ' style="text-align:left;"';
+        } else {
+            if (/^--*[ \t]*:[ \t]*$/.test(sLine)) {
+                return ' style="text-align:right;"';
+            } else {
+                if (/^:[ \t]*--*[ \t]*:$/.test(sLine)) {
+                    return ' style="text-align:center;"';
+                } else {
+                    return '';
+                }
+            }
+        }
+    }
+
+    function parseHeaders(header, style) {
+        var id = '';
+        header = header.trim();
+
+        if (options.tableHeaderId) {
+            id = ' id="' + header.replace(/ /g, '_').toLowerCase() + '"';
+        }
+
+        header = showdown.subParser('spanGamut')(header, options, globals);
+        return '' + header + '\n';
+    }
+
+    function parseCells(cell, style) {
+        var subText = showdown.subParser('spanGamut')(cell, options, globals);
+        return '' + subText + '\n';
+    }
+
+    function buildTable(headers, cells) {
+        var tb = '\n\n\n';
+        var tblLgn = headers.length;
+        for (var i = 0; i < tblLgn; ++i) {
+            tb += headers[i];
+        }
+
+        tb += '\n\n\n';
+
+        for (i = 0; i < cells.length; ++i) {
+            tb += '\n';
+
+            for (var ii = 0; ii < tblLgn; ++ii) {
+                tb += cells[i][ii];
+            }
+
+            tb += '\n';
+        }
+
+        tb += '\n
\n';
+        return tb;
+    }
+
+    text = globals.converter._dispatch('tables.before', text, options, globals);
+    text = text.replace(tableRgx, function (rawTable) {
+        var i;
+        var tableLines = rawTable.split('\n'); // strip wrong first and last column if wrapped tables are used
+        for (i = 0; i < tableLines.length; ++i) {
+            if (/^[ \t]{0,3}\|/.test(tableLines[i])) {
+                tableLines[i] = tableLines[i].replace(/^[ \t]{0,3}\|/, '');
+            }
+
+            if (/\|[ \t]*$/.test(tableLines[i])) {
+                tableLines[i] = tableLines[i].replace(/\|[ \t]*$/, '');
+            }
+        }
+
+        var rawHeaders = tableLines[0].split('|').map(function (s) {
+            return s.trim();
+        });
+        var rawStyles = tableLines[1].split('|').map(function (s) {
+            return s.trim();
+        });
+        var rawCells = [];
+        var headers = [];
+        var styles = [];
+        var cells = [];
+        tableLines.shift();
+        tableLines.shift();
+
+        for (i = 0; i < tableLines.length; ++i) {
+            if (tableLines[i].trim() === '') {
+                continue;
+            }
+
+            rawCells.push(
+                tableLines[i].split('|').map(function (s) {
+                    return s.trim();
+                })
+            );
+        }
+
+        if (rawHeaders.length < rawStyles.length) {
+            return rawTable;
+        }
+
+        for (i = 0; i < rawStyles.length; ++i) {
+            styles.push(parseStyles(rawStyles[i]));
+        }
+
+        for (i = 0; i < rawHeaders.length; ++i) {
+            if (showdown.helper.isUndefined(styles[i])) {
+                styles[i] = '';
+            }
+
+            headers.push(parseHeaders(rawHeaders[i], styles[i]));
+        }
+
+        for (i = 0; i < rawCells.length; ++i) {
+            var row = [];
+
+            for (var ii = 0; ii < headers.length; ++ii) {
+                if (showdown.helper.isUndefined(rawCells[i][ii])) {
+                }
+
+                row.push(parseCells(rawCells[i][ii], styles[ii]));
+            }
+
+            cells.push(row);
+        }
+
+        return buildTable(headers, cells);
+    });
+    text = globals.converter._dispatch('tables.after', text, options, globals);
+    return text;
+});
+/**
+ * Swap back in all the special characters we've hidden.
+ */
+
+showdown.subParser('unescapeSpecialChars', function (text) {
+    'use strict';
+
+    text = text.replace(/~E(\d+)E/g, function (wholeMatch, m1) {
+        var charCodeToReplace = parseInt(m1);
+        return String.fromCharCode(charCodeToReplace);
+    });
+    return text;
+});
+module.exports = showdown;
diff --git a/litemall-wx_uni/lib/wxParse/wxDiscode.js b/litemall-wx_uni/lib/wxParse/wxDiscode.js
new file mode 100644
index 0000000000000000000000000000000000000000..575513f31968bbd577c04d35fded964e9b11e4c1
--- /dev/null
+++ b/litemall-wx_uni/lib/wxParse/wxDiscode.js
@@ -0,0 +1,196 @@
+// HTML 支持的数学符号
+function strNumDiscode(str) {
+    str = str.replace(/∀/g, '∀');
+    str = str.replace(/∂/g, '∂');
+    str = str.replace(/&exists;/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;
+} //HTML 支持的希腊字母
+
+function strGreeceDiscode(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, 'ϒ');
+    str = str.replace(/ϖ/g, 'ϖ');
+    str = str.replace(/·/g, '·');
+    return str;
+} //
+
+function strcharacterDiscode(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, '>');
+    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, '♦');
+    return str;
+}
+
+function strMoreDiscode(str) {
+    str = str.replace(/\r\n/g, '');
+    str = str.replace(/\n/g, '');
+    str = str.replace(/code/g, 'wxxxcode-style');
+    return str;
+}
+
+function strDiscode(str) {
+    str = strNumDiscode(str);
+    str = strGreeceDiscode(str);
+    str = strcharacterDiscode(str);
+    str = strOtherDiscode(str);
+    str = strMoreDiscode(str);
+    return str;
+}
+
+function urlToHttpUrl(url, rep) {
+    var patt1 = new RegExp('^//');
+    var result = patt1.test(url);
+
+    if (result) {
+        url = rep + ':' + url;
+    }
+
+    return url;
+}
+
+module.exports = {
+    strDiscode: strDiscode,
+    urlToHttpUrl: urlToHttpUrl
+};
diff --git a/litemall-wx_uni/lib/wxParse/wxParse.css b/litemall-wx_uni/lib/wxParse/wxParse.css
new file mode 100644
index 0000000000000000000000000000000000000000..95792c264a71601ef0b3979e9d67e7cdbc318c8c
--- /dev/null
+++ b/litemall-wx_uni/lib/wxParse/wxParse.css
@@ -0,0 +1,262 @@
+/**
+ * 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 {
+    margin: 0 5px;
+    font-family: Helvetica, sans-serif;
+    font-size: 28rpx;
+    color: #666;
+    line-height: 1.8;
+}
+view {
+    word-break: break-all;
+    overflow: auto;
+}
+.wxParse-inline {
+    display: inline;
+    margin: 0;
+    padding: 0;
+}
+/*//标题 */
+.wxParse-div {
+    margin: 0;
+    padding: 0;
+}
+.wxParse-h1 {
+    font-size: 2em;
+    margin: 0.67em 0;
+}
+.wxParse-h2 {
+    font-size: 1.5em;
+    margin: 0.75em 0;
+}
+.wxParse-h3 {
+    font-size: 1.17em;
+    margin: 0.83em 0;
+}
+.wxParse-h4 {
+    margin: 1.12em 0;
+}
+.wxParse-h5 {
+    font-size: 0.83em;
+    margin: 1.5em 0;
+}
+.wxParse-h6 {
+    font-size: 0.75em;
+    margin: 1.67em 0;
+}
+
+.wxParse-h1 {
+    font-size: 18px;
+    font-weight: 400;
+    margin-bottom: 0.9em;
+}
+.wxParse-h2 {
+    font-size: 16px;
+    font-weight: 400;
+    margin-bottom: 0.34em;
+}
+.wxParse-h3 {
+    font-weight: 400;
+    font-size: 15px;
+    margin-bottom: 0.34em;
+}
+.wxParse-h4 {
+    font-weight: 400;
+    font-size: 14px;
+    margin-bottom: 0.24em;
+}
+.wxParse-h5 {
+    font-weight: 400;
+    font-size: 13px;
+    margin-bottom: 0.14em;
+}
+.wxParse-h6 {
+    font-weight: 400;
+    font-size: 12px;
+    margin-bottom: 0.04em;
+}
+
+.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-pre,
+.wxParse-tt,
+.wxParse-code,
+.wxParse-kbd,
+.wxParse-samp {
+    font-family: monospace;
+}
+.wxParse-pre {
+    white-space: pre;
+}
+.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-自定义个性化的css样式*/
+/*增加video的css样式*/
+.wxParse-strong,
+wxParse-s {
+    display: inline;
+}
+.wxParse-a {
+    color: deepskyblue;
+    word-break: break-all;
+    overflow: auto;
+}
+
+.wxParse-video {
+    text-align: center;
+    margin: 10px 0;
+}
+
+.wxParse-video-video {
+    width: 100%;
+}
+
+.wxParse-img {
+    background-color: #efefef;
+    overflow: hidden;
+    width: 40px;
+    height: 40px;
+}
+
+.wxParse-blockquote {
+    margin: 0;
+    padding: 10px 0 10px 5px;
+    font-family: Courier, Calibri, '宋体';
+    background: #f5f5f5;
+    border-left: 3px solid #dbdbdb;
+}
+
+.wxParse-code,
+.wxParse-wxxxcode-style {
+    display: inline;
+    background: #f5f5f5;
+}
+.wxParse-ul {
+    margin: 20rpx 10rpx;
+}
+
+.wxParse-li,
+.wxParse-li-inner {
+    display: flex;
+    align-items: baseline;
+    margin: 10rpx 0;
+}
+.wxParse-li-text {
+    align-items: center;
+    line-height: 20px;
+}
+
+.wxParse-li-circle {
+    display: inline-flex;
+    width: 5px;
+    height: 5px;
+    background-color: #333;
+    margin-right: 5px;
+}
+
+.wxParse-li-square {
+    display: inline-flex;
+    width: 10rpx;
+    height: 10rpx;
+    background-color: #333;
+    margin-right: 5px;
+}
+.wxParse-li-ring {
+    display: inline-flex;
+    width: 10rpx;
+    height: 10rpx;
+    border: 2rpx solid #333;
+    border-radius: 50%;
+    background-color: #fff;
+    margin-right: 5px;
+}
+
+/*.wxParse-table{
+    width: 100%;
+    height: 400px;
+}
+.wxParse-thead,.wxParse-tfoot,.wxParse-tr{
+    display: flex;
+    flex-direction: row;
+}
+.wxParse-th,.wxParse-td{
+    display: flex;
+    width: 580px;
+    overflow: auto;
+}*/
+
+.wxParse-u {
+    text-decoration: underline;
+}
+.wxParse-hide {
+    display: none;
+}
+.WxEmojiView {
+    align-items: center;
+}
+.wxEmoji {
+    width: 16px;
+    height: 16px;
+}
+.wxParse-tr {
+    display: flex;
+    border-right: 1px solid #e0e0e0;
+    border-bottom: 1px solid #e0e0e0;
+}
+.wxParse-th,
+.wxParse-td {
+    flex: 1;
+    padding: 5px;
+    font-size: 28rpx;
+    border-left: 1px solid #e0e0e0;
+    word-break: break-all;
+}
+.wxParse-td:last {
+    border-top: 1px solid #e0e0e0;
+}
+.wxParse-th {
+    background: #f0f0f0;
+    border-top: 1px solid #e0e0e0;
+}
diff --git a/litemall-wx_uni/lib/wxParse/wxParse.vue b/litemall-wx_uni/lib/wxParse/wxParse.vue
new file mode 100644
index 0000000000000000000000000000000000000000..565b36193a4c961af03247a4d9a2fc94ebece1ad
--- /dev/null
+++ b/litemall-wx_uni/lib/wxParse/wxParse.vue
@@ -0,0 +1,1296 @@
+
+
+
+
diff --git a/litemall-wx_uni/main.js b/litemall-wx_uni/main.js
new file mode 100644
index 0000000000000000000000000000000000000000..14002b7752059c94844f9654ce8ec415a9456b3b
--- /dev/null
+++ b/litemall-wx_uni/main.js
@@ -0,0 +1,31 @@
+import App from './App';
+
+// Api函数polyfill（目前为实验版本，如不需要，可删除！）';
+import Polyfill from './polyfill/polyfill';
+Polyfill.init();
+
+// 全局mixins，用于实现setData等功能，请勿删除！';
+import Mixin from './polyfill/mixins';
+
+// #ifndef VUE3
+import Vue from 'vue';
+
+Vue.mixin(Mixin);
+Vue.config.productionTip = false;
+App.mpType = 'app';
+const app = new Vue({
+    ...App
+});
+app.$mount();
+// #endif
+
+// #ifdef VUE3
+import { createSSRApp } from 'vue';
+export function createApp() {
+    const app = createSSRApp(App);
+    app.mixin(Mixin);
+    return {
+        app
+    };
+}
+// #endif
diff --git a/litemall-wx_uni/manifest.json b/litemall-wx_uni/manifest.json
new file mode 100644
index 0000000000000000000000000000000000000000..822dc5d5888cf73eda964f75a133c180512d7164
--- /dev/null
+++ b/litemall-wx_uni/manifest.json
@@ -0,0 +1,76 @@
+{
+	"name": "litemall-wx",
+	"appid": "",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {},
+		"distribute": {
+			"android": {
+				"permissions": [
+					"",
+					"",
+					"",
+					"",
+					"",
+					"",
+					"",
+					"",
+					"",
+					"",
+					"",
+					"",
+					"",
+					"",
+					""
+				]
+			},
+			"ios": {},
+			"sdkConfigs": {}
+		}
+	},
+	"quickapp": {},
+	"mp-weixin": {
+		"appid": "wx5e4cd1d279a5fca0",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true,
+		"permission": {
+			"scope.userLocation": {
+				"desc": "你的位置信息将用于小程序位置接口的效果展示"
+			}
+		},
+		"plugins": {}
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2",
+	"networkTimeout": {
+		"request": 10000,
+		"connectSocket": 10000,
+		"uploadFile": 10000,
+		"downloadFile": 10000
+	}
+}
\ No newline at end of file
diff --git a/litemall-wx_uni/pages.json b/litemall-wx_uni/pages.json
new file mode 100644
index 0000000000000000000000000000000000000000..795796bb797c7095d9361c485f9c97c42890bf69
--- /dev/null
+++ b/litemall-wx_uni/pages.json
@@ -0,0 +1,332 @@
+{
+	"pages": [
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/catalog/catalog",
+			"style": {
+				"navigationBarTitleText": "分类"
+			}
+		},
+		{
+			"path": "pages/newGoods/newGoods",
+			"style": {
+				"navigationBarTitleText": "新品首发"
+			}
+		},
+		{
+			"path": "pages/hotGoods/hotGoods",
+			"style": {
+				"navigationBarTitleText": "人气推荐"
+			}
+		},
+		{
+			"path": "pages/ucenter/index/index",
+			"style": {
+				"backgroundColor": "#f4f4f4",
+				"navigationBarTitleText": "个人中心",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ucenter/address/address",
+			"style": {
+				"navigationBarTitleText": "地址管理"
+			}
+		},
+		{
+			"path": "pages/ucenter/addressAdd/addressAdd",
+			"style": {
+				"navigationBarTitleText": "编辑地址"
+			}
+		},
+		{
+			"path": "pages/ucenter/feedback/feedback",
+			"style": {
+				"navigationBarTitleText": "意见反馈"
+			}
+		},
+		{
+			"path": "pages/ucenter/footprint/footprint",
+			"style": {
+				"navigationBarTitleText": "我的足迹"
+			}
+		},
+		{
+			"path": "pages/ucenter/order/order",
+			"style": {
+				"navigationBarTitleText": "我的订单"
+			}
+		},
+		{
+			"path": "pages/ucenter/orderDetail/orderDetail",
+			"style": {
+				"navigationBarTitleText": "订单详情"
+			}
+		},
+		{
+			"path": "pages/ucenter/couponList/couponList",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "我的优惠券"
+			}
+		},
+		{
+			"path": "pages/ucenter/couponSelect/couponSelect",
+			"style": {
+				"navigationBarTitleText": "选择优惠券"
+			}
+		},
+		{
+			"path": "pages/ucenter/collect/collect",
+			"style": {
+				"navigationBarTitleText": "我的收藏"
+			}
+		},
+		{
+			"path": "pages/auth/login/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
+		{
+			"path": "pages/auth/accountLogin/accountLogin",
+			"style": {
+				"navigationBarTitleText": "账号登录"
+			}
+		},
+		{
+			"path": "pages/auth/register/register",
+			"style": {
+				"navigationBarTitleText": "注册"
+			}
+		},
+		{
+			"path": "pages/auth/reset/reset",
+			"style": {
+				"navigationBarTitleText": "密码重置"
+			}
+		},
+		{
+			"path": "pages/payResult/payResult",
+			"style": {
+				"navigationBarTitleText": "付款结果",
+				"navigationBarBackgroundColor": "#fafafa"
+			}
+		},
+		{
+			"path": "pages/comment/comment",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "评价"
+			}
+		},
+		{
+			"path": "pages/commentPost/commentPost",
+			"style": {
+				"navigationBarTitleText": "评价"
+			}
+		},
+		{
+			"path": "pages/topic/topic",
+			"style": {
+				"navigationBarTitleText": "专题"
+			}
+		},
+		{
+			"path": "pages/topicComment/topicComment",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "评论"
+			}
+		},
+		{
+			"path": "pages/topicDetail/topicDetail",
+			"style": {
+				"navigationBarTitleText": "专题详情"
+			}
+		},
+		{
+			"path": "pages/topicCommentPost/topicCommentPost",
+			"style": {
+				"navigationBarTitleText": "评论"
+			}
+		},
+		{
+			"path": "pages/brand/brand",
+			"style": {
+				"navigationBarTitleText": "品牌商直供"
+			}
+		},
+		{
+			"path": "pages/brandDetail/brandDetail",
+			"style": {
+				"navigationBarTitleText": "品牌商详情"
+			}
+		},
+		{
+			"path": "pages/search/search",
+			"style": {
+				"navigationBarTitleText": "搜索"
+			}
+		},
+		{
+			"path": "pages/category/category",
+			"style": {}
+		},
+		{
+			"path": "pages/cart/cart",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "购物车"
+			}
+		},
+		{
+			"path": "pages/checkout/checkout",
+			"style": {
+				"navigationBarTitleText": "填写订单"
+			}
+		},
+		{
+			"path": "pages/goods/goods",
+			"style": {
+				"navigationBarTitleText": "商品详情"
+			}
+		},
+		{
+			"path": "pages/about/about",
+			"style": {}
+		},
+		{
+			"path": "pages/groupon/myGroupon/myGroupon",
+			"style": {
+				"navigationBarTitleText": "我的团购"
+			}
+		},
+		{
+			"path": "pages/groupon/grouponDetail/grouponDetail",
+			"style": {
+				"navigationBarTitleText": "团购详情"
+			}
+		},
+		{
+			"path": "pages/groupon/grouponList/grouponList",
+			"style": {
+				"navigationBarTitleText": "团购专区"
+			}
+		},
+		{
+			"path": "pages/coupon/coupon",
+			"style": {
+				"navigationBarTitleText": "优惠券专区"
+			}
+		},
+		{
+			"path": "pages/help/help",
+			"style": {
+				"navigationBarTitleText": "帮助中心"
+			}
+		},
+		{
+			"path": "pages/ucenter/aftersale/aftersale",
+			"style": {
+				"navigationBarTitleText": "售后"
+			}
+		},
+		{
+			"path": "pages/ucenter/aftersaleList/aftersaleList",
+			"style": {
+				"navigationBarTitleText": "我的售后"
+			}
+		},
+		{
+			"path": "pages/ucenter/aftersaleDetail/aftersaleDetail",
+			"style": {
+				"navigationBarTitleText": "售后详情"
+			}
+		}
+	],
+	"tabBar": {
+		"backgroundColor": "#fafafa",
+		"borderStyle": "white",
+		"selectedColor": "#AB956D",
+		"color": "#666",
+		"list": [
+			{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/images/home.png",
+				"selectedIconPath": "static/images/home@selected.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/catalog/catalog",
+				"iconPath": "static/images/category.png",
+				"selectedIconPath": "static/images/category@selected.png",
+				"text": "分类"
+			},
+			{
+				"pagePath": "pages/cart/cart",
+				"iconPath": "static/images/cart.png",
+				"selectedIconPath": "static/images/cart@selected.png",
+				"text": "购物车"
+			},
+			{
+				"pagePath": "pages/ucenter/index/index",
+				"iconPath": "static/images/my.png",
+				"selectedIconPath": "static/images/my@selected.png",
+				"text": "个人"
+			}
+		]
+	},
+	"networkTimeout": {
+		"request": 10000,
+		"connectSocket": 10000,
+		"uploadFile": 10000,
+		"downloadFile": 10000
+	},
+	"debug": true,
+	"sitemapLocation": "sitemap.json",
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			// "van-cell-group": "@/lib/vant-weapp2/cell-group/index.vue",
+			// "van-cell": "@/lib/vant-weapp2/cell/index.vue",
+			// "van-picker": "@/lib/vant-weapp2/picker/index.vue",
+			// "van-popup": "@/lib/vant-weapp2/popup/index.vue",
+			// "van-field": "@/lib/vant-weapp2/field/index.vue",
+			// "van-uploader": "@/lib/vant-weapp2/uploader/index.vue",
+			// "van-button": "@/lib/vant-weapp2/button/index.vue",
+			// "van-tag": "@/lib/vant-weapp2/tag/index.vue",
+			// "van-icon": "@/lib/vant-weapp2/icon/index.vue",
+			// "van-checkbox": "@/lib/vant-weapp2/checkbox/index.vue",
+			// "van-steps": "@/lib/vant-weapp2/steps/index.vue"
+		}
+	},
+	"globalStyle": {
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"navigationBarTitleText": "litemall小程序商城",
+		"enablePullDownRefresh": false,
+		"navigationBarTextStyle": "black",
+		"backgroundColor": "#FFFFFF",
+		"backgroundTextStyle": "dark",
+		"usingComponents": {
+			"van-cell-group": "/wxcomponents/vant-weapp/cell-group/index",
+			"van-cell": "/wxcomponents/vant-weapp/cell/index",
+			"van-picker": "/wxcomponents/vant-weapp/picker/index",
+			"van-popup": "/wxcomponents/vant-weapp/popup/index",
+			"van-field": "/wxcomponents/vant-weapp/field/index",
+			"van-uploader": "/wxcomponents/vant-weapp/uploader/index",
+			"van-button": "/wxcomponents/vant-weapp/button/index",
+			"van-tag": "/wxcomponents/vant-weapp/tag/index",
+			"van-icon": "/wxcomponents/vant-weapp/icon/index",
+			"van-checkbox": "/wxcomponents/vant-weapp/checkbox/index",
+			"van-steps": "/wxcomponents/vant-weapp/steps/index"
+		}
+	},
+	"subPackages": []
+}
\ No newline at end of file
diff --git a/litemall-wx_uni/pages/about/about.css b/litemall-wx_uni/pages/about/about.css
new file mode 100644
index 0000000000000000000000000000000000000000..9de850339119bb8c0eb58413a44db33dd1ff5548
--- /dev/null
+++ b/litemall-wx_uni/pages/about/about.css
@@ -0,0 +1,35 @@
+/* about.wxss */
+
+.label {
+    font-size: 26rpx;
+    margin-left: 20rpx;
+    padding: 10rpx 0;
+}
+
+.about-item {
+    background: white;
+    border-top: solid #f2f2f2 0.5rpx;
+    border-bottom: solid #f2f2f2 0.5rpx;
+    width: 100%;
+    height: 100rpx;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+.item-left {
+    font-size: 38rpx;
+    margin-left: 40rpx;
+    margin-top: auto;
+    margin-bottom: auto;
+}
+
+.item-right {
+    margin-right: 15rpx;
+    margin-top: auto;
+    margin-bottom: auto;
+}
+.right-icon {
+    width: 40rpx;
+    height: 40rpx;
+}
diff --git a/litemall-wx_uni/pages/about/about.vue b/litemall-wx_uni/pages/about/about.vue
new file mode 100644
index 0000000000000000000000000000000000000000..678108f3b5d78224c54a913b724e21e6f612036c
--- /dev/null
+++ b/litemall-wx_uni/pages/about/about.vue
@@ -0,0 +1,103 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/auth/accountLogin/accountLogin.css b/litemall-wx_uni/pages/auth/accountLogin/accountLogin.css
new file mode 100644
index 0000000000000000000000000000000000000000..4e61212c9ab8e63318592d4fa52b5fdac4915ccc
--- /dev/null
+++ b/litemall-wx_uni/pages/auth/accountLogin/accountLogin.css
@@ -0,0 +1,103 @@
+.form-box {
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    padding: 0 40rpx;
+    margin-top: 200rpx;
+    background: #fff;
+}
+
+.form-item {
+    position: relative;
+    background: #fff;
+    height: 96rpx;
+    border-bottom: 1px solid #d9d9d9;
+}
+
+.form-item .username,
+.form-item .password,
+.form-item .code {
+    position: absolute;
+    top: 26rpx;
+    left: 0;
+    display: block;
+    width: 100%;
+    height: 44rpx;
+    background: #fff;
+    color: #333;
+    font-size: 30rpx;
+}
+
+.form-item-code {
+    margin-top: 32rpx;
+    height: auto;
+    overflow: hidden;
+    width: 100%;
+}
+
+.form-item-code .form-item {
+    float: left;
+    width: 350rpx;
+}
+
+.form-item-code .code-img {
+    float: right;
+    margin-top: 4rpx;
+    height: 88rpx;
+    width: 236rpx;
+}
+
+.form-item .clear {
+    position: absolute;
+    top: 32rpx;
+    right: 18rpx;
+    z-index: 2;
+    display: block;
+    background: #fff;
+}
+
+.login-btn {
+    margin: 60rpx 0 40rpx 0;
+    height: 96rpx;
+    line-height: 96rpx;
+    font-size: 30rpx;
+    border-radius: 6rpx;
+    width: 90%;
+    color: #fff;
+    right: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: flex;
+    bottom: 0;
+    left: 0;
+    padding: 0;
+    margin-left: 5%;
+    text-align: center;
+    /* padding-left: -5rpx; */
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+    background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
+
+.form-item-text {
+    height: 35rpx;
+    width: 100%;
+}
+
+.form-item-text .register {
+    display: block;
+    height: 34rpx;
+    float: left;
+    font-size: 28rpx;
+}
+
+.form-item-text .reset {
+    display: block;
+    height: 34rpx;
+    float: right;
+    font-size: 28rpx;
+}
diff --git a/litemall-wx_uni/pages/auth/accountLogin/accountLogin.vue b/litemall-wx_uni/pages/auth/accountLogin/accountLogin.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b28809fd295f511226686bac67d055403e67b01f
--- /dev/null
+++ b/litemall-wx_uni/pages/auth/accountLogin/accountLogin.vue
@@ -0,0 +1,161 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/auth/login/login.css b/litemall-wx_uni/pages/auth/login/login.css
new file mode 100644
index 0000000000000000000000000000000000000000..7720984bbc7d8f2b2b81fe18e6ad3e775b3d9b11
--- /dev/null
+++ b/litemall-wx_uni/pages/auth/login/login.css
@@ -0,0 +1,61 @@
+.login-box {
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    padding: 0 40rpx;
+    margin-top: 200rpx;
+    background: #fff;
+}
+
+.wx-login-btn {
+    margin: 60rpx 0 40rpx 0;
+    height: 96rpx;
+    line-height: 96rpx;
+    font-size: 30rpx;
+    border-radius: 6rpx;
+    width: 90%;
+    color: #fff;
+    right: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: flex;
+    bottom: 0;
+    left: 0;
+    padding: 0;
+    margin-left: 5%;
+    text-align: center;
+    /* padding-left: -5rpx; */
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+}
+
+.account-login-btn {
+    width: 90%;
+    margin: 0 auto;
+    color: #fff;
+    font-size: 30rpx;
+    height: 96rpx;
+    line-height: 96rpx;
+    right: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: flex;
+    bottom: 0;
+    left: 0;
+    border-radius: 0;
+    padding: 0;
+    margin-left: 5%;
+    text-align: center;
+    /* padding-left: -5rpx; */
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+    background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
diff --git a/litemall-wx_uni/pages/auth/login/login.vue b/litemall-wx_uni/pages/auth/login/login.vue
new file mode 100644
index 0000000000000000000000000000000000000000..51a1d7c8d61a971d5b12b7228d585cfeb167ae94
--- /dev/null
+++ b/litemall-wx_uni/pages/auth/login/login.vue
@@ -0,0 +1,94 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/auth/register/register.css b/litemall-wx_uni/pages/auth/register/register.css
new file mode 100644
index 0000000000000000000000000000000000000000..0c1e0d5527199a25db6cb244e17c9d505a036a26
--- /dev/null
+++ b/litemall-wx_uni/pages/auth/register/register.css
@@ -0,0 +1,70 @@
+.form-box {
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    padding: 0 40rpx;
+    margin-top: 96rpx;
+    background: #fff;
+}
+
+.form-item {
+    position: relative;
+    background: #fff;
+    height: 96rpx;
+    border-bottom: 1px solid #d9d9d9;
+}
+
+.form-item .username,
+.form-item .password,
+.form-item .mobile,
+.form-item .code {
+    position: absolute;
+    top: 26rpx;
+    left: 0;
+    display: block;
+    width: 100%;
+    height: 44rpx;
+    background: #fff;
+    color: #333;
+    font-size: 30rpx;
+}
+
+.form-item-code {
+    margin-top: 32rpx;
+    height: auto;
+    overflow: hidden;
+    width: 100%;
+}
+
+.form-item-code .form-item {
+    float: left;
+    width: 350rpx;
+}
+
+.form-item-code .code-btn {
+    float: right;
+    padding: 20rpx 40rpx;
+    border: 1px solid #d9d9d9;
+    border-radius: 10rpx;
+    color: #fff;
+    background: green;
+}
+
+.form-item .clear {
+    position: absolute;
+    top: 32rpx;
+    right: 18rpx;
+    z-index: 2;
+    display: block;
+    background: #fff;
+}
+
+.register-btn {
+    margin: 60rpx 0 40rpx 0;
+    height: 96rpx;
+    line-height: 96rpx;
+    color: #fff;
+    font-size: 30rpx;
+    width: 100%;
+    border-radius: 6rpx;
+}
diff --git a/litemall-wx_uni/pages/auth/register/register.vue b/litemall-wx_uni/pages/auth/register/register.vue
new file mode 100644
index 0000000000000000000000000000000000000000..349d16cdcae1c161ea2bfb158c8b1d15ea6a8ba5
--- /dev/null
+++ b/litemall-wx_uni/pages/auth/register/register.vue
@@ -0,0 +1,269 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/auth/reset/reset.css b/litemall-wx_uni/pages/auth/reset/reset.css
new file mode 100644
index 0000000000000000000000000000000000000000..8a03a4b6149d02de1a03dbaae39a727a572cee0b
--- /dev/null
+++ b/litemall-wx_uni/pages/auth/reset/reset.css
@@ -0,0 +1,68 @@
+.form-box {
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    padding: 0 40rpx;
+    margin-top: 96rpx;
+    background: #fff;
+}
+
+.form-item {
+    position: relative;
+    background: #fff;
+    height: 96rpx;
+    border-bottom: 1px solid #d9d9d9;
+}
+
+.form-item .mobile,
+.form-item .password,
+.form-item .code {
+    position: absolute;
+    top: 26rpx;
+    left: 0;
+    display: block;
+    width: 100%;
+    height: 44rpx;
+    background: #fff;
+    color: #333;
+    font-size: 30rpx;
+}
+
+.form-item-code {
+    margin-top: 32rpx;
+    height: auto;
+    overflow: hidden;
+    width: 100%;
+}
+
+.form-item-code .form-item {
+    float: left;
+    width: 350rpx;
+}
+
+.form-item-code .code-btn {
+    float: right;
+    padding: 20rpx 40rpx;
+    border: 1px solid #d9d9d9;
+    border-radius: 10rpx;
+}
+
+.form-item .clear {
+    position: absolute;
+    top: 32rpx;
+    right: 18rpx;
+    z-index: 2;
+    display: block;
+    background: #fff;
+}
+
+.reset-btn {
+    margin: 60rpx 0 40rpx 0;
+    height: 96rpx;
+    line-height: 96rpx;
+    color: #fff;
+    font-size: 30rpx;
+    width: 100%;
+    background: #b4282d;
+    border-radius: 6rpx;
+}
diff --git a/litemall-wx_uni/pages/auth/reset/reset.vue b/litemall-wx_uni/pages/auth/reset/reset.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d6cf30de927cebada3c38ef1eba139a3add631b5
--- /dev/null
+++ b/litemall-wx_uni/pages/auth/reset/reset.vue
@@ -0,0 +1,210 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/brand/brand.css b/litemall-wx_uni/pages/brand/brand.css
new file mode 100644
index 0000000000000000000000000000000000000000..0aa6ab32aeafcef57b9bfa3bf7ff9d2696783cb2
--- /dev/null
+++ b/litemall-wx_uni/pages/brand/brand.css
@@ -0,0 +1,52 @@
+.brand-list .item {
+    display: block;
+    width: 750rpx;
+    height: 416rpx;
+    position: relative;
+    margin-bottom: 4rpx;
+}
+
+.brand-list .item .img-bg {
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 0;
+    width: 750rpx;
+    height: 417rpx;
+    overflow: hidden;
+}
+
+.brand-list .item .img-bg image {
+    width: 750rpx;
+    height: 416rpx;
+}
+
+.brand-list .item .txt-box {
+    position: absolute;
+    left: 0;
+    top: 0;
+    display: table;
+    z-index: 0;
+    width: 750rpx;
+    height: 417rpx;
+}
+
+.brand-list .item .line {
+    display: table-cell;
+    vertical-align: middle;
+    text-align: center;
+    height: 63rpx;
+    line-height: 63rpx;
+}
+
+.brand-list .item .line text {
+    font-size: 35rpx;
+    font-weight: 700;
+    text-shadow: 1rpx 1rpx rgba(0, 0, 0, 0.32);
+    color: #fff;
+}
+
+.brand-list .item .line .s {
+    padding: 0 10rpx;
+    font-size: 40rpx;
+}
diff --git a/litemall-wx_uni/pages/brand/brand.vue b/litemall-wx_uni/pages/brand/brand.vue
new file mode 100644
index 0000000000000000000000000000000000000000..da7876b4f705123e12de9b645ce36a6c53f3f382
--- /dev/null
+++ b/litemall-wx_uni/pages/brand/brand.vue
@@ -0,0 +1,86 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/brandDetail/brandDetail.css b/litemall-wx_uni/pages/brandDetail/brandDetail.css
new file mode 100644
index 0000000000000000000000000000000000000000..972e66e0fef30d78eb42501a979cf02af2f916e0
--- /dev/null
+++ b/litemall-wx_uni/pages/brandDetail/brandDetail.css
@@ -0,0 +1,111 @@
+page {
+    background: #f4f4f4;
+}
+
+.brand-info .name {
+    width: 100%;
+    height: 290rpx;
+    position: relative;
+}
+
+.brand-info .img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 290rpx;
+}
+
+.brand-info .info-box {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 290rpx;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.brand-info .info {
+    display: block;
+}
+
+.brand-info .txt {
+    display: block;
+    height: 37.5rpx;
+    font-size: 37.5rpx;
+    color: #fff;
+}
+
+.brand-info .line {
+    margin: 0 auto;
+    margin-top: 16rpx;
+    display: block;
+    height: 2rpx;
+    width: 145rpx;
+    background: #fff;
+}
+
+.brand-info .desc {
+    background: #fff;
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    padding: 41.5rpx 31.25rpx;
+    font-size: 30rpx;
+    color: #666;
+    line-height: 41.5rpx;
+    text-align: center;
+}
+
+.cate-item .b {
+    width: 750rpx;
+    height: auto;
+    overflow: hidden;
+    border-top: 1rpx solid #f4f4f4;
+    margin-top: 20rpx;
+}
+
+.cate-item .b .item {
+    float: left;
+    background: #fff;
+    width: 375rpx;
+    padding-bottom: 33.333rpx;
+    border-bottom: 1rpx solid #f4f4f4;
+    height: auto;
+    overflow: hidden;
+    text-align: center;
+}
+
+.cate-item .b .item-b {
+    border-right: 1rpx solid #f4f4f4;
+}
+
+.cate-item .item .img {
+    margin-top: 10rpx;
+    width: 302rpx;
+    height: 302rpx;
+}
+
+.cate-item .item .name {
+    display: block;
+    width: 365.625rpx;
+    height: 35rpx;
+    padding: 0 20rpx;
+    overflow: hidden;
+    margin: 11.5rpx 0 22rpx 0;
+    text-align: center;
+    font-size: 30rpx;
+    color: #333;
+}
+
+.cate-item .item .price {
+    display: block;
+    width: 365.625rpx;
+    height: 30rpx;
+    text-align: center;
+    font-size: 30rpx;
+    color: #b4282d;
+}
diff --git a/litemall-wx_uni/pages/brandDetail/brandDetail.vue b/litemall-wx_uni/pages/brandDetail/brandDetail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..afc8c81b1b4d219dc14ffb33ef3c5e0ecf1fccd1
--- /dev/null
+++ b/litemall-wx_uni/pages/brandDetail/brandDetail.vue
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/cart/cart.css b/litemall-wx_uni/pages/cart/cart.css
new file mode 100644
index 0000000000000000000000000000000000000000..e668bc4428a1722885efc9f21cd8382c8c1cefd2
--- /dev/null
+++ b/litemall-wx_uni/pages/cart/cart.css
@@ -0,0 +1,492 @@
+page {
+    height: 100%;
+    min-height: 100%;
+    background: #f4f4f4;
+}
+
+.container {
+    background: #f4f4f4;
+    width: 100%;
+    height: auto;
+    min-height: 100%;
+    overflow: hidden;
+}
+
+.service-policy {
+    width: 750rpx;
+    height: 73rpx;
+    background: #f4f4f4;
+    padding: 0 31.25rpx;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.service-policy .item {
+    background-size: 10rpx;
+    padding-left: 15rpx;
+    display: flex;
+    align-items: center;
+    font-size: 25rpx;
+    color: #666;
+}
+
+.no-login {
+    width: 100%;
+    height: auto;
+    margin: 0 auto;
+}
+
+.no-login .c {
+    width: 100%;
+    height: auto;
+    margin-top: 400rpx;
+}
+
+.no-login .c text {
+    margin: 0 auto;
+    display: block;
+    width: 258rpx;
+    height: 59rpx;
+    line-height: 29rpx;
+    text-align: center;
+    font-size: 35rpx;
+    color: #999;
+}
+
+.no-login button {
+    width: 90%;
+    margin: 0 auto;
+    color: #fff;
+    font-size: 30rpx;
+    height: 96rpx;
+    line-height: 96rpx;
+    right: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: flex;
+    bottom: 0;
+    left: 0;
+    border-radius: 0;
+    padding: 0;
+    margin-left: 5%;
+    text-align: center;
+    /* padding-left: -5rpx; */
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+    background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
+
+.no-cart {
+    width: 100%;
+    height: auto;
+    margin: 0 auto;
+}
+
+.no-cart .c {
+    width: 100%;
+    height: auto;
+    margin-top: 400rpx;
+}
+
+.no-cart .c text {
+    margin: 0 auto;
+    display: block;
+    width: 258rpx;
+    height: 29rpx;
+    line-height: 29rpx;
+    text-align: center;
+    font-size: 29rpx;
+    color: #999;
+}
+
+.cart-view {
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+}
+
+.cart-view .list {
+    height: auto;
+    width: 100%;
+    overflow: hidden;
+    margin-bottom: 120rpx;
+}
+
+.cart-view .group-item {
+    height: auto;
+    width: 100%;
+    background: #fff;
+    margin-bottom: 18rpx;
+}
+
+.cart-view .item {
+    height: 164rpx;
+    width: 100%;
+    overflow: hidden;
+}
+
+.cart-view .item .van-checkbox {
+    float: left;
+    margin: 65rpx 18rpx 65rpx 18rpx;
+}
+
+.cart-view .item .van-checkbox .van-icon {
+    color: #fff;
+}
+
+.cart-view .item .cart-goods {
+    float: left;
+    height: 164rpx;
+    width: 672rpx;
+    border-bottom: 1px solid #f4f4f4;
+}
+
+.cart-view .item .img {
+    float: left;
+    height: 125rpx;
+    width: 125rpx;
+    background: #f4f4f4;
+    margin: 19.5rpx 18rpx 19.5rpx 0;
+}
+
+.cart-view .item .info {
+    float: left;
+    height: 125rpx;
+    width: 503rpx;
+    margin: 19.5rpx 26rpx 19.5rpx 0;
+}
+
+.cart-view .item .t {
+    margin: 8rpx 0;
+    height: 28rpx;
+    font-size: 25rpx;
+    color: #333;
+    overflow: hidden;
+}
+
+.cart-view .item .name {
+    height: 28rpx;
+    max-width: 310rpx;
+    line-height: 28rpx;
+    font-size: 25rpx;
+    color: #333;
+    overflow: hidden;
+}
+
+.cart-view .item .num {
+    height: 28rpx;
+    line-height: 28rpx;
+    float: right;
+}
+
+.cart-view .item .attr {
+    margin-bottom: 17rpx;
+    height: 24rpx;
+    line-height: 24rpx;
+    font-size: 22rpx;
+    color: #666;
+    overflow: hidden;
+}
+
+.cart-view .item .b {
+    height: 28rpx;
+    line-height: 28rpx;
+    font-size: 25rpx;
+    color: #333;
+    overflow: hidden;
+}
+
+.cart-view .item .price {
+    float: left;
+}
+
+.cart-view .item.edit .t {
+    display: none;
+}
+
+.cart-view .item.edit .attr {
+    text-align: right;
+    padding-right: 25rpx;
+    background-size: 12rpx 20rpx;
+    margin-bottom: 24rpx;
+    height: 39rpx;
+    line-height: 39rpx;
+    font-size: 24rpx;
+    color: #999;
+    overflow: hidden;
+}
+
+.cart-view .item.edit .b {
+    display: flex;
+    height: 52rpx;
+    overflow: hidden;
+}
+
+.cart-view .item.edit .price {
+    line-height: 52rpx;
+    height: 52rpx;
+    flex: 1;
+}
+
+.cart-view .item .selnum {
+    display: none;
+}
+
+.cart-view .item.edit .selnum {
+    width: 235rpx;
+    height: 52rpx;
+    border: 1rpx solid #ccc;
+    display: flex;
+}
+
+.selnum .cut {
+    width: 70rpx;
+    height: 100%;
+    text-align: center;
+    line-height: 50rpx;
+}
+
+.selnum .number {
+    flex: 1;
+    height: 100%;
+    text-align: center;
+    line-height: 68.75rpx;
+    border-left: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+    float: left;
+}
+
+.selnum .add {
+    width: 80rpx;
+    height: 100%;
+    text-align: center;
+    line-height: 50rpx;
+}
+
+.cart-view .group-item .header {
+    width: 100%;
+    height: 94rpx;
+    line-height: 94rpx;
+    padding: 0 26rpx;
+    border-bottom: 1px solid #f4f4f4;
+}
+
+.cart-view .promotion .icon {
+    display: inline-block;
+    height: 24rpx;
+    width: 15rpx;
+}
+
+.cart-view .promotion {
+    margin-top: 25.5rpx;
+    float: left;
+    height: 43rpx;
+    width: 480rpx;
+    /*margin-right: 84rpx;*/
+    line-height: 43rpx;
+    font-size: 0;
+}
+
+.cart-view .promotion .tag {
+    border: 1px solid #f48f18;
+    height: 37rpx;
+    line-height: 31rpx;
+    padding: 0 9rpx;
+    margin-right: 10rpx;
+    color: #f48f18;
+    font-size: 24.5rpx;
+}
+
+.cart-view .promotion .txt {
+    height: 43rpx;
+    line-height: 43rpx;
+    padding-right: 10rpx;
+    color: #333;
+    font-size: 29rpx;
+    overflow: hidden;
+}
+
+.cart-view .get {
+    margin-top: 18rpx;
+    float: right;
+    height: 58rpx;
+    padding-left: 14rpx;
+    border-left: 1px solid #d9d9d9;
+    line-height: 58rpx;
+    font-size: 29rpx;
+    color: #333;
+}
+
+.cart-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    height: 100rpx;
+    width: 100%;
+    background: #fff;
+    display: flex;
+}
+
+.cart-bottom .van-checkbox {
+    float: left;
+    margin: 33rpx 18rpx 33rpx 26rpx;
+    font-size: 29rpx;
+}
+
+.cart-bottom .van-checkbox .van-icon {
+    color: #fff;
+}
+
+.cart-bottom .total {
+    height: 34rpx;
+    flex: 1;
+    margin: 33rpx 10rpx;
+    font-size: 29rpx;
+}
+
+.cart-bottom .delete {
+    text-align: center;
+    width: 180rpx;
+    height: 80rpx;
+    line-height: 82rpx;
+    padding: 0;
+    margin: 0;
+    margin-left: -5rpx;
+    padding-right: 25rpx;
+    font-size: 25rpx;
+    color: #f4f4f4;
+    /* text-align: center; */
+    border-top-left-radius: 0rpx;
+    border-bottom-left-radius: 0rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+    background-image: linear-gradient(to right, #9a9ba1 0%, #ae8b9c 100%);
+}
+
+.cart-bottom .checkout {
+    height: 100rpx;
+    width: 210rpx;
+    text-align: center;
+    line-height: 100rpx;
+    font-size: 29rpx;
+    background: #b4282d;
+    color: #fff;
+}
+
+.action_btn_area {
+    /* border: 1px solid #333; */
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    right: 0;
+    top: 0;
+    width: 380rpx;
+    height: 100rpx;
+}
+
+.action_btn_area .edit {
+    width: 140rpx;
+    /* border: 1px solid #000; */
+    height: 80rpx;
+    line-height: 82rpx;
+    padding: 0;
+    margin: 0;
+    margin-right: 5rpx;
+    text-align: center;
+    /* padding-left: 25rpx; */
+    font-size: 25rpx;
+    color: #f4f4f4;
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+    /* background-image: linear-gradient(to right, #ff7701 100%); */
+    background-image: linear-gradient(to right, #ab956d 0%, #ab956d 100%);
+}
+
+.action_btn_area .checkout {
+    width: 140rpx;
+    height: 80rpx;
+    line-height: 82rpx;
+    padding: 0;
+    margin: 0;
+    margin-left: 5rpx;
+    /* padding-right: 25rpx; */
+    font-size: 25rpx;
+    color: #f4f4f4;
+    text-align: center;
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+    background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
+
+.action_btn_area .delete {
+    width: 140rpx;
+    /* border: 1px solid #000; */
+    height: 80rpx;
+    line-height: 82rpx;
+    padding: 0;
+    margin: 0;
+    margin-right: 5rpx;
+    text-align: center;
+    padding-left: -5rpx;
+    font-size: 25rpx;
+    color: #f4f4f4;
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+    background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
+
+.action_btn_area .sure {
+    text-align: center;
+    width: 140rpx;
+    height: 80rpx;
+    line-height: 82rpx;
+    padding: 0;
+    margin: 0;
+    margin-right: 10rpx;
+    padding-left: -5rpx;
+    font-size: 25rpx;
+    color: #f4f4f4;
+    /* text-align: center; */
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+    background-image: linear-gradient(to right, #ab956d 0%, #ab956d 100%);
+    /* background-image: linear-gradient(to right, #ff7701 0%, #fe4800 100%); */
+}
+
+.auth_btn {
+    position: fixed;
+    top: 55vh;
+    left: 10vw;
+    width: 80vw;
+    height: 96rpx;
+    line-height: 96rpx;
+    font-size: 25rpx;
+    color: #f4f4f4;
+    /* text-align: center; */
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+    letter-spacing: 3rpx;
+    background-image: linear-gradient(to right, #8baaaa 0%, #9a9ba1 100%);
+}
diff --git a/litemall-wx_uni/pages/cart/cart.vue b/litemall-wx_uni/pages/cart/cart.vue
new file mode 100644
index 0000000000000000000000000000000000000000..4979bc0f2277b105563aad7923376728443e88ee
--- /dev/null
+++ b/litemall-wx_uni/pages/cart/cart.vue
@@ -0,0 +1,391 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/catalog/catalog.css b/litemall-wx_uni/pages/catalog/catalog.css
new file mode 100644
index 0000000000000000000000000000000000000000..3992be44fa8219a13241d96cd271a0a5a7d90d9e
--- /dev/null
+++ b/litemall-wx_uni/pages/catalog/catalog.css
@@ -0,0 +1,160 @@
+page {
+    height: 100%;
+}
+
+.container {
+    background: #f9f9f9;
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+}
+
+.search {
+    height: 88rpx;
+    width: 100%;
+    padding: 0 30rpx;
+    background: #fff;
+    display: flex;
+    align-items: center;
+}
+
+.search .input {
+    width: 690rpx;
+    height: 56rpx;
+    background: #ededed;
+    border-radius: 8rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.search .van-icon-search {
+    line-height: 56rpx;
+}
+
+.search .txt {
+    height: 42rpx;
+    line-height: 42rpx;
+    color: #666;
+    padding-left: 10rpx;
+    font-size: 30rpx;
+}
+
+.catalog {
+    flex: 1;
+    width: 100%;
+    background: #fff;
+    display: flex;
+    border-top: 1px solid #fafafa;
+}
+
+.catalog .nav {
+    width: 162rpx;
+    height: 100%;
+}
+
+.catalog .nav .item {
+    text-align: center;
+    line-height: 90rpx;
+    width: 162rpx;
+    height: 90rpx;
+    color: #333;
+    font-size: 28rpx;
+    border-left: 6rpx solid #fff;
+}
+
+.catalog .nav .item.active {
+    color: #ab956d;
+    font-size: 36rpx;
+    border-left: 6rpx solid #ab956d;
+}
+
+.catalog .cate {
+    border-left: 1px solid #fafafa;
+    flex: 1;
+    height: 100%;
+    padding: 0 30rpx 0 30rpx;
+}
+
+.banner {
+    display: block;
+    height: 222rpx;
+    width: 100%;
+    position: relative;
+}
+
+.banner .image {
+    position: absolute;
+    top: 30rpx;
+    left: 0;
+    border-radius: 4rpx;
+    height: 192rpx;
+    width: 100%;
+}
+
+.banner .txt {
+    position: absolute;
+    top: 30rpx;
+    text-align: center;
+    color: #fff;
+    font-size: 28rpx;
+    left: 0;
+    height: 192rpx;
+    line-height: 192rpx;
+    width: 100%;
+}
+
+.catalog .hd {
+    height: 108rpx;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.catalog .hd .txt {
+    font-size: 24rpx;
+    text-align: center;
+    color: #333;
+    padding: 0 10rpx;
+    width: auto;
+}
+
+.catalog .hd .line {
+    width: 40rpx;
+    height: 1px;
+    background: #d9d9d9;
+}
+
+.catalog .bd {
+    height: auto;
+    width: 100%;
+    overflow: hidden;
+}
+
+.catalog .bd .item {
+    display: block;
+    float: left;
+    height: 216rpx;
+    width: 144rpx;
+    margin-right: 34rpx;
+}
+
+.catalog .bd .item.last {
+    margin-right: 0;
+}
+
+.catalog .bd .item .icon {
+    height: 144rpx;
+    width: 144rpx;
+}
+
+.catalog .bd .item .txt {
+    display: block;
+    text-align: center;
+    font-size: 24rpx;
+    color: #333;
+    height: 72rpx;
+    width: 144rpx;
+}
diff --git a/litemall-wx_uni/pages/catalog/catalog.vue b/litemall-wx_uni/pages/catalog/catalog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3188f9fc9ac1911b35b47a1e01b2f8adff371fa7
--- /dev/null
+++ b/litemall-wx_uni/pages/catalog/catalog.vue
@@ -0,0 +1,143 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/category/category.css b/litemall-wx_uni/pages/category/category.css
new file mode 100644
index 0000000000000000000000000000000000000000..99e98212464722cfaabb3ff8fb16b3a2bcb6590e
--- /dev/null
+++ b/litemall-wx_uni/pages/category/category.css
@@ -0,0 +1,118 @@
+.container {
+    background: #f9f9f9;
+}
+
+.cate-nav {
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 1000;
+}
+
+.cate-nav-body {
+    height: 84rpx;
+    white-space: nowrap;
+    background: #fff;
+    border-top: 1px solid rgba(0, 0, 0, 0.15);
+    overflow: hidden;
+}
+
+.cate-nav .item {
+    display: inline-block;
+    height: 84rpx;
+    min-width: 130rpx;
+    padding: 0 15rpx;
+}
+
+.cate-nav .item .name {
+    display: block;
+    height: 84rpx;
+    padding: 0 20rpx;
+    line-height: 84rpx;
+    color: #333;
+    font-size: 30rpx;
+    width: auto;
+}
+
+.cate-nav .item.active .name {
+    color: #ab956d;
+    border-bottom: 2px solid #ab956d;
+}
+
+.cate-item {
+    margin-top: 94rpx;
+    height: auto;
+    overflow: hidden;
+}
+
+.cate-item .h {
+    height: 145rpx;
+    width: 750rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+
+.cate-item .h .name {
+    display: block;
+    height: 35rpx;
+    margin-bottom: 18rpx;
+    font-size: 30rpx;
+    color: #333;
+}
+
+.cate-item .h .desc {
+    display: block;
+    height: 24rpx;
+    font-size: 24rpx;
+    color: #999;
+}
+
+.cate-item .b {
+    width: 750rpx;
+    padding: 0 6.25rpx;
+    height: auto;
+    overflow: hidden;
+}
+
+.cate-item .b .item {
+    float: left;
+    background: #fff;
+    width: 365rpx;
+    margin-bottom: 6.25rpx;
+    padding-bottom: 33.333rpx;
+    height: auto;
+    overflow: hidden;
+    text-align: center;
+}
+
+.cate-item .b .item-b {
+    margin-left: 6.25rpx;
+}
+
+.cate-item .item .img {
+    width: 302rpx;
+    height: 302rpx;
+}
+
+.cate-item .item .name {
+    display: block;
+    width: 365.625rpx;
+    height: 35rpx;
+    margin: 11.5rpx 0 22rpx 0;
+    text-align: center;
+    overflow: hidden;
+    padding: 0 20rpx;
+    font-size: 30rpx;
+    color: #333;
+}
+
+.cate-item .item .price {
+    display: block;
+    width: 365.625rpx;
+    height: 30rpx;
+    text-align: center;
+    font-size: 30rpx;
+    color: #ab956d;
+}
diff --git a/litemall-wx_uni/pages/category/category.vue b/litemall-wx_uni/pages/category/category.vue
new file mode 100644
index 0000000000000000000000000000000000000000..9b8cb4e7464b2cadf2fff84d47ddb90d74019449
--- /dev/null
+++ b/litemall-wx_uni/pages/category/category.vue
@@ -0,0 +1,215 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/checkout/checkout.css b/litemall-wx_uni/pages/checkout/checkout.css
new file mode 100644
index 0000000000000000000000000000000000000000..d7dbb738bbc334c827af5d519ba8283f7be66d8d
--- /dev/null
+++ b/litemall-wx_uni/pages/checkout/checkout.css
@@ -0,0 +1,310 @@
+page {
+    height: 100%;
+    background: #f4f4f4;
+}
+
+.address-box {
+    width: 100%;
+    height: 166.55rpx;
+    background-size: 62.5rpx 10.5rpx;
+    margin-bottom: 20rpx;
+    padding-top: 10.5rpx;
+}
+
+.address-item {
+    display: flex;
+    height: 155.55rpx;
+    background: #fff;
+    padding: 41.6rpx 0 41.6rpx 31.25rpx;
+}
+
+.address-item.address-empty {
+    line-height: 75rpx;
+    text-align: center;
+}
+
+.address-box .l {
+    width: 125rpx;
+    height: 100%;
+}
+
+.address-box .l .name {
+    margin-left: 6.25rpx;
+    margin-top: -7.25rpx;
+    display: block;
+    width: 125rpx;
+    height: 43rpx;
+    line-height: 43rpx;
+    font-size: 30rpx;
+    color: #333;
+    margin-bottom: 5rpx;
+}
+
+.address-box .l .default {
+    margin-left: 6.25rpx;
+    display: block;
+    width: 62rpx;
+    height: 33rpx;
+    border-radius: 5rpx;
+    border: 1px solid #b4282d;
+    font-size: 20.5rpx;
+    text-align: center;
+    line-height: 29rpx;
+    color: #b4282d;
+}
+
+.address-box .m {
+    flex: 1;
+    height: 72.25rpx;
+    color: #999;
+}
+
+.address-box .mobile {
+    display: block;
+    height: 29rpx;
+    line-height: 29rpx;
+    margin-bottom: 6.25rpx;
+    font-size: 30rpx;
+    color: #333;
+}
+
+.address-box .address {
+    display: block;
+    height: 37.5rpx;
+    line-height: 37.5rpx;
+    font-size: 25rpx;
+    color: #666;
+}
+
+.address-box .r {
+    width: 77rpx;
+    height: 77rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.address-box .r image {
+    width: 52.078rpx;
+    height: 52.078rpx;
+}
+
+.coupon-box {
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    background: #fff;
+}
+
+.coupon-box .coupon-item {
+    width: 100%;
+    height: 108.3rpx;
+    overflow: hidden;
+    background: #fff;
+    display: flex;
+    padding-left: 31.25rpx;
+}
+
+.coupon-box .l {
+    flex: 1;
+    height: 43rpx;
+    line-height: 43rpx;
+    padding-top: 35rpx;
+}
+
+.coupon-box .l .name {
+    float: left;
+    font-size: 30rpx;
+    color: #666;
+}
+
+.coupon-box .l .txt {
+    float: right;
+    font-size: 30rpx;
+    color: #666;
+}
+
+.coupon-box .r {
+    margin-top: 15.5rpx;
+    width: 77rpx;
+    height: 77rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.coupon-box .r image {
+    width: 52.078rpx;
+    height: 52.078rpx;
+}
+
+.message-box {
+    margin-top: 20rpx;
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    background: #fff;
+}
+
+.message-box .message-item {
+    height: 52.078rpx;
+    overflow: hidden;
+    background: #fff;
+    display: flex;
+    margin-left: 31.25rpx;
+    padding-right: 31.25rpx;
+    padding-top: 26rpx;
+}
+
+.order-box {
+    margin-top: 20rpx;
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    background: #fff;
+}
+
+.order-box .order-item {
+    height: 104.3rpx;
+    overflow: hidden;
+    background: #fff;
+    display: flex;
+    margin-left: 31.25rpx;
+    padding-right: 31.25rpx;
+    padding-top: 26rpx;
+    border-bottom: 1px solid #d9d9d9;
+}
+
+.order-box .order-item .l {
+    float: left;
+    height: 52rpx;
+    width: 50%;
+    line-height: 52rpx;
+    overflow: hidden;
+}
+
+.order-box .order-item .r {
+    float: right;
+    text-align: right;
+    width: 50%;
+    height: 52rpx;
+    line-height: 52rpx;
+    overflow: hidden;
+}
+
+.order-box .order-item.no-border {
+    border-bottom: none;
+}
+
+.goods-items {
+    margin-top: 20rpx;
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    background: #fff;
+    padding-left: 31.25rpx;
+    margin-bottom: 120rpx;
+}
+
+.goods-items .item {
+    height: 192rpx;
+    padding-right: 31.25rpx;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.15);
+}
+
+.goods-items .item.no-border {
+    border-bottom: none;
+}
+
+.goods-items .item:last-child {
+    border-bottom: none;
+}
+
+.goods-items .img {
+    height: 145.83rpx;
+    width: 145.83rpx;
+    background-color: #f4f4f4;
+    margin-right: 20rpx;
+}
+
+.goods-items .img image {
+    height: 145.83rpx;
+    width: 145.83rpx;
+}
+
+.goods-items .info {
+    flex: 1;
+    height: 145.83rpx;
+    padding-top: 5rpx;
+}
+
+.goods-items .t {
+    height: 33rpx;
+    line-height: 33rpx;
+    margin-bottom: 10rpx;
+    overflow: hidden;
+    font-size: 30rpx;
+    color: #333;
+}
+
+.goods-items .t .name {
+    display: block;
+    float: left;
+}
+
+.goods-items .t .number {
+    display: block;
+    float: right;
+    text-align: right;
+}
+
+.goods-items .m {
+    height: 29rpx;
+    overflow: hidden;
+    line-height: 29rpx;
+    margin-bottom: 25rpx;
+    font-size: 25rpx;
+    color: #666;
+}
+
+.goods-items .b {
+    height: 41rpx;
+    overflow: hidden;
+    line-height: 41rpx;
+    font-size: 30rpx;
+    color: #333;
+}
+
+.order-total {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 100rpx;
+    width: 100%;
+    display: flex;
+}
+
+.order-total .l {
+    flex: 1;
+    height: 100rpx;
+    line-height: 100rpx;
+    color: #b4282d;
+    background: #fff;
+    font-size: 33rpx;
+    padding-left: 31.25rpx;
+    border-top: 1rpx solid rgba(0, 0, 0, 0.2);
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.2);
+}
+
+.order-total .r {
+    width: 233rpx;
+    height: 100rpx;
+    background: #b4282d;
+    border: 1px solid #b4282d;
+    line-height: 100rpx;
+    text-align: center;
+    color: #fff;
+    font-size: 30rpx;
+}
diff --git a/litemall-wx_uni/pages/checkout/checkout.vue b/litemall-wx_uni/pages/checkout/checkout.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b51de05a54a14a434a988353b39191231fa1f865
--- /dev/null
+++ b/litemall-wx_uni/pages/checkout/checkout.vue
@@ -0,0 +1,346 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/comment/comment.css b/litemall-wx_uni/pages/comment/comment.css
new file mode 100644
index 0000000000000000000000000000000000000000..10baf4cc9165f4cde65df965a649fddf66655277
--- /dev/null
+++ b/litemall-wx_uni/pages/comment/comment.css
@@ -0,0 +1,155 @@
+.comments {
+    width: 100%;
+    height: auto;
+    padding-left: 30rpx;
+    background: #fff;
+    margin: 20rpx 0;
+}
+
+.comments .h {
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 1000;
+    width: 100%;
+    display: flex;
+    background: #fff;
+    height: 84rpx;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.15);
+}
+
+.comments .h .item {
+    display: inline-block;
+    height: 82rpx;
+    width: 50%;
+    padding: 0 15rpx;
+    text-align: center;
+}
+
+.comments .h .item .txt {
+    display: inline-block;
+    height: 82rpx;
+    padding: 0 20rpx;
+    line-height: 82rpx;
+    color: #333;
+    font-size: 30rpx;
+    width: 170rpx;
+}
+
+.comments .h .item.active .txt {
+    color: #ab2b2b;
+    border-bottom: 4rpx solid #ab2b2b;
+}
+
+.comments .b {
+    margin-top: 85rpx;
+    height: auto;
+    width: 720rpx;
+}
+
+.comments .b.no-h {
+    margin-top: 0;
+}
+
+.comments .item {
+    height: auto;
+    width: 720rpx;
+    overflow: hidden;
+    border-bottom: 1px solid #d9d9d9;
+    padding-bottom: 25rpx;
+}
+
+.comments .info {
+    height: 127rpx;
+    width: 100%;
+    padding: 33rpx 0 27rpx 0;
+}
+
+.comments .user {
+    float: left;
+    width: auto;
+    height: 67rpx;
+    line-height: 67rpx;
+    font-size: 0;
+}
+
+.comments .user image {
+    float: left;
+    width: 67rpx;
+    height: 67rpx;
+    margin-right: 17rpx;
+    border-radius: 50%;
+}
+
+.comments .user text {
+    display: inline-block;
+    width: auto;
+    height: 66rpx;
+    overflow: hidden;
+    font-size: 29rpx;
+    line-height: 66rpx;
+}
+
+.comments .time {
+    display: block;
+    float: right;
+    width: auto;
+    height: 67rpx;
+    line-height: 67rpx;
+    color: #7f7f7f;
+    font-size: 25rpx;
+    margin-right: 30rpx;
+}
+
+.comments .comment {
+    width: 720rpx;
+    padding-right: 30rpx;
+    line-height: 45.8rpx;
+    font-size: 29rpx;
+    margin-bottom: 16rpx;
+}
+
+.comments .imgs {
+    width: 720rpx;
+    height: 150rpx;
+    margin-bottom: 25rpx;
+}
+
+.comments .imgs .img {
+    height: 150rpx;
+    width: 150rpx;
+    margin-right: 28rpx;
+}
+
+.comments .spec {
+    width: 720rpx;
+    height: 25rpx;
+    font-size: 24rpx;
+    color: #999;
+}
+
+.comments .spec .item {
+    color: #7f7f7f;
+    font-size: 25rpx;
+}
+
+.comments .customer-service {
+    width: 690rpx;
+    height: auto;
+    overflow: hidden;
+    margin-top: 23rpx;
+    background: rgba(0, 0, 0, 0.03);
+    padding: 21rpx;
+}
+
+.comments .customer-service .u {
+    font-size: 24rpx;
+    color: #333;
+    line-height: 37.5rpx;
+}
+
+.comments .customer-service .c {
+    font-size: 24rpx;
+    color: #999;
+    line-height: 37.5rpx;
+}
diff --git a/litemall-wx_uni/pages/comment/comment.vue b/litemall-wx_uni/pages/comment/comment.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e52788d01a89150b18e0005df90ac8376db4ced2
--- /dev/null
+++ b/litemall-wx_uni/pages/comment/comment.vue
@@ -0,0 +1,187 @@
+
+
+
+
diff --git a/litemall-wx_uni/pages/commentPost/commentPost.css b/litemall-wx_uni/pages/commentPost/commentPost.css
new file mode 100644
index 0000000000000000000000000000000000000000..978e121c9e68c995d098888cfcc57b8ae667b765
--- /dev/null
+++ b/litemall-wx_uni/pages/commentPost/commentPost.css
@@ -0,0 +1,249 @@
+page,
+.container {
+    height: 100%;
+    background: #f4f4f4;
+}
+
+.post-comment {
+    width: 750rpx;
+    height: auto;
+    overflow: hidden;
+    padding: 30rpx;
+    background: #fff;
+}
+
+.post-comment .goods {
+    display: flex;
+    align-items: center;
+    height: 199rpx;
+    margin-left: 31.25rpx;
+}
+
+.post-comment .goods .img {
+    height: 145.83rpx;
+    width: 145.83rpx;
+    background: #f4f4f4;
+}
+
+.post-comment .goods .img image {
+    height: 145.83rpx;
+    width: 145.83rpx;
+}
+
+.post-comment .goods .info {
+    height: 145.83rpx;
+    flex: 1;
+    padding-left: 20rpx;
+}
+
+.post-comment .goods .name {
+    margin-top: 30rpx;
+    display: block;
+    height: 44rpx;
+    line-height: 44rpx;
+    color: #333;
+    font-size: 30rpx;
+}
+
+.post-comment .goods .number {
+    display: block;
+    height: 37rpx;
+    line-height: 37rpx;
+    color: #666;
+    font-size: 25rpx;
+}
+
+.post-comment .goods .status {
+    width: 105rpx;
+    color: #b4282d;
+    font-size: 25rpx;
+}
+
+.post-comment .rater {
+    display: flex;
+    flex-direction: row;
+    height: 55rpx;
+}
+
+.post-comment .rater .rater-title {
+    font-size: 29rpx;
+    padding-right: 10rpx;
+}
+
+.post-comment .rater image {
+    padding-left: 5rpx;
+    height: 50rpx;
+    width: 50rpx;
+}
+
+.post-comment .rater .rater-desc {
+    font-size: 29rpx;
+    padding-left: 10rpx;
+}
+
+.post-comment .input-box {
+    height: 337.5rpx;
+    width: 690rpx;
+    position: relative;
+    background: #fff;
+}
+
+.post-comment .input-box .content {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: block;
+    background: #fff;
+    font-size: 29rpx;
+    border: 5px solid #f4f4f4;
+    height: 300rpx;
+    width: 650rpx;
+    padding: 20rpx;
+}
+
+.post-comment .input-box .count {
+    position: absolute;
+    bottom: 20rpx;
+    right: 20rpx;
+    display: block;
+    height: 30rpx;
+    width: 50rpx;
+    font-size: 29rpx;
+    color: #999;
+}
+
+.post-comment .btns {
+    height: 108rpx;
+}
+
+.post-comment .close {
+    float: left;
+    height: 108rpx;
+    line-height: 108rpx;
+    text-align: left;
+    color: #666;
+    padding: 0 30rpx;
+}
+
+.post-comment .post {
+    float: right;
+    height: 108rpx;
+    line-height: 108rpx;
+    text-align: right;
+    padding: 0 30rpx;
+}
+
+.weui-uploader {
+    margin-top: 50rpx;
+}
+
+.weui-uploader__hd {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    padding-bottom: 10px;
+    -webkit-box-align: center;
+    -webkit-align-items: center;
+    align-items: center;
+}
+
+.weui-uploader__title {
+    -webkit-box-flex: 1;
+    -webkit-flex: 1;
+    flex: 1;
+}
+
+.weui-uploader__info {
+    color: #b2b2b2;
+}
+
+.weui-uploader__bd {
+    margin-bottom: -4px;
+    margin-right: -9px;
+    overflow: hidden;
+}
+
+.weui-uploader__file {
+    float: left;
+    margin-right: 9px;
+    margin-bottom: 9px;
+}
+
+.weui-uploader__img {
+    display: block;
+    width: 79px;
+    height: 79px;
+}
+
+.weui-uploader__file_status {
+    position: relative;
+}
+
+.weui-uploader__file_status:before {
+    content: ' ';
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+}
+
+.weui-uploader__file-content {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    color: #fff;
+}
+
+.weui-uploader__input-box {
+    float: left;
+    position: relative;
+    margin-right: 9px;
+    margin-bottom: 9px;
+    width: 77px;
+    height: 77px;
+    border: 1px solid #d9d9d9;
+}
+
+.weui-uploader__input-box:after,
+.weui-uploader__input-box:before {
+    content: ' ';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    background-color: #d9d9d9;
+}
+
+.weui-uploader__input-box:before {
+    width: 2px;
+    height: 39.5px;
+}
+
+.weui-uploader__input-box:after {
+    width: 39.5px;
+    height: 2px;
+}
+
+.weui-uploader__input-box:active {
+    border-color: #999;
+}
+
+.weui-uploader__input-box:active:after,
+.weui-uploader__input-box:active:before {
+    background-color: #999;
+}
+
+.weui-uploader__input {
+    position: absolute;
+    z-index: 1;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+}
diff --git a/litemall-wx_uni/pages/commentPost/commentPost.vue b/litemall-wx_uni/pages/commentPost/commentPost.vue
new file mode 100644
index 0000000000000000000000000000000000000000..cd7239cdf2932a58cf4cad43e9a55c40d68a2dc2
--- /dev/null
+++ b/litemall-wx_uni/pages/commentPost/commentPost.vue
@@ -0,0 +1,267 @@
+
+
+
+
\ No newline at end of file
diff --git a/litemall-wx_uni/wxcomponents/vant-weapp/field/textarea.wxml b/litemall-wx_uni/wxcomponents/vant-weapp/field/textarea.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..5015a51d2a21b4716c90e3f57410a40d36b39786
--- /dev/null
+++ b/litemall-wx_uni/wxcomponents/vant-weapp/field/textarea.wxml
@@ -0,0 +1,29 @@
+