Merge remote-tracking branch 'upstream/master'

src/common/lang/en.js

@@ -641,7 +641,9 @@ Within their 50% share each consensus node will receive their share according to
   dapps: {
     dapps: 'DApps',
     sesameSeed: 'Sesameseed',
-    sesameseedDesc: 'Sesameseed voting management'
+    sesameseedDesc: 'Sesameseed voting management',
+    notification: 'Notification',
+    userPolicy: 'You will be redirected to the third party dApp. Use of the third party dApp will be subject to their User Agreement and Privacy Policy. You will be liable to the third party dApp only.'
   },
   sesameseed: {
     stakeAmountTip: 'Stake amount for Sesameseed is 1 unit equals 1 ONT',

src/common/lang/zh.js

@@ -636,7 +636,9 @@ export default {
   dapps: {
     dapps: 'DApps',
     sesameSeed: '芝麻籽',
-    sesameseedDesc: 'Sesameseed voting management'
+    sesameseedDesc: 'Sesameseed voting management',
+    notification: '注意',
+    userPolicy: '您将跳转至第三方dApp页面，在第三方dApp上的使用行为将适用该第三方dApp的《用户协议》和《隐私政策》，由该第三方dApp直接并单独向您承担责任'
   },
   sesameseed: {
     stakeAmountTip: 'Stake amount for Sesameseed is 1 unit equals 1 ONT',

src/renderer/components/Dapps.vue

@@ -107,14 +107,14 @@ export default {
         };
     },
     mounted: function() {
-        /* this.$store.dispatch("showLoadingModals");
-    setTimeout(() => {
-      this.$store.dispatch("hideLoadingModals");
-    }, 8000); */
-        let that = this;
-        setInterval(() => {
-            that.getImageData();
-        }, this.interval);
+        this.$confirm({
+            title: this.$t('dapps.notification'),
+            content: this.$t('dapps.userPolicy'),
+            onOk() {},
+            onCancel: () => {
+                this.$router.back();
+            }
+        })
     },
     computed: {},
     beforeDestroy() {