合并分支 '1iuzhen' 到 'master'

订单添加、编辑、列表修改



查看合并请求 !215

@@ -275,7 +275,7 @@ class MemberSalesController extends HomeBaseController
             $mobile = '';
             $v['options'] = json_decode($v['options'],true);
             foreach ($v['options'] as $ko=>$vo) {
-                if($vo['id'] == 10) {
+                if($vo['id'] == 49) {
                     $mobile = $vo['user_choose'];
                 }
             }
@@ -323,7 +323,7 @@ class MemberSalesController extends HomeBaseController
                 $mobile = '';
                 $v['options'] = json_decode($v['options'],true);
                 foreach ($v['options'] as $ko=>$vo) {
-                    if($vo['id'] == 10) {
+                    if($vo['id'] == 49) {
                         $mobile = $vo['user_choose'];
                     }
                 }

@@ -262,6 +262,8 @@
 
     // 提交订单
     $('.submit_btn').click(function() {
+        var btn = $(this);
+        var text = btn.text();
         if(submit_common('.form_data',form_data)) {
             allow_submit = false;
             var data = {
@@ -275,6 +277,9 @@
                 type: "POST",
                 data: data,
                 dataType: "JSON",
+                beforeSend: function(){
+                    btn.text(text+'中...').prop('disabled', true);
+                },
                 success: function (res) {
                     console.log(res);
                     if (res.code == 1) {
@@ -309,6 +314,7 @@
                 },
                 complete: function(XHR,TS) {
                     allow_submit = true;
+                    btn.text(text).prop('disabled', false);
                 }
             });
         }

@@ -229,27 +229,27 @@
 
     // 提交订单
     $('.submit_btn').click(function() {
+        var btn = $(this);
+        var text = btn.text();
         if(submit_common('.form_data',form_data)) {
             allow_submit = false;
             var data = {
                 id: "{$typeInfo.id}",
                 param: form_data.join(',')
             };
-            // console.log(data);
-            // _common("{:url('submit_form')}",data,[$('.num').html(res.data),$('.mask').show()])
             $.ajax({
                 url: "{:url('submit_form')}",
                 type: "POST",
                 data: data,
                 dataType: "JSON",
+                beforeSend: function(){
+                    btn.text(text+'中...').prop('disabled', true);
+                },
                 success: function (res) {
                     // console.log(res);
                     if (res.code == 1) {
                         $('.num').html(res.data);
                         $('.mask').show()
-                        // setTimeout(function() {
-                        //     window.location.href = res.url;
-                        // },1000);
                     } else {
                         _error(res.msg);
                     }
@@ -259,10 +259,10 @@
                 },
                 complete: function(XHR,TS) {
                     allow_submit = true;
+                    btn.text(text).prop('disabled', false);
                 }
             });
         }
-        // $('.mask').show()
     });
 
     $('.order_long').click(function() {