diff --git a/fir_client/package.json b/fir_client/package.json index fbd1ae3..6d08dc9 100644 --- a/fir_client/package.json +++ b/fir_client/package.json @@ -18,6 +18,7 @@ "qrcodejs2": "^0.0.2", "vue": "^2.6.10", "vue-cookies": "^1.7.0", + "vue-lazyload": "^1.3.3", "vue-qr": "^2.3.0", "vue-router": "^3.1.3", "vuex": "^3.1.2" diff --git a/fir_client/src/assets/loading.gif b/fir_client/src/assets/loading.gif new file mode 100644 index 0000000..1e2ab09 Binary files /dev/null and b/fir_client/src/assets/loading.gif differ diff --git a/fir_client/src/components/FirAppInfosBase.vue b/fir_client/src/components/FirAppInfosBase.vue index 8ef5d0c..1148ada 100644 --- a/fir_client/src/components/FirAppInfosBase.vue +++ b/fir_client/src/components/FirAppInfosBase.vue @@ -153,7 +153,7 @@ if (this.appinfos.preview_url && this.appinfos.preview_url.length > 6) { p_url = this.appinfos.preview_url + p_url } - window.open(p_url, 'target', ''); + window.open(p_url, '_blank', ''); }, defaulttimeline() { this.setfunactive('timeline', 5); diff --git a/fir_client/src/components/FirApps.vue b/fir_client/src/components/FirApps.vue index 27148e8..00dc024 100644 --- a/fir_client/src/components/FirApps.vue +++ b/fir_client/src/components/FirApps.vue @@ -757,7 +757,7 @@ if (app.preview_url && app.preview_url.length > 6) { p_url = app.preview_url + p_url } - window.open(p_url, 'target', ''); + window.open(p_url, '_blank', ''); } }, computed: { getDelappTitle() { diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue index 7a3159e..d5615bf 100644 --- a/fir_client/src/components/FirDownload.vue +++ b/fir_client/src/components/FirDownload.vue @@ -107,7 +107,8 @@ 下载安装 - ? @@ -197,7 +198,7 @@
@@ -220,7 +221,7 @@ -
+
超级签安装教程 关闭 @@ -228,33 +229,18 @@
    -
  • +
  • +

    - 安装引导
    第一步 允许打开配置描述文件 + 安装引导
    {{ sign.msg}}

    • -
  • -

    - 安装引导
    第二步 点击右上角安装按钮 -

    -
    • -
  • -

    - 安装引导
    第三步 输入开机解锁密码 -

    -
    • -
  • -

    - 安装引导
    第四步 点击下方安装按钮 -

    -
    • -
-
+
@@ -270,6 +256,12 @@ name: "FirDownload", data() { return { + signhelplist: [ + {msg: '第一步 允许打开配置描述文件', url: require('../assets/sign/step1.jpg')}, + {msg: '第二步 点击右上角安装按钮', url: require('../assets/sign/step2.jpg')}, + {msg: '第三步 输入开机解锁密码', url: require('../assets/sign/step3.jpg')}, + {msg: '第四步 点击下方安装按钮', url: require('../assets/sign/step4.jpg')}, + ], imagelist: [], currentappinfo: {}, iscomboappinfo: {}, @@ -296,11 +288,12 @@ }, methods: { jiaocheng(act) { - let signhelp = document.getElementById('signhelp'); - let bg = document.getElementById('bg'); + let signhelp = this.$refs.signhelp; + let bg = this.$refs.signhelp; if (act === 'open') { signhelp.style.display = "block"; bg.style.display = "block"; + window.scroll(0, 1) } else { signhelp.style.display = "none"; bg.style.display = "none"; diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue index 2e85733..34d88d5 100644 --- a/fir_client/src/components/ShortDownload.vue +++ b/fir_client/src/components/ShortDownload.vue @@ -2,7 +2,7 @@
-
+
超级签安装教程 关闭 @@ -10,33 +10,18 @@
    -
  • +
  • +

    - 安装引导
    第一步 允许打开配置描述文件 + 安装引导
    {{ sign.msg}}

    • -
  • -

    - 安装引导
    第二步 点击右上角安装按钮 -

    -
    • -
  • -

    - 安装引导
    第三步 输入开机解锁密码 -

    -
    • -
  • -

    - 安装引导
    第四步 点击下方安装按钮 -

    -
    • -
-
+
@@ -137,7 +122,8 @@ - ?
@@ -224,7 +210,7 @@
  • - +
@@ -266,6 +252,12 @@ name: "ShortDownload", data() { return { + signhelplist: [ + {msg: '第一步 允许打开配置描述文件', url: require('../assets/sign/step1.jpg')}, + {msg: '第二步 点击右上角安装按钮', url: require('../assets/sign/step2.jpg')}, + {msg: '第三步 输入开机解锁密码', url: require('../assets/sign/step3.jpg')}, + {msg: '第四步 点击下方安装按钮', url: require('../assets/sign/step4.jpg')}, + ], imagelist: [], currentappinfo: {}, iscomboappinfo: {}, @@ -293,11 +285,12 @@ }, methods: { jiaocheng(act) { - let signhelp = document.getElementById('signhelp'); - let bg = document.getElementById('bg'); + let signhelp = this.$refs.signhelp; + let bg = this.$refs.signhelp; if (act === 'open') { signhelp.style.display = "block"; bg.style.display = "block"; + window.scroll(0, 1) } else { signhelp.style.display = "none"; bg.style.display = "none"; diff --git a/fir_client/src/main.js b/fir_client/src/main.js index eb8e8f8..c3872b6 100644 --- a/fir_client/src/main.js +++ b/fir_client/src/main.js @@ -154,7 +154,12 @@ Vue.prototype.$alert = MessageBox.alert; // Vue.use(ElementUI); Vue.use(Vuex); +import VueLazyload from 'vue-lazyload' +Vue.use(VueLazyload, { + loading: require('./assets/loading.gif'), + preLoad: 1 +}); new Vue({ render: h => h(App), diff --git a/fir_client/src/main.short.js b/fir_client/src/main.short.js index 6bb7ad4..8762e5b 100644 --- a/fir_client/src/main.short.js +++ b/fir_client/src/main.short.js @@ -24,6 +24,12 @@ Vue.prototype.$message = Message; Vue.config.productionTip = false; +import VueLazyload from 'vue-lazyload' + +Vue.use(VueLazyload, { + loading: require('./assets/loading.gif'), + preLoad: 1 +}); new Vue({ render: h => h(Download), diff --git a/fir_client/src/short.js b/fir_client/src/short.js index d394dc2..1f17532 100644 --- a/fir_client/src/short.js +++ b/fir_client/src/short.js @@ -2,7 +2,12 @@ import Vue from 'vue' import Download from "@/Download"; import router from "@/router/short"; +import VueLazyload from 'vue-lazyload' +Vue.use(VueLazyload, { + loading: require('./assets/loading.gif'), + preLoad: 1 +}); Vue.config.productionTip = false; new Vue({