bug

app.json

@@ -23,7 +23,6 @@
     "pages/mine/mine",
     "pages/mineCollect/mineCollect",
     "pages/mineInvite/invite",
-    "pages/mineCoupon/coupon",
     "pages/mineAddress/mineAddress",
     "pages/editAddress/editAddress",
     "pages/selectAddress/selectAddress",

pages/mine/mine.js

@@ -19,6 +19,12 @@ Page({
           num:0,
         },
         {
+          label: "待审核",
+          state: "2",
+          icon: "icon-daishenhe",
+          num: 0,
+        },
+        {
           label: "待发货",
           state: "3",
           icon: "icon-daifahuo1",
@@ -29,6 +35,12 @@ Page({
           state: "4",
           icon: "icon-daishouhuo",
           num: 0,
+        },
+        {
+          label: "已完成",
+          state: "5",
+          icon: "icon-yiwancheng1",
+          num: 0,
         }
       ]
     },

pages/mine/mine.wxml

@@ -20,10 +20,10 @@
  <view class='user-order'>
     <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title f-box f-align-items-center">
       <view class='f-item'>{{orderList.label}}</view>
-      <!-- <view class='f-s28 f-box f-align-items-center' data-state="" bindtap='orderList'>
+      <view class='f-s28 f-box f-align-items-center' data-state="{{orderList.state}}" bindtap='orderList'>
         <view>{{orderList.summary}}</view>
         <icon class='{{orderList.icon}} iconfont'></icon>
-      </view> -->
+      </view>
     </view>
     <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
       <view class='f-item  order-item' wx:for="{{orderList.data}}" data-state="{{item.state}}" bindtap='orderList'>
@@ -63,7 +63,7 @@
   </view>
 
   <!-- 退出渠道 -->
-  <view class='channe-box' wx:if="{{channIdState}}" bindtap='outChann'>
+  <view class='channe-box' wx:if="{{channelName}}" bindtap='outChann'>
     <button class='f-s30'>退出渠道</button>
   </view>
   

pages/mineCoupon/coupon.js

@@ -1,252 +0,0 @@
-// coupon.js  -  优惠劵
-
-//  useState : 使用状态  0-未使用   1-使用   2-过期
-var app = getApp() ;
-var couponList = [
-];
-
-
-Page({
-  data: {
-    couponList: couponList,
-    isSelect: false,
-    usey : true,
-    total2 : 0,
-    hiddenmodal: true, //弹窗
-    modalCont: ''
-  },
-
-  onLoad: function (options){
-    var that = this;
-    var host = getApp().globalData.servsers;
-    var un_id = getApp().globalData.un_id;
-    console.log(un_id);
-
-    un_id = 'oovpNwvQGE0uUqpsQrbiVigaEFM0';
-
-    if (un_id != undefined && un_id != '' && un_id != null){
-      //增加登陆优惠券（后台自动判断是否是新用户）
-      wx.request({
-        url: host + "mycouponapi/insertadd",
-        data: {
-          user_id: un_id,
-          coupon_id: '1',
-          batch_no: '0'
-        },
-        method: 'GET', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
-        header: {
-          'Accept': 'application/json'
-        },
-        success: function (res) {
-          if (res == null || res.data == null) {
-            console.error('网络请求失败');
-            return;
-          }
-        }
-      })
-
-      wx.request({//请求回当前用户下的所有优惠劵
-        url: host + "couponapi/couponall",
-        data: {
-          user_id: un_id,
-          coupon_id: '1',
-        },
-        method: 'GET', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
-        header: {
-          'Accept': 'application/json'
-        },
-        success: function (res) {
-          that.setData({
-            couponList: res.data.rows
-          });
-          console.log(res.data.rows)
-          if (res == null || res.data == null) {
-            console.error('网络请求失败');
-            return;
-          }
-        }
-      });
-
-      wx.request({//将当前优惠劵活动对应的优惠劵插入相应的用户中
-        url: host + "mycouponapi/insertadd",
-        data: {
-          user_id: un_id,
-          coupon_id: '2,3,4',
-          batch_no: '1'
-        },
-        method: 'GET', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
-        header: {
-          'Accept': 'application/json'
-        },
-        success: function (res) {
-
-          wx.request({//请求回当前用户下的所有优惠劵
-            url: host + "couponapi/couponall",
-            data: {
-              user_id: un_id,
-              coupon_id: '1',
-            },
-            method: 'GET', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
-            header: {
-              'Accept': 'application/json'
-            },
-            success: function (res) {
-              that.setData({
-                couponList: res.data.rows
-              });
-              if (res == null || res.data == null) {
-                console.error('网络请求失败');
-                return;
-              }
-            }
-          })
-
-          if (res == null || res.data == null) {
-            console.error('网络请求失败');
-            return;
-          }
-        }
-      })
-
-      //获取当前日期
-      var date = new Date();
-      var Y = date.getFullYear();
-      var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
-      var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
-      var nowTime = Y + '/' + M + '/' + D;
-      nowTime = nowTime.replace(/-/g, '/');
-      nowTime = Date.parse(nowTime);
-
-      var couponList = that.data.couponList;
-      var listLen = couponList.length;
-      for (var i = 0; i < listLen; i++) {
-        var beiginTime = that.data.couponList[i].coupon_start;
-        var beginTimestamp = beiginTime.replace(/-/g, '/');
-        beginTimestamp = Date.parse(beginTimestamp);
-        var endTime = that.data.couponList[i].coupon_stop;
-        var endTimestamp = endTime.replace(/-/g, '/');
-        endTimestamp = Date.parse(endTimestamp);
-        if (parseInt(nowTime) > parseInt(endTimestamp)) {//已过期
-          if (that.data.couponList[i].coupon_state == 0) {
-            that.data.couponList[i].coupon_state = 4;
-          }
-        }
-      }
-
-
-
-      that.data.total2 = options.total2;
-      var pages = getCurrentPages();
-      var currPage = pages[pages.length - 1];  //当前页面
-      var prevPage = pages[pages.length - 2]; //上一个页面
-      if (prevPage.route == 'pages/mine/index') {//从"我的"进入，则没有使用状态
-        that.setData({
-          usey: false
-        })
-      }
-
-    }
-
-  },
-
-  //选用优惠劵
-  usrCoupon: function (e) {
-    var that = this;
-    var pages = getCurrentPages();
-    var currPage = pages[pages.length - 1];  //当前页面
-    var prevPage = pages[pages.length - 2]; //上一个页面
-    var id = e.currentTarget.dataset.id;
-    var youhuiLimit = that.data.couponList[id].coupon_full_money;
-
-    //获取当前日期
-    var date = new Date();
-    var Y = date.getFullYear();
-    var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
-    var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
-    var nowTime = Y + '/' + M + '/' + D;
-    nowTime = nowTime.replace(/-/g, '/');
-    nowTime = Date.parse(nowTime);
-
-    var beiginTime = that.data.couponList[id].coupon_start;
-    var endTime = that.data.couponList[id].coupon_stop;
-
-    if (beiginTime == '' || beiginTime == null || beiginTime　==　undefined){
-      beginTimestamp = parseInt(nowTime) + 1;
-    }else{
-      var beginTimestamp = beiginTime.replace(/-/g, '/');
-      beginTimestamp = Date.parse(beginTimestamp);
-    }
-
-    if (endTime == '' || endTime == null || endTime 　== 　undefined) {
-      endTimestamp = parseInt(nowTime) + 1;
-    } else {
-      var endTimestamp = endTime.replace(/-/g, '/');
-      endTimestamp = Date.parse(endTimestamp);
-    }
-
-    // console.log("1:" + (parseInt(nowTime) >= parseInt(beginTimestamp)));
-    // console.log("2:" + (parseInt(nowTime) <= parseInt(endTimestamp)));    
-    // console.log("nowTime:" + nowTime);
-    // console.log("beginTimestamp:" + beginTimestamp);
-    // console.log("endTimestamp:" + endTimestamp);
-    // console.log("that.data.total2:" + that.data.total2);
-    // console.log("youhuiLimit:" + youhuiLimit);
-
-    if (parseInt(nowTime) >= parseInt(beginTimestamp) && parseInt(nowTime) <= parseInt(endTimestamp) || (beiginTime == null && endTime == null)) {//限定使用时间之内
-      if (parseFloat(that.data.total2) > parseFloat(youhuiLimit) || parseFloat(that.data.total2) == parseFloat(youhuiLimit)) {
-        var couponName = that.data.couponList[id].coupon_rule;
-        var minNum = that.data.couponList[id].coupon_cou_money;
-        var total2 = parseFloat(that.data.total2);
-        var newTotal = 0;
-        if (total2 > minNum){
-
-          minNum = minNum;
-          newTotal = this.data.total2 - parseFloat(minNum);
-        } else{
-          minNum = total2 - 0.01;
-          newTotal = 0.01;
-        }        
-
-        var coupon_id = that.data.couponList[id].id;
-
-        prevPage.setData({
-          minNum: minNum,//优惠金额
-          couponName: couponName,
-          total2: newTotal,
-          coupon_id: coupon_id
-        });
-        wx.navigateBack({});
-      }else{
-        that.setData({
-          hiddenmodal: false,
-          modalCont: '不满足使用条件！'
-        })
-        setTimeout(function () {
-          that.setData({
-            hiddenmodal: true
-          })
-        }, 1500)
-        var newTotal = this.data.total2;
-        var couponName = '';
-        var minNum = 0;
-      }
-    }else{
-      console.log("dd")
-      that.setData({
-        hiddenmodal: false,
-        modalCont: '不满足使用条件！'
-      })
-      setTimeout(function () {
-        that.setData({
-          hiddenmodal: true
-        })
-      }, 1500)
-      var newTotal = this.data.total2 ;
-      var couponName = '';
-      var minNum = 0;
-    }
-    
-    
-  }
-
-})

pages/mineCoupon/coupon.json

@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "优惠劵"
-}

