完成合并并解决冲突

xuxueyang

2024-09-14 92a4759e242421f578d463e457fcea33893c6c2a

 sub_pages/customer/coupon/coupon-self.vue

@@ -34,6 +34,9 @@
                     {{item.effectiveEnd&&('有效期至 '+item.effectiveEnd) || '长久有效'}}
                  </view>
               </view>
               <view class="img-out">
						
               </view>
            </view>
            <view class="tip">
               <span