From c67b0d48ec0a674fde227e5e5140e1d416239157 Mon Sep 17 00:00:00 2001
From: nineven <nineven@qq.com>
Date: Fri, 9 Apr 2021 21:59:41 +0800
Subject: [PATCH] format code

---
 .../{FirAppBase.vue => FirBase.vue}           |  4 +-
 .../components/{ => apps}/FirAppInfosBase.vue |  2 +-
 .../{ => apps}/FirAppInfosbaseinfo.vue        |  4 +-
 .../{ => apps}/FirAppInfoscombo.vue           |  2 +-
 .../{ => apps}/FirAppInfosdevices.vue         |  0
 .../{ => apps}/FirAppInfossecurity.vue        |  4 +-
 .../{ => apps}/FirAppInfossupersign.vue       |  4 +-
 .../{ => apps}/FirAppInfostimeline.vue        |  2 +-
 .../src/components/{ => apps}/FirApps.vue     | 30 ++++++++------
 .../{ => user}/FirSuperSignBase.vue           |  4 +-
 .../components/{ => user}/FirUserOrders.vue   |  4 +-
 .../{ => user}/FirUserProfileBase.vue         |  4 +-
 .../FirUserProfileCertification.vue           |  4 +-
 .../{ => user}/FirUserProfileChangePwd.vue    |  2 +-
 .../{ => user}/FirUserProfileInfo.vue         |  4 +-
 .../components/{ => user}/FirUserStorage.vue  |  4 +-
 fir_client/src/router/index.js                | 40 +++++++++----------
 fir_client/src/utils/index.js                 |  8 ++--
 18 files changed, 65 insertions(+), 61 deletions(-)
 rename fir_client/src/components/{FirAppBase.vue => FirBase.vue} (95%)
 rename fir_client/src/components/{ => apps}/FirAppInfosBase.vue (99%)
 rename fir_client/src/components/{ => apps}/FirAppInfosbaseinfo.vue (98%)
 rename fir_client/src/components/{ => apps}/FirAppInfoscombo.vue (99%)
 rename fir_client/src/components/{ => apps}/FirAppInfosdevices.vue (100%)
 rename fir_client/src/components/{ => apps}/FirAppInfossecurity.vue (99%)
 rename fir_client/src/components/{ => apps}/FirAppInfossupersign.vue (99%)
 rename fir_client/src/components/{ => apps}/FirAppInfostimeline.vue (99%)
 rename fir_client/src/components/{ => apps}/FirApps.vue (98%)
 rename fir_client/src/components/{ => user}/FirSuperSignBase.vue (99%)
 rename fir_client/src/components/{ => user}/FirUserOrders.vue (98%)
 rename fir_client/src/components/{ => user}/FirUserProfileBase.vue (98%)
 rename fir_client/src/components/{ => user}/FirUserProfileCertification.vue (99%)
 rename fir_client/src/components/{ => user}/FirUserProfileChangePwd.vue (98%)
 rename fir_client/src/components/{ => user}/FirUserProfileInfo.vue (99%)
 rename fir_client/src/components/{ => user}/FirUserStorage.vue (99%)

