股票搜索和提交订单重复

pages/signup/signup.js

@@ -16,7 +16,8 @@ Page({
     phone:'',
     phcode:'',
     signup_name:'',
-    text:'获取验证码'
+    text:'获取验证码',
+    isLoading:0,
   },
 
   /**
@@ -113,13 +114,6 @@ Page({
           data.total_fee=this.data.info.player_price 
           data.signup_name=this.data.signup_name
       }
-      // if (!data.match_group) {
-      //   wx.showToast({
-      //     icon: 'none',
-      //     title: '请选择比赛分组',
-      //   })
-      //   return
-      // }
       if (data.phone.length<11){
         wx.showToast({
           icon: 'none',
@@ -134,37 +128,50 @@ Page({
         })
         return
       }
-      console.log(data,'aaaa')
+      if(this.data.isLoading == 1){
+        return
+      }
+
+      this.setData({
+        isLoading:1
+      })
+      wx.showLoading({
+        title: '正在提交订单',
+      })
       $api.wxpay(data).then(res=>{
-          if(res.data.data.free){
-            app.globalData.follow = 1
-            wx.showToast({
-              title: '报名成功',
-            })
-            wx.switchTab({
-              url: '../index/index'
-            });
-          }
-          var timestamp = Math.round(new Date().getTime() / 1000).toString();
-          var paySign = md5('appId=' + res.data.data.appid + '&nonceStr=' + res.data.data.nonce_str + '&package=prepay_id=' + res.data.data.prepay_id + '&signType=MD5&timeStamp=' + timestamp + '&key=' + res.data.data.key).toUpperCase();
-          console.log(paySign)
-            wx.requestPayment({
-              timeStamp: timestamp,
-              nonceStr: res.data.data.nonce_str,
-              package: 'prepay_id=' + res.data.data.prepay_id,
-              signType: 'MD5',
-              paySign: paySign,
-              success(res) { 
-                app.globalData.follow = 1
-                wx.showToast({
-                  title: '报名成功',
-                })
-                wx.switchTab({
-                  url: '../index/index'
-                });
-              },
-              fail(res) { console.log(res)}
-            })
+        wx.hideLoading()
+        this.setData({
+          isLoading:0
+        })
+        if(res.data.data.free){
+          app.globalData.follow = 1
+          wx.showToast({
+            title: '报名成功',
+          })
+          wx.switchTab({
+            url: '../index/index'
+          });
+        }
+        var timestamp = Math.round(new Date().getTime() / 1000).toString();
+        var paySign = md5('appId=' + res.data.data.appid + '&nonceStr=' + res.data.data.nonce_str + '&package=prepay_id=' + res.data.data.prepay_id + '&signType=MD5&timeStamp=' + timestamp + '&key=' + res.data.data.key).toUpperCase();
+        console.log(paySign)
+          wx.requestPayment({
+            timeStamp: timestamp,
+            nonceStr: res.data.data.nonce_str,
+            package: 'prepay_id=' + res.data.data.prepay_id,
+            signType: 'MD5',
+            paySign: paySign,
+            success(res) { 
+              app.globalData.follow = 1
+              wx.showToast({
+                title: '报名成功',
+              })
+              wx.switchTab({
+                url: '../index/index'
+              });
+            },
+            fail(res) { console.log(res)}
+          })
       })
   },
 

pages/stock/stock.js

@@ -28,6 +28,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log('112',options)
     this.setData({
       type:options.type,
       stock_date:options.stock_date
@@ -110,7 +111,7 @@ Page({
   toSearch(){
 
     wx.navigateTo({
-      url: '../stock/stock?type=2',
+      url: '../stock/stock?type=2&stock_date=' + this.data.stock_date,
     })
     
   },

pages/stock/stock.wxml

@@ -107,7 +107,7 @@
     </view>
   </view>
   <scroll-view  scroll-y='{{true}}' bindscrolltolower='next' style="background: #fff;padding:0 30rpx;">
-        <navigator hover-class="none" class="list" url="../stock/stock?id={{item.id}}&&date={{stock_date}}&type=1" wx:for='{{searchList}}'>
+        <navigator hover-class="none" class="list" url="../stock/stock?id={{item.id}}&stock_date={{stock_date}}&type=1" wx:for='{{searchList}}'>
           <image wx:if="{{index<3}}" class="number" mode="widthFix" src="../../xiao/{{index+1}}.png"></image>
           <text wx:else class="number">{{index+1}}</text>
           <view class="stock-name">