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

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

@@ -265,8 +265,8 @@
         <div class="col-xs-0 col-lg-2"></div>
         <div class="col-xs-12 col-lg-8 main" style="margin: 0 auto;margin-top: 10px;">
             <div class="col-xs-12 col-lg-12 imgbox" style="width:100%;margin-bottom:20px;display: flex;height: auto;" >
-                <img  class="col-xs-3 col-lg-3" src="{{cdn_asset('/assets/img/logo.jpg')}}">
-                <img  class="col-xs-9 col-lg-9" src="{{cdn_asset('/assets/img/top.jpg')}}" alt="">
+                <img  class="col-xs-3 col-lg-2" src="{{cdn_asset('/assets/img/logo.jpg')}}">
+                <img  class="col-xs-9 col-lg-10" src="{{cdn_asset('/assets/img/top.jpg')}}" alt="">
             </div>
             
             <form class="bs-example bs-example-form main" role="form">

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

@@ -134,8 +134,8 @@
                      <input type="hidden" name="id" value="{{ $id }}">
                      <input type="hidden" id="total_price" name="total_price" value=""/>
                 <div class="top" style="width: 90%;margin: 0 auto;display: flex;margin-bottom: 40px;">
-                    <img  class="col-xs-3 col-lg-3" src="{{cdn_asset('/assets/img/logo.jpg')}}">
-                    <img  class="col-xs-9 col-lg-9" src="{{cdn_asset('/assets/img/top.jpg')}}" alt="">
+                    <img  class="col-xs-3 col-lg-2" src="{{cdn_asset('/assets/img/logo.jpg')}}">
+                    <img  class="col-xs-9 col-lg-10" src="{{cdn_asset('/assets/img/top.jpg')}}" alt="">
                 </div>
                 <div class="tishi" style="border-bottom: 1px solid #ccc;">
                     <h4>温馨提示：</h4>

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

@@ -91,6 +91,7 @@
     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_combo = "{{$data_combo}}";
@@ -98,6 +99,7 @@
     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
@@ -108,19 +110,19 @@
     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 += '<span class="price" style="color:red">'+chose[i].realPrice+'</span><input type="text" class="cprice" value="'+chose[i].name+'" name="xiangmu[]" disabled/>';
         choses += '</label>';
-        zonger += Number(chose[i].price);
+        zonger += Number(chose[i].realPrice);
         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 += '<span class="price" style="color:red">'+taocan[t].realPrice+'</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 class="neirong">'+taocan[t].content+'</div>';
         taocans += '</div>'
-        zonger += Number(taocan[t].youhui);
+        zonger += Number(taocan[t].realPrice);
     }
     // for (var i = 0; i < cl; i++) {
     //     taocans += '<div class="col-lg-12 quest">'