From 63d9b3bf86c34d9138f303d3785d3c8e3a865761 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 21 Mar 2023 13:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E9=97=B4=E8=B7=9D=E4=B8=8D=E4=B8=80=E8=87=B4=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9A=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85=E6=98=AF=E4=B9=B1=E7=9A=84=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BC=9A=E5=91=98=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E7=94=B3=E8=AF=B7=E7=82=B9=E8=BF=9B=E5=8E=BB?=
 =?UTF-8?q?=E4=B8=80=E7=9B=B4=E8=BD=AC=E5=9C=88=E5=9C=88=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=9A=E4=BC=9A=E5=91=98=E4=B8=AD=E5=BF=83=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8A=E6=96=B9=E7=A9=BA=E7=99=BD=E5=A4=AA=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/member/index.vue                        |  3 ++
 pages_promotion/fenxiao/apply_upgrade.vue     |  3 +-
 pages_rush/article/list.vue                   | 36 ++++++++++---------
 .../components/uni-popup-new/uni-popup.vue    |  4 ++-
 4 files changed, 28 insertions(+), 18 deletions(-)

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;
+}
 </style>
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 @@
     <!-- #endif -->
 
     <!-- #ifdef MP-WEIXIN -->
-    <swiper class="swipe" circular indicator-dots autoplay :interval="3000" v-if="set_info.banner_list && cate_ids === 'recommend'" >
+    <swiper class="swipe" circular indicator-dots autoplay :interval="30000" v-if="set_info.banner_list && cate_ids === 'recommend'" >
       <swiper-item v-for="(item,index) in set_info.banner_list" :key="index">
-        <image class="image-item" :src="$util.img(item)" mode="aspectFit"></image>
+        <image class="image-item" :src="$util.img(item)" mode="widthFix"></image>
       </swiper-item>
     </swiper>
     <!-- #endif -->
@@ -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: {