Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/pages/index/index.js

@@ -202,8 +202,9 @@ Page({
     if (!this.data.sendCode){
       return;
     }
-    app.wxRequest(app.globalData.urlRoot + "captcha/sendCaptcha", { mobile:this.data.subscribeData.mobile},res=>{
-      console.log(res);
+    this.data.sendCode = false;
+    app.wxRequest(app.globalData.urlRoot + "captcha/sendCaptcha", { mobile: this.data.subscribeData.mobile }, res => {
+      this.data.sendCode = true;
       if (res.code == 200) {
         this.countDown();
         wx.showToast({
@@ -213,7 +214,6 @@ Page({
         this.setData({
           verificationCode:60
         })
-        this.data.sendCode = false;
       }else{
         wx.showToast({
           title: res.msg,
@@ -268,7 +268,12 @@ Page({
       })
       return;
     }
+    if (!this.data.sendCode) {
+      return;
+    }
+    this.data.sendCode = false;
     app.wxRequest(app.globalData.urlRoot + "userInfo/submitOrderInfo", this.data.subscribeData, res => {
+      this.data.sendCode = true;
       if (res.code == 200) {
         wx.showToast({
           title: '预约成功'

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -238,7 +238,9 @@ Page({
     if (!this.data.sendCode) {
       return;
     }
-    app.wxRequest(app.globalData.urlRoot + "captcha/sendCaptcha", { mobile: this.data.subscribeData.mobile}, res => {
+    this.data.sendCode = false;
+    app.wxRequest(app.globalData.urlRoot + "captcha/sendCaptcha", { mobile: this.data.subscribeData.mobile }, res => {
+      this.data.sendCode = true;
       if (res.code == 200) {
         this.countDown();
         wx.showToast({
@@ -248,7 +250,6 @@ Page({
         this.setData({
           verificationCode: 60
         })
-        this.data.sendCode = false;
       } else {
         wx.showToast({
           title: res.msg,
@@ -303,7 +304,12 @@ Page({
       })
       return;
     }
+    if (!this.data.sendCode) {
+      return;
+    }
+    this.data.sendCode = false;
     app.wxRequest(app.globalData.urlRoot + "userInfo/submitOrderInfo", this.data.subscribeData, res => {
+      this.data.sendCode = true;
       if (res.code == 200) {
         wx.showToast({
           title: '预约成功'

496_dongfengqichen/pages/prizes/prizes.js

@@ -63,5 +63,10 @@ Page({
    */
   onShareAppMessage: function () {
     return app.sharePack();
+  },
+  backPage: function () {
+    wx.navigateBack({
+      delta:1
+    })
   }
 })

496_dongfengqichen/pages/prizes/prizes.wxml

@@ -68,7 +68,7 @@
       </view>
     </view>
     <view class="immediateFetching">
-      <view class="prizeTitle" style="margin-top:0;">立即抓取</view>
+      <view class="prizeTitle" bindtap="backPage" style="margin-top:0;">立即抓取</view>
     </view>
   </view>
   <tabBar></tabBar>