优惠券v2

pages/order/components/coupon/index.js

@@ -73,14 +73,6 @@ Component({
     
         let listData = []
         if (this.properties.sourceFrom == 'cart') {
-            postList.forEach(v=>{
-                listData.push({
-                    sku_id: v.sku.id,
-                    price: v.sku.price,
-                    sell_price: v.sku.price,
-                    num: v.productNum,
-                })
-            })
             ticketList.forEach(v=>{
                 listData.push({
                     sku_id: v.sku.id,
@@ -101,6 +93,14 @@ Component({
                 })
             }
         }
+        postList.forEach(v=>{
+            listData.push({
+                sku_id: v.sku.id,
+                price: v.sku.price,
+                sell_price: v.sku.price,
+                num: v.productNum,
+            })
+        })
 
         commonApi.user_post('coupon/use_max_coupon_listv2',{
           money:this.data.money,

pages/order/coupon/index.js

@@ -8,6 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+      noUseList: [],
     list:[],
     moreFlag:true,
 
@@ -26,15 +27,8 @@ Page({
     let signleProduct = app.globalData.product || null
 
     let listData = []
+    // 门票类
     if (sourceFrom == 'cart') {
-        postList.forEach(v=>{
-            listData.push({
-                sku_id: v.sku.id,
-                price: v.sku.price,
-                sell_price: v.sku.price,
-                num: v.productNum,
-            })
-        })
         ticketList.forEach(v=>{
             listData.push({
                 sku_id: v.sku.id,
@@ -55,6 +49,16 @@ Page({
             })
         }
     }
+    // 特产类
+    postList.forEach(v=>{
+        listData.push({
+            sku_id: v.sku.id,
+            price: v.sku.price,
+            sell_price: v.sku.price,
+            num: v.productNum,
+        })
+    })
+
     this.setData({
         productList: listData
     })
@@ -70,8 +74,11 @@ Page({
       res.data.map(item=>{
         item.selected = false;
       })
+
+
       this.setData({
-        list:res.data
+        list:res.data.filter(x=>x.can_use),
+        noUseList: res.data.filter(x=>!x.can_use),
       })
       this.getMaxC(options)
     })

pages/order/coupon/index.wxml

@@ -1,6 +1,7 @@
 <!--pages/order/coupon/index.wxml-->
 <title title="优惠券"></title>
-<view wx:if="{{list.length>0}}">
+<view >
+<view wx:if="{{list.length>0}}" class="coupon-title">可使用红包 <text class="couon-date">{{list.length}}张</text></view>
 <view class="coupon-item-box" wx:for="{{list}}">
     <view class="coupon-item" >
         <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
@@ -13,6 +14,29 @@
         </view>
         <view wx:if="{{item.can_use}}" class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
         <view class="couon-date" wx:else>不可用</view>
+
+    </view>
+    <view class="no-reason" wx:if="{{!item.can_use}}">
+        <view style="color: #D62828;margin-bottom: 8rpx;">不可用原因</view>
+        <view>{{item.reason}}</view>
+    </view>
+</view>
+
+<view wx:if="{{noUseList.length>0}}" class="coupon-title">不可使用红包 <text class="couon-date">{{noUseList.length}}张</text></view>
+<view class="coupon-item-box" wx:for="{{noUseList}}">
+    <view class="coupon-item" >
+        <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
+        <view class="money1" wx:else>
+        {{item.activity.fold}}
+        </view>
+        <view class="coupon-info">
+        <view>{{item.activity.name}}</view>
+        <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
+        </view>
+        <view wx:if="{{item.can_use}}" class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
+        <view class="couon-date" wx:else>不可用</view>
+
+        <view class="cover-no-use" wx:if="{{!item.can_use}}"></view>
     </view>
     <view class="no-reason" wx:if="{{!item.can_use}}">
         <view style="color: #D62828;margin-bottom: 8rpx;">不可用原因</view>
@@ -25,7 +49,7 @@
 
   <view class="btn" bindtap="submit">确定</view>
 </view>
-<view class="common-empty" wx:if="{{list.length==0}}" style="z-index:-1;top:0">
+<view class="common-empty" wx:if="{{list.length==0&&noUseList.length==0}}" style="z-index:-1;top:0">
   <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
   <view>暂无优惠券</view>
 </view>

pages/order/coupon/index.wxss

@@ -16,7 +16,7 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-
+    position: relative;
   height: 136rpx;
 }
 .coupon-item .money {
@@ -84,4 +84,21 @@ page {
     color: #666;
     font-size: 24rpx;
     box-sizing: border-box;
+}
+
+.cover-no-use{
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+    height: 100;
+    opacity: 0.5;
+    background: white;
+}
+.coupon-title{
+    padding: 26rpx 26rpx 0;
+    width: 100%;
+    box-sizing: border-box;
 }

pages/order/scene/index.js

@@ -379,7 +379,7 @@ changeDate: function (e) {
     this.totalPrice(e.detail.price)
     if (this.data.coupon) {
       wx.showToast({
-        title: '订单价格发生变化，请重新选择优惠券',
+        title: '订单时间发生变化，请重新选择优惠券',
         icon: 'none'
       })
       this.setData({

utils/https.js

@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"