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

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

@@ -112,7 +112,7 @@
         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].realPrice);
+        zonger += Number(chose[i].price);
         choses += '</div>'
     }
     for (var t = 0; t < tl; t++) {
@@ -120,9 +120,9 @@
         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].content+'</div>';
+        taocans += '<div class="neirong">'+taocan[t].neirong+'</div>';
         taocans += '</div>'
-        zonger += Number(taocan[t].realPrice);
+        zonger += Number(taocan[t].youhui);
     }
     // for (var i = 0; i < cl; i++) {
     //     taocans += '<div class="col-lg-12 quest">'