Merge refs/remotes/KXMH/develop into refs/heads/develop

app.json

@@ -25,6 +25,7 @@
     "pages/user/invoice/my_invoice/my_invoice",
     "pages/user/invoice/make_invoice/make_invoice",
     "pages/user/discount/discount/discount",
+    "pages/user/discount/coupons/coupons",
     "pages/user/discount/discount_ex/discount_ex",
     "pages/user/discount/discount_avilable/discount_avilable",
     "pages/user/auto_service/auto_service",

pages/index/city/selectcity.js

@@ -134,7 +134,8 @@ Page({
       ],
       swith_area:0,
       city: cityName,
-      city_id
+      city_id,
+      isGiftMarkShow:false
     })
     getApp().globalData.city_id = city_id
     prevPage.refresh_info(city_id)

pages/index/index/index.js

@@ -1,7 +1,8 @@
 // pages/index/index.js
 import {
     httpUtil,
-    location_city
+    location_city,
+    login_check
 } from '../../../utils/util'
 Page({
 
@@ -99,18 +100,18 @@ Page({
                 return
             }
             let key = wx.getStorageSync('key')
-            // console.log(key);
-            // console.log(key.indexOf(res.id));
-            if(key.indexOf(res.id)!=-1){
-                // console.log('我尊在');
+            if (key.indexOf(res.id) != -1) {
+                this.setData({
+                    screen_list: res,
+                    isGiftMarkShow: !this.data.isActionMarkShow
+                })
                 return
             }
             this.setData({
                 screen_list: res,
-                isActionMarkShow: true
+                isActionMarkShow: true,
             })
         })
-        wx.stopPullDownRefresh()
     },
     // 获取演出列表方法封装
     get_show_list(city_id, sort_type, page) {
@@ -155,17 +156,19 @@ Page({
             url: '/pages/opera/show/show_detail?cycle_id=' + e.currentTarget.dataset.cycle_id,
         })
     },
+    // 关闭广告
     cancle_mark(e) {
-        let id=e.currentTarget.dataset.id
-        let key=wx.getStorageSync('key')
-        if(key.indexOf(id)==-1){
-            wx.setStorageSync('key',[...key,id])
+        let id = e.currentTarget.dataset.id
+        let key = wx.getStorageSync('key')
+        if (key.indexOf(id) == -1) {
+            wx.setStorageSync('key', [...key, id])
         }
         this.setData({
             isActionMarkShow: false,
             isGiftMarkShow: true
         })
     },
+    // 礼物图标
     advertisementMark_show() {
         this.setData({
             isActionMarkShow: true,
@@ -173,6 +176,10 @@ Page({
         })
     },
     onlinkurl(e) {
+        // wx.navigateTo({
+        //     url: '/pages/user/discount/coupons/coupons',
+        // })
+        this.cancle_mark(e)
         let link_url = e.currentTarget.dataset.link_url
         wx.navigateTo({
             url: link_url
@@ -199,7 +206,6 @@ Page({
      * 生命周期函数--监听页面初次渲染完成
      */
     onReady: function () {
-        wx.setStorageSync('key',[])
     },
 
     /**
@@ -228,8 +234,8 @@ Page({
         // wx.reLaunch({
         //     url: '/pages/index/index/index'
         // })
+        wx.stopPullDownRefresh()
         this.refresh_info(getApp().globalData.city_id)
-        
     },
 
     /**

pages/index/index/index.wxml

@@ -23,7 +23,7 @@
 <!-- 开屏广告 -->
 <view class="markinfo" wx:if="{{isActionMarkShow}}" bindtouchstart='buttonStart' catchtouchmove='buttonMove'>
   <view class="fiexbox">
-    <view class="box" bind:tap="onlinkurl" data-link_url="{{screen_list.link_url}}">
+    <view class="box" bind:tap="onlinkurl" data-id="{{screen_list.id}}" data-link_url="{{screen_list.link_url}}">
       <image
         src="{{screen_list.img_url}}"
         ></image>

pages/user/discount/coupons/coupons.js

@@ -0,0 +1,98 @@
+// pages/user/discount/coupons/coupons.js
+import {
+  httpUtil,
+  location_city,
+  login_check
+} from '../../../../utils/util'
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    coupons_list: []
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.getcollect_list(options.activity_id)
+  },
+  getcollect_list(activity_id) {
+    console.log(activity_id);
+
+  },
+  collect_receive(e) {
+    
+    // if (login_check()) {
+    //   // let id = e.currentTarget.dataset.id
+      let status=1
+      let statusInfo=['success','error','error']
+      let statusTitle=['领取成功','已经领取','领取失败']
+      wx.showToast({
+        title: statusTitle[status],
+        icon: statusInfo[status],
+        mask: true
+      })
+      setTimeout(() => {
+        wx.hideToast()
+        if(status==0){
+          wx.redirectTo({
+            url: '/pages/user/discount/discount/discount',
+          })
+        }
+      }, 1000);
+
+    // }
+
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/user/discount/coupons/coupons.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"领取优惠券"
+
+}

pages/user/discount/coupons/coupons.wxml

@@ -0,0 +1,19 @@
+<view class="coupons">
+  <!-- <view wx:if="coupons_list.length==0" class="no_content">
+    <image class="img" src="/images/ui/none.png" />
+    <view class="warn">还未查询到可用优惠券</view>
+  </view> -->
+  <view class="coupon coupon_back">
+    <view class="_left">
+        <text style=" font-size: 30px;">¥</text>
+        <!-- {{item.subtract}} -->50
+      </view>
+      <view class="_right">
+        <!-- <view class="_ln">满{{item.full}}元可用</view> -->
+        <view class="_ln">满100元可用</view>
+        <view class="_ln">所有剧目可使用本张优惠券</view>
+        <view class="_ln">有效期至2021年10月1日</view>
+      </view>
+      <view class="_rightbtn" bindtap="collect_receive" data-id="2">领取</view>
+  </view>
+</view>