From fb82934f9cd86b4e2feaaaa880458c75e70ab690 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 8 Aug 2022 10:15:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods-category/goods-category.vue | 4 ++--
 pages/plugins/coupon/index/index.vue    | 7 ++++++-
 pages/plugins/coupon/user/user.vue      | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 7fc64709..b26c7360 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -45,7 +45,7 @@
                                 <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_item_two_index == -1 ? 'nav-active cr-main border-color-main' : '')" :data-index="nav_active_index" :data-itemtwoindex="-1" :data-itemthreeindex="-1" @tap="nav_event">
                                     <text>全部</text>
                                 </view>
-                                <block v-if="(data_content || null) != null && data_content.items.length > 0">
+                                <block v-if="(data_content || null) != null && (data_content.items || null) != null && data_content.items.length > 0">
                                     <block v-for="(item, index) in data_content.items" :key="index">
                                         <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_item_two_index == index ? 'nav-active cr-main border-color-main' : '')" :data-index="nav_active_index" :data-itemtwoindex="index" :data-itemthreeindex="-1" @tap="nav_event">
                                             <text>{{item.name}}</text>
@@ -59,7 +59,7 @@
                             <scroll-view :scroll-y="true" class="ht-auto goods-list" :scroll-top="scroll_top" @scroll="scroll_event" @scrolltolower="scroll_lower" lower-threshold="30">
                                 <view class="pr">
                                     <!-- 三级导航 -->
-                                    <view v-if="(data_three_content || null) != null && data_three_content.items.length > 0" class="word-list scroll-view-horizontal">
+                                    <view v-if="(data_three_content || null) != null && (data_three_content.items || null) != null && data_three_content.items.length > 0" class="word-list scroll-view-horizontal">
                                         <scroll-view :scroll-x="true">
                                             <view :class="'word-icon dis-inline-block text-size-sm round padding-top-xs padding-bottom-xs padding-left padding-right '+((nav_active_item_three_index == -1) ? 'bg-main-light br-main-light cr-main' : 'br-gray cr-gray')" :data-index="nav_active_index" :data-itemtwoindex="nav_active_item_two_index" :data-itemthreeindex="-1" @tap="nav_event">全部</view>
                                             <block v-for="(item, index) in data_three_content.items" :key="index">
diff --git a/pages/plugins/coupon/index/index.vue b/pages/plugins/coupon/index/index.vue
index c92028ad..c5a014d8 100644
--- a/pages/plugins/coupon/index/index.vue
+++ b/pages/plugins/coupon/index/index.vue
@@ -1,7 +1,7 @@
 <template>
     <view>
         <view v-if="(data_base || null) != null && (data_base.banner_images || null) != null" class="padding-horizontal-main padding-top-main">
-            <image class="wh-auto dis-block border-radius-main" :src="data_base.banner_images" mode="widthFix"></image>
+            <image class="wh-auto dis-block border-radius-main" :src="data_base.banner_images" mode="widthFix" :data-value="data_base.url || ''" @tap="url_event"></image>
         </view>
 
         <!-- 优惠劵列表 -->
@@ -226,6 +226,11 @@
                         }
                     }
                 }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
             }
         }
     };
diff --git a/pages/plugins/coupon/user/user.vue b/pages/plugins/coupon/user/user.vue
index c5d8e79e..e5f19994 100644
--- a/pages/plugins/coupon/user/user.vue
+++ b/pages/plugins/coupon/user/user.vue
@@ -21,7 +21,7 @@
                                     <text v-if="(item.coupon.desc || null) != null" class="desc cr-gray">{{item.coupon.desc}}</text>
                                 </view>
                                 <view v-if="(item.coupon.use_limit_type_name || null) != null" class="base-tips cr-base single-text">{{item.coupon.use_limit_type_name}}</view>
-                                <view class="base-time cr-gray single-text">{{item.time_start_text}} 至{{item.time_end_text}}</view>
+                                <view class="base-time cr-gray single-text">{{item.time_start}} 至{{item.time_end}}</view>
                             </view>
                             <navigator :url="home_page_url" open-type="switchTab" hover-class="none">
                                 <view class="v-right fr" :style="'background:' + item.coupon.bg_color_value + ';'">
@@ -67,7 +67,7 @@
                                     <text v-if="(item.coupon.desc || null) != null" class="desc cr-gray">{{item.coupon.desc}}</text>
                                 </view>
                                 <view v-if="(item.coupon.use_limit_type_name || null) != null" class="base-tips cr-base single-text">{{item.coupon.use_limit_type_name}}</view>
-                                <view class="base-time cr-gray single-text">过期 {{item.time_end_text}}</view>
+                                <view class="base-time cr-gray single-text">过期 {{item.time_end}}</view>
                             </view>
                             <view class="v-right fr">
                                 <text class="circle"></text>