Merge branch 'dev_lqs' into 'master'

Dev lqs

See merge request !134

.gitignore

-.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?

.vscode/settings.json

+{
+    "prettier.semi": false,
+    "vetur.format.defaultFormatter.js": "none"
+}
\ No newline at end of file

H5/.gitignore

 .DS_Store
 node_modules
 /dist
-
+/front
 
 # local env files
 .env.local

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;

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");
     }
   }

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) {

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"
         }

H5/vue.config.js

+// const path = require("path");
+
 const name = "西田森App";
 
 module.exports = {
   publicPath: "/front",
+  outputDir: "front",
   devServer: {
     proxy: {
       '/shop-mall': {