diff --git a/components/shop/shop-item/index.vue b/components/shop/shop-item/index.vue index d78eb13..aa37287 100644 --- a/components/shop/shop-item/index.vue +++ b/components/shop/shop-item/index.vue @@ -33,7 +33,7 @@ export default { border-radius: 50%; } >text{ - width: 100rpx; + max-width: 100rpx; margin-top: 14rpx; font-size: 24rpx; color: #333; diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue index 9f508aa..5c0876b 100644 --- a/pageE/order/Details.vue +++ b/pageE/order/Details.vue @@ -232,7 +232,7 @@ export default { this.$u.api.getOrderInfo({ order_id: id, }).then(res => { - // console.log(res) + console.log(res) if(res.errCode == 0) { this.orderInfo = res.data; this.setTitle(this.orderInfo.view_type); @@ -286,6 +286,7 @@ export default { toOtherPage(url) { this.$u.route('/pageE/order/' + url, { oid: this.orderInfo.order_id, + type:this.orderInfo.view_type }); }, makePhone(phone) { diff --git a/pageE/tool/MineHistory.vue b/pageE/tool/MineHistory.vue index 2cfd3ba..7c41d71 100644 --- a/pageE/tool/MineHistory.vue +++ b/pageE/tool/MineHistory.vue @@ -1,6 +1,6 @@ @@ -47,6 +47,9 @@ export default { onLoad() { this.getBrowseList(); }, + onReachBottom(){ + this.reachBottom() + }, methods: { viewAction(id) { this.showAction = true; @@ -58,6 +61,10 @@ export default { this.$u.api.delMemberBrowse({ goods_id: glist }).then(res => { if(res.errCode == 0) { this.getBrowseList(); + uni.pageScrollTo({ + scrollTop: 0, + duration: 300 + }); } else { this.$u.toast(res.message); } @@ -109,13 +116,16 @@ export default { } }; -