From 6331e016d1ee5751e7196b200021e7ae4024e1c8 Mon Sep 17 00:00:00 2001
From: xh-pan1 <xh-pan1@hnair.com>
Date: Sat, 18 Nov 2023 22:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E8=AF=AD=E8=A8=80?=
=?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/toolBar/BasicsComp/assistDiv.vue | 2 +-
.../components/toolBar/BasicsComp/headerTool.vue | 2 +-
.../components/toolBar/BasicsComp/noticeTool.vue | 4 +-
.../components/toolBar/BasicsComp/textTool.vue | 6 +-
.../toolBar/toolModule/coupon-select.vue | 2 +-
.../toolBar/toolModule/custom-page-select.vue | 2 +-
.../toolBar/toolModule/notice-select.vue | 2 +-
.../toolBar/toolModule/product-select.vue | 2 +-
.../components/toolBar/toolModule/shop-select.vue | 2 +-
src/App.vue | 13 +-
src/layout/components/Navbar.vue | 16 +-
src/locales/en.json | 297 ++++++++++----------
src/locales/zh-CN.json | 306 +++++++++++----------
src/main.js | 8 +-
src/permission.js | 44 +++
src/utils/auth.js | 4 +-
src/utils/request.js | 3 +
src/views/active/getActive.vue | 8 +-
src/views/active/index.vue | 6 +-
src/views/commodity/commdityClass/Edit.vue | 56 +++-
src/views/commodity/commdityClass/index.vue | 22 +-
.../commodityList copy/commodityGroup.vue | 4 +-
src/views/commodity/commodityList copy/index.vue | 4 +-
.../commodity/commodityList/commodityGroup.vue | 4 +-
src/views/commodity/commodityList/index.vue | 4 +-
.../commodity/commoditySystem/addCommodity.vue | 102 +++----
.../commodity/commoditySystem/addComponent.vue | 2 +-
src/views/commodity/commoditySystem/index.vue | 102 +++----
src/views/customer/addOperate.vue | 2 +-
src/views/customer/clusteringList/index.vue | 8 +-
src/views/customer/customerList/index.vue | 6 +-
src/views/customer/operate/index.vue | 6 +-
src/views/customer/tagList.vue | 6 +-
src/views/customerService/service/index.vue | 4 +-
src/views/customerService/setting/index.vue | 2 +-
src/views/dashboard/index.vue | 2 +-
src/views/distributor/achievement/humens.vue | 4 +-
src/views/distributor/achievement/order.vue | 4 +-
src/views/distributor/achievement/programme.vue | 2 +-
src/views/distributor/customer/popSearch.vue | 8 +-
src/views/distributor/personnel/list.vue | 6 +-
src/views/distributor/personnel/msg.vue | 6 +-
src/views/finance/list/index.vue | 6 +-
src/views/liveMenu/liveProduct/index.vue | 6 +-
src/views/liveMenu/liveRoom/index.vue | 6 +-
src/views/marketing/channelActivity/form.vue | 4 +-
src/views/marketing/channelActivity/index.vue | 4 +-
.../channelActivity/selectChannelCoupons.vue | 8 +-
.../channelCoupons/components/couponSelect.vue | 2 +-
.../channelCoupons/components/productSelect.vue | 2 +-
src/views/marketing/channelCoupons/index.vue | 6 +-
src/views/marketing/channelManage/index.vue | 12 +-
src/views/marketing/compose/add.vue | 6 +-
src/views/marketing/compose/index.vue | 6 +-
src/views/marketing/coupon/index.vue | 10 +-
src/views/marketing/discount/add.vue | 2 +-
src/views/marketing/discount/index.vue | 6 +-
src/views/marketing/group/add.vue | 2 +-
src/views/marketing/group/index.vue | 6 +-
src/views/marketing/price/add.vue | 6 +-
src/views/marketing/price/index.vue | 6 +-
src/views/marketing/scene/add.vue | 2 +-
src/views/marketing/scene/index.vue | 2 +-
src/views/marketing/spike/add.vue | 2 +-
src/views/marketing/spike/index.vue | 6 +-
src/views/order/aftersale/afterDetails.vue | 6 +-
src/views/order/aftersale/index.vue | 4 +-
src/views/order/pending/index.vue | 10 +-
src/views/order/pending/pendDetails.vue | 12 +-
src/views/setup/role/index.vue | 6 +-
src/views/setup/tabs/index.vue | 8 +-
src/views/setup/user/index.vue | 8 +-
src/views/shop/decoration/index.vue | 8 +-
src/views/shop/material/fileUpload.vue | 2 +-
src/views/shop/material/index.vue | 10 +-
src/views/shop/myshop/index.vue | 64 ++---
src/views/stock/stocknote/index.vue | 4 +-
src/views/system/logistics/Edit.vue | 14 +-
src/views/system/logistics/index.vue | 30 +-
src/views/system/shopCrossDetail/index.vue | 4 +-
src/views/system/shopSys/index.vue | 28 +-
src/views/system/storehouse/Edit.vue | 16 +-
src/views/system/storehouse/index.vue | 18 +-
83 files changed, 799 insertions(+), 666 deletions(-)
diff --git a/canvas-container/components/toolBar/BasicsComp/assistDiv.vue b/canvas-container/components/toolBar/BasicsComp/assistDiv.vue
index 44226be..803d1d0 100644
--- a/canvas-container/components/toolBar/BasicsComp/assistDiv.vue
+++ b/canvas-container/components/toolBar/BasicsComp/assistDiv.vue
@@ -7,7 +7,7 @@
<div class="Info">{{activeComponent.componentContent.bgColor}}</div>
<div class="modifyBox">
<div class="colorBox">
- <span @click="resetBgColor">重置</span>
+ <span @click="resetBgColor">{{ $t('common.reset') }}</span>
<div class="block">
<el-color-picker v-model="activeComponent.componentContent.bgColor"></el-color-picker>
</div>
diff --git a/canvas-container/components/toolBar/BasicsComp/headerTool.vue b/canvas-container/components/toolBar/BasicsComp/headerTool.vue
index 9549437..fb780fa 100644
--- a/canvas-container/components/toolBar/BasicsComp/headerTool.vue
+++ b/canvas-container/components/toolBar/BasicsComp/headerTool.vue
@@ -36,7 +36,7 @@
<div class="Info">{{activeComponent.componentContent.titColor}}</div>
<div class="modifyBox">
<div class="colorBox">
- <span @click="resetColor">重置</span>
+ <span @click="resetColor">{{ $t('common.reset') }}</span>
<div class="block">
<el-color-picker v-model="activeComponent.componentContent.titColor"></el-color-picker>
</div>
diff --git a/canvas-container/components/toolBar/BasicsComp/noticeTool.vue b/canvas-container/components/toolBar/BasicsComp/noticeTool.vue
index c4c4f27..5c3806f 100644
--- a/canvas-container/components/toolBar/BasicsComp/noticeTool.vue
+++ b/canvas-container/components/toolBar/BasicsComp/noticeTool.vue
@@ -7,7 +7,7 @@
<div class="Info">{{activeComponent.componentContent.titColor}}</div>
<div class="modifyBox">
<div class="colorBox">
- <span @click="resetColor">重置</span>
+ <span @click="resetColor">{{ $t('common.reset') }}</span>
<div class="block">
<el-color-picker v-model="activeComponent.componentContent.titColor"></el-color-picker>
</div>
@@ -19,7 +19,7 @@
<div class="Info">{{activeComponent.componentContent.bgColor}}</div>
<div class="modifyBox">
<div class="colorBox">
- <span @click="resetBgColor">重置</span>
+ <span @click="resetBgColor">{{ $t('common.reset') }}</span>
<div class="block">
<el-color-picker v-model="activeComponent.componentContent.bgColor"></el-color-picker>
</div>
diff --git a/canvas-container/components/toolBar/BasicsComp/textTool.vue b/canvas-container/components/toolBar/BasicsComp/textTool.vue
index fa7ab05..4658b25 100644
--- a/canvas-container/components/toolBar/BasicsComp/textTool.vue
+++ b/canvas-container/components/toolBar/BasicsComp/textTool.vue
@@ -63,7 +63,7 @@
<div class="Info">{{activeComponent.componentContent.titColor}}</div>
<div class="modifyBox">
<div class="colorBox">
- <span @click="resetColor">重置</span>
+ <span @click="resetColor">{{ $t('common.reset') }}</span>
<div class="block">
<el-color-picker v-model="activeComponent.componentContent.titColor"></el-color-picker>
</div>
@@ -75,7 +75,7 @@
<div class="Info">{{activeComponent.componentContent.describeColor}}</div>
<div class="modifyBox">
<div class="colorBox">
- <span @click="resetDescribeColor">重置</span>
+ <span @click="resetDescribeColor">{{ $t('common.reset') }}</span>
<div class="block">
<el-color-picker v-model="activeComponent.componentContent.describeColor"></el-color-picker>
</div>
@@ -87,7 +87,7 @@
<div class="Info">{{activeComponent.componentContent.bgColor}}</div>
<div class="modifyBox">
<div class="colorBox">
- <span @click="resetBgColor">重置</span>
+ <span @click="resetBgColor">{{ $t('common.reset') }}</span>
<div class="block">
<el-color-picker v-model="activeComponent.componentContent.bgColor"></el-color-picker>
</div>
diff --git a/canvas-container/components/toolBar/toolModule/coupon-select.vue b/canvas-container/components/toolBar/toolModule/coupon-select.vue
index 3b4dc36..cd63f15 100644
--- a/canvas-container/components/toolBar/toolModule/coupon-select.vue
+++ b/canvas-container/components/toolBar/toolModule/coupon-select.vue
@@ -5,7 +5,7 @@
<el-input v-model="formData.keyword" maxlength="20" placeholder="请输入优惠券名称"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="onSubmit">查询</el-button>
+ <el-button type="primary" @click="onSubmit">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
<el-table
diff --git a/canvas-container/components/toolBar/toolModule/custom-page-select.vue b/canvas-container/components/toolBar/toolModule/custom-page-select.vue
index 6a0f562..bed0526 100644
--- a/canvas-container/components/toolBar/toolModule/custom-page-select.vue
+++ b/canvas-container/components/toolBar/toolModule/custom-page-select.vue
@@ -5,7 +5,7 @@
<el-input v-model="formData.keyword" maxlength="20" placeholder="页面名称"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="onSubmit">查询</el-button>
+ <el-button type="primary" @click="onSubmit">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
<el-table
diff --git a/canvas-container/components/toolBar/toolModule/notice-select.vue b/canvas-container/components/toolBar/toolModule/notice-select.vue
index 12a018a..e9e9ecd 100644
--- a/canvas-container/components/toolBar/toolModule/notice-select.vue
+++ b/canvas-container/components/toolBar/toolModule/notice-select.vue
@@ -5,7 +5,7 @@
<el-input v-model="formData.keyword" maxlength="20" placeholder="店铺名称"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="onSubmit">查询</el-button>
+ <el-button type="primary" @click="onSubmit">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
<el-table
diff --git a/canvas-container/components/toolBar/toolModule/product-select.vue b/canvas-container/components/toolBar/toolModule/product-select.vue
index 280b8b4..a377fae 100644
--- a/canvas-container/components/toolBar/toolModule/product-select.vue
+++ b/canvas-container/components/toolBar/toolModule/product-select.vue
@@ -20,7 +20,7 @@
clearable></el-cascader>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="onSubmit">查询</el-button>
+ <el-button type="primary" @click="onSubmit">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
<el-table
diff --git a/canvas-container/components/toolBar/toolModule/shop-select.vue b/canvas-container/components/toolBar/toolModule/shop-select.vue
index 1a875d9..9ffe268 100644
--- a/canvas-container/components/toolBar/toolModule/shop-select.vue
+++ b/canvas-container/components/toolBar/toolModule/shop-select.vue
@@ -5,7 +5,7 @@
<el-input v-model="formData.keyword" maxlength="20" placeholder="店铺名称"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="onSubmit">查询</el-button>
+ <el-button type="primary" @click="onSubmit">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
<el-table
diff --git a/src/App.vue b/src/App.vue
index 7735a02..200e9e5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
<template>
<div id="app">
- <el-dialog title="$t('notice_dialog_title')" top="30vh" :visible.sync="tipShow" width="30%" center>
+ <el-dialog title="$t('common.notice_dialog_title')" top="30vh" :visible.sync="tipShow" width="30%" center>
<span
>为保护个人隐私信息，系统自动对敏感数据进行脱敏。如需编辑、查看完整信息，可通过“用户隐私二次认证”功能进行验证，验证通过之后，24小时内可查看完整信息。</span
>
@@ -22,12 +22,23 @@ export default {
};
},
created() {
+ this.initLanguage();
if (this.$store.state.user.token) {
// this.getPrivacySwitch();
}
},
methods: {
+ initLanguage(){
+ // this.$i18n.mergeLocaleMessage('en',
+ // {
+ // "permission" : {
+ // "概括":"1111"
+ // }
+ // }
+ // );
+ },
getPrivacySwitch() {
+
getPrivacySwitch().then((res) => {
var IsTipshow = localStorage.getItem("IsTipshow");
localStorage.setItem('privacyTime', res.data)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index d00fab6..2b9540a 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -107,7 +107,7 @@
<script>
import { mapGetters } from 'vuex'
-import { removeToken, removeBusinessId, removeUserId, setAvatar, getToken, setProject, getBusinessId, getProject, setLanguaue,getLanguaue } from '@/utils/auth'
+import { removeToken, removeBusinessId, removeUserId, setAvatar, getToken, setProject, getBusinessId, getProject, setLanguage,getLanguage } from '@/utils/auth'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
@@ -186,17 +186,17 @@ export default {
this.isBusinessMode = getProject() !== '0'
- let initLanguaue = getLanguaue();
- if(!initLanguaue || initLanguaue === '' ){
- initLanguaue = 'zh'
+ let initLanguage = getLanguage();
+ if(!initLanguage || initLanguage === '' ){
+ initLanguage = 'zh'
}
- // this.$i18n.locale = initLanguaue
- this.languaueName = (initLanguaue === 'en' ? "English" : "中文")
+ // this.$i18n.locale = initLanguage
+ this.languaueName = (initLanguage === 'en' ? "English" : "中文")
},
methods: {
handleCommand(command){
- setLanguaue(command)
- this.languaueName = (getLanguaue() === 'en' ? "English" : "中文")
+ setLanguage(command)
+ this.languaueName = (getLanguage() === 'en' ? "English" : "中文")
this.$i18n.locale = command
},
changeBusinessMode(){
diff --git a/src/locales/en.json b/src/locales/en.json
index f60dac3..2f7cf46 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -31,152 +31,159 @@
"submit": "Submit",
"edit": "Edit",
"delete": "Delete",
- "choose": "Please choose"
+ "choose": "Please choose",
+ "query": "Query",
+ "reset": "Reset",
+ "operate": "Operate",
+ "createTIme": "CreateTime",
+ "contactPerson": "ContactPerson",
+ "contactPhone": "ContactPhone",
+ "nodata": "No Data",
+ "set": "reset",
+ "notice_dialog_title": "Tips",
+ "deletedialogtitle": "The selected data will be permanently deleted. Do you want to continue?",
+ "deletesuccess": "Delete Success!",
+ "content": "Content",
+ "styles": "Styles",
+ "bannersetting": "Banner Setting",
+ "onepicturetip": "This is a picture",
+ "all": "All",
+ "allow": "Allow",
+ "notallow": "Not Allow",
+ "uploadnow": "Upload",
+ "baseinfo": "BaseInfo",
+ "yes": "Yes",
+ "no": "No"
},
- "permission": {
- "概括": "Overview",
- "分销商": "Distributor",
- "系统管理": "System Management",
- "字典管理": "Dict Management",
- "角色管理": "Role Management",
- "菜单管理": "Menu Management",
- "用户管理": "User Management",
- "新增": "Add",
- "修改": "Edit",
- "删除": "Delete",
- "新增父级菜单": "Add Parent Menu",
- "新增子级菜单": "Add Child Menu",
- "新增子级按钮": "Add Child Btn",
- "客户管理": "Custom Management",
- "标签管理": "Tag Management",
- "评论": "Comment",
- "评论管理": "Comment Management",
- "敏感词管理": "Sensitive word management",
- "评论列表": "Comment List",
- "添加": "Add",
- "售后处理": "After Sales",
- "平台活动": "Platform activities",
- "商品管理": "Product Management",
- "商品类别": "Product category",
- "商家管理": "Business Management",
- "商家列表": "Business List",
- "入驻申请": "Settled Request",
- "导出标签": "Export",
- "关键词管理": "Keyword Management",
- "订单": "Order",
- "待处理订单": "Pending orders",
- "售后订单": "After sales orders",
- "商品": "Product",
- "商品分组": "Product Group",
- "店铺": "Shop",
- "素材管理": "Material Management",
- "设置": "Setting",
- "商家设置": "Business Setting",
- "物流设置": "Logistics Settings",
- "财务": "Finance",
- "财务明细": "Finance Detail",
- "收款账户": "Finance Account",
- "分销员": "Distributors",
- "保证金": "Margin",
- "财务管理": "Finance Management",
- "提现申请": "Withdrawal Apply",
- "财务概况": "Financial Overview",
- "用户提现": "User withdrawal",
- "批量导入": "Import",
- "新增商品": "Add",
- "新增分组": "Add",
- "新增标签": "Add",
- "上传": "Upload",
- "新建方案": "Add",
- "商家菜单": "Business Menu",
- "终端装修": "Terminal decoration",
- "消息中心": "Msg Center",
- "历史消息": "Msg History",
- "消息推送": "Message push",
- "营销活动": "Marketing activities",
- "优惠券管理": "Coupon Management",
- "拼团": "Piecing together a group",
- "秒杀": "Flash killing",
- "限时折扣": "Limited time discount",
- "客户列表": "Customer List",
- "标签列表": "Tag List",
- "客户分群": "Customer segmentation",
- "运营计划": "Operational planning",
- "优惠券活动": "Coupon activity",
- "秒杀活动": "Flash sale activity",
- "支付有礼": "Pay with courtesy",
- "会员管理": "Member Management",
- "会员列表": "Member List",
- "会员标签": "Member Tag",
- "导出": "Export",
- "会员权益": "Member Benefits",
- "会员等级": "Member Level",
- "订单管理": "Order Management",
- "订单列表": "Order List",
- "场景营销": "Scenario marketing",
- "组合捆绑": "Combination bundling",
- "定价捆绑": "Pricing Bundle",
- "商品列表": "Product List",
- "汽车管理": "Car Management",
- "汽车类别": "Car Category",
- "类别参数": "Category Management",
- "房产管理": "Property Management",
- "房产类型": "Property Type",
- "沙石管理": "Stone Management",
- "沙石类型": "Stone Type",
- "类别分类": "Category classification",
- "再生管理": "Regeneration management",
- "再生类型": "Regeneration type",
- "税务管理": "Tax management",
- "税务类型": "Tax type",
- "直播管理": "Live management",
- "广告管理": "Advertisement Management",
- "直播列表": "Live List",
- "直播商品": "Live Product",
- "广告列表": "Advertising List",
- "风控管理": "Risk control management",
- "IP黑名单": "IP BlackList",
- "用户黑名单": "User BlackList",
- "风控规则": "Risk control rules",
- "客服配置": "Customer configuration",
- "客服管理": "Customer management",
- "测试秒杀活动": "Flash killing activity test",
- "测试限时折扣": "Limited time discount test",
- "测试支付有礼": "Payment courtesy test",
- "测试优惠卷": "Coupon test",
- "积分管理": "Points Management",
- "积分配置": "Integral configuration",
- "积分记录": "Points Record",
- "签到配置": "Sign-in configuration",
- "微信客服": "WeChat customer",
- "直播间管理": "Live room management",
- "直播间商品管理": "Live Room Product Management",
- "微信客服管理": "WeChat customer management",
- "渠道优惠券管理": "Channel coupon management",
- "测试": "Test",
- "手机管理": "Mobile management",
- "二次认证": "Secondary certification",
- "二次认证管理": "Secondary certification management",
- "手机号管理": "Mobile number management",
- "渠道管理": "Channel management",
- "渠道列表": "Channel List",
- "渠道券管理": "Channel voucher management",
- "渠道券活动": "Channel voucher activity",
- "品牌管理": "Branding",
- "手机号码": "Phone Number",
- "渠道优惠券": "Channel Coupon",
- "仓库管理": "Storehouse management",
- "跨境设置": "Cross border settings",
- "分账比例设置": "Allocation ratio setting",
- "库存管理": "Inventory management",
- "库存明细": "Inventory Details",
- "店铺列表": "Shop List",
- "我的店铺": "My Shop",
- "商家商品分类": "Business Product ",
- "商家装修": "BUsiness Build"
+ "permission.概括":"Summarize",
+ "shop": {
+ "dianpuzhuangxiu": "ShopDecoration",
+ "newShop": "New Shop",
+ "shopCode": "ShopCode",
+ "shopName": "shopName",
+ "shopNameHint": "Please input the shop name",
+ "shopCodeHint": "Please input the shop code",
+ "shopContactPersonHint": "Please input the shop contact person",
+ "editShop": "Edit Shop",
+ "shopDetail": "Shop Detail",
+ "shopAddress": "SHop Address",
+ "returnContact": "Return Contact",
+ "returnPhone": "Return Phone",
+ "returnAddress": "Return Address",
+ "crossborderornot": "Cross-border",
+ "ebpname": "Ebpname",
+ "ebpcode": "Ebpcode"
},
- "commom": {
- "nodata": "No Data"
+ "order": {
+ "orderId": "Order Id",
+ "trackingnumber": "Tracking number",
+ "expresscompany": "Express Company",
+ "logisticsinfo": "Logistics Info",
+ "orderinfo": "Order Info",
+ "amountlabel": "Payment Amount"
},
- "notice_dialog_title": "Tips"
+ "business": {
+ "businessLogo": "Logo",
+ "businessInfo": "Business Info",
+ "businessAddress": "Business Address",
+ "businessBrief": "Business Brief",
+ "businessContactMobilePhone": "Business ContactPhone",
+ "payinfoauth": "Payment information authentication",
+ "payauth": "Authentication",
+ "businessAuth": "Business Authentication",
+ "chooseLedgerPeriod": "Please choose ledger period",
+ "payinfoId": "Payment information ID"
+ },
+ "logistics": {
+ "planname": "Plan Name",
+ "newplan": "New Plan",
+ "plannamehint": "Please enter the plan name",
+ "storehouse": "Storehouse",
+ "deliverablerange": "Deliverable Range",
+ "bypiece": "By piece",
+ "byweight": "By weight",
+ "freeshipping": "Free Shipping",
+ "billingtype": "Billing Type",
+ "storehousehint": "Please select a specific storehouse"
+ },
+ "storehouse": {
+ "storehousetype": "Storehouse Type",
+ "storehousekind": "Storehouse Kind",
+ "selfsupportstorehouse": "Self-support Storehouse",
+ "outsourcingstorehouse": "Outsourcing Storehouse",
+ "internalhouse": "Internal Storehouse",
+ "bondedstorehouse": "Bonded Storehouse",
+ "overseasstorehouse": "Overseas Storehouse",
+ "storehousename": "Storehouse Name"
+ },
+ "material": {
+ "picture": "Picture",
+ "video": "Video",
+ "link": "Link",
+ "tag": "Tag",
+ "taghit": "Please enter the tag name",
+ "upload": "Upload"
+ },
+ "product": {
+ "productname": "Product Name",
+ "productnamehint": "Please enter the product name",
+ "productclassify": "Product Classify",
+ "shelvestate": "Shelvestate",
+ "shelvestatehint": "Please choose the shelvestate",
+ "shelveson": "Shelves on",
+ "shelvesoff": "Shelves off",
+ "addproduct": "New Product",
+ "batchexport": "Batch export",
+ "batchimport": "Batch import",
+ "productexport": "Product export",
+ "productId": "Product ID",
+ "mainpicture": "Product main picture",
+ "pricerange": "Price Range",
+ "memberprice": "Member price",
+ "creditsexchange": "Credits exchange",
+ "salesvolume": "Sales volume",
+ "inventory": "Inventory",
+ "notlistedyet": "Not listed yet",
+ "alreadylisted": "Already listed",
+ "tobereviewed": "To be reviewed",
+ "auditfailure": "Audit failure",
+ "causeofrejection": "Cause of rejection",
+ "brand": "Brand",
+ "setmemberprice": "Set Member Price",
+ "batchimportproduct": "Batch Import Product",
+ "productuploadtips": "Only xlsx files can be uploaded, and the size does not exceed 10 MB.",
+ "importproducttips1": "If you do not know the excel template before uploading, please click",
+ "importproducttips2": "Download the template",
+ "importproducttips3": " ",
+ "preferentialmode": "Preferential mode",
+ "discount": "Discount",
+ "specifiedprice": "Specified price",
+ "specification": "Specification",
+ "price": "Price",
+ "clearalloldmembershipprices": "Clear all old membership prices",
+ "pricediscount": "discount",
+ "priceyuan": "yuan",
+ "ownedshop": "Owned shop",
+ "productbrief": "Product brief",
+ "productbriefhint": "Pelease enter product brief",
+ "platformproductclassify": "Platform product classify",
+ "businessproductclassify": "Business Product Classify",
+ "productgroup": "Product Group",
+ "productgrouphint": "Please enter product group",
+ "brandhint": "Please choose brand",
+ "supplierhint": "Please enter the supplier name",
+ "stylesetting": "Style Setting",
+ "multistyle": "Multi-style",
+ "originalprice": "Original price",
+ "rate": "taxRate",
+ "weight": "weight",
+ "Internationalbarcode": "International bar code",
+ "skuname": "Sku name",
+ "skuvalue": "Sku value",
+ "needimage": "Need Image",
+ "newsku": "New Sku",
+ "productdetail": "Product Details",
+ "needlogitics": "Need Logistics",
+ "allowoversold": "Allow Oversold"
+ }
}
diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
index ce5575b..7a7c700 100644
--- a/src/locales/zh-CN.json
+++ b/src/locales/zh-CN.json
@@ -32,153 +32,167 @@
"submit": "提交",
"edit": "编辑",
"delete": "删除",
- "choose": "请选择"
+ "choose": "请选择",
+ "query": "查询",
+ "reset": "重置",
+ "operate": "操作",
+ "createTIme": "创建时间",
+ "contactPhone": "联系电话",
+ "contactPerson": "负责人",
+ "nodata": "暂无数据",
+ "set": "重置",
+ "notice_dialog_title": "温馨提示",
+ "deletedialogtitle": "选中数据将被永久删除, 是否继续？",
+ "deletesuccess": "删除成功!",
+ "content": "内容",
+ "styles": "样式",
+ "bannersetting": "banner设置",
+ "onepicturetip": "这是一张图片",
+ "all": "全部",
+ "allow": "允许",
+ "notallow": "不允许",
+ "uploadnow": "立即上传",
+ "baseinfo": "基础信息",
+ "yes": "是",
+ "no": "否"
},
- "permission": {
- "概况": "概况",
- "概括": "概括",
- "分销商": "分销商",
- "系统管理": "系统管理",
- "字典管理": "字典管理",
- "角色管理": "角色管理",
- "菜单管理": "菜单管理",
- "用户管理": "用户管理",
- "新增": "新增",
- "修改": "修改",
- "删除": "删除",
- "新增父级菜单": "新增父级菜单",
- "新增子级菜单": "新增子级菜单",
- "新增子级按钮": "新增子级按钮",
- "客户管理": "客户管理",
- "标签管理": "标签管理",
- "评论": "评论",
- "评论管理": "评论管理",
- "敏感词管理": "敏感词管理",
- "评论列表": "评论列表",
- "添加": "添加",
- "售后处理": "售后处理",
- "平台活动": "平台活动",
- "商品管理": "商品管理",
- "商品类别": "商品类别",
- "商家管理": "商家管理",
- "商家列表": "商家列表",
- "入驻申请": "入驻申请",
- "导出标签": "导出标签",
- "关键词管理": "关键词管理",
- "订单": "订单",
- "待处理订单": "待处理订单",
- "售后订单": "售后订单",
- "商品": "商品",
- "商品分组": "商品分组",
- "店铺": "店铺",
- "素材管理": "素材管理",
- "设置": "设置",
- "商家设置": "商家设置",
- "物流设置": "物流设置",
- "财务": "财务",
- "财务明细": "财务明细",
- "收款账户": "收款账户",
- "分销员": "分销员",
- "保证金": "保证金",
- "财务管理": "财务管理",
- "提现申请": "提现申请",
- "财务概况": "财务概况",
- "用户提现": "用户提现",
- "批量导入": "批量导入",
- "新增商品": "新增商品",
- "新增分组": "新增分组",
- "新增标签": "新增标签",
- "上传": "上传",
- "新建方案": "新建方案",
- "商家菜单": "商家菜单",
- "终端装修": "终端装修",
- "消息中心": "消息中心",
- "历史消息": "历史消息",
- "消息推送": "消息推送",
- "营销活动": "营销活动",
- "优惠券管理": "优惠券管理",
- "拼团": "拼团",
- "秒杀": "秒杀",
- "限时折扣": "限时折扣",
- "客户列表": "客户列表",
- "标签列表": "标签列表",
- "客户分群": "客户分群",
- "运营计划": "运营计划",
- "优惠券活动": "优惠券活动",
- "秒杀活动": "秒杀活动",
- "支付有礼": "支付有礼",
- "会员管理": "会员管理",
- "会员列表": "会员列表",
- "会员标签": "会员标签",
- "导出": "导出",
- "会员权益": "会员权益",
- "会员等级": "会员等级",
- "订单管理": "订单管理",
- "订单列表": "订单列表",
- "场景营销": "场景营销",
- "组合捆绑": "组合捆绑",
- "定价捆绑": "定价捆绑",
- "商品列表": "商品列表",
- "汽车管理": "汽车管理",
- "汽车类别": "汽车类别",
- "类别参数": "类别参数",
- "房产管理": "房产管理",
- "房产类型": "房产类型",
- "沙石管理": "沙石管理",
- "沙石类型": "沙石类型",
- "类别分类": "类别分类",
- "再生管理": "再生管理",
- "再生类型": "再生类型",
- "税务管理": "税务管理",
- "税务类型": "税务类型",
- "直播管理": "直播管理",
- "广告管理": "广告管理",
- "直播列表": "直播列表",
- "直播商品": "直播商品",
- "广告列表": "广告列表",
- "风控管理": "风控管理",
- "IP黑名单": "IP黑名单",
- "用户黑名单": "用户黑名单",
- "风控规则": "风控规则",
- "客服配置": "客服配置",
- "客服管理": "客服管理",
- "测试秒杀活动": "测试秒杀活动",
- "测试限时折扣": "测试限时折扣",
- "测试支付有礼": "测试支付有礼",
- "测试优惠卷": "测试优惠卷",
- "积分管理": "积分管理",
- "积分配置": "积分配置",
- "积分记录": "积分记录",
- "签到配置": "签到配置",
- "微信客服": "微信客服",
- "直播间管理": "直播间管理",
- "直播间商品管理": "直播间商品管理",
- "微信客服管理": "微信客服管理",
- "渠道优惠券管理": "渠道优惠券管理",
- "测试": "测试",
- "手机管理": "手机管理",
- "二次认证": "二次认证",
- "二次认证管理": "二次认证管理",
- "手机号管理": "手机号管理",
- "渠道管理": "渠道管理",
- "渠道列表": "渠道列表",
- "渠道券管理": "渠道券管理",
- "渠道券活动": "渠道券活动",
- "品牌管理": "品牌管理",
- "手机号码": "手机号码",
- "渠道优惠券": "渠道优惠券",
- "仓库管理": "仓库管理",
- "跨境设置": "跨境设置",
- "分账比例设置": "分账比例设置",
- "库存管理": "库存管理",
- "库存明细": "库存明细",
- "店铺列表": "店铺列表",
- "我的店铺": "我的店铺",
- "商家商品分类": "商家商品分类",
- "商家装修": "商家装修"
+ "permission.概括":"概括",
+ "shop": {
+ "dianpuzhuangxiu": "店铺装修",
+ "newShop": "新增店铺",
+ "shopCode": "店铺编码",
+ "shopName": "店铺名称",
+ "shopNameHint": "请输入店铺名称",
+ "shopCodeHint": "请输入店铺编码",
+ "shopContactPersonHint": "请输入负责人",
+ "editShop": "修改店铺",
+ "shopDetail": "店铺详情",
+ "shopAddress": "店铺地址",
+ "returnContact": "退货联系人",
+ "returnPhone": "退货联系电话",
+ "returnAddress": "退货地址",
+ "crossborderornot": "是否跨境",
+ "ebpname": "电商企业名称",
+ "ebpcode": "电商企业代码"
},
- "commom": {
- "nodata": "暂无数据"
+ "order": {
+ "orderId": "订单ID",
+ "trackingnumber": "快递单号",
+ "send": "发货",
+ "expresscompany": "快递公司",
+ "logisticsinfo": "物流信息",
+ "orderinfo": "订单信息",
+ "payunit": "（元）",
+ "amountlabel": "支付金额（元）"
},
- "notice_dialog_title": "温馨提示"
+ "business": {
+ "businessName": "商家名称",
+ "businessLogo": "商家logo",
+ "businessInfo": "商家信息",
+ "businessAddress": "商家地址",
+ "businessBrief": "商家简介",
+ "businessContactMobilePhone": "负责人手机号",
+ "payinfoauth": "支付信息认证",
+ "payauth": "立即认证",
+ "businessAuth": "商家认证",
+ "ledgerperiod": "分账账期",
+ "chooseLedgerPeriod": "请选择分账账期",
+ "payinfoId": "支付信息Id"
+ },
+ "logistics": {
+ "planname": "方案名称",
+ "newplan": "新增物流方案",
+ "plannamehint": "请输入方案名称",
+ "storehouse": "仓库",
+ "deliverablerange": "可配送范围",
+ "bypiece": "按件数",
+ "byweight": "按重量",
+ "freeshipping": "包邮",
+ "billingtype": "计费方式",
+ "storehousehint": "请选择具体仓库"
+ },
+ "storehouse": {
+ "storehousetype": "仓库类型",
+ "storehousekind": "仓库种类",
+ "selfsupportstorehouse": "自营仓",
+ "outsourcingstorehouse": "委外仓",
+ "internalhouse": "国内仓",
+ "bondedstorehouse": "保税仓",
+ "overseasstorehouse": "海外仓",
+ "storehousename": "仓库名称"
+ },
+ "material": {
+ "picture": "图片",
+ "video": "视频",
+ "link": "链接",
+ "tag": "标签",
+ "taghit": "请输入标签名称",
+ "upload": "点击上传"
+ },
+ "product": {
+ "productname": "商品名称",
+ "productnamehint": "请输入商品名称",
+ "productclassify": "商品分类",
+ "shelvestate": "上架状态",
+ "shelvestatehint": "请选择上架状态",
+ "shelveson": "上架",
+ "shelvesoff": "下架",
+ "addproduct": "新增商品",
+ "batchexport": "批量导入",
+ "batchimport": "批量导入",
+ "productexport": "导出商品",
+ "productId": "商品id",
+ "mainpicture": "商品主图",
+ "pricerange": "售价区间",
+ "memberprice": "会员价",
+ "creditsexchange": "积分兑换",
+ "salesvolume": "销量",
+ "inventory": "库存",
+ "notlistedyet": "未上架",
+ "alreadylisted": "已上架",
+ "tobereviewed": "待审核",
+ "auditfailure": "审核失败",
+ "causeofrejection": "驳回原因",
+ "brand": "品牌",
+ "setmemberprice": "设置会员价",
+ "batchimportproduct": "批量导入商品",
+ "productuploadtips": "只能上传xlsx文件，且不超过10M",
+ "importproducttips1": "上传前不知道excel模板的，请点击",
+ "importproducttips2": "点我下载模板",
+ "importproducttips3": "去下载",
+ "preferentialmode": "优惠方式",
+ "discount": "折扣",
+ "specifiedprice": "指定价格",
+ "specification": "规格",
+ "price": "售价",
+ "clearalloldmembershipprices": "清除所有旧会员价",
+ "pricediscount": "折",
+ "priceyuan": "元",
+ "editproduct": "编辑商品",
+ "ownedshop": "所属店铺",
+ "productbrief": "卖点简介",
+ "productbriefhint": "请输入卖点简介",
+ "platformproductclassify": "平台商品分类",
+ "businessproductclassify": "商家商品分类",
+ "productgroup": "商品分组",
+ "productgrouphint": "请选择商品分组",
+ "brandhint": "请选择品牌",
+ "supplier": "供应商",
+ "supplierhint": "请输入供应商名称",
+ "productimg": "商品图片",
+ "stylesetting": "款式设置",
+ "singlestyle": "单款式",
+ "multistyle": "多款式",
+ "originalprice": "原价",
+ "rate": "税率",
+ "weight": "重量",
+ "Internationalbarcode": "国际条码",
+ "skuname": "规格名",
+ "skuvalue": "规格值",
+ "needimage": "需要配图",
+ "newsku": "添加规格",
+ "productdetail": "商品详情",
+ "needlogitics": "需要物流",
+ "allowoversold": "允许超卖"
+ }
}
diff --git a/src/main.js b/src/main.js
index 2767623..59c0168 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,14 +30,14 @@ import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'
// Vue.use(ElementUI, { locale })
// 如果想要中文版 element-ui，按如下方式声明
-const messages={
+const messages = {
- en:{
+ "en":{
... require('./locales/en.json'),
...elementEnLocale
},
- zh:{
+ "zh":{
... require('./locales/zh-CN.json'),
...elementZhLocale
@@ -51,7 +51,7 @@ const i18n = new VueI18n({
Vue.use(ElementUI, {
i18n: (key, value) => i18n.t(key, value)
})
-
+window.i18n = i18n;
Vue.config.productionTip = false
new Vue({
diff --git a/src/permission.js b/src/permission.js
index 892aa82..a0ce446 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -83,6 +83,50 @@ router.beforeEach(async(to, from, next) => {
export const loadMenus = (next, to) => {
adminBuild({ platformUserId: getUserId() }).then(res => {
+
+ //整理多语言资源
+ let menuList = res.data;
+ let enDataMap={}
+ let zhCNDataMap={}
+ menuList.forEach(item => {
+ let enDataItem = ""
+ let zhCNDataItem = ""
+ if(item.permissionNameMap){
+ enDataItem = item.permissionNameMap["en"]
+ zhCNDataItem = item.permissionNameMap["zh"]
+ }
+ if(enDataItem && enDataItem.length > 0){
+ enDataMap["permission."+item.permissionName]=enDataItem;
+ }
+ if(zhCNDataItem && zhCNDataItem.length > 0){
+ zhCNDataMap["permission."+item.permissionName]=zhCNDataItem;
+ }
+ if(item.children){
+ item.children.forEach(childItem => {
+ let enDataChildItem = ""
+ let zhCNDataChildItem = ""
+ if(childItem.permissionNameMap){
+ enDataChildItem = childItem.permissionNameMap["en"]
+ zhCNDataChildItem = childItem.permissionNameMap["zh"]
+ }
+ if(enDataChildItem && enDataChildItem.length > 0){
+ enDataMap["permission."+childItem.permissionName]=enDataChildItem;
+ }
+ if(zhCNDataChildItem && zhCNDataChildItem.length > 0){
+ zhCNDataMap["permission."+childItem.permissionName]=zhCNDataChildItem;
+ }
+ })
+ }
+
+ })
+ // console.log(enDataMap)
+ // console.log(i18n.getLocaleMessage('en'))
+ // console.log(Object.assign(enDataMap,i18n.getLocaleMessage('en')))
+ // i18n.setLocaleMessage('en', Object.assign(enDataMap,i18n.getLocaleMessage('en')));
+ // i18n.setLocaleMessage('zh-CN', Object.assign(zhCNDataMap,i18n.getLocaleMessage('zh-CN')));
+ i18n.mergeLocaleMessage('en',enDataMap);
+ i18n.mergeLocaleMessage('zh', zhCNDataMap);
+
// setBtns(JSON.stringify(res.buttons))
const asyncRouter = filterAsyncRouter(res.data)
// 画布设置
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 59fa10f..4862810 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -52,11 +52,11 @@ export function setProject(name) {
return sessionStorage.setItem(project, name)
}
-export function setLanguaue(lang) {
+export function setLanguage(lang) {
return localStorage.setItem(language, lang)
}
-export function getLanguaue() {
+export function getLanguage() {
return localStorage.getItem(language)
}
diff --git a/src/utils/request.js b/src/utils/request.js
index 460d95b..208fc9a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,6 +8,7 @@ import router from '@/router'
import {
getToken,
getBusinessId,
+ getLanguage,
getProject,
removeToken
} from '@/utils/auth'
@@ -33,6 +34,8 @@ service.interceptors.request.use(
config.headers['Authorization-business'] = getToken()
config.headers['businessId'] = getBusinessId()
+ config.headers['language'] = getLanguage()
+
let headerProject = config.headers['project']
if(!headerProject){
config.headers['project'] = getProject()
diff --git a/src/views/active/getActive.vue b/src/views/active/getActive.vue
index 898a9f8..d336ff4 100644
--- a/src/views/active/getActive.vue
+++ b/src/views/active/getActive.vue
@@ -95,13 +95,13 @@
type="primary"
plain
@click="search"
- >查询
+ >{{ $t('common.query') }}
</el-button>
<el-button
type="primary"
plain
@click="clear"
- >重置
+ >{{ $t('common.set') }}
</el-button>
</nav>
<!-- <div class="formSearch">
@@ -146,8 +146,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="primary" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div> -->
diff --git a/src/views/active/index.vue b/src/views/active/index.vue
index 61d0b9f..fb8ef92 100644
--- a/src/views/active/index.vue
+++ b/src/views/active/index.vue
@@ -39,8 +39,8 @@
<el-option label="报名失败" value="2" />
</el-select>
</div>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
</FixedNav>
<!-- 表格 -->
<div class="tableBox">
@@ -81,7 +81,7 @@
<span v-if="scope.row.signState == null">未报名</span>
</template>
</el-table-column>
- <el-table-column label="操作" fixed="right" show-overflow-tooltip width="220">
+ <el-table-column :label="$t('common.operate')" fixed="right" show-overflow-tooltip width="220">
<template slot-scope="scope">
<div class="btnList">
<el-button
diff --git a/src/views/commodity/commdityClass/Edit.vue b/src/views/commodity/commdityClass/Edit.vue
index addbf22..113f968 100644
--- a/src/views/commodity/commdityClass/Edit.vue
+++ b/src/views/commodity/commdityClass/Edit.vue
@@ -31,13 +31,22 @@
<div class="content">
<el-input
- v-model="data.classifyName"
+ v-model="data.classifyName_ZH"
class="input"
:disabled="isCheck"
maxlength="6"
size="mini"
:placeholder="data.classifyLevel | placeholderTips"
/>
+ <el-input
+
+ v-model="data.classifyName_EN"
+ class="input"
+ :disabled="isCheck"
+ maxlength="6"
+ size="mini"
+ :placeholder="data.classifyLevel | placeholderEnTips"
+ />
<el-upload
class="upload-uploader"
:headers="headers"
@@ -176,9 +185,19 @@ export default {
placeholderTips (classifyLevel) {
classifyLevel = classifyLevel + ''
const tipsMp = {
- 1: '输入一级类别名称（最大6个字符）',
- 2: '输入二级类别名称（最大6个字符）',
- 3: '输入三级类别名称（最大6个字符）'
+ 1: '输入一级类别中文名称（最大6个字符）',
+ 2: '输入二级类别中文名称（最大6个字符）',
+ 3: '输入三级类别中文名称（最大6个字符）'
+ }
+ return tipsMp[classifyLevel]
+ },
+
+ placeholderEnTips (classifyLevel) {
+ classifyLevel = classifyLevel + ''
+ const tipsMp = {
+ 1: '输入一级类别英文名称（最大60个字符）',
+ 2: '输入二级类别英文名称（最大60个字符）',
+ 3: '输入三级类别英文名称（最大60个字符）'
}
return tipsMp[classifyLevel]
}
@@ -266,6 +285,12 @@ export default {
oneClassifyId
})
const resData = res.data
+ resData.classifyName_ZH = JSON.parse(resData.classifyNameJson)[
+ "zh"
+ ];
+ resData.classifyName_EN = JSON.parse(resData.classifyNameJson)[
+ "en"
+ ];
this.initImageArray(resData)
if (resData) {
this.treeData = [resData]
@@ -307,7 +332,8 @@ export default {
idx: idx++,
classifyId: 0,
classifyPid: 0,
- classifyName: '',
+ classifyName_ZH: '',
+ classifyName_EN: '',
classifyImage: '',
classifyLevel: 1,
link: '',
@@ -331,7 +357,8 @@ export default {
idx: idx++,
classifyId: 0,
classifyPid: 0,
- classifyName: '',
+ classifyName_ZH: '',
+ classifyName_EN: '',
classifyImage: '',
classifyLevel: classifyLevel,
link: '',
@@ -385,10 +412,19 @@ export default {
},
async addGroup () {
const params = this.treeData
+
if (params.length === 0) {
this.$message.error('请添加分类')
return
}
+ for (const index in params) {
+ let itemParams = params[index]
+ itemParams.classifyName = itemParams.classifyName_ZH;
+ itemParams.classifyNameMap = {}
+ itemParams.classifyNameMap["zh"] = itemParams.classifyName_ZH;
+ itemParams.classifyNameMap["en"] = itemParams.classifyName_EN;
+ itemParams.classifyNameJson = JSON.stringify(itemParams.classifyNameMap);
+ }
this.resetImage(this.treeData[0])
const obj = {
classifies: params
@@ -410,6 +446,14 @@ export default {
this.$message.error('请选择分类')
return
}
+ for (const index in params) {
+ let itemParams = params[index]
+ itemParams.classifyName = itemParams.classifyName_ZH;
+ itemParams.classifyNameMap = {}
+ itemParams.classifyNameMap["zh"] = itemParams.classifyName_ZH;
+ itemParams.classifyNameMap["en"] = itemParams.classifyName_EN;
+ itemParams.classifyNameJson = JSON.stringify(itemParams.classifyNameMap);
+ }
this.resetImage(this.treeData[0])
const obj = {
classifies: params,
diff --git a/src/views/commodity/commdityClass/index.vue b/src/views/commodity/commdityClass/index.vue
index bd46f06..ffbad90 100644
--- a/src/views/commodity/commdityClass/index.vue
+++ b/src/views/commodity/commdityClass/index.vue
@@ -11,8 +11,9 @@
:header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
:tree-props="{ children: 'childs' }"
>
- <el-table-column prop="classifyName" label="商品类别" />
- <el-table-column prop="status" label="操作">
+ <el-table-column prop="classifyName_ZH" label="商品类别(中文)" />
+ <el-table-column prop="classifyName_EN" label="商品类别(英文)" />
+ <el-table-column prop="status" :label="$t('common.operate')">
<template slot-scope="scope">
<el-button type="text" @click.native.prevent="checkRow(scope.row)">{{ $t('common.view') }}</el-button>
<el-button type="text" @click.native.prevent="updateRow(scope.row)">{{ $t('common.edit') }}</el-button>
@@ -125,8 +126,8 @@ export default {
// 删除
async deleteRow(row) {
this.$confirm('此操作将永久删除该类别, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ confirmButtonText: $t('common.sure'),
+ cancelButtonText: $t('common.cancle'),
type: 'warning'
})
.then(() => {
@@ -153,8 +154,17 @@ export default {
},
async getAll(formParams) {
const res = await commdityClassGetAll(formParams, {project: getBusinessId()})
- this.tableData = res.data.list
- this.total = res.data.total
+ let tempData = res.data.list;
+ tempData.forEach((itemData) => {
+ itemData.classifyName_ZH = JSON.parse(itemData.classifyNameJson)[
+ "zh"
+ ];
+ itemData.classifyName_EN = JSON.parse(itemData.classifyNameJson)[
+ "en"
+ ];
+ });
+ this.tableData = tempData;
+ this.total = res.data.total;
}
}
}
diff --git a/src/views/commodity/commodityList copy/commodityGroup.vue b/src/views/commodity/commodityList copy/commodityGroup.vue
index 0147be6..e106cdc 100644
--- a/src/views/commodity/commodityList copy/commodityGroup.vue
+++ b/src/views/commodity/commodityList copy/commodityGroup.vue
@@ -104,8 +104,8 @@
<el-input v-model="formInline.minPrice" maxlength="9" /><span>至</span><el-input v-model="formInline.maxPrice" maxlength="9" />
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clearData">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clearData">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/commodity/commodityList copy/index.vue b/src/views/commodity/commodityList copy/index.vue
index 9cbb9b7..e8ccb4d 100644
--- a/src/views/commodity/commodityList copy/index.vue
+++ b/src/views/commodity/commodityList copy/index.vue
@@ -9,7 +9,7 @@
<el-input v-model="formInline.search" maxlength="20" placeholder="请输入分组名称" />
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
<el-button type="primary" plain @click="addNewGroup">新增分组</el-button>
<!-- <span v-for="(item,index) in btnList" :key="index" class="promissStyle">
<el-button type="success" plain @click="btnClick(item)">{{ item.permissionName }}</el-button>
@@ -37,7 +37,7 @@
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column prop="updateTime" label="修改时间" width="220" />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/commodity/commodityList/commodityGroup.vue b/src/views/commodity/commodityList/commodityGroup.vue
index 86f802e..d13f9df 100644
--- a/src/views/commodity/commodityList/commodityGroup.vue
+++ b/src/views/commodity/commodityList/commodityGroup.vue
@@ -104,8 +104,8 @@
<el-input v-model="formInline.minPrice" maxlength="9" /><span>至</span><el-input v-model="formInline.maxPrice" maxlength="9" />
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clearData">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clearData">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/commodity/commodityList/index.vue b/src/views/commodity/commodityList/index.vue
index 15d3790..fc88a8d 100644
--- a/src/views/commodity/commodityList/index.vue
+++ b/src/views/commodity/commodityList/index.vue
@@ -9,7 +9,7 @@
<el-input v-model="formInline.search" maxlength="20" placeholder="请输入分组名称" />
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
<el-button type="primary" plain @click="addNewGroup">新增分组</el-button>
<!-- <span v-for="(item,index) in btnList" :key="index" class="promissStyle">
<el-button type="success" plain @click="btnClick(item)">{{ item.permissionName }}</el-button>
@@ -37,7 +37,7 @@
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column prop="updateTime" label="修改时间" width="220" />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/commodity/commoditySystem/addCommodity.vue b/src/views/commodity/commoditySystem/addCommodity.vue
index ff3ff18..53f61de 100644
--- a/src/views/commodity/commoditySystem/addCommodity.vue
+++ b/src/views/commodity/commoditySystem/addCommodity.vue
@@ -2,9 +2,9 @@
<div class="edit_add_page">
<div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
- <div class="detail_title">基础信息</div>
+ <div class="detail_title">{{ $t('common.baseinfo') }}</div>
- <el-form-item label="所属店铺:" prop="shopId">
+ <el-form-item :label="$t('product.ownedshop')" prop="shopId">
<el-select v-model="form.shopId" placeholder="请选择所属店铺" clearable>
<el-option v-for="(item, index) in shopList" :key="index" :label="item.shopName"
:value="item.shopId" />
@@ -12,15 +12,15 @@
</el-form-item>
- <el-form-item label="商品名称:" prop="productName">
- <el-input v-model="form.productName" maxlength="50" class="form-content-item-input" placeholder="请输入商品名称" show-word-limit />
+ <el-form-item :label="$t('product.productname')" prop="productName">
+ <el-input v-model="form.productName" maxlength="50" class="form-content-item-input" :placeholder="$t('product.productnamehint')" show-word-limit />
</el-form-item>
- <el-form-item label="卖点简介:" prop="productBrief">
- <el-input v-model="form.productBrief" maxlength="50" class="form-content-item-input" placeholder="请输入卖点简介" show-word-limit />
+ <el-form-item :label="$t('product.productbrief')" prop="productBrief">
+ <el-input v-model="form.productBrief" maxlength="50" class="form-content-item-input" :placeholder="$t('product.productbriefhint')" show-word-limit />
</el-form-item>
- <el-form-item label="平台商品分类:" prop="classifyId">
+ <el-form-item :label="$t('product.platformproductclassify')" prop="classifyId">
<el-cascader v-model="form.classifyId" :options="classifyList" clearable :props="{
checkStrictly: false,
label: 'categoryName',
@@ -29,14 +29,14 @@
}" @change="handleChangeCascader" />
</el-form-item>
- <el-form-item label="商品分组:" prop="shopGroupId">
- <el-select v-model="form.shopGroupId" placeholder="请选择商品分组" clearable>
+ <el-form-item :label="$t('product.productgroup')" prop="shopGroupId">
+ <el-select v-model="form.shopGroupId" :placeholder="$t('product.productgrouphint')" clearable>
<el-option v-for="(item, index) in groupList" :key="index" :label="item.groupName"
:value="item.shopGroupId" />
</el-select>
</el-form-item>
- <el-form-item label="商家商品分类:" prop="classifyBusinessId">
+ <el-form-item :label="$t('product.businessproductclassify')" prop="classifyBusinessId">
<el-cascader v-model="form.classifyBusinessId" :options="classifyBusinessList" clearable :props="{
checkStrictly: false,
label: 'categoryName',
@@ -52,16 +52,16 @@
</el-select>
</el-form-item> -->
- <el-form-item label="品牌:">
- <el-select v-model="form.brandId" clearable placeholder="请选择品牌">
+ <el-form-item :label="$t('product.brand')">
+ <el-select v-model="form.brandId" clearable :placeholder="$t('product.brandhint')">
<el-option v-for="item in brandList" :key="item.id" :label="item.brandName" :value="item.id" />
</el-select>
</el-form-item>
- <el-form-item class="form-item-long" label="供应商:">
- <el-input v-model="form.supplierName" maxlength="20" class="form-content-item-input" show-word-limit placeholder="请输入供应商名称" />
+ <el-form-item class="form-item-long" :label="$t('product.supplier')">
+ <el-input v-model="form.supplierName" maxlength="20" class="form-content-item-input" show-word-limit placeholder="$t('product.supplierhint')" />
</el-form-item>
- <el-form-item label="商品图片:">
+ <el-form-item :label="$t('product.productimg')">
<div class="upload-wrap">
<el-upload list-type="picture-card" :on-preview="handlePictureCardPreview" :on-remove="handleRemove"
:headers="headers" :data="dataObj" :file-list="form.images" :limit="20" :on-success="handleImageSuccess"
@@ -82,10 +82,10 @@
</div>
</el-form-item>
- <el-form-item label="款式设置:">
+ <el-form-item :label="$t('product.stylesetting')">
<el-radio-group v-model="form.attrStyle" @input="changeAttrStyle">
- <el-radio :label="0" key="0">单款式</el-radio>
- <el-radio :label="1" key="1">多款式</el-radio>
+ <el-radio :label="0" key="0">{{$t('product.singlestyle')}}</el-radio>
+ <el-radio :label="1" key="1">{{ $t('product.multistyle') }}</el-radio>
</el-radio-group>
</el-form-item>
@@ -93,52 +93,52 @@
<div v-if="form.attrStyle === 0" class="single-style">
<el-table :data="skuList" style="width: 100%"
:header-cell-style="{ background: '#EEF3FF', color: '#333333' }">
- <el-table-column label="规格">
+ <el-table-column :label="$t('product.specification')">
<template slot-scope="scope">
<el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="10" />
</template>
</el-table-column>
- <el-table-column label="售价">
+ <el-table-column :label="$t('product.price')">
<template slot-scope="scope">
<el-input-number v-model="scope.row.price" :controls="false" :max="999999999" :min="0" :precision="2"
:step="0.01" />
</template>
</el-table-column>
- <el-table-column label="原价">
+ <el-table-column :label="$t('product.originalprice')">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
<el-input-number v-model="scope.row.originalPrice" :controls="false" :max="999999999" :min="0"
:precision="2" :step="0.01" />
</template>
</el-table-column>
- <el-table-column label="税率">
+ <el-table-column :label="$t('product.rate')">
<template slot-scope="scope">
<el-input-number v-model="scope.row.rate" :controls="false" :min="0" :precision="2" :step="0.01" />
</template>
</el-table-column>
- <el-table-column label="仓库">
+ <el-table-column :label="$t('logistics.storehouse')">
<template slot-scope="scope">
- <el-select v-model="scope.row.storehouseId" placeholder="请选择具体仓库" clearable>
+ <el-select v-model="scope.row.storehouseId" :placeholder="$t('logistics.storehousehint')" clearable>
<el-option v-for="(item, index) in storehouseList" :key="index" :label="item.storehouseName"
:value="item.storehouseId" />
</el-select>
</template>
</el-table-column>
- <el-table-column label="库存">
+ <el-table-column :label="$t('product.inventory')">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.stockNumber" type="number" oninput="value=value.replace(/[^\d]/g,'')" /> -->
<el-input-number v-model="scope.row.stockNumber" :disabled="true" :controls="false" :max="999999999"
:min="0" :precision="0" />
</template>
</el-table-column>
- <el-table-column label="重量(KG)">
+ <el-table-column :label="$t('product.weight')">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.weight" type="number" oninput="value=value.replace(/-/, '')" /> -->
<el-input-number v-model="scope.row.weight" :controls="false" :max="999" :min="0" :precision="2"
:step="0.01" />
</template>
</el-table-column>
- <el-table-column label="国际条码">
+ <el-table-column :label="$t('product.Internationalbarcode')">
<template slot-scope="scope">
<el-input v-model="scope.row.sku" maxlength="20" />
</template>
@@ -147,12 +147,12 @@
</div>
<div v-else class="multiple-styles">
<div v-for="(skuAttr, index) in form.skuAttrList" :key="index" class="sku-attr-list">
- <el-form-item label="规格名">
+ <el-form-item :label="$t('product.skuname')">
<el-input v-model="skuAttr.skuName" maxlength="20" />
<i v-if="index != 0" class="el-icon-close delImg" @click="delSkuAttrList(index)" />
- <el-checkbox v-if="index === 0" v-model="skuAttr.needImg" style="margin-left: 20px;">需要配图</el-checkbox>
+ <el-checkbox v-if="index === 0" v-model="skuAttr.needImg" style="margin-left: 20px;">{{ $t('product.needimage') }}</el-checkbox>
</el-form-item>
- <el-form-item label="规格值">
+ <el-form-item :label="$t('product.skuvalue')">
<div class="attr-value-list">
<div v-for="(sku, index1) in skuAttr.values" :key="index + '-' + index1" class="main-diagram m-8">
<el-input v-model="sku.skuValue" maxlength="10" />
@@ -179,11 +179,11 @@
</div>
</div>
</div>
- <el-button type="text" style="margin-left: 10px;" @click="addAttrValue(index)">添加</el-button>
+ <el-button type="text" style="margin-left: 10px;" @click="addAttrValue(index)">{{ $t('permission.添加') }}</el-button>
</div>
</el-form-item>
</div>
- <el-button class="add-attr-btn" type="primary" @click="addSkuAttrList">添加规格</el-button>
+ <el-button class="add-attr-btn" type="primary" @click="addSkuAttrList">{{ $t('product.newsku') }}</el-button>
<el-table :data="skuList" style="width: 100%"
:header-cell-style="{ background: '#EEF3FF', color: '#333333' }">
<el-table-column v-for="(skuAttr, index) in skuAttrName" :key="index" :label="skuAttr.skuName">
@@ -214,34 +214,34 @@
<el-input-number v-model="scope.row.rate" :controls="false" :min="0" :precision="2" :step="0.01" />
</template>
</el-table-column>
- <el-table-column label="仓库">
+ <el-table-column :label="$t('logistics.storehouse')">
<template slot-scope="scope">
- <el-select v-model="scope.row.storehouseId" placeholder="请选择具体仓库" clearable>
+ <el-select v-model="scope.row.storehouseId" :placeholder="$t('logistics.storehousehint')" clearable>
<el-option v-for="(item, index) in storehouseList" :key="index" :label="item.storehouseName"
:value="item.storehouseId" />
</el-select>
</template>
</el-table-column>
- <el-table-column label="库存">
+ <el-table-column :label="$t('product.inventory')">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.stockNumber" type="number" oninput="value=value.replace(/[^\d]/g,'')" /> -->
<el-input-number v-model="scope.row.stockNumber" :disabled="true" :controls="false" :max="999999999"
:min="0" :precision="0" />
</template>
</el-table-column>
- <el-table-column label="重量(KG)">
+ <el-table-column :label="$t('product.weight')">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.weight" type="number" oninput="value=value.replace(/-/, '')" /> -->
<el-input-number v-model="scope.row.weight" :controls="false" :max="999" :min="0" :precision="6"
:step="0.01" />
</template>
</el-table-column>
- <el-table-column label="国际条码" width="120">
+ <el-table-column label="$t('product.Internationalbarcode')" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.sku" maxlength="20" />
</template>
</el-table-column>
- <!-- <el-table-column label="操作">
+ <!-- <el-table-column :label="$t('common.operate')">
<template slot-scope="scope">
<el-button type="text" @click="delAttrValue(scope.row,scope.$index,scope.row,scope)">{{ $t('common.delete') }}</el-button>
</template>
@@ -250,7 +250,7 @@
</div>
</div>
- <el-form-item label="商品详情:" style="margin-bottom: 5px;">
+ <el-form-item :label="$t('product.productdetail')" style="margin-bottom: 5px;">
</el-form-item>
<Tinymce v-if="showTinymce" ref="content" v-model="form.productText" style="width: 99%;" class="tinymce-wrap"
@@ -259,33 +259,33 @@
<div class="lastitem">
<div class="hitem">
- <el-form-item label="需要物流" prop="ifLogistics">
+ <el-form-item :label="$t('product.needlogitics')" prop="ifLogistics">
<el-radio-group v-model="form.ifLogistics">
- <el-radio :label="1">是</el-radio>
- <el-radio :label="0">否</el-radio>
+ <el-radio :label="1">{{ $t('common.yes') }}</el-radio>
+ <el-radio :label="0">{{ $t('common.no') }}</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="允许超卖" prop="ifOversold">
+ <el-form-item :label="$t('product.allowoversold')" prop="ifOversold">
<el-radio-group v-model="form.ifOversold">
- <el-radio :label="1">允许</el-radio>
- <el-radio :label="0">不允许</el-radio>
+ <el-radio :label="1">{{ $t('common.allow') }}</el-radio>
+ <el-radio :label="0">{{ $t('common.notallow') }}</el-radio>
</el-radio-group>
</el-form-item>
</div>
<div class="hitem">
- <el-form-item label="上架状态" prop="shelveState">
+ <el-form-item :label="$t('product.shelvestate')" prop="shelveState">
<el-radio-group v-model="form.shelveState">
- <el-radio :label="1">上架</el-radio>
- <el-radio :label="0">下架</el-radio>
+ <el-radio :label="1">{{ $t('product.shelveson') }}</el-radio>
+ <el-radio :label="0">{{ $t('product.shelvesoff') }}</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="积分兑换" prop="ifCredit">
+ <el-form-item :label="$t('product.creditsexchange')" prop="ifCredit">
<el-radio-group v-model="form.ifCredit">
- <el-radio :label="1">允许</el-radio>
- <el-radio :label="0">不允许</el-radio>
+ <el-radio :label="1">{{ $t('common.allow') }}</el-radio>
+ <el-radio :label="0">{{ $t('common.notallow') }}</el-radio>
</el-radio-group>
<p style="color: #cf0f0f">开启积分兑换后，积分所抵扣的金额由商户承担</p>
</el-form-item>
diff --git a/src/views/commodity/commoditySystem/addComponent.vue b/src/views/commodity/commoditySystem/addComponent.vue
index 05836d5..b33337b 100644
--- a/src/views/commodity/commoditySystem/addComponent.vue
+++ b/src/views/commodity/commoditySystem/addComponent.vue
@@ -233,7 +233,7 @@
<el-input v-model="scope.row.sku" maxlength="20" />
</template>
</el-table-column>
- <!-- <el-table-column label="操作">
+ <!-- <el-table-column :label="$t('common.operate')">
<template slot-scope="scope">
<el-button type="text" @click="delAttrValue(scope.row,scope.$index,scope.row,scope)">{{ $t('common.delete') }}</el-button>
</template>
diff --git a/src/views/commodity/commoditySystem/index.vue b/src/views/commodity/commoditySystem/index.vue
index 9aed0b8..5214354 100644
--- a/src/views/commodity/commoditySystem/index.vue
+++ b/src/views/commodity/commoditySystem/index.vue
@@ -5,17 +5,17 @@
<!-- 搜索 -->
<div class="formSearch">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
- <el-form-item label="商品名称">
- <el-input v-model="formInline.search" maxlength="20" placeholder="请输入商品名称" />
+ <el-form-item :label="$t('product.productname')">
+ <el-input v-model="formInline.search" maxlength="20" placeholder="$t('product.productnamehint')" />
</el-form-item>
- <el-form-item label="上架状态">
- <el-select v-model="formInline.shelveState" placeholder="请选择上架状态">
- <el-option label="全部" :value="null" />
- <el-option label="上架" value="1" />
- <el-option label="下架" value="0" />
+ <el-form-item :label="$t('product.shelvestate')">
+ <el-select v-model="formInline.shelveState" :placeholder="$t('product.shelvestatehint')">
+ <el-option :label="$t('common.all')" :value="null" />
+ <el-option :label="$t('product.shelveson')" value="1" />
+ <el-option :label="$t('product.shelvesoff')" value="0" />
</el-select>
</el-form-item>
- <el-form-item label="商品分类">
+ <el-form-item :label="$t('product.productclassify')">
<el-cascader
v-model="formInline.classifyId"
:options="categoryList"
@@ -30,11 +30,11 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
- <el-button type="success" plain @click="add">新增商品</el-button>
- <el-button type="success" plain @click="sends">批量导入</el-button>
- <el-button type="success" plain @click="productDataExport">导出商品</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
+ <el-button type="success" plain @click="add">{{ $t('product.addproduct') }}</el-button>
+ <el-button type="success" plain @click="sends">{{ $t('product.batchimport') }}</el-button>
+ <el-button type="success" plain @click="productDataExport">{{ $t('product.productexport') }}</el-button>
<!-- <span v-for="(item,index) in btnList" :key="index" class="promissStyle">
<el-button type="success" plain @click="btnClick(item)">{{ item.permissionName }}</el-button>
</span> -->
@@ -51,42 +51,42 @@
tooltip-effect="dark"
style="width: 100%"
>
- <el-table-column prop="productId" label="商品id" show-overflow-tooltip />
- <el-table-column label="商品主图" width="150" align="center">
+ <el-table-column prop="productId" :label="$t('product.productId')" show-overflow-tooltip />
+ <el-table-column :label="$t('product.mainpicture')" width="150" align="center">
<template slot-scope="scope">
<img height="80" width="80" :src="scope.row.productImage " alt srcset>
</template>
</el-table-column>
- <el-table-column prop="productName" label="商品名称" width="220" />
- <el-table-column prop="shopName" label="店铺名称" width="220" />
- <el-table-column prop="section" label="售价区间" show-overflow-tooltip />
- <el-table-column prop="memberSection" label="会员价" show-overflow-tooltip />
- <el-table-column prop="ifCredit" label="积分兑换" show-overflow-tooltip>
+ <el-table-column prop="productName" :label="$t('product.productname')" width="220" />
+ <el-table-column prop="shopName" :label="$t('shop.shopName')" width="220" />
+ <el-table-column prop="section" :label="$t('product.pricerange')" show-overflow-tooltip />
+ <el-table-column prop="memberSection" :label="$t('product.memberprice')" show-overflow-tooltip />
+ <el-table-column prop="ifCredit" :label="$t('product.creditsexchange')" show-overflow-tooltip>
<template slot-scope="scope">
- <span v-if="scope.row.ifCredit == 1">允许</span>
- <span v-if="scope.row.ifCredit == 0">不允许</span>
+ <span v-if="scope.row.ifCredit == 1">{{$t('common.allow')}}</span>
+ <span v-if="scope.row.ifCredit == 0">{{ $t('common.notallow') }}</span>
</template>
</el-table-column>
- <el-table-column prop="stockNumber" label="库存" show-overflow-tooltip />
- <el-table-column prop="volume" label="销量" show-overflow-tooltip />
- <el-table-column prop="volume" label="上架状态" show-overflow-tooltip>
+ <el-table-column prop="stockNumber" :label="$t('product.inventory')" show-overflow-tooltip />
+ <el-table-column prop="volume" :label="$t('product.salesvolume')" show-overflow-tooltip />
+ <el-table-column prop="volume" :label="$t('product.shelvestate')" show-overflow-tooltip>
<template slot-scope="scope">
- <span v-if="scope.row.shelveState==0">未上架</span>
- <span v-if="scope.row.shelveState==1">已上架</span>
- <span v-if="scope.row.shelveState==2">待审核</span>
- <span v-if="scope.row.shelveState==3">审核失败</span>
+ <span v-if="scope.row.shelveState==0">{{ $t('product.notlistedyet') }}</span>
+ <span v-if="scope.row.shelveState==1">{{ $t('product.alreadylisted') }}</span>
+ <span v-if="scope.row.shelveState==2">{{ $t('product.tobereviewed') }}</span>
+ <span v-if="scope.row.shelveState==3">{{ $t('product.auditfailure') }}</span>
</template>
</el-table-column>
- <el-table-column prop="reject" label="驳回原因" show-overflow-tooltip />
- <el-table-column :formatter="row=>getBrandName(row)" label="品牌" show-overflow-tooltip />
- <el-table-column prop="createTime" label="创建时间" width="180" />
- <el-table-column label="操作" width="200">
+ <el-table-column prop="reject" :label="$t('product.causeofrejection')" show-overflow-tooltip />
+ <el-table-column :formatter="row=>getBrandName(row)" :label="$t('product.brand')" show-overflow-tooltip />
+ <el-table-column prop="createTime" :label="$t('common.createTIme')" width="180" />
+ <el-table-column :label="$t('common.operate')" width="200">
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row)">{{ $t('common.edit') }}</el-button>
- <el-button v-if="scope.row.shelveState==0" type="text" @click="down(scope.row)">上架</el-button>
- <el-button v-if="scope.row.shelveState==1" type="text" @click="down(scope.row)">下架</el-button>
- <el-button v-if="scope.row.shelveState==1" type="text" @click="setVipPrice(scope.row)">设置会员价</el-button>
+ <el-button v-if="scope.row.shelveState==0" type="text" @click="down(scope.row)">{{ $t('product.shelveson') }}</el-button>
+ <el-button v-if="scope.row.shelveState==1" type="text" @click="down(scope.row)">{{ $t('product.shelvesoff') }}</el-button>
+ <el-button v-if="scope.row.shelveState==1" type="text" @click="setVipPrice(scope.row)">{{ $t('product.setmemberprice') }}</el-button>
<el-button v-if="scope.row.shelveState!=1" type="text" @click="del(scope.row)">{{ $t('common.delete') }}</el-button>
</div>
</template>
@@ -107,7 +107,7 @@
</div>
<!-- 批量导入 -->
<el-dialog
- title="批量导入商品"
+ :title="$t('product.batchimportproduct')"
:visible.sync="batchAdd"
:close-on-click-modal="false"
center
@@ -131,37 +131,37 @@
>
<i class="el-icon-upload" />
<div class="el-upload__text">
- <em>点击上传</em>
+ <em>{{ $t('material.upload') }}</em>
</div>
- <div slot="tip" class="el-upload__tip">只能上传xlsx文件，且不超过10M</div>
+ <div slot="tip" class="el-upload__tip">{{ $t('product.productuploadtips') }}</div>
<div slot="tip" class="el-upload__tip">
- 上传前不知道excel模板的，请点击
- <span class="clickMe" @click="poDownload">点我下载模板</span> 去下载
+ {{ $t('product.importproducttips1') }}
+ <span class="clickMe" @click="poDownload">{{ $t('product.importproducttips2') }}</span> {{ $t('product.importproducttips3') }}
</div>
</el-upload>
<br>
- <el-button size="small" type="primary" @click="uploadFile">立即上传</el-button>
+ <el-button size="small" type="primary" @click="uploadFile">{{ $t('common.uploadnow') }}</el-button>
</div>
</el-dialog>
<!-- 设置会员价弹窗 -->
<el-dialog
- title="设置会员价"
+ :title="$t('product.setmemberprice')"
:visible.sync="vipPriceVisible"
width="50%"
class="vipDialog"
>
<el-form ref="form" label-width="80px">
- <el-form-item label="优惠方式">
+ <el-form-item :label="$t('product.preferentialmode')">
<el-radio-group v-model="mode" @change="modeChange">
- <el-radio :label="1">折扣</el-radio>
- <el-radio :label="2">指定价格</el-radio>
+ <el-radio :label="1">{{ $t('product.discount') }}</el-radio>
+ <el-radio :label="2">{{ $t('product.specifiedprice') }}</el-radio>
</el-radio-group>
</el-form-item>
<div class="priceTable">
<table>
<tr>
- <th>规格</th>
- <th>售价</th>
+ <th>{{ $t('product.specification') }}</th>
+ <th>{{ $t('product.price') }}</th>
<th v-for="(item,index) in gradeList" :key="index">
{{ item }}
</th>
@@ -174,12 +174,12 @@
{{ item.price }}
</td>
<td v-for="(itemJ,indexJ) in item.memberPrices" :key="indexJ" class="td-input">
- <el-input v-model="itemJ.price" maxlength="9" oninput="value=value.replace(/([^\d|\.])/g, '')" /> {{ mode==1?'折':'元' }}
+ <el-input v-model="itemJ.price" maxlength="9" oninput="value=value.replace(/([^\d|\.])/g, '')" /> {{ mode==1?$t('product.pricediscount'):$t('product.priceyuan') }}
</td>
</tr>
</table>
</div>
- <el-button type="success" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
+ <el-button type="success" class="clearBtn" @click="clearProductMember">{{ $t('product.clearalloldmembershipprices') }}</el-button>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="vipPriceVisible = false">{{ $t('common.cancle') }}</el-button>
@@ -188,7 +188,7 @@
</el-dialog>
<!-- 新增/修改商品弹窗 -->
<el-dialog
- :title="!commId ? '新增商品' : '编辑商品'"
+ :title="!commId ? $t('product.addproduct') : $t('product.editproduct')"
:visible.sync="commidyVisible"
width="74%"
center
diff --git a/src/views/customer/addOperate.vue b/src/views/customer/addOperate.vue
index 07d63f9..f6de52d 100644
--- a/src/views/customer/addOperate.vue
+++ b/src/views/customer/addOperate.vue
@@ -93,7 +93,7 @@
<el-input v-model="formInline.search" maxlength="20" placeholder="请输入人群名称" />
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/customer/clusteringList/index.vue b/src/views/customer/clusteringList/index.vue
index 992705d..3388274 100644
--- a/src/views/customer/clusteringList/index.vue
+++ b/src/views/customer/clusteringList/index.vue
@@ -12,8 +12,8 @@
<el-input v-model="formInline.max" maxlength="9" />
</div>
<div class="btns">
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="primary" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="primary" plain @click="addClustering">新建人群</el-button>
<el-button type="primary" plain @click="delClusteringFn(id = null)">{{ $t('common.delete') }}</el-button>
</div>
@@ -36,7 +36,7 @@
<el-table-column prop="crowdName" label="人群名称" show-overflow-tooltip />
<el-table-column prop="content" label="人群定义" show-overflow-tooltip />
<el-table-column prop="users" label="人群数量" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row.shopCrowdId)">{{ $t('common.edit') }}</el-button>
@@ -89,7 +89,7 @@
<el-table-column prop="lastTime" label="上次消费时间" show-overflow-tooltip />
<el-table-column prop="time" label="成为客户时间" show-overflow-tooltip />
<el-table-column prop="labelName" label="客户标签" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="showDetail(scope.row.buyerUserId)">详情</el-button>
diff --git a/src/views/customer/customerList/index.vue b/src/views/customer/customerList/index.vue
index 0535a0a..126a66e 100644
--- a/src/views/customer/customerList/index.vue
+++ b/src/views/customer/customerList/index.vue
@@ -44,8 +44,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="primary" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>
<!-- <el-button type="primary" plain @click="addTag">添加标签</el-button>-->
<el-button type="primary" plain @click="addCustomer">添加客户</el-button>
<el-button type="success" plain @click="userDataExport">导出</el-button>
@@ -76,7 +76,7 @@
<el-table-column :formatter="row=>row.registerIp?row.registerIp:'-'" label="注册IP" show-overflow-tooltip />
<el-table-column :formatter="row=>row.lastLoginIp?row.lastLoginIp:'-'" prop="time" label="最后登录IP" show-overflow-tooltip />
<el-table-column prop="labelName" label="客户标签" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip fixed="right">
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip fixed="right">
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row)">加标签</el-button>
diff --git a/src/views/customer/operate/index.vue b/src/views/customer/operate/index.vue
index f617a72..19cc355 100644
--- a/src/views/customer/operate/index.vue
+++ b/src/views/customer/operate/index.vue
@@ -33,8 +33,8 @@
</div>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clearData">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clearData">{{ $t('common.reset') }}</el-button>
<el-button type="primary" plain @click="addOperate">新增</el-button>
<el-button type="primary" plain @click="delData(id = null)">{{ $t('common.delete') }}</el-button>
</el-form-item>
@@ -75,7 +75,7 @@
<span v-if="scope.row.state === 2">已结束</span>
</template>
</el-table-column>
- <el-table-column label="操作" show-overflow-tooltip align="center">
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip align="center">
<template slot-scope="scope">
<div class="btnList">
<el-button v-if="scope.row.state === 0" type="text" @click="edit(scope.row.shopOperateId)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/customer/tagList.vue b/src/views/customer/tagList.vue
index 428b4c9..72bbaf4 100644
--- a/src/views/customer/tagList.vue
+++ b/src/views/customer/tagList.vue
@@ -12,8 +12,8 @@
<el-input v-model="formInline.maxPerson" maxlength="9" class="nums" />
</div>
<div class="btns">
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="primary" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="primary" plain @click="addTag">添加标签</el-button>
<el-button type="primary" plain @click="deleteTagFn(id = null)">{{ $t('common.delete') }}</el-button>
</div>
@@ -36,7 +36,7 @@
<el-table-column prop="labelName" label="标签名称" show-overflow-tooltip />
<el-table-column prop="remark" label="备注信息" show-overflow-tooltip />
<el-table-column prop="person" label="客户数量" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row.labelId)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/customerService/service/index.vue b/src/views/customerService/service/index.vue
index fec4a5c..087e1d1 100644
--- a/src/views/customerService/service/index.vue
+++ b/src/views/customerService/service/index.vue
@@ -35,7 +35,7 @@
</el-table-column>
<el-table-column prop="url" label="客服链接" />
<!-- <el-table-column prop="name" label="接待人数量" /> -->
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row)">{{ $t('common.edit') }}</el-button>
@@ -143,7 +143,7 @@
<span v-if="scope.row.state == 1">空闲</span>
</template>
</el-table-column>
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="deleteReceptionist(scope.row)">{{ $t('common.delete') }}</el-button>
diff --git a/src/views/customerService/setting/index.vue b/src/views/customerService/setting/index.vue
index 8ee5aa5..4b56a27 100644
--- a/src/views/customerService/setting/index.vue
+++ b/src/views/customerService/setting/index.vue
@@ -19,7 +19,7 @@
type="primary"
@click="submitForm('ruleForm')"
>{{ $t('common.save') }}</el-button>
- <el-button @click="resetForm('ruleForm')">重置</el-button>
+ <el-button @click="resetForm('ruleForm')">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index a913463..db24fd1 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -79,7 +79,7 @@
</ul>
<div v-else class="empty">
<img :src="empty" alt>
- <p>{{ $t('commom.nodata') }}</p>
+ <p>{{ $t('common.nodata') }}</p>
</div>
<el-button type="success" class="exportBtn" plain @click="hotProductsExport">{{ $t('common.export') }}</el-button>
</div>
diff --git a/src/views/distributor/achievement/humens.vue b/src/views/distributor/achievement/humens.vue
index 55e7cb9..06f89ff 100644
--- a/src/views/distributor/achievement/humens.vue
+++ b/src/views/distributor/achievement/humens.vue
@@ -22,8 +22,8 @@
/>
</el-form-item>
<el-form-item label-width="0">
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/distributor/achievement/order.vue b/src/views/distributor/achievement/order.vue
index 4927c63..1d68d00 100644
--- a/src/views/distributor/achievement/order.vue
+++ b/src/views/distributor/achievement/order.vue
@@ -32,8 +32,8 @@
</el-select>
</el-form-item>
<el-form-item label-width="0">
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/distributor/achievement/programme.vue b/src/views/distributor/achievement/programme.vue
index bb40115..cd6ce12 100644
--- a/src/views/distributor/achievement/programme.vue
+++ b/src/views/distributor/achievement/programme.vue
@@ -134,7 +134,7 @@
<span v-else>{{ scope.row.indirectProportion + '%' }}</span>
</template>
</el-table-column>
- <el-table-column label="操作">
+ <el-table-column :label="$t('common.operate')">
<template slot-scope="scope">
<el-button
v-if="scope.row.edit || scope.row.add"
diff --git a/src/views/distributor/customer/popSearch.vue b/src/views/distributor/customer/popSearch.vue
index 7e1c7d7..53be115 100644
--- a/src/views/distributor/customer/popSearch.vue
+++ b/src/views/distributor/customer/popSearch.vue
@@ -22,8 +22,8 @@
</el-select>
</el-form-item>
<el-form-item label-width="0">
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -48,7 +48,7 @@
</template>
</el-table-column>
<el-table-column prop="updateTime" label="关系更新时间" />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="relieve(scope.row)">解绑</el-button>
@@ -102,7 +102,7 @@
<div style="text-align: center;">
<div style="display: flex" class="diaoCen">
<el-input v-model="searchs" maxlength="20" style="width:200px" clearable placeholder="请输入分销员名称" />
- <el-button type="primary" @click="searchDis">查询</el-button>
+ <el-button type="primary" @click="searchDis">{{ $t('common.query') }}</el-button>
</div>
<el-radio-group v-model="distributorId">
<el-radio
diff --git a/src/views/distributor/personnel/list.vue b/src/views/distributor/personnel/list.vue
index 13f86b7..05e99f6 100644
--- a/src/views/distributor/personnel/list.vue
+++ b/src/views/distributor/personnel/list.vue
@@ -32,8 +32,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="success" plain @click="add">添加分销员</el-button>
</el-form-item>
</el-form>
@@ -55,7 +55,7 @@
<el-table-column prop="total" label="累计客户" />
<el-table-column prop="subordinate" label="累计下级" />
<el-table-column prop="money" label="累计佣金(元 )" />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/distributor/personnel/msg.vue b/src/views/distributor/personnel/msg.vue
index 39ed750..4e0e492 100644
--- a/src/views/distributor/personnel/msg.vue
+++ b/src/views/distributor/personnel/msg.vue
@@ -30,8 +30,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -58,7 +58,7 @@
</template>
</el-table-column>
<el-table-column prop="money" label="审核时间" />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="del(scope.row)">处理</el-button>
diff --git a/src/views/finance/list/index.vue b/src/views/finance/list/index.vue
index 15968cb..ab09127 100644
--- a/src/views/finance/list/index.vue
+++ b/src/views/finance/list/index.vue
@@ -50,7 +50,7 @@
<el-table-column prop="income" label="收入（元）" width="220" />
<el-table-column prop="expenditure" label="支出（元）" show-overflow-tooltip />
<el-table-column prop="commission" label="佣金（元）" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="seeMore(scope.row)">{{ $t('common.view') }}</el-button>
@@ -115,7 +115,7 @@
</el-select>
</el-form-item>
<el-form-item label-width="0">
- <el-button type="primary" plain @click="search">查询</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -131,7 +131,7 @@
>
<el-table-column prop="waterType" label="流水类型" />
<el-table-column prop="shopName" label="所属店铺" />
- <el-table-column prop="orderFormid" label="订单ID" />
+ <el-table-column prop="orderFormid" label="$t('order.orderId')" />
<el-table-column prop="incomeType" label="收支类型" />
<el-table-column prop="money" label="金额(元)" />
<el-table-column prop="commission" label="佣金(元)" />
diff --git a/src/views/liveMenu/liveProduct/index.vue b/src/views/liveMenu/liveProduct/index.vue
index 2657ecf..af9c2c7 100644
--- a/src/views/liveMenu/liveProduct/index.vue
+++ b/src/views/liveMenu/liveProduct/index.vue
@@ -102,12 +102,12 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="创建时间">
+ <el-table-column prop="createTime" :label="$t('common.createTIme')">
<!-- 暂无 -->
</el-table-column>
<el-table-column
fixed="right"
- label="操作"
+ :label="$t('common.operate')"
width="200"
show-overflow-tooltip
>
@@ -211,7 +211,7 @@
type="primary"
plai
@click="getClassifyGetAll"
- >查询</el-button>
+ >{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
<el-table
diff --git a/src/views/liveMenu/liveRoom/index.vue b/src/views/liveMenu/liveRoom/index.vue
index d3513a4..e8ed9fb 100644
--- a/src/views/liveMenu/liveRoom/index.vue
+++ b/src/views/liveMenu/liveRoom/index.vue
@@ -45,7 +45,7 @@
<el-table-column prop="anchorWechat" label="主播微信号" />
<el-table-column prop="startTime" label="直播开始时间" />
<el-table-column prop="endTime" label="预计结束时间" />
- <el-table-column prop="createTime" label="创建时间" />
+ <el-table-column prop="createTime" :label="$t('common.createTIme')" />
<el-table-column label="审核状态" width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.state == 0" type="warning">
@@ -62,7 +62,7 @@
<el-table-column
fixed="right"
width="200"
- label="操作"
+ :label="$t('common.operate')"
show-overflow-tooltip
>
<template slot-scope="scope">
@@ -450,7 +450,7 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="getProPassList">查询</el-button>
+ <el-button type="primary" plain @click="getProPassList">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
<!-- 表格 -->
diff --git a/src/views/marketing/channelActivity/form.vue b/src/views/marketing/channelActivity/form.vue
index 174806b..48d387a 100644
--- a/src/views/marketing/channelActivity/form.vue
+++ b/src/views/marketing/channelActivity/form.vue
@@ -51,8 +51,8 @@
</template>
</el-table-column>
<el-table-column prop="content" label="内容" show-overflow-tooltip />
- <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
- <el-table-column label="操作" fixed="right">
+ <el-table-column prop="createTime" :label="$t('common.createTIme')" show-overflow-tooltip />
+ <el-table-column :label="$t('common.operate')" fixed="right">
<template v-slot="scope">
<el-button :disabled="form.isLook" @click="handleDelSelectCoupon(scope.row)">{{ $t('common.delete') }}</el-button>
</template>
diff --git a/src/views/marketing/channelActivity/index.vue b/src/views/marketing/channelActivity/index.vue
index 0bef1e4..e50219f 100644
--- a/src/views/marketing/channelActivity/index.vue
+++ b/src/views/marketing/channelActivity/index.vue
@@ -35,13 +35,13 @@
<el-table-column prop="publishCount" label="活动发放总数" width="180" />
<el-table-column prop="releaseCount" label="已发放总数" width="180" />
- <el-table-column prop="address" label="操作" width="320" fixed="right">
+ <el-table-column prop="address" :label="$t('common.operate')" width="320" fixed="right">
<template v-slot="scope">
<el-button size="mini" type="primary" @click="handleCopeLink(scope.row)">复制链接
</el-button>
<el-button size="mini" type="warning" @click="handleEditForm(scope.row, true)">详情
</el-button>
- <el-button v-if="scope.row.state === 0" size="mini" type="warning" @click="handleEditForm(scope.row)">编辑
+ <el-button v-if="scope.row.state === 0" size="mini" type="warning" @click="handleEditForm(scope.row)">{{ $t('common.edit') }}<
</el-button>
<el-button size="mini" @click="handleDelete(scope.row)">删除
</el-button>
diff --git a/src/views/marketing/channelActivity/selectChannelCoupons.vue b/src/views/marketing/channelActivity/selectChannelCoupons.vue
index 3ef0f4f..63d0eeb 100644
--- a/src/views/marketing/channelActivity/selectChannelCoupons.vue
+++ b/src/views/marketing/channelActivity/selectChannelCoupons.vue
@@ -29,14 +29,14 @@
<el-option label="已结束" value="2" />
</el-select>
</el-form-item>
- <el-form-item label="创建时间">
+ <el-form-item :label="$t('common.createTIme')">
<el-date-picker v-model="formInline.dates" type="datetimerange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" @change="search" />
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}
</el-button>
- <el-button type="primary" plain @click="clear">重置
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}
</el-button>
<!-- <el-button type="primary" plain @click="addActivity">新增
</el-button> -->
@@ -66,7 +66,7 @@
</template>
</el-table-column>
<el-table-column prop="content" label="内容" show-overflow-tooltip />
- <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
+ <el-table-column prop="createTime" :label="$t('common.createTIme')" show-overflow-tooltip />
</el-table>
<div class="fenye">
<el-pagination :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="10"
diff --git a/src/views/marketing/channelCoupons/components/couponSelect.vue b/src/views/marketing/channelCoupons/components/couponSelect.vue
index b365534..344003e 100644
--- a/src/views/marketing/channelCoupons/components/couponSelect.vue
+++ b/src/views/marketing/channelCoupons/components/couponSelect.vue
@@ -5,7 +5,7 @@
<el-input v-model="params.search" maxlength="20" placeholder="请输入优惠券名称" />
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="getTableData">查询</el-button>
+ <el-button type="primary" @click="getTableData">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
<el-table
diff --git a/src/views/marketing/channelCoupons/components/productSelect.vue b/src/views/marketing/channelCoupons/components/productSelect.vue
index 60bd720..23f1fd5 100644
--- a/src/views/marketing/channelCoupons/components/productSelect.vue
+++ b/src/views/marketing/channelCoupons/components/productSelect.vue
@@ -5,7 +5,7 @@
<el-input v-model="params.search" maxlength="20" placeholder="店铺名称/商品ID/商品分组" />
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="onSubmit">查询</el-button>
+ <el-button type="primary" @click="onSubmit">{{ $t('common.query') }}</el-button>
</el-form-item>
</el-form>
<el-table
diff --git a/src/views/marketing/channelCoupons/index.vue b/src/views/marketing/channelCoupons/index.vue
index 37a4840..75d3c6d 100644
--- a/src/views/marketing/channelCoupons/index.vue
+++ b/src/views/marketing/channelCoupons/index.vue
@@ -9,8 +9,8 @@
<el-input v-model="formInline.search" maxlength="20" clearable placeholder="请输入渠道券名称" style="width: 200px;" class="filter-item" @keyup.enter.native="search" />
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -80,7 +80,7 @@
</div>
</template>
</el-table-column>
- <el-table-column width="200" label="操作" align="center" fixed="right">
+ <el-table-column width="200" :label="$t('common.operate')" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/marketing/channelManage/index.vue b/src/views/marketing/channelManage/index.vue
index 2ed4c66..7de272a 100644
--- a/src/views/marketing/channelManage/index.vue
+++ b/src/views/marketing/channelManage/index.vue
@@ -62,7 +62,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="创建时间">
+ <el-form-item :label="$t('common.createTIme')">
<el-date-picker
v-model="formInline.dates"
type="datetimerange"
@@ -77,13 +77,13 @@
type="primary"
plain
@click="search"
- >查询
+ >{{ $t('common.query') }}
</el-button>
<el-button
type="primary"
plain
@click="clear"
- >重置
+ >{{ $t('common.reset') }}
</el-button>
<el-button
type="primary"
@@ -148,11 +148,11 @@
/>
<el-table-column
prop="createTime"
- label="创建时间"
+ :label="$t('common.createTIme')"
show-overflow-tooltip
/>
<el-table-column
- label="操作"
+ :label="$t('common.operate')"
show-overflow-tooltip
>
<template slot-scope="scope">
@@ -161,7 +161,7 @@
v-if="scope.row.state === 0"
type="text"
@click="editActivity(scope.row.shopCouponId)"
- >编辑
+ >{{ $t('common.edit') }}
</el-button>
<el-button
v-if="scope.row.state !== 0"
diff --git a/src/views/marketing/compose/add.vue b/src/views/marketing/compose/add.vue
index 7c600f1..41a788d 100644
--- a/src/views/marketing/compose/add.vue
+++ b/src/views/marketing/compose/add.vue
@@ -126,7 +126,7 @@
width="120"
show-overflow-tooltip
/>
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-popconfirm
@@ -175,8 +175,8 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="getProList">查询</el-button>
- <el-button type="primary" @click="clear">重置</el-button>
+ <el-button type="primary" @click="getProList">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" @click="clear">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/marketing/compose/index.vue b/src/views/marketing/compose/index.vue
index 174098f..a1f170b 100644
--- a/src/views/marketing/compose/index.vue
+++ b/src/views/marketing/compose/index.vue
@@ -14,8 +14,8 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
- <!-- <el-button type="primary" plain @click="search">查询</el-button>-->
- <!-- <el-button type="primary" plain @click="clear">重置</el-button>-->
+ <!-- <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>-->
+ <!-- <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>-->
<el-button type="primary" plain @click="addActivity">新增</el-button>
</el-form-item>
</el-form>
@@ -44,7 +44,7 @@
<span v-if="scope.row.state === 3">已停用</span>
</template>
</el-table-column>
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<!-- <el-button v-if="scope.row.state === 0 || scope.row.state === 3" type="text" @click="editActivity(scope.row.composeId)">{{ $t('common.edit') }}</el-button> -->
diff --git a/src/views/marketing/coupon/index.vue b/src/views/marketing/coupon/index.vue
index 0b730c4..4b1165e 100644
--- a/src/views/marketing/coupon/index.vue
+++ b/src/views/marketing/coupon/index.vue
@@ -20,7 +20,7 @@
<el-option label="已结束" value="2" />
</el-select>
</el-form-item>
- <el-form-item label="创建时间">
+ <el-form-item :label="$t('common.createTIme')">
<el-date-picker
v-model="formInline.dates"
type="datetimerange"
@@ -31,8 +31,8 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="primary" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="primary" plain @click="addActivity">新增</el-button>
</el-form-item>
</el-form>
@@ -64,8 +64,8 @@
</template>
</el-table-column>
<el-table-column prop="content" label="内容" show-overflow-tooltip />
- <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column prop="createTime" :label="$t('common.createTIme')" show-overflow-tooltip />
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button v-if="scope.row.state === 0" type="text" @click="editActivity(scope.row.shopCouponId)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/marketing/discount/add.vue b/src/views/marketing/discount/add.vue
index 0972f0d..71708c5 100644
--- a/src/views/marketing/discount/add.vue
+++ b/src/views/marketing/discount/add.vue
@@ -105,7 +105,7 @@
</template>
</el-table-column>
<el-table-column prop="stockNumber" label="库存" width="120" show-overflow-tooltip />
- <!-- <el-table-column width="80" label="操作" show-overflow-tooltip>-->
+ <!-- <el-table-column width="80" :label="$t('common.operate')" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- <div class="btnList">-->
<!-- <el-popconfirm title="确定删除此活动？" @onConfirm="deleteSeckillFn(scope.row)">-->
diff --git a/src/views/marketing/discount/index.vue b/src/views/marketing/discount/index.vue
index 049cce6..f7c2c41 100644
--- a/src/views/marketing/discount/index.vue
+++ b/src/views/marketing/discount/index.vue
@@ -14,8 +14,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="primary" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="primary" plain @click="addActivity">新增</el-button>
</el-form-item>
</el-form>
@@ -43,7 +43,7 @@
<el-table-column prop="content" label="活动内容" show-overflow-tooltip />
<el-table-column prop="startTime" label="活动开始时间" show-overflow-tooltip />
<el-table-column prop="endTime" label="活动结束时间" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button v-if="scope.row.state === 0" type="text" @click="editActivity(scope.row.shopDiscountId)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/marketing/group/add.vue b/src/views/marketing/group/add.vue
index 10bb4a6..aec8f8a 100644
--- a/src/views/marketing/group/add.vue
+++ b/src/views/marketing/group/add.vue
@@ -102,7 +102,7 @@
</template>
</el-table-column>
<el-table-column prop="stockNumber" label="库存" width="120" show-overflow-tooltip />
- <!-- <el-table-column width="80" label="操作" show-overflow-tooltip>-->
+ <!-- <el-table-column width="80" :label="$t('common.operate')" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- <div class="btnList">-->
<!-- <el-popconfirm title="确定删除此券？" @onConfirm="delGroupBuyFn(scope.row)">-->
diff --git a/src/views/marketing/group/index.vue b/src/views/marketing/group/index.vue
index a8aa6f4..56cb98c 100644
--- a/src/views/marketing/group/index.vue
+++ b/src/views/marketing/group/index.vue
@@ -14,8 +14,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="primary" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="primary" plain @click="addActivity">新增</el-button>
</el-form-item>
</el-form>
@@ -43,7 +43,7 @@
<el-table-column prop="content" label="活动内容" show-overflow-tooltip />
<el-table-column prop="startTime" label="活动开始时间" show-overflow-tooltip />
<el-table-column prop="endTime" label="活动结束时间" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button v-if="scope.row.state === 0" type="text" @click="editActivity(scope.row.shopGroupWorkId)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/marketing/price/add.vue b/src/views/marketing/price/add.vue
index 787f50e..0ec5b96 100644
--- a/src/views/marketing/price/add.vue
+++ b/src/views/marketing/price/add.vue
@@ -118,7 +118,7 @@
width="120"
show-overflow-tooltip
/>
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-popconfirm
@@ -160,8 +160,8 @@
<el-input v-model="proOption.search" maxlength="20" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="getProList">查询</el-button>
- <el-button type="primary" @click="clear">重置</el-button>
+ <el-button type="primary" @click="getProList">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" @click="clear">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/marketing/price/index.vue b/src/views/marketing/price/index.vue
index e01601e..64a20e5 100644
--- a/src/views/marketing/price/index.vue
+++ b/src/views/marketing/price/index.vue
@@ -14,8 +14,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="primary" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="primary" plain @click="addActivity">新增</el-button>
</el-form-item>
</el-form> -->
@@ -45,7 +45,7 @@
<span v-if="scope.row.state === 3">已停用</span>
</template>
</el-table-column>
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<!-- <el-button v-if="scope.row.state === 0 || scope.row.state === 3" type="text" @click="editActivity(scope.row.priceId)">{{ $t('common.edit') }}</el-button> -->
diff --git a/src/views/marketing/scene/add.vue b/src/views/marketing/scene/add.vue
index 63392a6..561420c 100644
--- a/src/views/marketing/scene/add.vue
+++ b/src/views/marketing/scene/add.vue
@@ -217,7 +217,7 @@
</template>
</el-table-column>
<el-table-column prop="content" label="内容" show-overflow-tooltip />
- <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
+ <el-table-column prop="createTime" :label="$t('common.createTIme')" show-overflow-tooltip />
</el-table>
<div class="fenye">
<el-pagination
diff --git a/src/views/marketing/scene/index.vue b/src/views/marketing/scene/index.vue
index 9376f35..bcb6477 100644
--- a/src/views/marketing/scene/index.vue
+++ b/src/views/marketing/scene/index.vue
@@ -33,7 +33,7 @@
<span v-if="scope.row.state === 2">已停止</span>
</template>
</el-table-column>
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="editActivity(scope.row.sceneId)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/marketing/spike/add.vue b/src/views/marketing/spike/add.vue
index b6e6d5d..296a25a 100644
--- a/src/views/marketing/spike/add.vue
+++ b/src/views/marketing/spike/add.vue
@@ -105,7 +105,7 @@
</template>
</el-table-column>
<el-table-column prop="stockNumber" label="库存" width="120" show-overflow-tooltip />
- <!-- <el-table-column width="80" label="操作" show-overflow-tooltip>-->
+ <!-- <el-table-column width="80" :label="$t('common.operate')" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- <div class="btnList">-->
<!-- <el-popconfirm title="确定删除此活动？" @onConfirm="deleteSeckillFn(scope.row)">-->
diff --git a/src/views/marketing/spike/index.vue b/src/views/marketing/spike/index.vue
index ef90ae0..a77ec14 100644
--- a/src/views/marketing/spike/index.vue
+++ b/src/views/marketing/spike/index.vue
@@ -14,8 +14,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="primary" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="primary" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="primary" plain @click="addActivity">新增</el-button>
</el-form-item>
</el-form>
@@ -43,7 +43,7 @@
<el-table-column prop="content" label="活动内容" show-overflow-tooltip />
<el-table-column prop="effectiveStart" label="活动开始时间" show-overflow-tooltip />
<el-table-column prop="effectiveEnd" label="活动结束时间" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button v-if="scope.row.state === 0" type="text" @click="editActivity(scope.row.shopSeckillId)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/order/aftersale/afterDetails.vue b/src/views/order/aftersale/afterDetails.vue
index 4513f65..01c55e4 100644
--- a/src/views/order/aftersale/afterDetails.vue
+++ b/src/views/order/aftersale/afterDetails.vue
@@ -274,7 +274,7 @@
<!-- 发货 -->
<el-dialog
:visible.sync="isVisibles"
- title="发货"
+ title="$t('order.send')"
:close-on-click-modal="false"
>
<el-form
@@ -283,7 +283,7 @@
:rules="rules"
label-width="80px"
>
- <el-form-item label="快递公司" prop="express">
+ <el-form-item :label="$t('order.expresscompany')" prop="express">
<el-select v-model="form.express" filterable>
<el-option
v-for="(item, index) in companyList"
@@ -293,7 +293,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="快递单号" prop="deliverFormid">
+ <el-form-item :label="$t('order.trackingnumber')" prop="deliverFormid">
<el-input v-model="form.deliverFormid" maxlength="20" />
</el-form-item>
<!--
diff --git a/src/views/order/aftersale/index.vue b/src/views/order/aftersale/index.vue
index a75be7c..e4ed098 100644
--- a/src/views/order/aftersale/index.vue
+++ b/src/views/order/aftersale/index.vue
@@ -55,7 +55,7 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
<el-button type="success" plain @click="afterOrderDataExport">导出订单</el-button>
</el-form-item>
</el-form>
@@ -84,7 +84,7 @@
<el-table-column prop="price" label="退款金额(元)" show-overflow-tooltip />
<el-table-column prop="afterStateName" label="售后状态" show-overflow-tooltip />
<el-table-column prop="createTime" label="申请时间" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="view(scope.row)">{{ scope.row.afterState == 1 ? '处理' : '查看' }}</el-button>
diff --git a/src/views/order/pending/index.vue b/src/views/order/pending/index.vue
index e87400f..8944be5 100644
--- a/src/views/order/pending/index.vue
+++ b/src/views/order/pending/index.vue
@@ -21,7 +21,7 @@
style="width:130px"
placeholder="请选择"
>
- <el-option label="订单id" value="1" />
+ <el-option :label="$t('order.orderId')" value="1" />
<el-option label="买家账户" value="2" />
<el-option label="收件人姓名" value="3" />
<el-option label="收件人手机号" value="4" />
@@ -49,7 +49,7 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
<el-button type="success" plain @click="orderDataExport">导出订单</el-button>
</el-form-item>
@@ -66,10 +66,10 @@
tooltip-effect="dark"
style="width: 100%"
>
- <el-table-column label="订单id" width="220">
+ <el-table-column :label="$t('order.orderId')" width="220">
<template slot-scope="scope">{{ scope.row.orderId }}</template>
</el-table-column>
- <el-table-column prop="price" label="支付金额（元）" width="220" />
+ <el-table-column prop="price" :label="$t('order.amountlabel')" width="220" />
<el-table-column prop="number" label="商品数量（件）" show-overflow-tooltip />
<el-table-column label="订单状态" show-overflow-tooltip>
<template slot-scope="scope">
@@ -83,7 +83,7 @@
</el-table-column>
<el-table-column prop="customerName" label="下单账户" show-overflow-tooltip />
<el-table-column prop="createTime" label="下单时间" show-overflow-tooltip />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button v-if="scope.row.state === 1" type="text" @click="changePrice(scope.row)">改价</el-button>
diff --git a/src/views/order/pending/pendDetails.vue b/src/views/order/pending/pendDetails.vue
index 49455ef..bd1a597 100644
--- a/src/views/order/pending/pendDetails.vue
+++ b/src/views/order/pending/pendDetails.vue
@@ -3,11 +3,11 @@
<div v-loading="loading" class="order_details">
<div class="baseinfo_row">
<div class="baseinfo_col">
- <div class="item_title">订单信息</div>
+ <div class="item_title">{{ $t('order.orderinfo') }}</div>
<ul>
<li>
<p>
- <span>订单ID:</span>
+ <span>{{ $t('order.orderId') }}:</span>
<span>{{ order.orderId }}</span>
</p>
</li>
@@ -168,7 +168,7 @@
</ul>
</div>
<div class="baseinfo_col">
- <div class="item_title" style="visibility:hidden">物流信息</div>
+ <div class="item_title" style="visibility:hidden">{{ $t('order.logisticsinfo') }}</div>
<!-- <p
v-for="(item, index) in tracesList"
:key="index"
@@ -181,14 +181,14 @@
</div>
<!-- 发货 -->
- <el-dialog :visible.sync="isVisible" title="发货" append-to-body :close-on-click-modal="false">
+ <el-dialog :visible.sync="isVisible" :title="$t('order.send')" append-to-body :close-on-click-modal="false">
<el-form ref="sendGoodsForm" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="快递公司" prop="express">
+ <el-form-item :label="$t('order.expresscompany')" prop="express">
<el-select v-model="form.express" filterable>
<el-option v-for="(item, index) in companyList" :key="index" :label="item.dictName" :value="item.dictId" />
</el-select>
</el-form-item>
- <el-form-item label="快递单号" prop="deliverFormid">
+ <el-form-item :label="$t('order.trackingnumber')" prop="deliverFormid">
<el-input v-model="form.deliverFormid" maxlength="20"
oninput="value = value.replace(/[^\a-\z\A-\Z0-9]/g,'')" />
</el-form-item>
diff --git a/src/views/setup/role/index.vue b/src/views/setup/role/index.vue
index b1cd210..8a76c56 100644
--- a/src/views/setup/role/index.vue
+++ b/src/views/setup/role/index.vue
@@ -8,8 +8,8 @@
<el-input v-model="formInline.search" maxlength="20" placeholder="请输入角色名" />
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="success" plain @click="add">新增角色</el-button>
</el-form-item>
</el-form>
@@ -31,7 +31,7 @@
</el-table-column>
<el-table-column prop="roleName" label="角色名称" />
<el-table-column prop="roleDescribe" label="描述" />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/setup/tabs/index.vue b/src/views/setup/tabs/index.vue
index b9c84ce..7469b95 100644
--- a/src/views/setup/tabs/index.vue
+++ b/src/views/setup/tabs/index.vue
@@ -10,8 +10,8 @@
<span>菜单名:</span>
<el-input v-model="formInline.permissionName" maxlength="20" placeholder="请输入菜单名" />
</div>
- <el-button type="primary" plain @click="search">查询</el-button>
- <el-button type="info" size="medium" plain @click="clear">重置</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
+ <el-button type="info" size="medium" plain @click="clear">{{ $t('common.reset') }}</el-button>
<el-button type="success" size="medium" plain @click="add(1)">新增父级目录</el-button>
<el-button type="success" size="medium" plain @click="add(2)">新增子级菜单</el-button>
<!-- <el-button type="success" size="medium" plain @click="add(3)">新增子级按钮</el-button> -->
@@ -37,8 +37,8 @@
</template>
</el-table-column>
<el-table-column prop="permission" label="菜单标识" />
- <el-table-column prop="createTime" label="创建时间" />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column prop="createTime" :label="$t('common.createTIme')" />
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/setup/user/index.vue b/src/views/setup/user/index.vue
index 48eaa90..7ce3313 100644
--- a/src/views/setup/user/index.vue
+++ b/src/views/setup/user/index.vue
@@ -14,9 +14,9 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain @click="search">查询</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
<el-button type="success" plain @click="add">新增用户</el-button>
- <el-button type="info" plain @click="clear">重置</el-button>
+ <el-button type="info" plain @click="clear">{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -43,8 +43,8 @@
<span v-if="scope.row.state == 1">启用</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="创建时间" />
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column prop="createTime" :label="$t('common.createTIme')" />
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="edit(scope.row)">{{ $t('common.edit') }}</el-button>
diff --git a/src/views/shop/decoration/index.vue b/src/views/shop/decoration/index.vue
index 8fbdea2..a962ae0 100644
--- a/src/views/shop/decoration/index.vue
+++ b/src/views/shop/decoration/index.vue
@@ -10,15 +10,15 @@
<div class="phoneAll">
<!-- 手机端布局 -->
<div class="phoneStyle">
- <div class="phoneTop">这是一张图片</div>
+ <div class="phoneTop">{{ $t('common.onepicturetip') }}</div>
</div>
<!-- 样式设置 -->
<div class="phoneRight">
<div class="r_top">
- <span class="cen_title">banner设置</span>
+ <span class="cen_title">{{ $t('common.bannersetting') }}</span>
</div>
<div class="r_cen">
- <div class="cen_title">样式</div>
+ <div class="cen_title">{{ $t('common.styles') }}</div>
<div class="r_select">
<el-select v-model="value" placeholder="填充">
<el-option
@@ -31,7 +31,7 @@
</div>
</div>
<div class="r_top">
- <span class="cen_title">内容</span>
+ <span class="cen_title">{{ $t('common.content') }}</span>
</div>
</div>
</div>
diff --git a/src/views/shop/material/fileUpload.vue b/src/views/shop/material/fileUpload.vue
index 80a344d..f6d279f 100644
--- a/src/views/shop/material/fileUpload.vue
+++ b/src/views/shop/material/fileUpload.vue
@@ -19,7 +19,7 @@
:on-remove="handleRemove"
class="upload-demo"
>
- <el-button v-if="isUpload" size="small" type="primary">点击上传</el-button>
+ <el-button v-if="isUpload" size="small" type="primary">$t('material.upload')</el-button>
</el-upload>
</div>
</template>
diff --git a/src/views/shop/material/index.vue b/src/views/shop/material/index.vue
index f20722d..dd3ca9d 100644
--- a/src/views/shop/material/index.vue
+++ b/src/views/shop/material/index.vue
@@ -11,8 +11,8 @@
</span>
</div>
<el-tabs v-model="activeName" class="tabsRight" @tab-click="handleClick">
- <el-tab-pane label="图片" name="1" />
- <el-tab-pane label="视频" name="2" />
+ <el-tab-pane :label="$t('material.picture')" name="1" />
+ <el-tab-pane :label="$t('material.video')" name="2" />
</el-tabs>
<!-- 图片内容 -->
<div v-if="tipsList.length" class="imgOne">
@@ -44,8 +44,8 @@
<img :src="item.image" alt>
</div>
<div class="tagBtns">
- <el-button type="text" @click="link(item.image)">链接</el-button>
- <el-button type="text" @click="changeTips(labelIndex)">标签</el-button>
+ <el-button type="text" @click="link(item.image)">{{ $t('material.link') }}</el-button>
+ <el-button type="text" @click="changeTips(labelIndex)">{{ $t('material.tag') }}</el-button>
<el-button type="text" @click="delTips(item)">{{ $t('common.delete') }}</el-button>
</div>
</div>
@@ -64,7 +64,7 @@
:close-on-click-modal="false"
>
<div>
- <el-input v-model="tipsName" maxlength="10" placeholder="请输入标签名称" />
+ <el-input v-model="tipsName" maxlength="10" placeholder="$t('material.taghit')" />
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="addtips.show = false">{{ $t('common.cancle') }}</el-button>
diff --git a/src/views/shop/myshop/index.vue b/src/views/shop/myshop/index.vue
index c0029a9..d4a1b99 100644
--- a/src/views/shop/myshop/index.vue
+++ b/src/views/shop/myshop/index.vue
@@ -8,25 +8,25 @@
:inline="true"
:model="formInline"
>
- <el-form-item label="店铺名称">
+ <el-form-item :label="$t('shop.shopName')">
<el-input
v-model="formInline.shopName"
maxlength="20"
- placeholder="请输入店铺名称"
+ :placeholder="$t('shop.shopNameHint')"
/>
</el-form-item>
- <el-form-item label="店铺编码">
+ <el-form-item :label="$t('shop.shopCode')">
<el-input
v-model="formInline.shopCode"
maxlength="20"
- placeholder="请输入店铺编码"
+ :placeholder="$t('shop.shopCodeHint')"
/>
</el-form-item>
- <el-form-item label="负责人">
+ <el-form-item :label="$t('common.contactPerson')">
<el-input
v-model="formInline.chargePersonName"
maxlength="20"
- placeholder="请输入负责人"
+ :placeholder="$t('shop.shopContactPersonHint')"
/>
</el-form-item>
<!-- <el-form-item label="合同状态">
@@ -49,13 +49,13 @@
type="primary"
plain
@click="onSubmit"
- >查询
+ >{{ $t('common.query') }}
</el-button>
<el-button
type="success"
plain
@click="addbuss"
- >新建店铺
+ >{{ $t('shop.newShop') }}
</el-button>
</el-form-item>
</el-form>
@@ -71,7 +71,7 @@
style="width: 100%"
>
<el-table-column
- label="店铺名称"
+ :label="$t('shop.shopName')"
width="220"
>
<template slot-scope="scope">{{ scope.row.shopName }}</template>
@@ -79,17 +79,17 @@
<el-table-column
prop="shopCode"
width="150"
- label="店铺编码"
+ :label="$t('shop.shopCode')"
/>
<el-table-column
prop="chargePersonName"
width="80"
- label="负责人"
+ :label="$t('common.contactPerson')"
/>
<el-table-column
prop="chargePersonPhone"
- label="联系电话"
+ :label="$t('common.contactPhone')"
/>
<!-- <el-table-column label="合同状态">
<template slot-scope="scope">
@@ -99,10 +99,10 @@
</el-table-column> -->
<el-table-column
prop="createTime"
- label="创建时间"
+ :label="$t('common.createTIme')"
/>
<el-table-column
- label="操作"
+ :label="$t('common.operate')"
show-overflow-tooltip
>
<template slot-scope="scope">
@@ -115,7 +115,7 @@
<el-button
type="text"
@click="edit(scope.row)"
- >编辑
+ >{{ $t('common.edit') }}
</el-button>
<!-- <el-button
v-if="scope.row.state == 1"
@@ -132,13 +132,13 @@
<el-button
type="text"
@click="delshop(scope.row)"
- >删除
+ >{{ $t('common.delete') }}
</el-button>
<el-button
type="text"
@click="editCavans(scope.row)"
- >店铺装修
+ >{{ $t('shop.dianpuzhuangxiu') }}
</el-button>
</div>
</template>
@@ -161,10 +161,10 @@
<el-dialog
:title="
userState === 0
- ? '新增店铺'
+ ? $t('shop.newShop')
: userState === 1
- ? '修改店铺'
- : '查看店铺'
+ ? $t('shop.editShop')
+ : $t('shop.shopDetail')
"
:visible.sync="dialogVisible"
width="30%"
@@ -178,7 +178,7 @@
label-width="120px"
>
<el-form-item
- label="店铺名称"
+ :label="$t('shop.shopName')"
prop="shopName"
>
<el-input
@@ -188,7 +188,7 @@
/>
</el-form-item>
<el-form-item
- label="店铺编码"
+ :label="$t('shop.shopCode')"
prop="shopCode"
v-if="userState !== 0"
>
@@ -200,7 +200,7 @@
</el-form-item>
<el-form-item
- label="店铺负责人"
+ :label="$t('common.contactPerson')"
prop="chargePersonName"
>
<el-input
@@ -210,7 +210,7 @@
/>
</el-form-item>
<el-form-item
- label="负责人电话"
+ :label="$t('common.contactPhone')"
prop="chargePersonPhone"
>
<el-input
@@ -231,7 +231,7 @@
/>
</el-form-item>
<el-form-item
- label="店铺地址"
+ :label="$t('shop.shopAddress')"
prop="shopAdress"
>
<el-input
@@ -245,7 +245,7 @@
</div> -->
</el-form-item>
<el-form-item
- label="退货联系人"
+ :label="$t('shop.returnContact')"
prop="shopReturn.returnPerson"
>
<el-input
@@ -255,7 +255,7 @@
/>
</el-form-item>
<el-form-item
- label="退货联系电话"
+ label="$t('shop.returnPhone')"
prop="shopReturn.returnPhone"
>
<el-input
@@ -276,7 +276,7 @@
/>
</el-form-item>
<el-form-item
- label="退货地址"
+ :label="$t('shop.returnAddress')"
prop="shopReturn.returnAdress"
>
<el-input
@@ -287,7 +287,7 @@
/>
</el-form-item>
- <el-form-item label="是否跨境">
+ <el-form-item :label="$t('shop.crossborderornot')">
<el-switch
v-model="localIsCross"
@change="changeCrossMode()"
@@ -297,7 +297,7 @@
</el-form-item>
<el-form-item
- label="电商企业名称"
+ :label="$t('shop.ebpname')"
prop="crossDetail.ebpname"
v-if="localIsCross"
>
@@ -309,7 +309,7 @@
</el-form-item>
<el-form-item
- label="电商企业代码"
+ :label="$t('shop.ebpcode')"
prop="crossDetail.ebpcode"
v-if="localIsCross"
>
@@ -614,7 +614,7 @@ export default {
// this.ruleForm.shopPhone = this.userPhone
// }
if (this.ruleForm.shopName === '') {
- this.$message.error('请输入店铺名称')
+ this.$message.error($t('shop.shopNameHint'))
return
}
// if (this.ruleForm.effectiveDate === '') {
diff --git a/src/views/stock/stocknote/index.vue b/src/views/stock/stocknote/index.vue
index df785d2..6a85c17 100644
--- a/src/views/stock/stocknote/index.vue
+++ b/src/views/stock/stocknote/index.vue
@@ -10,7 +10,7 @@
</el-form-item> -->
<el-form-item>
<el-button type="success" plain @click="add">新增出入库单</el-button>
- <!-- <el-button type="primary" plain @click="search">查询</el-button>-->
+ <!-- <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>-->
</el-form-item>
</el-form>
</div>
@@ -45,7 +45,7 @@
<el-table-column label="出入库单价" width="100">
<template slot-scope="scope">{{ scope.row.price }}</template>
</el-table-column>
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" :visible="false" @click="seeMore(scope.row)">{{ $t('common.view') }}</el-button>
diff --git a/src/views/system/logistics/Edit.vue b/src/views/system/logistics/Edit.vue
index e213fe5..136d434 100644
--- a/src/views/system/logistics/Edit.vue
+++ b/src/views/system/logistics/Edit.vue
@@ -11,7 +11,7 @@
class="dialog-wrap"
>
<el-form class="dialog-from" :model="params" label-width="120px">
- <el-form-item label="方案名称">
+ <el-form-item :label="$t('logistics.planname')">
<el-input
v-model="params.logisticsName"
maxlength="20"
@@ -20,9 +20,9 @@
/>
</el-form-item>
- <el-form-item label="仓库">
+ <el-form-item :label="$t('logistics.storehouse')">
<template slot-scope="scope">
- <el-select v-model="params.storehouseId" placeholder="请选择具体仓库" clearable>
+ <el-select v-model="params.storehouseId" :placeholder="$t('logistics.storehousehint')" clearable>
<el-option
v-for="(item,index) in storehouseList"
:key="index"
@@ -33,11 +33,11 @@
</template>
</el-form-item>
- <el-form-item label="计费方式">
+ <el-form-item :label="$t('logistics.billingtype')">
<el-radio-group v-model="params.chargeType">
- <el-radio :disabled="isDisabled" :label="1">按件数</el-radio>
- <el-radio :disabled="isDisabled" :label="2">按重量</el-radio>
- <el-radio :disabled="isDisabled" :label="3">包邮</el-radio>
+ <el-radio :disabled="isDisabled" :label="1">{{ $t('logistics.bypiece') }}</el-radio>
+ <el-radio :disabled="isDisabled" :label="2">{{ $t('logistics.byweight') }}</el-radio>
+ <el-radio :disabled="isDisabled" :label="3">{{ $t('logistics.freeshipping') }}</el-radio>
</el-radio-group>
</el-form-item>
<template>
diff --git a/src/views/system/logistics/index.vue b/src/views/system/logistics/index.vue
index f781d01..bb3dbec 100644
--- a/src/views/system/logistics/index.vue
+++ b/src/views/system/logistics/index.vue
@@ -5,12 +5,12 @@
<!-- 搜索 -->
<div class="formSearch">
<el-form :inline="true" :model="formParams" class="demo-form-inline">
- <el-form-item label="方案名称">
- <el-input v-model="formParams.logisticsName" maxlength="20" placeholder="请输入方案名称" />
+ <el-form-item :label="$t('logistics.planname')">
+ <el-input v-model="formParams.logisticsName" maxlength="20" :placeholder="$t('logistics.plannamehint')" />
</el-form-item>
<el-form-item>
- <el-button type="success" plain @click="add">新增物流方案</el-button>
- <el-button type="primary" plain @click="search">查询</el-button>
+ <el-button type="success" plain @click="add">{{ $t('logistics.newplan') }}</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
<span v-for="(item,index) in btnList" :key="index" class="promissStyle">
<el-button type="success" plain @click="btnClick(item)">{{ item.permissionName }}</el-button>
</span>
@@ -27,19 +27,19 @@
tooltip-effect="dark"
style="width: 100%"
>
- <el-table-column label="方案名称" width="220">
+ <el-table-column :label="$t('logistics.planname')" width="220">
<template slot-scope="scope">{{ scope.row.logisticsName }}</template>
</el-table-column>
- <el-table-column prop="storehouseName" label="仓库" width="220" />
- <el-table-column prop="regions" label="可配送范围" width="420" />
+ <el-table-column prop="storehouseName" :label="$t('logistics.storehouse')" width="220" />
+ <el-table-column prop="regions" :label="$t('logistics.deliverablerange')" width="420" />
<el-table-column prop="name" label="计费方式" width="220">
<template slot-scope="scope">
- <span v-if="scope.row.chargeType == 1">按件数</span>
- <span v-if="scope.row.chargeType == 2">按重量</span>
- <span v-if="scope.row.chargeType == 3">包邮</span>
+ <span v-if="scope.row.chargeType == 1">{{ $t('logistics.bypiece') }}</span>
+ <span v-if="scope.row.chargeType == 2">{{ $t('logistics.byweight') }}</span>
+ <span v-if="scope.row.chargeType == 3">{{ $t('logistics.freeshipping') }}</span>
</template>
</el-table-column>
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="seeMore(scope.row)">{{ $t('common.view') }}</el-button>
@@ -174,9 +174,9 @@ export default {
},
// 删除
del(row) {
- this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm($t('common.deletedialogtitle'), $t('common.notice_dialog_title'), {
+ confirmButtonText: $t('common.sure'),
+ cancelButtonText: $t('common.cancle'),
type: 'warning'
})
.then(() => {
@@ -184,7 +184,7 @@ export default {
if (res.code === '') {
this.$message({
type: 'success',
- message: '删除成功!'
+ message: $t('common.deletesuccess')
})
}
this.getList(this.formParams)
diff --git a/src/views/system/shopCrossDetail/index.vue b/src/views/system/shopCrossDetail/index.vue
index 27cbf0d..650f1b9 100644
--- a/src/views/system/shopCrossDetail/index.vue
+++ b/src/views/system/shopCrossDetail/index.vue
@@ -16,10 +16,10 @@
>{{ $t('common.save') }}</el-button>
</div>
<div class="shop-details">
- <el-form-item label="电商企业名称" prop="ebpname">
+ <el-form-item :label="$t('shop.ebpname')" prop="ebpname">
<el-input v-model="crossDetail.ebpname" :disabled="disabled1" />
</el-form-item>
- <el-form-item label="电商企业代码" prop="ebpcode">
+ <el-form-item :label="$t('shop.ebpcode')" prop="ebpcode">
<el-input v-model="crossDetail.ebpcode" :disabled="disabled1" />
</el-form-item>
</div>
diff --git a/src/views/system/shopSys/index.vue b/src/views/system/shopSys/index.vue
index b71699d..13fdbd4 100644
--- a/src/views/system/shopSys/index.vue
+++ b/src/views/system/shopSys/index.vue
@@ -2,7 +2,7 @@
<div class="setting-shop-page">
<el-form ref="ruleForm" :model="storeDetails" :rules="rules" label-width="100px">
<div class="h5">
- <div class="title">商家信息</div>
+ <div class="title">{{ $t('business.businessInfo') }}</div>
<el-button
v-if="!disabled1"
type="text"
@@ -16,7 +16,7 @@
>{{ $t('common.save') }}</el-button>
</div>
<div class="shop-details">
- <el-form-item label="商家logo">
+ <el-form-item :label="$t('business.businessLogo')">
<el-upload
:class="[{ 'avatar-uploader': !storeDetails.businessLogo }]"
:headers="headers"
@@ -36,10 +36,10 @@
<i v-else class="el-icon-plus avatar-uploader-icon" />
</el-upload>
</el-form-item>
- <el-form-item label="商家名称">
+ <el-form-item :label="$t('business.businessName')">
<el-input v-model="storeDetails.businessName" maxlength="20" :disabled="disabled1" />
</el-form-item>
- <el-form-item label="联系电话" prop="buinessPhone">
+ <el-form-item :label="$t('common.contactPhone')" prop="buinessPhone">
<el-input
v-if="businessPhoneShow"
:value="hidden(storeDetails.buinessPhone,3,4)"
@@ -55,7 +55,7 @@
:disabled="disabled1"
/>
</el-form-item>
- <el-form-item label="发货地址">
+ <el-form-item :label="$t('business.businessAddress')">
<el-input
v-model="storeDetails.businessAdress"
maxlength="60"
@@ -64,7 +64,7 @@
type="textarea"
/>
</el-form-item>
- <el-form-item label="商家简介">
+ <el-form-item :label="$t('business.businessBrief')">
<el-input
v-model="storeDetails.businessBrief"
maxlength="50"
@@ -73,10 +73,10 @@
type="textarea"
/>
</el-form-item>
- <el-form-item label="负责人">
+ <el-form-item :label="$t('common.contactPerson')">
<el-input v-model="storeDetails.chargePersonName" maxlength="20" :disabled="disabled1" />
</el-form-item>
- <el-form-item label="负责人手机号" prop="chargePersonPhone">
+ <el-form-item :label="$t('business.businessContactMobilePhone')" prop="chargePersonPhone">
<el-input
v-if="chargePersonPhoneShow"
:value="hidden(storeDetails.chargePersonPhone,3,4)"
@@ -102,11 +102,11 @@
</el-form-item> -->
</div>
<div class="h5">
- <div class="title">商家认证</div>
+ <div class="title">{{ $t('business.businessAuth') }}</div>
</div>
<div class="shop-details" v-if="storeDetails.xsPayId && storeDetails.xsPayId.length > 0" style="overflow: hidden; line-height: 40px">
- <el-form-item label="支付信息Id">
+ <el-form-item :label="$t('business.payinfoId')">
<el-input
v-model="storeDetails.xsPayId"
maxlength="60"
@@ -114,8 +114,8 @@
/>
</el-form-item>
- <el-form-item label="分账账期">
- <el-select v-model="storeDetails.shareDays" placeholder="请选择分账账期"
+ <el-form-item :label="$t('business.ledgerperiod')">
+ <el-select v-model="storeDetails.shareDays" :placeholder="$t('business.chooseLedgerPeriod')"
:disabled="disabled1">
<el-option
v-for="item in shareDaySettings"
@@ -127,8 +127,8 @@
</el-form-item>
</div>
<div class="shop-details" v-else style="overflow: hidden; line-height: 40px">
- 支付信息认证
- <el-button type="primary" style="float:right" @click="approve">立即认证</el-button>
+ {{ $t('business.payinfoauth') }}
+ <el-button type="primary" style="float:right" @click="approve">{{ $t('business.payauth') }}</el-button>
</div>
<!-- <div class="h5" v-if="localIsCross">
diff --git a/src/views/system/storehouse/Edit.vue b/src/views/system/storehouse/Edit.vue
index a569ddb..c759f3e 100644
--- a/src/views/system/storehouse/Edit.vue
+++ b/src/views/system/storehouse/Edit.vue
@@ -11,7 +11,7 @@
class="dialog-wrap"
>
<el-form class="dialog-from" :model="params" label-width="150px">
- <el-form-item label="仓库名称">
+ <el-form-item :label="$t('storehouse.storehousename')">
<el-input
v-model="params.storehouseName"
maxlength="20"
@@ -19,17 +19,17 @@
onblur="value=value.replace(/(^\s*)|(\s*$)/g, '')"
/>
</el-form-item>
- <el-form-item label="仓库类型">
+ <el-form-item :label="$t('storehouse.storehousetype')">
<el-radio-group v-model="params.type">
- <el-radio :disabled="isDisabled" :label="1">自营仓</el-radio>
- <el-radio :disabled="isDisabled" :label="2">委外仓</el-radio>
+ <el-radio :disabled="isDisabled" :label="1">{{ $t('storehouse.selfsupportstorehouse') }}</el-radio>
+ <el-radio :disabled="isDisabled" :label="2">{{ $t('storehouse.outsourcingstorehouse') }}</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="仓库种类">
+ <el-form-item :label="$t('storehouse.storehousekind')">
<el-radio-group v-model="params.kind">
- <el-radio :disabled="isDisabled" :label="1">国内仓</el-radio>
- <el-radio :disabled="isDisabled" :label="2">保税仓</el-radio>
- <el-radio :disabled="isDisabled" :label="3">海外仓</el-radio>
+ <el-radio :disabled="isDisabled" :label="1">{{ $t('storehouse.internalhouse') }}</el-radio>
+ <el-radio :disabled="isDisabled" :label="2">{{ $t('storehouse.bondedstorehouse') }}</el-radio>
+ <el-radio :disabled="isDisabled" :label="3">{{ $t('storehouse.overseasstorehouse') }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/storehouse/index.vue b/src/views/system/storehouse/index.vue
index 4c4c854..8f713d7 100644
--- a/src/views/system/storehouse/index.vue
+++ b/src/views/system/storehouse/index.vue
@@ -10,7 +10,7 @@
</el-form-item>
<el-form-item>
<el-button type="success" plain @click="add">新增仓库</el-button>
- <el-button type="primary" plain @click="search">查询</el-button>
+ <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
<span v-for="(item,index) in btnList" :key="index" class="promissStyle">
<el-button type="success" plain @click="btnClick(item)">{{ item.permissionName }}</el-button>
</span>
@@ -30,20 +30,20 @@
<el-table-column label="仓库名称" width="220">
<template slot-scope="scope">{{ scope.row.storehouseName }}</template>
</el-table-column>
- <el-table-column prop="type" label="仓库类型" width="220" >
+ <el-table-column prop="type" :label="$t('storehouse.storehousetype')" width="220" >
<template slot-scope="scope">
- <span v-if="scope.row.type == 1">自营仓</span>
- <span v-if="scope.row.type == 2">委外仓</span>
+ <span v-if="scope.row.type == 1">{{ $t('storehouse.selfsupportstorehouse') }}</span>
+ <span v-if="scope.row.type == 2">{{ $t('storehouse.outsourcingstorehouse') }}</span>
</template>
</el-table-column>
- <el-table-column prop="kind" label="仓库种类" width="220">
+ <el-table-column prop="kind" :label="$t('storehouse.storehousekind')" width="220">
<template slot-scope="scope">
- <span v-if="scope.row.kind == 1">国内仓</span>
- <span v-if="scope.row.kind == 2">保税仓</span>
- <span v-if="scope.row.kind == 3">海外仓</span>
+ <span v-if="scope.row.kind == 1">{{ $t('storehouse.internalhouse') }}</span>
+ <span v-if="scope.row.kind == 2">{{ $t('storehouse.bondedstorehouse') }}</span>
+ <span v-if="scope.row.kind == 3">{{ $t('storehouse.overseasstorehouse') }}</span>
</template>
</el-table-column>
- <el-table-column label="操作" show-overflow-tooltip>
+ <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope">
<div class="btnList">
<el-button type="text" @click="seeMore(scope.row)">{{ $t('common.view') }}</el-button>