Branch_ccc #10

Merged
root merged 22 commits from Branch_ccc into master 2024-11-13 11:11:55 +08:00
Showing only changes of commit 6c85309ff4 - Show all commits

View File

@ -17,13 +17,19 @@
</view> </view>
<view class="c" v-if="!userInfo.activate">您与众悦e家商场的第101天</view> <view class="c" v-if="!userInfo.activate">您与众悦e家商场的第101天</view>
<view class="b" v-if="!userInfo.activate">开通即享会员权益</view> <view class="b" v-if="!userInfo.activate">开通即享会员权益</view>
<view class="b" v-if="userInfo.activate">SVIP会员 {{ sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd') }} 到期</view> <view class="b" v-if="userInfo.activate">
<text v-if="userInfo.cardName != '永久'">
SVIP会员
{{ sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd') }} 到期</text>
<text class="b" v-if="userInfo.cardName == '永久'">永久SVIP会员</text>
</view>
</view> </view>
</view> </view>
<view class="r" v-if="!userInfo.activate"> <view class="r" v-if="!userInfo.activate && userInfo.cardName != '永久'">
<text>立即开通</text> <text>立即开通</text>
</view> </view>
<view class="r" v-if="userInfo.activate"> <view class="r" v-if="userInfo.activate && userInfo.cardName != '永久'">
<text>续费会员</text> <text>续费会员</text>
</view> </view>
</view> </view>
@ -55,12 +61,13 @@
</view> </view>
</view> </view>
<view class="vip-kt"> <view class="vip-kt" v-if="userInfo.cardName != '永久'">
<view class="top"> <view class="top">
<!-- <text class="t1" v-if="userInfo.activate == 1">试用会员</text> --> <!-- <text class="t1" v-if="userInfo.activate == 1">试用会员</text> -->
<text class="t1" v-if="!userInfo.activate">开通会员</text> <text class="t1" v-if="!userInfo.activate">开通会员</text>
<text class="t2" v-if="userInfo.activate">有效期至</text> <text class="t2">有效期至</text>
<text class="t3" v-if="userInfo.activate">{{ timeAute }}</text> <text class="t3" v-if="timeAute">{{ timeAute }}</text>
<text class="t3" v-else>{{ sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd') }}</text>
</view> </view>
<scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120"> <scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120">
<view id="demo1" @click="vipFun(index,item.name)" class="scroll-view-item_H uni-bg-red" <view id="demo1" @click="vipFun(index,item.name)" class="scroll-view-item_H uni-bg-red"
@ -73,13 +80,14 @@
</scroll-view> </scroll-view>
</view> </view>
<view class="vip-text"> <view class="vip-text" v-if="userInfo.cardName != '永久'">
购买即视为同意<text class="ts" @click="sheep.$router.redirect('/pages/user/user_vip/agreement')">会员用户协议</text> 购买即视为同意<text class="ts"
@click="sheep.$router.redirect('/pages/user/user_vip/agreement')">会员用户协议</text>
</view> </view>
<!-- <view class="vip-btn" @click="beclick()" v-if="!userInfo.activate"> <!-- <view class="vip-btn" @click="beclick()" v-if="!userInfo.activate">
立即试用 立即试用
</view> --> </view> -->
<view class="vip-btn" @click="beclick()"> <view class="vip-btn" @click="beclick()" v-if="userInfo.cardName != '永久'">
立即开通 立即开通
</view> </view>
</view> </view>
@ -106,7 +114,7 @@
const vipList2 = ref([]); const vipList2 = ref([]);
const valVip = ref(88888); const valVip = ref(88888);
const nameVip = ref([]); const nameVip = ref([]);
const timeAute = ref(sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd')); const timeAute = ref();
// //
function getList() { function getList() {
request({ request({
@ -129,14 +137,18 @@
function vipFun(index, name) { function vipFun(index, name) {
valVip.value = index valVip.value = index
data.cardName = name data.cardName = name
timeAute.value = sheep.$helper.timeFormat(vipList.value[index].cardExpirationTime, 'yyyy-mm-dd'); if (name == '永久') {
timeAute.value = '永久会员';
} else {
timeAute.value = sheep.$helper.timeFormat(vipList.value[index].cardExpirationTime, 'yyyy-mm-dd');
}
console.log(userInfo.cardExpirationTime,"userInfo.cardExpirationTime") console.log(userInfo.cardExpirationTime, "userInfo.cardExpirationTime")
} }
// beclick // beclick
function beclick() { function beclick() {
if( data.cardName == '' ) { if (data.cardName == '') {
sheep.$helper.toast('请选择') sheep.$helper.toast('请选择')
return; return;
}; };