diff --git a/pages/member/index.vue b/pages/member/index.vue index 4d6d903..58031eb 100644 --- a/pages/member/index.vue +++ b/pages/member/index.vue @@ -90,4 +90,7 @@ export default { .hide { display: none; } +/deep/ .member-info{ + padding-top: 0!important; +} diff --git a/pages_promotion/fenxiao/apply_upgrade.vue b/pages_promotion/fenxiao/apply_upgrade.vue index d196f4c..da88a01 100644 --- a/pages_promotion/fenxiao/apply_upgrade.vue +++ b/pages_promotion/fenxiao/apply_upgrade.vue @@ -77,6 +77,7 @@ export default { id_card_front: '', id_card_reverse: '', upgrade_agree: '', + status: 0, }, }; }, @@ -99,7 +100,7 @@ export default { success: res => { if (res.code === 0) { _this.baseInfo = res.data; - _this.info = res.data.info; + if(res.data.info) _this.info = res.data.info; if(parseInt(this.info.status) === 2){ _this.$util.showToast({ diff --git a/pages_rush/article/list.vue b/pages_rush/article/list.vue index 5099dda..1dfa25d 100644 --- a/pages_rush/article/list.vue +++ b/pages_rush/article/list.vue @@ -28,9 +28,9 @@ - + - + @@ -370,7 +370,7 @@ export default { } } .top-buttons{ - height: 90rpx; + height: 60rpx; width: 100%; display: inline-flex; flex-direction: row; @@ -423,14 +423,14 @@ export default { } .swipe{ - width: 100%; + width: 100% !important; height: calc(100vw / 2); padding: 0; margin: 20rpx 0; .image-item{ - width: 100%; - height: 100%; + width: 100% !important; + height: 100%!important; border-radius: 20rpx; /deep/ div{ background-size: 100% 100% !important; @@ -525,7 +525,7 @@ export default { align-items: center; height: 60rpx; line-height: 60rpx; - margin: 50rpx 0 10rpx 0; + margin: 10rpx 0 10rpx 0; position: relative; .title{ @@ -639,7 +639,7 @@ export default { align-items: center; height: 60rpx; line-height: 60rpx; - margin: 50rpx 0 10rpx 0; + margin: 0 0 10rpx 0; position: relative; .title{ @@ -661,8 +661,9 @@ export default { .article-block{ display: inline-block; width: 55vw; - padding: 20rpx 16rpx; + padding: 0 20rpx 10rpx 0!important; height: calc(65vw / 2); + position: relative; .img{ width: 100%; height: 100%; @@ -674,15 +675,20 @@ export default { } } .block-content{ - width: calc(100%); - height: 100%; + width: 55vw; + height: calc(65vw / 2); display: block; - position: relative; - top: calc(-65vw / 4 - 36rpx); + position: absolute; + top: 0; + left: 0; color: #ffffff; + display: inline-flex; + flex-direction: column; + flex-wrap: nowrap; + justify-content: center; + align-items: center; .content-title{ - margin: auto; overflow: hidden; /*这里要显示的设置宽度*/ white-space:nowrap; @@ -698,9 +704,7 @@ export default { -webkit-box-orient: vertical; } .content-abstract{ - margin: auto; overflow: hidden; - margin-top: 16rpx; white-space:nowrap; text-align: center; color: #ffffff; diff --git a/pages_rush/components/uni-popup-new/uni-popup.vue b/pages_rush/components/uni-popup-new/uni-popup.vue index db90c59..1326d51 100644 --- a/pages_rush/components/uni-popup-new/uni-popup.vue +++ b/pages_rush/components/uni-popup-new/uni-popup.vue @@ -44,12 +44,14 @@ * @event {Function} maskClick 点击遮罩触发 */ + import uniTransition from '@/pages_rush/components/uni-transition/uni-transition.vue'; export default { name: 'uniPopup', components: { // #ifdef H5 - keypress + keypress, // #endif + uniTransition }, emits: ['change', 'maskClick'], props: {