czg_team/cashier_wx
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
YeMingfei666
2025-09-28 09:48:12 +08:00
parent 87fafdbf9a f066bd171b
commit 766d7f5b3b
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/coupon-modal.vue
View File

@@ -40,9 +40,7 @@
</view>
<view class="time">
<view class="row">
<text class="t">
有效期至：{{ dayjs(val.validStartTime).format('YYYY.M.D') }}-{{ dayjs(val.validEndTime).format('YYYY.M.D') }}
</text>
<text class="t">有效期至：{{ dayjs(val.validStartTime).format('YYYY.M.D') }}-{{ dayjs(val.validEndTime).format('YYYY.M.D') }}</text>
</view>
</view>
</view>
@@ -235,9 +233,17 @@ onMounted(() => {
}
}
.title {
width: 280upx;
font-size: 28upx;
color: #fff;
font-weight: bold;
/* 禁止换行 */
white-space: nowrap;
/* 超出部分隐藏 */
overflow: hidden;
/* 显示省略号 */
text-overflow: ellipsis;
/* 确保元素有明确的宽度限制（可继承父元素宽度或手动设置） */
}
.time {
display: flex;
@@ -249,7 +255,7 @@ onMounted(() => {
display: flex;
align-items: center;
.t {
font-size: 10px;
font-size: 18upx;
color: #c50914;
}
}
@@ -266,6 +272,7 @@ onMounted(() => {
justify-content: center;
border-radius: 50%;
background-color: #fe413d;
box-shadow: 0 8upx 8upx rgba(254, 65, 61, 0.6);
.t {
color: #fff;
font-size: 20upx;

4
pages/user/coupon.vue
View File

@@ -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
});

4
pages/user/user.vue
View File

@@ -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>