Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into ymf

user/vip/vip.vue

@@ -11,14 +11,14 @@
 				<view class="u-p-l-22" style="position: relative">
 					<view class="shop-name">{{ shopInfo.shopName }}</view>
 					<view class="lv">{{ memberLevel ? memberLevel.name : '' }}</view>
-					<view class="time">
-						<text>{{ memberLevel ? memberLevel.endTime : '' }}到期</text>
-						<text>{{ memberLevel ? memberLevel.memberName : '' }}</text>
+					<view class="time" v-if="shopUserInfo.openType == 'PAY'">
+						<text>{{ memberLevel ? dayjs(memberLevel.endTime).format('YYYY-MM-DD') : '' }}到期</text>
+						<text style="margin-left: 8px;">{{ memberLevel ? memberLevel.memberName : '' }}</text>
 					</view>
 					<view class="rule u-m-t-40 u-flex u-flex-between u-flex-y-center">
 						<text class="color-one">
 							<text class="font-16">{{ memberLevel ? memberLevel.experience : '' }}</text>
-							<text class="font-12">经验值</text>
+							<text class="font-12">成长值</text>
 						</text>
 						<text class="desc" @click="modelShow('等级说明')">等级说明</text>
 					</view>
@@ -61,7 +61,7 @@
 			<view class="color-666 font-14 u-m-t-16">每充值1元获得{{ state.rechargeReward || '' }}成长值</view>
 		</view>
 
-		<button class="buy-btn" @click="toXufei">立即续费</button>
+		<button class="buy-btn" @click="toXufei" v-if="shopUserInfo.openType == 'PAY'">立即续费</button>
 
 		<up-popup :show="model.show" mode="center" round="16rpx" close-on-click-overlay @close="model.show = false">
 			<view class="model-box">
@@ -78,6 +78,7 @@
 </template>
 
 <script setup>
+import dayjs from 'dayjs';
 import { onLoad } from '@dcloudio/uni-app';
 import * as vipApi from '@/common/api/market/vip.js';
 import { APIusershopInfodetail, APIshopUserInfo } from '@/common/api/member.js';