修改bug

bothyan · Jul 10, 2018 · 39d0ad8 · 39d0ad8
1 parent cbdeee5
commit 39d0ad8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 12 deletions.
diff --git a/h5/js/pay.js b/h5/js/pay.js
@@ -4,8 +4,8 @@
     var mainfun = {
         offernum:0,
         jineval:0,
-        paytext:"",
         inputval:"",
+        paytype:0,
         init:function(){
             this.handle();
         },
@@ -47,11 +47,20 @@
             });
 
             $("#paylays .choosetype").bind("click",function(){
+                 var type = $(this).attr("_type");
+                 mainfun.paytype = type;
                 $("#paylays .choosetype").find(".radio").removeClass("hover");
                 $(this).find(".radio").addClass("hover");
+
             });
             $("#pays").bind("click",function(){
-
+                //mainfun.paytype 0储蓄支付 1微信支付
+                var money = $("span.spanjines").eq(0).text();
+                if(money == ""){
+                    alert("请输入金额");
+                }
+                alert("支付类型："+mainfun.paytype)
+                alert("支付金额："+money)
             });
             $("#nav p").bind("click",function(){
                 var index = $(this).index();
@@ -81,7 +90,12 @@
             $("#keyboardlays .keyfirm").bind("click",function(){
                 $("#keyboardlays").animate({
                     "bottom":'-466px'
-                },300)
+                },300);
+
+                if(that.inputval.charAt(that.inputval.length - 1)== "."){
+                    that.inputval = parseInt(that.inputval);
+                    $("#jine").val(that.inputval);
+                }
                 var jine =  that.inputval - that.offernum;
                 if(jine>0){
                     $("span.spanjines").text(jine+"元"); 
@@ -98,9 +112,19 @@
 
             $("#keyboardlays .key").bind("click",function(){
                 var val = $(this).text();
-                that.inputval = that.inputval + val;
-                $("#jine").val(that.inputval);
+                var inputval = that.inputval + val;
+                if(val == "." && that.inputval.indexOf(".") == -1 && that.inputval !== ""){
+                    that.inputval = that.inputval + val;
+                    $("#jine").val(that.inputval);
+                }else if(/^\d+(\.\d{1,2})?$/.test(inputval)){
+                    that.inputval = inputval;
+                    $("#jine").val(inputval);
+                }
             });
+
+            $("#bindmember").bind("click",function(){
+                alert("绑定会员");
+            })
         }
     }
 

diff --git a/h5/pay.html b/h5/pay.html
@@ -19,7 +19,7 @@
     <span>￥</span>
   </div>
   <p class="add-remarks" id="addRemarks">添加备注</p>
-  <div class="offers">
+  <div class="offers" style="display: none">
     <p class="tips">以下优惠不可同享</p>
     <ul class="offers-ul" id="offers-ul">
         <li id="choosecoupon">
@@ -37,7 +37,7 @@
     </ul>
   </div>
   <p class="submit" id="submit">确认买单<span class="spanjines"></span></p>
-
+  <p class="submit" id="bindmember">绑定会员</p>
   <!-- 黑色透明蒙层 -->
   <div class="overlays" id="overlays"></div> 
 
@@ -145,13 +145,13 @@
   <!-- 支付弹层 --> 
   <div class="paylays" id="paylays">  
     <p class="title"><span>×</span>确认支付</p>
-    <div class="chuzhi choosetype">
+    <div class="chuzhi choosetype" _type="0">
       <span class="word">储</span>  
       <p class="jine">储值(余额300.32元)</p>
       <span class="radio hover"></span>
     </div>
     <p class="ptitle">支付方式</p>
-    <div class="wxbox choosetype">
+    <div class="wxbox choosetype" _type="1">
       <span class="wxicon"></span>
       <p class="jine">微信支付</p>
       <span class="radio"></span>

diff --git a/xfz/pages/my/my.wxml b/xfz/pages/my/my.wxml
@@ -35,12 +35,10 @@
     <view class="myhd">
         <image src="../../images/my/icon1.png" style="width: 34rpx;height: 30rpx;"></image>
         <text>我的红包</text>
-        <image class="arrow-right" src="../../images/arrow.png"></image>
     </view>
     <view class="myhd">
         <image src="../../images/my/icon2.png" style="width: 31rpx;height: 29rpx;"></image>
         <text>我的计次卡</text>
-        <image class="arrow-right" src="../../images/arrow.png"></image>
     </view>
     <view class="myhd" bindtap="toconsume">
         <image src="../../images/my/icon3.png" style="width: 30rpx;height: 30rpx;"></image>
@@ -55,6 +53,5 @@
     <view class="myhd">
         <image src="../../images/my/icon4.png" style="width: 30rpx;height: 24rpx;"></image>
         <text>我的发票</text>
-        <image class="arrow-right" src="../../images/arrow.png"></image>
     </view>
 </view>