优化英文版订单

platform-admin/src/main/resources/dev/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=root
-jdbc.password=diaoyun666
+#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=root
+#jdbc.password=diaoyun666
 
-#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-#jdbc.username: root
-#jdbc.password: Diaoyunnuli.8
+jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.username: root
+jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30

platform-admin/src/main/resources/prod/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=root
-jdbc.password=diaoyun666
+#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=root
+#jdbc.password=diaoyun666
 
-#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-#jdbc.username: root
-#jdbc.password: Diaoyunnuli.8
+jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.username: root
+jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30 

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderEnlist.html

@@ -146,10 +146,10 @@
     <div  v-show="showOrderDesc":model="orderBasicVo"   style="height: 100%;">
         <br/>
         <Steps :current="currentStatus" >
-            <Step title="The buyer place the order" ></Step>
-            <Step title="The buyer payment"></Step>
-            <Step title="The delivery"></Step>
-            <Step title="Confirm the goods"></Step>
+            <Step title="Place the order" ></Step>
+            <Step title="Payment"></Step>
+            <Step title="Delivery"></Step>
+            <Step title="Confirm receiving goods"></Step>
             <Step title="Comments"></Step>
         </Steps>
         <section class="order-time">
@@ -254,7 +254,7 @@
                     <th> commodity price </th>
                     <th> quantity of goods </th>
 <!--                    <th> product link </th>-->
-                    <th> daigou status </th>
+                    <th> shipped status </th>
                     <th> logistics number </th>
                 </tr>
             </thread>

platform-admin/src/main/webapp/js/sys/tbcforderEnList.js

@@ -6,9 +6,9 @@ $(function () {
             //显示字段
             {label: 'orderId', name: 'orderId', index: 'order_id', key: true, hidden: true},
             {label: 'order number', name: 'orderNo', index: 'order_no'},
-            {label: 'username ', name: 'userName', index: 'user_name'},
+            {label: 'customer ', name: 'userName', index: 'user_name'},
             {label: 'order time', name: 'orderTime', index: 'order_time'},
-            {label: 'payment', name: 'payWayCode', index: 'pay_way_code'},
+            {label: 'method of payment', name: 'payWayCode', index: 'pay_way_code'},
             {
                 label: 'order amount',
                 name: 'realityPay',
@@ -286,14 +286,14 @@ let vm = new Vue({
         ],
         basicInfoData: [
             {
-                type: 'order number',
+                type: 'Order number',
                 data: 18
             },
             {
-                type: 'username',
+                type: 'Customer',
                 data: 18
             }, {
-                type: 'Automatically determine receipt time',
+                type: 'Default delivery time',
                 data: 18
             }, {
                 type: 'Source of the order',
@@ -386,7 +386,7 @@ let vm = new Vue({
         ],
         costColumns: [
             {
-                title: 'Cost type',
+                title: 'Fee type',
                 key: 'costtype'
             },
             {
@@ -399,7 +399,7 @@ let vm = new Vue({
                 costtype: 'Goods together',
                 constnum: 1,
             }, {
-                costtype: 'postage',
+                costtype: 'freight charge',
                 constnum: 1,
             }, {
                 costtype: 'taxes and dues',