diff --git a/江可飞/小程序开发/app.json b/江可飞/小程序开发/app.json
index 0ff183a..8f594d2 100644
--- a/江可飞/小程序开发/app.json
+++ b/江可飞/小程序开发/app.json
@@ -1,13 +1,8 @@
 {
   "pages": [
-<<<<<<< HEAD
-    "pages/index/index",
-    "pages/logs/logs",
-    "pages/shouye/shouye",
-=======
     "pages/shouye/shouye",
+    "pages/index/index",
     "pages/logs/logs",
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
     "pages/fenlei/fenlei",
     "pages/gouwu/gouwu",
     "pages/wode/wode"
@@ -22,11 +17,7 @@
     "selectedColor": "#f00",
     "list": [
       {
-<<<<<<< HEAD
-        "pagePath": "pages/index/index",
-=======
         "pagePath": "pages/shouye/shouye",
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
         "text": "首页",
         "iconPath": "pages/index/image/1.png",
         "selectedIconPath": "pages/index/image/2.png"
diff --git a/江可飞/小程序开发/app.wxss b/江可飞/小程序开发/app.wxss
index 132e48d..06c6fc9 100644
--- a/江可飞/小程序开发/app.wxss
+++ b/江可飞/小程序开发/app.wxss
@@ -1,9 +1,4 @@
 /**app.wxss**/
-<<<<<<< HEAD
-=======
-@import 'weui.wxss';
-@import "html-view/index.wxss";
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
 .container {
   height: 100%;
   display: flex;
@@ -13,15 +8,3 @@
   padding: 200rpx 0;
   box-sizing: border-box;
 } 
-<<<<<<< HEAD
-=======
-
-.containers {
-  height: 100%;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  box-sizing: border-box;
-} 
-
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
diff --git a/江可飞/小程序开发/html-view/each/default.js b/江可飞/小程序开发/html-view/each/default.js
deleted file mode 100644
index 604014b..0000000
--- a/江可飞/小程序开发/html-view/each/default.js
+++ /dev/null
@@ -1,79 +0,0 @@
-const html5Entities = require('../vendors/html5-entities')
-const { windowWidth } = wx.getSystemInfoSync()
-
-module.exports = item => {
-  // decode html entities
-  if (item.type === 'Text') {
-    item.content = html5Entities.decode(item.content)
-    return
-  }
-
-  // <video> and <audio>
-  if (item.tagName === 'video' || item.tagName === 'audio') {
-    item.wxTag = item.tagName
-
-    if (!item.attributes.src) {
-      item.children.some(child => {
-        if (child.tagName === 'source') {
-          item.attributes.src = child.attributes.src
-          return true
-        }
-        return false
-      })
-    }
-    return
-  }
-
-  // <br>
-  if (item.tagName === 'br') {
-    item.wxTag = 'text'
-    item.children = [{ type: 'Text', content: '\n' }]
-    return
-  }
-
-  // other tags
-  if (['b', 'big', 'i', 'small', 'tt', 'abbr', 'acronym', 'cite', 'code', 'dfn', 'em', 'kbd', 'strong', 'samp', 'time', 'var', 'a', 'bdo', 'map', 'object', 'q', 'script', 'span', 'sub', 'sup', 'button', 'input', 'label', 'select', 'textarea'].indexOf(item.tagName) !== -1) {
-    item.wxTag = 'text'
-  } else {
-    item.wxTag = 'view'
-  }
-
-  // <img>
-  if (item.tagName === 'img') {
-    item.wxTag = 'image'
-
-    let width, height
-
-    if (!item.attributes.style) item.attributes.style = {}
-
-    if (item.attributes.style.width && item.attributes.style.width.indexOf('px')) {
-      width = item.attributes.style.width.slice(0, -2)
-    } else if (item.attributes.width) {
-      width = item.attributes.width
-    }
-
-    if (item.attributes.style.height && item.attributes.style.height.indexOf('px')) {
-      height = item.attributes.style.height.slice(0, -2)
-    } else if (item.attributes.height) {
-      height = item.attributes.height
-    }
-
-    if (item.attributes.style) {
-      delete item.attributes.style.width
-      delete item.attributes.style.height
-    }
-
-    delete item.attributes.width
-    delete item.attributes.height
-
-    if (width && width < windowWidth) {
-      item.attributes.style.width = width + 'px'
-      if (height) item.attributes.style.height = height + 'px'
-    }
-  }
-
-  // generate inline style string
-  if (item.attributes && item.attributes.style) {
-    item.attributes.styleString = Object.keys(item.attributes.style).map(key => key + ': ' + item.attributes.style[key]).join(';')
-  }
-}
diff --git a/江可飞/小程序开发/html-view/each/qiniuImg.js b/江可飞/小程序开发/html-view/each/qiniuImg.js
deleted file mode 100644
index 8c2a8d7..0000000
--- a/江可飞/小程序开发/html-view/each/qiniuImg.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// 七牛图片裁剪
-
-const { pixelRatio, windowWidth } = wx.getSystemInfoSync()
-const width = pixelRatio * windowWidth
-
-module.exports = (domain, quality) =>
-  item => {
-    if (item.tagName === 'img' && item.attributes.src.indexOf(domain) !== -1 && item.attributes.src.indexOf('?') === -1) {
-      item.attributes.src += '?imageView2/2/w/' + width
-      if (quality) item.attributes.src += '/q/' + quality
-    }
-  }
diff --git a/江可飞/小程序开发/html-view/each/resolveAnchor.js b/江可飞/小程序开发/html-view/each/resolveAnchor.js
deleted file mode 100644
index b4927b2..0000000
--- a/江可飞/小程序开发/html-view/each/resolveAnchor.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// <a> to <navigator>
-
-const url = require('../vendors/url')
-const Router = require('../vendors/Router')
-
-module.exports = (domain, routes) =>
-  item => {
-    if (item.tagName === 'a') {
-      const u = url.parse(item.attributes.href)
-      if (u.hostname === domain) {
-        const router = new Router(routes)
-        const route = router.match(u.pathname)
-        if (route) {
-          item.wxTag = 'navigator'
-          item.url = url.format({ pathname: route.path, query: Object.assign(u.query, route.params, route.options) })
-        }
-      }
-    }
-  }
diff --git a/江可飞/小程序开发/html-view/each/resolveUrl.js b/江可飞/小程序开发/html-view/each/resolveUrl.js
deleted file mode 100644
index c600f7f..0000000
--- a/江可飞/小程序开发/html-view/each/resolveUrl.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const { resolve } = require('../vendors/url')
-
-module.exports = baseUrl =>
-  item => {
-    if (['img', 'video', 'audio', 'source'].indexOf(item.tagName) !== -1) {
-      if (item.attributes.src) item.attributes.src = resolve(baseUrl, item.attributes.src)
-    } else if (item.tagName === 'a') {
-      item.attributes.href = resolve(baseUrl, item.attributes.href)
-    }
-  }
diff --git a/江可飞/小程序开发/html-view/index.js b/江可飞/小程序开发/html-view/index.js
deleted file mode 100644
index 75a0f5e..0000000
--- a/江可飞/小程序开发/html-view/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-const himalaya = require('./vendors/himalaya')
-const defaultEachFn = require('./each/default')
-const resolveUrl = require('./each/resolveUrl')
-
-class HtmlParser {
-  constructor(html, { baseUrl } = {}) {
-    this.nodes = himalaya.parse(html)
-    if (baseUrl) this.each(resolveUrl(baseUrl))
-    this.each(defaultEachFn)
-  }
-
-  each(fn) {
-    this._each(fn, this.nodes)
-    return this
-  }
-
-  _each(fn, nodes) {
-    nodes.forEach((item, ...args) => {
-      fn(item, ...args)
-
-      if (item.children) this._each(fn, item.children)
-    })
-  }
-
-  filter(fn) {
-    this.nodes = this._filter(fn, this.nodes)
-    return this
-  }
-
-  _filter(fn, nodes) {
-    return nodes.filter((item, ...args) => {
-      const result = fn(item, ...args)
-      if (result && item.children) item.children = this._filter(fn, item.children)
-      return result
-    })
-  }
-
-  map(fn) {
-    this.nodes = this._map(fn, this.nodes)
-    return this
-  }
-
-  _map(fn, nodes) {
-    return nodes.map((item, ...args) => {
-      item = fn(item, ...args)
-      if (item.children) item.children = this._map(fn, item.children)
-      return item
-    })
-  }
-}
-
-module.exports = HtmlParser
diff --git a/江可飞/小程序开发/html-view/index.wxml b/江可飞/小程序开发/html-view/index.wxml
deleted file mode 100644
index f8b10f5..0000000
--- a/江可飞/小程序开发/html-view/index.wxml
+++ /dev/null
@@ -1,7 +0,0 @@
-<import src="nodes.wxml" />
-
-<template name="html-view">
-  <view class="html-view">
-    <template is="html-view-nodes" data="{{nodes: data}}" />
-  </view>
-</template>
diff --git a/江可飞/小程序开发/html-view/index.wxss b/江可飞/小程序开发/html-view/index.wxss
deleted file mode 100644
index 2a72643..0000000
--- a/江可飞/小程序开发/html-view/index.wxss
+++ /dev/null
@@ -1,21 +0,0 @@
-@import "reset.wxss";
-
-.html-view {
-  font-size: 36rpx;
-  color: #333;
-  line-height: 1.6;
-  overflow-wrap: break-word;
-}
-
-.img, .video {
-  width: 100%;
-}
-
-.table {
-  border-collapse: collapse;
-}
-
-.th, .td {
-  border: 1rpx solid #333;
-  padding: 10rpx;
-}
diff --git a/江可飞/小程序开发/html-view/nodes.wxml b/江可飞/小程序开发/html-view/nodes.wxml
deleted file mode 100644
index bee7881..0000000
--- a/江可飞/小程序开发/html-view/nodes.wxml
+++ /dev/null
@@ -1,241 +0,0 @@
-<template name="html-view-nodes">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-1" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-1" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-1" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-1">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-2" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-2" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-2" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-2">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-3" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-3" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-3" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-3">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-4" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-4" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-4" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-4">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-5" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-5" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-5" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-5">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-6" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-6" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-6" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-6">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-7" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-7" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-7" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-7">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-8" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-8" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-8" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-8">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-9" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-9" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-9" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-9">
-  <block wx:for="{{nodes}}" wx:key="">
-    <block wx:if="{{item.type === 'Text'}}">{{item.content}}</block>
-    <block wx:elif="{{item.type === 'Element'}}">
-      <view wx:if="{{item.wxTag === 'view'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-10" data="{{nodes: item.children}}" />
-      </view>
-
-      <text wx:elif="{{item.wxTag === 'text'}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-10" data="{{nodes: item.children}}" />
-      </text>
-
-      <navigator wx:elif="{{item.wxTag === 'navigator'}}" url="{{item.url}}" class="{{item.tagName}} {{item.attributes.className}}" style="{{item.attributes.styleString}}">
-        <template is="html-view-nodes-10" data="{{nodes: item.children}}" />
-      </navigator>
-
-      <image wx:if="{{item.wxTag === 'image'}}" src="{{item.attributes.src}}" class="img" mode="widthFix" style="{{item.attributes.styleString}}" />
-
-      <video wx:elif="{{item.wxTag === 'video'}}" src="{{item.attributes.src}}" class="video"></video>
-
-      <audio wx:elif="{{item.wxTag === 'audio'}}" src="{{item.attributes.src}}" class="audio" controls></audio>
-    </block>
-  </block>
-</template>
-<template name="html-view-nodes-10"></template>
\ No newline at end of file
diff --git a/江可飞/小程序开发/html-view/reset.wxss b/江可飞/小程序开发/html-view/reset.wxss
deleted file mode 100644
index 1638992..0000000
--- a/江可飞/小程序开发/html-view/reset.wxss
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-css reset
-based on https://chromium.googlesource.com/chromium/blink/+/master/Source/core/css/html.css
-*/
-
-.html {
-  display: block;
-}
-
-/* children of the <head> element all have display:none */
-.head {
-  display: none;
-}
-
-.meta {
-  display: none;
-}
-
-.title {
-  display: none;
-}
-
-.link {
-  display: none;
-}
-
-.style {
-  display: none;
-}
-
-.script {
-  display: none;
-}
-
-/* generic block-level elements */
-
-.body {
-  display: block;
-  margin: 8rpx;
-}
-
-.p {
-  display: block;
-  margin: 1em 0;
-}
-
-.div {
-  display: block;
-}
-
-.layer {
-  display: block;
-}
-
-.article, .aside, .footer, .header, .hgroup, .main, .nav, .section {
-  display: block;
-}
-
-.marquee {
-  display: inline-block;
-}
-
-.address {
-  display: block;
-}
-
-.blockquote {
-  display: block;
-  margin: 1em 40rpx;
-}
-
-.figcaption {
-  display: block;
-}
-
-.figure {
-  display: block;
-  margin: 1em 40rpx;
-}
-
-.q {
-  display: inline;
-}
-
-.q:before {
-  content: open-quote;
-}
-
-.q:after {
-  content: close-quote;
-}
-
-.center {
-  display: block;
-  text-align: center;
-}
-
-.hr {
-  display: block;
-  margin: 0.5em 0;
-  border: 1rpx inset;
-}
-
-.map {
-  display: inline;
-}
-
-/* heading elements */
-
-.h1 {
-  display: block;
-  font-size: 2em;
-  font-weight: bold;
-  margin: 0.67em 0;
-}
-
-.h2 {
-  display: block;
-  font-size: 1.5em;
-  font-weight: bold;
-  margin: 0.83em 0;
-}
-
-.h3 {
-  display: block;
-  font-size: 1.17em;
-  font-weight: bold;
-  margin: 1em 0;
-}
-
-.h4 {
-  display: block;
-  font-weight: bold;
-  margin: 1.33em 0;
-}
-
-.h5 {
-  display: block;
-  font-size: 0.83em;
-  font-weight: bold;
-  margin: 1.67em 0;
-}
-
-.h6 {
-  display: block;
-  font-size: 0.67em;
-  font-weight: bold;
-  margin: 2.33em 0;
-}
-
-/* tables */
-
-.table {
-  display: table;
-  border-collapse: separate;
-  border-spacing: 2px;
-  border-color: gray;
-}
-
-.thead {
-  display: table-header-group;
-  vertical-align: middle;
-  border-color: inherit;
-}
-
-.tbody {
-  display: table-row-group;
-  vertical-align: middle;
-  border-color: inherit;
-}
-
-.tfoot {
-  display: table-footer-group;
-  vertical-align: middle;
-  border-color: inherit;
-}
-
-.col {
-  display: table-column;
-}
-
-.colgroup {
-  display: table-column-group;
-}
-
-.tr {
-  display: table-row;
-  vertical-align: inherit;
-  border-color: inherit
-}
-
-.td, .th {
-  display: table-cell;
-  vertical-align: inherit;
-}
-
-.th {
-  font-weight: bold;
-}
-
-.caption {
-  display: table-caption;
-  text-align: center;
-}
-
-/* lists */
-
-.ul, .menu, .dir {
-  list-style-type: disc;
-  margin: 1em 0;
-  padding-left: 40rpx;
-}
-
-.ol {
-  display: block;
-  list-style-type: decimal;
-  margin: 1em 0;
-  padding-left: 40rpx;
-}
-
-.li {
-  display: list-item;
-  text-align: match-parent;
-}
-
-.ul .ul, .ol .ul {
-  list-style-type: circle
-}
-
-.ol .ol .ul, .ol .ul .ul, .ul .ol .ul, .ul .ul .ul {
-  list-style-type: square;
-}
-
-.dd {
-  display: block;
-  margin-left: 40rpx;
-}
-
-.dl {
-  display: block;
-  margin: 1em 0;
-}
-
-.dt {
-  display: block
-}
-
-.ol .ul, .ul .ol, .ul .ul, .ol .ol {
-  margin: 0;
-}
-
-/* inline elements */
-
-.u, .ins {
-  text-decoration: underline;
-}
-
-.strong, .b {
-  font-weight: bold;
-}
-
-.i, .cite, .em, .var, .address, .dfn {
-  font-style: italic;
-}
-
-.tt, .code, .kbd, .samp {
-  font-family: monospace;
-}
-
-.pre, .xmp, .plaintext, .listing {
-  display: block;
-  font-family: monospace;
-  white-space: pre;
-  margin: 1em 0;
-}
-
-.mark {
-  background-color: yellow;
-  color: black;
-}
-
-.big {
-  font-size: larger;
-}
-
-.small {
-  font-size: smaller;
-}
-
-.s, .strike, .del {
-  text-decoration: line-through;
-}
-
-.sub {
-  vertical-align: sub;
-  font-size: smaller;
-}
-
-.sup {
-  vertical-align: super;
-  font-size: smaller;
-}
-
-.nobr {
-  white-space: nowrap;
-}
diff --git a/江可飞/小程序开发/html-view/vendors/Router.js b/江可飞/小程序开发/html-view/vendors/Router.js
deleted file mode 100644
index 7998436..0000000
--- a/江可飞/小程序开发/html-view/vendors/Router.js
+++ /dev/null
@@ -1,198 +0,0 @@
-(function (global, factory) {
-  if (typeof define === "function" && define.amd) {
-    define(['module', 'exports'], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(module, exports);
-  } else {
-    var mod = {
-      exports: {}
-    };
-    factory(mod, mod.exports);
-    global.Router = mod.exports;
-  }
-})(this, function (module, exports) {
-  'use strict';
-
-  exports.__esModule = true;
-
-  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
-    return typeof obj;
-  } : function (obj) {
-    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  };
-
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
-    }
-  }
-
-  var Router = function () {
-    function Router(conf) {
-      _classCallCheck(this, Router);
-
-      this.routes = {};
-
-      if (conf.constructor === Array) conf = { ALL: conf };
-
-      for (var method in conf) {
-        var routes = conf[method];
-        var rts = this.routes[method] = {
-          string: {},
-          regex: []
-        };
-
-        var _loop = function _loop() {
-          if (_isArray) {
-            if (_i >= _iterator.length) return 'break';
-            _ref = _iterator[_i++];
-          } else {
-            _i = _iterator.next();
-            if (_i.done) return 'break';
-            _ref = _i.value;
-          }
-
-          var _rt = _ref;
-
-          var pattern = void 0,
-              replacement = void 0,
-              params = void 0,
-              options = void 0;
-
-          if (_rt.constructor === String) {
-            pattern = _rt;
-            replacement = '$&';
-            params = [];
-            options = {};
-          } else {
-            var rt = _rt.concat();
-            pattern = rt.shift();
-            replacement = rt.shift() || '$&';
-            options = _typeof(rt[rt.length - 1]) == 'object' ? rt.pop() : {};
-            params = rt;
-          }
-
-          if (pattern.constructor === RegExp) {
-            rts.regex.push({
-              pattern: pattern,
-              replacement: replacement,
-              params: params,
-              options: options,
-              origin: _rt
-            });
-          } else {
-            if (!/:|\*|\$/.test(pattern)) {
-              rts.string[pattern] = {
-                replacement: replacement === '$&' ? pattern : replacement,
-                options: options,
-                origin: _rt
-              };
-            } else {
-              params = [];
-
-              pattern = pattern.replace(/[\\&()+.[?^{|]/g, '\\$&').replace(/:(\w+)/g, function (str, key) {
-                params.push(key);
-                return '([^/]+)';
-              }).replace(/\*/g, '.*');
-
-              rts.regex.push({
-                pattern: new RegExp('^' + pattern + '$'),
-                replacement: replacement,
-                params: params,
-                options: options,
-                origin: _rt
-              });
-            }
-          }
-        };
-
-        for (var _iterator = routes, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-          var _ref;
-
-          var _ret = _loop();
-
-          if (_ret === 'break') break;
-        }
-      }
-    }
-
-    Router.prototype.match = function match(path) {
-      var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'ALL';
-
-      var rts = this.routes[method];
-
-      if (rts) {
-        if (rts.string[path]) {
-          var match = {
-            path: rts.string[path].replacement,
-            params: {},
-            options: rts.string[path].options,
-            origin: rts.string[path].origin
-          };
-
-          if (Router.log) {
-            console.log('path:', path, '\n', 'method:', method, '\n', 'match:', match); // eslint-disable-line
-          }
-
-          return match;
-        }
-
-        var _replacement = void 0;
-        var _params = {};
-        for (var _iterator2 = rts.regex, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-          var _ref2;
-
-          if (_isArray2) {
-            if (_i2 >= _iterator2.length) break;
-            _ref2 = _iterator2[_i2++];
-          } else {
-            _i2 = _iterator2.next();
-            if (_i2.done) break;
-            _ref2 = _i2.value;
-          }
-
-          var rt = _ref2;
-
-          var matches = path.match(rt.pattern);
-          if (matches) {
-            _replacement = rt.replacement;
-            if (_replacement.indexOf('$') !== -1) {
-              _replacement = _replacement === '$&' ? path : path.replace(rt.pattern, _replacement);
-            }
-
-            matches.shift();
-            for (var j = 0; j < rt.params.length; j++) {
-              if (rt.params[j]) {
-                _params[rt.params[j]] = matches[j];
-              }
-            }
-
-            var _match = {
-              path: _replacement,
-              params: _params,
-              options: rt.options,
-              origin: rt.origin
-            };
-
-            if (Router.log) {
-              console.log('path:', path, '\n', 'method:', method, '\n', 'match:', _match); // eslint-disable-line
-            }
-
-            return _match;
-          }
-        }
-      }
-
-      if (Router.log) {
-        console.log('path:', path, '\n', 'method:', method, '\n', 'match:', null); // eslint-disable-line
-      }
-
-      return method === 'ALL' ? null : this.match(path);
-    };
-
-    return Router;
-  }();
-
-  exports.default = Router;
-  module.exports = exports['default'];
-});
\ No newline at end of file
diff --git a/江可飞/小程序开发/html-view/vendors/himalaya.js b/江可飞/小程序开发/html-view/vendors/himalaya.js
deleted file mode 100644
index c569516..0000000
--- a/江可飞/小程序开发/html-view/vendors/himalaya.js
+++ /dev/null
@@ -1,317 +0,0 @@
-(function() {
-  var root = this;
-
-  var tagStart = '<';
-  var tagEnd = '>';
-  var commentStart = '<!--';
-  var commentEnd = '-->';
-
-  var voidTags = [
-    "!doctype", "area", "base", "br", "col", "command",
-    "embed", "hr", "img", "input", "keygen", "link",
-    "meta", "param", "source", "track", "wbr"
-  ];
-  var closingTags = [
-    "colgroup", "dd", "dt", "li", "options", "p",
-    "td", "tfoot", "th", "thead", "tr"
-  ];
-  var childlessTags = ['style', 'script', 'template'];
-
-  function parse(str) {
-    return parseUntil(str + '</root>', ['root']).nodes;
-  }
-
-  function parseUntil(str, stack) {
-    var nodes = [];
-
-    while (str.length) {
-      var nextTag = str.indexOf(tagStart);
-      if (nextTag === -1) {
-        // only text left
-        nodes.push({
-          type: 'Text',
-          content: str
-        });
-        str = '';
-        break;
-      }
-
-      if (nextTag) {
-        // text before tag
-        nodes.push({
-          type: 'Text',
-          content: str.slice(0, nextTag)
-        });
-        str = str.slice(nextTag);
-        continue;
-      }
-
-      if (startsWithCommentStart(str)) {
-        // comment
-        var end = str.indexOf(commentEnd);
-        nodes.push({
-          type: 'Comment',
-          content: str.slice(commentStart.length, end)
-        });
-        str = str.slice(end + commentEnd.length);
-        continue;
-      }
-
-      var isClosingTag = str.charAt(nextTag + 1) === '/';
-      if (isClosingTag) {
-        var endTagEnd = str.indexOf(tagEnd);
-        var innerTag = str.slice(2, endTagEnd);
-        var tagName = innerTag.trim().split(' ')[0];
-        str = str.slice(endTagEnd + 1);
-        var loc = stack.lastIndexOf(tagName);
-        if (~loc) {
-          stack = stack.slice(0, loc);
-          break;
-        }
-        continue;
-      }
-
-      // open tag
-      var results = parseTag(str, stack);
-      if (results.tag) {
-        results.tag.type = 'Element';
-        nodes.push(results.tag);
-        str = results.str;
-      }
-      if (results.stack.length !== stack.length) {
-        stack = results.stack;
-        break;
-      }
-    }
-
-    return {
-      nodes: nodes,
-      stack: stack,
-      str: str
-    };
-  }
-
-  function parseTag(str, stack) {
-    var idxTagEnd = str.indexOf(tagEnd);
-    var idxSpace = str.indexOf(' ');
-    var tagNameEnd = ~idxSpace ?
-      Math.min(idxTagEnd, idxSpace) :
-      idxTagEnd;
-    var tagName = str.slice(1, tagNameEnd);
-    var lowTagName = tagName.toLowerCase();
-
-    if (stack[stack.length - 1] === tagName && ~closingTags.indexOf(lowTagName)) {
-      return {
-        stack: stack.slice(0, -1)
-      };
-    }
-
-    var attrs = parseAttrs(str.slice(tagNameEnd));
-    var tag = {
-      tagName: tagName,
-      attributes: attrs.attributes
-    };
-    str = attrs.str;
-
-    if (startsWithSelfClose(str)) {
-      str = str.slice(2);
-    } else {
-      str = str.slice(1);
-
-      if (~childlessTags.indexOf(lowTagName)) {
-        var end = '</' + tagName + '>';
-        var idx = str.indexOf(end);
-        if (!~idx) idx = Infinity;
-        tag.content = str.slice(0, idx);
-        str = str.slice(idx);
-      } else if (!~voidTags.indexOf(lowTagName)) {
-        var results = parseUntil(str, stack.concat(tagName));
-        tag.children = results.nodes;
-        str = results.str;
-        stack = results.stack;
-      }
-    }
-
-    return {
-      tag: tag,
-      str: str,
-      stack: stack
-    };
-  }
-
-  function parseAttrs(str) {
-    str = str.trim();
-    var results = tagPairs(str, 0);
-    str = str.slice(results.cursor);
-    var attributes = results.kvs.map(function(pair) {
-      var kv = splitHead(pair.trim(), '=');
-      kv[1] = kv[1] ? unquote(kv[1]) : kv[0];
-      return kv;
-    }).reduce(function(attrs, kv) {
-      var property = kv[0];
-      var value = kv[1];
-      if (property === 'class') {
-        attrs.className = value.split(' ');
-      } else if (property === 'style') {
-        attrs.style = parseStyle(value);
-      } else if (startsWithDataDash(property)) {
-        attrs.dataset = attrs.dataset || {};
-        var key = camelCase(property.slice(5));
-        attrs.dataset[key] = castValue(value);
-      } else {
-        attrs[camelCase(property)] = castValue(value);
-      }
-      return attrs;
-    }, {});
-    return {
-      str: str,
-      attributes: attributes
-    };
-  }
-
-  function splitHead(str, sep) {
-    var idx = str.indexOf(sep);
-    if (idx === -1) return [str];
-    return [str.slice(0, idx), str.slice(idx + sep.length)];
-  }
-
-  function tagPairs(str, index) {
-    var words = []; // "key", "key=value", "key='value'", etc
-    var quote = null; // null, single-, or double-quote
-    var cursor = index; // index of parse into str
-    var wordBegin = cursor; // index of word start
-    var len = str.length;
-    while(cursor < len) {
-      var char = str.charAt(cursor);
-      var isTagEnd = !quote && (char === '/' || char === tagEnd);
-      if (isTagEnd) {
-        if (cursor !== wordBegin) {
-          words.push(str.slice(wordBegin, cursor));
-        }
-        break;
-      }
-
-      var isWordEnd = !quote && char === ' ';
-      if (isWordEnd) {
-        if (cursor !== wordBegin) {
-          words.push(str.slice(wordBegin, cursor));
-        }
-        wordBegin = cursor + 1;
-        cursor++;
-        continue;
-      }
-
-      var isQuoteEnd = char === quote;
-      if (isQuoteEnd) {
-        quote = null;
-        cursor++;
-        continue;
-      }
-
-      var isQuoteStart = !quote && (char === '\'' || char === '"');
-      if (isQuoteStart) {
-        quote = char;
-        cursor++;
-        continue;
-      }
-
-      cursor++;
-    }
-
-    var attrs = [];
-    var wLen = words.length;
-    for (var i = 0; i < wLen; i++) {
-      var word = words[i];
-      if (!(word && word.length)) continue;
-      var isNotPair = word.indexOf('=') === -1;
-      if (isNotPair) {
-        var secondWord = words[i + 1];
-        var thirdWord = words[i + 2];
-        var isSpacedPair = secondWord === '=' && thirdWord;
-        if (isSpacedPair) {
-          var newWord = word + '=' + thirdWord;
-          attrs.push(newWord);
-          i += 2;
-          continue;
-        }
-      }
-      attrs.push(word);
-    }
-
-    return {
-      cursor: cursor,
-      kvs: attrs
-    };
-  }
-
-  function unquote(str) {
-    var car = str.charAt(0);
-    var end = str.length - 1;
-    if (car === '"' || car === "'" && car === str.charAt(end)) {
-      return str.slice(1, end);
-    }
-    return str;
-  }
-
-  function parseStyle(str) {
-    return str.trim().split(';').map(function(statement) {
-      return statement.trim().split(':');
-    }).reduce(function(styles, kv) {
-      if (kv[1]) styles[camelCase(kv[0].trim())] = castValue(kv[1].trim());
-      return styles;
-    }, {});
-  }
-
-  function camelCase(str) {
-    return str.split('-').reduce(function(str, word) {
-      return str + word.charAt(0).toUpperCase() + word.slice(1);
-    });
-  }
-
-  function castValue(str) {
-    if (typeof str !== 'string') return str;
-    var num = +str;
-    if (!isNaN(num)) return num;
-    return str;
-  }
-
-  function startsWithCommentStart(s) {
-    return (
-      s.charAt(0) === '<' &&
-      s.charAt(1) === '!' &&
-      s.charAt(2) === '-' &&
-      s.charAt(3) === '-');
-  }
-
-  function startsWithSelfClose(s) {
-    return (
-      s.charAt(0) === '/' &&
-      s.charAt(1) === '>');
-  }
-
-  function startsWithDataDash(s) {
-    return (
-      s.charAt(0) === 'd' &&
-      s.charAt(1) === 'a' &&
-      s.charAt(2) === 't' &&
-      s.charAt(3) === 'a' &&
-      s.charAt(4) === '-');
-  }
-
-  var himalaya = {
-    parse: parse,
-    parseTag: parseTag,
-    parseUntil: parseUntil,
-    parseAttrs: parseAttrs,
-    parseStyle: parseStyle
-  };
-
-  if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      exports = module.exports = himalaya;
-    }
-    exports.himalaya = himalaya;
-  } else {
-    root.himalaya = himalaya;
-  }
-}).call(this);
diff --git a/江可飞/小程序开发/html-view/vendors/html5-entities.js b/江可飞/小程序开发/html-view/vendors/html5-entities.js
deleted file mode 100644
index e0fa53c..0000000
--- a/江可飞/小程序开发/html-view/vendors/html5-entities.js
+++ /dev/null
@@ -1,190 +0,0 @@
-var ENTITIES = [['Aacute', [193]], ['aacute', [225]], ['Abreve', [258]], ['abreve', [259]], ['ac', [8766]], ['acd', [8767]], ['acE', [8766, 819]], ['Acirc', [194]], ['acirc', [226]], ['acute', [180]], ['Acy', [1040]], ['acy', [1072]], ['AElig', [198]], ['aelig', [230]], ['af', [8289]], ['Afr', [120068]], ['afr', [120094]], ['Agrave', [192]], ['agrave', [224]], ['alefsym', [8501]], ['aleph', [8501]], ['Alpha', [913]], ['alpha', [945]], ['Amacr', [256]], ['amacr', [257]], ['amalg', [10815]], ['amp', [38]], ['AMP', [38]], ['andand', [10837]], ['And', [10835]], ['and', [8743]], ['andd', [10844]], ['andslope', [10840]], ['andv', [10842]], ['ang', [8736]], ['ange', [10660]], ['angle', [8736]], ['angmsdaa', [10664]], ['angmsdab', [10665]], ['angmsdac', [10666]], ['angmsdad', [10667]], ['angmsdae', [10668]], ['angmsdaf', [10669]], ['angmsdag', [10670]], ['angmsdah', [10671]], ['angmsd', [8737]], ['angrt', [8735]], ['angrtvb', [8894]], ['angrtvbd', [10653]], ['angsph', [8738]], ['angst', [197]], ['angzarr', [9084]], ['Aogon', [260]], ['aogon', [261]], ['Aopf', [120120]], ['aopf', [120146]], ['apacir', [10863]], ['ap', [8776]], ['apE', [10864]], ['ape', [8778]], ['apid', [8779]], ['apos', [39]], ['ApplyFunction', [8289]], ['approx', [8776]], ['approxeq', [8778]], ['Aring', [197]], ['aring', [229]], ['Ascr', [119964]], ['ascr', [119990]], ['Assign', [8788]], ['ast', [42]], ['asymp', [8776]], ['asympeq', [8781]], ['Atilde', [195]], ['atilde', [227]], ['Auml', [196]], ['auml', [228]], ['awconint', [8755]], ['awint', [10769]], ['backcong', [8780]], ['backepsilon', [1014]], ['backprime', [8245]], ['backsim', [8765]], ['backsimeq', [8909]], ['Backslash', [8726]], ['Barv', [10983]], ['barvee', [8893]], ['barwed', [8965]], ['Barwed', [8966]], ['barwedge', [8965]], ['bbrk', [9141]], ['bbrktbrk', [9142]], ['bcong', [8780]], ['Bcy', [1041]], ['bcy', [1073]], ['bdquo', [8222]], ['becaus', [8757]], ['because', [8757]], ['Because', [8757]], ['bemptyv', [10672]], ['bepsi', [1014]], ['bernou', [8492]], ['Bernoullis', [8492]], ['Beta', [914]], ['beta', [946]], ['beth', [8502]], ['between', [8812]], ['Bfr', [120069]], ['bfr', [120095]], ['bigcap', [8898]], ['bigcirc', [9711]], ['bigcup', [8899]], ['bigodot', [10752]], ['bigoplus', [10753]], ['bigotimes', [10754]], ['bigsqcup', [10758]], ['bigstar', [9733]], ['bigtriangledown', [9661]], ['bigtriangleup', [9651]], ['biguplus', [10756]], ['bigvee', [8897]], ['bigwedge', [8896]], ['bkarow', [10509]], ['blacklozenge', [10731]], ['blacksquare', [9642]], ['blacktriangle', [9652]], ['blacktriangledown', [9662]], ['blacktriangleleft', [9666]], ['blacktriangleright', [9656]], ['blank', [9251]], ['blk12', [9618]], ['blk14', [9617]], ['blk34', [9619]], ['block', [9608]], ['bne', [61, 8421]], ['bnequiv', [8801, 8421]], ['bNot', [10989]], ['bnot', [8976]], ['Bopf', [120121]], ['bopf', [120147]], ['bot', [8869]], ['bottom', [8869]], ['bowtie', [8904]], ['boxbox', [10697]], ['boxdl', [9488]], ['boxdL', [9557]], ['boxDl', [9558]], ['boxDL', [9559]], ['boxdr', [9484]], ['boxdR', [9554]], ['boxDr', [9555]], ['boxDR', [9556]], ['boxh', [9472]], ['boxH', [9552]], ['boxhd', [9516]], ['boxHd', [9572]], ['boxhD', [9573]], ['boxHD', [9574]], ['boxhu', [9524]], ['boxHu', [9575]], ['boxhU', [9576]], ['boxHU', [9577]], ['boxminus', [8863]], ['boxplus', [8862]], ['boxtimes', [8864]], ['boxul', [9496]], ['boxuL', [9563]], ['boxUl', [9564]], ['boxUL', [9565]], ['boxur', [9492]], ['boxuR', [9560]], ['boxUr', [9561]], ['boxUR', [9562]], ['boxv', [9474]], ['boxV', [9553]], ['boxvh', [9532]], ['boxvH', [9578]], ['boxVh', [9579]], ['boxVH', [9580]], ['boxvl', [9508]], ['boxvL', [9569]], ['boxVl', [9570]], ['boxVL', [9571]], ['boxvr', [9500]], ['boxvR', [9566]], ['boxVr', [9567]], ['boxVR', [9568]], ['bprime', [8245]], ['breve', [728]], ['Breve', [728]], ['brvbar', [166]], ['bscr', [119991]], ['Bscr', [8492]], ['bsemi', [8271]], ['bsim', [8765]], ['bsime', [8909]], ['bsolb', [10693]], ['bsol', [92]], ['bsolhsub', [10184]], ['bull', [8226]], ['bullet', [8226]], ['bump', [8782]], ['bumpE', [10926]], ['bumpe', [8783]], ['Bumpeq', [8782]], ['bumpeq', [8783]], ['Cacute', [262]], ['cacute', [263]], ['capand', [10820]], ['capbrcup', [10825]], ['capcap', [10827]], ['cap', [8745]], ['Cap', [8914]], ['capcup', [10823]], ['capdot', [10816]], ['CapitalDifferentialD', [8517]], ['caps', [8745, 65024]], ['caret', [8257]], ['caron', [711]], ['Cayleys', [8493]], ['ccaps', [10829]], ['Ccaron', [268]], ['ccaron', [269]], ['Ccedil', [199]], ['ccedil', [231]], ['Ccirc', [264]], ['ccirc', [265]], ['Cconint', [8752]], ['ccups', [10828]], ['ccupssm', [10832]], ['Cdot', [266]], ['cdot', [267]], ['cedil', [184]], ['Cedilla', [184]], ['cemptyv', [10674]], ['cent', [162]], ['centerdot', [183]], ['CenterDot', [183]], ['cfr', [120096]], ['Cfr', [8493]], ['CHcy', [1063]], ['chcy', [1095]], ['check', [10003]], ['checkmark', [10003]], ['Chi', [935]], ['chi', [967]], ['circ', [710]], ['circeq', [8791]], ['circlearrowleft', [8634]], ['circlearrowright', [8635]], ['circledast', [8859]], ['circledcirc', [8858]], ['circleddash', [8861]], ['CircleDot', [8857]], ['circledR', [174]], ['circledS', [9416]], ['CircleMinus', [8854]], ['CirclePlus', [8853]], ['CircleTimes', [8855]], ['cir', [9675]], ['cirE', [10691]], ['cire', [8791]], ['cirfnint', [10768]], ['cirmid', [10991]], ['cirscir', [10690]], ['ClockwiseContourIntegral', [8754]], ['CloseCurlyDoubleQuote', [8221]], ['CloseCurlyQuote', [8217]], ['clubs', [9827]], ['clubsuit', [9827]], ['colon', [58]], ['Colon', [8759]], ['Colone', [10868]], ['colone', [8788]], ['coloneq', [8788]], ['comma', [44]], ['commat', [64]], ['comp', [8705]], ['compfn', [8728]], ['complement', [8705]], ['complexes', [8450]], ['cong', [8773]], ['congdot', [10861]], ['Congruent', [8801]], ['conint', [8750]], ['Conint', [8751]], ['ContourIntegral', [8750]], ['copf', [120148]], ['Copf', [8450]], ['coprod', [8720]], ['Coproduct', [8720]], ['copy', [169]], ['COPY', [169]], ['copysr', [8471]], ['CounterClockwiseContourIntegral', [8755]], ['crarr', [8629]], ['cross', [10007]], ['Cross', [10799]], ['Cscr', [119966]], ['cscr', [119992]], ['csub', [10959]], ['csube', [10961]], ['csup', [10960]], ['csupe', [10962]], ['ctdot', [8943]], ['cudarrl', [10552]], ['cudarrr', [10549]], ['cuepr', [8926]], ['cuesc', [8927]], ['cularr', [8630]], ['cularrp', [10557]], ['cupbrcap', [10824]], ['cupcap', [10822]], ['CupCap', [8781]], ['cup', [8746]], ['Cup', [8915]], ['cupcup', [10826]], ['cupdot', [8845]], ['cupor', [10821]], ['cups', [8746, 65024]], ['curarr', [8631]], ['curarrm', [10556]], ['curlyeqprec', [8926]], ['curlyeqsucc', [8927]], ['curlyvee', [8910]], ['curlywedge', [8911]], ['curren', [164]], ['curvearrowleft', [8630]], ['curvearrowright', [8631]], ['cuvee', [8910]], ['cuwed', [8911]], ['cwconint', [8754]], ['cwint', [8753]], ['cylcty', [9005]], ['dagger', [8224]], ['Dagger', [8225]], ['daleth', [8504]], ['darr', [8595]], ['Darr', [8609]], ['dArr', [8659]], ['dash', [8208]], ['Dashv', [10980]], ['dashv', [8867]], ['dbkarow', [10511]], ['dblac', [733]], ['Dcaron', [270]], ['dcaron', [271]], ['Dcy', [1044]], ['dcy', [1076]], ['ddagger', [8225]], ['ddarr', [8650]], ['DD', [8517]], ['dd', [8518]], ['DDotrahd', [10513]], ['ddotseq', [10871]], ['deg', [176]], ['Del', [8711]], ['Delta', [916]], ['delta', [948]], ['demptyv', [10673]], ['dfisht', [10623]], ['Dfr', [120071]], ['dfr', [120097]], ['dHar', [10597]], ['dharl', [8643]], ['dharr', [8642]], ['DiacriticalAcute', [180]], ['DiacriticalDot', [729]], ['DiacriticalDoubleAcute', [733]], ['DiacriticalGrave', [96]], ['DiacriticalTilde', [732]], ['diam', [8900]], ['diamond', [8900]], ['Diamond', [8900]], ['diamondsuit', [9830]], ['diams', [9830]], ['die', [168]], ['DifferentialD', [8518]], ['digamma', [989]], ['disin', [8946]], ['div', [247]], ['divide', [247]], ['divideontimes', [8903]], ['divonx', [8903]], ['DJcy', [1026]], ['djcy', [1106]], ['dlcorn', [8990]], ['dlcrop', [8973]], ['dollar', [36]], ['Dopf', [120123]], ['dopf', [120149]], ['Dot', [168]], ['dot', [729]], ['DotDot', [8412]], ['doteq', [8784]], ['doteqdot', [8785]], ['DotEqual', [8784]], ['dotminus', [8760]], ['dotplus', [8724]], ['dotsquare', [8865]], ['doublebarwedge', [8966]], ['DoubleContourIntegral', [8751]], ['DoubleDot', [168]], ['DoubleDownArrow', [8659]], ['DoubleLeftArrow', [8656]], ['DoubleLeftRightArrow', [8660]], ['DoubleLeftTee', [10980]], ['DoubleLongLeftArrow', [10232]], ['DoubleLongLeftRightArrow', [10234]], ['DoubleLongRightArrow', [10233]], ['DoubleRightArrow', [8658]], ['DoubleRightTee', [8872]], ['DoubleUpArrow', [8657]], ['DoubleUpDownArrow', [8661]], ['DoubleVerticalBar', [8741]], ['DownArrowBar', [10515]], ['downarrow', [8595]], ['DownArrow', [8595]], ['Downarrow', [8659]], ['DownArrowUpArrow', [8693]], ['DownBreve', [785]], ['downdownarrows', [8650]], ['downharpoonleft', [8643]], ['downharpoonright', [8642]], ['DownLeftRightVector', [10576]], ['DownLeftTeeVector', [10590]], ['DownLeftVectorBar', [10582]], ['DownLeftVector', [8637]], ['DownRightTeeVector', [10591]], ['DownRightVectorBar', [10583]], ['DownRightVector', [8641]], ['DownTeeArrow', [8615]], ['DownTee', [8868]], ['drbkarow', [10512]], ['drcorn', [8991]], ['drcrop', [8972]], ['Dscr', [119967]], ['dscr', [119993]], ['DScy', [1029]], ['dscy', [1109]], ['dsol', [10742]], ['Dstrok', [272]], ['dstrok', [273]], ['dtdot', [8945]], ['dtri', [9663]], ['dtrif', [9662]], ['duarr', [8693]], ['duhar', [10607]], ['dwangle', [10662]], ['DZcy', [1039]], ['dzcy', [1119]], ['dzigrarr', [10239]], ['Eacute', [201]], ['eacute', [233]], ['easter', [10862]], ['Ecaron', [282]], ['ecaron', [283]], ['Ecirc', [202]], ['ecirc', [234]], ['ecir', [8790]], ['ecolon', [8789]], ['Ecy', [1069]], ['ecy', [1101]], ['eDDot', [10871]], ['Edot', [278]], ['edot', [279]], ['eDot', [8785]], ['ee', [8519]], ['efDot', [8786]], ['Efr', [120072]], ['efr', [120098]], ['eg', [10906]], ['Egrave', [200]], ['egrave', [232]], ['egs', [10902]], ['egsdot', [10904]], ['el', [10905]], ['Element', [8712]], ['elinters', [9191]], ['ell', [8467]], ['els', [10901]], ['elsdot', [10903]], ['Emacr', [274]], ['emacr', [275]], ['empty', [8709]], ['emptyset', [8709]], ['EmptySmallSquare', [9723]], ['emptyv', [8709]], ['EmptyVerySmallSquare', [9643]], ['emsp13', [8196]], ['emsp14', [8197]], ['emsp', [8195]], ['ENG', [330]], ['eng', [331]], ['ensp', [8194]], ['Eogon', [280]], ['eogon', [281]], ['Eopf', [120124]], ['eopf', [120150]], ['epar', [8917]], ['eparsl', [10723]], ['eplus', [10865]], ['epsi', [949]], ['Epsilon', [917]], ['epsilon', [949]], ['epsiv', [1013]], ['eqcirc', [8790]], ['eqcolon', [8789]], ['eqsim', [8770]], ['eqslantgtr', [10902]], ['eqslantless', [10901]], ['Equal', [10869]], ['equals', [61]], ['EqualTilde', [8770]], ['equest', [8799]], ['Equilibrium', [8652]], ['equiv', [8801]], ['equivDD', [10872]], ['eqvparsl', [10725]], ['erarr', [10609]], ['erDot', [8787]], ['escr', [8495]], ['Escr', [8496]], ['esdot', [8784]], ['Esim', [10867]], ['esim', [8770]], ['Eta', [919]], ['eta', [951]], ['ETH', [208]], ['eth', [240]], ['Euml', [203]], ['euml', [235]], ['euro', [8364]], ['excl', [33]], ['exist', [8707]], ['Exists', [8707]], ['expectation', [8496]], ['exponentiale', [8519]], ['ExponentialE', [8519]], ['fallingdotseq', [8786]], ['Fcy', [1060]], ['fcy', [1092]], ['female', [9792]], ['ffilig', [64259]], ['fflig', [64256]], ['ffllig', [64260]], ['Ffr', [120073]], ['ffr', [120099]], ['filig', [64257]], ['FilledSmallSquare', [9724]], ['FilledVerySmallSquare', [9642]], ['fjlig', [102, 106]], ['flat', [9837]], ['fllig', [64258]], ['fltns', [9649]], ['fnof', [402]], ['Fopf', [120125]], ['fopf', [120151]], ['forall', [8704]], ['ForAll', [8704]], ['fork', [8916]], ['forkv', [10969]], ['Fouriertrf', [8497]], ['fpartint', [10765]], ['frac12', [189]], ['frac13', [8531]], ['frac14', [188]], ['frac15', [8533]], ['frac16', [8537]], ['frac18', [8539]], ['frac23', [8532]], ['frac25', [8534]], ['frac34', [190]], ['frac35', [8535]], ['frac38', [8540]], ['frac45', [8536]], ['frac56', [8538]], ['frac58', [8541]], ['frac78', [8542]], ['frasl', [8260]], ['frown', [8994]], ['fscr', [119995]], ['Fscr', [8497]], ['gacute', [501]], ['Gamma', [915]], ['gamma', [947]], ['Gammad', [988]], ['gammad', [989]], ['gap', [10886]], ['Gbreve', [286]], ['gbreve', [287]], ['Gcedil', [290]], ['Gcirc', [284]], ['gcirc', [285]], ['Gcy', [1043]], ['gcy', [1075]], ['Gdot', [288]], ['gdot', [289]], ['ge', [8805]], ['gE', [8807]], ['gEl', [10892]], ['gel', [8923]], ['geq', [8805]], ['geqq', [8807]], ['geqslant', [10878]], ['gescc', [10921]], ['ges', [10878]], ['gesdot', [10880]], ['gesdoto', [10882]], ['gesdotol', [10884]], ['gesl', [8923, 65024]], ['gesles', [10900]], ['Gfr', [120074]], ['gfr', [120100]], ['gg', [8811]], ['Gg', [8921]], ['ggg', [8921]], ['gimel', [8503]], ['GJcy', [1027]], ['gjcy', [1107]], ['gla', [10917]], ['gl', [8823]], ['glE', [10898]], ['glj', [10916]], ['gnap', [10890]], ['gnapprox', [10890]], ['gne', [10888]], ['gnE', [8809]], ['gneq', [10888]], ['gneqq', [8809]], ['gnsim', [8935]], ['Gopf', [120126]], ['gopf', [120152]], ['grave', [96]], ['GreaterEqual', [8805]], ['GreaterEqualLess', [8923]], ['GreaterFullEqual', [8807]], ['GreaterGreater', [10914]], ['GreaterLess', [8823]], ['GreaterSlantEqual', [10878]], ['GreaterTilde', [8819]], ['Gscr', [119970]], ['gscr', [8458]], ['gsim', [8819]], ['gsime', [10894]], ['gsiml', [10896]], ['gtcc', [10919]], ['gtcir', [10874]], ['gt', [62]], ['GT', [62]], ['Gt', [8811]], ['gtdot', [8919]], ['gtlPar', [10645]], ['gtquest', [10876]], ['gtrapprox', [10886]], ['gtrarr', [10616]], ['gtrdot', [8919]], ['gtreqless', [8923]], ['gtreqqless', [10892]], ['gtrless', [8823]], ['gtrsim', [8819]], ['gvertneqq', [8809, 65024]], ['gvnE', [8809, 65024]], ['Hacek', [711]], ['hairsp', [8202]], ['half', [189]], ['hamilt', [8459]], ['HARDcy', [1066]], ['hardcy', [1098]], ['harrcir', [10568]], ['harr', [8596]], ['hArr', [8660]], ['harrw', [8621]], ['Hat', [94]], ['hbar', [8463]], ['Hcirc', [292]], ['hcirc', [293]], ['hearts', [9829]], ['heartsuit', [9829]], ['hellip', [8230]], ['hercon', [8889]], ['hfr', [120101]], ['Hfr', [8460]], ['HilbertSpace', [8459]], ['hksearow', [10533]], ['hkswarow', [10534]], ['hoarr', [8703]], ['homtht', [8763]], ['hookleftarrow', [8617]], ['hookrightarrow', [8618]], ['hopf', [120153]], ['Hopf', [8461]], ['horbar', [8213]], ['HorizontalLine', [9472]], ['hscr', [119997]], ['Hscr', [8459]], ['hslash', [8463]], ['Hstrok', [294]], ['hstrok', [295]], ['HumpDownHump', [8782]], ['HumpEqual', [8783]], ['hybull', [8259]], ['hyphen', [8208]], ['Iacute', [205]], ['iacute', [237]], ['ic', [8291]], ['Icirc', [206]], ['icirc', [238]], ['Icy', [1048]], ['icy', [1080]], ['Idot', [304]], ['IEcy', [1045]], ['iecy', [1077]], ['iexcl', [161]], ['iff', [8660]], ['ifr', [120102]], ['Ifr', [8465]], ['Igrave', [204]], ['igrave', [236]], ['ii', [8520]], ['iiiint', [10764]], ['iiint', [8749]], ['iinfin', [10716]], ['iiota', [8489]], ['IJlig', [306]], ['ijlig', [307]], ['Imacr', [298]], ['imacr', [299]], ['image', [8465]], ['ImaginaryI', [8520]], ['imagline', [8464]], ['imagpart', [8465]], ['imath', [305]], ['Im', [8465]], ['imof', [8887]], ['imped', [437]], ['Implies', [8658]], ['incare', [8453]], ['in', [8712]], ['infin', [8734]], ['infintie', [10717]], ['inodot', [305]], ['intcal', [8890]], ['int', [8747]], ['Int', [8748]], ['integers', [8484]], ['Integral', [8747]], ['intercal', [8890]], ['Intersection', [8898]], ['intlarhk', [10775]], ['intprod', [10812]], ['InvisibleComma', [8291]], ['InvisibleTimes', [8290]], ['IOcy', [1025]], ['iocy', [1105]], ['Iogon', [302]], ['iogon', [303]], ['Iopf', [120128]], ['iopf', [120154]], ['Iota', [921]], ['iota', [953]], ['iprod', [10812]], ['iquest', [191]], ['iscr', [119998]], ['Iscr', [8464]], ['isin', [8712]], ['isindot', [8949]], ['isinE', [8953]], ['isins', [8948]], ['isinsv', [8947]], ['isinv', [8712]], ['it', [8290]], ['Itilde', [296]], ['itilde', [297]], ['Iukcy', [1030]], ['iukcy', [1110]], ['Iuml', [207]], ['iuml', [239]], ['Jcirc', [308]], ['jcirc', [309]], ['Jcy', [1049]], ['jcy', [1081]], ['Jfr', [120077]], ['jfr', [120103]], ['jmath', [567]], ['Jopf', [120129]], ['jopf', [120155]], ['Jscr', [119973]], ['jscr', [119999]], ['Jsercy', [1032]], ['jsercy', [1112]], ['Jukcy', [1028]], ['jukcy', [1108]], ['Kappa', [922]], ['kappa', [954]], ['kappav', [1008]], ['Kcedil', [310]], ['kcedil', [311]], ['Kcy', [1050]], ['kcy', [1082]], ['Kfr', [120078]], ['kfr', [120104]], ['kgreen', [312]], ['KHcy', [1061]], ['khcy', [1093]], ['KJcy', [1036]], ['kjcy', [1116]], ['Kopf', [120130]], ['kopf', [120156]], ['Kscr', [119974]], ['kscr', [120000]], ['lAarr', [8666]], ['Lacute', [313]], ['lacute', [314]], ['laemptyv', [10676]], ['lagran', [8466]], ['Lambda', [923]], ['lambda', [955]], ['lang', [10216]], ['Lang', [10218]], ['langd', [10641]], ['langle', [10216]], ['lap', [10885]], ['Laplacetrf', [8466]], ['laquo', [171]], ['larrb', [8676]], ['larrbfs', [10527]], ['larr', [8592]], ['Larr', [8606]], ['lArr', [8656]], ['larrfs', [10525]], ['larrhk', [8617]], ['larrlp', [8619]], ['larrpl', [10553]], ['larrsim', [10611]], ['larrtl', [8610]], ['latail', [10521]], ['lAtail', [10523]], ['lat', [10923]], ['late', [10925]], ['lates', [10925, 65024]], ['lbarr', [10508]], ['lBarr', [10510]], ['lbbrk', [10098]], ['lbrace', [123]], ['lbrack', [91]], ['lbrke', [10635]], ['lbrksld', [10639]], ['lbrkslu', [10637]], ['Lcaron', [317]], ['lcaron', [318]], ['Lcedil', [315]], ['lcedil', [316]], ['lceil', [8968]], ['lcub', [123]], ['Lcy', [1051]], ['lcy', [1083]], ['ldca', [10550]], ['ldquo', [8220]], ['ldquor', [8222]], ['ldrdhar', [10599]], ['ldrushar', [10571]], ['ldsh', [8626]], ['le', [8804]], ['lE', [8806]], ['LeftAngleBracket', [10216]], ['LeftArrowBar', [8676]], ['leftarrow', [8592]], ['LeftArrow', [8592]], ['Leftarrow', [8656]], ['LeftArrowRightArrow', [8646]], ['leftarrowtail', [8610]], ['LeftCeiling', [8968]], ['LeftDoubleBracket', [10214]], ['LeftDownTeeVector', [10593]], ['LeftDownVectorBar', [10585]], ['LeftDownVector', [8643]], ['LeftFloor', [8970]], ['leftharpoondown', [8637]], ['leftharpoonup', [8636]], ['leftleftarrows', [8647]], ['leftrightarrow', [8596]], ['LeftRightArrow', [8596]], ['Leftrightarrow', [8660]], ['leftrightarrows', [8646]], ['leftrightharpoons', [8651]], ['leftrightsquigarrow', [8621]], ['LeftRightVector', [10574]], ['LeftTeeArrow', [8612]], ['LeftTee', [8867]], ['LeftTeeVector', [10586]], ['leftthreetimes', [8907]], ['LeftTriangleBar', [10703]], ['LeftTriangle', [8882]], ['LeftTriangleEqual', [8884]], ['LeftUpDownVector', [10577]], ['LeftUpTeeVector', [10592]], ['LeftUpVectorBar', [10584]], ['LeftUpVector', [8639]], ['LeftVectorBar', [10578]], ['LeftVector', [8636]], ['lEg', [10891]], ['leg', [8922]], ['leq', [8804]], ['leqq', [8806]], ['leqslant', [10877]], ['lescc', [10920]], ['les', [10877]], ['lesdot', [10879]], ['lesdoto', [10881]], ['lesdotor', [10883]], ['lesg', [8922, 65024]], ['lesges', [10899]], ['lessapprox', [10885]], ['lessdot', [8918]], ['lesseqgtr', [8922]], ['lesseqqgtr', [10891]], ['LessEqualGreater', [8922]], ['LessFullEqual', [8806]], ['LessGreater', [8822]], ['lessgtr', [8822]], ['LessLess', [10913]], ['lesssim', [8818]], ['LessSlantEqual', [10877]], ['LessTilde', [8818]], ['lfisht', [10620]], ['lfloor', [8970]], ['Lfr', [120079]], ['lfr', [120105]], ['lg', [8822]], ['lgE', [10897]], ['lHar', [10594]], ['lhard', [8637]], ['lharu', [8636]], ['lharul', [10602]], ['lhblk', [9604]], ['LJcy', [1033]], ['ljcy', [1113]], ['llarr', [8647]], ['ll', [8810]], ['Ll', [8920]], ['llcorner', [8990]], ['Lleftarrow', [8666]], ['llhard', [10603]], ['lltri', [9722]], ['Lmidot', [319]], ['lmidot', [320]], ['lmoustache', [9136]], ['lmoust', [9136]], ['lnap', [10889]], ['lnapprox', [10889]], ['lne', [10887]], ['lnE', [8808]], ['lneq', [10887]], ['lneqq', [8808]], ['lnsim', [8934]], ['loang', [10220]], ['loarr', [8701]], ['lobrk', [10214]], ['longleftarrow', [10229]], ['LongLeftArrow', [10229]], ['Longleftarrow', [10232]], ['longleftrightarrow', [10231]], ['LongLeftRightArrow', [10231]], ['Longleftrightarrow', [10234]], ['longmapsto', [10236]], ['longrightarrow', [10230]], ['LongRightArrow', [10230]], ['Longrightarrow', [10233]], ['looparrowleft', [8619]], ['looparrowright', [8620]], ['lopar', [10629]], ['Lopf', [120131]], ['lopf', [120157]], ['loplus', [10797]], ['lotimes', [10804]], ['lowast', [8727]], ['lowbar', [95]], ['LowerLeftArrow', [8601]], ['LowerRightArrow', [8600]], ['loz', [9674]], ['lozenge', [9674]], ['lozf', [10731]], ['lpar', [40]], ['lparlt', [10643]], ['lrarr', [8646]], ['lrcorner', [8991]], ['lrhar', [8651]], ['lrhard', [10605]], ['lrm', [8206]], ['lrtri', [8895]], ['lsaquo', [8249]], ['lscr', [120001]], ['Lscr', [8466]], ['lsh', [8624]], ['Lsh', [8624]], ['lsim', [8818]], ['lsime', [10893]], ['lsimg', [10895]], ['lsqb', [91]], ['lsquo', [8216]], ['lsquor', [8218]], ['Lstrok', [321]], ['lstrok', [322]], ['ltcc', [10918]], ['ltcir', [10873]], ['lt', [60]], ['LT', [60]], ['Lt', [8810]], ['ltdot', [8918]], ['lthree', [8907]], ['ltimes', [8905]], ['ltlarr', [10614]], ['ltquest', [10875]], ['ltri', [9667]], ['ltrie', [8884]], ['ltrif', [9666]], ['ltrPar', [10646]], ['lurdshar', [10570]], ['luruhar', [10598]], ['lvertneqq', [8808, 65024]], ['lvnE', [8808, 65024]], ['macr', [175]], ['male', [9794]], ['malt', [10016]], ['maltese', [10016]], ['Map', [10501]], ['map', [8614]], ['mapsto', [8614]], ['mapstodown', [8615]], ['mapstoleft', [8612]], ['mapstoup', [8613]], ['marker', [9646]], ['mcomma', [10793]], ['Mcy', [1052]], ['mcy', [1084]], ['mdash', [8212]], ['mDDot', [8762]], ['measuredangle', [8737]], ['MediumSpace', [8287]], ['Mellintrf', [8499]], ['Mfr', [120080]], ['mfr', [120106]], ['mho', [8487]], ['micro', [181]], ['midast', [42]], ['midcir', [10992]], ['mid', [8739]], ['middot', [183]], ['minusb', [8863]], ['minus', [8722]], ['minusd', [8760]], ['minusdu', [10794]], ['MinusPlus', [8723]], ['mlcp', [10971]], ['mldr', [8230]], ['mnplus', [8723]], ['models', [8871]], ['Mopf', [120132]], ['mopf', [120158]], ['mp', [8723]], ['mscr', [120002]], ['Mscr', [8499]], ['mstpos', [8766]], ['Mu', [924]], ['mu', [956]], ['multimap', [8888]], ['mumap', [8888]], ['nabla', [8711]], ['Nacute', [323]], ['nacute', [324]], ['nang', [8736, 8402]], ['nap', [8777]], ['napE', [10864, 824]], ['napid', [8779, 824]], ['napos', [329]], ['napprox', [8777]], ['natural', [9838]], ['naturals', [8469]], ['natur', [9838]], ['nbsp', [160]], ['nbump', [8782, 824]], ['nbumpe', [8783, 824]], ['ncap', [10819]], ['Ncaron', [327]], ['ncaron', [328]], ['Ncedil', [325]], ['ncedil', [326]], ['ncong', [8775]], ['ncongdot', [10861, 824]], ['ncup', [10818]], ['Ncy', [1053]], ['ncy', [1085]], ['ndash', [8211]], ['nearhk', [10532]], ['nearr', [8599]], ['neArr', [8663]], ['nearrow', [8599]], ['ne', [8800]], ['nedot', [8784, 824]], ['NegativeMediumSpace', [8203]], ['NegativeThickSpace', [8203]], ['NegativeThinSpace', [8203]], ['NegativeVeryThinSpace', [8203]], ['nequiv', [8802]], ['nesear', [10536]], ['nesim', [8770, 824]], ['NestedGreaterGreater', [8811]], ['NestedLessLess', [8810]], ['nexist', [8708]], ['nexists', [8708]], ['Nfr', [120081]], ['nfr', [120107]], ['ngE', [8807, 824]], ['nge', [8817]], ['ngeq', [8817]], ['ngeqq', [8807, 824]], ['ngeqslant', [10878, 824]], ['nges', [10878, 824]], ['nGg', [8921, 824]], ['ngsim', [8821]], ['nGt', [8811, 8402]], ['ngt', [8815]], ['ngtr', [8815]], ['nGtv', [8811, 824]], ['nharr', [8622]], ['nhArr', [8654]], ['nhpar', [10994]], ['ni', [8715]], ['nis', [8956]], ['nisd', [8954]], ['niv', [8715]], ['NJcy', [1034]], ['njcy', [1114]], ['nlarr', [8602]], ['nlArr', [8653]], ['nldr', [8229]], ['nlE', [8806, 824]], ['nle', [8816]], ['nleftarrow', [8602]], ['nLeftarrow', [8653]], ['nleftrightarrow', [8622]], ['nLeftrightarrow', [8654]], ['nleq', [8816]], ['nleqq', [8806, 824]], ['nleqslant', [10877, 824]], ['nles', [10877, 824]], ['nless', [8814]], ['nLl', [8920, 824]], ['nlsim', [8820]], ['nLt', [8810, 8402]], ['nlt', [8814]], ['nltri', [8938]], ['nltrie', [8940]], ['nLtv', [8810, 824]], ['nmid', [8740]], ['NoBreak', [8288]], ['NonBreakingSpace', [160]], ['nopf', [120159]], ['Nopf', [8469]], ['Not', [10988]], ['not', [172]], ['NotCongruent', [8802]], ['NotCupCap', [8813]], ['NotDoubleVerticalBar', [8742]], ['NotElement', [8713]], ['NotEqual', [8800]], ['NotEqualTilde', [8770, 824]], ['NotExists', [8708]], ['NotGreater', [8815]], ['NotGreaterEqual', [8817]], ['NotGreaterFullEqual', [8807, 824]], ['NotGreaterGreater', [8811, 824]], ['NotGreaterLess', [8825]], ['NotGreaterSlantEqual', [10878, 824]], ['NotGreaterTilde', [8821]], ['NotHumpDownHump', [8782, 824]], ['NotHumpEqual', [8783, 824]], ['notin', [8713]], ['notindot', [8949, 824]], ['notinE', [8953, 824]], ['notinva', [8713]], ['notinvb', [8951]], ['notinvc', [8950]], ['NotLeftTriangleBar', [10703, 824]], ['NotLeftTriangle', [8938]], ['NotLeftTriangleEqual', [8940]], ['NotLess', [8814]], ['NotLessEqual', [8816]], ['NotLessGreater', [8824]], ['NotLessLess', [8810, 824]], ['NotLessSlantEqual', [10877, 824]], ['NotLessTilde', [8820]], ['NotNestedGreaterGreater', [10914, 824]], ['NotNestedLessLess', [10913, 824]], ['notni', [8716]], ['notniva', [8716]], ['notnivb', [8958]], ['notnivc', [8957]], ['NotPrecedes', [8832]], ['NotPrecedesEqual', [10927, 824]], ['NotPrecedesSlantEqual', [8928]], ['NotReverseElement', [8716]], ['NotRightTriangleBar', [10704, 824]], ['NotRightTriangle', [8939]], ['NotRightTriangleEqual', [8941]], ['NotSquareSubset', [8847, 824]], ['NotSquareSubsetEqual', [8930]], ['NotSquareSuperset', [8848, 824]], ['NotSquareSupersetEqual', [8931]], ['NotSubset', [8834, 8402]], ['NotSubsetEqual', [8840]], ['NotSucceeds', [8833]], ['NotSucceedsEqual', [10928, 824]], ['NotSucceedsSlantEqual', [8929]], ['NotSucceedsTilde', [8831, 824]], ['NotSuperset', [8835, 8402]], ['NotSupersetEqual', [8841]], ['NotTilde', [8769]], ['NotTildeEqual', [8772]], ['NotTildeFullEqual', [8775]], ['NotTildeTilde', [8777]], ['NotVerticalBar', [8740]], ['nparallel', [8742]], ['npar', [8742]], ['nparsl', [11005, 8421]], ['npart', [8706, 824]], ['npolint', [10772]], ['npr', [8832]], ['nprcue', [8928]], ['nprec', [8832]], ['npreceq', [10927, 824]], ['npre', [10927, 824]], ['nrarrc', [10547, 824]], ['nrarr', [8603]], ['nrArr', [8655]], ['nrarrw', [8605, 824]], ['nrightarrow', [8603]], ['nRightarrow', [8655]], ['nrtri', [8939]], ['nrtrie', [8941]], ['nsc', [8833]], ['nsccue', [8929]], ['nsce', [10928, 824]], ['Nscr', [119977]], ['nscr', [120003]], ['nshortmid', [8740]], ['nshortparallel', [8742]], ['nsim', [8769]], ['nsime', [8772]], ['nsimeq', [8772]], ['nsmid', [8740]], ['nspar', [8742]], ['nsqsube', [8930]], ['nsqsupe', [8931]], ['nsub', [8836]], ['nsubE', [10949, 824]], ['nsube', [8840]], ['nsubset', [8834, 8402]], ['nsubseteq', [8840]], ['nsubseteqq', [10949, 824]], ['nsucc', [8833]], ['nsucceq', [10928, 824]], ['nsup', [8837]], ['nsupE', [10950, 824]], ['nsupe', [8841]], ['nsupset', [8835, 8402]], ['nsupseteq', [8841]], ['nsupseteqq', [10950, 824]], ['ntgl', [8825]], ['Ntilde', [209]], ['ntilde', [241]], ['ntlg', [8824]], ['ntriangleleft', [8938]], ['ntrianglelefteq', [8940]], ['ntriangleright', [8939]], ['ntrianglerighteq', [8941]], ['Nu', [925]], ['nu', [957]], ['num', [35]], ['numero', [8470]], ['numsp', [8199]], ['nvap', [8781, 8402]], ['nvdash', [8876]], ['nvDash', [8877]], ['nVdash', [8878]], ['nVDash', [8879]], ['nvge', [8805, 8402]], ['nvgt', [62, 8402]], ['nvHarr', [10500]], ['nvinfin', [10718]], ['nvlArr', [10498]], ['nvle', [8804, 8402]], ['nvlt', [60, 8402]], ['nvltrie', [8884, 8402]], ['nvrArr', [10499]], ['nvrtrie', [8885, 8402]], ['nvsim', [8764, 8402]], ['nwarhk', [10531]], ['nwarr', [8598]], ['nwArr', [8662]], ['nwarrow', [8598]], ['nwnear', [10535]], ['Oacute', [211]], ['oacute', [243]], ['oast', [8859]], ['Ocirc', [212]], ['ocirc', [244]], ['ocir', [8858]], ['Ocy', [1054]], ['ocy', [1086]], ['odash', [8861]], ['Odblac', [336]], ['odblac', [337]], ['odiv', [10808]], ['odot', [8857]], ['odsold', [10684]], ['OElig', [338]], ['oelig', [339]], ['ofcir', [10687]], ['Ofr', [120082]], ['ofr', [120108]], ['ogon', [731]], ['Ograve', [210]], ['ograve', [242]], ['ogt', [10689]], ['ohbar', [10677]], ['ohm', [937]], ['oint', [8750]], ['olarr', [8634]], ['olcir', [10686]], ['olcross', [10683]], ['oline', [8254]], ['olt', [10688]], ['Omacr', [332]], ['omacr', [333]], ['Omega', [937]], ['omega', [969]], ['Omicron', [927]], ['omicron', [959]], ['omid', [10678]], ['ominus', [8854]], ['Oopf', [120134]], ['oopf', [120160]], ['opar', [10679]], ['OpenCurlyDoubleQuote', [8220]], ['OpenCurlyQuote', [8216]], ['operp', [10681]], ['oplus', [8853]], ['orarr', [8635]], ['Or', [10836]], ['or', [8744]], ['ord', [10845]], ['order', [8500]], ['orderof', [8500]], ['ordf', [170]], ['ordm', [186]], ['origof', [8886]], ['oror', [10838]], ['orslope', [10839]], ['orv', [10843]], ['oS', [9416]], ['Oscr', [119978]], ['oscr', [8500]], ['Oslash', [216]], ['oslash', [248]], ['osol', [8856]], ['Otilde', [213]], ['otilde', [245]], ['otimesas', [10806]], ['Otimes', [10807]], ['otimes', [8855]], ['Ouml', [214]], ['ouml', [246]], ['ovbar', [9021]], ['OverBar', [8254]], ['OverBrace', [9182]], ['OverBracket', [9140]], ['OverParenthesis', [9180]], ['para', [182]], ['parallel', [8741]], ['par', [8741]], ['parsim', [10995]], ['parsl', [11005]], ['part', [8706]], ['PartialD', [8706]], ['Pcy', [1055]], ['pcy', [1087]], ['percnt', [37]], ['period', [46]], ['permil', [8240]], ['perp', [8869]], ['pertenk', [8241]], ['Pfr', [120083]], ['pfr', [120109]], ['Phi', [934]], ['phi', [966]], ['phiv', [981]], ['phmmat', [8499]], ['phone', [9742]], ['Pi', [928]], ['pi', [960]], ['pitchfork', [8916]], ['piv', [982]], ['planck', [8463]], ['planckh', [8462]], ['plankv', [8463]], ['plusacir', [10787]], ['plusb', [8862]], ['pluscir', [10786]], ['plus', [43]], ['plusdo', [8724]], ['plusdu', [10789]], ['pluse', [10866]], ['PlusMinus', [177]], ['plusmn', [177]], ['plussim', [10790]], ['plustwo', [10791]], ['pm', [177]], ['Poincareplane', [8460]], ['pointint', [10773]], ['popf', [120161]], ['Popf', [8473]], ['pound', [163]], ['prap', [10935]], ['Pr', [10939]], ['pr', [8826]], ['prcue', [8828]], ['precapprox', [10935]], ['prec', [8826]], ['preccurlyeq', [8828]], ['Precedes', [8826]], ['PrecedesEqual', [10927]], ['PrecedesSlantEqual', [8828]], ['PrecedesTilde', [8830]], ['preceq', [10927]], ['precnapprox', [10937]], ['precneqq', [10933]], ['precnsim', [8936]], ['pre', [10927]], ['prE', [10931]], ['precsim', [8830]], ['prime', [8242]], ['Prime', [8243]], ['primes', [8473]], ['prnap', [10937]], ['prnE', [10933]], ['prnsim', [8936]], ['prod', [8719]], ['Product', [8719]], ['profalar', [9006]], ['profline', [8978]], ['profsurf', [8979]], ['prop', [8733]], ['Proportional', [8733]], ['Proportion', [8759]], ['propto', [8733]], ['prsim', [8830]], ['prurel', [8880]], ['Pscr', [119979]], ['pscr', [120005]], ['Psi', [936]], ['psi', [968]], ['puncsp', [8200]], ['Qfr', [120084]], ['qfr', [120110]], ['qint', [10764]], ['qopf', [120162]], ['Qopf', [8474]], ['qprime', [8279]], ['Qscr', [119980]], ['qscr', [120006]], ['quaternions', [8461]], ['quatint', [10774]], ['quest', [63]], ['questeq', [8799]], ['quot', [34]], ['QUOT', [34]], ['rAarr', [8667]], ['race', [8765, 817]], ['Racute', [340]], ['racute', [341]], ['radic', [8730]], ['raemptyv', [10675]], ['rang', [10217]], ['Rang', [10219]], ['rangd', [10642]], ['range', [10661]], ['rangle', [10217]], ['raquo', [187]], ['rarrap', [10613]], ['rarrb', [8677]], ['rarrbfs', [10528]], ['rarrc', [10547]], ['rarr', [8594]], ['Rarr', [8608]], ['rArr', [8658]], ['rarrfs', [10526]], ['rarrhk', [8618]], ['rarrlp', [8620]], ['rarrpl', [10565]], ['rarrsim', [10612]], ['Rarrtl', [10518]], ['rarrtl', [8611]], ['rarrw', [8605]], ['ratail', [10522]], ['rAtail', [10524]], ['ratio', [8758]], ['rationals', [8474]], ['rbarr', [10509]], ['rBarr', [10511]], ['RBarr', [10512]], ['rbbrk', [10099]], ['rbrace', [125]], ['rbrack', [93]], ['rbrke', [10636]], ['rbrksld', [10638]], ['rbrkslu', [10640]], ['Rcaron', [344]], ['rcaron', [345]], ['Rcedil', [342]], ['rcedil', [343]], ['rceil', [8969]], ['rcub', [125]], ['Rcy', [1056]], ['rcy', [1088]], ['rdca', [10551]], ['rdldhar', [10601]], ['rdquo', [8221]], ['rdquor', [8221]], ['rdsh', [8627]], ['real', [8476]], ['realine', [8475]], ['realpart', [8476]], ['reals', [8477]], ['Re', [8476]], ['rect', [9645]], ['reg', [174]], ['REG', [174]], ['ReverseElement', [8715]], ['ReverseEquilibrium', [8651]], ['ReverseUpEquilibrium', [10607]], ['rfisht', [10621]], ['rfloor', [8971]], ['rfr', [120111]], ['Rfr', [8476]], ['rHar', [10596]], ['rhard', [8641]], ['rharu', [8640]], ['rharul', [10604]], ['Rho', [929]], ['rho', [961]], ['rhov', [1009]], ['RightAngleBracket', [10217]], ['RightArrowBar', [8677]], ['rightarrow', [8594]], ['RightArrow', [8594]], ['Rightarrow', [8658]], ['RightArrowLeftArrow', [8644]], ['rightarrowtail', [8611]], ['RightCeiling', [8969]], ['RightDoubleBracket', [10215]], ['RightDownTeeVector', [10589]], ['RightDownVectorBar', [10581]], ['RightDownVector', [8642]], ['RightFloor', [8971]], ['rightharpoondown', [8641]], ['rightharpoonup', [8640]], ['rightleftarrows', [8644]], ['rightleftharpoons', [8652]], ['rightrightarrows', [8649]], ['rightsquigarrow', [8605]], ['RightTeeArrow', [8614]], ['RightTee', [8866]], ['RightTeeVector', [10587]], ['rightthreetimes', [8908]], ['RightTriangleBar', [10704]], ['RightTriangle', [8883]], ['RightTriangleEqual', [8885]], ['RightUpDownVector', [10575]], ['RightUpTeeVector', [10588]], ['RightUpVectorBar', [10580]], ['RightUpVector', [8638]], ['RightVectorBar', [10579]], ['RightVector', [8640]], ['ring', [730]], ['risingdotseq', [8787]], ['rlarr', [8644]], ['rlhar', [8652]], ['rlm', [8207]], ['rmoustache', [9137]], ['rmoust', [9137]], ['rnmid', [10990]], ['roang', [10221]], ['roarr', [8702]], ['robrk', [10215]], ['ropar', [10630]], ['ropf', [120163]], ['Ropf', [8477]], ['roplus', [10798]], ['rotimes', [10805]], ['RoundImplies', [10608]], ['rpar', [41]], ['rpargt', [10644]], ['rppolint', [10770]], ['rrarr', [8649]], ['Rrightarrow', [8667]], ['rsaquo', [8250]], ['rscr', [120007]], ['Rscr', [8475]], ['rsh', [8625]], ['Rsh', [8625]], ['rsqb', [93]], ['rsquo', [8217]], ['rsquor', [8217]], ['rthree', [8908]], ['rtimes', [8906]], ['rtri', [9657]], ['rtrie', [8885]], ['rtrif', [9656]], ['rtriltri', [10702]], ['RuleDelayed', [10740]], ['ruluhar', [10600]], ['rx', [8478]], ['Sacute', [346]], ['sacute', [347]], ['sbquo', [8218]], ['scap', [10936]], ['Scaron', [352]], ['scaron', [353]], ['Sc', [10940]], ['sc', [8827]], ['sccue', [8829]], ['sce', [10928]], ['scE', [10932]], ['Scedil', [350]], ['scedil', [351]], ['Scirc', [348]], ['scirc', [349]], ['scnap', [10938]], ['scnE', [10934]], ['scnsim', [8937]], ['scpolint', [10771]], ['scsim', [8831]], ['Scy', [1057]], ['scy', [1089]], ['sdotb', [8865]], ['sdot', [8901]], ['sdote', [10854]], ['searhk', [10533]], ['searr', [8600]], ['seArr', [8664]], ['searrow', [8600]], ['sect', [167]], ['semi', [59]], ['seswar', [10537]], ['setminus', [8726]], ['setmn', [8726]], ['sext', [10038]], ['Sfr', [120086]], ['sfr', [120112]], ['sfrown', [8994]], ['sharp', [9839]], ['SHCHcy', [1065]], ['shchcy', [1097]], ['SHcy', [1064]], ['shcy', [1096]], ['ShortDownArrow', [8595]], ['ShortLeftArrow', [8592]], ['shortmid', [8739]], ['shortparallel', [8741]], ['ShortRightArrow', [8594]], ['ShortUpArrow', [8593]], ['shy', [173]], ['Sigma', [931]], ['sigma', [963]], ['sigmaf', [962]], ['sigmav', [962]], ['sim', [8764]], ['simdot', [10858]], ['sime', [8771]], ['simeq', [8771]], ['simg', [10910]], ['simgE', [10912]], ['siml', [10909]], ['simlE', [10911]], ['simne', [8774]], ['simplus', [10788]], ['simrarr', [10610]], ['slarr', [8592]], ['SmallCircle', [8728]], ['smallsetminus', [8726]], ['smashp', [10803]], ['smeparsl', [10724]], ['smid', [8739]], ['smile', [8995]], ['smt', [10922]], ['smte', [10924]], ['smtes', [10924, 65024]], ['SOFTcy', [1068]], ['softcy', [1100]], ['solbar', [9023]], ['solb', [10692]], ['sol', [47]], ['Sopf', [120138]], ['sopf', [120164]], ['spades', [9824]], ['spadesuit', [9824]], ['spar', [8741]], ['sqcap', [8851]], ['sqcaps', [8851, 65024]], ['sqcup', [8852]], ['sqcups', [8852, 65024]], ['Sqrt', [8730]], ['sqsub', [8847]], ['sqsube', [8849]], ['sqsubset', [8847]], ['sqsubseteq', [8849]], ['sqsup', [8848]], ['sqsupe', [8850]], ['sqsupset', [8848]], ['sqsupseteq', [8850]], ['square', [9633]], ['Square', [9633]], ['SquareIntersection', [8851]], ['SquareSubset', [8847]], ['SquareSubsetEqual', [8849]], ['SquareSuperset', [8848]], ['SquareSupersetEqual', [8850]], ['SquareUnion', [8852]], ['squarf', [9642]], ['squ', [9633]], ['squf', [9642]], ['srarr', [8594]], ['Sscr', [119982]], ['sscr', [120008]], ['ssetmn', [8726]], ['ssmile', [8995]], ['sstarf', [8902]], ['Star', [8902]], ['star', [9734]], ['starf', [9733]], ['straightepsilon', [1013]], ['straightphi', [981]], ['strns', [175]], ['sub', [8834]], ['Sub', [8912]], ['subdot', [10941]], ['subE', [10949]], ['sube', [8838]], ['subedot', [10947]], ['submult', [10945]], ['subnE', [10955]], ['subne', [8842]], ['subplus', [10943]], ['subrarr', [10617]], ['subset', [8834]], ['Subset', [8912]], ['subseteq', [8838]], ['subseteqq', [10949]], ['SubsetEqual', [8838]], ['subsetneq', [8842]], ['subsetneqq', [10955]], ['subsim', [10951]], ['subsub', [10965]], ['subsup', [10963]], ['succapprox', [10936]], ['succ', [8827]], ['succcurlyeq', [8829]], ['Succeeds', [8827]], ['SucceedsEqual', [10928]], ['SucceedsSlantEqual', [8829]], ['SucceedsTilde', [8831]], ['succeq', [10928]], ['succnapprox', [10938]], ['succneqq', [10934]], ['succnsim', [8937]], ['succsim', [8831]], ['SuchThat', [8715]], ['sum', [8721]], ['Sum', [8721]], ['sung', [9834]], ['sup1', [185]], ['sup2', [178]], ['sup3', [179]], ['sup', [8835]], ['Sup', [8913]], ['supdot', [10942]], ['supdsub', [10968]], ['supE', [10950]], ['supe', [8839]], ['supedot', [10948]], ['Superset', [8835]], ['SupersetEqual', [8839]], ['suphsol', [10185]], ['suphsub', [10967]], ['suplarr', [10619]], ['supmult', [10946]], ['supnE', [10956]], ['supne', [8843]], ['supplus', [10944]], ['supset', [8835]], ['Supset', [8913]], ['supseteq', [8839]], ['supseteqq', [10950]], ['supsetneq', [8843]], ['supsetneqq', [10956]], ['supsim', [10952]], ['supsub', [10964]], ['supsup', [10966]], ['swarhk', [10534]], ['swarr', [8601]], ['swArr', [8665]], ['swarrow', [8601]], ['swnwar', [10538]], ['szlig', [223]], ['Tab', [9]], ['target', [8982]], ['Tau', [932]], ['tau', [964]], ['tbrk', [9140]], ['Tcaron', [356]], ['tcaron', [357]], ['Tcedil', [354]], ['tcedil', [355]], ['Tcy', [1058]], ['tcy', [1090]], ['tdot', [8411]], ['telrec', [8981]], ['Tfr', [120087]], ['tfr', [120113]], ['there4', [8756]], ['therefore', [8756]], ['Therefore', [8756]], ['Theta', [920]], ['theta', [952]], ['thetasym', [977]], ['thetav', [977]], ['thickapprox', [8776]], ['thicksim', [8764]], ['ThickSpace', [8287, 8202]], ['ThinSpace', [8201]], ['thinsp', [8201]], ['thkap', [8776]], ['thksim', [8764]], ['THORN', [222]], ['thorn', [254]], ['tilde', [732]], ['Tilde', [8764]], ['TildeEqual', [8771]], ['TildeFullEqual', [8773]], ['TildeTilde', [8776]], ['timesbar', [10801]], ['timesb', [8864]], ['times', [215]], ['timesd', [10800]], ['tint', [8749]], ['toea', [10536]], ['topbot', [9014]], ['topcir', [10993]], ['top', [8868]], ['Topf', [120139]], ['topf', [120165]], ['topfork', [10970]], ['tosa', [10537]], ['tprime', [8244]], ['trade', [8482]], ['TRADE', [8482]], ['triangle', [9653]], ['triangledown', [9663]], ['triangleleft', [9667]], ['trianglelefteq', [8884]], ['triangleq', [8796]], ['triangleright', [9657]], ['trianglerighteq', [8885]], ['tridot', [9708]], ['trie', [8796]], ['triminus', [10810]], ['TripleDot', [8411]], ['triplus', [10809]], ['trisb', [10701]], ['tritime', [10811]], ['trpezium', [9186]], ['Tscr', [119983]], ['tscr', [120009]], ['TScy', [1062]], ['tscy', [1094]], ['TSHcy', [1035]], ['tshcy', [1115]], ['Tstrok', [358]], ['tstrok', [359]], ['twixt', [8812]], ['twoheadleftarrow', [8606]], ['twoheadrightarrow', [8608]], ['Uacute', [218]], ['uacute', [250]], ['uarr', [8593]], ['Uarr', [8607]], ['uArr', [8657]], ['Uarrocir', [10569]], ['Ubrcy', [1038]], ['ubrcy', [1118]], ['Ubreve', [364]], ['ubreve', [365]], ['Ucirc', [219]], ['ucirc', [251]], ['Ucy', [1059]], ['ucy', [1091]], ['udarr', [8645]], ['Udblac', [368]], ['udblac', [369]], ['udhar', [10606]], ['ufisht', [10622]], ['Ufr', [120088]], ['ufr', [120114]], ['Ugrave', [217]], ['ugrave', [249]], ['uHar', [10595]], ['uharl', [8639]], ['uharr', [8638]], ['uhblk', [9600]], ['ulcorn', [8988]], ['ulcorner', [8988]], ['ulcrop', [8975]], ['ultri', [9720]], ['Umacr', [362]], ['umacr', [363]], ['uml', [168]], ['UnderBar', [95]], ['UnderBrace', [9183]], ['UnderBracket', [9141]], ['UnderParenthesis', [9181]], ['Union', [8899]], ['UnionPlus', [8846]], ['Uogon', [370]], ['uogon', [371]], ['Uopf', [120140]], ['uopf', [120166]], ['UpArrowBar', [10514]], ['uparrow', [8593]], ['UpArrow', [8593]], ['Uparrow', [8657]], ['UpArrowDownArrow', [8645]], ['updownarrow', [8597]], ['UpDownArrow', [8597]], ['Updownarrow', [8661]], ['UpEquilibrium', [10606]], ['upharpoonleft', [8639]], ['upharpoonright', [8638]], ['uplus', [8846]], ['UpperLeftArrow', [8598]], ['UpperRightArrow', [8599]], ['upsi', [965]], ['Upsi', [978]], ['upsih', [978]], ['Upsilon', [933]], ['upsilon', [965]], ['UpTeeArrow', [8613]], ['UpTee', [8869]], ['upuparrows', [8648]], ['urcorn', [8989]], ['urcorner', [8989]], ['urcrop', [8974]], ['Uring', [366]], ['uring', [367]], ['urtri', [9721]], ['Uscr', [119984]], ['uscr', [120010]], ['utdot', [8944]], ['Utilde', [360]], ['utilde', [361]], ['utri', [9653]], ['utrif', [9652]], ['uuarr', [8648]], ['Uuml', [220]], ['uuml', [252]], ['uwangle', [10663]], ['vangrt', [10652]], ['varepsilon', [1013]], ['varkappa', [1008]], ['varnothing', [8709]], ['varphi', [981]], ['varpi', [982]], ['varpropto', [8733]], ['varr', [8597]], ['vArr', [8661]], ['varrho', [1009]], ['varsigma', [962]], ['varsubsetneq', [8842, 65024]], ['varsubsetneqq', [10955, 65024]], ['varsupsetneq', [8843, 65024]], ['varsupsetneqq', [10956, 65024]], ['vartheta', [977]], ['vartriangleleft', [8882]], ['vartriangleright', [8883]], ['vBar', [10984]], ['Vbar', [10987]], ['vBarv', [10985]], ['Vcy', [1042]], ['vcy', [1074]], ['vdash', [8866]], ['vDash', [8872]], ['Vdash', [8873]], ['VDash', [8875]], ['Vdashl', [10982]], ['veebar', [8891]], ['vee', [8744]], ['Vee', [8897]], ['veeeq', [8794]], ['vellip', [8942]], ['verbar', [124]], ['Verbar', [8214]], ['vert', [124]], ['Vert', [8214]], ['VerticalBar', [8739]], ['VerticalLine', [124]], ['VerticalSeparator', [10072]], ['VerticalTilde', [8768]], ['VeryThinSpace', [8202]], ['Vfr', [120089]], ['vfr', [120115]], ['vltri', [8882]], ['vnsub', [8834, 8402]], ['vnsup', [8835, 8402]], ['Vopf', [120141]], ['vopf', [120167]], ['vprop', [8733]], ['vrtri', [8883]], ['Vscr', [119985]], ['vscr', [120011]], ['vsubnE', [10955, 65024]], ['vsubne', [8842, 65024]], ['vsupnE', [10956, 65024]], ['vsupne', [8843, 65024]], ['Vvdash', [8874]], ['vzigzag', [10650]], ['Wcirc', [372]], ['wcirc', [373]], ['wedbar', [10847]], ['wedge', [8743]], ['Wedge', [8896]], ['wedgeq', [8793]], ['weierp', [8472]], ['Wfr', [120090]], ['wfr', [120116]], ['Wopf', [120142]], ['wopf', [120168]], ['wp', [8472]], ['wr', [8768]], ['wreath', [8768]], ['Wscr', [119986]], ['wscr', [120012]], ['xcap', [8898]], ['xcirc', [9711]], ['xcup', [8899]], ['xdtri', [9661]], ['Xfr', [120091]], ['xfr', [120117]], ['xharr', [10231]], ['xhArr', [10234]], ['Xi', [926]], ['xi', [958]], ['xlarr', [10229]], ['xlArr', [10232]], ['xmap', [10236]], ['xnis', [8955]], ['xodot', [10752]], ['Xopf', [120143]], ['xopf', [120169]], ['xoplus', [10753]], ['xotime', [10754]], ['xrarr', [10230]], ['xrArr', [10233]], ['Xscr', [119987]], ['xscr', [120013]], ['xsqcup', [10758]], ['xuplus', [10756]], ['xutri', [9651]], ['xvee', [8897]], ['xwedge', [8896]], ['Yacute', [221]], ['yacute', [253]], ['YAcy', [1071]], ['yacy', [1103]], ['Ycirc', [374]], ['ycirc', [375]], ['Ycy', [1067]], ['ycy', [1099]], ['yen', [165]], ['Yfr', [120092]], ['yfr', [120118]], ['YIcy', [1031]], ['yicy', [1111]], ['Yopf', [120144]], ['yopf', [120170]], ['Yscr', [119988]], ['yscr', [120014]], ['YUcy', [1070]], ['yucy', [1102]], ['yuml', [255]], ['Yuml', [376]], ['Zacute', [377]], ['zacute', [378]], ['Zcaron', [381]], ['zcaron', [382]], ['Zcy', [1047]], ['zcy', [1079]], ['Zdot', [379]], ['zdot', [380]], ['zeetrf', [8488]], ['ZeroWidthSpace', [8203]], ['Zeta', [918]], ['zeta', [950]], ['zfr', [120119]], ['Zfr', [8488]], ['ZHcy', [1046]], ['zhcy', [1078]], ['zigrarr', [8669]], ['zopf', [120171]], ['Zopf', [8484]], ['Zscr', [119989]], ['zscr', [120015]], ['zwj', [8205]], ['zwnj', [8204]]];
-
-var alphaIndex = {};
-var charIndex = {};
-
-createIndexes(alphaIndex, charIndex);
-
-/**
- * @constructor
- */
-function Html5Entities() {}
-
-/**
- * @param {String} str
- * @returns {String}
- */
-Html5Entities.prototype.decode = function(str) {
-    if (str.length === 0) {
-        return '';
-    }
-    return str.replace(/&(#?[\w\d]+);?/g, function(s, entity) {
-        var chr;
-        if (entity.charAt(0) === "#") {
-            var code = entity.charAt(1) === 'x' ?
-                parseInt(entity.substr(2).toLowerCase(), 16) :
-                parseInt(entity.substr(1));
-
-            if (!(isNaN(code) || code < -32768 || code > 65535)) {
-                chr = String.fromCharCode(code);
-            }
-        } else {
-            chr = alphaIndex[entity];
-        }
-        return chr || s;
-    });
-};
-
-/**
- * @param {String} str
- * @returns {String}
- */
- Html5Entities.decode = function(str) {
-    return new Html5Entities().decode(str);
- };
-
-/**
- * @param {String} str
- * @returns {String}
- */
-Html5Entities.prototype.encode = function(str) {
-    var strLength = str.length;
-    if (strLength === 0) {
-        return '';
-    }
-    var result = '';
-    var i = 0;
-    while (i < strLength) {
-        var charInfo = charIndex[str.charCodeAt(i)];
-        if (charInfo) {
-            var alpha = charInfo[str.charCodeAt(i + 1)];
-            if (alpha) {
-                i++;
-            } else {
-                alpha = charInfo[''];
-            }
-            if (alpha) {
-                result += "&" + alpha + ";";
-                i++;
-                continue;
-            }
-        }
-        result += str.charAt(i);
-        i++;
-    }
-    return result;
-};
-
-/**
- * @param {String} str
- * @returns {String}
- */
- Html5Entities.encode = function(str) {
-    return new Html5Entities().encode(str);
- };
-
-/**
- * @param {String} str
- * @returns {String}
- */
-Html5Entities.prototype.encodeNonUTF = function(str) {
-    var strLength = str.length;
-    if (strLength === 0) {
-        return '';
-    }
-    var result = '';
-    var i = 0;
-    while (i < strLength) {
-        var c = str.charCodeAt(i);
-        var charInfo = charIndex[c];
-        if (charInfo) {
-            var alpha = charInfo[str.charCodeAt(i + 1)];
-            if (alpha) {
-                i++;
-            } else {
-                alpha = charInfo[''];
-            }
-            if (alpha) {
-                result += "&" + alpha + ";";
-                i++;
-                continue;
-            }
-        }
-        if (c < 32 || c > 126) {
-            result += '&#' + c + ';';
-        } else {
-            result += str.charAt(i);
-        }
-        i++;
-    }
-    return result;
-};
-
-/**
- * @param {String} str
- * @returns {String}
- */
- Html5Entities.encodeNonUTF = function(str) {
-    return new Html5Entities().encodeNonUTF(str);
- };
-
-/**
- * @param {String} str
- * @returns {String}
- */
-Html5Entities.prototype.encodeNonASCII = function(str) {
-    var strLength = str.length;
-    if (strLength === 0) {
-        return '';
-    }
-    var result = '';
-    var i = 0;
-    while (i < strLength) {
-        var c = str.charCodeAt(i);
-        if (c <= 255) {
-            result += str[i++];
-            continue;
-        }
-        result += '&#' + c + ';';
-        i++
-    }
-    return result;
-};
-
-/**
- * @param {String} str
- * @returns {String}
- */
- Html5Entities.encodeNonASCII = function(str) {
-    return new Html5Entities().encodeNonASCII(str);
- };
-
-/**
- * @param {Object} alphaIndex Passed by reference.
- * @param {Object} charIndex Passed by reference.
- */
-function createIndexes(alphaIndex, charIndex) {
-    var i = ENTITIES.length;
-    var _results = [];
-    while (i--) {
-        var e = ENTITIES[i];
-        var alpha = e[0];
-        var chars = e[1];
-        var chr = chars[0];
-        var addChar = (chr < 32 || chr > 126) || chr === 62 || chr === 60 || chr === 38 || chr === 34 || chr === 39;
-        var charInfo;
-        if (addChar) {
-            charInfo = charIndex[chr] = charIndex[chr] || {};
-        }
-        if (chars[1]) {
-            var chr2 = chars[1];
-            alphaIndex[alpha] = String.fromCharCode(chr) + String.fromCharCode(chr2);
-            _results.push(addChar && (charInfo[chr2] = alpha));
-        } else {
-            alphaIndex[alpha] = String.fromCharCode(chr);
-            _results.push(addChar && (charInfo[''] = alpha));
-        }
-    }
-}
-
-module.exports = Html5Entities;
diff --git a/江可飞/小程序开发/html-view/vendors/url.js b/江可飞/小程序开发/html-view/vendors/url.js
deleted file mode 100644
index 2a3e103..0000000
--- a/江可飞/小程序开发/html-view/vendors/url.js
+++ /dev/null
@@ -1,186 +0,0 @@
-(function (global, factory) {
-  if (typeof define === "function" && define.amd) {
-    define(['module', 'exports'], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(module, exports);
-  } else {
-    var mod = {
-      exports: {}
-    };
-    factory(mod, mod.exports);
-    global.url = mod.exports;
-  }
-})(this, function (module, exports) {
-  'use strict';
-
-  exports.__esModule = true;
-  function parseQuery(str) {
-    var query = {};
-    if (str.length) {
-      str.replace(/\+/g, ' ').split('&').forEach(function (s) {
-        var pair = s.split('=');
-        var key = decodeURIComponent(pair[0]);
-        var val = pair.length === 1 ? '' : decodeURIComponent(pair[1]);
-        if (query[key] == null) {
-          query[key] = val;
-        } else {
-          if (query[key].constructor !== Array) query[key] = [query[key]];
-          query[key].push(val);
-        }
-      });
-    }
-    return query;
-  }
-
-  function formatQuery(obj) {
-    var str = '';
-
-    var _loop = function _loop(p) {
-      var key = encodeURIComponent(p);
-      [].concat(obj[p]).forEach(function (val) {
-        if (val == null) return;
-        str += '&' + key;
-        if (val !== '') str += '=' + encodeURIComponent(val);
-      });
-    };
-
-    for (var p in obj) {
-      _loop(p);
-    }
-    return str.slice(1);
-  }
-
-  function parse(str) {
-    var m = /^(?:([^:/?#]+:))?(?:\/\/(?:(([^:@]*)(?::([^:@]*))?)?@)?(([^:/?#]*)(?::(\d*))?))?(((?:[^?#/]*\/)*[^?#]*)(?:(\?[^#]*))?)(?:(#.*))?/.exec(str);
-    var url = {};['href', 'protocol', 'auth', 'username', 'password', 'host', 'hostname', 'port', 'path', 'pathname', 'search', 'hash'].forEach(function (key, i) {
-      return url[key] = m[i] || '';
-    });
-    if (!url.path && !url.pathname) url.path = url.pathname = '/';
-    url.query = parseQuery(url.search.slice(1));
-    return url;
-  }
-
-  function format() {
-    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        _ref$protocol = _ref.protocol,
-        protocol = _ref$protocol === undefined ? '' : _ref$protocol,
-        _ref$auth = _ref.auth,
-        auth = _ref$auth === undefined ? '' : _ref$auth,
-        _ref$username = _ref.username,
-        username = _ref$username === undefined ? '' : _ref$username,
-        _ref$password = _ref.password,
-        password = _ref$password === undefined ? '' : _ref$password,
-        _ref$host = _ref.host,
-        host = _ref$host === undefined ? '' : _ref$host,
-        _ref$hostname = _ref.hostname,
-        hostname = _ref$hostname === undefined ? '' : _ref$hostname,
-        _ref$port = _ref.port,
-        port = _ref$port === undefined ? '' : _ref$port,
-        _ref$path = _ref.path,
-        path = _ref$path === undefined ? '' : _ref$path,
-        _ref$pathname = _ref.pathname,
-        pathname = _ref$pathname === undefined ? '' : _ref$pathname,
-        _ref$search = _ref.search,
-        search = _ref$search === undefined ? '' : _ref$search,
-        _ref$query = _ref.query,
-        query = _ref$query === undefined ? null : _ref$query,
-        _ref$hash = _ref.hash,
-        hash = _ref$hash === undefined ? '' : _ref$hash;
-
-    var str = '';
-
-    if (protocol) {
-      str += protocol;
-      if (protocol.slice(-1) !== ':') str += ':';
-    }
-
-    if (protocol || host || hostname) str += '//';
-
-    if (host || hostname) {
-      if (auth) {
-        str += auth + '@';
-      } else if (username) {
-        str += username;
-        if (password) str += ':' + password;
-        str += '@';
-      }
-
-      if (host) {
-        str += host;
-      } else {
-        str += hostname;
-        if (port) str += ':' + port;
-      }
-    }
-
-    if (path) {
-      str += path;
-    } else {
-      str += pathname || '/';
-
-      if (search) {
-        str += search;
-      } else if (query) {
-        var q = formatQuery(query);
-        if (q) str += '?' + q;
-      }
-    }
-
-    str += hash;
-
-    return str;
-  }
-
-  function resolve(from, to) {
-    from = parse(from);
-    to = parse(to);
-
-    // 'to' is an absolute URL
-    if (to.protocol) return to.href;
-
-    // 'to' only need to complete the protocol
-    if (to.host) {
-      to.protocol = from.protocol;
-      return format(to);
-    }
-
-    // 'to' has aboslute path
-    if (to.path[0] === '/') {
-      from.path = to.path;
-      from.pathname = from.search = '';
-      from.query = null;
-      from.hash = to.hash;
-      return format(from);
-    }
-
-    if (to.pathname) {
-      (function () {
-        var dirFrom = from.pathname.split('/');
-        // pop the filename
-        dirFrom.pop();
-
-        to.pathname.split('/').forEach(function (d) {
-          switch (d) {
-            case '.':
-              return;
-            case '..':
-              return dirFrom.length > 1 ? dirFrom.pop() : null;
-            default:
-              dirFrom.push(d);
-          }
-        });
-
-        from.pathname = dirFrom.join('/');
-      })();
-    }
-
-    from.path = '';
-    from.search = to.search;
-    from.query = null;
-    from.hash = to.hash;
-    return format(from);
-  }
-
-  exports.default = { parse: parse, format: format, resolve: resolve, parseQuery: parseQuery, formatQuery: formatQuery };
-  module.exports = exports['default'];
-});
\ No newline at end of file
diff --git a/江可飞/小程序开发/pages/fenlei/fenlei.js b/江可飞/小程序开发/pages/fenlei/fenlei.js
index 5197573..217be54 100644
--- a/江可飞/小程序开发/pages/fenlei/fenlei.js
+++ b/江可飞/小程序开发/pages/fenlei/fenlei.js
@@ -1,66 +1,117 @@
 // pages/fenlei/fenlei.js
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
+    cateItems: [
+      {
+        cate_id: 1,
+        cate_name: "小说",
+        ishaveChild: true,
+        children:
+          [
+            {
+              child_id: 1,
+              name: '福尔摩斯',
+              image: "/pages/index/image/xs1.jpg"
+            },
+            {
+              child_id: 2,
+              name: '莫泊桑',
+              image: "/pages/index/image/xs2.jpg"
+            },
+            {
+              child_id: 3,
+              name: '盗墓笔记',
+              image: "/pages/index/image/xs3.jpg"
+            },
+            {
+              child_id: 4,
+              name: '明朝那些事',
+              image: "/pages/index/image/xs4.jpg"
+            }
+          ]
+      },
+      {
+        cate_id: 2,
+        cate_name: "科学期刊",
+        ishaveChild: true,
+        children:
+          [
+            {
+              child_id: 1,
+              name: '世界百科',
+              image: "/pages/index/image/kxqk1.jpg"
+            },
+            {
+              child_id: 2,
+              name: '动物百科',
+              image: "/pages/index/image/kxqk2.jpg"
+            },
+            {
+              child_id: 3,
+              name: '趣味科学',
+              image: "/pages/index/image/kxqk3.jpg"
+            }
+          ]
+      },
+      {
+        cate_id: 3,
+        cate_name: "儿童书籍",
+        ishaveChild: true,
+        children:
+          [
+            {
+              child_id: 1,
+              name: '父与子全集',
+              image: "/pages/index/image/etsj1.jpg"
+            },
+            {
+              child_id: 2,
+              name: '丁丁历险记',
+              image: "/pages/index/image/etsj2.jpg"
+            },
+            {
+              child_id: 3,
+              name: '美丽星空',
+              image: "/pages/index/image/etsj3.jpg"
+            },
+            {
+              child_id: 4,
+              name: '小虎神探队',
+              image: "/pages/index/image/etsj4.jpg"
+            }
+          ]
+      },
+      {
+        cate_id: 4,
+        cate_name: "计算机",
+        ishaveChild: true,
+        children: [
+          {
+            child_id: 1,
+            name: 'Java Web',
+            image: "/pages/index/image/java.jpg"
+          },
+          {
+            child_id: 2,
+            name: '计算机网络',
+            image:"/pages/index/image/jsswl.jpg"
+          },
+        ]
+      }
+    ],
+    curNav: 1,
+    curIndex: 0
   },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
+  //事件处理函数  
+  switchRightTab: function (e) {
+    // 获取item项的id，和数组的下标值  
+    let id = e.target.dataset.id,
+      index = parseInt(e.target.dataset.index);
+    // 把点击到的某一项，设为当前index  
+    this.setData({
+      curNav: id,
+      curIndex: index
+    })
   }
-})
\ No newline at end of file
+}) 
\ No newline at end of file
diff --git a/江可飞/小程序开发/pages/fenlei/fenlei.wxml b/江可飞/小程序开发/pages/fenlei/fenlei.wxml
index 81a0db3..d7abca7 100644
--- a/江可飞/小程序开发/pages/fenlei/fenlei.wxml
+++ b/江可飞/小程序开发/pages/fenlei/fenlei.wxml
@@ -1,2 +1,28 @@
 <!--pages/fenlei/fenlei.wxml-->
-<text>pages/fenlei/fenlei.wxml</text>
+<!--主盒子-->
+
+  <!--左侧栏-->
+  <view class="nav_left">
+    <block wx:for="{{cateItems}}">
+      <!--当前项的id等于item项的id，那个就是当前状态-->
+      <!--用data-index记录这个数据在数组的下标位置，使用data-id设置每个item的id值，供打开2级页面使用-->
+      <view class="nav_left_items {{curNav == item.cate_id ? 'active' : ''}}" bindtap="switchRightTab" data-index="{{index}}" data-id="{{item.cate_id}}">{{item.cate_name}}</view>
+    </block>
+  </view>
+  <!--右侧栏-->
+  <view class="nav_right">
+    <!--如果有数据，才遍历项-->
+    <view wx:if="{{cateItems[curIndex].ishaveChild}}">
+      <block wx:for="{{cateItems[curIndex].children}}">
+        <view class="nav_right_items">
+        <!--界面跳转 -->
+          <navigator url="../../detail/detail}}">
+            <image src="{{item.image}}"></image>
+            <text>{{item.name}}</text>
+          </navigator>
+        </view>
+      </block>
+    </view>
+    <!--如果无数据，则显示数据-->
+    <view class="nodata_text" wx:else>该分类暂无数据</view>
+  </view>
diff --git a/江可飞/小程序开发/pages/fenlei/fenlei.wxss b/江可飞/小程序开发/pages/fenlei/fenlei.wxss
index 64f911a..257b64c 100644
--- a/江可飞/小程序开发/pages/fenlei/fenlei.wxss
+++ b/江可飞/小程序开发/pages/fenlei/fenlei.wxss
@@ -1 +1,87 @@
-/* pages/fenlei/fenlei.wxss */
\ No newline at end of file
+/* pages/fenlei/fenlei.wxss */
+page{  
+  background: #f5f5f5;  
+}  
+/*总体主盒子*/  
+.container {  
+  position: relative;  
+  width: 100%;  
+  height: 100%;  
+  background-color: #fff;  
+  color: #939393;  
+}
+ /*左侧栏主盒子*/  
+.nav_left{  
+  /*设置行内块级元素（没使用定位）*/  
+  display: inline-block;  
+  width: 25%;  
+  height: 100%;  
+  /*主盒子设置背景色为灰色*/  
+  background: #f5f5f5;  
+  text-align: center;  
+}  
+/*左侧栏list的item*/  
+.nav_left .nav_left_items{  
+  /*每个高30px*/  
+  height: 40px;  
+  /*垂直居中*/  
+  line-height: 40px;  
+  /*再设上下padding增加高度，总高42px*/  
+  padding: 6px 0;  
+  /*只设下边线*/  
+  border-bottom: 1px solid #dedede;  
+  /*文字14px*/  
+  font-size: 14px; 
+}  
+/*左侧栏list的item被选中时*/  
+.nav_left .nav_left_items.active{  
+  /*背景色变成白色*/  
+  background: #fff;  
+  color: #f0145a; 
+}  
+/*右侧栏主盒子*/  
+.nav_right{  
+  /*右侧盒子使用了绝对定位*/  
+  position: absolute;  
+  top: 0;  
+  right: 0;  
+  flex: 1;  
+  /*宽度75%，高度占满，并使用百分比布局*/  
+  width: 75%;  
+  height: 1000px;  
+  padding: 10px;  
+  box-sizing: border-box;  
+  background: #fff;  
+}  
+/*右侧栏list的item*/  
+.nav_right .nav_right_items{  
+  /*浮动向左*/  
+  float: left;  
+  /*每个item设置宽度是33.33%*/  
+  width: 33.33%;  
+  height: 120px;  
+  text-align: center;  
+}  
+.nav_right .nav_right_items image{  
+  /*被图片设置宽高*/  
+  width: 60px;  
+  height: 60px;  
+  margin-top: 15px;  
+}  
+.nav_right .nav_right_items text{  
+  /*给text设成块级元素*/  
+  display: block;  
+  margin-top: 15px;  
+  font-size: 14px;  
+  color: black;
+  /*设置文字溢出部分为...*/  
+  overflow: hidden;  
+  white-space: nowrap;  
+  text-overflow: ellipsis;  
+} 
+.nodata_text
+{
+  color: black;
+  font-size: 14px;  
+  text-align: center;  
+} 
\ No newline at end of file
diff --git a/江可飞/小程序开发/pages/gouwu/gouwu.wxml b/江可飞/小程序开发/pages/gouwu/gouwu.wxml
index c97497e..e65c4de 100644
--- a/江可飞/小程序开发/pages/gouwu/gouwu.wxml
+++ b/江可飞/小程序开发/pages/gouwu/gouwu.wxml
@@ -1,23 +1,15 @@
 <!--pages/gouwu/gouwu.wxml-->
-<<<<<<< HEAD
 
-=======
-<view class='container' hidden="{{iscart}}">
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       <!-- 上部分  -->
       <view class='section section-good'>
         <checkbox-group bindchange="checkboxChange">
           <view class='good' wx:for='{{goodList}}' wx:for-item="good" wx:key="good.name">
              
-            <!--第一个盒子  -->
+           <!--第一个盒子  -->
               <view class='good_title'>
                 <view class='shangjia'></view>
                 <view class='shanchu'>
-<<<<<<< HEAD
                   <view class='shanchu_trash' bindtap="deleteList"><image src='/pages/index/image/shanchu.png'></image></view>
-=======
-                  <view class='shanchu_trash' bindtap="deleteList"><image src='/assets/images/trash.png'></image></view>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
                 <!-- 删除 -->
                 </view>
               </view>
@@ -73,14 +65,10 @@
         </navigator>
       </view>
 
-<<<<<<< HEAD
 
-=======
-</view>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
 
 <!--如果购物车内没有数据，就显示没有数据-->  
 <view class="cartList" hidden="{{!iscart}}">  
-    <image src="/assets/images/iconfont-cart-empty.png"/>  
+    <image src="/pages/index/image/gouwuche.jpg"/>  
     <view>购物车什么都没有，赶快去购物吧</view>  
 </view>  
diff --git a/江可飞/小程序开发/pages/index/image/banner/banner1.jpg b/江可飞/小程序开发/pages/index/image/banner/banner1.jpg
deleted file mode 100644
index 8991843..0000000
Binary files a/江可飞/小程序开发/pages/index/image/banner/banner1.jpg and /dev/null differ
diff --git a/江可飞/小程序开发/pages/index/image/banner/banner2.jpg b/江可飞/小程序开发/pages/index/image/banner/banner2.jpg
deleted file mode 100644
index 3a9b15f..0000000
Binary files a/江可飞/小程序开发/pages/index/image/banner/banner2.jpg and /dev/null differ
diff --git a/江可飞/小程序开发/pages/index/image/banner/banner3.jpg b/江可飞/小程序开发/pages/index/image/banner/banner3.jpg
deleted file mode 100644
index c1820f9..0000000
Binary files a/江可飞/小程序开发/pages/index/image/banner/banner3.jpg and /dev/null differ
diff --git a/江可飞/小程序开发/pages/index/image/etsj1.jpg b/江可飞/小程序开发/pages/index/image/etsj1.jpg
new file mode 100644
index 0000000..375a5a4
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/etsj1.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/etsj2.jpg b/江可飞/小程序开发/pages/index/image/etsj2.jpg
new file mode 100644
index 0000000..f90cc80
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/etsj2.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/etsj3.jpg b/江可飞/小程序开发/pages/index/image/etsj3.jpg
new file mode 100644
index 0000000..14df22a
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/etsj3.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/etsj4.jpg b/江可飞/小程序开发/pages/index/image/etsj4.jpg
new file mode 100644
index 0000000..33038a6
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/etsj4.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/jsswl.jpg b/江可飞/小程序开发/pages/index/image/jsswl.jpg
new file mode 100644
index 0000000..a1ea4eb
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/jsswl.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/kxqk1.jpg b/江可飞/小程序开发/pages/index/image/kxqk1.jpg
new file mode 100644
index 0000000..e832fb1
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/kxqk1.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/kxqk2.jpg b/江可飞/小程序开发/pages/index/image/kxqk2.jpg
new file mode 100644
index 0000000..39d3b5c
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/kxqk2.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/kxqk3.jpg b/江可飞/小程序开发/pages/index/image/kxqk3.jpg
new file mode 100644
index 0000000..362f39f
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/kxqk3.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/xs1.jpg b/江可飞/小程序开发/pages/index/image/xs1.jpg
new file mode 100644
index 0000000..945463c
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/xs1.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/xs2.jpg b/江可飞/小程序开发/pages/index/image/xs2.jpg
new file mode 100644
index 0000000..e369cf4
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/xs2.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/xs3.jpg b/江可飞/小程序开发/pages/index/image/xs3.jpg
new file mode 100644
index 0000000..27a4eb6
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/xs3.jpg differ
diff --git a/江可飞/小程序开发/pages/index/image/xs4.jpg b/江可飞/小程序开发/pages/index/image/xs4.jpg
new file mode 100644
index 0000000..dd22ecf
Binary files /dev/null and b/江可飞/小程序开发/pages/index/image/xs4.jpg differ
diff --git a/江可飞/小程序开发/pages/index/index.js b/江可飞/小程序开发/pages/index/index.js
index 2cdf99b..608a282 100644
--- a/江可飞/小程序开发/pages/index/index.js
+++ b/江可飞/小程序开发/pages/index/index.js
@@ -51,8 +51,4 @@ Page({
       hasUserInfo: true
     })
   }
