sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev

master
gongfuxiang 2023-11-04 10:28:12 +08:00
parent 783a705ee6 e7882e1b46
commit 27d321ab61
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/coupon-card/coupon-card.vue
View File

@ -11,8 +11,8 @@
</view>
<view class="card-right flex-1 flex-width flex-row jc-sb align-c" :class="propStatusType > 3 ? 'failure cr-grey-9' : ''">
<view class="card-info flex-1 flex-width padding-right-main" :class="propStatusType > 3 ? 'failure cr-grey-9' : 'cr-black'">
<view class="title text-size-lg single-text">{{ propData.use_limit_type_name }}</view>
<view v-if="propData.time_start && propData.time_end" class="date text-size-md cr-grey-9 single-text padding-top-sm">{{ propData.time_start }}-{{ propData.time_end }}</view>
<view class="title text-size-lg single-text" :class="propData.time_start">{{ propData.use_limit_type_name }}</view>
<view v-if="propStartTime && propEndTime" class="date text-size-xs cr-grey-9 single-text padding-top-sm">{{ propStartTime }}-{{ propEndTime }}</view>
<view v-if="propIsProgress && propData.process_data" class="progress padding-top-sm flex-row align-c">
<block v-if="propData.process_data.type == 0">
<text class="text-size-xs cr-grey-9"> {{ propData.process_data.msg }} </text>
@ -116,6 +116,15 @@
type: String,
default: '去使用',
},
// 优惠券有效期
propStartTime:{
type: String,
default: '',
},
propEndTime:{
type: String,
default: '',
}
},
data() {
return {

10
pages/plugins/coupon/user/user.vue
View File

@ -12,21 +12,21 @@
<!-- 未使用 -->
<block v-if="(data_list.not_use || null) != null && data_list.not_use.length > 0 && nav_tabs_value == 'not_use'">
<block v-for="(item, index) in data_list.not_use" :key="index">
<component-poupon-card :prop-data="item.coupon" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-poupon-card>
<component-coupon-card :prop-data="item.coupon" :prop-start-time="item.time_start" :prop-end-time="item.time_end" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-coupon-card>
</block>
</block>
<!-- 已使用 -->
<block v-if="(data_list.already_use || null) != null && data_list.already_use.length > 0 && nav_tabs_value == 'already_use'">
<block v-for="(item, index) in data_list.already_use" :key="index">
<component-poupon-card :prop-data="item.coupon" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-poupon-card>
<component-coupon-card :prop-data="item.coupon" :prop-start-time="item.time_start" :prop-end-time="item.time_end" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-coupon-card>
</block>
</block>
<!-- 已过期 -->
<block v-if="(data_list.already_expire || null) != null && data_list.already_expire.length > 0 && nav_tabs_value == 'already_expire'">
<block v-for="(item, index) in data_list.already_expire" :key="index">
<component-poupon-card :prop-data="item.coupon" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-poupon-card>
<component-coupon-card :prop-data="item.coupon" :prop-start-time="item.time_start" :prop-end-time="item.time_end" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-coupon-card>
</block>
</block>
</view>
@ -43,7 +43,7 @@
const app = getApp();
import componentNoData from '../../../../components/no-data/no-data';
import componentBottomLine from '../../../../components/bottom-line/bottom-line';
import componentPouponCard from '@/components/coupon-card/coupon-card.vue';
import componentCouponCard from '@/components/coupon-card/coupon-card.vue';
const coupon_static_url = app.globalData.get_static_url('coupon', true);
export default {
@ -79,7 +79,7 @@
components: {
componentNoData,
componentBottomLine,
componentPouponCard,
componentCouponCard,
},
props: {},