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

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

@@ -110,7 +110,7 @@
     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].realPrice+'</span><input type="text" class="cprice" value="'+chose[i].name+'" name="xiangmu[]" disabled/>';
+        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);
         choses += '</div>'
@@ -118,7 +118,7 @@
     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].realPrice+'</span><input type="text" class="tprice" value="'+taocan[t].name+'" name="taocan[]" disabled/>';
+        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>'