-<<<<<<< HEAD
-  
-=======
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
 })
diff --git a/江可飞/小程序开发/pages/shouye/shouye.js b/江可飞/小程序开发/pages/shouye/shouye.js
index 473f0c9..ef720b4 100644
--- a/江可飞/小程序开发/pages/shouye/shouye.js
+++ b/江可飞/小程序开发/pages/shouye/shouye.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 // pages/shouye/shouye.js
 Page({
 
@@ -63,117 +62,5 @@ Page({
    */
   onShareAppMessage: function () {
 
-=======
-//index.js
-//获取应用实例
-const app = getApp()
-const api = require('../../utils/api.js');
-
-Page({
-  data: {
-    motto: 'Hello World',
-    userInfo: {},
-    hasUserInfo: false,
-    canIUse: wx.canIUse('button.open-type.getUserInfo'),
-    imgUrls: [
-      '../index/image/banner/banner1.jpg',
-      '../index/image/banner/banner2.jpg',
-      '../index/image/banner/banner3.jpg'
-    ],
-    indicatorDots: true,
-    autoplay: true,
-    interval: 5000,
-    duration: 1000,
-    forumList: [],
-  },
-  //事件处理函数
- // bindViewTap: function () {
-   // wx.navigateTo({
-    //  url: '../logs/logs'
-   // })
-  //},
-  onShow() {
-
-  },
-  onLoad: function () {
-    let that = this;
-    wx.getStorage({
-      key: 'bbsProfile',
-      fail: function (res) {
-        that.login();
-      }
-    })
-    this.getForum();
-    if (app.globalData.userInfo) {
-      this.setData({
-        userInfo: app.globalData.userInfo,
-        hasUserInfo: true
-      })
-    } else if (this.data.canIUse) {
-      // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
-      // 所以此处加入 callback 以防止这种情况
-      app.userInfoReadyCallback = res => {
-        this.setData({
-          userInfo: res.userInfo,
-          hasUserInfo: true
-        })
-      }
-    } else {
-      // 在没有 open-type=getUserInfo 版本的兼容处理
-      wx.getUserInfo({
-        success: res => {
-          app.globalData.userInfo = res.userInfo
-          this.setData({
-            userInfo: res.userInfo,
-            hasUserInfo: true
-          })
-        }
-      })
-    }
-
-
-  },
-  getUserInfo: function (e) {
-    console.log(e)
-    app.globalData.userInfo = e.detail.userInfo
-    this.setData({
-      userInfo: e.detail.userInfo,
-      hasUserInfo: true
-    })
-  },
-  getForum() {
-    let data = {
-      pageNo: "0",
-      pageSize: "5"
-    };
-    api.getForum({
-      data,
-      success: (res) => {
-        this.setData({
-          forumList: res.data.content
-        })
-      }
-    })
-  },
-  login() {
-    let data = {
-      "username": "3f8bbbfaafda4d3e83e06b689d785e52",
-      "password": "3f8bbbfaafda4d3e83e06b689d785e52"
-    }
-    api.login({
-      data,
-      success: (res) => {
-        wx.setStorage({
-          key: 'bbsProfile',
-          data: res.data.item
-        })
-      }
-    })
-  },
-  toList(e) {
-    wx.navigateTo({
-      url: '../logs/logs?id=0',
-    })
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
   }
 })
\ No newline at end of file
diff --git a/江可飞/小程序开发/pages/shouye/shouye.json b/江可飞/小程序开发/pages/shouye/shouye.json
index 90652ee..8835af0 100644
--- a/江可飞/小程序开发/pages/shouye/shouye.json
+++ b/江可飞/小程序开发/pages/shouye/shouye.json
@@ -1,7 +1,3 @@
 {
-<<<<<<< HEAD
   "usingComponents": {}
-=======
-  "navigationBarTitleText": "首页"
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
 }
\ No newline at end of file
diff --git a/江可飞/小程序开发/pages/shouye/shouye.wxml b/江可飞/小程序开发/pages/shouye/shouye.wxml
index b451b40..89dfdb9 100644
--- a/江可飞/小程序开发/pages/shouye/shouye.wxml
+++ b/江可飞/小程序开发/pages/shouye/shouye.wxml
@@ -1,60 +1,2 @@
-<<<<<<< HEAD
 <!--pages/shouye/shouye.wxml-->
 <text>pages/shouye/shouye.wxml</text>
-=======
-<view class="containers">
-  <!--<view class="userinfo">
-    <button wx:if="{{!hasUserInfo && canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
-    <block wx:else>
-      <image bindtap="bindViewTap" class="userinfo-avatar" src="{{userInfo.avatarUrl}}" background-size="cover"></image>
-      <text class="userinfo-nickname">{{userInfo.nickName}}</text>
-    </block>
-  </view>
-  <view class="usermotto">
-    <text class="user-motto">{{motto}}</text>
-  </view>-->
-  <view class="swiper-ai">
-    <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
-      <block wx:for="{{imgUrls}}">
-        <swiper-item>
-          <image src="{{item}}" class="slide-image" width="355" height="240" />
-        </swiper-item>
-      </block>
-    </swiper>
-  </view>
-  <!--<view>
-    <label class="weui-search-bar__label" hidden="{{inputShowed}}" bindtap="showInput">
-      <icon class="weui-icon-search" type="search" size="14"></icon>
-      <view class="weui-search-bar__text">搜索</view>
-    </label>
-  </view>-->
-  <view class="weui-search-bar__form">
-    <view class="weui-search-bar__box">
-      <icon class="weui-icon-search_in-box" type="search" size="14"></icon>
-      <form bindsubmit="formSubmit">
-        <input type="text" bindconfirm="bindKeyFirm" class="weui-search-bar__input" placeholder="搜索" value="{{inputVal}}" focus="{{inputShowed}}" bindinput="inputTyping" />
-      </form>
-    </view>
-  </view>
-  <view class="weui-panel weui-panel_access" style="margin-top:0;">
-    <view class="weui-panel__hd">推荐模块</view>
-    <view class="weui-panel__bd">
-      <navigator wx:for="{{forumList}}" url="../logs/logs?id={{item.id}}" data-id="{{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
-        <view class="weui-media-box__hd weui-media-box__hd_in-appmsg" style="width:120px;height:80px;">
-          <image class="weui-media-box__thumb" src='../index/image/banner/img{{index}}.jpeg' />
-        </view>
-        <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
-          <view class="weui-media-box__title">{{item.forum_name}}</view>
-          <view class="weui-media-box__desc">{{item.forum_description}}</view>
-        </view>
-      </navigator>
-    </view>
-    <view class="weui-panel__ft">
-      <view class="weui-cell weui-cell_access weui-cell_link">
-        <view class="weui-cell__bd" bindtap="toList">查看更多</view>
-        <view class="weui-cell__ft weui-cell__ft_in-access"></view>
-      </view>
-    </view>
-  </view>
-</view>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
diff --git a/江可飞/小程序开发/pages/shouye/shouye.wxss b/江可飞/小程序开发/pages/shouye/shouye.wxss
index 9497f6a..29b43f8 100644
--- a/江可飞/小程序开发/pages/shouye/shouye.wxss
+++ b/江可飞/小程序开发/pages/shouye/shouye.wxss
@@ -1,30 +1 @@
-<<<<<<< HEAD
-/* pages/shouye/shouye.wxss */
-=======
-/**index.wxss**/
-.userinfo {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.userinfo-avatar {
-  width: 128rpx;
-  height: 128rpx;
-  margin: 20rpx;
-  border-radius: 50%;
-}
-.swiper-ai image{
-  width: 100%;
-}
-.swiper-ai swiper{
-  height:240px;
-}
-.userinfo-nickname {
-  color: #aaa;
-}
-
-.usermotto {
-  margin-top: 200px;
-}
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
+/* pages/shouye/shouye.wxss */
\ No newline at end of file
diff --git a/江可飞/小程序开发/pages/wode/wode.js b/江可飞/小程序开发/pages/wode/wode.js
index dc2c4a7..88b86ab 100644
--- a/江可飞/小程序开发/pages/wode/wode.js
+++ b/江可飞/小程序开发/pages/wode/wode.js
@@ -10,41 +10,25 @@ Page({
         typeId: 0,
         name: '待付款',
         url: 'bill',
-<<<<<<< HEAD
         imageurl: '/pages/index/image/fukuan.png',
-=======
-        imageurl: 'pages/index/image/fukuan.png',
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       },
       {
         typeId: 1,
         name: '待发货',
         url: 'bill',
-<<<<<<< HEAD
         imageurl: '/pages/index/image/fahuo.png',
-=======
-        imageurl: 'pages/index/image/fahua.png',
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       },
       {
         typeId: 2,
         name: '待收货',
         url: 'bill',
-<<<<<<< HEAD
         imageurl: '/pages/index/image/shouhuo.png'
-=======
-        imageurl: 'pages/index/image/shouhua.png'
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       },
       {
         typeId: 3,
         name: '待评价',
         url: 'bill',
-<<<<<<< HEAD
         imageurl: '/pages/index/image/pingjia.png'
-=======
-        imageurl: 'pages/index/image/pingjia.png'
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       }
     ],
   },
diff --git a/江可飞/小程序开发/pages/wode/wode.wxml b/江可飞/小程序开发/pages/wode/wode.wxml
index 1ef58aa..6056539 100644
--- a/江可飞/小程序开发/pages/wode/wode.wxml
+++ b/江可飞/小程序开发/pages/wode/wode.wxml
@@ -1,10 +1,6 @@
 <!--pages/wode/wode.wxml-->
 
-<<<<<<< HEAD
 
-=======
-<view class="container">
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
 
   <view class="userinfo">
     <image class="userinfo-avatar" src="{{userInfo.avatarUrl}}" background-size="cover"></image>
@@ -18,11 +14,7 @@
   <view class="order" catchtap="toOrder">
     <text class="myorder-text">我的订单</text>
     <text class="myorderlook-text">查看全部订单</text>
-<<<<<<< HEAD
     <image class="next-image" src="/pages/index/image/next.png"></image>
-=======
-    <image class="next-image" src="../../images/person/next.png"></image>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
   </view>
   <view class="line"></view>
 
@@ -38,52 +30,28 @@
   <view class="separate"></view>
   <view class="person-list">
     <view class="list-item">
-<<<<<<< HEAD
       <image class="item-image" src="/pages/index/image/wdshoucang.png"></image>
-=======
-      <image class="item-image" src="../../images/person/personal_favorite.png"></image>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       <text class="item-text">我的收藏</text>
     </view>
     <view class="person-line"></view>
     <view class="list-item">
-<<<<<<< HEAD
       <image class="item-image" src="/pages/index/image/shdz.png"></image>
-=======
-      <image class="item-image" src="../../images/person/personal_site.png"></image>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       <text class="item-text">收货地址</text>
     </view>
     <view class="person-line"></view>
     <view class="list-item">
-<<<<<<< HEAD
       <image class="item-image" src="/pages/index/image/wddd.png"></image>
-=======
-      <image class="item-image" src="../../images/person/personal_sale_record.png"></image>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       <text class="item-text">我的订单</text>
     </view>
     <view class="person-line"></view>
     <view class="list-item">
-<<<<<<< HEAD
       <image class="item-image" src="/pages/index/image/wdpj.png"></image>
-=======
-      <image class="item-image" src="../../images/person/personal_evaluated.png"></image>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       <text class="item-text">我的评价</text>
     </view>
     <view class="person-line"></view>
     <view class="list-item">
-<<<<<<< HEAD
       <image class="item-image" src="/pages/index/image/gywm.png"></image>
-=======
-      <image class="item-image" src="../../images/person/personal_share.png"></image>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
       <text class="item-text">关于我们</text>
     </view>
   </view>
   <view class="separate"></view>
-<<<<<<< HEAD
-=======
-</view>
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
diff --git a/江可飞/小程序开发/project.config.json b/江可飞/小程序开发/project.config.json
index b01666d..5fd7f42 100644
--- a/江可飞/小程序开发/project.config.json
+++ b/江可飞/小程序开发/project.config.json
@@ -13,13 +13,8 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.4.4",
-<<<<<<< HEAD
 	"appid": "wx18f06ad86d422b11",
-	"projectname": "%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%BC%80%E5%8F%9111",
-=======
-	"appid": "wxd037e598f9fc428d",
-	"projectname": "%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%BC%80%E5%8F%91",
->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58
+	"projectname": "%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%BC%80%E5%8F%91%E6%B5%8B%E8%AF%95",
 	"debugOptions": {
 		"hidedInDevtools": []
 	},
diff --git a/江可飞/小程序开发/utils/api.js b/江可飞/小程序开发/utils/api.js
deleted file mode 100644
index 99a3ca3..0000000
--- a/江可飞/小程序开发/utils/api.js
+++ /dev/null
@@ -1,62 +0,0 @@
-const apiURL = 'http://47.104.244.32:8100';
-let headerData= {
-
-}
-headerData['Content-Type']= 'application/json';
-let userData ={};
-wx.getStorage({
-  key: 'bbsProfile',
-  success: function(res) {
-    userData = res.data;
-      if(userData.token){
-        headerData['Authorization']=userData.token;
-    }
-  }
-})
-
-
-const wxRequest = (params, url) => {
-  wx.request({
-    url,
-    method: params.method || 'POST',
-    data: params.data || {},
-    header:headerData, /*{
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-    },*/
-    success(res) {
-      if (params.success) {
-        params.success(res);
-      }
-    },
-    fail(res) {
-      if (params.fail) {
-        params.fail(res);
-      }
-    },
-    complete(res) {
-      if (params.complete) {
-        params.complete(res);
-      }
-    },
-  });
-};
-
-const getForum = (params) => {
-  wxRequest(params, `${apiURL}/forumManagement/getForum`);
-};
-const getQuestion = (params) => {
-  wxRequest(params, `${apiURL}/question/getQuestion`);
-};
-const login = (params) => {
-  wxRequest(params, `${apiURL}/session`);
-};
-const newAdmin = (params) => {
-  wxRequest(params, `${apiURL}/user/newAdmin`);
-};
-module.exports = {
-  getForum,
-  getQuestion,
-  login,
-  newAdmin
-};
diff --git a/江可飞/小程序开发/weui.wxss b/江可飞/小程序开发/weui.wxss
deleted file mode 100644
index 3d6cfac..0000000
--- a/江可飞/小程序开发/weui.wxss
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * WeUI v1.1.1 (https://github.com/weui/weui-wxss)
- * Copyright 2017 Tencent, Inc.
- * Licensed under the MIT license
- */
-page{line-height:1.6;font-family:-apple-system-font,Helvetica Neue,sans-serif}icon{vertical-align:middle}.weui-cells{position:relative;margin-top:1.17647059em;background-color:#fff;line-height:1.41176471;font-size:17px}.weui-cells:before{top:0;border-top:1rpx solid #d9d9d9}.weui-cells:after,.weui-cells:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#d9d9d9}.weui-cells:after{bottom:0;border-bottom:1rpx solid #d9d9d9}.weui-cells__title{margin-top:.77em;margin-bottom:.3em;padding-left:15px;padding-right:15px;color:#999;font-size:14px}.weui-cells_after-title{margin-top:0}.weui-cells__tips{margin-top:.3em;color:#999;padding-left:15px;padding-right:15px;font-size:14px}.weui-cell{padding:10px 15px;position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-cell:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid #d9d9d9;color:#d9d9d9;left:15px}.weui-cell:first-child:before{display:none}.weui-cell_active{background-color:#ececec}.weui-cell_primary{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.weui-cell__bd{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-cell__ft{text-align:right;color:#999}.weui-cell_access{color:inherit}.weui-cell__ft_in-access{padding-right:13px;position:relative}.weui-cell__ft_in-access:after{content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8cd;border-style:solid;-webkit-transform:matrix(.71,.71,-.71,.71,0,0);transform:matrix(.71,.71,-.71,.71,0,0);position:relative;top:-2px;position:absolute;top:50%;margin-top:-4px;right:2px}.weui-cell_link{color:#586c94;font-size:14px}.weui-cell_link:active{background-color:#ececec}.weui-cell_link:first-child:before{display:block}.weui-icon-radio{margin-left:3.2px;margin-right:3.2px}.weui-icon-checkbox_circle,.weui-icon-checkbox_success{margin-left:4.6px;margin-right:4.6px}.weui-check__label:active{background-color:#ececec}.weui-check{position:absolute;left:-9999px}.weui-check__hd_in-checkbox{padding-right:.35em}.weui-cell__ft_in-radio{padding-left:.35em}.weui-cell_input{padding-top:0;padding-bottom:0}.weui-label{width:105px;word-wrap:break-word;word-break:break-all}.weui-input{height:2.58823529em;min-height:2.58823529em;line-height:2.58823529em}.weui-toptips{position:fixed;-webkit-transform:translateZ(0);transform:translateZ(0);top:0;left:0;right:0;padding:5px;font-size:14px;text-align:center;color:#fff;z-index:5000;word-wrap:break-word;word-break:break-all}.weui-toptips_warn{background-color:#e64340}.weui-textarea{display:block;width:100%}.weui-textarea-counter{color:#b2b2b2;text-align:right}.weui-cell_warn,.weui-textarea-counter_warn{color:#e64340}.weui-form-preview{position:relative;background-color:#fff}.weui-form-preview:before{top:0;border-top:1rpx solid #d9d9d9}.weui-form-preview:after,.weui-form-preview:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#d9d9d9}.weui-form-preview:after{bottom:0;border-bottom:1rpx solid #d9d9d9}.weui-form-preview__value{font-size:14px}.weui-form-preview__value_in-hd{font-size:26px}.weui-form-preview__hd{position:relative;padding:10px 15px;text-align:right;line-height:2.5em}.weui-form-preview__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1rpx solid #d9d9d9;color:#d9d9d9;left:15px}.weui-form-preview__bd{padding:10px 15px;font-size:.9em;text-align:right;color:#999;line-height:2}.weui-form-preview__ft{position:relative;line-height:50px;display:-webkit-box;display:-webkit-flex;display:flex}.weui-form-preview__ft:after{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid #d5d5d6;color:#d5d5d6}.weui-form-preview__item{overflow:hidden}.weui-form-preview__label{float:left;margin-right:1em;min-width:4em;color:#999;text-align:justify;text-align-last:justify}.weui-form-preview__value{display:block;overflow:hidden;word-break:normal;word-wrap:break-word}.weui-form-preview__btn{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#3cc51f;text-align:center}.weui-form-preview__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1rpx solid #d5d5d6;color:#d5d5d6}.weui-form-preview__btn:first-child:after{display:none}.weui-form-preview__btn_active{background-color:#eee}.weui-form-preview__btn_default{color:#999}.weui-form-preview__btn_primary{color:#0bb20c}.weui-cell_select{padding:0}.weui-select{position:relative;padding-left:15px;padding-right:30px;height:2.58823529em;min-height:2.58823529em;line-height:2.58823529em;border-right:1rpx solid #d9d9d9}.weui-select:before{content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8cd;border-style:solid;-webkit-transform:matrix(.71,.71,-.71,.71,0,0);transform:matrix(.71,.71,-.71,.71,0,0);position:relative;top:-2px;position:absolute;top:50%;right:15px;margin-top:-4px}.weui-select_in-select-after{padding-left:0}.weui-cell__bd_in-select-before,.weui-cell__hd_in-select-after{padding-left:15px}.weui-cell_vcode{padding-right:0}.weui-vcode-btn,.weui-vcode-img{margin-left:5px;height:2.58823529em;vertical-align:middle}.weui-vcode-btn{display:inline-block;padding:0 .6em 0 .7em;border-left:1px solid #e5e5e5;line-height:2.58823529em;font-size:17px;color:#3cc51f;white-space:nowrap}.weui-vcode-btn:active{color:#52a341}.weui-cell_switch{padding-top:6px;padding-bottom:6px}.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,.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}.weui-article{padding:20px 15px;font-size:15px}.weui-article__section{margin-bottom:1.5em}.weui-article__h1{font-size:18px;font-weight:400;margin-bottom:.9em}.weui-article__h2{font-size:16px;font-weight:400;margin-bottom:.34em}.weui-article__h3{font-weight:400;font-size:15px;margin-bottom:.34em}.weui-article__p{margin:0 0 .8em}.weui-msg{padding-top:36px;text-align:center}.weui-msg__link{display:inline;color:#586c94}.weui-msg__icon-area{margin-bottom:30px}.weui-msg__text-area{margin-bottom:25px;padding:0 20px}.weui-msg__title{margin-bottom:5px;font-weight:400;font-size:20px}.weui-msg__desc{font-size:14px;color:#999}.weui-msg__opr-area{margin-bottom:25px}.weui-msg__extra-area{margin-bottom:15px;font-size:14px;color:#999}@media screen and (min-height:438px){.weui-msg__extra-area{position:fixed;left:0;bottom:0;width:100%;text-align:center}}.weui-flex{display:-webkit-box;display:-webkit-flex;display:flex}.weui-flex__item{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-btn{margin-top:15px}.weui-btn:first-child{margin-top:0}.weui-btn-area{margin:1.17647059em 15px .3em}.weui-agree{display:block;padding:.5em 15px;font-size:13px}.weui-agree__text{color:#999}.weui-agree__link{display:inline;color:#586c94}.weui-agree__checkbox{position:absolute;left:-9999px}.weui-agree__checkbox-icon{position:relative;top:2px;display:inline-block;border:1px solid #d1d1d1;background-color:#fff;border-radius:3px;width:11px;height:11px}.weui-agree__checkbox-icon-check{position:absolute;top:1px;left:1px}.weui-footer{color:#999;font-size:14px;text-align:center}.weui-footer_fixed-bottom{position:fixed;bottom:.52em;left:0;right:0}.weui-footer__links{font-size:0}.weui-footer__link{display:inline-block;vertical-align:top;margin:0 .62em;position:relative;font-size:14px;color:#586c94}.weui-footer__link:before{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1rpx solid #c7c7c7;color:#c7c7c7;left:-.65em;top:.36em;bottom:.36em}.weui-footer__link:first-child:before{display:none}.weui-footer__text{padding:0 .34em;font-size:12px}.weui-grids{border-top:1rpx solid #d9d9d9;border-left:1rpx solid #d9d9d9;overflow:hidden}.weui-grid{position:relative;float:left;padding:20px 10px;width:33.33333333%;box-sizing:border-box;border-right:1rpx solid #d9d9d9;border-bottom:1rpx solid #d9d9d9}.weui-grid_active{background-color:#ececec}.weui-grid__icon{display:block;width:28px;height:28px;margin:0 auto}.weui-grid__label{margin-top:5px;display:block;text-align:center;color:#000;font-size:14px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.weui-loading{margin:0 5px;width:20px;height:20px;display:inline-block;vertical-align:middle;-webkit-animation:a 1s steps(12) infinite;animation:a 1s steps(12) infinite;background:transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;background-size:100%}.weui-loading.weui-loading_transparent{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E")}@-webkit-keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.weui-badge{display:inline-block;padding:.15em .4em;min-width:8px;border-radius:18px;background-color:#e64340;color:#fff;line-height:1.2;text-align:center;font-size:12px;vertical-align:middle}.weui-badge_dot{padding:.4em;min-width:0}.weui-loadmore{width:65%;margin:1.5em auto;line-height:1.6em;font-size:14px;text-align:center}.weui-loadmore__tips{display:inline-block;vertical-align:middle}.weui-loadmore_line{border-top:1px solid #e5e5e5;margin-top:2.4em}.weui-loadmore__tips_in-line{position:relative;top:-.9em;padding:0 .55em;background-color:#fff;color:#999}.weui-loadmore__tips_in-dot{position:relative;padding:0 .16em;width:4px;height:1.6em}.weui-loadmore__tips_in-dot:before{content:" ";position:absolute;top:50%;left:50%;margin-top:-1px;margin-left:-2px;width:4px;height:4px;border-radius:50%;background-color:#e5e5e5}.weui-panel{background-color:#fff;margin-top:10px;position:relative;overflow:hidden}.weui-panel:first-child{margin-top:0}.weui-panel:before{top:0;border-top:1rpx solid #e5e5e5}.weui-panel:after,.weui-panel:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#e5e5e5}.weui-panel:after{bottom:0;border-bottom:1rpx solid #e5e5e5}.weui-panel__hd{padding:14px 15px 10px;color:#999;font-size:13px;position:relative}.weui-panel__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1rpx solid #e5e5e5;color:#e5e5e5;left:15px}.weui-media-box{padding:15px;position:relative}.weui-media-box:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1rpx solid #e5e5e5;color:#e5e5e5;left:15px}.weui-media-box:first-child:before{display:none}.weui-media-box__title{font-weight:400;font-size:17px;width:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;word-wrap:break-word;word-break:break-all}.weui-media-box__desc{color:#999;font-size:13px;line-height:1.2;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.weui-media-box__info{margin-top:15px;padding-bottom:5px;font-size:13px;color:#cecece;line-height:1em;list-style:none;overflow:hidden}.weui-media-box__info__meta{float:left;padding-right:1em}.weui-media-box__info__meta_extra{padding-left:1em;border-left:1px solid #cecece}.weui-media-box__title_in-text{margin-bottom:8px}.weui-media-box_appmsg{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-media-box__thumb{width:100%;height:100%;vertical-align:top}.weui-media-box__hd_in-appmsg{margin-right:.8em;width:60px;height:60px;line-height:60px;text-align:center}.weui-media-box__bd_in-appmsg{-webkit-box-flex:1;-webkit-flex:1;flex:1;min-width:0}.weui-media-box_small-appmsg{padding:0}.weui-cells_in-small-appmsg{margin-top:0}.weui-cells_in-small-appmsg:before{display:none}.weui-progress{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-progress__bar{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-progress__opr{margin-left:15px;font-size:0}.weui-navbar{display:-webkit-box;display:-webkit-flex;display:flex;position:absolute;z-index:500;top:0;width:100%;border-bottom:1rpx solid #ccc}.weui-navbar__item{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:13px 0;text-align:center;font-size:0}.weui-navbar__item.weui-bar__item_on{color:#1aad19}.weui-navbar__slider{position:absolute;content:" ";left:0;bottom:0;width:6em;height:3px;background-color:#1aad19;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.weui-navbar__title{display:inline-block;font-size:15px;max-width:8em;width:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal}.weui-tab{position:relative;height:100%}.weui-tab__panel{box-sizing:border-box;height:100%;padding-top:50px;overflow:auto;-webkit-overflow-scrolling:touch}.weui-search-bar{position:relative;padding:8px 10px;display:-webkit-box;display:-webkit-flex;display:flex;box-sizing:border-box;background-color:#efeff4;border-top:1rpx solid #d7d6dc;border-bottom:1rpx solid #d7d6dc}.weui-icon-search{margin-right:8px;font-size:inherit}.weui-icon-search_in-box{position:absolute;left:10px;top:7px}.weui-search-bar__text{display:inline-block;font-size:14px;vertical-align:middle}.weui-search-bar__form{position:relative;-webkit-box-flex:1;-webkit-flex:auto;flex:auto;border-radius:5px;background:#fff;border:1rpx solid #e6e6ea}.weui-search-bar__box{position:relative;padding-left:30px;padding-right:30px;width:100%;box-sizing:border-box;z-index:1}.weui-search-bar__input{height:28px;line-height:28px;font-size:14px}.weui-icon-clear{position:absolute;top:0;right:0;padding:7px 8px;font-size:0}.weui-search-bar__label{position:absolute;top:0;right:0;bottom:0;left:0;z-index:2;border-radius:3px;text-align:center;color:#9b9b9b;background:#fff;line-height:28px}.weui-search-bar__cancel-btn{margin-left:10px;line-height:28px;color:#09bb07;white-space:nowrap}
\ No newline at end of file