diff --git a/pages/mine/point/myPoint.vue b/pages/mine/point/myPoint.vue index 4482b8a..f6df627 100644 --- a/pages/mine/point/myPoint.vue +++ b/pages/mine/point/myPoint.vue @@ -4,7 +4,7 @@ - 积分介绍 + diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue index a645f0a..3eb5c7f 100644 --- a/pages/order/fillorder.vue +++ b/pages/order/fillorder.vue @@ -154,7 +154,7 @@ 运费 - ¥{{ + ¥{{ orderMessage.priceDetailDTO.freightPrice | unitPrice }} @@ -278,6 +278,7 @@ export default { }, }, + /** * 监听返回 */ diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue index 256d869..bfbb51e 100644 --- a/pages/passport/wechatMPLogin.vue +++ b/pages/passport/wechatMPLogin.vue @@ -20,6 +20,7 @@ + @@ -74,6 +75,11 @@ export default { back() { whetherNavigate("wx"); }, + backToHome(){ + uni.switchTab({ + url: `/pages/tabbar/home/index` + }); + }, //获取用户信息 getUserProfile(e) { let that = this; @@ -229,8 +235,8 @@ text.shop { .btn-auth { width: 92%; - margin: 0 auto 100rpx; - border-radius: 100px; + margin: 0 auto 40rpx; + // border-radius: 100px; animation: mymove 5s infinite; -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/ animation-direction: alternate; /*轮流反向播放动画。*/ @@ -240,10 +246,15 @@ text.shop { -webkit-animation-direction: alternate; /*轮流反向播放动画。*/ -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/ } +.btn-callback { + width: 92%; + margin: 0 auto 100rpx; +} .btns { margin-top: 100rpx; display: flex; + flex-direction: column; width: 100%; justify-content: center; } diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue index 5501b1d..1055bef 100644 --- a/pages/tabbar/user/my.vue +++ b/pages/tabbar/user/my.vue @@ -68,10 +68,9 @@ - - + @@ -79,9 +78,6 @@ import tool from "@/pages/tabbar/user/utils/tool.vue"; import { getCouponsNum, getFootprintNum } from "@/api/members.js"; import { getUserWallet } from "@/api/members"; -let startY = 0, - moveY = 0, - pageAtTop = true; export default { components: { tool, @@ -102,6 +98,8 @@ export default { this.userInfo = this.$options.filters.isLogin(); if (this.$options.filters.isLogin("auth")) { this.getUserOrderNum(); + } else { + this.walletNum = 0; } }, onPullDownRefresh() { @@ -133,45 +131,6 @@ export default { ? this.navigateTo("/pages/mine/set/personMsg") : this.navigateTo("/pages/passport/login"); }, - - /** - * 会员卡下拉和回弹 - * 1.关闭bounce避免ios端下拉冲突 - * 2.由于touchmove事件的缺陷(以前做小程序就遇到,比如20跳到40,h5反而好很多),下拉的时候会有掉帧的感觉 - * transition设置0.1秒延迟,让css来过渡这段空窗期 - * 3.回弹效果可修改曲线值来调整效果,推荐一个好用的bezier生成工具 http://cubic-bezier.com/ - */ - coverTouchstart(e) { - if (pageAtTop === false) { - return; - } - this.coverTransition = "transform .1s linear"; - startY = e.touches[0].clientY; - }, - coverTouchmove(e) { - moveY = e.touches[0].clientY; - let moveDistance = moveY - startY; - if (moveDistance < 0) { - this.moving = false; - return; - } - this.moving = true; - if (moveDistance >= 80 && moveDistance < 100) { - moveDistance = 80; - } - - if (moveDistance > 0 && moveDistance <= 80) { - this.coverTransform = `translateY(${moveDistance}px)`; - } - }, - coverTouchend() { - if (this.moving === false) { - return; - } - this.moving = false; - this.coverTransition = "transform 0.3s cubic-bezier(.21,1.93,.53,.64)"; - this.coverTransform = "translateY(0px)"; - }, async getUserOrderNum() { uni.stopPullDownRefresh();