Merge branch 'master' of http://git.ichunt.net/semour/semour_admin

resources/views/admin/pages/order-page.blade.php

@@ -83,12 +83,22 @@
         font-size: 16px;
         font-weight: bold;
     }
+
+    @if($info["lang"] == 2)
+    .en-form .layui-inline .layui-form-label {
+        width: 169px;
+    }
+
+    .en-form .layui-inline .layui-input-block {
+        margin-left: 169px;
+    }
+    @endif
 </style>
 
 <section class="order-page">
     <input type="hidden" id="order_id" value="{{$info['receiveInfo']['order_id']}}">
     <!--基本信息-->
-    <div class="layui-card">
+    <div class="layui-card en-form">
         <div class="layui-card-header">{{admin_trans("order.order_page.基本信息")}}</div>
         <div class="layui-card-body layui-form">
             <div class="layui-inline">
@@ -416,7 +426,7 @@
                     <div class="layui-form-mid">{{$info["settlementInfo"]["order_user_pay_type_cn"]}} </div>
                     <div class="show" style="display: none">
                         <input type="radio" name="order_user_pay_type" value="1" title="Paypal" @if($info["settlementInfo"]["order_user_pay_type"] == "1") checked @endif >
-                        <input type="radio" name="order_user_pay_type" value="2"   @if($info["settlementInfo"]["order_user_pay_type"] == "2") checked @endif  title="TT">
+                        <input type="radio" name="order_user_pay_type" value="2" @if($info["settlementInfo"]["order_user_pay_type"] == "2") checked @endif  title="TT">
                     </div>
                 </div>
             </div>
@@ -439,9 +449,9 @@
     </div>
 </script>
 <script>
-    var translation= <?php echo json_encode($info["translation"]); ?>;
-    var lang = <?php echo $info["lang"]; ?>;
-    var lang_str = "<?php echo $info["lang_str"]; ?>";
+  var translation = <?php echo json_encode($info["translation"]); ?>;
+  var lang = <?php echo $info["lang"]; ?>;
+  var lang_str = "<?php echo $info["lang_str"]; ?>";
 </script>
 <script type="text/javascript" src="/assets/js/order/index.js?v={{time()}}"></script>