فهرست منبع

fix: 权益卡续费活动弹窗样式和交互

- storePages/myRights: 续费按钮条件改为 canRenew,标题改为"请选择续费活动"
- storePages/myRights: 移除 actionBar 顶部边框
- orderPages/storeService: 增加续费弹窗样式,标题改为"请选择续费活动"
- orderPages/storeService: 增加 selectUpgradeActivity 和 closeUpgradePopup 方法

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
xuyunhui 2 روز پیش
والد
کامیت
2e42f5e56a

+ 48 - 0
orderPages/storeService/index.rpx.scss

@@ -258,3 +258,51 @@
   border-radius: 36rpx;
   padding: 10rpx 20rpx;
 }
+.upgradePopupView{
+  width: 600rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  padding: 32rpx;
+  box-sizing: border-box;
+}
+.upgradeTitle{
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333333;
+  text-align: center;
+  margin-bottom: 24rpx;
+}
+.upgradeScroll{
+  max-height: 600rpx;
+}
+.upgradeItem{
+  padding: 24rpx;
+  background: #F7F7F7;
+  border-radius: 16rpx;
+  margin-bottom: 16rpx;
+}
+.upgradeItemTitle{
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333333;
+  line-height: 40rpx;
+}
+.upgradeItemPrice{
+  font-size: 24rpx;
+  color: #666666;
+  margin-top: 8rpx;
+}
+.upgradePrice{
+  color: #FF4444;
+  font-weight: bold;
+}
+.upgradeCloseBtn{
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  background: #FFE05C;
+  border-radius: 40rpx;
+  font-size: 28rpx;
+  color: #333333;
+  margin-top: 16rpx;
+}

+ 10 - 2
orderPages/storeService/index.vue

@@ -175,7 +175,7 @@
     </uni-popup>
     <uni-popup ref="upgradePopup" type="center">
       <view class="upgradePopupView">
-        <view class="upgradeTitle">请选择升级活动</view>
+        <view class="upgradeTitle">请选择续费活动</view>
         <scroll-view class="upgradeScroll" scroll-y>
           <view class="upgradeItem" v-for="(act,idx) in upgradeActivityList" :key="idx" @click="selectUpgradeActivity(idx)">
             <view class="upgradeItemTitle">{{act.title}}</view>
@@ -314,7 +314,15 @@
           this.recommendActivity = res.data.data
         })
       },
-
+      selectUpgradeActivity(idx){
+        const activity = this.upgradeActivityList[idx]
+        console.log(activity, 'activity')
+        this.goUpgradeDetail(activity, this.currentUpgradeItem)
+        this.closeUpgradePopup()
+      },
+      closeUpgradePopup(){
+        this.$refs.upgradePopup.close()
+      },
       navigateTo(item){
         if(item.activityId){
           let list = item.activityId.split(',')

+ 1 - 1
storePages/myRights/index.rpx.scss

@@ -167,7 +167,7 @@
 
 .actionBar{
   padding: 16rpx 0;
-  border-top: 1rpx solid #F2F2F2;
+  //border-top: 1rpx solid #F2F2F2;
 }
 .actionBtn{
   min-width: 128rpx;

+ 2 - 2
storePages/myRights/index.vue

@@ -73,7 +73,7 @@
 
 							<view class="actionBar flex-row justify-end">
 <!--								<view class="actionBtn renewBtn" v-if="item.isShow" @click.stop="navigateTo(item)">续费</view>-->
-								<view class="actionBtn upgradeBtn" v-if="item.isShow" @click.stop="upgrade(item)">续费</view>
+								<view class="actionBtn upgradeBtn" v-if="item.canRenew" @click.stop="upgrade(item)">续费</view>
 							</view>
 
 							<view class="rule-toggle" @click.stop="showRemark(item)">
@@ -112,7 +112,7 @@
 
 		<uni-popup ref="upgradePopup" type="center">
 			<view class="upgradePopupView">
-				<view class="upgradeTitle">请选择升级活动</view>
+				<view class="upgradeTitle">请选择续费活动</view>
 				<scroll-view class="upgradeScroll" scroll-y>
 					<view class="upgradeItem" v-for="(act,idx) in upgradeActivityList" :key="idx" @click="selectUpgradeActivity(idx)">
 						<view class="upgradeItemTitle">{{act.title}}</view>