merge fixed

pages/index/index.axml

@@ -111,7 +111,7 @@
                 <text class="scan-coupon-text-fail-desr">{{convertCouponMsg}}</text>
                 <view class="failure-operation">
                      <button class="close-use-coupon"  type="ghost"  size="default"  onTap="convertCouponClose">关闭</button>
-                     <button class="again-use-coupon"  type="primary" size="default"  onTap="convertCoupon">重新兑换</button>
+                     <button class="again-use-coupon"  type="primary" size="default"  onTap="onHomeExchangeClicked">重新兑换</button>
                 </view> 
             </view>
         </view>

pages/index/index.js

@@ -225,14 +225,15 @@ Page({
   /**首页相关 */
   /**立即收款 */
   onHomeCashierImmediatelyClicked() {
-
+     this.setData({scene:3}) 
   },
 
   /**
    * 兑换
    */
   onHomeExchangeClicked() {
-
+     this.setData({convertCouponState:1})
+     this.sendConvertCouponToFront(1)
   },
 
   /**
@@ -353,10 +354,7 @@ Page({
     });
   },
 
-  //直接收银
-  directPayment(e) {
-    this.setData({scene:3}) 
-  },
+ 
   //发生直接收银事件
   sendPaymentToFront(payment) {
     var commonRequest = {
@@ -582,11 +580,7 @@ Page({
     })
   },
 
- //兑换券
- convertCoupon(e){
-    this.setData({convertCouponState:1})
-    this.sendConvertCouponToFront(1)
- }, 
+
 
 //兑换券界面关闭
  convertCouponClose(e){