admingit/WechatOwnerService
1
0
Fork 0
mirror of https://gitee.com/java110/WechatOwnerService.git synced 2026-02-23 21:36:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
java110 2021-12-29 19:41:58 +08:00
commit 36ca853a3b
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages.json
View File

@ -634,6 +634,14 @@
"navigationBarTitleText": "优惠卷", "navigationBarTitleText": "优惠卷",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
{
"path" : "pages/myAccount/myCoupons",
"style" :
{
"navigationBarTitleText": "我的优惠券",
"enablePullDownRefresh": false
}
} }
], ],

31
pages/myAccount/myCoupons.vue
View File

@ -10,9 +10,15 @@
</view> </view>
<view class="content"> <view class="content">
<!-- 未使用 --> <!-- 未使用 -->
<<<<<<< HEAD
<view> <view>
<view class="list" v-if="active==0"> <view class="list" v-if="active==0">
<view class="listItem" v-for="(item, index) in couponList" :key="index"> <view class="listItem" v-for="(item, index) in couponList" :key="index">
=======
<view >
<view class="list" v-if="active==0">
<view class="listItem" v-for="(item, index) in couponList" :key="index">
>>>>>>> 2a32c560597e4407f5574f9fb1f10ca92b52e79e
<image src="/static/images/coupon.png" class="coupon"></image> <image src="/static/images/coupon.png" class="coupon"></image>
<view class="box"> <view class="box">
<view class="price"> <view class="price">
@ -33,6 +39,7 @@
</view> </view>
<!-- 已使用 --> <!-- 已使用 -->
<<<<<<< HEAD
<view class="list expired" v-if="active==1"> <view class="list expired" v-if="active==1">
<view class="listItem" v-for="(item, index) in useCouponList" :key="index"> <view class="listItem" v-for="(item, index) in useCouponList" :key="index">
<image src="/static/images/coupon.png" class="coupon"></image> <image src="/static/images/coupon.png" class="coupon"></image>
@ -48,14 +55,38 @@
</view> </view>
<view class="usestate"> <view class="usestate">
您已使用过此优惠券。 您已使用过此优惠券。
=======
<view v-for="(itemsData, i) in list">
<view class="list expired" v-if="active==1">
<view class="listItem" v-for="(item, index) in couponList" :key="index">
<image src="/static/images/coupon.png" class="coupon"></image>
<view class="box">
<view class="price">
<view class="icon">¥</view>
<view class="volum">{{ item.actualPrice }}</view>
</view>
<view class="descripe">
<view class="shop-name">{{ item.couponName }}</view>
<view class="text">无门槛</view>
<view class="expire">{{ item.createTime }}-{{ item.endTime+'00：00' }}</view>
</view>
<view class="usestate" >
您已使用过此优惠券。
</view>
>>>>>>> 2a32c560597e4407f5574f9fb1f10ca92b52e79e
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 已过期 --> <!-- 已过期 -->
<view class="list expired" v-if="active==2"> <view class="list expired" v-if="active==2">
<<<<<<< HEAD
<view> <view>
<view class="listItem" v-for="(item, index) in tmpCouponList" :key="index"> <view class="listItem" v-for="(item, index) in tmpCouponList" :key="index">
=======
<view >
<view class="listItem" v-for="(item, index) in tmpCouponList" :key="index">
>>>>>>> 2a32c560597e4407f5574f9fb1f10ca92b52e79e
<image src="/static/images/coupon.png" class="coupon"></image> <image src="/static/images/coupon.png" class="coupon"></image>
<view class="box"> <view class="box">
<view class="price"> <view class="price">

BIN
static/images/coupon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB