kevin_zhangl 3 gadi atpakaļ
vecāks
revīzija
3abf8e5fb2

+ 34 - 34
frontendApi/modules/v1/controllers/ShopController.php

@@ -458,31 +458,31 @@ EOT;
         $orderBase = <<<ORDER
             <table border="1" style="table-layout: fixed; padding: 10px 20px;" width="100%">
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员编号</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member code</td>
                     <td width="70%">{$userId}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员名字</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member name</td>
                     <td width="70%">{$userName}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员地址</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member address</td>
                     <td width="70%">{$address}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员电话</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member phone</td>
                     <td width="70%">{$mobile}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单编号</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Order code</td>
                     <td width="70%">{$orderSn}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单日期</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Creation time</td>
                     <td width="70%">{$orderAt}</td>
                 </tr>
                 <tr>
-                    <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">订单明细</td>
+                    <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">Order detail</td>
                     <td class="bg"></td>
                 </tr>
             </table>
@@ -498,7 +498,7 @@ ORDER;
             <html lang="en">
             <head>
                 <meta charset="UTF-8" />
-                <title>订单详情</title>
+                <title>Order detail</title>
                 <style>
                     table {
                         border-collapse: collapse;
@@ -518,22 +518,22 @@ ORDER;
             </head>
             <body>
                 <div class="content">
-                    <p style="text-align: center; font-weight: bold; font-size: 22px;"><b>订单详情</b><br></p>
+                    <p style="text-align: center; font-weight: bold; font-size: 22px;"><b>Order detail</b><br></p>
                     <div>
                         <div style="display: block; width: 100%;">
                             {$orderBase}
                             
                             <table border="1" width="100%" style="padding: 10px 20px; text-align: center;">
                                 <tr>
-                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">商品编号</th>
-                                    <th width="30%" style="font-size: 14px; font-weight: bold; text-align: center;">商品名称</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">数量</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">单价</th>
-                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">总价</th>
+                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
+                                    <th width="30%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Quantity</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
+                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>
                                 </tr>
                                 {$orderDetails}
                                 <tr>
-                                    <td colspan="2">合计</td>
+                                    <td colspan="2">Total</td>
                                     <td>{$orderNums}</td>
                                     <td></td>
                                     <td>{$orderAmount}</td>
@@ -545,11 +545,11 @@ ORDER;
                             <table width="100%" style="border: none; padding: 10px 20px; text-align: center;">
                                 <tr style="border: none;">
                                     <td width="70%" style="border: none;"></td>
-                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">签名:</td>
+                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Signature:</td>
                                 </tr>
                                 <tr style="border: none;">
                                     <td width="70%" style="border: none;"></td>
-                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">日期:</td>
+                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Date:</td>
                                 </tr>
                             </table>
                         </div>
@@ -674,31 +674,31 @@ EOT;
         $orderBase = <<<ORDER
             <table border="1" style="table-layout: fixed; padding: 10px 20px;" width="100%">
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员编号</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member code</td>
                     <td width="70%">{$userId}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员名字</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member name</td>
                     <td width="70%">{$userName}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员地址</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member address</td>
                     <td width="70%">{$address}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员电话</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member phone</td>
                     <td width="70%">{$mobile}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单编号</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Order code</td>
                     <td width="70%">{$orderSn}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单日期</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Creation time</td>
                     <td width="70%">{$orderAt}</td>
                 </tr>
                 <tr>
-                    <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">订单明细</td>
+                    <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">Order detail</td>
                     <td class="bg"></td>
                 </tr>
             </table>
@@ -714,7 +714,7 @@ ORDER;
             <html lang="en">
             <head>
                 <meta charset="UTF-8" />
-                <title>订单详情</title>
+                <title>Order detail</title>
                 <style>
                     table {
                         border-collapse: collapse;
@@ -734,22 +734,22 @@ ORDER;
             </head>
             <body>
                 <div class="content">
-                    <p style="text-align: center; font-weight: bold; font-size: 22px;"><b>订单详情</b><br></p>
+                    <p style="text-align: center; font-weight: bold; font-size: 22px;"><b>Order detail</b><br></p>
                     <div>
                         <div style="display: block; width: 100%;">
                             {$orderBase}
                             
                             <table border="1" width="100%" style="padding: 10px 20px; text-align: center;">
                                 <tr>
-                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">商品编号</th>
-                                    <th width="30%" style="font-size: 14px; font-weight: bold; text-align: center;">商品名称</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">数量</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">单价</th>
-                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">价</th>
+                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
+                                    <th width="30%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Quantity</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
+                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount价</th>
                                 </tr>
                                 {$orderDetails}
                                 <tr>
-                                    <td colspan="2">合计</td>
+                                    <td colspan="2">Total</td>
                                     <td>{$orderNums}</td>
                                     <td></td>
                                     <td>{$orderAmount}</td>
@@ -761,11 +761,11 @@ ORDER;
                             <table width="100%" style="border: none; padding: 10px 20px; text-align: center;">
                                 <tr style="border: none;">
                                     <td width="70%" style="border: none;"></td>
-                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">签名:</td>
+                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Signature:</td>
                                 </tr>
                                 <tr style="border: none;">
                                     <td width="70%" style="border: none;"></td>
-                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">日期:</td>
+                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Date:</td>
                                 </tr>
                             </table>
                         </div>

+ 2 - 2
frontendEle/src/views/shop/index.vue

@@ -34,13 +34,13 @@
                           </template>
                       </el-table-column>
 
-                      <el-table-column label="税率" prop="TAX_RATE"><!--税率-->
+                      <el-table-column label="Tax rate" prop="TAX_RATE"><!--税率-->
                           <template slot-scope="scope">
                               <span>{{ Math.round(scope.row.TAX_RATE * 100) / 100 }}</span>
                           </template>
                       </el-table-column>
 
-                      <el-table-column label="税额"><!--税额-->
+                      <el-table-column label="Tax"><!--税额-->
                           <template slot-scope="scope">
                               <span>{{ Math.round((scope.row.SELL_PRICE - scope.row.SELL_PRICE / (1 + scope.row.TAX_RATE / 100)) * 100) / 100 }}</span>
                           </template>