Merge branch 'master' into skk/feat/signIn-new

components/couponWrap/index.wxml

@@ -11,8 +11,14 @@
                             <text class="_unit">元</text>
                         </block>
                         <block wx:elif="{{item.type.value == 'D'}}">
-                            <text>{{nums.formatDiscount(item)}}</text>
-                            <text class="_unit">折</text>
+                          <block wx:if="{{nums.formatDiscount(item) == 0}}">
+                            <text style="font-size: 44rpx;font-weight: 350;">兑换券</text>
+                            <text class="_unit"></text>
+                          </block>
+                          <block wx:else>
+                              <text>{{nums.formatDiscount(item)}}</text>
+                              <text class="_unit">折</text>
+                          </block>
                         </block>
                       </view>
                       <view class="coupon-condition">{{nums.formatLeastCost(item)}}</view>

pages/integral/integral.js

@@ -92,7 +92,8 @@ Page({
     // 获取优惠券列表
     this.getCouponList()
     if(getMobileCache() != ''){
-        this.findIntegral()
+        // this.findIntegral()
+        this.getphoneClick()
     }  
   },
 
@@ -410,6 +411,7 @@ getphoneClick() {
                 let dateNum = Math.round(new Date().getTime() / 1000).toString()
                 if (wx.getStorageSync('orderDetails') != '' && this.data.mobile === JSON.parse(wx
                         .getStorageSync('orderDetails')).mobile) {
+                            console.log(dateNum - JSON.parse(wx.getStorageSync('orderDetails')).date)
                     if (dateNum - JSON.parse(wx.getStorageSync('orderDetails')).date <= 120) {
                         const data = JSON.parse(wx.getStorageSync('orderDetails'))
                         if (dateNum - data.date < 60) {
@@ -436,6 +438,8 @@ getphoneClick() {
                                 activeNum: 0,
                             })
                         }
+                    }else{
+                        wx.setStorageSync('orderDetails', null)
                     }
                 }
             } 
@@ -636,6 +640,7 @@ paymentClick() {
                             date: Math.round(new Date().getTime() / 1000).toString(),
                             mobile: getMobileCache()
                         },
+                       
                     })
                     wx.setStorageSync('orderDetails', JSON.stringify(this.data.active1obj))
                     if (res.data.step === 1) {
@@ -663,10 +668,10 @@ paymentClick() {
 
             }).catch(error=>{
                 console.log('zhifu')
-                console.log(error)
+                console.log(error.data.message)
                 wx.showToast({
                     icon: 'none',
-                    title: '请一分钟后再选择'
+                    title: error.data.message
                 })
             })
         }
@@ -846,6 +851,10 @@ paymentClick() {
             }).catch(error=>{
                 console.log('chongxin')
                 console.log(error)
+                wx.showToast({
+                    icon: 'none',
+                    title: error.data.message
+                })
             });
         } else {
             if (this.data.activeNum === 0 && this.data.codeName === '重新获取验证码') {

pages/integral/integral.wxss

@@ -521,7 +521,7 @@ page {
   position: fixed;
   width: 600rpx;
   height: 590rpx;
-  top: 35% !important;
+  top: 30% !important;
   left: 50%;
   transform: translate(-50%, -50%);
   background-color: white;
@@ -562,9 +562,9 @@ page {
 }
 
 .payment-code-input {
-  margin: 0 auto;
-  margin-top: 10rpx;
-  margin-bottom: 16rpx;
+  /* margin: 0 auto; */
+  /* margin-top: 10rpx; */
+  /* margin-bottom: 16rpx; */
   box-sizing: border-box;
   border-bottom: 2rpx solid #DCDFE6;
   text-align: center;

project.private.config.json

@@ -234,6 +234,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/activityInfo/activityInfo",
+          "query": "activityId=o2QmBRGmPk-187",
+          "scene": null,
+          "launchMode": "default"
         }
       ]
     }