From 5b3f6fea228b58ea482b5ecffbd2b38262e3ba78 Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Mon, 4 Jan 2021 14:14:09 +0800
Subject: [PATCH] 优惠券使用说明

---
 packageA/pages/quan_list/quan_list.wxml | 4 +++-
 packageA/pages/quan_pro/quan_pro.wxml   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml
index b843c58..02b5e62 100644
--- a/packageA/pages/quan_list/quan_list.wxml
+++ b/packageA/pages/quan_list/quan_list.wxml
@@ -17,7 +17,9 @@
        <!-- 右边 -->
         <view class="right fs24 co_g pding" style="background-image:url({{iurl}}/miniapp/images/coupon_img/white.png); position: relative">
               <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view>
-              <view style="margin-top: 5rpx">所有门店通用</view>
+
+              <view style="margin-top: 5rpx" wx:if="{{item.coupon_remark!=null && item.coupon_remark!=''}}">{{item.coupon_remark}}</view>
+              <view style="margin-top: 5rpx" wx:else>所有门店通用</view>
               <view wx:if="{{item.endtype==0}}">有效期              
                  <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
                   <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至
diff --git a/packageA/pages/quan_pro/quan_pro.wxml b/packageA/pages/quan_pro/quan_pro.wxml
index 219c326..234985d 100644
--- a/packageA/pages/quan_pro/quan_pro.wxml
+++ b/packageA/pages/quan_pro/quan_pro.wxml
@@ -13,9 +13,10 @@
                          <image style="width: 70rpx; height: 70rpx; vertical-align: middle; margin-right: 20rpx" src="{{iurl}}/miniapp/images/coupon_img/coupon_logo.png"></image>
                          {{q_data.name}}
                      </view>
-                     <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx"><view class="t_circle"></view>
+                     <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx"><view class="t_circle"></view>                     
                              <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text>
                              <text wx:else>仅限{{q_data.useobjectname}}使用</text>
+                             <text>{{q_data.coupon_remark}}</text>
                      </view>
                 </view>
                 <view class="right" style="margin-right: 80rpx;">
--
libgit2 0.21.4