diff --git a/App.vue b/App.vue index 16f7557..ef5019d 100644 --- a/App.vue +++ b/App.vue @@ -17,6 +17,7 @@ export default { 'pages/shareArea/hiList', 'pages/shareArea/hiOrder', 'pages/pay/hiPay', + 'pages/pay/success', ] if (whiteList.indexOf(options.path) !== -1) return this.$store.dispatch('GetInfo') diff --git a/components/share/DefaultSharePage.vue b/components/share/DefaultSharePage.vue index 2e3bba5..2128593 100644 --- a/components/share/DefaultSharePage.vue +++ b/components/share/DefaultSharePage.vue @@ -3,7 +3,7 @@ {{ desensitization(userInfo.memberCode) }} @@ -187,22 +182,22 @@ export default { display: flex; flex-direction: column; align-items: center; + justify-content: center; } /* 背景图片样式 */ .share-bg-image { - position: absolute; - top: 0; - left: 0; - width: 100%; height: 100%; + width: 100%; + // height: 100%; z-index: 1; + // object-fit: cover; } .share-wrapper { position: absolute; z-index: 2; - top: 360rpx; + bottom: 30rpx; display: flex; flex-direction: column; align-items: center; @@ -216,15 +211,14 @@ export default { box-sizing: border-box; flex-direction: column; align-items: center; + justify-content: center; margin: 0 auto; opacity: 0; - transform: translateY(20rpx); - transition: all 0.3s ease; + text-align: center; } .portal-frame.is-loaded { opacity: 1; - transform: translateY(0); } /* 二维码样式区域 - 用户自定义样式位置 */ @@ -275,6 +269,8 @@ export default { /* 会员编号样式区域 - 用户自定义样式位置 */ .member-code-text { + display: block; + text-align: center; /* 用户可以在这里自定义会员编号的样式 */ } diff --git a/components/successDialog.vue b/components/successDialog.vue index 4d5e46e..86ffb63 100644 --- a/components/successDialog.vue +++ b/components/successDialog.vue @@ -1,262 +1,282 @@ - \ No newline at end of file +::v-deep .u-form-item__body__left__content__label { + font-size: 24rpx; + font-family: Source Han Sans CN; + font-weight: 400; + color: #999999; +} + diff --git a/config/login.js b/config/login.js index da9c78a..a67c169 100644 --- a/config/login.js +++ b/config/login.js @@ -9,6 +9,11 @@ export const login = params => export const autoLogin = params => http.post('/member/api/retail-auth/auto-login', params) +// 分享注册后自动登录 +// registered-auto-login +export const registeredAutoLogin = params => + http.post('/member/api/retail-auth/registered-auto-login', params) + //用户信息 export const getInfo = params => http.get('/member/api/retail-member/get-info', { params }) diff --git a/pages/login/index.vue b/pages/login/index.vue index 6f4e897..01ddef4 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -1,26 +1,26 @@ - @@ -116,7 +129,7 @@ export default { }, onLoad() { this.getVerifyCode() - this.loginForm.username = uni.getStorageSync('username')||'' + this.loginForm.username = uni.getStorageSync('username') || '' // this.getLanguage() }, methods: { @@ -135,13 +148,13 @@ export default { this.loginForm.username = '' }, getVerifyCode() { - api.captchaImage().then((res) => { + api.captchaImage().then(res => { this.codeUrl = 'data:image/gif;base64,' + res.img this.loginForm.uuid = res.uuid }) }, toLogin() { - api.login(this.loginForm).then((res) => { + api.login(this.loginForm).then(res => { this.isLoading = false if (!res) { // uni.showToast({ @@ -165,29 +178,16 @@ export default { url: url, method: 'GET', responseType: 'arraybuffer', - success: (res) => {}, - fail: (err) => { + success: res => {}, + fail: err => { reject(err) }, }) }) }, getUseInfo() { - store.dispatch('GetInfo').then((res) => { + store.dispatch('GetInfo').then(res => { uni.switchTab({ url: '/pages/index/index' }) - // 目前强制跳首页 - // if (res.data.loginType == 1) { - // uni.redirectTo({ url: '/pages/specialMember/index' }) - // } else { - // if (res.data.registerFans == 0) { - // uni.redirectTo({ url: '/pages/shareArea/index?specialArea=7' }) - // } else if (res.data.registerShare == 0) { - // // uni.redirectTo({ url: '/pages/shareArea/haiNdex?specialArea=21 ' }) - // uni.switchTab({ url: '/pages/index/index' }) - // } else { - // uni.switchTab({ url: '/pages/index/index' }) - // } - // } }) // api.getInfo().then((res) => { // uni.setStorage('User', res.data) @@ -239,7 +239,7 @@ body { text-align: center; } .btn { - background-color: #005BAC; + background-color: #005bac; border: none; height: 92rpx; line-height: 92rpx; @@ -329,4 +329,4 @@ body { .pa { padding: 7px 20rpx; } - \ No newline at end of file + diff --git a/pages/mine/share/index.vue b/pages/mine/share/index.vue index 0fac93b..c8cb571 100644 --- a/pages/mine/share/index.vue +++ b/pages/mine/share/index.vue @@ -1,7 +1,13 @@