Commit e478a3be by 陆志强

Merge branch 'feature/pay' into dev

parents de513a4a 1891be27
{ {
"name": "web-my", "name": "web-my",
"version": "2.13.16", "version": "2.14.8",
"description": "C端个人中心", "description": "C端个人中心",
"private": true, "private": true,
"description": "C端个人中心",
"scripts": { "scripts": {
"serve:dev": "cross-env mode=test vue-cli-service serve --mode development", "serve:dev": "cross-env mode=test vue-cli-service serve --mode development",
"serve:pre": "cross-env mode=preview vue-cli-service serve --mode development", "serve:pre": "cross-env mode=preview vue-cli-service serve --mode development",
...@@ -18,9 +17,6 @@ ...@@ -18,9 +17,6 @@
"release:patch": "standard-version -r patch" "release:patch": "standard-version -r patch"
}, },
"dependencies": { "dependencies": {
"@gdyfe/uploader": "2.3.6",
"@nuxtjs/axios": "^5.13.6",
"@nuxtjs/sentry": "^5.1.7",
"@gdyfe/config": "^2.1.5", "@gdyfe/config": "^2.1.5",
"@gdyfe/gdy-component-lib": "^1.0.4", "@gdyfe/gdy-component-lib": "^1.0.4",
"@vant/touch-emulator": "^1.4.0", "@vant/touch-emulator": "^1.4.0",
......
...@@ -160,10 +160,8 @@ export default { ...@@ -160,10 +160,8 @@ export default {
}); });
if (res.code === 200 && res.errorCode === 0) { if (res.code === 200 && res.errorCode === 0) {
const { tradeType, prepayInfo } = res.data; const { tradeType, prepayInfo } = res.data;
const DEF_SITE = process.client const DEF_SITE = `//${ENV_CONFIG.CUSTOMER_DOMAIN}` + (window.location.protocol.split(":")[0] === "https" ? ENV_CONFIG.HTTPS_PORT : ENV_CONFIG.HTTP_PORT)
? `//${ENV_CONFIG.CUSTOMER_DOMAIN}` + // : `http://${ENV_CONFIG.CUSTOMER_DOMAIN + ENV_CONFIG.HTTP_PORT}`;
(window.location.protocol.split(":")[0] === "https" ? ENV_CONFIG.HTTPS_PORT : ENV_CONFIG.HTTP_PORT)
: `http://${ENV_CONFIG.CUSTOMER_DOMAIN + ENV_CONFIG.HTTP_PORT}`;
if (res.data.url) { if (res.data.url) {
window.location.href = res.data.url; window.location.href = res.data.url;
} else if (tradeType === "MWEB") { } else if (tradeType === "MWEB") {
......
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
}); });
if (res.code === 200 && res.errorCode === 0) { if (res.code === 200 && res.errorCode === 0) {
this.$toast("绑定成功!"); this.$toast("绑定成功!");
this.$store.dispatch("users/get_userInfo"); this.$store.dispatch("users/get_userInfo", { query: this.$route.query });
this.$router.back(); this.$router.back();
} else { } else {
if (res.errorMessage) { if (res.errorMessage) {
......
...@@ -125,7 +125,7 @@ export default { ...@@ -125,7 +125,7 @@ export default {
captcha: this.form.code captcha: this.form.code
}); });
if (res.code === 200 && res.errorCode === 0) { if (res.code === 200 && res.errorCode === 0) {
this.$store.dispatch('users/get_userInfo'); this.$store.dispatch('users/get_userInfo', { query: this.$route.query });
this.$router.back(); this.$router.back();
} else { } else {
if (res.errorMessage) { if (res.errorMessage) {
......
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
}); });
if (res.code === 200 && res.errorCode === 0) { if (res.code === 200 && res.errorCode === 0) {
this.$toast("修改成功!"); this.$toast("修改成功!");
this.$store.dispatch("users/get_userInfo"); this.$store.dispatch("users/get_userInfo", { query: this.$route.query });
this.$router.back(); this.$router.back();
} else { } else {
if (res.errorMessage) { if (res.errorMessage) {
......
...@@ -222,7 +222,7 @@ export default { ...@@ -222,7 +222,7 @@ export default {
}); });
if (res.code === 200 && res.errorCode === 0) { if (res.code === 200 && res.errorCode === 0) {
this.$toast("已提交审核!"); this.$toast("已提交审核!");
this.$store.dispatch("users/get_userInfo"); this.$store.dispatch("users/get_userInfo", { query: this.$route.query });
} else { } else {
if (res.errorMessage) { if (res.errorMessage) {
this.$toast(res.errorMessage); this.$toast(res.errorMessage);
...@@ -242,7 +242,7 @@ export default { ...@@ -242,7 +242,7 @@ export default {
}); });
if (res.code === 200 && res.errorCode === 0) { if (res.code === 200 && res.errorCode === 0) {
this.$toast("修改成功!"); this.$toast("修改成功!");
this.$store.dispatch("users/get_userInfo"); this.$store.dispatch("users/get_userInfo", { query: this.$route.query });
} else { } else {
if (res.errorMessage) { if (res.errorMessage) {
this.$toast(res.errorMessage); this.$toast(res.errorMessage);
...@@ -264,7 +264,7 @@ export default { ...@@ -264,7 +264,7 @@ export default {
}); });
if (res.code === 200 && res.errorCode === 0) { if (res.code === 200 && res.errorCode === 0) {
this.$toast("已提交审核!"); this.$toast("已提交审核!");
this.$store.dispatch("users/get_userInfo"); this.$store.dispatch("users/get_userInfo", { query: this.$route.query });
} else { } else {
if (res.errorMessage) { if (res.errorMessage) {
this.$toast(res.errorMessage); this.$toast(res.errorMessage);
......
...@@ -274,7 +274,7 @@ export default { ...@@ -274,7 +274,7 @@ export default {
} else { } else {
this.$toast("提交成功,红包将会在24小时内到账!"); this.$toast("提交成功,红包将会在24小时内到账!");
this.form.amount = ""; this.form.amount = "";
this.$store.dispatch('users/get_userInfo'); this.$store.dispatch('users/get_userInfo', { query: this.$route.query });
} }
this.changeImg() this.changeImg()
} else { } else {
......
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 sign in to comment