Commit deb2cfed authored by mengcuiguang's avatar mengcuiguang

代码优化

parent d8f2e1fd
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
</view> </view>
</view> </view>
<text class="trialStyle" v-show="hintText!=null&&hintText!=''">
{{hintText}}
</text>
<view style="display: flex;flex-direction: column;align-items: center;"> <view style="display: flex;flex-direction: column;align-items: center;">
<view style="font-size: 24rpx;color: gray;margin-top: 16rpx;margin-bottom: 18rpx;"> <view style="font-size: 24rpx;color: gray;margin-top: 16rpx;margin-bottom: 18rpx;">
订单中如有疑问,请在个人中心联系客服</view> 订单中如有疑问,请在个人中心联系客服</view>
...@@ -107,6 +111,7 @@ ...@@ -107,6 +111,7 @@
agreeFlag: false, agreeFlag: false,
userBean: {}, userBean: {},
agreementDto: null, agreementDto: null,
hintText: '',
os: 'android', os: 'android',
titleText: '超多精彩小说一键解锁', titleText: '超多精彩小说一键解锁',
showClone: false showClone: false
...@@ -153,11 +158,11 @@ ...@@ -153,11 +158,11 @@
success: ({ success: ({
data data
}) => { }) => {
console.log("agreement=",data.agreement); console.log("agreement=", data.agreement);
if(data.agreement==undefined){ if (data.agreement == undefined) {
console.log("agreement=22222"); console.log("agreement=22222");
this.agreementDto = null; this.agreementDto = null;
}else{ } else {
this.agreementDto = data.agreement; this.agreementDto = data.agreement;
} }
...@@ -184,7 +189,7 @@ ...@@ -184,7 +189,7 @@
}, },
choosePack(item, index) { choosePack(item, index) {
this.selectedIndex = index; this.selectedIndex = index;
this.hintText = this.vipList[this.selectedIndex].trailRemark;
this.handlePay(); this.handlePay();
}, },
handlePay() { handlePay() {
...@@ -380,4 +385,15 @@ ...@@ -380,4 +385,15 @@
} }
} }
} }
.trialStyle {
display: flex;
align-items: center;
font-size: 30rpx;
color: gainsboro;
margin: 20rpx;
word-wrap: break-word;
word-break: break-all;
white-space: pre-line;
}
</style> </style>
\ No newline at end of file
This diff is collapsed.
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
<view class="name row" :class="[{active2: index==selectedIndex}]"> <view class="name row" :class="[{active2: index==selectedIndex}]">
{{item.title}} {{item.title}}
</view> </view>
<view class="price row" :class="[{active1: index==selectedIndex},{price2:item.firstPayPrice<=0}]"> <view class="price row"
:class="[{active1: index==selectedIndex},{price2:item.firstPayPrice<=0}]">
<view style="font-size: 50rpx;">{{item.firstPayPrice<=0 ? '' : '¥'}}</view> <view style="font-size: 50rpx;">{{item.firstPayPrice<=0 ? '' : '¥'}}</view>
{{item.firstPayPrice<=0 ? '免费试用' : item.firstPayPrice}} {{item.firstPayPrice<=0 ? '免费试用' : item.firstPayPrice}}
</view> </view>
...@@ -41,6 +42,10 @@ ...@@ -41,6 +42,10 @@
</view> </view>
</view> </view>
<text class="trialStyle" v-show="hintText!=null&&hintText!=''">
{{hintText}}
</text>
<view class="agreementWrp"> <view class="agreementWrp">
<checkbox-group @change="checkboxChange" style="width: 50rpx;"> <checkbox-group @change="checkboxChange" style="width: 50rpx;">
...@@ -82,6 +87,7 @@ ...@@ -82,6 +87,7 @@
os: 'android', os: 'android',
checked: false, checked: false,
agreementDto: null, agreementDto: null,
hintText: ''
} }
}, },
methods: { methods: {
...@@ -117,6 +123,7 @@ ...@@ -117,6 +123,7 @@
}, },
choosePack(item, index) { choosePack(item, index) {
this.selectedIndex = index; this.selectedIndex = index;
this.hintText = this.vipList[this.selectedIndex].trailRemark;
}, },
handleUnsign() { handleUnsign() {
if (this.agreementDto) { if (this.agreementDto) {
...@@ -274,7 +281,7 @@ ...@@ -274,7 +281,7 @@
display: inline-block; display: inline-block;
.active { .active {
background-color: #FEF8F5; background-color: #FEEDD0;
border: 4rpx solid #FDEADC !important; border: 4rpx solid #FDEADC !important;
} }
...@@ -406,4 +413,15 @@ ...@@ -406,4 +413,15 @@
} }
} }
} }
.trialStyle {
display: flex;
align-items: center;
font-size: 30rpx;
color: gainsboro;
margin: 20rpx;
word-wrap: break-word;
word-break: break-all;
white-space: pre-line;
}
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment