From a39bd028e10558727ca234e738890f9d5c8370d8 Mon Sep 17 00:00:00 2001
From: GJW200011 <2399547226@qq.com>
Date: Sun, 26 Sep 2021 18:28:17 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=88=91=E7=9A=84=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E9=BB=98=E8=AE=A4=E5=9F=8E=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/discount/coupons/coupons.js        | 14 +++++++-----
 pages/user/discount/coupons/coupons.wxml      |  5 +++--
 pages/user/discount/coupons/coupons.wxss      | 11 ++++++++++
 .../discount_avilable/discount_avilable.js    | 22 +++++++++++++++----
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/pages/user/discount/coupons/coupons.js b/pages/user/discount/coupons/coupons.js
index 2decbc8..980e9e6 100644
--- a/pages/user/discount/coupons/coupons.js
+++ b/pages/user/discount/coupons/coupons.js
@@ -37,11 +37,15 @@ Page({
         icon: 'success',
         mask: true
       })
-      setTimeout(() => {
-        wx.redirectTo({
-          url: '/pages/user/discount/discount/discount',
-        })
-      }, 1000);
+      this.data.coupons_list[e.currentTarget.dataset.index].is_received = 1
+      this.setData({
+        coupons_list: this.data.coupons_list
+      })
+    })
+  },
+  mydiscount() {
+    wx.redirectTo({
+      url: '/pages/user/discount/discount/discount',
     })
   },
   /**
diff --git a/pages/user/discount/coupons/coupons.wxml b/pages/user/discount/coupons/coupons.wxml
index 6c6c2e0..068c5ed 100644
--- a/pages/user/discount/coupons/coupons.wxml
+++ b/pages/user/discount/coupons/coupons.wxml
@@ -15,7 +15,8 @@
       </view>
       <view class="_ln">有效期至{{item.end_date}}</view>
     </view>
-    <view class="_rightbtn" bindtap="collect_receive" data-id="{{item.id}}" wx:if="{{!item.is_received}}">领取</view>
+    <view class="_rightbtn" bindtap="collect_receive" data-id="{{item.id}}" data-index='{{index}}'  wx:if="{{!item.is_received}}">领取</view>
     <view class="_rightbtn received" wx:else>已领取</view>
   </view>
-</view>
\ No newline at end of file
+</view>
+<button class="_button" bindtap="mydiscount">我的优惠券</button>
\ No newline at end of file
diff --git a/pages/user/discount/coupons/coupons.wxss b/pages/user/discount/coupons/coupons.wxss
index e25cfa2..f33236f 100644
--- a/pages/user/discount/coupons/coupons.wxss
+++ b/pages/user/discount/coupons/coupons.wxss
@@ -55,4 +55,15 @@
   /* color: #181818; */
   font-size: 28rpx;
   margin-bottom: 10rpx;
+}
+._button{
+  position: fixed;
+  bottom: 100rpx;
+  width: 312rpx;
+  background: linear-gradient(90deg, #FF4284 0%, #FF1D42 100%);
+  border-radius: 44rpx;
+  color: #fff;
+  font-size: 28rpx;
+  left: 50%;
+  transform: translate(-50%,0);
 }
\ No newline at end of file
diff --git a/pages/user/discount/discount_avilable/discount_avilable.js b/pages/user/discount/discount_avilable/discount_avilable.js
index d058d93..ece7406 100644
--- a/pages/user/discount/discount_avilable/discount_avilable.js
+++ b/pages/user/discount/discount_avilable/discount_avilable.js
@@ -1,6 +1,7 @@
 
 import {
-  http
+  http,
+  location_city
 } from '../../../../utils/util'
 Page({
 
@@ -19,13 +20,26 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+
     let coupon_id = options.coupon_id
     let city_id = getApp().globalData.city_id
-    http("/api/v1/coupon-cycle","post",{coupon_id,city_id}).then(res=>{
-    this.setData({IP_list:res})
+
+    if (!city_id) {
+      // 默认北京写法
+      location_city().then(res => {
+        let city_id = res.city_info.city_id
+        getApp().globalData.city_id = city_id
+        this.getip_list(coupon_id, city_id)
+      })
+      return
+    }
+    this.getip_list(coupon_id, city_id)
+  },
+  getip_list(coupon_id, city_id) {
+    http("/api/v1/coupon-cycle", "post", { coupon_id, city_id }).then(res => {
+      this.setData({ IP_list: res })
     })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */