theo 3 vuotta sitten
vanhempi
commit
496bdf0e07

+ 7 - 7
backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -242,7 +242,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '190'],
                 ],
                 'REAL_PRICE' => [
-                    'header' => 'item pricing',//商品单价
+                    'header' => 'Item Pricing',//商品单价
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -270,7 +270,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => 'freight',//运费
+                    'header' => 'Freight',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -284,7 +284,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'TAX_RATE' => [
-                    'header' => 'Tax rate',//税率
+                    'header' => 'Tax Rate',//税率
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -316,18 +316,18 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => 'courier number',//快递单号
+                    'header' => 'Courier Number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => 'Shipping method',//发货方式
+                    'header' => 'Shipping Method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
                         return $row['EXPRESS_TYPE']==0 ? 'mailing ':' auto pick ';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => 'Member notes',//会员备注
+                    'header' => 'Member Notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -340,7 +340,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
                 'DELIVERY_STATUS' => null,
                 'DELIVERY_STATUS_NAME' => [
-                    'header' => 'Shipment status',//发货状态
+                    'header' => 'Shipment Status',//发货状态
                     'headerOther' => [
                         'width' => '110',
                     ],

+ 1 - 1
backendEle/src/components/FilterUser.vue

@@ -161,7 +161,7 @@ export default {
       pageSize: 20,
       filterCustomType: {
         decLevel: {
-          placeholder: '请选择报单级别',
+          placeholder: 'Select entry level', // 请选择报单级别
           labelField: 'LEVEL_NAME',
           valueField: 'ID',
           values: baseInfo.decLevels()

+ 1 - 1
backendEle/src/views/user/change-show-emp-level.vue

@@ -14,7 +14,7 @@
           <el-tag type="info">选择重置,前台会显示会员实际聘级</el-tag>
         </el-form-item>
         <el-form-item label="前台显示聘级" v-if="!form.isReset">
-          <el-select v-model="form.levelId" placeholder="请选择聘级">
+          <el-select v-model="form.levelId" placeholder="Select Employee Level"> <!-- 请选择聘级 -->
             <el-option v-for="(item,key) in allEmpLevel" :label="item.LEVEL_NAME" :value="item.ID"
                        :key="key"></el-option>
           </el-select>