Merge branch 'feature/york-1365-i18n-inpro' of http://18.167.157.193:1026/guanli/ngds into feature/theo-translate

# Conflicts:
#	backendApi/modules/v1/models/lists/shop/DecOrderList.php
#	backendApi/modules/v1/models/lists/shop/GoodsList.php
#	backendApi/modules/v1/models/lists/shop/PackageList.php
#	backendEle/src/views/shop/goods-add.vue
#	backendEle/src/views/shop/index.vue
#	backendEle/src/views/shop/package-add.vue
#	backendEle/src/views/shop/package.vue
#	frontendApi/config/menu.php

backendApi/config/menu.php

@@ -11,7 +11,7 @@ return [
 //        'class' => 'list-header',
 //    ],
     'dashboard'=>[
-        'name'=>'控制台',
+        'name'=>'Console',//控制台
         'class' => '',
         'icon'=>'el-icon-guide',
         'controller'=>'dashboard',
@@ -26,7 +26,7 @@ return [
         ]
     ],
     'shop'=>[
-        'name'=>'商城管理',
+        'name'=>'Products Management',//商城管理
         'class' => '',
         'icon'=>'el-icon-goods',
         'controller'=>'shop',
@@ -34,14 +34,14 @@ return [
         'routePath'=>'shop',
         'show'=>1,
         'child'=>[
-            ['name'=>'商品列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'index', 'routePath'=>'shop/index', 'show'=>1,],
+            ['name'=>'Products list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'index', 'routePath'=>'shop/index', 'show'=>1,],//商品列表
             // 新添加的商品操作  --- stat
             ['name'=>'添加商品', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-add', 'routePath'=>'shop/goods-add', 'show'=>0,],
             ['name'=>'编辑商品', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-edit', 'routePath'=>'shop/goods-edit', 'show'=>0,],
             ['name'=>'删除商品', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-delete', 'routePath'=>'shop/goods-delete', 'show'=>0,],
             // 新添加的商品操作 ---stop
             ['name'=>'商品列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-list-export', 'routePath'=>'shop/goods-list-export', 'show'=>0,],
-            ['name'=>'套餐管理', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],
+            ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
             ['name'=>'报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],
             ['name'=>'报单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list-export', 'routePath'=>'shop/dec-order-list-export', 'show'=>0,],
             ['name'=>'订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],

backendApi/modules/v1/models/lists/shop/DecOrderList.php

@@ -16,7 +16,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
      * @return string
      */
     public function getListName(){
-        return '订单列表';
+        return 'Entry list';//报单列表
     }
 
     /**
@@ -52,35 +52,35 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
             $this->columns = [
                 'ID' => null,
                 'DEC_SN' => [
-                    'header' => '报单编号',
+                    'header' => 'Entry code',//报单编号
                     'headerOther' => ['width' => '200'],
                 ],
                 'ORDER_SN' => [
-                    'header' => '订单编号',
+                    'header' => 'Order code',//订单编号
                     'headerOther' => ['width' => '200'],
                 ],
                 'USER_NAME' => [
-                    'header' => '报单人',
+                    'header' => 'Member code',//报单人
                     'headerOther' => ['width' => '150'],
                 ],
                 'TO_USER_NAME' => [
-                    'header' => '被报单人',
+                    'header' => 'Entry Member code',//被报单人
                     'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 'ID_CARD' => [
-                    'header' => '会员身份证号',
+                    'header' => 'Membership id number',//会员身份证号
                     'headerOther' => ['width' => '150'],
                 ],
                 'MOBILE' => [
-                    'header' => '会员手机号',
+                    'header' => 'Member mobile Phone Number',//会员手机号
                     'headerOther' => ['width' => '150'],
                 ],
                 'DEC_LV_NAME' => [
-                    'header' => '会员级别',
+                    'header' => 'Member Levels',//会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -92,15 +92,15 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'DEC_USER_NAME' => [
-                    'header' => '报单中心编号',
+                    'header' => 'Entry code',//报单中心编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'DEC_REAL_NAME' => [
-                    'header' => '报单中心姓名',
+                    'header' => 'Entry name',//报单中心姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 'DEC_AMOUNT' => [
-                    'header' => '报单金额',
+                    'header' => 'Entry amount',//报单金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -114,7 +114,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'DEC_PV' => [
-                    'header' => '报单BV',
+                    'header' => 'Entry BV',//报单BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -128,7 +128,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'PAID_WALLET' => [
-                    'header' => '付款钱包',
+                    'header' => 'Payment wallet',//付款钱包
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -137,7 +137,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'REMARK' => [
-                    'header' => '备注',
+                    'header' => 'Note',//备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -149,7 +149,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'REC_USER_NAME' => [
-                    'header' => '报单时开拓者',
+                    'header' => '报单时开拓者',//报单时开拓者
                     'headerOther' => ['width' => '150'],
                 ],
                 'REC_REAL_NAME' => [
@@ -186,23 +186,23 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'delivery method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mail' : 'Self Pick-up';//邮寄：自提
                     },
                 ],
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Current Period',//期数
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation Time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -211,7 +211,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'UPDATED_AT' => [
-                    'header' => '更新时间',
+                    'header' => 'Update Time',//更新时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['UPDATED_AT'],
@@ -232,21 +232,21 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'DEC_SN'=> ['name'=> '报单编号'],
-                'ORDER_SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '报单人'],
-                'TO_USER_NAME'=> ['name'=> '被报单人'],
-                'REAL_NAME'=> ['name'=> '会员姓名'],
-                'DEC_REAL_NAME'=> ['name'=> '报单中心姓名'],
-                'ID_CARD'=> ['name'=> '会员身份证号'],
-                'MOBILE'=> ['name'=> '会员手机号'],
-                'DEC_LV_NAME'=> ['name'=> '会员级别', 'other'=> 'decLevel'],
-                'DEC_AMOUNT'=> ['name'=> '报单金额'],
-                'DEC_PV'=> ['name'=> '报单报单BV'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'REC_USER_NAME'=> ['name'=> '报单时开拓者'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=> 'date'],
-                'UPDATED_AT'=> ['name'=> '更新时间', 'other'=> 'date'],
+                'DEC_SN'=> ['name'=> 'Entry code'],//报单编号
+                'ORDER_SN'=> ['name'=> 'Order code'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//报单人
+                'TO_USER_NAME'=> ['name'=> 'Entry Member code'],//被报单人
+                'REAL_NAME'=> ['name'=> 'Member name'],//会员姓名
+                'DEC_REAL_NAME'=> ['name'=> 'Entry name'],//报单中心姓名
+                'ID_CARD'=> ['name'=> 'Membership id number'],//会员身份证号
+                'MOBILE'=> ['name'=> 'Member mobile Phone Number'],//会员手机号
+                'DEC_LV_NAME'=> ['name'=> 'Member Levels', 'other'=> 'decLevel'],//会员级别
+                'DEC_AMOUNT'=> ['name'=> 'Entry amount'],//报单金额
+                'DEC_PV'=> ['name'=> 'Entry BV'],//报单BV
+                'PERIOD_NUM'=> ['name'=> 'Current Period'],//期数
+                'REC_USER_NAME'=> ['name'=> '报单时开拓者'],//报单时开拓者
+                'CREATED_AT'=> ['name'=> 'Creation Time', 'other'=> 'date'],//创建时间
+                'UPDATED_AT'=> ['name'=> 'Update Time', 'other'=> 'date'],//更新时间
             ];
         }
         return $this->filterTypes;

backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -13,7 +13,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
      * @return string
      */
     public function getListName(){
-        return '商品列表';
+        return 'Products list';//商品列表
     }
 
     /**
@@ -38,11 +38,11 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
             $this->columns = [
                 'ID' => null,
                 'GOODS_NAME' => [
-                    'header' => '商品名称',
+                    'header' => 'Products name',//商品名称
                     'headerOther' => ['width' => '200'],
                 ],
                 'GOODS_NO' => [
-                    'header' => '商品编号',
+                    'header' => 'Products code',//商品编号
                     'headerOther' => ['width' => '200'],
                 ],
                 // 'TYPE' => [
@@ -53,7 +53,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                 //     'headerOther' => ['width' => '150'],
                 // ],
                 'SELL_DISCOUNT' => [
-                    'header' => '商品折扣',
+                    'header' => 'Products discount',//商品折扣
                     'value' => function($row) {
                         $discount = 0;
                         if ($row['TYPE'] == 1) {
@@ -69,7 +69,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'GIFT_TYPE' => [
-                    'header' => '商品类型',
+                    'header' => 'Products type',//商品类型
                     'value' => function($row){
                         $giftType = ShopGoods::GIFT_TYPE;
                         $gift = explode(',',$row['GIFT_TYPE']);
@@ -83,7 +83,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'CATEGORY_TYPE' => [
-                    'header' => '商品分类',
+                    'header' => 'Products Category',//商品分类
                     'value' => function($row) {
                         $categoryType = array_column(ShopGoods::CATEGORY_TYPE, NULL, 'id');
                         return $categoryType[$row['CATEGORY_TYPE']]['name'] ?? '';
@@ -91,7 +91,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'SELL_TYPE' => [
-                    'header' => '购买方式',
+                    'header' => 'Purchase method',//购买方式
                     'value' => function($row){
                         $sellType = ShopGoods::SALE_TYPE;
                         $sel = explode(',',$row['SELL_TYPE']);
@@ -104,7 +104,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'SELL_PRICE' => [
-                    'header' => '销售价格',
+                    'header' => 'Products Prices ',//商品价格
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -118,7 +118,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'PRICE_PV' => [
-                    'header' => '销售BV',
+                    'header' => 'Products BV',//产品BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -132,22 +132,22 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'STORE_NUMS' => [
-                    'header' => '库存',
+                    'header' => 'Inventory',//库存
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'STATUS' => [
-                    'header' => '状态',
+                    'header' => 'STATUS',//状态
                     'value' => function($row) {
-                        return $row['STATUS'] == 1 ? '已上架' : '已下架';
+                        return $row['STATUS'] == 1 ? 'On sale' : 'Sold out'; //已上架：已下架
                     },
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'UPDATED_AT' => [
-                    'header' => '更新时间',
+                    'header' => 'Update time',//更新时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['UPDATED_AT'],
@@ -169,14 +169,15 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
         if(!$this->filterTypes){
             $this->filterTypes = [
                 //'TYPE' => ['isUserTable' => false, 'name' => '商品来源', 'other' => 'select', 'selectData' => [['id' => 1, 'name' => '国内商品'], ['id' => 2, 'name' => '进口商品']]],
-                'GIFT_TYPE' => ['isUserTable' => false, 'name' => '商品类型', 'other' => 'select', 'selectData' => [['id' => 1, 'name' => '报单区'], ['id' => 2, 'name' => '复消区'], ['id' => 3, 'name' => '工作室报单'], ['id' => 4, 'name' => '工作室复消']]],
-                'STATUS'=> ['name'=> '状态', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '已下架'],['id'=> 1, 'name'=> '已上架']]],
-                'GOODS_NAME'=> ['name'=> '商品名称'],
-                'GOODS_NO'=> ['name'=> '商品编号'],
+                //'GIFT_TYPE' => ['isUserTable' => false, 'name' => '商品类型', 'other' => 'select', 'selectData' => [['id' => 1, 'name' => '报单区'], ['id' => 2, 'name' => '复消区'], ['id' => 3, 'name' => '工作室报单'], ['id' => 4, 'name' => '工作室复消']]],
+                'GIFT_TYPE' => ['isUserTable' => false, 'name' => 'Products type', 'other' => 'select', 'selectData' => [['id' => 1, 'name' => 'Entry area'], ['id' => 2, 'name' => 'Reselling area'], ['id' => 3, 'name' => 'Office Entry area'], ['id' => 4, 'name' => 'Office Reselling area']]],
+                'STATUS'=> ['name'=> 'Status', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> 'Sold out'],['id'=> 1, 'name'=> 'On sale']]],//状态，已下架，已上架
+                'GOODS_NAME'=> ['name'=> 'Products name'],//商品名称
+                'GOODS_NO'=> ['name'=> 'Products code'],//商品编号
 //                'SELL_TYPE'=> ['name'=> '复消购买方式', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '余额购买'],['id'=> 2, 'name'=> '积分购买']]],
-                'SELL_PRICE'=> ['name'=> '销售价格'],
-                'PRICE_PV'=> ['name'=> '销售BV'],
-                'CATEGORY_TYPE' => ['name' => '商品分类', 'other'=> 'select', 'selectData'=> ShopGoods::CATEGORY_TYPE],
+                'SELL_PRICE'=> ['name'=> 'Products Prices'],//销售价格
+                'PRICE_PV'=> ['name'=> 'Products BV'],//销售PV
+                'CATEGORY_TYPE' => ['name' => 'Products Category', 'other'=> 'select', 'selectData'=> ShopGoods::CATEGORY_TYPE],//商品分类
             ];
         }
         return $this->filterTypes;

backendApi/modules/v1/models/lists/shop/PackageList.php

@@ -14,7 +14,7 @@ class PackageList extends \common\libs\dataList\DataList implements DataListInte
      * @return string
      */
     public function getListName(){
-        return '套餐列表';
+        return 'Kitting products list';//套餐列表
     }
 
     /**
@@ -43,19 +43,19 @@ class PackageList extends \common\libs\dataList\DataList implements DataListInte
             $this->columns = [
                 'ID' => null,
                 'PACKAGE_NAME' => [
-                    'header' => '套餐名称',
+                    'header' => 'Kitting products name',//套餐名称
                     'headerOther' => ['width' => '200'],
                 ],
                 'PACKAGE_NO' => [
-                    'header' => '套餐编号',
+                    'header' => 'Kitting products code',//套餐编号
                     'headerOther' => ['width' => '200'],
                 ],
                 'LEVEL_NAME' => [
-                    'header' => '所属报单级别',
+                    'header' => 'Entry level',//所属报单级别
                     'headerOther' => ['width' => '200'],
                 ],
                 'AMOUNT' => [
-                    'header' => '套餐金额',
+                    'header' => 'Kit price',//套餐金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -69,7 +69,7 @@ class PackageList extends \common\libs\dataList\DataList implements DataListInte
                     },
                 ],
                 'PV' => [
-                    'header' => '套餐BV',
+                    'header' => 'Kitting products BV',//套餐BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -83,20 +83,20 @@ class PackageList extends \common\libs\dataList\DataList implements DataListInte
                     },
                 ],
                 'STATUS' => [
-                    'header' => '状态',
+                    'header' => 'Status',//状态
                     'value' => function($row) {
-                        return $row['STATUS'] == 1 ? '已上架' : '已下架';
+                        return $row['STATUS'] == 1 ? 'On sale' : 'Sold out';//'已上架' : '已下架'
                     },
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'PACKAGE_CONTENT' => [
-                    'header' => '套餐内容',
+                    'header' => 'Kit products',//套餐内容
                     'headerOther' => ['width' => '290'],
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -117,11 +117,11 @@ class PackageList extends \common\libs\dataList\DataList implements DataListInte
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'LEVEL_NAME'=> ['name'=> '所属报单级别', 'other'=> 'decLevel'],
-                'PACKAGE_NAME'=> ['name'=> '套餐名称'],
-                'AMOUNT'=> ['name'=> '套餐金额'],
-                'PV'=> ['name'=> '套餐BV'],
-                'STATUS'=> ['name'=> '状态', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '已上架'],['id'=> 0, 'name'=> '已下架']]],
+                'LEVEL_NAME'=> ['name'=> 'Entry level', 'other'=> 'decLevel'],//所属报单级别
+                'PACKAGE_NAME'=> ['name'=> 'Kitting products name'],//套餐名称
+                'AMOUNT'=> ['name'=> 'Kitting products amount'],//套餐金额
+                'PV'=> ['name'=> 'Kitting products BV'],//套餐BV
+                'STATUS'=> ['name'=> 'Status', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> 'On sale'],['id'=> 0, 'name'=> 'Sold out']]],//状态，已上架，已下架
             ];
         }
         return $this->filterTypes;

backendEle/src/components/FilterUser.vue

@@ -3,15 +3,15 @@
     <div class="filter-option">
       <el-select class="filter-item"
                  v-model="filterType"
-                 placeholder="筛选类型"
+                 placeholder="Filter type"
                  @change="handleFilterTypeChange"
-      >
+      ><!-- 筛选类型 -->
         <el-option v-for="(item,key) in allFilterTypes" :key="key" :label="item.name" :value="key"></el-option>
       </el-select>
       <el-select class="filter-item"
                  v-model="filterSymbol"
-                 placeholder="筛选方式"
-      >
+                 placeholder="Filter mode"
+      ><!-- 筛选方式 -->
         <el-option v-for="(item,key) in filterSymbols" :key="key" :label="item" :value="key"></el-option>
       </el-select>
       <template
@@ -21,7 +21,7 @@
             v-model="filterValue"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
-            placeholder="选择日期">
+            placeholder="Select date"><!-- 选择日期 -->
         </el-date-picker>
       </template>
       <template
@@ -31,7 +31,7 @@
             v-model="filterValue"
             value-format="yyyyMM"
             type="month"
-            placeholder="选择月份">
+            placeholder="Select month"><!-- 选择月份 -->
         </el-date-picker>
       </template>
       <template
@@ -46,8 +46,8 @@
           v-else-if="filterType !== '' && allFilterTypes[filterType].hasOwnProperty('other') && allFilterTypes[filterType].other === 'select'">
         <el-select class="filter-item"
                    v-model="filterValue"
-                   :placeholder="`请选择${allFilterTypes[filterType].name}`"
-        >
+                   :placeholder="`Please select ${allFilterTypes[filterType].name}`"
+        ><!-- 请选择 -->
           <el-option v-for="(item,key) in allFilterTypes[filterType].selectData" :key="key" :label="item.name"
                      :value="item.id"></el-option>
         </el-select>
@@ -59,7 +59,7 @@
         </el-select>
       </template>
       <template v-else>
-        <el-input class="filter-item filter-value" v-model="filterValue" placeholder="请输入内容"></el-input>
+        <el-input class="filter-item filter-value" v-model="filterValue" placeholder="Please enter the content"><!-- 请输入内容 --></el-input>
       </template>
       <el-select class="filter-item filter-relation"
                  v-model="filterRelation"
@@ -69,7 +69,7 @@
       </el-select>
       <el-button class="filter-item" icon="el-icon-plus" @click="handleOptionPlus"></el-button>
       <el-button class="filter-item" type="primary" @click="handleFilterUser" icon="el-icon-search">{{filterBtnName}}</el-button>
-      <el-button class="filter-item" type="" @click="handleFilterClear">重置</el-button>
+      <el-button class="filter-item" type="" @click="handleFilterClear">Reset<!-- 重置 --></el-button>
       <el-button class="down-button" type="text"><i class="el-icon-arrow-down"></i></el-button>
     </div>
     <div class="filter-selected" v-show="filterSelected.length > 0">
@@ -146,7 +146,7 @@
       filterBtnName: {
         type: String,
         default() {
-          return '筛选会员'
+          return 'Select'//筛选
         }
       }
     },
@@ -252,14 +252,14 @@
         filterType: '',
         filterSymbol: '',
         filterSymbols: {
-          '=': '等于',
-          'like': '包含',
-          '<>': '不等于',
-          'notLike': '不包含',
-          '>': '大于',
-          '>=': '大于等于',
-          '<': '小于',
-          '<=': '小于等于',
+          '=': 'Is equal to', //等于
+          'like': 'Is including',//包含
+          '<>': 'Is not',//不等于
+          'notLike': 'not Is including ',//不包含
+          '>': 'Is greater than',//大于
+          '>=': 'Is greater than or equal to',//大于等于
+          '<': 'Is smaller than',//小于
+          '<=': 'Is smaller than or equal to',//小于等于
         },
         filterRelation: 'and',
         filterRelations: {

backendEle/src/main.js

@@ -2,6 +2,7 @@
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 import Vue from 'vue'
 import ElementUI from 'element-ui'
+import locale from 'element-ui/lib/locale/lang/en'
 import 'element-ui/lib/theme-chalk/index.css'
 import App from './App'
 import router from './router'
@@ -9,7 +10,7 @@ import router from './router'
 import axios from './utils/axiosPlugin'
 import errorInfo from './utils/errorCode'
 
-Vue.use(ElementUI)
+Vue.use(ElementUI,{locale})
 
 Vue.config.productionTip = false
 

backendEle/src/router/index.js

@@ -29,9 +29,9 @@ export const constantRouterMap = [
       component: _import('dashboard/index'),
       name: 'dashboard_index',
       meta: {
-        title: '控制台',
+        title: 'Console',//控制台
         breadcrumb: [
-          {title: '首页', path: '/dashboard/index'},
+          {title: 'Home Page', path: '/dashboard/index'},//首页
         ],
       },
     }]
@@ -110,10 +110,10 @@ export const constantRouterMap = [
             component: _import('shop/package'),
             name: 'shop_package',
             meta: {
-                title: '报单套餐列表',
+                title: 'Kitting products list',//报单套餐列表
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '商城管理', path: '/shop/dec-order-list'},
+                    {title: 'Home Page', path: '/dashboard/index'},//首页
+                    {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
                 ],
             },
 
@@ -123,10 +123,10 @@ export const constantRouterMap = [
             component: _import('shop/package-add'),
             name: 'shop_package-add',
             meta: {
-                title: '报单套餐添加',
+                title: 'Add Kitting products',//报单套餐添加
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '商城管理', path: '/shop/dec-order-list'},
+                    {title: 'Home Page', path: '/dashboard/index'},//首页
+                    {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
                 ],
             },
 
@@ -136,10 +136,10 @@ export const constantRouterMap = [
             component: _import('shop/index'),
             name: 'shop_index',
             meta: {
-                title: '商品列表',
+                title: 'Products list',//商品列表
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '商城管理', path: '/shop/dec-order-list'},
+                    {title: 'Home Page', path: '/dashboard/index'},//首页
+                    {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
                 ],
             },
 
@@ -149,10 +149,10 @@ export const constantRouterMap = [
             component: _import('shop/goods-add'),
             name: 'shop_goods-add',
             meta: {
-                title: '商品添加',
+                title: 'Products add',//商品添加
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '商城管理', path: '/shop/dec-order-list'},
+                    {title: 'Home Page', path: '/dashboard/index'},//首页
+                    {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
                 ],
             },
 

backendEle/src/static/css/style.css

@@ -511,7 +511,8 @@ a {
     }
 
     .layout-menu-left {
-        width: 500px;
+        /* width: 500px; */
+		width: 400px;
     }
 
     .breadcrumb-box {

backendEle/src/views/layout/layout.vue

@@ -54,7 +54,7 @@
             </transition>
           </li>
           <li>
-            <h4>{{contentTitle}}</h4>
+            <h4>{{contentTitle}}</h4><!-- 控制台 -->
           </li>
         </ul>
         <div style="text-align: right;font-size: 14px;">
@@ -62,7 +62,7 @@
           Current Period<!-- 当期期数 -->：<b class="text-danger">{{periodNum}}</b>
           <el-breadcrumb separator="/">
             <el-breadcrumb-item v-for="(item, index) in breadcrumb" :to="{ path: item.path }" :key="index">
-              {{item.title}}
+              {{item.title}}<!-- 顶部面包屑 -->
             </el-breadcrumb-item>
           </el-breadcrumb>
         </div>

backendEle/src/views/shop/dec-order-list.vue

@@ -20,8 +20,8 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/dec-order-list-export`)">导出Excel</el-button>
-        <el-button type="primary" size="small" @click="handleExportPDF" v-show="permission.hasPermission(`shop/dec-order-list-export`)">导出PDF</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/dec-order-list-export`)">Export Excel</el-button>
+        <el-button type="primary" size="small" @click="handleExportPDF" v-show="permission.hasPermission(`shop/dec-order-list-export`)">Export PDF</el-button>
           <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
@@ -94,9 +94,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+          confirmButtonText: 'Confirm',//确认
+          cancelButtonText: 'Cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`shop/dec-order-list-export`, this.filterModel)
@@ -112,7 +112,7 @@
         handleExportPDF() {
             if (this.multipleSelection.length === 0) {
                 this.$message({
-                    message: '请选择一条订单导出',
+                    message: 'Please select an order to export',//请选择一条订单导出
                     type: 'error'
                 })
                 return false
@@ -124,15 +124,15 @@
             let orderSnSet = Array.from(new Set(orderSnList))
             if (orderSnSet.length !== 1) {
                 this.$message({
-                    message: '每次只能导出一条订单',
+                    message: 'Only one order can be exported at a time',//每次只能导出一条订单
                     type: 'error'
                 })
                 return false
             }
 
-            this.$confirm(`确定要导出当前数据吗？`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示',
+                confirmButtonText: 'Confirm',//确认
+                cancelButtonText: 'Cancel',//取消
                 type: 'warning'
             }).then(() => {
                 // 导出时只需要订单ID即可

backendEle/src/views/shop/goods-add.vue

@@ -3,7 +3,7 @@
         <div class="white-box">
             <el-form ref="form"  label-width="250px" class="form-page">
 
-                <el-form-item label="商品名称">
+                <el-form-item label="Products Name"><!-- 商品名称 -->
                     <el-input v-model="form.goodsName"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="商品来源">
@@ -12,53 +12,53 @@
                                    :value="index"></el-option>
                     </el-select>
                 </el-form-item> -->
-                <el-form-item label="会员折扣">
+                <el-form-item label="Member discount"><!-- 会员折扣 -->
                     <el-input v-model="form.sellDiscount"></el-input>
                 </el-form-item>
-                <el-form-item label="商品类型">
+                <el-form-item label="Product type"><!-- 商品类型 -->
                     <el-checkbox  v-for="(value,key) in GiftTypeArr" v-model="form.giftType[key-1]" :key="key" >{{value.name}}</el-checkbox>
                 </el-form-item>
                 <!-- <el-form-item label="复消购买方式">
                     <el-checkbox  v-for="(value,key) in sellType" v-model="form.sellType[key-1]" :key="key" >{{value.name}}</el-checkbox>
                 </el-form-item> -->
-                <el-form-item label="商品分类">
+                <el-form-item label="Product Category"><!-- 商品分类 -->
                     <el-select v-model="form.categoryType" placeholder="">
                         <el-option v-for="item in categoryType" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商品编号">
+                <el-form-item label="Product Code"><!-- 商品编号 -->
                     <el-input v-model="form.goodsNo"></el-input>
                 </el-form-item>
-                <el-form-item label="单位">
+                <el-form-item label="Unit"><!-- 单位 -->
                     <el-input v-model="form.unit"></el-input>
                 </el-form-item>
-                <el-form-item label="市场价格">
+                <el-form-item label="Market price"><!-- 市场价格 -->
                     <el-input v-model="form.marketPrice"></el-input>
                 </el-form-item>
-                <el-form-item label="销售价格">
+                <el-form-item label="Selling price"><!-- 销售价格 -->
                     <el-input v-model="form.sellPrice"></el-input>
                 </el-form-item>
-                <el-form-item label="价格BV" v-show="pvDisabled">
+                <el-form-item label="Price BV" v-show="pvDisabled"><!-- 价格BV -->
                     <el-input v-model="form.pricePv"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="兑换积分">
                     <el-input v-model="form.point"></el-input>
                 </el-form-item> -->
-                <el-form-item label="库存">
+                <el-form-item label="Inventory"><!-- 库存 -->
                     <el-input v-model="form.storeNums"></el-input>
                 </el-form-item>
-                <el-form-item label="商品详情">
+                <el-form-item label="Product details"><!-- 商品详情 -->
                     <el-input
                             type="textarea"
                             :rows="2"
-                            placeholder="请输入内容"
+                            placeholder="Please enter the content"
                             v-model="form.content">
-                    </el-input>
+                    </el-input><!-- 请输入内容 -->
                 </el-form-item>
-                <el-form-item label="排序">
+                <el-form-item label="Order"><!-- 排序 -->
                     <el-input v-model="form.sort"></el-input>
                 </el-form-item>
-                <el-form-item label="上传图片">
+                <el-form-item label="Upload images"><!-- 上传图片 -->
                     <div class='up_load'>
                         <leo-uploader
                             @on-success='upLoadSuccess'
@@ -67,7 +67,7 @@
                     </div>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="addSubmit" :loading="submitButtonStat">添加</el-button>
+                    <el-button type="primary" @click="addSubmit" :loading="submitButtonStat">Add<!-- 添加 --></el-button>
                 </el-form-item>
             </el-form>
         </div>

backendEle/src/views/shop/index.vue

@@ -16,19 +16,19 @@
                         </template>
                     </template>
                 </el-table-column>
-                <el-table-column fixed="right" label="操作" width="180">
+                <el-table-column fixed="right" label="operation" width="180"><!-- 操作 -->
                     <template slot-scope="scope">
                         <el-dropdown size="small" trigger="click" v-if="permission.hasPermission(`shop/goods-edit`) || permission.hasPermission(`shop/goods-delete`)">
                             <el-button type="primary" size="small" @click.stop="">
-                                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
                             </el-button>
                             <el-dropdown-menu slot="dropdown">
-                                <el-dropdown-item command="goods-edit" @click.native="handleEditShow(scope.row)">修改数据 </el-dropdown-item>
+                                <el-dropdown-item command="goods-edit" @click.native="handleEditShow(scope.row)">Edit<!-- 修改数据 --> </el-dropdown-item>
                                 <el-dropdown-item command="del" @click.native="handleDel(scope.row.ID)"
-                                                  v-show="permission.hasPermission(`shop/goods-delete`)">删除数据
+                                                  v-show="permission.hasPermission(`shop/goods-delete`)">Delete<!-- 删除数据 -->
                                 </el-dropdown-item>
-                                <el-dropdown-item command="goods-edit" @click.native="handleGoodUp(scope.row.ID)">商品上架 </el-dropdown-item>
-                                 <el-dropdown-item command="goods-edit" @click.native="handleGoodDown(scope.row.ID)">商品下架 </el-dropdown-item>
+                                <el-dropdown-item command="goods-edit" @click.native="handleGoodUp(scope.row.ID)">On sale<!-- 商品上架 --> </el-dropdown-item>
+                                 <el-dropdown-item command="goods-edit" @click.native="handleGoodDown(scope.row.ID)">Sold out<!-- 商品下架 --> </el-dropdown-item>
                             </el-dropdown-menu>
                         </el-dropdown>
                     </template>
@@ -52,10 +52,10 @@
                     </el-dropdown-menu>
                 </el-dropdown>-->
                 <el-button type="primary" size="small" @click="handlestate" icon="el-icon-plus"
-                           v-if="permission.hasPermission(`shop/goods-add`)">商品添加
+                           v-if="permission.hasPermission(`shop/goods-add`)"><!-- 商品添加 -->Products add
                 </el-button>
 
-                <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/goods-list-export`)">导出Excel</el-button>
+                <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/goods-list-export`)">Export Excel</el-button>
                 <!-- <el-button-group>
                     <el-button type="success" size="mini" @click.native="handleup(scope.row.ID)">上架</el-button>
                     <el-button type="danger" size="mini">下架</el-button>
@@ -63,11 +63,11 @@
                 <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
             </div>
         </div>
-        <el-dialog title="修改套餐" :visible.sync="dialogEditFormVisible">
+        <el-dialog title="Edit Products" :visible.sync="dialogEditFormVisible"><!-- 修改商品 -->
             <el-form :model="form" label-width="250px" class="form-dialog" v-loading="dialogEditLoading">
 
 
-                    <el-form-item label="商品名称">
+                    <el-form-item label="Products Name"><!-- 商品名称 -->
                         <el-input v-model="form.goodsName"></el-input>
                     </el-form-item>
                     <!-- <el-form-item label="商品来源">
@@ -76,54 +76,54 @@
                                        :value="index"></el-option>
                         </el-select>
                     </el-form-item> -->
-                    <el-form-item label="会员折扣">
+                    <el-form-item label="Member discount"><!-- 会员折扣 -->
                         <el-input v-model="form.sellDiscount"></el-input>
                     </el-form-item>
-                    <el-form-item label="商品类型">
+                    <el-form-item label="Product type"><!-- 商品类型 -->
                         <el-checkbox  v-for="(value,index) in GiftTypeArr" v-model="value.checked" :key="index" >{{value.name}}</el-checkbox>
                     </el-form-item>
                     <!-- <el-form-item label="复消购买方式">
                          <el-checkbox  v-for="(value,index) in sell_type" v-model="value.checked" :key="index" >{{value.name}}</el-checkbox>
                     </el-form-item> -->
-                    <el-form-item label="商品分类">
+                    <el-form-item label="Product Category"> <!-- 商品分类 -->
                         <el-select v-model="form.categoryType">
                             <el-option v-for="item in categoryType" :key="item.id" :label="item.name" :value="item.id" ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="商品编号">
+                    <el-form-item label="Product Code"><!-- 商品编号 -->
                         <el-input v-model="form.goodsNo"></el-input>
                     </el-form-item>
-                    <el-form-item label="单位">
+                    <el-form-item label="Unit"><!-- 单位 -->
                         <el-input v-model="form.unit"></el-input>
                     </el-form-item>
-                    <el-form-item label="市场价格">
+                    <el-form-item label="Market price"><!-- 市场价格 -->
                         <el-input v-model="form.marketPrice"></el-input>
                     </el-form-item>
-                    <el-form-item label="销售价格" p>
+                    <el-form-item label="Selling price" > <!-- 销售价格 -->
                         <el-input v-model="form.sellPrice"></el-input>
                     </el-form-item>
-                    <el-form-item label="价格BV" v-show="pvDisabled">
+                    <el-form-item label="Price BV" v-show="pvDisabled"> <!-- 价格BV -->
                         <el-input v-model="form.pricePv"></el-input>
                     </el-form-item>
-                    <el-form-item label="兑换积分" v-show="false">
+                    <el-form-item label="Exchange points" v-show="false"> <!-- 兑换积分 -->
                         <el-input v-model="form.point"></el-input>
                     </el-form-item>
-                    <el-form-item label="库存">
+                    <el-form-item label="Inventory"> <!-- 库存 -->
                         <el-input v-model="form.storeNums"></el-input>
                     </el-form-item>
-                    <el-form-item label="商品详情">
+                    <el-form-item label="Product details"><!-- 商品详情 -->
                         <el-input
                                 type="textarea"
                                 :rows="2"
-                                placeholder="请输入内容"
+                                placeholder="Please enter the content"
                                 v-model="form.content">
-                        </el-input>
+                        </el-input><!-- 请输入内容 -->
                     </el-form-item>
-                    <el-form-item label="排序">
+                    <el-form-item label="order"> <!-- 排序 -->
                         <el-input v-model="form.sort"></el-input>
                     </el-form-item>
 
-                    <el-form-item label="上传图片">
+                    <el-form-item label="upload images"> <!-- 上传图片 -->
                        <div class='up_load'>
                            <!-- <img v-if="form.cover&&img_show" :src="form.cover" alt=""> -->
                             <leo-uploader
@@ -139,8 +139,8 @@
 
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button @click="dialogEditFormVisible = false">取 消</el-button>
-                <el-button type="primary" @click.native="handleEdit">修 改</el-button>
+                <el-button @click="dialogEditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+                <el-button type="primary" @click.native="handleEdit">Edit<!-- 修 改 --></el-button>
             </div>
         </el-dialog>
     </div>
@@ -309,7 +309,7 @@
             handleEdit() {
                 this.dialogEditFormVisible = false
                 this.$message({
-                    message: '正在修改数据',
+                    message: 'Modifying data',//正在修改数据
                     type: 'info'
                 })
                 let path = 'shop/goods-edit'
@@ -343,9 +343,9 @@
 
             handleDel(id = null) {
                 let obj = this
-                this.$confirm('确定删除选定的数据？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                this.$confirm('Determine to delete the selected data？', 'Hint', {//'确定删除选定的数据？', '提示'
+                    confirmButtonText: 'Confirm',//确定
+                    cancelButtonText: 'Cancel',//取消
                     type: 'warning'
                 }).then(() => {
                     let selectedIds = []
@@ -401,9 +401,9 @@
             },
 
             handleExport(){
-                this.$confirm(`确定要导出当前数据吗？`, '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                this.$confirm(`Determine to export the selected data？`, 'Hint', {//确定要导出当前数据吗？`, '提示'
+                    confirmButtonText: 'Confirm',//确定
+                    cancelButtonText: 'Cancel',//取消
                     type: 'warning'
                 }).then(() => {
                     return network.getData(`shop/goods-list-export`, this.filterModel)

backendEle/src/views/shop/package-add.vue

@@ -3,31 +3,31 @@
         <div class="white-box">
             <el-form ref="form"  label-width="250px" class="form-page">
 
-                <el-form-item label="套餐名称">
+                <el-form-item label="Kitting products name"><!-- 套餐名称 -->
                     <el-input v-model="form.packageName"></el-input>
                 </el-form-item>
-                <el-form-item label="套餐编号">
+                <el-form-item label="Kitting products code"><!-- 套餐编号 -->
                     <el-input v-model="form.packageNo"></el-input>
                 </el-form-item>
-                <el-form-item label="套餐金额">
+                <el-form-item label="Kitting products amount"><!-- 套餐金额 -->
                     <el-input v-model="form.amount"></el-input>
                 </el-form-item>
-                <el-form-item label="套餐BV">
+                <el-form-item label="Kitting products BV"><!-- 套餐bV -->
                     <el-input v-model="form.amountPv"></el-input>
                 </el-form-item>
-                <el-form-item label="报单级别ID">
-                    <el-select v-model="form.levelId" placeholder="请选择报单级别">
+                <el-form-item label="Entry level ID"><!-- 报单级别ID -->
+                    <el-select v-model="form.levelId" placeholder="Select entry level"><!-- 请选择报单级别 -->
                         <el-option v-for="(item,index) in allDecLevel" :key="index" :label="item.LEVEL_NAME"
                                    :value="item.ID"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="套餐内容">
+                <el-form-item label="Kit products"><!-- 套餐内容 -->
                     <el-input v-model="form.packageContent"></el-input>
                 </el-form-item>
 
 
                 <el-form-item>
-                    <el-button type="primary" @click="addSubmit" :loading="submitButtonStat">添加</el-button>
+                    <el-button type="primary" @click="addSubmit" :loading="submitButtonStat">Add<!-- 添加 --></el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -88,7 +88,7 @@
             handleEdit() {
                 this.dialogEditFormVisible = false
                 this.$message({
-                    message: '正在修改数据',
+                    message: 'Modifying data',
                     type: 'info'
                 })
                 let path = 'finance/deal-type-edit'

backendEle/src/views/shop/package.vue

@@ -18,20 +18,20 @@
                         </template>
                     </template>
                 </el-table-column>
-                <el-table-column fixed="right" label="操作" width="180">
+                <el-table-column fixed="right" label="Action" width="180"><!-- 操作 -->
                     <template slot-scope="scope">
                         <el-dropdown size="small" trigger="click" v-if="permission.hasPermission(`shop/package-get`)">
                             <el-button type="primary" size="small" @click.stop="">
-                                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
                             </el-button>
                             <el-dropdown-menu slot="dropdown">
-                                <el-dropdown-item command="package-get" @click.native="handleEditShow(scope.row)">修改数据
+                                <el-dropdown-item command="package-get" @click.native="handleEditShow(scope.row)">Edit<!-- 修改数据 -->
                                 </el-dropdown-item>
                                 <el-dropdown-item command="del" @click.native="handleDel(scope.row.ID)"
-                                                  v-show="permission.hasPermission(`shop/goods-delete`)">删除数据
+                                                  v-show="permission.hasPermission(`shop/goods-delete`)">Delete<!-- 删除数据 -->
                                 </el-dropdown-item>
-                                <el-dropdown-item command="goods-edit" @click.native="handleGoodUp(scope.row.ID)">商品上架 </el-dropdown-item>
-                                <el-dropdown-item command="goods-edit" @click.native="handleGoodDown(scope.row.ID)">商品下架 </el-dropdown-item>
+                                <el-dropdown-item command="goods-edit" @click.native="handleGoodUp(scope.row.ID)">On sale<!-- 商品上架 --> </el-dropdown-item>
+                                <el-dropdown-item command="goods-edit" @click.native="handleGoodDown(scope.row.ID)">Sold out<!-- 商品下架 --> </el-dropdown-item>
                             </el-dropdown-menu>
                         </el-dropdown>
                     </template>
@@ -40,40 +40,40 @@
 
             <div class="white-box-footer">
                 <el-button type="primary" size="small" @click="handlestate" icon="el-icon-plus"
-                           v-if="permission.hasPermission(`shop/package-add`)">新增套餐
+                           v-if="permission.hasPermission(`shop/package-add`)">Add Kitting products<!-- 新增套餐 -->
                 </el-button>
                 <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                             @current-change="handleCurrentChange"></pagination>
             </div>
         </div>
-        <el-dialog title="修改套餐" :visible.sync="dialogEditFormVisible">
+        <el-dialog title="Edit Kitting products" :visible.sync="dialogEditFormVisible"><!-- 修改套餐 -->
             <el-form :model="form" label-width="250px" class="form-dialog" v-loading="dialogEditLoading">
 
-                <el-form-item label="套餐名称">
+                <el-form-item label="Kitting products name"><!-- 套餐名称 -->
                     <el-input v-model="form.packageName"></el-input>
                 </el-form-item>
-                <el-form-item label="套餐编号">
+                <el-form-item label="Kitting products code"><!-- 套餐编号 -->
                     <el-input v-model="form.packageNo"></el-input>
                 </el-form-item>
-                <el-form-item label="套餐金额">
+                <el-form-item label="Kitting products amount"><!-- 套餐金额 -->
                     <el-input v-model="form.amount"></el-input>
                 </el-form-item>
-                <el-form-item label="套餐BV">
+                <el-form-item label="Kitting products BV"><!-- 套餐bV -->
                     <el-input v-model="form.amountPv"></el-input>
                 </el-form-item>
-                <el-form-item label="报单级别ID">
-                    <el-select v-model="form.levelId" placeholder="请选择报单级别">
+                <el-form-item label="Entry level ID"><!-- 报单级别ID -->
+                    <el-select v-model="form.levelId" placeholder="Select entry level"><!-- 请选择报单级别 -->
                         <el-option v-for="(item,index) in allDecLevel" :key="index" :label="item.LEVEL_NAME"
                                    :value="item.ID"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="套餐内容">
+                <el-form-item label="Kit products"><!-- 套餐内容 -->
                     <el-input v-model="form.packageContent"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button @click="dialogEditFormVisible = false">取 消</el-button>
-                <el-button type="primary" @click.native="handleEdit">修 改</el-button>
+                <el-button @click="dialogEditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+                <el-button type="primary" @click.native="handleEdit">Edit<!-- 修 改 --></el-button>
             </div>
         </el-dialog>
     </div>
@@ -158,7 +158,7 @@
             handleEdit() {
                 this.dialogEditFormVisible = false
                 this.$message({
-                    message: '正在修改数据',
+                    message: 'Modifying data',//正在修改数据
                     type: 'info'
                 })
                 let path = 'shop/package-get'
@@ -174,9 +174,9 @@
 
             handleDel(id = null) {
                 let obj = this
-                this.$confirm('确定删除选定的数据？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                this.$confirm('OK to delete the selected data？', 'Hint', {//'确定删除选定的数据？', '提示'
+                    confirmButtonText: 'Confirm',
+                    cancelButtonText: 'Cancel',
                     type: 'warning'
                 }).then(() => {
                     let selectedIds = []

common/models/ShopGoods.php

@@ -79,26 +79,26 @@ class ShopGoods extends \common\components\ActiveRecord
     ];
     const GIFT_TYPE = [
         1 =>[
-            'name'=>'报单区',
+            'name'=>'Entry area',//报单区
         ],
         2 =>[
-            'name'=>'复消区',
+            'name'=>'Reselling area',//复消区
         ],
         3 =>[
-            'name'=>'工作室报单',
+            'name'=>'Office Entry area',//工作室报单
         ],
         4 =>[
-            'name'=>'工作室复消',
+            'name'=>'Office Reselling area',//工作室复消
         ],
     ];
     const STATUS_NAME = [
-        1 => '已上架',
-        0 => '已下架',
+        1 => 'On sale',//已上架
+        0 => 'Sold out',//已下架
     ];
     const CATEGORY_TYPE = [
         [
             'id' => 1,
-            'name' => '普通商品',
+            'name' => 'Common products',//普通商品
             'sell_type' => [
                 self::SALE_TYPE[1],
                 self::SALE_TYPE[3],
@@ -107,21 +107,21 @@ class ShopGoods extends \common\components\ActiveRecord
         ],
         [
             'id' => 4,
-            'name' => '旅游积分商品',
+            'name' => 'Travel bonus products',//旅游积分商品
             'sell_type' => [
                 self::SALE_TYPE[4]
             ]
         ],
         [
             'id' => 5,
-            'name' => '名车积分商品',
+            'name' => 'Car bonus products',//名车积分商品
             'sell_type' => [
                 self::SALE_TYPE[5]
             ]
         ],
         [
             'id' => 6,
-            'name' => '豪宅积分商品',
+            'name' => 'House bonus products',//豪宅积分商品
             'sell_type' => [
                 self::SALE_TYPE[6]
             ]

frontendApi/config/menu.php

@@ -108,7 +108,7 @@ return [
         'routePath'=>'article',
         'show'=>1,
         'child'=>[
-
+			
         ]
     ],
 //    'message'=>[

frontendApi/modules/v1/controllers/ShopController.php

@@ -302,15 +302,15 @@ class ShopController extends BaseController {
             ],
             [
                 'name' => '4',
-                'label' => 'Travel Bonus Goods',//旅游积分商品
+                'label' => 'Travel Bonus Products',//旅游积分商品
             ],
             [
                 'name' => '5',
-                'label' => 'Car Bonus Goods',//名车积分商品
+                'label' => 'Car Bonus Products',//名车积分商品
             ],
             [
                 'name' => '6',
-                'label' => 'House Bonus Goods',//豪宅积分商品
+                'label' => 'House Bonus Products',//豪宅积分商品
             ],
         ];
         return static::notice($data);