Skip to content

X
XiTianSenMall
Commit 33a8642d authored by leiqingsong's avatar leiqingsong
Browse files
Options

Merge branch 'dev_xll' into 'master' 

获取用户信息

See merge request !28
parents 5a58bd4d 5fcdffdf
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 137 deletions
H5/package-lock.json
View file @ 33a8642d
...@@ -1747,6 +1747,16 @@ ...@@ -1747,6 +1747,16 @@
"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
"dev": true "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": { "autoprefixer": {
"version": "9.8.6", "version": "9.8.6",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
...@@ -1788,6 +1798,41 @@ ...@@ -1788,6 +1798,41 @@
"unique-filename": "^1.1.1" "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": { "postcss-loader": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz", "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
...@@ -1829,6 +1874,16 @@ ...@@ -1829,6 +1874,16 @@
"minipass": "^3.1.1" "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": { "terser-webpack-plugin": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
...@@ -1845,6 +1900,32 @@ ...@@ -1845,6 +1900,32 @@
"terser": "^4.6.12", "terser": "^4.6.12",
"webpack-sources": "^1.4.3" "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 @@ ...@@ -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": { "vue-router": {
"version": "3.5.1", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",
......
H5/src/App.vue
View file @ 33a8642d
...@@ -29,9 +29,9 @@ export default { ...@@ -29,9 +29,9 @@ export default {
console.log(res); console.log(res);
}) })
.catch(err => { .catch(err => {
console.log('error', err); console.log("error", err);
}); });
}, }
}; };
</script> </script>
......
H5/src/api/customer.js
View file @ 33a8642d
...@@ -4,8 +4,8 @@ import request from "@/utils/request"; ...@@ -4,8 +4,8 @@ import request from "@/utils/request";
* 获取专属客服 * 获取专属客服
*/ */
export function getCustomer() { export function getCustomer() {
return request({ return request({
url: "/customerService/service", url: "/customerService/service",
method: "get" method: "get"
}) });
} }
\ No newline at end of file
H5/src/api/invite.js
View file @ 33a8642d
...@@ -7,7 +7,7 @@ import request from "@/utils/request"; ...@@ -7,7 +7,7 @@ import request from "@/utils/request";
export function inviteCode(userId) { export function inviteCode(userId) {
return request({ return request({
url: `/api/user/registerByQrCode?userId=${userId}`, url: `/api/user/registerByQrCode?userId=${userId}`,
responseType: 'arraybuffer', responseType: "arraybuffer",
method: "get" method: "get"
}); });
} }
H5/src/api/user.js
View file @ 33a8642d
...@@ -54,13 +54,26 @@ export function setAvatar(params) { ...@@ -54,13 +54,26 @@ export function setAvatar(params) {
/** /**
* 退出 * 退出
* @param {*} token * @param {*} token
* @returns * @returns
*/ */
export function logout(token) { export function logout(token) {
return request({ return request({
url: "/api/user/logout", url: "/api/user/logout",
method: "post", 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
View file @ 33a8642d
...@@ -152,7 +152,7 @@ const routes = [ ...@@ -152,7 +152,7 @@ const routes = [
path: "/aboutUs", path: "/aboutUs",
name: "AboutUs", name: "AboutUs",
component: () => import("@/views/aboutUs"), component: () => import("@/views/aboutUs"),
meta: { title: "公司简介", noNav: true } meta: { title: "公司简介", noNav: false }
} }
]; ];
......
H5/src/utils/bridgeToAppFun.js
View file @ 33a8642d
// H5 去调用App的方法 // H5 去调用App的方法
import jsBridge from "./bridge"; import jsBridge from "./bridge";
import { getUserInfo } from "@/api/user";
// 获取Token // 获取Token
export function getAuthToken() { export function getAuthToken() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
console.log("调用1"); console.log("调用1");
jsBridge.callhandler("getAuthToken", null, data => { jsBridge.callhandler("getAuthToken", null, data => {
console.log("调用2"); console.log("调用2");
localStorage.setItem('token', data); localStorage.setItem("token", data);
console.log("--------------"); console.log("--------------");
if (data) { if (data) {
getUserInfo().then(res=>{
})
alert("获取到的token" + data); alert("获取到的token" + data);
resolve(data); resolve(data);
} else { } else {
......
H5/src/utils/request.js
View file @ 33a8642d
...@@ -11,9 +11,8 @@ const service = axios.create({ ...@@ -11,9 +11,8 @@ const service = axios.create({
service.interceptors.request.use( service.interceptors.request.use(
config => { config => {
const token = localStorage.getItem('token'); const token = localStorage.getItem("token");
config.headers["Authorization"] = config.headers["Authorization"] = "Bearer " + token;
"Bearer " + token;
if (!config.loading) { if (!config.loading) {
loading = Toast.loading({ loading = Toast.loading({
forbidClick: true, forbidClick: true,
......
H5/src/views/customer-service.vue
View file @ 33a8642d
...@@ -44,9 +44,9 @@ export default { ...@@ -44,9 +44,9 @@ export default {
getCustomerData() { getCustomerData() {
getCustomer().then(res => { getCustomer().then(res => {
if (res.code === 0) { 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
View file @ 33a8642d
...@@ -73,10 +73,10 @@ export default { ...@@ -73,10 +73,10 @@ export default {
this.getWalletInfo(); this.getWalletInfo();
getAuthToken() getAuthToken()
.then(res => { .then(res => {
console.log('success', res); console.log("success", res);
}) })
.catch(err => { .catch(err => {
console.log('error', err); console.log("error", err);
}); });
}, },
methods: { methods: {
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
} }
}) })
.catch(error => { .catch(error => {
console.log('catch', error); console.log("catch", error);
}); });
} }
} }
......
H5/src/views/invite.vue
View file @ 33a8642d
...@@ -24,45 +24,44 @@ export default { ...@@ -24,45 +24,44 @@ export default {
}); });
inviteCode(userId).then(res => { inviteCode(userId).then(res => {
if (loading) _this.$toast.clear(); 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 uInt8Array = new Uint8Array(res);
let len = uInt8Array.length; let len = uInt8Array.length;
let binaryString = new Array(len); let binaryString = new Array(len);
while (len--) { while (len--) {
binaryString[len] = String.fromCharCode(uInt8Array[len]); binaryString[len] = String.fromCharCode(uInt8Array[len]);
} }
let data = window.btoa(binaryString.join('')); let data = window.btoa(binaryString.join(""));
let imageType = 'image/jpeg'; let imageType = "image/jpeg";
let imageUrl = "data:" + imageType + ";base64," + data let imageUrl = "data:" + imageType + ";base64," + data;
return imageUrl return imageUrl;
}
},
} }
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.invite-code { .invite-code {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background: url("../assets/images/invite.jpeg"); background: url("../assets/images/invite.jpeg");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100% ; background-size: 100% 100%;
.imgCode{ .imgCode {
position: absolute; position: absolute;
width: 60px;
height: 60px;
right: 50px;
bottom: 10px;
}
@media only screen and (device-width: 375px) and (-webkit-device-pixel-ratio: 3) {
.imgCode {
width: 60px; width: 60px;
height: 60px; height: 60px;
right: 50px; bottom: 20px;
bottom: 10px;
} }
@media only screen and (device-width:375px) and (-webkit-device-pixel-ratio: 3) {
.imgCode{
width: 60px;
height: 60px;
bottom: 20px;
}
} }
} }
</style> </style>
H5/src/views/settings.vue
View file @ 33a8642d
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
<van-cell is-link title="软件更新" value="版本v1.2" /> <van-cell is-link title="软件更新" value="版本v1.2" />
<van-cell is-link title="用户协议" @click="jumpToInstructions" /> <van-cell is-link title="用户协议" @click="jumpToInstructions" />
</van-cell-group> </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
base-dialog-title="推荐人邀请码" base-dialog-title="推荐人邀请码"
...@@ -63,9 +65,9 @@ export default { ...@@ -63,9 +65,9 @@ export default {
logout() { logout() {
const params = { const params = {
token: "qwedskdljlkjlklkjlkjlkjl" token: "qwedskdljlkjlklkjlkjlkjl"
} };
logout(params).then() logout(params).then();
logoutToApp() logoutToApp();
}, },
jumpToInstructions() { jumpToInstructions() {
this.$router.push("/instructions"); this.$router.push("/instructions");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment