From c5942681a90f17678bbb117839d6c10171c32fa6 Mon Sep 17 00:00:00 2001
From: leiqingsong <1762842758@qq.com>
Date: Wed, 24 Mar 2021 13:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4=E9=BB=98=E8=AE=A4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                     | 24 ------------------------
 .vscode/settings.json          |  4 ++++
 H5/.gitignore                  |  2 +-
 H5/src/main.js                 |  4 ++--
 H5/src/utils/bridgeToAppFun.js |  2 +-
 H5/src/views/grade.vue         | 14 +++++++-------
 H5/src/views/leagueNums.vue    | 16 ++++++++--------
 H5/vue.config.js               |  3 +++
 8 files changed, 26 insertions(+), 43 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8627629..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-.DS_Store
-node_modules
-/dist
-.idea
-
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..db62ad6
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "prettier.semi": false,
+    "vetur.format.defaultFormatter.js": "none"
+}
\ No newline at end of file
diff --git a/H5/.gitignore b/H5/.gitignore
index 403adbc..ee8dc92 100644
--- a/H5/.gitignore
+++ b/H5/.gitignore
@@ -1,7 +1,7 @@
 .DS_Store
 node_modules
 /dist
-
+/front
 
 # local env files
 .env.local
diff --git a/H5/src/main.js b/H5/src/main.js
index 57d00ae..bc01369 100644
--- a/H5/src/main.js
+++ b/H5/src/main.js
@@ -7,13 +7,13 @@ import "minirefresh/dist/debug/minirefresh.css";
 import "amfe-flexible";
 import "@/plugins/vant-ui.js";
 import "@/plugins/echarts-plugins.js";
-// import Vconsole from "vconsole";
+import Vconsole from "vconsole";
 
 import bridgeToAppFun from "@/utils/bridgeToAppFun";
 Vue.prototype.$bridgeToAppFun = new bridgeToAppFun();
 
 /*生产环境请注释掉 */
-// Vue.prototype.$vConsole = new Vconsole();
+Vue.prototype.$vConsole = new Vconsole();
 
 Vue.use(MiniRefreshTools);
 Vue.config.productionTip = false;
diff --git a/H5/src/utils/bridgeToAppFun.js b/H5/src/utils/bridgeToAppFun.js
index e7dc2d0..eb3cf2d 100644
--- a/H5/src/utils/bridgeToAppFun.js
+++ b/H5/src/utils/bridgeToAppFun.js
@@ -63,7 +63,6 @@ class bridgeToAppFun {
   navigateBack() {
     console.log("返回");
     if (this.userAgent === "android") {
-      console.log("an");
       try {
         const home_url =
           "https://shop92680967.youzan.com/v2/showcase/homepage?alias=6aFsQ4vCp7";
@@ -72,6 +71,7 @@ class bridgeToAppFun {
         console.log("返回调用失败，都不行");
       }
     } else {
+      console.log('去调用ios返回');
       jsBridge.callhandler("navigateBack");
     }
   }
diff --git a/H5/src/views/grade.vue b/H5/src/views/grade.vue
index e261687..f9e861d 100644
--- a/H5/src/views/grade.vue
+++ b/H5/src/views/grade.vue
@@ -71,27 +71,27 @@ export default {
       type: ["amount", "recommend", "team"],
       list: [
         {
-          num: 14,
-          label: "团队总人数",
+          num: 0,
+          label: "团队详情",
           hasArrow: true,
           urlName: "LeagueNums",
           field: "teamUserCount"
         },
         {
-          num: 12,
+          num: 0,
           label: "我的直推",
           hasArrow: true,
           urlName: "MyStatus",
           field: "recommendUserCount"
         },
         {
-          num: 61859,
+          num: 0,
           label: "团队累计总业绩",
           hasArrow: false,
           field: "teamCountDouble"
         },
         {
-          num: 11256,
+          num: 0,
           label: "团队当月新增业绩",
           hasArrow: false,
           field: "teamNowCount"
@@ -107,7 +107,6 @@ export default {
       try {
         this.$bridgeToAppFun.navigateBack();
       } catch {
-        console.log("不能和App交互");
         this.$router.go(-1);
       }
     },
@@ -116,7 +115,6 @@ export default {
     },
     getstatus() {
       const userId = JSON.parse(localStorage.getItem("user")).userId;
-      console.log(userId);
       const _this = this;
       getForestStatus(userId).then(res => {
         if (res.code === 0) {
@@ -125,6 +123,8 @@ export default {
         } else {
           _this.$toast.fail(res.msg);
         }
+      }).catch(err => {
+        console.log(err);
       });
     },
     handleData(data) {
diff --git a/H5/src/views/leagueNums.vue b/H5/src/views/leagueNums.vue
index 5e2166c..cec366d 100644
--- a/H5/src/views/leagueNums.vue
+++ b/H5/src/views/leagueNums.vue
@@ -28,42 +28,42 @@ export default {
     return {
       list: [
         {
-          num: "",
+          num: 0,
           label: "普通用户",
           field: "normalUserNum"
         },
         {
-          num: "",
+          num: 0,
           label: "幼苗",
           field: "seedlingNum"
         },
         {
-          num: "",
+          num: 0,
           label: "青铜树",
           field: "bronzeTreeNum"
         },
         {
-          num: "",
+          num: 0,
           label: "白银树",
           field: "silverTreeNum"
         },
         {
-          num: "",
+          num: 0,
           label: "黄金树",
           field: "goldTreeNum"
         },
         {
-          num: "",
+          num: 0,
           label: "农场主",
           field: "farmerNum"
         },
         {
-          num: "",
+          num: 0,
           label: "森林之星",
           field: "forestStartNum"
         },
         {
-          num: "",
+          num: 0,
           label: "西田森合伙人",
           field: "partnerNum"
         }
diff --git a/H5/vue.config.js b/H5/vue.config.js
index fcbc083..e3e268e 100644
--- a/H5/vue.config.js
+++ b/H5/vue.config.js
@@ -1,7 +1,10 @@
+// const path = require("path");
+
 const name = "西田森App";
 
 module.exports = {
   publicPath: "/front",
+  outputDir: "front",
   devServer: {
     proxy: {
       '/shop-mall': {
-- 
2.18.1