Merge branch 'dev_xll' into 'master'

获取用户信息

See merge request !28

H5/package-lock.json

@@ -1747,6 +1747,16 @@
           "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "autoprefixer": {
           "version": "9.8.6",
           "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
@@ -1788,6 +1798,41 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
         "postcss-loader": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
@@ -1829,6 +1874,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
@@ -1845,6 +1900,32 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.1.2",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
+          "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "loader-utils": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            }
+          }
         }
       }
     },
@@ -11357,87 +11438,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.1.2",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
-      "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",

H5/src/App.vue

@@ -29,9 +29,9 @@ export default {
         console.log(res);
       })
       .catch(err => {
-        console.log('error', err);
+        console.log("error", err);
       });
-  },
+  }
 };
 </script>
 

H5/src/api/customer.js

@@ -7,5 +7,5 @@ export function getCustomer() {
   return request({
     url: "/customerService/service",
     method: "get"
-	})
+  });
 }

H5/src/api/invite.js

@@ -7,7 +7,7 @@ import request from "@/utils/request";
 export function inviteCode(userId) {
   return request({
     url: `/api/user/registerByQrCode?userId=${userId}`,
-    responseType: 'arraybuffer',
+    responseType: "arraybuffer",
     method: "get"
   });
 }

H5/src/api/user.js

@@ -61,6 +61,19 @@ export function logout(token) {
   return request({
     url: "/api/user/logout",
     method: "post",
-    header: { "token":  token}
-  })
+    header: { token: token }
+  });
+}
+
+
+/**
+ * 根据token获取userId
+ * @param {*} params token
+ */
+ export function getUserInfo() {
+  return request({
+    url: "/api/user/info",
+    method: "post",
+    
+  });
 }
\ No newline at end of file

H5/src/router/index.js

@@ -152,7 +152,7 @@ const routes = [
     path: "/aboutUs",
     name: "AboutUs",
     component: () => import("@/views/aboutUs"),
-    meta: { title: "公司简介", noNav: true }
+    meta: { title: "公司简介", noNav: false }
   }
 ];
 

H5/src/utils/bridgeToAppFun.js

 // H5 去调用App的方法
 import jsBridge from "./bridge";
-
+import { getUserInfo } from "@/api/user";
 // 获取Token
 export function getAuthToken() {
   return new Promise((resolve, reject) => {
     console.log("调用1");
     jsBridge.callhandler("getAuthToken", null, data => {
       console.log("调用2");
-      localStorage.setItem('token', data);
+      localStorage.setItem("token", data);
+
       console.log("--------------");
       if (data) {
+        getUserInfo().then(res=>{
+          
+        })
         alert("获取到的token" + data);
         resolve(data);
       } else {

H5/src/utils/request.js

@@ -11,9 +11,8 @@ const service = axios.create({
 
 service.interceptors.request.use(
   config => {
-    const token = localStorage.getItem('token');
-    config.headers["Authorization"] =
-      "Bearer " + token;
+    const token = localStorage.getItem("token");
+    config.headers["Authorization"] = "Bearer " + token;
     if (!config.loading) {
       loading = Toast.loading({
         forbidClick: true,

H5/src/views/customer-service.vue

@@ -44,9 +44,9 @@ export default {
     getCustomerData() {
       getCustomer().then(res => {
         if (res.code === 0) {
-          this.imageUrl = process.env.VUE_APP_BASE_URL + res.data
+          this.imageUrl = process.env.VUE_APP_BASE_URL + res.data;
         }
-      })
+      });
     }
   }
 };

H5/src/views/income/wallet.vue

@@ -73,10 +73,10 @@ export default {
     this.getWalletInfo();
     getAuthToken()
       .then(res => {
-        console.log('success', res);
+        console.log("success", res);
       })
       .catch(err => {
-        console.log('error', err);
+        console.log("error", err);
       });
   },
   methods: {
@@ -112,7 +112,7 @@ export default {
           }
         })
         .catch(error => {
-          console.log('catch', error);
+          console.log("catch", error);
         });
     }
   }

H5/src/views/invite.vue

@@ -24,22 +24,21 @@ export default {
       });
       inviteCode(userId).then(res => {
         if (loading) _this.$toast.clear();
-        _this.imgSrc = _this.getUserPhoto(res)
+        _this.imgSrc = _this.getUserPhoto(res);
       });
     },
-     getUserPhoto(res){
+    getUserPhoto(res) {
       let uInt8Array = new Uint8Array(res);
       let len = uInt8Array.length;
       let binaryString = new Array(len);
       while (len--) {
         binaryString[len] = String.fromCharCode(uInt8Array[len]);
       }
-        let data = window.btoa(binaryString.join(''));
-        let imageType = 'image/jpeg';
-        let imageUrl = "data:" + imageType + ";base64," + data
-        return imageUrl
-
-      },
+      let data = window.btoa(binaryString.join(""));
+      let imageType = "image/jpeg";
+      let imageUrl = "data:" + imageType + ";base64," + data;
+      return imageUrl;
+    }
   }
 };
 </script>
@@ -49,16 +48,16 @@ export default {
   height: 100vh;
   background: url("../assets/images/invite.jpeg");
   background-repeat: no-repeat;
-    background-size: 100% 100% ;
-    .imgCode{
+  background-size: 100% 100%;
+  .imgCode {
     position: absolute;
     width: 60px;
     height: 60px;
     right: 50px;
     bottom: 10px;
   }
-    @media only screen and (device-width:375px) and (-webkit-device-pixel-ratio: 3) {
-    .imgCode{
+  @media only screen and (device-width: 375px) and (-webkit-device-pixel-ratio: 3) {
+    .imgCode {
       width: 60px;
       height: 60px;
       bottom: 20px;

H5/src/views/settings.vue

@@ -20,7 +20,9 @@
       <van-cell is-link title="软件更新" value="版本v1.2" />
       <van-cell is-link title="用户协议" @click="jumpToInstructions" />
     </van-cell-group>
-    <van-button size="large" class="logout-btn" @click="logout" >退出登录</van-button>
+    <van-button size="large" class="logout-btn" @click="logout"
+      >退出登录</van-button
+    >
 
     <base-dialog
       base-dialog-title="推荐人邀请码"
@@ -63,9 +65,9 @@ export default {
     logout() {
       const params = {
         token: "qwedskdljlkjlklkjlkjlkjl"
-      }
-      logout(params).then()
-      logoutToApp()
+      };
+      logout(params).then();
+      logoutToApp();
     },
     jumpToInstructions() {
       this.$router.push("/instructions");