pages/mineCoupon/coupon.wxml

@@ -1,33 +0,0 @@
-<!--coupon.wxml   优惠劵  -->
-<view class="container">
-  <block wx:for="{{couponList}}" wx:key="index"  wx:for-index="i">
-    <!-- 每一个优惠劵 -->
-    <view class="coupon_wrap   {{item.coupon_state == 2 ? 'coupon_wrap_2' : ''}} ">
-      <view class="coupon_title_wrap">
-        <!-- 优惠金额 -->
-        <view class="coupon_title">¥{{item.coupon_cou_money}}</view>
-
-        <block wx:if="{{item.coupon_state == 0}}">
-          <view wx:if="{{usey}}"  bindtap="usrCoupon"  data-id="{{i}}"  class="use_state    use_state_0">使用</view>
-        </block>
-        <view  wx:elif="{{item.coupon_state == 1}}"  class="use_state  use_state_1">已使用</view>
-
-        <!-- 不可用 -->
-        
-
-        <!-- 已过期 -->
-        <view  wx:elif="{{item.coupon_state == 4}}"  class="use_state  use_state_2"><image src="/images/youhuijuan_guoqi.png"></image></view>
-      </view>
-      <!-- 分隔线 -->
-      <view class="coupon_line"><image src='/images/youhuijuan_line.png'></image></view>
-      <!-- 使用条件 -->
-      <view class="coupon_infor">
-        <view class="coupon_infor_left">{{item.coupon_start == null ? '' : item.coupon_start}}{{item.coupon_start == null ? '' : ' - '}}{{item.coupon_stop == null ? '' : item.coupon_stop}}</view>
-        <view class="coupon_rule">{{item.coupon_rule}}</view>
-      </view>
-    </view>
-  </block>
-</view>
-<view class="modal_wrap  {{hiddenmodal ? 'hidden' : ''}}">
-  <view class="modal  {{hiddenmodal ? 'hidden' : ''}}">{{modalCont}}</view>
-</view>

