Merge branch 'master' of https://github.com/irisnet/explorer into hot…

…fix/v0.11.2.0803
irisnet · Sep 14, 2020 · e923b42 · e923b42
2 parents 970d5d0 + b44a4e3
commit e923b42
Show file tree

Hide file tree

Showing 13 changed files with 181 additions and 81 deletions.
diff --git a/backend/orm/document/static_delegator.go b/backend/orm/document/static_delegator.go
@@ -131,7 +131,7 @@ func (d ExStaticDelegator) GetAddressByPeriod(lastcaculatetime, caculatetime tim
 	cond := bson.M{
 		ExStaticDelegatorDateTag: bson.M{
 			"$gte": lastcaculatetime,
-			"$lt":  caculatetime,
+			"$lte":  caculatetime,
 		},
 	}
 	filter := bson.M{

diff --git a/frontend/icon/iconfont.css b/frontend/icon/iconfont.css
diff --git a/frontend/icon/iconfont.eot b/frontend/icon/iconfont.eot
diff --git a/frontend/icon/iconfont.js b/frontend/icon/iconfont.js
diff --git a/frontend/icon/iconfont.json b/frontend/icon/iconfont.json
@@ -6,20 +6,69 @@
   "description": "",
   "glyphs": [
     {
-        "icon_id": "14183675",
-        "name": "GOZ",
-        "font_class": "GOZ",
-        "unicode": "e65b",
-        "unicode_decimal": 58971
-    },
-      {
-          "icon_id": "13982898",
-          "name": "缺省默认头像",
-          "font_class": "queshengmorentouxiang",
-          "unicode": "e659",
-          "unicode_decimal": 58969
-      },
-      {
+      "icon_id": "16967260",
+      "name": "BIFROST",
+      "font_class": "BI-01",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "14409079",
+      "name": "复位",
+      "font_class": "fuwei",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "10124727",
+      "name": "排序-下",
+      "font_class": "paixu-xia",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "10124732",
+      "name": "排序-上",
+      "font_class": "paixu-shang",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "14209633",
+      "name": "刷新",
+      "font_class": "shuaxin",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "14206834",
+      "name": "选中 全部",
+      "font_class": "xuanzhongquanbu",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "14206835",
+      "name": "未选中 全部",
+      "font_class": "weixuanzhongquanbu",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "14183675",
+      "name": "GOZ",
+      "font_class": "GOZ",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "13982898",
+      "name": "缺省默认头像",
+      "font_class": "queshengmorentouxiang",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
       "icon_id": "13851059",
       "name": "展开",
       "font_class": "zhankai",

diff --git a/frontend/icon/iconfont.svg b/frontend/icon/iconfont.svg
diff --git a/frontend/icon/iconfont.ttf b/frontend/icon/iconfont.ttf
diff --git a/frontend/icon/iconfont.woff b/frontend/icon/iconfont.woff
diff --git a/frontend/icon/iconfont.woff2 b/frontend/icon/iconfont.woff2
diff --git a/frontend/package.json b/frontend/package.json
@@ -15,7 +15,7 @@
     "echarts": "^4.1.0",
     "element-ui": "^2.13.0",
     "fs": "^0.0.1-security",
-    "irisnet-crypto": "git+https://github.com/irisnet/irisnet-crypto.git#v1.3.1",
+    "irisnet-crypto": "git+https://github.com/irisnet/irisnet-crypto.git#v1.3.6-rc0",
     "jquery": "^3.2.1",
     "js-yaml": "^3.13.1",
     "lodash.defaultsdeep": "^4.6.1",

diff --git a/frontend/src/components/header/AppHeader.vue b/frontend/src/components/header/AppHeader.vue
@@ -686,6 +686,8 @@
 						item.icon = 'iconfont iconcaihongmao'
                     }else if(item.network_name === constant.CHAINID.GOZTESTNET){
                         item.icon = 'iconfont iconGOZ'
+                    }else if(item.network_name === constant.CHAINID.BIFROST){
+                        item.icon = 'iconfont iconBI-01'
                     }
 					item.netWorkSelectOption = `${Tools.firstWordUpperCase(item.env)} ${item.chain_id.toLocaleUpperCase()}`;
 					return item

diff --git a/frontend/src/constant/Constant.js b/frontend/src/constant/Constant.js
@@ -74,6 +74,7 @@ CHAINID.NYANCAT = 'nyancat';
 CHAINID.QA = 'rainbow-qa';
 CHAINID.DEV = 'rainbow-dev';
 CHAINID.GOZTESTNET = 'goz-testnet';
+CHAINID.BIFROST = 'bifrost'
 
 
 

diff --git a/frontend/src/main.ts b/frontend/src/main.ts
@@ -42,10 +42,9 @@ Vue.component('swipe', Swipe);
 Vue.component('swipe-item', SwipeItem);
 
 import axios from "axios"
-const  codec  = require("irisnet-crypto/util/codec.js") ;
 const  crypto = require("irisnet-crypto");
 Vue.prototype.$Crypto = crypto;
-Vue.prototype.$Codec = codec;
+Vue.prototype.$Codec = crypto.Codec;
 Vue.prototype.$uMeng = Umeng;
 
 Vue.config.productionTip = false;