Merge branch 'master' of ssh://git.9026.com:2212/richod/dcj

resources/views/web/order/result.blade.php

@@ -277,54 +277,18 @@
 
             });
         })
-        var data_single = "{{$data_single}}";
-            data_single = data_single.replace(/"/g,'\"');
-            data_single = data_single.replace(/&lt;/g,'\<');
-            data_single = data_single.replace(/&gt;/g,'\>');
-            var chose = JSON.parse(data_single);
-            console.log(chose)
+            var data_single_check = "{{$data_single_check}}";
+                data_single_check = data_single_check.replace(/&quot;/g,'\"');
+                data_single_check = data_single_check.replace(/&lt;/g,'\<');
+                data_single_check = data_single_check.replace(/&gt;/g,'\>');
+                var chosec = JSON.parse(data_single_check);
 
 
-            var data_combo = "{{$data_combo}}";
-            data_combo = data_combo.replace(/&quot;/g,'\"');
-            data_combo = data_combo.replace(/&lt;/g,'\<');
-            data_combo = data_combo.replace(/&gt;/g,'\>');
-            var taocan = JSON.parse(data_combo);
-            console.log(taocan)
-            var zonger = 0;
-
-            var cl = chose.length
-            var tl = taocan.length
-            console.log(cl)
-            for (var i = 0; i < cl; i++) {
-                choses += '<div class="col-lg-12 quest">'
-                choses += '<label class="col-xs-12 col-lg-4">'
-                choses += '<span class="price" style="color:red">'+chose[i].price+'</span><input type="text" class="cprice" value="'+chose[i].name+'" name="xiangmu[]" disabled/>';
-                choses += '</label>';
-                zonger += Number(chose[i].price);
-                choses += '</div>'
-            }
-            for (var t = 0; t < tl; t++) {
-                taocans += '<div class="col-lg-12 quest">'
-                taocans += '<label class="col-xs-12 col-lg-4">'
-                taocans += '<span class="price" style="color:red">'+taocan[t].youhui+'</span><input type="text" class="tprice" value="'+taocan[t].name+'" name="taocan[]" disabled/>';
-                taocans += '</label>';
-                taocans += '<div class="neirong">'+taocan[t].neirong+'</div>';
-                taocans += '</div>'
-                zonger += Number(taocan[t].youhui);
-            }
-            var data_singlec = "{{$data_single_check}}";
-                data_singlec = data_singlc.replace(/&quot;/g,'\"');
-                data_singlec = data_singlec.replace(/&lt;/g,'\<');
-                data_singlec = data_singlec.replace(/&gt;/g,'\>');
-                var chosec = JSON.parse(data_singlec);
-
-
-                var data_comboc = "{{$data_combo_check}}";
-                data_comboc = data_comboc.replace(/&quot;/g,'\"');
-                data_comboc = data_comboc.replace(/&lt;/g,'\<');
-                data_comboc = data_comboc.replace(/&gt;/g,'\>');
-                var taocanc = JSON.parse(data_comboc);
+                var data_combo_check = "{{$data_combo_check}}";
+                data_combo_check = data_combo_check.replace(/&quot;/g,'\"');
+                data_combo_check = data_combo_check.replace(/&lt;/g,'\<');
+                data_combo_check = data_combo_check.replace(/&gt;/g,'\>');
+                var taocanc = JSON.parse(data_combo_check);
                 console.log(chosec,taocanc)
 
                 var cl = chosec.length