diff --git a/fir_client/src/components/FirAppBase.vue b/fir_client/src/components/FirBase.vue
similarity index 95%
rename from fir_client/src/components/FirAppBase.vue
rename to fir_client/src/components/FirBase.vue
index fcde1c6..84e3f3f 100644
--- a/fir_client/src/components/FirAppBase.vue
+++ b/fir_client/src/components/FirBase.vue
@@ -24,7 +24,7 @@
     import {show_beautpic,} from "../utils";
 
     export default {
-        name: "FirAppBase",
+        name: "FirBase",
         components: {FirFooter, FirHeader},
         data() {
             return {
@@ -33,7 +33,7 @@
         },
         mounted() {
             let canvas = this.$refs.canvas;
-            show_beautpic(this, canvas);
+            show_beautpic(this, canvas, 200);
         }, watch: {}
         , methods: {
             canvas_move(e) {
diff --git a/fir_client/src/components/FirAppInfosBase.vue b/fir_client/src/components/apps/FirAppInfosBase.vue
similarity index 99%
rename from fir_client/src/components/FirAppInfosBase.vue
rename to fir_client/src/components/apps/FirAppInfosBase.vue
index e58d5c4..18f3a22 100644
--- a/fir_client/src/components/FirAppInfosBase.vue
+++ b/fir_client/src/components/apps/FirAppInfosBase.vue
@@ -98,7 +98,7 @@
 </template>
 
 <script>
-    import {apputils} from "../restful";
+    import {apputils} from "../../restful";
     import VueQr from 'vue-qr';
 
     export default {
diff --git a/fir_client/src/components/FirAppInfosbaseinfo.vue b/fir_client/src/components/apps/FirAppInfosbaseinfo.vue
similarity index 98%
rename from fir_client/src/components/FirAppInfosbaseinfo.vue
rename to fir_client/src/components/apps/FirAppInfosbaseinfo.vue
index 59c30df..4414a63 100644
--- a/fir_client/src/components/FirAppInfosbaseinfo.vue
+++ b/fir_client/src/components/apps/FirAppInfosbaseinfo.vue
@@ -89,8 +89,8 @@
 </template>
 
 <script>
-    import {apputils, getapppicurl, releaseapputils} from "../restful"
-    import {AvatarUploadUtils} from "../utils";
+    import {apputils, getapppicurl, releaseapputils} from "../../restful"
+    import {AvatarUploadUtils} from "../../utils";
 
     export default {
         name: "FirAppInfosbaseinfo",
diff --git a/fir_client/src/components/FirAppInfoscombo.vue b/fir_client/src/components/apps/FirAppInfoscombo.vue
similarity index 99%
rename from fir_client/src/components/FirAppInfoscombo.vue
rename to fir_client/src/components/apps/FirAppInfoscombo.vue
index 37f42d3..6664434 100644
--- a/fir_client/src/components/FirAppInfoscombo.vue
+++ b/fir_client/src/components/apps/FirAppInfoscombo.vue
@@ -80,7 +80,7 @@
 </template>
 
 <script>
-    import {getapps, apputils} from "../restful";
+    import {getapps, apputils} from "../../restful";
 
     export default {
         name: "FirAppInfoscombo"
diff --git a/fir_client/src/components/FirAppInfosdevices.vue b/fir_client/src/components/apps/FirAppInfosdevices.vue
similarity index 100%
rename from fir_client/src/components/FirAppInfosdevices.vue
rename to fir_client/src/components/apps/FirAppInfosdevices.vue
diff --git a/fir_client/src/components/FirAppInfossecurity.vue b/fir_client/src/components/apps/FirAppInfossecurity.vue
similarity index 99%
rename from fir_client/src/components/FirAppInfossecurity.vue
rename to fir_client/src/components/apps/FirAppInfossecurity.vue
index 438c250..c2ecd5a 100644
--- a/fir_client/src/components/FirAppInfossecurity.vue
+++ b/fir_client/src/components/apps/FirAppInfossecurity.vue
@@ -89,8 +89,8 @@
 </template>
 
 <script>
-    import {apputils,} from "../restful"
-    import {deepCopy} from "../utils";
+    import {apputils,} from "../../restful"
+    import {deepCopy} from "../../utils";
 
     export default {
         name: "FirAppInfossecurity",
diff --git a/fir_client/src/components/FirAppInfossupersign.vue b/fir_client/src/components/apps/FirAppInfossupersign.vue
similarity index 99%
rename from fir_client/src/components/FirAppInfossupersign.vue
rename to fir_client/src/components/apps/FirAppInfossupersign.vue
index ffabf1f..7fad71c 100644
--- a/fir_client/src/components/FirAppInfossupersign.vue
+++ b/fir_client/src/components/apps/FirAppInfossupersign.vue
@@ -83,8 +83,8 @@
 </template>
 
 <script>
-    import {apputils,} from "../restful"
-    import {deepCopy} from "../utils";
+    import {apputils,} from "../../restful"
+    import {deepCopy} from "../../utils";
 
     export default {
         name: "FirAppInfossupersign",
diff --git a/fir_client/src/components/FirAppInfostimeline.vue b/fir_client/src/components/apps/FirAppInfostimeline.vue
similarity index 99%
rename from fir_client/src/components/FirAppInfostimeline.vue
rename to fir_client/src/components/apps/FirAppInfostimeline.vue
index a7b03ff..0a6fbb6 100644
--- a/fir_client/src/components/FirAppInfostimeline.vue
+++ b/fir_client/src/components/apps/FirAppInfostimeline.vue
@@ -116,7 +116,7 @@
 </template>
 
 <script>
-    import {releaseapputils, getdownloadurl} from "../restful"
+    import {releaseapputils, getdownloadurl} from "../../restful"
 
     export default {
         name: "FirAppInfostimeline",
diff --git a/fir_client/src/components/FirApps.vue b/fir_client/src/components/apps/FirApps.vue
similarity index 98%
rename from fir_client/src/components/FirApps.vue
rename to fir_client/src/components/apps/FirApps.vue
index bf1479a..bf99412 100644
--- a/fir_client/src/components/FirApps.vue
+++ b/fir_client/src/components/apps/FirApps.vue
@@ -153,27 +153,27 @@
                             <div class="cube">
                                 <!--前面图片 -->
                                 <div class="out_front">
-                                    <img src="../assets/imgs/1.png" class="pic">
+                                    <img src="../../assets/imgs/1.png" class="pic">
                                 </div>
                                 <!--后面图片 -->
                                 <div class="out_back">
-                                    <img src="../assets/imgs/5.png" class="pic">
+                                    <img src="../../assets/imgs/5.png" class="pic">
                                 </div>
                                 <!--左面图片 -->
                                 <div class="out_left">
-                                    <img src="../assets/imgs/6.png" class="pic">
+                                    <img src="../../assets/imgs/6.png" class="pic">
                                 </div>
                                 <!--右面图片 -->
                                 <div class="out_right">
-                                    <img src="../assets/imgs/7.png" class="pic">
+                                    <img src="../../assets/imgs/7.png" class="pic">
                                 </div>
                                 <!--上面图片 -->
                                 <div class="out_top">
-                                    <img src="../assets/imgs/8.png" class="pic">
+                                    <img src="../../assets/imgs/8.png" class="pic">
                                 </div>
                                 <!--下面图片 -->
                                 <div class="out_bottom">
-                                    <img src="../assets/imgs/9.png" class="pic">
+                                    <img src="../../assets/imgs/9.png" class="pic">
                                 </div>
 
                                 <!--小正方体 -->
@@ -473,7 +473,7 @@
 </template>
 
 <script>
-    import {getapps, apputils, analyseApps, getuploadurl, get_package_prices, my_order} from "../restful";
+    import {getapps, apputils, analyseApps, getuploadurl, get_package_prices, my_order} from "../../restful";
     import {
         getScrollHeight,
         getScrollTop,
@@ -484,7 +484,7 @@
         uploadaliyunoss,
         uploadlocalstorage,
         format_money, show_beautpic
-    } from "../utils";
+    } from "../../utils";
 
     export default {
         name: "FirApps",
@@ -629,6 +629,13 @@
                         this.analyseappinfo.is_new = data.data.is_new;
                         this.analyseappinfo.binary_url = data.data.binary_url;
                         this.willuploadApp = true;
+
+                        // eslint-disable-next-line no-unused-vars
+                        this.timmer = setTimeout(data => {
+                            let canvas = this.$refs.canvas;
+                            show_beautpic(this, canvas, 666, 0.8);
+                        }, 100);
+
                     } else {
                         this.$message.error("上传token获取失败，请刷新重试")
                     }
@@ -669,7 +676,7 @@
                 // eslint-disable-next-line no-unused-vars
                 this.timmer = setTimeout(data => {
                     let canvas = this.$refs.canvas;
-                    show_beautpic(this, canvas, 999);
+                    show_beautpic(this, canvas, 888, 0.8);
                 }, 100);
 
                 let file = dataURLtoFile(this.analyseappinfo.icon, this.analyseappinfo.png_key);
@@ -1470,10 +1477,7 @@
 
     .canvas {
         position: absolute;
-        left: -0px;
-        margin-top: -60px;
-        height: 100%;
+        margin-top: -58px;
         z-index: 999;
-        width: 100%;
     }
 </style>
diff --git a/fir_client/src/components/FirSuperSignBase.vue b/fir_client/src/components/user/FirSuperSignBase.vue
similarity index 99%
rename from fir_client/src/components/FirSuperSignBase.vue
rename to fir_client/src/components/user/FirSuperSignBase.vue
index 6363699..89bea67 100644
--- a/fir_client/src/components/FirSuperSignBase.vue
+++ b/fir_client/src/components/user/FirSuperSignBase.vue
@@ -437,8 +437,8 @@
 
 <script>
 
-    import {iosdeveloper, iosdevices, iosdevicesudid, userinfos} from "../restful";
-    import {removeAaary, IsNum} from "../utils";
+    import {iosdeveloper, iosdevices, iosdevicesudid, userinfos} from "../../restful";
+    import {removeAaary, IsNum} from "../../utils";
 
     export default {
         name: "FirSuperSignBase",
diff --git a/fir_client/src/components/FirUserOrders.vue b/fir_client/src/components/user/FirUserOrders.vue
similarity index 98%
rename from fir_client/src/components/FirUserOrders.vue
rename to fir_client/src/components/user/FirUserOrders.vue
index c050969..af0e54d 100644
--- a/fir_client/src/components/FirUserOrders.vue
+++ b/fir_client/src/components/user/FirUserOrders.vue
@@ -11,7 +11,7 @@
         >
             <el-row :gutter="8">
                 <el-col :span="12" style="text-align: center">
-                    <el-image :src="require('../assets/wx_pay.jpg')" style="width: 320px;height: 320px"
+                    <el-image :src="require('../../assets/wx_pay.jpg')" style="width: 320px;height: 320px"
                               fit="fit"></el-image>
                     <el-link>用微信扫描二维码</el-link>
                 </el-col>
@@ -223,7 +223,7 @@
 
 <script>
 
-    import {my_order, userinfos} from "../restful";
+    import {my_order, userinfos} from "../../restful";
 
     export default {
         name: "FirUserOrders",
diff --git a/fir_client/src/components/FirUserProfileBase.vue b/fir_client/src/components/user/FirUserProfileBase.vue
similarity index 98%
rename from fir_client/src/components/FirUserProfileBase.vue
rename to fir_client/src/components/user/FirUserProfileBase.vue
index fe77aa8..bc84932 100644
--- a/fir_client/src/components/FirUserProfileBase.vue
+++ b/fir_client/src/components/user/FirUserProfileBase.vue
@@ -62,8 +62,8 @@
 </template>
 
 <script>
-    import {userinfos, getuserpicurl} from '../restful';
-    import {AvatarUploadUtils} from "../utils";
+    import {userinfos, getuserpicurl} from '../../restful';
+    import {AvatarUploadUtils} from "../../utils";
 
     export default {
         name: "FirUserProfileBase",
diff --git a/fir_client/src/components/FirUserProfileCertification.vue b/fir_client/src/components/user/FirUserProfileCertification.vue
similarity index 99%
rename from fir_client/src/components/FirUserProfileCertification.vue
rename to fir_client/src/components/user/FirUserProfileCertification.vue
index 6a10a8a..67fa9a4 100644
--- a/fir_client/src/components/FirUserProfileCertification.vue
+++ b/fir_client/src/components/user/FirUserProfileCertification.vue
@@ -216,8 +216,8 @@
 </template>
 
 <script>
-    import {getAuthcTokenFun, registerFun, user_certification} from "../restful";
-    import {AvatarUploadUtils, checkphone, geetest} from "../utils";
+    import {getAuthcTokenFun, registerFun, user_certification} from "../../restful";
+    import {AvatarUploadUtils, checkphone, geetest} from "../../utils";
 
     export default {
         name: "FirUserProfileCertification",
diff --git a/fir_client/src/components/FirUserProfileChangePwd.vue b/fir_client/src/components/user/FirUserProfileChangePwd.vue
similarity index 98%
rename from fir_client/src/components/FirUserProfileChangePwd.vue
rename to fir_client/src/components/user/FirUserProfileChangePwd.vue
index 43e1044..73e30e7 100644
--- a/fir_client/src/components/FirUserProfileChangePwd.vue
+++ b/fir_client/src/components/user/FirUserProfileChangePwd.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-    import {userinfos} from "../restful";
+    import {userinfos} from "../../restful";
 
     export default {
         name: "FirUserProfileChangePwd",
diff --git a/fir_client/src/components/FirUserProfileInfo.vue b/fir_client/src/components/user/FirUserProfileInfo.vue
similarity index 99%
rename from fir_client/src/components/FirUserProfileInfo.vue
rename to fir_client/src/components/user/FirUserProfileInfo.vue
index c4d522e..01d810c 100644
--- a/fir_client/src/components/FirUserProfileInfo.vue
+++ b/fir_client/src/components/user/FirUserProfileInfo.vue
@@ -176,8 +176,8 @@
 </template>
 
 <script>
-    import {userinfos, getAuthcTokenFun, registerFun} from '../restful'
-    import {deepCopy} from "../utils";
+    import {userinfos, getAuthcTokenFun, registerFun} from '../../restful'
+    import {deepCopy} from "../../utils";
 
     export default {
         name: "FirUserProfileInfo",
diff --git a/fir_client/src/components/FirUserStorage.vue b/fir_client/src/components/user/FirUserStorage.vue
similarity index 99%
rename from fir_client/src/components/FirUserStorage.vue
rename to fir_client/src/components/user/FirUserStorage.vue
index 49d6008..e73ad03 100644
--- a/fir_client/src/components/FirUserStorage.vue
+++ b/fir_client/src/components/user/FirUserStorage.vue
@@ -305,8 +305,8 @@
 </template>
 
 <script>
-    import {getStorageinfo, userinfos} from "../restful";
-    import {deepCopy} from "../utils";
+    import {getStorageinfo, userinfos} from "../../restful";
+    import {deepCopy} from "../../utils";
 
     export default {
         name: "FirUserStorage",
diff --git a/fir_client/src/router/index.js b/fir_client/src/router/index.js
index 5a1f5c6..a469602 100644
--- a/fir_client/src/router/index.js
+++ b/fir_client/src/router/index.js
@@ -27,26 +27,26 @@ const router = new VueRouter({
         {
             path: '/apps',
             // component: FirAppBase,
-            component: () => import("@/components/FirAppBase"),
+            component: () => import("@/components/FirBase"),
 
             children: [
                 {
                     path: '',
                     name: 'FirApps',
-                    component: () => import("@/components/FirApps"),
+                    component: () => import("@/components/apps/FirApps"),
                 }
                 ,
                 {
                     path: ':id',
                     // component: FirAppInfosBase,
-                    component: () => import("@/components/FirAppInfosBase"),
+                    component: () => import("@/components/apps/FirAppInfosBase"),
 
                     children: [
                         {
                             path: '',
                             name: 'FirAppInfostimeline',
                             // component: FirAppInfostimeline,
-                            component: () => import("@/components/FirAppInfostimeline"),
+                            component: () => import("@/components/apps/FirAppInfostimeline"),
 
                         }
                         ,
@@ -54,35 +54,35 @@ const router = new VueRouter({
                             path: 'info',
                             name: 'FirAppInfosbaseinfo',
                             // component: FirAppInfosbaseinfo,
-                            component: () => import("@/components/FirAppInfosbaseinfo"),
+                            component: () => import("@/components/apps/FirAppInfosbaseinfo"),
 
                         },
                         {
                             path: 'security',
                             name: 'FirAppInfossecurity',
                             // component: FirAppInfossecurity
-                            component: () => import("@/components/FirAppInfossecurity"),
+                            component: () => import("@/components/apps/FirAppInfossecurity"),
 
                         },
                         {
                             path: 'devices',
                             name: 'FirAppInfosdevices',
                             // component: FirAppInfosdevices
-                            component: () => import("@/components/FirAppInfosdevices"),
+                            component: () => import("@/components/apps/FirAppInfosdevices"),
 
                         },
                         {
                             path: 'combo',
                             name: 'FirAppInfoscombo',
                             // component: FirAppInfoscombo,
-                            component: () => import("@/components/FirAppInfoscombo"),
+                            component: () => import("@/components/apps/FirAppInfoscombo"),
 
                         },
                         {
                             path: 'supersign',
                             name: 'FirAppInfossupersign',
                             // component: FirAppInfossupersign,
-                            component: () => import("@/components/FirAppInfossupersign"),
+                            component: () => import("@/components/apps/FirAppInfossupersign"),
 
                         }
                     ]
@@ -92,33 +92,33 @@ const router = new VueRouter({
         {
             path: '/user',
             // component: FirAppBase,
-            component: () => import("@/components/FirAppBase"),
+            component: () => import("@/components/FirBase"),
 
             children: [
                 {
                     path: '',
                     // component: FirUserProfileBase,
-                    component: () => import("@/components/FirUserProfileBase"),
+                    component: () => import("@/components/user/FirUserProfileBase"),
 
                     children: [
                         {
                             path: 'info',
                             name: 'FirUserProfileInfo',
                             meta: {label: '个人资料'},
-                            component: () => import("@/components/FirUserProfileInfo"),
+                            component: () => import("@/components/user/FirUserProfileInfo"),
 
                         }, {
                             path: 'setpasswd',
                             name: 'FirUserProfileChangePwd',
                             meta: {label: '修改密码'},
                             // component: FirUserProfileChangePwd
-                            component: () => import("@/components/FirUserProfileChangePwd"),
+                            component: () => import("@/components/user/FirUserProfileChangePwd"),
 
                         }, {
                             path: 'certification',
                             name: 'FirUserProfileCertification',
                             meta: {label: '实名认证'},
-                            component: () => import("@/components/FirUserProfileCertification"),
+                            component: () => import("@/components/user/FirUserProfileCertification"),
 
                         },
                     ]
@@ -136,14 +136,14 @@ const router = new VueRouter({
         {
             path: '/supersign',
             // component: FirAppBase,
-            component: () => import("@/components/FirAppBase"),
+            component: () => import("@/components/FirBase"),
 
             children: [
                 {
                     path: ':act',
                     name: 'FirSuperSignBase',
                     meta: {label: '超级签名'},
-                    component: () => import("@/components/FirSuperSignBase"),
+                    component: () => import("@/components/user/FirSuperSignBase"),
 
                 }
             ]
@@ -151,26 +151,26 @@ const router = new VueRouter({
         {
             path: '/storage',
             // component: FirAppBase,
-            component: () => import("@/components/FirAppBase"),
+            component: () => import("@/components/FirBase"),
             children: [
                 {
                     path: ':act',
                     name: 'FirUserStorage',
                     meta: {label: '存储管理'},
-                    component: () => import("@/components/FirUserStorage"),
+                    component: () => import("@/components/user/FirUserStorage"),
 
                 }
             ]
         },
         {
             path: '/orders',
-            component: () => import("@/components/FirAppBase"),
+            component: () => import("@/components/FirBase"),
             children: [
                 {
                     path: '',
                     name: 'FirUserOrders',
                     meta: {label: '订单详情'},
-                    component: () => import("@/components/FirUserOrders"),
+                    component: () => import("@/components/user/FirUserOrders"),
 
                 }
             ]
diff --git a/fir_client/src/utils/index.js b/fir_client/src/utils/index.js
index 257d564..aa4bc9e 100644
--- a/fir_client/src/utils/index.js
+++ b/fir_client/src/utils/index.js
@@ -344,7 +344,7 @@ export function format_money(s, n = 2) {
     return new_format_money
 }
 
-export function show_beautpic(father, canvas, nb = 666) {
+export function show_beautpic(father, canvas, nb = 666, sp = 0.3) {
     let ctx = canvas.getContext('2d');
     canvas.width = window.innerWidth;
     canvas.height = window.innerHeight;
@@ -359,7 +359,7 @@ export function show_beautpic(father, canvas, nb = 666) {
     let dots = {
         nb: nb,
         distance: 100,
-        d_radius: 150,
+        d_radius: 180,
         array: []
     };
 
@@ -438,8 +438,8 @@ export function show_beautpic(father, canvas, nb = 666) {
     }
 
     function connectDots() {
-        for (let i = 0; i < dots.nb * 0.3; i++) {
-            for (let j = 0; j < dots.nb * 0.3; j++) {
+        for (let i = 0; i < dots.nb * sp; i++) {
+            for (let j = 0; j < dots.nb * sp; j++) {
                 let i_dot = dots.array[i];
                 let j_dot = dots.array[j];