Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into ymf
This commit is contained in:
@@ -38,7 +38,7 @@
|
||||
<text class="t">{{ item.name }}</text>
|
||||
</view>
|
||||
<view class="view time">
|
||||
<text class="t">{{ dayjs(item.effectStartTime).format('YYYY.M.D') }} - {{ dayjs(item.effectEndTime).format('YYYY.M.D') }}</text>
|
||||
<text class="t">有效期至:{{ dayjs(item.effectStartTime).format('YYYY.M.D') }} - {{ dayjs(item.effectEndTime).format('YYYY.M.D') }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn" v-if="item.status == 0" @click="toUseHandle(item)">
|
||||
@@ -197,7 +197,7 @@ async function getCouponList() {
|
||||
userId: uni.cache.get('userInfo').id,
|
||||
name: querForm.value.searchValue,
|
||||
status: statusList.value[querForm.value.statusActiveIndex].value,
|
||||
shopId: querForm.value.shopId ? querForm.value.shopId : uni.cache.get('shopId'),
|
||||
// shopId: querForm.value.shopId ? querForm.value.shopId : uni.cache.get('shopId'),
|
||||
page: list.page,
|
||||
size: list.size
|
||||
});
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
<view class="vip u-m-t-40">
|
||||
<view class="u-flex u-flex-between u-m-t-20">
|
||||
<view class="u-flex">
|
||||
<image style="width: 50rpx;height: 37rpx;" src="/static/icon/vip.png" mode="aspectFill">
|
||||
<image style="width: 50rpx;height: 40rpx;" src="/static/icon/vip.png" mode="aspectFill">
|
||||
</image>
|
||||
<text class="color-333 font-14 u-m-l-20">会员</text>
|
||||
</view>
|
||||
@@ -101,7 +101,7 @@
|
||||
</view>
|
||||
<view class="my_list_item_right u-flex ">
|
||||
<text v-if="item.type=='score'" class="font-12 ">{{userInfo.accountPoints || 0}}</text>
|
||||
<text v-else-if="item.type=='my_coupon'" class="font-12 ">{{userInfo.couponNum || 0}}</text>
|
||||
<!-- <text v-else-if="item.type=='my_coupon'" class="font-12 ">{{userInfo.couponNum || 0}}</text> -->
|
||||
<text class="font-12 color-999" v-else>查看</text>
|
||||
<u-icon class="u-m-t-2" name="arrow-right" color="#999999" size="12"></u-icon>
|
||||
</view>
|
||||
|
||||
Reference in New Issue
Block a user