pages/mineCoupon/coupon.wxss

@@ -1,88 +0,0 @@
-/* coupon.wxss */
-.container{
-  text-align: center;
-  margin-top:45rpx;
-}
-.coupon_wrap{
-  display: block;
-  width: 610rpx;
-  padding: 0  40rpx;
-  margin:0 auto 20rpx;
-  background-color: #fff;
-}
-.coupon_title_wrap{
-  position: relative
-}
-.coupon_title{
-  text-align: left;
-  line-height: 110rpx;
-  color: #e60012;
-  font-size: 78rpx;
-  padding: 16rpx 0 0 0;
-}
-.use_state{
-  width: 116rpx;
-  height: 46rpx;
-  font-size: 24rpx;
-  line-height: 46rpx;
-  position: absolute;
-  top:50%;
-  right: 0;
-  margin-top:-15rpx;
-  /* border-radius: 6rpx; */
-}
-.use_state_0{
-  color: #e60012;
-  border: 1rpx solid #e60012;
-}
-.use_state_1{
-  color: #c8c8c8;
-  border: 1rpx solid #c8c8c8;
-}
-.coupon_line image{
-  width: 615rpx;
-  height: 30rpx;
-}
-.coupon_infor_left,.coupon_rule{
-  float: left;
-  font-size: 24rpx;
-  line-height: 44rpx;
-  color:#222;
-  padding:0 0 12rpx 0;
-}
-.coupon_rule{
-  float: right;
-}
-/*  已过期 */
-.coupon_wrap_2 view{
-  color:#c8c8c8;
-}
-.use_state_2{
-  width: 83rpx;
-  height: 83rpx;
-  right: 14rpx;
-  margin-top:-33rpx;
-}
-.use_state_2 image{
-  width: 100%;
-  height: 100%;
-}
-.modal_wrap{
-  position: fixed;
-  top:0;
-  left:0;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.modal{
-  font-size: 28rpx;
-  color:#fff;
-  padding:15rpx 20rpx;
-  background-color: rgba(0,0,0,0.6);
-}
-.hidden{
-   display: none; 
-}

style/font/demo.css

@@ -1,539 +0,0 @@
-/* Logo 字体 */
-@font-face {
-  font-family: "iconfont logo";
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
-}
-
-.logo {
-  font-family: "iconfont logo";
-  font-size: 160px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* tabs */
-.nav-tabs {
-  position: relative;
-}
-
-.nav-tabs .nav-more {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  height: 42px;
-  line-height: 42px;
-  color: #666;
-}
-
-#tabs {
-  border-bottom: 1px solid #eee;
-}
-
-#tabs li {
-  cursor: pointer;
-  width: 100px;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  font-size: 16px;
-  border-bottom: 2px solid transparent;
-  position: relative;
-  z-index: 1;
-  margin-bottom: -1px;
-  color: #666;
-}
-
-
-#tabs .active {
-  border-bottom-color: #f00;
-  color: #222;
-}
-
-.tab-container .content {
-  display: none;
-}
-
-/* 页面布局 */
-.main {
-  padding: 30px 100px;
-  width: 960px;
-  margin: 0 auto;
-}
-
-.main .logo {
-  color: #333;
-  text-align: left;
-  margin-bottom: 30px;
-  line-height: 1;
-  height: 110px;
-  margin-top: -50px;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.main .logo a {
-  font-size: 160px;
-  color: #333;
-}
-
-.helps {
-  margin-top: 40px;
-}
-
-.helps pre {
-  padding: 20px;
-  margin: 10px 0;
-  border: solid 1px #e7e1cd;
-  background-color: #fffdef;
-  overflow: auto;
-}
-
-.icon_lists {
-  width: 100% !important;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.icon_lists li {
-  width: 100px;
-  margin-bottom: 10px;
-  margin-right: 20px;
-  text-align: center;
-  list-style: none !important;
-  cursor: default;
-}
-
-.icon_lists li .code-name {
-  line-height: 1.2;
-}
-
-.icon_lists .icon {
-  display: block;
-  height: 100px;
-  line-height: 100px;
-  font-size: 42px;
-  margin: 10px auto;
-  color: #333;
-  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
-  -moz-transition: font-size 0.25s linear, width 0.25s linear;
-  transition: font-size 0.25s linear, width 0.25s linear;
-}
-
-.icon_lists .icon:hover {
-  font-size: 100px;
-}
-
-.icon_lists .svg-icon {
-  /* 通过设置 font-size 来改变图标大小 */
-  width: 1em;
-  /* 图标和文字相邻时，垂直对齐 */
-  vertical-align: -0.15em;
-  /* 通过设置 color 来改变 SVG 的颜色/fill */
-  fill: currentColor;
-  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
-      normalize.css 中也包含这行 */
-  overflow: hidden;
-}
-
-.icon_lists li .name,
-.icon_lists li .code-name {
-  color: #666;
-}
-
-/* markdown 样式 */
-.markdown {
-  color: #666;
-  font-size: 14px;
-  line-height: 1.8;
-}
-
-.highlight {
-  line-height: 1.5;
-}
-
-.markdown img {
-  vertical-align: middle;
-  max-width: 100%;
-}
-
-.markdown h1 {
-  color: #404040;
-  font-weight: 500;
-  line-height: 40px;
-  margin-bottom: 24px;
-}
-
-.markdown h2,
-.markdown h3,
-.markdown h4,
-.markdown h5,
-.markdown h6 {
-  color: #404040;
-  margin: 1.6em 0 0.6em 0;
-  font-weight: 500;
-  clear: both;
-}
-
-.markdown h1 {
-  font-size: 28px;
-}
-
-.markdown h2 {
-  font-size: 22px;
-}
-
-.markdown h3 {
-  font-size: 16px;
-}
-
-.markdown h4 {
-  font-size: 14px;
-}
-
-.markdown h5 {
-  font-size: 12px;
-}
-
-.markdown h6 {
-  font-size: 12px;
-}
-
-.markdown hr {
-  height: 1px;
-  border: 0;
-  background: #e9e9e9;
-  margin: 16px 0;
-  clear: both;
-}
-
-.markdown p {
-  margin: 1em 0;
-}
-
-.markdown>p,
-.markdown>blockquote,
-.markdown>.highlight,
-.markdown>ol,
-.markdown>ul {
-  width: 80%;
-}
-
-.markdown ul>li {
-  list-style: circle;
-}
-
-.markdown>ul li,
-.markdown blockquote ul>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown>ul li p,
-.markdown>ol li p {
-  margin: 0.6em 0;
-}
-
-.markdown ol>li {
-  list-style: decimal;
-}
-
-.markdown>ol li,
-.markdown blockquote ol>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown code {
-  margin: 0 3px;
-  padding: 0 5px;
-  background: #eee;
-  border-radius: 3px;
-}
-
-.markdown strong,
-.markdown b {
-  font-weight: 600;
-}
-
-.markdown>table {
-  border-collapse: collapse;
-  border-spacing: 0px;
-  empty-cells: show;
-  border: 1px solid #e9e9e9;
-  width: 95%;
-  margin-bottom: 24px;
-}
-
-.markdown>table th {
-  white-space: nowrap;
-  color: #333;
-  font-weight: 600;
-}
-
-.markdown>table th,
-.markdown>table td {
-  border: 1px solid #e9e9e9;
-  padding: 8px 16px;
-  text-align: left;
-}
-
-.markdown>table th {
-  background: #F7F7F7;
-}
-
-.markdown blockquote {
-  font-size: 90%;
-  color: #999;
-  border-left: 4px solid #e9e9e9;
-  padding-left: 0.8em;
-  margin: 1em 0;
-}
-
-.markdown blockquote p {
-  margin: 0;
-}
-
-.markdown .anchor {
-  opacity: 0;
-  transition: opacity 0.3s ease;
-  margin-left: 8px;
-}
-
-.markdown .waiting {
-  color: #ccc;
-}
-
-.markdown h1:hover .anchor,
-.markdown h2:hover .anchor,
-.markdown h3:hover .anchor,
-.markdown h4:hover .anchor,
-.markdown h5:hover .anchor,
-.markdown h6:hover .anchor {
-  opacity: 1;
-  display: inline-block;
-}
-
-.markdown>br,
-.markdown>p>br {
-  clear: both;
-}
-
-
-.hljs {
-  display: block;
-  background: white;
-  padding: 0.5em;
-  color: #333333;
-  overflow-x: auto;
-}
-
-.hljs-comment,
-.hljs-meta {
-  color: #969896;
-}
-
-.hljs-string,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-strong,
-.hljs-emphasis,
-.hljs-quote {
-  color: #df5000;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-type {
-  color: #a71d5d;
-}
-
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-attribute {
-  color: #0086b3;
-}
-
-.hljs-section,
-.hljs-name {
-  color: #63a35c;
-}
-
-.hljs-tag {
-  color: #333333;
-}
-
-.hljs-title,
-.hljs-attr,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
-  color: #795da3;
-}
-
-.hljs-addition {
-  color: #55a532;
-  background-color: #eaffea;
-}
-
-.hljs-deletion {
-  color: #bd2c00;
-  background-color: #ffecec;
-}
-
-.hljs-link {
-  text-decoration: underline;
-}
-
-/* 代码高亮 */
-/* PrismJS 1.15.0
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-@media print {
-
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: .5em 0;
-  overflow: auto;
-}
-
-:not(pre)>code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-
-/* Inline code */
-:not(pre)>code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
-  white-space: normal;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-
-.token.punctuation {
-  color: #999;
-}
-
-.namespace {
-  opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-
-.token.italic {
-  font-style: italic;
-}
-
-.token.entity {
-  cursor: help;
-}

style/font/demo_index.html

@@ -1,607 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8"/>
-  <title>IconFont Demo</title>
-  <link rel="shortcut icon" href="https://gtms04.alicdn.com/tps/i4/TB1_oz6GVXXXXaFXpXXJDFnIXXX-64-64.ico" type="image/x-icon"/>
-  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
-  <link rel="stylesheet" href="demo.css">
-  <link rel="stylesheet" href="iconfont.css">
-  <script src="iconfont.js"></script>
-  <!-- jQuery -->
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
-  <!-- 代码高亮 -->
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
-</head>
-<body>
-  <div class="main">
-    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">&#xe86b;</a></h1>
-    <div class="nav-tabs">
-      <ul id="tabs" class="dib-box">
-        <li class="dib active"><span>Unicode</span></li>
-        <li class="dib"><span>Font class</span></li>
-        <li class="dib"><span>Symbol</span></li>
-      </ul>
-      
-      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=1047507" target="_blank" class="nav-more">查看项目</a>
-      
-    </div>
-    <div class="tab-container">
-      <div class="content unicode" style="display: block;">
-          <ul class="icon_lists dib-box">
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe619;</span>
-                <div class="name">定制家居</div>
-                <div class="code-name">&amp;#xe619;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe600;</span>
-                <div class="name">待发货</div>
-                <div class="code-name">&amp;#xe600;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe613;</span>
-                <div class="name">关闭</div>
-                <div class="code-name">&amp;#xe613;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe6b0;</span>
-                <div class="name">编辑</div>
-                <div class="code-name">&amp;#xe6b0;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe629;</span>
-                <div class="name">首页</div>
-                <div class="code-name">&amp;#xe629;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe61b;</span>
-                <div class="name">消息</div>
-                <div class="code-name">&amp;#xe61b;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe622;</span>
-                <div class="name">待收货</div>
-                <div class="code-name">&amp;#xe622;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe636;</span>
-                <div class="name">购物车</div>
-                <div class="code-name">&amp;#xe636;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe610;</span>
-                <div class="name">待付款</div>
-                <div class="code-name">&amp;#xe610;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe688;</span>
-                <div class="name">VIP</div>
-                <div class="code-name">&amp;#xe688;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe651;</span>
-                <div class="name">搜索</div>
-                <div class="code-name">&amp;#xe651;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe61a;</span>
-                <div class="name">我的</div>
-                <div class="code-name">&amp;#xe61a;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe601;</span>
-                <div class="name">htb－Arrow right02</div>
-                <div class="code-name">&amp;#xe601;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe615;</span>
-                <div class="name">旋转</div>
-                <div class="code-name">&amp;#xe615;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe606;</span>
-                <div class="name">分享</div>
-                <div class="code-name">&amp;#xe606;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe602;</span>
-                <div class="name">购物车</div>
-                <div class="code-name">&amp;#xe602;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe640;</span>
-                <div class="name">删除</div>
-                <div class="code-name">&amp;#xe640;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe644;</span>
-                <div class="name">地址</div>
-                <div class="code-name">&amp;#xe644;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe743;</span>
-                <div class="name">fangda</div>
-                <div class="code-name">&amp;#xe743;</div>
-              </li>
-          
-          </ul>
-          <div class="article markdown">
-          <h2 id="unicode-">Unicode 引用</h2>
-          <hr>
-
-          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
-          <ul>
-            <li>兼容性最好，支持 IE6+，及所有现代浏览器。</li>
-            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
-            <li>但是因为是字体，所以不支持多色。只能使用平台里单色的图标，就算项目里有多色图标也会自动去色。</li>
-          </ul>
-          <blockquote>
-            <p>注意：新版 iconfont 支持多色图标，这些多色图标在 Unicode 模式下将不能使用，如果有需求建议使用symbol 的引用方式</p>
-          </blockquote>
-          <p>Unicode 使用步骤如下：</p>
-          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
-<pre><code class="language-css"
->@font-face {
-  font-family: 'iconfont';
-  src: url('iconfont.eot');
-  src: url('iconfont.eot?#iefix') format('embedded-opentype'),
-      url('iconfont.woff2') format('woff2'),
-      url('iconfont.woff') format('woff'),
-      url('iconfont.ttf') format('truetype'),
-      url('iconfont.svg#iconfont') format('svg');
-}
-</code></pre>
-          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
-<pre><code class="language-css"
->.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-</code></pre>
-          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
-<pre>
-<code class="language-html"
->&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
-</code></pre>
-          <blockquote>
-            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
-          </blockquote>
-          </div>
-      </div>
-      <div class="content font-class">
-        <ul class="icon_lists dib-box">
-          
-          <li class="dib">
-            <span class="icon iconfont icon-dingzhijiaju"></span>
-            <div class="name">
-              定制家居
-            </div>
-            <div class="code-name">.icon-dingzhijiaju
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-daifahuo1"></span>
-            <div class="name">
-              待发货
-            </div>
-            <div class="code-name">.icon-daifahuo1
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-guanbi1"></span>
-            <div class="name">
-              关闭
-            </div>
-            <div class="code-name">.icon-guanbi1
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-bianji"></span>
-            <div class="name">
-              编辑
-            </div>
-            <div class="code-name">.icon-bianji
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-shouye"></span>
-            <div class="name">
-              首页
-            </div>
-            <div class="code-name">.icon-shouye
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-xiaoxi"></span>
-            <div class="name">
-              消息
-            </div>
-            <div class="code-name">.icon-xiaoxi
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-daishouhuo"></span>
-            <div class="name">
-              待收货
-            </div>
-            <div class="code-name">.icon-daishouhuo
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-gouwuche"></span>
-            <div class="name">
-              购物车
-            </div>
-            <div class="code-name">.icon-gouwuche
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-icon-test"></span>
-            <div class="name">
-              待付款
-            </div>
-            <div class="code-name">.icon-icon-test
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-VIP"></span>
-            <div class="name">
-              VIP
-            </div>
-            <div class="code-name">.icon-VIP
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-sousuo"></span>
-            <div class="name">
-              搜索
-            </div>
-            <div class="code-name">.icon-sousuo
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-wode"></span>
-            <div class="name">
-              我的
-            </div>
-            <div class="code-name">.icon-wode
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-left"></span>
-            <div class="name">
-              htb－Arrow right02
-            </div>
-            <div class="code-name">.icon-left
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-xuanzhuan"></span>
-            <div class="name">
-              旋转
-            </div>
-            <div class="code-name">.icon-xuanzhuan
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-fenxiang"></span>
-            <div class="name">
-              分享
-            </div>
-            <div class="code-name">.icon-fenxiang
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-03-copy"></span>
-            <div class="name">
-              购物车
-            </div>
-            <div class="code-name">.icon-03-copy
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-tuanduicankaoxian-"></span>
-            <div class="name">
-              删除
-            </div>
-            <div class="code-name">.icon-tuanduicankaoxian-
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-dizhi"></span>
-            <div class="name">
-              地址
-            </div>
-            <div class="code-name">.icon-dizhi
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-fangda"></span>
-            <div class="name">
-              fangda
-            </div>
-            <div class="code-name">.icon-fangda
-            </div>
-          </li>
-          
-        </ul>
-        <div class="article markdown">
-        <h2 id="font-class-">font-class 引用</h2>
-        <hr>
-
-        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
-        <p>与 Unicode 使用方式相比，具有如下特点：</p>
-        <ul>
-          <li>兼容性良好，支持 IE8+，及所有现代浏览器。</li>
-          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
-          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
-          <li>不过因为本质上还是使用的字体，所以多色图标还是不支持的。</li>
-        </ul>
-        <p>使用步骤如下：</p>
-        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
-<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
-</code></pre>
-        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
-<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
-</code></pre>
-        <blockquote>
-          <p>"
-            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
-        </blockquote>
-      </div>
-      </div>
-      <div class="content symbol">
-          <ul class="icon_lists dib-box">
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-dingzhijiaju"></use>
-                </svg>
-                <div class="name">定制家居</div>
-                <div class="code-name">#icon-dingzhijiaju</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-daifahuo1"></use>
-                </svg>
-                <div class="name">待发货</div>
-                <div class="code-name">#icon-daifahuo1</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-guanbi1"></use>
-                </svg>
-                <div class="name">关闭</div>
-                <div class="code-name">#icon-guanbi1</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-bianji"></use>
-                </svg>
-                <div class="name">编辑</div>
-                <div class="code-name">#icon-bianji</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-shouye"></use>
-                </svg>
-                <div class="name">首页</div>
-                <div class="code-name">#icon-shouye</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-xiaoxi"></use>
-                </svg>
-                <div class="name">消息</div>
-                <div class="code-name">#icon-xiaoxi</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-daishouhuo"></use>
-                </svg>
-                <div class="name">待收货</div>
-                <div class="code-name">#icon-daishouhuo</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-gouwuche"></use>
-                </svg>
-                <div class="name">购物车</div>
-                <div class="code-name">#icon-gouwuche</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-icon-test"></use>
-                </svg>
-                <div class="name">待付款</div>
-                <div class="code-name">#icon-icon-test</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-VIP"></use>
-                </svg>
-                <div class="name">VIP</div>
-                <div class="code-name">#icon-VIP</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-sousuo"></use>
-                </svg>
-                <div class="name">搜索</div>
-                <div class="code-name">#icon-sousuo</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-wode"></use>
-                </svg>
-                <div class="name">我的</div>
-                <div class="code-name">#icon-wode</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-left"></use>
-                </svg>
-                <div class="name">htb－Arrow right02</div>
-                <div class="code-name">#icon-left</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-xuanzhuan"></use>
-                </svg>
-                <div class="name">旋转</div>
-                <div class="code-name">#icon-xuanzhuan</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-fenxiang"></use>
-                </svg>
-                <div class="name">分享</div>
-                <div class="code-name">#icon-fenxiang</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-03-copy"></use>
-                </svg>
-                <div class="name">购物车</div>
-                <div class="code-name">#icon-03-copy</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-tuanduicankaoxian-"></use>
-                </svg>
-                <div class="name">删除</div>
-                <div class="code-name">#icon-tuanduicankaoxian-</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-dizhi"></use>
-                </svg>
-                <div class="name">地址</div>
-                <div class="code-name">#icon-dizhi</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-fangda"></use>
-                </svg>
-                <div class="name">fangda</div>
-                <div class="code-name">#icon-fangda</div>
-            </li>
-          
-          </ul>
-          <div class="article markdown">
-          <h2 id="symbol-">Symbol 引用</h2>
-          <hr>
-
-          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
-            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
-          <ul>
-            <li>支持多色图标了，不再受单色限制。</li>
-            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
-            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
-            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
-          </ul>
-          <p>使用步骤如下：</p>
-          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
-<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
-</code></pre>
-          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
-<pre><code class="language-html">&lt;style&gt;
-.icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-&lt;/style&gt;
-</code></pre>
-          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
-<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
-  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
-&lt;/svg&gt;
-</code></pre>
-          </div>
-      </div>
-
-    </div>
-  </div>
-  <script>
-  $(document).ready(function () {
-      $('.tab-container .content:first').show()
-
-      $('#tabs li').click(function (e) {
-        var tabContent = $('.tab-container .content')
-        var index = $(this).index()
-
-        if ($(this).hasClass('active')) {
-          return
-        } else {
-          $('#tabs li').removeClass('active')
-          $(this).addClass('active')
-
-          tabContent.hide().eq(index).fadeIn()
-        }
-      })
-    })
-  </script>
-</body>
-</html>