多语言配置

canvas-container/components/Upload/index.vue

@@ -266,8 +266,8 @@ export default {
         return true
       }
       return await this.$confirm('此操作将会删除已上传的文件, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       })
     },
@@ -303,8 +303,8 @@ export default {
         this.previewObj.show = true
       }else{
         this.$confirm('需要下载才能预览此文件, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.sure'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           let htmlAnchorElement = document.createElement('a');

canvas-container/components/canvasEditPage.vue

@@ -119,8 +119,8 @@
       // 删除组件
       delComponent (item, index) {
         this.$confirm('确定删除吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('common.sure'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           this.activeComponent = -1

canvas-container/components/toolBar/BasicsComp/brandList.vue

@@ -4,7 +4,7 @@
     <div class="toolBox">
       <div class="itemBox">
         <label>标题</label>
-        <el-input v-model="activeComponent.componentContent.title" maxlength="20" placeholder="请输入内容"></el-input>
+        <el-input v-model="activeComponent.componentContent.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
       </div>
       <div class="itemBox">
         <label>文字对齐方式</label>
@@ -39,7 +39,7 @@
                   <tool-select-link :linkObj.sync='item.linkObj'></tool-select-link>
                   <div class="itemImgTit itemBox">
                     <label>标题</label>
-                    <el-input v-model="item.title" maxlength="20" placeholder="请输入内容"></el-input>
+                    <el-input v-model="item.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
                   </div>
                 </div>
                 <div @click="deleteItem(item, index)" class="deleteItem"><span class="iconfont">&#xe633;</span>删除内容</div>

canvas-container/components/toolBar/BasicsComp/headerTool.vue

@@ -15,7 +15,7 @@
         <div v-else>
           <div class="itemBox">
             <div class="Tit">LOGO文本</div>
-            <el-input class="item-input" v-model="activeComponent.componentContent.title" maxlength="20" placeholder="请输入内容"></el-input>
+            <el-input class="item-input" v-model="activeComponent.componentContent.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
           </div>
           <div class="itemBox">
             <div class="Tit">文本大小</div>

canvas-container/components/toolBar/BasicsComp/imageText.vue

@@ -8,7 +8,7 @@
       <div class="textTit">文本设置</div>
       <div class="itemBox">
         <label>标题</label>
-        <el-input v-model="activeComponent.componentContent.title" maxlength="20" placeholder="请输入内容"></el-input>
+        <el-input v-model="activeComponent.componentContent.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
       </div>
       <div class="itemBox">
         <label>正文</label>

canvas-container/components/toolBar/BasicsComp/imageTextList.vue

@@ -4,7 +4,7 @@
     <div class="toolBox">
       <div class="itemBox">
         <label>标题</label>
-        <el-input v-model="activeComponent.componentContent.title" maxlength="20" placeholder="请输入内容"></el-input>
+        <el-input v-model="activeComponent.componentContent.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
       </div>
       <div class="itemBox">
         <label>文字对齐方式</label>
@@ -46,14 +46,14 @@
                   <tool-single-img :imageUrl.sync='item.imgData' tip='建议尺寸5:4等比例图片'></tool-single-img>
                   <div class="itemImgTit itemBox">
                     <label>标题</label>
-                    <el-input v-model="item.title" maxlength="20" placeholder="请输入内容"></el-input>
+                    <el-input v-model="item.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
                   </div>
                   <div class="itemBox">
                     <label>描述内容</label>
                     <el-input
                       type="textarea"
                       :rows="2"
-                      placeholder="请输入内容"
+                      :placeholder="$t('common.defaulthint')"
                       resize="none"
                       v-model="item.describe"
                       maxlength="200">

canvas-container/components/toolBar/BasicsComp/imageTextNav.vue

@@ -22,7 +22,7 @@
                   <tool-single-img :imageUrl.sync='item.img' tip="建议尺寸: 100*100px"></tool-single-img>
                   <div class="itemImgTit itemBox">
                     <label>标题</label>
-                    <el-input v-model="item.title" maxlength="20" placeholder="请输入内容"></el-input>
+                    <el-input v-model="item.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
                   </div>
                   <tool-select-link :linkObj.sync='item.linkObj'></tool-select-link>
                 </div>

canvas-container/components/toolBar/BasicsComp/shopTop.vue

@@ -71,7 +71,7 @@
                       <div class="addLabelBox" v-show="labelCurrent === index">
                         <div class="itemBox">
                           <label>名称</label>
-                          <el-input v-model="item.name" maxlength="20" placeholder="请输入内容"></el-input>
+                          <el-input v-model="item.name" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
                         </div>
                         <tool-select-link :linkObj.sync='item.linkObj' title="图片链接"></tool-select-link>
                       </div>

canvas-container/components/toolBar/BasicsComp/textTool.vue

@@ -4,14 +4,14 @@
       <div class="toolBox">
         <div class="itemBox">
           <label>标题内容</label>
-          <el-input v-model="activeComponent.componentContent.title" maxlength="20" placeholder="请输入内容"></el-input>
+          <el-input v-model="activeComponent.componentContent.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
         </div>
         <div class="itemBox">
           <label>描述内容</label>
           <el-input
             type="textarea"
             :rows="2"
-            placeholder="请输入内容"
+            :placeholder="$t('common.defaulthint')"
             resize="none"
             v-model="activeComponent.componentContent.describe"
             maxlength="200">

canvas-container/components/toolBar/BasicsComp/videoTool.vue

@@ -5,12 +5,12 @@
       <div class="itemBox">
         <label>视频地址</label>
         <Upload :default-file-list="defaultVideoList" :limit-size="20" :multiple="false" :types="['mp4']" :limit="1" @change="(fileList)=>handleUploadChange(fileList,'videoUrl')" />
-<!--        <el-input v-model="activeComponent.componentContent.videoUrl" placeholder="请输入内容"></el-input>-->
+<!--        <el-input v-model="activeComponent.componentContent.videoUrl" :placeholder="$t('common.defaulthint')"></el-input>-->
       </div>
       <div class="itemBox">
         <label>覆盖页地址（APP）</label>
         <Upload :default-file-list="defaultImgList" :limit-size="20" :multiple="false" :types="['jpg','jpeg','png','gif']" :limit="1" @change="(fileList)=>handleUploadChange(fileList,'coverImg')"  />
-        <!--        <el-input v-model="activeComponent.componentContent.videoUrl" placeholder="请输入内容"></el-input>-->
+        <!--        <el-input v-model="activeComponent.componentContent.videoUrl" :placeholder="$t('common.defaulthint')"></el-input>-->
       </div>
 
 <!--      <div class="itemBox">-->
@@ -18,14 +18,14 @@
 <!--        <el-input-->
 <!--          type="textarea"-->
 <!--          :rows="2"-->
-<!--          placeholder="请输入内容"-->
+<!--          :placeholder="$t('common.defaulthint')"-->
 <!--          resize="none"-->
 <!--          v-model="textInfo">-->
 <!--        </el-input>-->
 <!--      </div>-->
       <div class="itemBox">
         <label>标题</label>
-        <el-input v-model="activeComponent.componentContent.title" maxlength="20" placeholder="请输入内容"></el-input>
+        <el-input v-model="activeComponent.componentContent.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
       </div>
       <div class="itemBox">
         <label>正文</label>

canvas-container/components/toolBar/goodsComp/categoryTool.vue

@@ -4,7 +4,7 @@
     <div class="toolBox">
       <div class="itemBox">
         <label>标题</label>
-        <el-input v-model="activeComponent.componentContent.title" maxlength="20" placeholder="请输入内容"></el-input>
+        <el-input v-model="activeComponent.componentContent.title" maxlength="20" :placeholder="$t('common.defaulthint')"></el-input>
       </div>
       <tool-select :linkValue.sync='activeComponent.componentContent.textAlign' title="文字对齐方式" :options="alignList"></tool-select>
       <div class="textTit">添加类别</div>

canvas-container/components/toolBar/goodsComp/productList.vue

@@ -4,7 +4,7 @@
     <div class="toolBox">
 <!--      <div class="itemBox" v-if="terminal !== 4">-->
 <!--        <label>标题</label>-->
-<!--        <el-input v-model="activeComponent.componentContent.title" placeholder="请输入内容"></el-input>-->
+<!--        <el-input v-model="activeComponent.componentContent.title" :placeholder="$t('common.defaulthint')"></el-input>-->
 <!--      </div>-->
       <tool-product-source :productData.sync='activeComponent.componentContent.productData' :type="activeComponent.type"></tool-product-source>
       <div class="styleSelectLine">

canvas-container/components/toolBar/shopComp/groupTool.vue

@@ -4,7 +4,7 @@
 <!--    <div class="toolBox" v-if="terminal !== 4">-->
 <!--      <div class="itemBox">-->
 <!--        <label>标题</label>-->
-<!--        <el-input v-model="activeComponent.componentContent.title" placeholder="请输入内容"></el-input>-->
+<!--        <el-input v-model="activeComponent.componentContent.title" :placeholder="$t('common.defaulthint')"></el-input>-->
 <!--      </div>-->
 <!--    </div>-->
     <div v-if="typeId == 3">

canvas-container/components/toolBar/shopComp/newProductTool.vue

@@ -4,7 +4,7 @@
     <div class="toolBox">
 <!--      <div class="itemBox" v-if="terminal !== 4">-->
 <!--        <label>标题</label>-->
-<!--        <el-input v-model="activeComponent.componentContent.title" placeholder="请输入内容"></el-input>-->
+<!--        <el-input v-model="activeComponent.componentContent.title" :placeholder="$t('common.defaulthint')"></el-input>-->
 <!--      </div>-->
       <div class="tool-select-product">
 <!--        <div class="title">-->

canvas-container/components/toolBar/shopComp/priceTool.vue

@@ -4,7 +4,7 @@
 <!--    <div class="toolBox" v-if="terminal !== 4">-->
 <!--      <div class="itemBox">-->
 <!--        <label>标题</label>-->
-<!--        <el-input v-model="activeComponent.componentContent.title" placeholder="请输入内容"></el-input>-->
+<!--        <el-input v-model="activeComponent.componentContent.title" :placeholder="$t('common.defaulthint')"></el-input>-->
 <!--      </div>-->
 <!--    </div>-->
     <div class="porListBox">

canvas-container/components/toolBar/shopComp/spikeTool.vue

@@ -4,7 +4,7 @@
 <!--    <div class="toolBox" v-if="terminal !== 4">-->
 <!--      <div class="itemBox">-->
 <!--        <label>标题</label>-->
-<!--        <el-input v-model="activeComponent.componentContent.title" placeholder="请输入内容"></el-input>-->
+<!--        <el-input v-model="activeComponent.componentContent.title" :placeholder="$t('common.defaulthint')"></el-input>-->
 <!--      </div>-->
 <!--    </div>-->
     <div class="porListBox">

canvas-container/components/toolBar/shopComp/vipTool.vue

@@ -4,7 +4,7 @@
     <div class="toolBox">
 <!--      <div class="itemBox" v-if="terminal !== 4">-->
 <!--        <label>标题</label>-->
-<!--        <el-input v-model="activeComponent.componentContent.title" placeholder="请输入内容"></el-input>-->
+<!--        <el-input v-model="activeComponent.componentContent.title" :placeholder="$t('common.defaulthint')"></el-input>-->
 <!--      </div>-->
 <div v-if="terminal == 4">
       <div class="styleSelectLine">

canvas-container/components/toolBar/toolModule/font-size-select.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-select class="fontSizeSelect" v-model="fontVal" placeholder="请选择" @change="fontChange">
+  <el-select class="fontSizeSelect" v-model="fontVal" :placeholder="$t('common.choose')" @change="fontChange">
     <el-option
       v-for="item in fontList"
       :key="item.value"

canvas-container/components/toolBar/toolModule/product-select.vue

@@ -5,8 +5,8 @@
         <el-input v-model="formData.keyword" maxlength="20" placeholder="店铺名称/商品ID/商品分组"></el-input>
       </el-form-item>
 <!--      <el-form-item label="上架状态">-->
-<!--        <el-select v-model="formData.status" placeholder="请选择">-->
-<!--          <el-option label="全部" value=""></el-option>-->
+<!--        <el-select v-model="formData.status" :placeholder="$t('common.choose')">-->
+<!--          <el-option :label="$t('common.all')" value=""></el-option>-->
 <!--          <el-option label="上架" value="1"></el-option>-->
 <!--          <el-option label="下架" value="0"></el-option>-->
 <!--        </el-select>-->

canvas-container/components/toolBar/toolModule/tool-select-category.vue

@@ -20,7 +20,7 @@
         v-model="categoryValue"
         multiple
         collapse-tags
-        placeholder="请选择">
+        :placeholder="$t('common.choose')">
         <el-option
           v-for="item in categoryList"
           :key="item.id"

src/App.vue

@@ -2,10 +2,10 @@
   <div id="app">
     <el-dialog :title="$t('common.notice_dialog_title')" top="30vh" :visible.sync="tipShow" width="30%" center>
       <span
-        >为保护个人隐私信息，系统自动对敏感数据进行脱敏。如需编辑、查看完整信息，可通过“用户隐私二次认证”功能进行验证，验证通过之后，24小时内可查看完整信息。</span
+        >{{$t('common.privacytips')}}</span
       >
       <span slot="footer" class="dialog-footer">
-        <el-button @click="tipShow = false">关闭</el-button>
+        <el-button @click="tipShow = false">{{$t('common.close')}}</el-button>
       </span>
     </el-dialog>
     <router-view />

src/locales/en.json

@@ -31,7 +31,7 @@
 	"common.query":"Query",
 	"common.reset":"Reset",
 	"common.operate":"Operate",
-	"common.createTIme":"Created Time",
+	"common.createTime":"Created Time",
 	"common.contactPhone":"Phone",
 	"common.contactPerson":"Contact",
 	"common.nodata":"No Data",
@@ -453,7 +453,7 @@
 	"common.stocknum":"Stock {number}",
 	"common.understock":"Insufficient",
 	"common.mobilephone_hint":"Please Enter the Phone Number",
-	"common.autologin":"Automatic login",
+	"common.autologin":"Auto login",
 	"common.forgetpassword":"Forget Password",
 	"common.sjdl":"Business Login",
 	"common.account_hint":"Please Enter the username",
@@ -512,5 +512,95 @@
 	"common.inoutsuccess_hint":"请填写正确的信息",
 	"common.successful":"Successful",
 	"common.addsuccessful":"Add Successful",
-	"common.editsuccessful":"Update Successful"
+	"common.editsuccessful":"Update Successful",
+	"common.turnover":"Turnover",
+	"common.pendingorder":"Pending Order",
+	"common.aftersaleorder":"After-sale Order",
+	"common.visits":"visits",
+	"common.today":"Today",
+	"common.yesterday":"Yesterday",
+	"common.last7days":"Last 7 days",
+	"common.last30days":"Last 30 days",
+	"common.unit_times":"times",
+	"common.unit_yuan":"yuan",
+	"common.unit_wan_yuan":"10000 yuan",
+	"common.unit_piece":"piece",
+	"common.sold_piece_num":"sold {number} piece",
+	"common.exporting":"Do not repeat operations during data export!",
+	"common.yhfwsj":"User_access_data",
+	"common.ddtjsj":"Order_statistics",
+	"common.rmspsj":"Hot_selling_goods_data",
+	"common.unit_time_name":"time",
+	"common.completed":"Completed",
+	"common.verificationcode":"Verification code",
+	"common.administratortelephone":"Administrator telephone",
+	"common.administratortelephone_hint":"Please Enter the Administrator telephone",
+	"common.certificationdate":"Certification date",
+	"common.uncertificated":"uncertificated",
+	"common.newphonenum_hint":"Please Enter the New Phone Number",
+	"common.getcodesuccess_notify":"Send successfully, please pay attention to check the mobile phone SMS",
+	"common.privacysuccess_notify":"If the second authentication is successful, the authentication is valid within 24 hours. If the second authentication is successful, the second authentication is valid within 24 hours",
+	"page.goodsalreadysent":"Sended",
+	"page.closed":"Closed",
+	"page.canceled":"Canceled",
+	"common.ordertime":"Order time",
+	"common.defaulthint":"Please Enter the content",
+	"common.starttime":"Start Time",
+	"common.endtime":"End Time",
+	"common.startdate":"Start Date",
+	"common.enddate":"End Date",
+	"common.betweentime":"To",
+	"common.choosetime":"Please choose the time range",
+	"common.buyeraccount":"Buyer",
+	"common.receivername":"Receiver Name",
+	"common.receivermobilenum":"Receiver Phonenumber",
+	"common.exportorder":"Export Order",
+	"common.orderstatus_dct":"To be grouped",
+	"common.product_number_tips":"Quantity",
+	"common.orderstatus":"Status",
+	"common.orderaccount":"Order Account",
+	"common.changeprice":"Change price",
+	"common.send":"Send",
+	"common.exportorder_filename":"orderdatadetail.xls",
+	"common.paymentcode":"Payment Code",
+	"common.paymenttime":"Payment Time",
+	"logistics.logisticsplan":"Logistics Plan",
+	"common.after-salestatus":"After-sale status",
+	"common.placeorderinfo":"Place Order Info",
+	"common.historyordernum":"Historical order total",
+	"common.orderremark":"Order Remark",
+	"common.receivinginfo":"Receiving Info",
+	"common.productinfo":"Product Info",
+	"common.product":"Product",
+	"common.quantity":"Quantity",
+	"common.total_small":"Total",
+	"common.producttotalprice":"Product Amount",
+	"common.freightamount":"Freight Amount",
+	"common.totalamount":"Total Amount",
+	"common.logisticscompany":"Logistics Company",
+	"common.hwbnumber":"HWB Number",
+	"common.logisticscompany_hint":"Please enter the Courier name",
+	"common.logistics_number_hint":"Please enter the tracking number",
+	"common.logisticscompany_choose_hint":"Please select a Courier",
+	"common.sendsuccess":"Send Success",
+	"common.privacytips":"In order to protect personal privacy information, the system automatically desensitizes sensitive data. If you need to edit and view the complete information, you can verify it through the 'User Privacy Secondary authentication' function. After the verification is passed, you can view the complete information within 24 hours.",
+	"common.close":"Close",
+	"common.dsjcl":"Pending merchant",
+	"common.dsjsh":"Waiting merchant receive",
+	"common.afterId":"After ID",
+	"common.productId":"Product ID",
+	"common.orderstatus_hint":"Please select the order status",
+	"common.after-salestatus_hint":"Please select the after-sale status",
+	"common.after-salestatus_shz":"After sale",
+	"common.after-salestatus_shcg":"After-sale success",
+	"common.after-salestatus_shgb":"After-sale closing",
+	"common.after-sales_type":"After-sale type",
+	"common.after-sales_type_hint":"Please select the after-sale type",
+	"common.after-sales_type_jtk":"Refund",
+	"common.after-sales_type_thtk":"Return",
+	"common.aftercode":"After-sale code",
+	"common.refundamount":"Refund Amount",
+	"common.deal":"Deal",
+	"common.exportafterorder_filename":"afterorderdatadetail.xls",
+	"common.after-salestatus_info":"After-sale Info"
 }

src/locales/zh-CN.json

@@ -31,7 +31,7 @@
 	"common.query":"查询",
 	"common.reset":"重置",
 	"common.operate":"操作",
-	"common.createTIme":"创建时间",
+	"common.createTime":"创建时间",
 	"common.contactPhone":"联系电话",
 	"common.contactPerson":"负责人",
 	"common.nodata":"暂无数据",
@@ -472,8 +472,8 @@
 	"common.company":"公司",
 	"common.school":"学校",
 	"common.returnperson_empty":"请输入收货人！",
-	"common.phonenumber_empty":"请输入手机号！",
-	"common.phonenumber_error":"请输入正确的手机号！",
+	"common.phonenumber_empty":"请输入手机号",
+	"common.phonenumber_error":"请输入正确的手机号",
 	"common.location_empty":"所在地不能为空！",
 	"common.location_detail_empty":"请输入详细地址！",
 	"common.removeaddress_tips":"是否删除此地址？",
@@ -512,5 +512,96 @@
 	"common.inoutsuccess_hint":"请填写正确的信息",
 	"common.successful":"成功",
 	"common.addsuccessful":"添加成功",
-	"common.editsuccessful":"修改成功"
+	"common.editsuccessful":"修改成功",
+	"common.turnover":"成交金额",
+	"common.pendingorder":"待处理订单",
+	"common.aftersaleorder":"售后订单",
+	"common.visits":"店铺访问次数",
+	"common.today":"今天",
+	"common.yesterday":"昨天",
+	"common.last7days":"最近7天",
+	"common.last30days":"最近30天",
+	"common.unit_times":"次",
+	"common.unit_yuan":"元",
+	"common.unit_wan_yuan":"万元",
+	"common.unit_piece":"件",
+	"common.sold_piece_num":"已售 {number} 件",
+	"common.exporting":"数据导出中，请勿重复操作！",
+	"common.yhfwsj":"用户访问数据",
+	"common.ddtjsj":"订单统计数据",
+	"common.rmspsj":"热卖商品数据",
+	"common.unit_time_name":"次数",
+	"common.completed":"已完成",
+	"common.verificationcode":"验证码",
+	"common.administratortelephone":"管理员电话" ,
+	"common.administratortelephone_hint":"请输入管理员电话",
+	"common.certificationdate":"认证时间",
+	"common.uncertificated":"未认证",
+	"common.newphonenum_hint":"请输入新手机号",
+	"common.getcodesuccess_notify":"发送成功，请注意查看手机短信",
+	"common.privacysuccess_notify":"二次认证成功，该认证24小时内有效，超过时间需要重新认证",
+	"page.goodsalreadysent":"已发货",
+	"page.closed":"已关闭",
+	"page.canceled":"已取消",
+	"common.ordertime":"下单时间",
+	"common.defaulthint":"请输入内容",
+	"common.starttime":"开始时间",
+	"common.endtime":"结束时间",
+	"common.startdate":"开始日期",
+	"common.enddate":"结束日期",
+	"common.betweentime":"至",
+	"common.choosetime":"请选择时间范围",
+	"common.buyeraccount":"买家账户",
+	"common.receivername":"收件人姓名",
+	"common.receivermobilenum":"收件人手机号",
+	"common.exportorder":"导出订单",
+	"common.orderstatus_dct":"待成团",
+	"common.product_number_tips":"商品数量（件）",
+	"common.orderstatus":"订单状态",
+	"common.orderaccount":"下单账户",
+	"common.changeprice":"改价",
+	"common.send":"发货",
+	"common.exportorder_filename":"订单数据明细表.xls",
+	"common.paymentcode":"支付单号",
+	"common.paymenttime":"支付时间",
+	"logistics.logisticsplan":"物流方案",
+	"common.after-salestatus":"售后状态",
+	"common.placeorderinfo":"下单信息",
+	"common.historyordernum":"历史订单总数",
+	"common.orderremark":"下单备注",
+	"common.receivinginfo":"收货信息",
+	"common.productinfo":"商品信息",
+	"common.product":"商品",
+	"common.quantity":"数量",
+	"common.total_small":"小计",
+	"common.producttotalprice":"商品总价",
+	"common.freightamount":"运费金额",
+	"common.totalamount":"总金额",
+	"common.logisticscompany":"物流公司",
+	"common.hwbnumber":"运单号",
+	"common.logisticscompany_hint":"请输入快递公司名称",
+	"common.logistics_number_hint":"请输入快递单号",
+	"common.logisticscompany_choose_hint":"请选择快递公司",
+	"common.sendsuccess":"发货成功",
+	"common.privacytips":"为保护个人隐私信息，系统自动对敏感数据进行脱敏。如需编辑、查看完整信息，可通过“用户隐私二次认证”功能进行验证，验证通过之后，24小时内可查看完整信息。",
+	"common.close":"关闭",
+	"common.dsjcl":"待商家处理",
+	"common.dsjsh":"待商家收货",
+	"common.afterId":"售后ID",
+	"common.productId":"商品ID",
+	"common.orderstatus_hint":"请选择订单状态",
+	"common.after-salestatus_hint":"请选择售后状态",
+	"common.after-salestatus_shz":"售后中",
+	"common.after-salestatus_shcg":"售后成功",
+	"common.after-salestatus_shgb":"售后关闭",
+	"common.after-sales_type":"售后类型",
+	"common.after-sales_type_hint":"请选择售后类型",
+	"common.after-sales_type_jtk":"仅退款",
+	"common.after-sales_type_thtk":"退货退款",
+	"common.aftercode":"售后单号",
+	"common.refundamount":"退款金额(元)",
+	"common.deal":"处理",
+	"common.exportafterorder_filename":"售后订单数据明细表.xls",
+	"common.after-salestatus_info":"售后信息"
+	
 }

src/views/active/activeData.vue

@@ -13,7 +13,7 @@
       </div>
       <div class="dataItem">
         <span>{{ dataInfo.total }}</span>
-        <p>成交金额</p>
+        <p>{{$t('common.turnover')}}</p>
       </div>
     </div>
     <div class="tabListInfo">活动成交的商品</div>

src/views/active/getActive.vue

@@ -42,13 +42,13 @@
             v-model="formInline.search"
             maxlength="20"
             class="searchInput"
-            placeholder="请输入内容"
+            :placeholder="$t('common.defaulthint')"
           >
             <el-select
               slot="prepend"
               v-model="formInline.condition"
               style="width:130px"
-              placeholder="请选择"
+              :placeholder="$t('common.choose')"
             >
               <el-option
                 label="商品id"
@@ -108,12 +108,12 @@
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
             <el-form-item>
               <div>
-                <el-input v-model="formInline.search" placeholder="请输入内容">
+                <el-input v-model="formInline.search" :placeholder="$t('common.defaulthint')">
                   <el-select
                     slot="prepend"
                     v-model="formInline.condition"
                     style="width:130px"
-                    placeholder="请选择"
+                    :placeholder="$t('common.choose')"
                   >
                     <el-option label="商品id" value="1" />
                     <el-option label="商品名称" value="2" />

src/views/active/index.vue

@@ -3,7 +3,7 @@
   <div class="commonActivityPage">
     <div class="acTab">
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="全部" name="1" />
+        <el-tab-pane :label="$t('common.all')" name="1" />
         <el-tab-pane label="我参与的" name="2" />
       </el-tabs>
       <el-radio-group v-model="formInline.signType" @change="signTypeChange">

src/views/commodity/commdityClass/Edit.vue

@@ -138,7 +138,7 @@
             type="primary"
             size="small"
             @click="close"
-          >确定
+          >{{$t('common.sure')}}
           </el-button>
         </template>
         <template v-else>

src/views/commodity/commodityList copy/commodityGroup.vue

@@ -173,7 +173,7 @@
             <div v-for="(item, index) of selectConditions" :key="item.type" class="condition">
               <div class="flexBox">
                 <div class="rightInfo">
-                  <el-select v-model="item.type" placeholder="请选择" @change="changeType(item, index)">
+                  <el-select v-model="item.type" :placeholder="$t('common.choose')" @change="changeType(item, index)">
                     <el-option
                       v-for="typeItem in options"
                       v-show="!types.includes(typeItem.type)"
@@ -184,7 +184,7 @@
                   </el-select>
                 </div>
                 <div class="purchase">
-                  <el-select v-model="item.calculation" placeholder="请选择">
+                  <el-select v-model="item.calculation" :placeholder="$t('common.choose')">
                     <el-option
                       v-for="calculationItem in calculationList"
                       :key="calculationItem.value"

src/views/commodity/commodityList copy/index.vue

@@ -246,8 +246,8 @@ export default {
     // 删除分组
     del(row) {
       this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       })
         .then(() => {

src/views/commodity/commodityList/commodityGroup.vue

@@ -173,7 +173,7 @@
             <div v-for="(item, index) of selectConditions" :key="item.type" class="condition">
               <div class="flexBox">
                 <div class="rightInfo">
-                  <el-select v-model="item.type" placeholder="请选择" @change="changeType(item, index)">
+                  <el-select v-model="item.type" :placeholder="$t('common.choose')" @change="changeType(item, index)">
                     <el-option
                       v-for="typeItem in options"
                       v-show="!types.includes(typeItem.type)"

src/views/commodity/commodityList/index.vue

@@ -246,8 +246,8 @@ export default {
     // 删除分组
     del(row) {
       this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       })
         .then(() => {

src/views/commodity/commoditySystem/index.vue

@@ -379,7 +379,7 @@ export default {
     // 导出商品
     async productDataExport() {
       this.$message({
-        message: '数据导出中，请勿重复操作！',
+        message: this.$t('common.exporting'),
         type: 'success'
       })
       const res = await productExport(this.formInline)
@@ -487,8 +487,8 @@ export default {
     clearProductMember() {
       console.log(this.productData, 'this.productData')
       this.$confirm('该商品所有旧设置的会员价将被清除, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         clearProductMember({ productId: this.productId }).then(res => {
@@ -507,8 +507,8 @@ export default {
     // 删除商品
     del(row) {
       this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       })
         .then(() => {

src/views/customer/addClustering.vue

@@ -13,7 +13,7 @@
               <div class="flexBox">
                 <div class="leftTit" v-text="index === 0 ? '特征筛选' : ''" />
                 <div class="rightInfo">
-                  <el-select v-model="item.type" placeholder="请选择" @change="changeType(item, index)">
+                  <el-select v-model="item.type" :placeholder="$t('common.choose')" @change="changeType(item, index)">
                     <el-option
                       v-for="typeItem in options"
                       v-show="!types.includes(typeItem.type)"
@@ -24,7 +24,7 @@
                   </el-select>
                 </div>
                 <div v-if="item.type === 9 || item.type === 10" class="purchase">
-                  <el-select v-model="item.calculation" placeholder="请选择">
+                  <el-select v-model="item.calculation" :placeholder="$t('common.choose')">
                     <el-option
                       v-for="calculationItem in calculationList"
                       :key="calculationItem.value"
@@ -38,7 +38,7 @@
                     v-model="item.labelIds"
                     multiple
                     collapse-tags
-                    placeholder="请选择"
+                    :placeholder="$t('common.choose')"
                   >
                     <el-option
                       v-for="tagItem in tagList"

src/views/customer/addOperate.vue

@@ -26,9 +26,9 @@
                     <el-date-picker
                       v-model="dateInfo"
                       type="datetimerange"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
+                      :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                       value-format="yyyy-MM-dd HH:mm:ss"
                     />
                   </el-form-item>

src/views/customer/clusteringList/index.vue

@@ -3,7 +3,7 @@
     <div class="formSearch">
       <div class="searchItem">
         <span>人群名称：</span>
-        <el-input v-model="formInline.crowdName" maxlength="20" placeholder="请输入内容" />
+        <el-input v-model="formInline.crowdName" maxlength="20" :placeholder="$t('common.defaulthint')" />
       </div>
       <div class="searchItem">
         <span>客户数量:</span>

src/views/customer/customerList/customerDetail.vue

@@ -58,7 +58,7 @@
               <span>{{ basicInfo.phone }}</span>
             </el-form-item>
             <el-form-item class="inputWide" label="客户昵称">
-              <el-input v-model="basicInfo.name" placeholder="请输入内容" maxlength="10" onblur="value=value.replace(/(^\s*)|(\s*$)/g, '')" show-word-limit />
+              <el-input v-model="basicInfo.name" :placeholder="$t('common.defaulthint')" maxlength="10" onblur="value=value.replace(/(^\s*)|(\s*$)/g, '')" show-word-limit />
             </el-form-item>
             <el-form-item class="inputWide" label="性别">
               <el-radio v-model="basicInfo.sex" label="男">男</el-radio>
@@ -78,7 +78,7 @@
                 v-model="basicInfo.ids"
                 multiple
                 collapse-tags
-                placeholder="请选择"
+                :placeholder="$t('common.choose')"
                 style="width: 100%;"
               >
                 <el-option
@@ -95,7 +95,7 @@
                 maxlength="200"
                 type="textarea"
                 :rows="4"
-                placeholder="请输入内容"
+                :placeholder="$t('common.defaulthint')"
               />
             </el-form-item>
           </el-form>

src/views/customer/customerList/index.vue

@@ -8,9 +8,9 @@
               <el-date-picker
                 v-model="formInline.lastTimes"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
               />
             </el-form-item>
@@ -22,16 +22,16 @@
               <el-date-picker
                 v-model="formInline.dates"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
               />
             </el-form-item>
           </div>
         </el-form-item>
         <el-form-item class="inputWide" label="手机号">
-          <el-input v-model="formInline.phone" maxlength="11" placeholder="请输入内容" />
+          <el-input v-model="formInline.phone" maxlength="11" :placeholder="$t('common.defaulthint')" />
         </el-form-item>
         <el-form-item class="inputWide" label="客户标签">
           <el-select v-model="formInline.labelId" placeholder="客户标签" clearable>
@@ -134,7 +134,7 @@
               v-model="basicInfo.ids"
               multiple
               collapse-tags
-              placeholder="请选择"
+              :placeholder="$t('common.choose')"
             >
               <el-option
                 v-for="item in tagList"
@@ -150,7 +150,7 @@
               maxlength="200"
               type="textarea"
               :rows="4"
-              placeholder="请输入内容"
+              :placeholder="$t('common.defaulthint')"
             />
           </el-form-item>
         </el-form>
@@ -176,7 +176,7 @@
               v-model="currentIds"
               multiple
               collapse-tags
-              placeholder="请选择"
+              :placeholder="$t('common.choose')"
             >
               <el-option
                 v-for="item in tagList"
@@ -313,7 +313,7 @@ export default {
     // 导出用户
     async userDataExport() {
       this.$message({
-        message: '数据导出中，请勿重复操作！',
+        message: this.$t('common.exporting'),
         type: 'success'
       })
       console.log(this.formInline, 'this.formInline')
@@ -344,7 +344,7 @@ export default {
           const reg = /^[1][3,4,5,7,8,9][0-9]{9}$/
           if (!reg.test(this.basicInfo.phone)) {
             this.$message({
-              message: '请输入正确的手机号',
+              message: this.$t('common.phonenumber_error'),
               type: 'warning'
             })
             return false

src/views/customer/operate/index.vue

@@ -9,7 +9,7 @@
           <el-input v-model="formInline.crowdName" maxlength="20" />
         </el-form-item>
         <el-form-item label="计划方式">
-          <el-select v-model="formInline.planMode" placeholder="请选择">
+          <el-select v-model="formInline.planMode" :placeholder="$t('common.choose')">
             <el-option
               v-for="item in planSelect"
               :key="item.value"
@@ -24,9 +24,9 @@
               <el-date-picker
                 v-model="formInline.dates"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
               />
             </el-form-item>

src/views/customer/tagList.vue

@@ -3,7 +3,7 @@
     <div class="formSearch">
       <div class="searchItem">
         <span>标签名称：</span>
-        <el-input v-model="formInline.tagName" maxlength="20" class="label" placeholder="请输入内容" />
+        <el-input v-model="formInline.tagName" maxlength="20" class="label" :placeholder="$t('common.defaulthint')" />
       </div>
       <div class="searchItem">
         <span>客户数量：</span>
@@ -71,7 +71,7 @@
       <div class="addTagBox">
         <el-form :inline="true" :model="addForm" :rules="addFormRules" label-width="120px">
           <el-form-item label="标签名称" prop="labelName">
-            <el-input v-model="addForm.labelName" placeholder="请输入内容" maxlength="10" onblur="value=value.replace(/(^\s*)|(\s*$)/g, '')" show-word-limit />
+            <el-input v-model="addForm.labelName" :placeholder="$t('common.defaulthint')" maxlength="10" onblur="value=value.replace(/(^\s*)|(\s*$)/g, '')" show-word-limit />
           </el-form-item>
           <el-form-item label="备注信息">
             <el-input
@@ -79,7 +79,7 @@
               maxlength="200"
               type="textarea"
               :rows="5"
-              placeholder="请输入内容"
+              :placeholder="$t('common.defaulthint')"
             />
           </el-form-item>
         </el-form>

src/views/customerService/service/index.vue

@@ -165,7 +165,7 @@
         <el-form-item class="inputWide" label="部门">
           <el-select
             v-model="CustomerName"
-            placeholder="请选择"
+            :placeholder="$t('common.choose')"
             @change="selDepartment"
           >
             <el-option
@@ -375,8 +375,8 @@ export default {
     // 删除用户
     async del(row) {
       this.$confirm('此操作将永久删除该客服, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning',
       })
         .then(() => {
@@ -462,8 +462,8 @@ export default {
     deleteReceptionist(row) {
       this.ReceptionistForm = row;
       this.$confirm('此操作将永久删除该接待员, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning',
       })
         .then(() => {

src/views/dashboard/index.vue

@@ -74,7 +74,7 @@
             <li v-for="(item, index) in info.hotSellProducts" :key="index">
               <p>{{ index + 1 }}</p>
               <p :title="item.productName">{{ item.productName }}</p>
-              <p>{{ `已售 ${item.number} 件` }}</p>
+              <p>{{ $t('common.sold_piece_num', {number:item.number})}}</p>
             </li>
           </ul>
           <div v-else class="empty">
@@ -101,16 +101,16 @@ export default {
         condition: 1
       },
       dataList: [
-        { name: '店铺访问次数', value: '', field: 'total', unit: '次' },
-        { name: '待处理订单', value: '', field: 'stayOrders', unit: '件' },
-        { name: '售后订单', value: '', field: 'stayAfters', unit: '件' },
-        { name: '成交金额', value: '', field: 'money', unit: '万元' }
+        { name: this.$t('common.visits'), value: '', field: 'total', unit: this.$t('common.unit_times') },
+        { name: this.$t('common.aftersaleorder'), value: '', field: 'stayOrders', unit: this.$t('common.unit_piece') },
+        { name: this.$t('common.pendingorder'), value: '', field: 'stayAfters', unit: this.$t('common.unit_piece') },
+        { name: this.$t('common.turnover'), value: '', field: 'money', unit: this.$t('common.unit_yuan') }
       ],
       tabList: [
-      { name: '今天', type: 1, show: true, date: '0' },
-      { name: '昨天', type: 2, date: '1' },
-      { name: '最近7天', type: 3, date: '7' },
-      { name: '最近30天', type: 4, date: '30' }
+      { name: this.$t('common.today'), type: 1, show: true, date: '0' },
+      { name: this.$t('common.yesterday'), type: 2, date: '1' },
+      { name: this.$t('common.last7days'), type: 3, date: '7' },
+      { name: this.$t('common.last30days'), type: 4, date: '30' }
       ],
       info: {},
       date: '0',
@@ -127,7 +127,7 @@ export default {
         const d = res.data
         // 小于100元，单位为 元
         if (d.money < 10000) {
-          this.dataList[3].unit = '元'
+          this.dataList[3].unit = this.$t('common.unit_yuan')
         }
         this.dataList.map(item => {
           item.value = d[item.field]
@@ -153,38 +153,38 @@ export default {
     // 导出用户访问数据
     async userVisitExport() {
       this.$message({
-        message: '数据导出中，请勿重复操作！',
+        message: this.$t('common.exporting'),
         type: 'success'
       })
       const res = await userVisitExport(this.form)
       if (!res) {
         return
       }
-      this.doExportFile(res, '用户访问数据')
+      this.doExportFile(res, this.$t('common.yhfwsj'))
     },
     // 导出订单统计数据
     async orderConvertExport() {
       this.$message({
-        message: '数据导出中，请勿重复操作！',
+        message: this.$t('common.exporting'),
         type: 'success'
       })
       const res = await orderConvertExport(this.form)
       if (!res) {
         return
       }
-      this.doExportFile(res, '订单统计数据')
+      this.doExportFile(res, this.$t('common.ddtjsj'))
     },
     // 导出热卖商品数据
     async hotProductsExport() {
       this.$message({
-        message: '数据导出中，请勿重复操作！',
+        message: this.$t('common.exporting'),
         type: 'success'
       })
       const res = await hotProductsExport(this.form)
       if (!res) {
         return
       }
-      this.doExportFile(res, '热卖商品数据')
+      this.doExportFile(res, this.$t('common.rmspsj'))
     },
     doExportFile(res, fileName) {
       const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
@@ -212,7 +212,7 @@ export default {
         },
         yAxis: {
           type: 'value',
-          name: '次数'
+          name: this.$t('common.unit_time_name')
         },
         series: [
           {
@@ -321,7 +321,7 @@ export default {
         series: [
           {
             type: 'bar', // 系列类型
-            name: '已完成',
+            name: this.$t('common.completed'),
             barMaxWidth: 20, // 柱条的最大宽度，不设时自适应
             // label: {
             //   show: true,

src/views/distributor/achievement/humens.vue

@@ -9,15 +9,15 @@
             <el-input v-model="formInline.distributorName" maxlength="20" placeholder="请输入分销员昵称" />
           </el-form-item>
           <el-form-item label="分销员手机号">
-            <el-input v-model="formInline.distributorPhone" maxlength="11" placeholder="请输入手机号" />
+            <el-input v-model="formInline.distributorPhone" maxlength="11" :placeholder="$t('common.phonenumber_empty')" />
           </el-form-item>
           <el-form-item label="起止时间">
             <el-date-picker
               v-model="formInline.dates"
               type="daterange"
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.starttime')"
+              :end-placeholder="$t('common.endtime')"
               value-format="yyyy-MM-dd"
             />
           </el-form-item>

src/views/distributor/achievement/order.vue

@@ -12,21 +12,21 @@
             <el-input v-model="formInline.distributorName" maxlength="20" placeholder="请输入分销员昵称" />
           </el-form-item>
           <el-form-item label="分销员手机号">
-            <el-input v-model="formInline.distributorPhone" maxlength="11" placeholder="请输入手机号" />
+            <el-input v-model="formInline.distributorPhone" maxlength="11" :placeholder="$t('common.phonenumber_empty')" />
           </el-form-item>
           <el-form-item label="交易时间">
             <el-date-picker
               v-model="formInline.dates"
               type="daterange"
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.starttime')"
+              :end-placeholder="$t('common.endtime')"
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
           <el-form-item label="结算状态">
             <el-select v-model="formInline.state" placeholder="请选择结算状态">
-              <el-option label="全部" :value="null" />
+              <el-option :label="$t('common.all')" :value="null" />
               <el-option label="已结算" value="1" />
               <el-option label="未结算" value="0" />
             </el-select>

src/views/distributor/achievement/programme.vue

@@ -323,8 +323,8 @@ export default {
     },
     deletes(distributorLevelId) {
       this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       })
         .then(() => {

src/views/distributor/customer/popSearch.vue

@@ -16,7 +16,7 @@
           </el-form-item>
           <el-form-item label="绑定状态">
             <el-select v-model="formInline.ifBind" placeholder="请选择绑定状态">
-              <el-option label="全部" :value="null" />
+              <el-option :label="$t('common.all')" :value="null" />
               <el-option label="已绑定" value="1" />
               <el-option label="未绑定" value="0" />
             </el-select>

src/views/distributor/customer/popSys.vue

@@ -95,7 +95,7 @@ export default {
     cancel() {
       this.salesRelationConfig()
       this.$message({
-        message: '已取消',
+        message: this.$t('page.canceled'),
         type: 'success'
       })
     },

src/views/distributor/personnel/list.vue

@@ -9,15 +9,15 @@
             <el-input v-model="formInline.distributorName" maxlength="20" placeholder="请输入分销员昵称" />
           </el-form-item>
           <el-form-item label="分销员手机号">
-            <el-input v-model="formInline.distributorPhone" maxlength="11" placeholder="请输入手机号" />
+            <el-input v-model="formInline.distributorPhone" maxlength="11" :placeholder="$t('common.phonenumber_empty')" />
           </el-form-item>
           <el-form-item label="加入时间">
             <el-date-picker
               v-model="formInline.dates"
               type="daterange"
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.starttime')"
+              :end-placeholder="$t('common.endtime')"
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
@@ -199,11 +199,11 @@ export default {
           { required: true, message: '请输入分销员昵称', trigger: 'blur' }
         ],
         distributorPhone: [
-          { required: true, message: '请输入手机号', trigger: 'blur' },
+          { required: true, message: this.$t('common.phonenumber_empty'), trigger: 'blur' },
           { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
           {
             pattern: /^1[3456789]\d{9}$/,
-            message: "请输入正确的手机号码"
+            message: this.$t('common.phonenumber_error')
           }
         ],
         distributorLevelId: [{ required: true, message: '请选择分销员等级', trigger: 'change' }],

src/views/distributor/personnel/msg.vue

@@ -9,21 +9,21 @@
             <el-input v-model="formInline.distributorName" maxlength="20" placeholder="请输入分销员昵称" />
           </el-form-item>
           <el-form-item label="分销员手机号">
-            <el-input v-model="formInline.distributorPhone" maxlength="11" placeholder="请输入手机号" />
+            <el-input v-model="formInline.distributorPhone" maxlength="11" :placeholder="$t('common.phonenumber_empty')" />
           </el-form-item>
           <el-form-item label="申请时间">
             <el-date-picker
               v-model="formInline.dates"
               type="daterange"
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.starttime')"
+              :end-placeholder="$t('common.endtime')"
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
           <el-form-item label="审核状态">
             <el-select v-model="formInline.state" placeholder="请选择审核状态">
-              <el-option label="全部" :value="null" />
+              <el-option :label="$t('common.all')" :value="null" />
               <el-option label="待处理" :value="0" />
               <el-option label="审核通过" :value="1" />
               <el-option label="审核不通过" :value="2" />

src/views/distributor/personnel/sys.vue

@@ -128,7 +128,7 @@ export default {
     // 取消
     cancel() {
       this.$message({
-        message: '已取消',
+        message: this.$t('page.canceled'),
         type: 'success'
       })
     },

src/views/finance/account/index.vue

@@ -97,11 +97,11 @@
             :loading="codeloading"
             @click="sendCode(form.phone)"
           >
-            <span v-if="!codeloading">获取验证码</span>
+            <span v-if="!codeloading">{{$t('common.verificationcodetip')}}</span>
             <span v-else>{{ count }} s</span>
           </el-button>
         </el-form-item>
-        <el-form-item label="验证码" prop="code">
+        <el-form-item :label="$t('common.verificationcode')" prop="code">
           <el-input v-model="form.code" style="width: 120px;" oninput="value=value.replace(/[^\d]/g,'')" maxlength="6" />
         </el-form-item>
       </el-form>
@@ -121,11 +121,11 @@
             :loading="codeloading"
             @click="sendCode(unbinds.phone)"
           >
-            <span v-if="!codeloading">获取验证码</span>
+            <span v-if="!codeloading">{{$t('common.verificationcodetip')}}}</span>
             <span v-else>{{ count }} s</span>
           </el-button>
         </el-form-item>
-        <el-form-item label="验证码" prop="code">
+        <el-form-item :label="$t('common.verificationcode')" prop="code">
           <el-input v-model="unbinds.code" style="width: 120px;" />
         </el-form-item>
       </el-form>
@@ -171,11 +171,11 @@
             :loading="codeloading"
             @click="sendCode(card.phone)"
           >
-            <span v-if="!codeloading">获取验证码</span>
+            <span v-if="!codeloading">{{$t('common.verificationcodetip')}}</span>
             <span v-else>{{ count }} s</span>
           </el-button>
         </el-form-item>
-        <el-form-item label="验证码" prop="code">
+        <el-form-item :label="$t('common.verificationcode')" prop="code">
           <el-input v-model="card.code" oninput="value=value.replace(/[^\d]/g,'')" maxlength="6" style="width: 120px;" />
         </el-form-item>
       </el-form>
@@ -245,8 +245,8 @@ export default {
         cardNumber: [
           { required: true, message: '请输入银行卡号', trigger: 'blur' }
         ],
-        phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
-        code: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
+        phone: [{ required: true, message: this.$t('common.phonenumber_empty'), trigger: 'blur' }],
+        code: [{ required: true, message: this.$t('common.enterverificationcode'), trigger: 'blur' }],
         bank: [{ required: true, message: '请输入选择银行', trigger: 'blur' }],
         oldCardNumber: [
           { required: true, message: '请输入原银行卡号', trigger: 'blur' }

src/views/finance/list/index.vue

@@ -100,15 +100,15 @@
               />
             </el-form-item>
             <el-form-item label="收支类型">
-              <el-select v-model="moneyForm.income" placeholder="请选择">
-                <el-option label="全部" :value="null" />
+              <el-select v-model="moneyForm.income" :placeholder="$t('common.choose')">
+                <el-option :label="$t('common.all')" :value="null" />
                 <el-option label="收入" value="1" />
                 <el-option label="支出" value="2" />
               </el-select>
             </el-form-item>
             <el-form-item label="流水类型">
-              <el-select v-model="moneyForm.state" placeholder="请选择">
-                <el-option label="全部" :value="null" />
+              <el-select v-model="moneyForm.state" :placeholder="$t('common.choose')">
+                <el-option :label="$t('common.all')" :value="null" />
                 <el-option label="支付" value="支付" />
                 <el-option label="退款" value="退款" />
                 <el-option label="提现" value="提现" />

src/views/liveMenu/liveProduct/index.vue

@@ -204,7 +204,7 @@
       <div v-if="proShowState == 1">
         <el-form :inline="true" :model="productForm" class="demo-form-inline">
           <el-form-item class="inputWide" label="关键字：">
-            <el-input v-model="productForm.search" maxlength="20" placeholder="请输入内容" />
+            <el-input v-model="productForm.search" maxlength="20" :placeholder="$t('common.defaulthint')" />
           </el-form-item>
           <el-form-item>
             <el-button
@@ -470,14 +470,14 @@ export default {
     },
     del(row) {
       this.$confirm('是否确认删除该内容?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning',
       }).then(() => {
         delLiveProduct(row)
           .then((res) => {
             this.closeDialogVisible = false;
-            this.$message.success($t('common.deletesuccess'));
+            this.$message.success(this.$t('common.deletesuccess'));
             this.getList();
           })
           .catch(err => {

src/views/liveMenu/liveRoom/index.vue

@@ -707,14 +707,14 @@ export default {
     },
     del(row) {
       this.$confirm('是否确认删除该内容?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning',
       }).then(() => {
         deleteLive(row)
           .then((res) => {
             this.closeDialogVisible = false;
-            this.$message.success($t('common.deletesuccess'));
+            this.$message.success(this.$t('common.deletesuccess'));
             this.getList();
           })
           .catch((err) => {

src/views/marketing/channelActivity/form.vue

@@ -19,8 +19,11 @@
             placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="活动时间：" prop="startTime">
-          <el-date-picker v-model="activityTimeArr" :disabled="form.isLook" range-separator="至" type="datetimerange"
-            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" />
+          <el-date-picker v-model="activityTimeArr" :disabled="form.isLook" type="datetimerange"
+          :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
+            value-format="yyyy-MM-dd HH:mm:ss" />
         </el-form-item>
         <el-form-item label="活动发放数量：" prop="publishCount">
           <el-input-number v-model="form.publishCount" :disabled="form.isLook" :controls="false" :max="999999999"
@@ -28,7 +31,7 @@
           份
         </el-form-item>
         <el-form-item label="发放渠道券" prop="couponList">
-          <el-button :disabled="form.isLook" type="primary" @click="showCouponSelect">请选择
+          <el-button :disabled="form.isLook" type="primary" @click="showCouponSelect">{{$t('common.choose')}}
           </el-button>
         </el-form-item>
         <el-form-item label=" ">

src/views/marketing/channelActivity/index.vue

@@ -125,8 +125,8 @@ export default {
     handleDelete(item) {
       const message = `是否删除活动${item.activityName}`
       this.$confirm(message, '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(async () => {
         // 删除逻辑

src/views/marketing/channelActivity/selectChannelCoupons.vue

@@ -12,26 +12,29 @@
         <div class="formSearch">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
             <el-form-item label="优惠券名称">
-              <el-input v-model="formInline.couponName" maxlength="20" clearable placeholder="请输入内容" @blur="search" />
+              <el-input v-model="formInline.couponName" maxlength="20" clearable :placeholder="$t('common.defaulthint')" @blur="search" />
             </el-form-item>
             <el-form-item label="优惠券类型">
               <el-select v-model="formInline.couponType" placeholder="请选择优惠券类型" @change="search">
-                <el-option label="全部" :value="null" />
+                <el-option :label="$t('common.all')" :value="null" />
                 <el-option label="满减券" value="1" />
                 <el-option label="折扣券" value="2" />
               </el-select>
             </el-form-item>
             <el-form-item label="状态">
               <el-select v-model="formInline.state" placeholder="请选择优惠券状态" @change="search">
-                <el-option label="全部" :value="null" />
+                <el-option :label="$t('common.all')" :value="null" />
                 <el-option label="未开始" value="0" />
                 <el-option label="进行中" value="1" />
                 <el-option label="已结束" value="2" />
               </el-select>
             </el-form-item>
             <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-date-picker v-model="formInline.dates" type="datetimerange" 
+              :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
+               value-format="yyyy-MM-dd HH:mm:ss" @change="search" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" plain @click="search">{{ $t('common.query') }}
@@ -263,7 +266,7 @@ export default {
     delCouponFn(data) {
       delCoupon({ shopCouponId: data.shopCouponId }).then(res => {
         if (res.code === '') {
-          this.$message.success($t('common.deletesuccess'))
+          this.$message.success(this.$t('common.deletesuccess'))
           this.formInline.page = 1
           this.getAll(this.formInline)
         } else {

src/views/marketing/channelManage/add.vue

@@ -50,7 +50,7 @@
           >指定商品可用
           </el-radio>
           <span v-if="!visitDetail" class="selectBtn" @click="chooseProduct(type = 2)">
-            请选择
+            {{$t('common.choose')}}
             <i v-if="addForm.applyType === 2 && idList.length !== 0" class="selectNum">
               {{ idList.length }}
             </i>
@@ -68,7 +68,7 @@
           >指定商品不可用
           </el-radio>
           <span v-if="!visitDetail" class="selectBtn" @click="chooseProduct(type = 3)">
-            请选择
+            {{$t('common.choose')}}
             <i v-if="addForm.applyType === 3 && idList.length !== 0" class="selectNum">
               {{ idList.length }}
             </i>
@@ -148,9 +148,9 @@
           <el-date-picker
             v-model="getACouponTime"
             type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
             value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
@@ -173,9 +173,9 @@
                 v-model="getEffectTime"
                 :disabled="addForm.timeType === 2"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
               />
             </el-form-item>

src/views/marketing/channelManage/index.vue

@@ -17,7 +17,7 @@
           <el-input
             v-model="formInline.couponName"
             maxlength="20"
-            placeholder="请输入内容"
+            :placeholder="$t('common.defaulthint')"
           />
         </el-form-item>
         <el-form-item label="优惠券类型">
@@ -26,7 +26,7 @@
             placeholder="请选择优惠券类型"
           >
             <el-option
-              label="全部"
+            :label="$t('common.all')"
               :value="null"
             />
             <el-option
@@ -45,7 +45,7 @@
             placeholder="请选择优惠券状态"
           >
             <el-option
-              label="全部"
+            :label="$t('common.all')"
               :value="null"
             />
             <el-option
@@ -66,9 +66,9 @@
           <el-date-picker
             v-model="formInline.dates"
             type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
             value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
@@ -396,7 +396,7 @@ export default {
     delCouponFn(data) {
       delCoupon({ shopCouponId: data.shopCouponId }).then(res => {
         if (res.code === '') {
-          this.$message.success($t('common.deletesuccess'))
+          this.$message.success(this.$t('common.deletesuccess'))
           this.formInline.page = 1
           this.getAll(this.formInline)
         } else {

src/views/marketing/compose/add.vue

@@ -25,9 +25,9 @@
               <el-date-picker
                 v-model="dateInfo"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 @change="changeDate"
               />
@@ -82,7 +82,7 @@
           <span
             class="selectBtn"
             @click="chooseProduct"
-          >请选择<i
+          >{{$t('common.choose')}}<i
             v-if="addForm.composeProducts.length !== 0"
             class="selectNum"
           >{{ addForm.composeProducts.length }}</i></span>

src/views/marketing/compose/index.vue

@@ -3,11 +3,11 @@
     <div class="formSearch">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <!--        <el-form-item label="活动名称">-->
-        <!--          <el-input v-model="formInline.groupName" placeholder="请输入内容" />-->
+        <!--          <el-input v-model="formInline.groupName" :placeholder="$t('common.defaulthint')" />-->
         <!--        </el-form-item>-->
         <!--        <el-form-item label="状态">-->
         <!--          <el-select v-model="formInline.state" placeholder="请选择状态">-->
-        <!--            <el-option label="全部" :value="null" />-->
+        <!--            <el-option :label="$t('common.all')" :value="null" />-->
         <!--            <el-option label="未开始" value="0" />-->
         <!--            <el-option label="进行中" value="1" />-->
         <!--            <el-option label="已结束" value="2" />-->
@@ -171,7 +171,7 @@ export default {
     delCompose(data) {
       composeDelete({ composeId: data.composeId }).then(res => {
         if (res.code === '') {
-          this.$message.success($t('common.deletesuccess'))
+          this.$message.success(this.$t('common.deletesuccess'))
           this.formInline.page = 1
           this.getAll(this.formInline)
         } else {

src/views/marketing/coupon/add.vue

@@ -21,7 +21,7 @@
             @change="chooseProduct(type = 2)"
           >指定商品可用</el-radio>
           <span v-if="!visitDetail" class="selectBtn" @click="chooseProduct(type = 2)">
-            请选择
+            {{$t('common.choose')}}
             <i v-if="addForm.applyType === 2 && idList.length !== 0" class="selectNum">
               {{ idList.length }}
             </i>
@@ -38,7 +38,7 @@
             @change="chooseProduct(type = 3)"
           >指定商品不可用</el-radio>
           <span v-if="!visitDetail" class="selectBtn" @click="chooseProduct(type = 3)">
-            请选择
+            {{$t('common.choose')}}
             <i v-if="addForm.applyType === 3 && idList.length !== 0" class="selectNum">
               {{ idList.length }}
             </i>
@@ -72,9 +72,9 @@
                 v-model="dateInfo"
                 :disabled="addForm.timeType === 2"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
               />
             </el-form-item>

src/views/marketing/coupon/index.vue

@@ -3,18 +3,18 @@
     <div class="formSearch">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <el-form-item label="优惠券名称">
-          <el-input v-model="formInline.couponName" maxlength="20" placeholder="请输入内容" />
+          <el-input v-model="formInline.couponName" maxlength="20" :placeholder="$t('common.defaulthint')" />
         </el-form-item>
         <el-form-item label="优惠券类型">
           <el-select v-model="formInline.couponType" placeholder="请选择优惠券类型">
-            <el-option label="全部" :value="null" />
+            <el-option :label="$t('common.all')" :value="null" />
             <el-option label="满减券" value="1" />
             <el-option label="折扣券" value="2" />
           </el-select>
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="formInline.state" placeholder="请选择优惠券状态">
-            <el-option label="全部" :value="null" />
+            <el-option :label="$t('common.all')" :value="null" />
             <el-option label="未开始" value="0" />
             <el-option label="进行中" value="1" />
             <el-option label="已结束" value="2" />
@@ -24,9 +24,9 @@
           <el-date-picker
             v-model="formInline.dates"
             type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
             value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
@@ -257,7 +257,7 @@ export default {
     delCouponFn(data) {
       delCoupon({ shopCouponId: data.shopCouponId }).then(res => {
         if (res.code === '') {
-          this.$message.success($t('common.deletesuccess'))
+          this.$message.success(this.$t('common.deletesuccess'))
           this.formInline.page = 1
           this.getAll(this.formInline)
         } else {

src/views/marketing/discount/add.vue

@@ -19,9 +19,9 @@
               <el-date-picker
                 v-model="dateInfo"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
               />
             </el-form-item>
@@ -47,7 +47,7 @@
           <el-radio v-model="addForm.ifAdd" label="0">不叠加</el-radio>
         </el-form-item>
         <el-form-item class="applyType" label="活动商品" prop="commodity">
-          <span class="selectBtn" @click="chooseProduct"><span v-if="!visitDetail">请选择</span><span v-else>查看商品</span><i v-if="addForm.details.length !== 0" class="selectNum">{{ addForm.details.length }}</i></span>
+          <span class="selectBtn" @click="chooseProduct"><span v-if="!visitDetail">{{$t('common.choose')}}</span><span v-else>查看商品</span><i v-if="addForm.details.length !== 0" class="selectNum">{{ addForm.details.length }}</i></span>
         </el-form-item>
       </el-form>
     </div>

src/views/marketing/discount/index.vue

@@ -3,11 +3,11 @@
     <div class="formSearch">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <el-form-item label="活动名称">
-          <el-input v-model="formInline.discountName" maxlength="15" placeholder="请输入内容" />
+          <el-input v-model="formInline.discountName" maxlength="15" :placeholder="$t('common.defaulthint')" />
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="formInline.state" placeholder="请选择状态">
-            <el-option label="全部" :value="null" />
+            <el-option :label="$t('common.all')" :value="null" />
             <el-option label="未开始" value="0" />
             <el-option label="进行中" value="1" />
             <el-option label="已结束" value="2" />
@@ -239,7 +239,7 @@ export default {
     delDiscountFn(id) {
       deleteDiscount({ shopDiscountId: id }).then(res => {
         if (res.code === '') {
-          this.$message.success($t('common.deletesuccess'))
+          this.$message.success(this.$t('common.deletesuccess'))
           this.formInline.page = 1
           this.getAll(this.formInline)
         } else {

src/views/marketing/group/add.vue

@@ -19,9 +19,9 @@
               <el-date-picker
                 v-model="dateInfo"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
               />
             </el-form-item>
@@ -48,7 +48,7 @@
           <el-radio v-model="addForm.ifAdd" label="0">不叠加</el-radio>
         </el-form-item>
         <el-form-item class="applyType" label="活动商品" prop="commodity">
-          <span class="selectBtn" @click="chooseProduct"><span v-if="!visitDetail">请选择</span><span v-else>查看商品</span><i v-if="addForm.details.length !== 0" class="selectNum">{{ addForm.details.length }}</i></span>
+          <span class="selectBtn" @click="chooseProduct"><span v-if="!visitDetail">{{$t('common.choose')}}</span><span v-else>查看商品</span><i v-if="addForm.details.length !== 0" class="selectNum">{{ addForm.details.length }}</i></span>
         </el-form-item>
       </el-form>
     </div>

src/views/marketing/group/index.vue

@@ -3,11 +3,11 @@
     <div class="formSearch">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <el-form-item label="活动名称">
-          <el-input v-model="formInline.groupName" maxlength="15" placeholder="请输入内容" />
+          <el-input v-model="formInline.groupName" maxlength="15" :placeholder="$t('common.defaulthint')" />
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="formInline.state" placeholder="请选择状态">
-            <el-option label="全部" :value="null" />
+            <el-option :label="$t('common.all')" :value="null" />
             <el-option label="未开始" value="0" />
             <el-option label="进行中" value="1" />
             <el-option label="已结束" value="2" />
@@ -241,7 +241,7 @@ export default {
     delGroupBuyFn(data) {
       deleteGroup({ shopGroupWorkId: data.shopGroupWorkId }).then(res => {
         if (res.code === '') {
-          this.$message.success($t('common.deletesuccess'))
+          this.$message.success(this.$t('common.deletesuccess'))
           this.formInline.page = 1
           this.getAll(this.formInline)
         } else {

src/views/marketing/price/add.vue

@@ -25,9 +25,9 @@
               <el-date-picker
                 v-model="dateInfo"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 @change="changeDate"
               />
@@ -74,7 +74,7 @@
           <span
             class="selectBtn"
             @click="chooseProduct"
-          >请选择<i
+          >{{$t('common.choose')}}<i
             v-if="addForm.priceProducts.length !== 0"
             class="selectNum"
           >{{ addForm.priceProducts.length }}</i></span>

src/views/marketing/price/index.vue

@@ -3,11 +3,11 @@
     <div class="formSearch">
       <!-- <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <el-form-item label="活动名称">
-          <el-input v-model="formInline.groupName" placeholder="请输入内容" />
+          <el-input v-model="formInline.groupName" :placeholder="$t('common.defaulthint')" />
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="formInline.state" placeholder="请选择状态">
-            <el-option label="全部" :value="null" />
+            <el-option :label="$t('common.all')" :value="null" />
             <el-option label="未开始" value="0" />
             <el-option label="进行中" value="1" />
             <el-option label="已结束" value="2" />
@@ -169,7 +169,7 @@ export default {
     delPrice(data) {
       priceDelete({ priceId: data.priceId }).then(res => {
         if (res.code === '') {
-          this.$message.success($t('common.deletesuccess'))
+          this.$message.success(this.$t('common.deletesuccess'))
           this.formInline.page = 1
           this.getAll(this.formInline)
         } else {

src/views/marketing/scene/add.vue

@@ -17,9 +17,9 @@
               v-model="dateInfo"
               :disabled="addForm.timeType === '2'"
               type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
               value-format="yyyy-MM-dd HH:mm:ss"
             />
           </div>
@@ -50,10 +50,10 @@
                 <el-time-picker
                   v-model="dayTime"
                   is-range
-                  range-separator="至"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  placeholder="选择时间范围"
+                  :range-separator="$t('common.betweentime')"
+                  :start-placeholder="$t('common.starttime')"
+                  :end-placeholder="$t('common.endtime')"
+                  :placeholder="$t('common.choosetime')"
                   value-format="HH:mm:ss"
                 />
               </dd>
@@ -110,7 +110,7 @@
                 >
                   <template slot-scope="scope">
                     <span class="selectBtn" @click="selectCoupons(scope.row)">
-                      请选择
+                      {{$t('common.choose')}}
                       <i v-if="scope.row.ids && scope.row.ids.length !== 0" class="selectNum">{{ scope.row.ids.length }}</i>
                     </span>
                   </template>
@@ -156,7 +156,7 @@
                 >
                   <template slot-scope="scope">
                     <span class="selectBtn" @click="selectCoupons(scope.row)">
-                      请选择
+                      {{$t('common.choose')}}
                       <i v-if="scope.row.ids && scope.row.ids.length !== 0" class="selectNum">{{ scope.row.ids.length }}</i>
                     </span>
                   </template>

src/views/marketing/scene/index.vue

@@ -147,7 +147,7 @@ export default {
     delScene(data) {
       sceneDelete({ sceneId: data.sceneId }).then(res => {
         if (res.code === '') {
-          this.$message.success($t('common.deletesuccess'))
+          this.$message.success(this.$t('common.deletesuccess'))
           this.formInline.page = 1
           this.getAll(this.formInline)
         } else {

src/views/marketing/spike/add.vue

@@ -19,9 +19,9 @@
               <el-date-picker
                 v-model="dateInfo"
                 type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
                 value-format="yyyy-MM-dd HH:mm:ss"
               />
             </el-form-item>
@@ -47,7 +47,7 @@
           <el-radio v-model="addForm.ifAdd" label="0">不叠加</el-radio>
         </el-form-item>
         <el-form-item class="applyType" label="活动商品" prop="commodity">
-          <span class="selectBtn" @click="chooseProduct"><span v-if="!visitDetail">请选择</span><span v-else>查看商品</span><i v-if="addForm.details.length !== 0" class="selectNum">{{ addForm.details.length }}</i></span>
+          <span class="selectBtn" @click="chooseProduct"><span v-if="!visitDetail">{{$t('common.choose')}}</span><span v-else>查看商品</span><i v-if="addForm.details.length !== 0" class="selectNum">{{ addForm.details.length }}</i></span>
         </el-form-item>
       </el-form>
     </div>

src/views/marketing/spike/index.vue

@@ -3,11 +3,11 @@
     <div class="formSearch">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
         <el-form-item label="活动名称">
-          <el-input v-model="formInline.seckillName" maxlength="15" placeholder="请输入内容" />
+          <el-input v-model="formInline.seckillName" maxlength="15" :placeholder="$t('common.defaulthint')" />
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="formInline.state" placeholder="请选择状态">
-            <el-option label="全部" :value="null" />
+            <el-option :label="$t('common.all')" :value="null" />
             <el-option label="未开始" value="0" />
             <el-option label="进行中" value="1" />
             <el-option label="已结束" value="2" />
@@ -240,7 +240,7 @@ export default {
     deleteSeckillFn(data) {
       deleteSeckill({ shopSeckillId: data.shopSeckillId }).then(res => {
         if (res.code === '') {
-          this.$message.success($t('common.deletesuccess'))
+          this.$message.success(this.$t('common.deletesuccess'))
           this.formInline.page = 1
           this.getAll(this.formInline)
         } else {

src/views/order/aftersale/afterDetails.vue

@@ -3,22 +3,22 @@
     <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('common.after-salestatus_info') }}</div>
           <ul>
             <li>
               <p>
-                <span>售后单号:</span>
+                <span>{{ $t('common.aftercode') }}:</span>
                 <span>{{ order.afterFormid }}</span>
               </p>
             </li>
             <li>
               <p>
-                <span>订单状态:</span>
-                <span v-if="order.state === 1">待付款</span>
-                  <span v-if="order.state === 2">待发货</span>
-                  <span v-if="order.state === 3">待收货</span>
-                  <span v-if="order.state === 4">已完成</span>
-                  <span v-if="order.state === 5">已取消</span>
+                <span>{{$t('common.orderstatus')}}:</span>
+                <span v-if="order.state === 1">{{$t('page.due')}}</span>
+                  <span v-if="order.state === 2">{{$t('page.goodswaitingtobesent')}}</span>
+                  <span v-if="order.state === 3">{{$t('page.waittobereceived')}}</span>
+                  <span v-if="order.state === 4">{{$t('common.completed')}}</span>
+                  <span v-if="order.state === 5">{{$t('page.canceled')}}</span>
               </p>
             </li>
 
@@ -43,11 +43,11 @@
           </ul>
         </div>
         <div class="baseinfo_col">
-          <div class="item_title" style="visibility:hidden">订单信息</div>
+          <div class="item_title" style="visibility:hidden">{{$t('order.orderinfo')}}</div>
           <ul>
             <li>
               <p>
-                <span>订单ID:</span>
+                <span>{{ $t('order.orderId') }}:</span>
                 <span>{{ order.orderId }}</span>
               </p>
             </li>
@@ -60,7 +60,7 @@
             </li>
             <li>
               <p>
-                <span>买家账户:</span>
+                <span>{{$t('common.buyeraccount')}}:</span>
                 <span>{{ order.customerName }}</span>
               </p>
             </li>
@@ -76,9 +76,9 @@
 
       <div class="baseinfo_row">
         <div class="baseinfo_col">
-          <div class="item_title">商品信息</div>
+          <div class="item_title">{{ $t('common.productinfo') }}</div>
           <el-table :data='order.products' style="width: 100%" class="product_table">
-            <el-table-column label="商品" width="400">
+            <el-table-column :label="$t('common.product')" width="400">
               <template slot-scope="scope">
                 <div class="product_info">
                   <img :src="scope.row.image" class="product_img">
@@ -97,16 +97,16 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="productPrice" label="价格">
+            <el-table-column prop="productPrice" :label="$t('common.price')">
             </el-table-column>
-            <el-table-column prop="number" label="数量">
+            <el-table-column prop="number" :label="$t('common.quantity')">
             </el-table-column>
-            <el-table-column prop="total" label="小计">
+            <el-table-column prop="total" :label="$t('common.total_small')">
             </el-table-column>
           </el-table>
           <div class="product_total">
-            <div class="product_row"><span>商品总价:</span> <span>{{ order.orderPrice }}</span></div>
-            <div class="product_row"><span>运费金额:</span> <span>{{ order.logisticsPrice }}</span></div>
+            <div class="product_row"><span>{{ $t('common.producttotalprice') }}:</span> <span>{{ order.orderPrice }}</span></div>
+            <div class="product_row"><span>{{ $t('common.freightamount') }}:</span> <span>{{ order.logisticsPrice }}</span></div>
             <div class="product_price"><span>退款总金额:</span> <span>{{ order.price }}</span></div>
 
           </div>
@@ -345,13 +345,13 @@ export default {
       },
       rules: {
         logisticsName: [
-          { required: false, message: '请输入快递公司名称', trigger: 'blur' }
+          { required: false, message: this.$t('common.logisticscompany_hint'), trigger: 'blur' }
         ],
         deliverFormid: [
-          { required: true, message: '请输入快递单号', trigger: 'blur' }
+          { required: true, message: this.$t('common.logistics_number_hint'), trigger: 'blur' }
         ],
         express: [
-          { required: true, message: '请选择快递公司', trigger: 'blur' }
+          { required: true, message: this.$t('common.logisticscompany_choose_hint'), trigger: 'blur' }
         ]
       }
     }
@@ -402,7 +402,7 @@ export default {
           orderDilevery(this.form).then((res) => {
             if (res.code === '') {
               this.$message({
-                message: '发货成功',
+                message: this.$t('common.sendsuccess'),
                 type: 'success'
               })
               this.isVisibles = false

src/views/order/aftersale/index.vue

@@ -3,60 +3,60 @@
   <div class="pending">
     <div class="tab_show">
       <el-tabs v-model="formInline.type" @tab-click="handleClick">
-        <el-tab-pane label="全部" :name="null" />
-        <el-tab-pane label="待商家处理" name="1" />
-        <el-tab-pane label="待商家收货" name="2" />
+        <el-tab-pane :label="$t('common.all')" :name="null" />
+        <el-tab-pane :label="$t('common.dsjcl')" name="1" />
+        <el-tab-pane :label="$t('common.dsjsh')" name="2" />
       </el-tabs>
       <!-- 搜索 -->
       <div class="formSearch">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
           <el-form-item>
             <div>
-              <el-input v-model="formInline.search" maxlength="20" placeholder="请输入内容">
+              <el-input v-model="formInline.search" maxlength="20" :placeholder="$t('common.defaulthint')">
                 <el-select
                   slot="prepend"
                   v-model="formInline.searchType"
                   style="width:130px"
-                  placeholder="请选择"
+                  :placeholder="$t('common.choose')"
                 >
-                  <el-option label="售后id" value="1" />
-                  <el-option label="买家账户" value="2" />
-                  <el-option label="收件人姓名" value="3" />
-                  <el-option label="收件人手机号" value="4" />
-                  <el-option label="商品ID" value="5" />
+                  <el-option :label="$t('common.afterId')" value="1" />
+                  <el-option :label="$t('common.buyeraccount')" value="2" />
+                  <el-option :label="$t('common.receivername')" value="3" />
+                  <el-option :label="$t('common.receivermobilenum')" value="4" />
+                  <el-option :label="$t('product.productId')" value="5" />
                 </el-select>
               </el-input>
             </div>
           </el-form-item>
-          <el-form-item label="订单状态">
-            <el-select v-model="formInline.state" placeholder="请选择订单状态">
-              <el-option label="全部" :value="null" />
-              <el-option label="待付款" value="1" />
-              <el-option label="待发货" value="2" />
-              <el-option label="已发货" value="3" />
-              <el-option label="已完成" value="4" />
-              <el-option label="已关闭" value="5" />
+          <el-form-item :label="$t('common.orderstatus')">
+            <el-select v-model="formInline.state" :placeholder="$t('common.orderstatus_hint')">
+              <el-option :label="$t('common.all')" :value="null" />
+              <el-option :label="$t('page.due')" value="1" />
+              <el-option :label="$t('page.goodswaitingtobesent')" value="2" />
+              <el-option :label="$t('page.goodsalreadysent')" value="3" />
+              <el-option :label="$t('common.completed')" value="4" />
+              <el-option :label="$t('page.closed')" value="5" />
             </el-select>
           </el-form-item>
-          <el-form-item label="售后状态">
-            <el-select v-model="formInline.afterState" placeholder="请选择售后状态">
-              <el-option label="全部" :value="null" />
+          <el-form-item :label="$t('common.after-salestatus')">
+            <el-select v-model="formInline.afterState" :placeholder="$t('common.after-salestatus_hint')">
+              <el-option :label="$t('common.all')" :value="null" />
               <!-- <el-option label="无售后" value="0" /> -->
-              <el-option label="售后中" value="1" />
-              <el-option label="售后成功" value="2" />
-              <el-option label="售后关闭" value="3" />
+              <el-option :label="$t('common.after-salestatus_shz')" value="1" />
+              <el-option :label="$t('common.after-salestatus_shcg')" value="2" />
+              <el-option :label="$t('common.after-salestatus_shgb')" value="3" />
             </el-select>
           </el-form-item>
-          <el-form-item label="售后类型">
-            <el-select v-model="formInline.afterType" placeholder="请选择售后类型">
-              <el-option label="全部" :value="null" />
-              <el-option label="仅退款" value="1" />
-              <el-option label="退货退款" value="2" />
+          <el-form-item :label="$t('common.after-sales_type')">
+            <el-select v-model="formInline.afterType" :placeholder="$t('common.after-sales_type_hint')">
+              <el-option :label="$t('common.all')" :value="null" />
+              <el-option :label="$t('common.after-sales_type_jtk')" value="1" />
+              <el-option :label="$t('common.after-sales_type_thtk')" value="2" />
             </el-select>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
-            <el-button type="success" plain @click="afterOrderDataExport">导出订单</el-button>
+            <el-button type="success" plain @click="afterOrderDataExport">{{ $t('common.exportorder') }}</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -71,23 +71,23 @@
           tooltip-effect="dark"
           style="width: 100%"
         >
-          <el-table-column label="售后id" width="220">
+          <el-table-column :label="$t('common.afterId')" width="220">
             <template slot-scope="scope">{{ scope.row.afterId }}</template>
           </el-table-column>
-          <el-table-column prop="afterFormid" label="售后单号" width="220" />
-          <el-table-column prop="afterId" label="售后类型" show-overflow-tooltip>
+          <el-table-column prop="afterFormid" :label="$t('common.aftercode')" width="220" />
+          <el-table-column prop="afterId" :label="$t('common.after-sales_type')" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span v-if="scope.row.afterType == 1">仅退款</span>
-              <span v-if="scope.row.afterType == 2">退货退款</span>
+              <span v-if="scope.row.afterType == 1">{{ $t('common.after-sales_type_jtk') }}</span>
+              <span v-if="scope.row.afterType == 2">{{ $t('common.after-sales_type_thtk') }}</span>
             </template>
           </el-table-column>
-          <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 prop="price" :label="$t('common.refundamount')" show-overflow-tooltip />
+          <el-table-column prop="afterStateName" :label="$t('common.after-salestatus')" show-overflow-tooltip />
+          <el-table-column prop="createTime" :label="$t('common.tkapplytime')" 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>
+                <el-button type="text" @click="view(scope.row)">{{ scope.row.afterState == 1 ? $t('common.deal') : $t('common.view') }}</el-button>
               </div>
             </template>
           </el-table-column>
@@ -187,7 +187,7 @@ export default {
     // 导出订单
     async afterOrderDataExport() {
       this.$message({
-        message: '数据导出中，请勿重复操作！',
+        message: this.$t('common.exporting'),
         type: 'success'
       })
       console.log(this.formInline, 'this.formInline')
@@ -196,7 +196,7 @@ export default {
         return
       }
       const blob = new Blob([res], { type: 'application/vnd.ms-excel' }) // 把得到的结果用流对象转一下
-      const fileName = '售后订单数据明细表.xls'
+      const fileName = this.$t('common.exportafterorder_filename')
       if ('download' in document.createElement('a')) {
         // 非IE下载
         const elink = document.createElement('a')

src/views/order/pending/index.vue

@@ -2,29 +2,29 @@
   <div class="pending">
     <div class="tab_show">
       <el-tabs v-model="formInline.state" @tab-click="handleClick">
-        <el-tab-pane label="全部" :name="''" />
-        <el-tab-pane label="待付款" name="1" />
-        <el-tab-pane label="待发货" name="2" />
-        <el-tab-pane label="已发货" name="3" />
-        <el-tab-pane label="已完成" name="4" />
-        <el-tab-pane label="已关闭" name="5" />
+        <el-tab-pane :label="$t('common.all')" :name="''" />
+        <el-tab-pane :label="$t('page.due')" name="1" />
+        <el-tab-pane :label="$t('page.goodswaitingtobesent')" name="2" />
+        <el-tab-pane :label="$t('page.goodsalreadysent')" name="3" />
+        <el-tab-pane :label="$t('common.completed')" name="4" />
+        <el-tab-pane :label="$t('page.closed')" name="5" />
       </el-tabs>
       <!-- 搜索 -->
       <div class="formSearch">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
           <el-form-item>
             <div>
-              <el-input v-model="formInline.search" maxlength="20" placeholder="请输入内容">
+              <el-input v-model="formInline.search" maxlength="20" :placeholder="$t('common.defaulthint')">
                 <el-select
                   slot="prepend"
                   v-model="formInline.searchType"
                   style="width:130px"
-                  placeholder="请选择"
+                  :placeholder="$t('common.choose')"
                 >
                   <el-option :label="$t('order.orderId')" value="1" />
-                  <el-option label="买家账户" value="2" />
-                  <el-option label="收件人姓名" value="3" />
-                  <el-option label="收件人手机号" value="4" />
+                  <el-option :label="$t('common.buyeraccount')" value="2" />
+                  <el-option :label="$t('common.receivername')" value="3" />
+                  <el-option :label="$t('common.receivermobilenum')" value="4" />
                   <!-- <el-option label="商品ID" value="5" /> -->
                 </el-select>
               </el-input>
@@ -32,25 +32,25 @@
           </el-form-item>
           <!-- <el-form-item label="售后状态">
             <el-select v-model="formInline.afterState" placeholder="请选择售后状态">
-              <el-option label="全部" :value="null" />
+              <el-option :label="$t('common.all')" :value="null" />
               <el-option label="无售后" value="0" />
               <el-option label="售后中" value="1" />
               <el-option label="售后成功" value="2" />
               <el-option label="售后关闭" value="3" />
             </el-select>
           </el-form-item> -->
-          <el-form-item label="下单时间">
+          <el-form-item :label="$t('common.ordertime')">
             <el-date-picker
               v-model="formInline.dates"
               type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              :range-separator="$t('common.betweentime')"
+              :start-placeholder="$t('common.startdate')"
+              :end-placeholder="$t('common.enddate')"
             />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" plain @click="search">{{ $t('common.query') }}</el-button>
-            <el-button type="success" plain @click="orderDataExport">导出订单</el-button>
+            <el-button type="success" plain @click="orderDataExport">{{$t('common.exportorder')}}</el-button>
 
           </el-form-item>
         </el-form>
@@ -70,24 +70,24 @@
             <template slot-scope="scope">{{ scope.row.orderId }}</template>
           </el-table-column>
           <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>
+          <el-table-column prop="number" :label="$t('common.product_number_tips')" show-overflow-tooltip />
+          <el-table-column :label="$t('common.orderstatus')" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span v-if="scope.row.state == 1">待付款</span>
-              <span v-if="scope.row.state == 2">待发货</span>
-              <span v-if="scope.row.state == 3">已发货</span>
-              <span v-if="scope.row.state == 4">已完成</span>
-              <span v-if="scope.row.state == 5">已关闭</span>
-              <span v-if="scope.row.state == 6">待成团</span>
+              <span v-if="scope.row.state == 1">{{$t('page.due')}}</span>
+              <span v-if="scope.row.state == 2">{{$t('page.goodswaitingtobesent')}}</span>
+              <span v-if="scope.row.state == 3">{{$t('page.goodsalreadysent')}}</span>
+              <span v-if="scope.row.state == 4">{{$t('common.completed')}}</span>
+              <span v-if="scope.row.state == 5">{{$t('page.closed')}}</span>
+              <span v-if="scope.row.state == 6">{{$t('common.orderstatus_dct')}}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="customerName" label="下单账户" show-overflow-tooltip />
-          <el-table-column prop="createTime" label="下单时间" show-overflow-tooltip />
+          <el-table-column prop="customerName" :label="$t('common.orderaccount')" show-overflow-tooltip />
+          <el-table-column prop="createTime" :label="$t('common.ordertime')" 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>
-                <el-button v-if="scope.row.state == 2" type="text" @click="view(scope.row)">发货</el-button>
+                <el-button v-if="scope.row.state === 1" type="text" @click="changePrice(scope.row)">{{$t('common.changeprice')}}</el-button>
+                <el-button v-if="scope.row.state == 2" type="text" @click="view(scope.row)">{{$t('common.send')}}</el-button>
                 <el-button v-else type="text" @click="view(scope.row)">{{ $t('common.view') }}</el-button>
               </div>
             </template>
@@ -187,7 +187,7 @@ export default {
     // 导出订单
     async orderDataExport() {
       this.$message({
-        message: '数据导出中，请勿重复操作！',
+        message: this.$t('common.exporting'),
         type: 'success'
       })
       console.log(this.formInline, 'this.formInline')
@@ -196,7 +196,7 @@ export default {
         return
       }
       const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
-      const fileName = '订单数据明细表.xls'
+      const fileName = this.$t('common.exportorder_filename')
       if ('download' in document.createElement('a')) {
         // 非IE下载
         const elink = document.createElement('a')

src/views/order/pending/pendDetails.vue

@@ -13,47 +13,47 @@
             </li>
             <li>
               <p>
-                <span>支付单号:</span>
+                <span>{{$t("common.paymentcode")}}:</span>
                 <span>{{ order.transactionId }}</span>
               </p>
             </li>
 
             <li>
               <p>
-                <span>支付时间:</span>
+                <span>{{$t('common.paymenttime')}}:</span>
                 <span>{{ order.paymentTime }}</span>
               </p>
             </li>
             <li>
               <p>
-                <span>创建时间:</span>
+                <span>{{$t('common.createTime')}}:</span>
                 <span>{{ order.createTime }}</span>
               </p>
             </li>
           </ul>
         </div>
         <div class="baseinfo_col">
-          <div class="item_title" style="visibility:hidden">订单信息</div>
+          <div class="item_title" style="visibility:hidden">{{$t('order.orderinfo')}}</div>
           <ul>
             <li>
               <p>
-                <span>订单状态:</span>
-                <span v-if="order.state === 1">待付款</span>
-                <span v-if="order.state === 2">待发货</span>
-                <span v-if="order.state === 3">待收货</span>
-                <span v-if="order.state === 4">已完成</span>
-                <span v-if="order.state === 5">已取消</span>
+                <span>{{$t('common.orderstatus')}}:</span>
+                <span v-if="order.state === 1">{{$t('page.due')}}</span>
+                <span v-if="order.state === 2">{{$t('page.goodswaitingtobesent')}}</span>
+                <span v-if="order.state === 3">{{$t('page.waittobereceived')}}</span>
+                <span v-if="order.state === 4">{{$t('common.completed')}}</span>
+                <span v-if="order.state === 5">{{$t('page.canceled')}}</span>
               </p>
             </li>
             <li>
               <p>
-                <span>物流方案:</span>
+                <span>{{$t('logistics.logisticsplan')}}:</span>
                 <span>{{ order.logisticsName }}</span>
               </p>
             </li>
             <li>
               <p>
-                <span>售后状态:</span>
+                <span>{{$t('common.after-salestatus')}}:</span>
                 <span>{{ order.afterStateName }}</span>
               </p>
             </li>
@@ -61,47 +61,47 @@
           </ul>
         </div>
         <div class="baseinfo_col">
-          <div class="item_title">下单信息</div>
+          <div class="item_title">{{$t('common.placeorderinfo')}}</div>
           <ul>
 
             <li>
               <p>
-                <span>下单账户:</span>
+                <span>{{$t('common.orderaccount')}}:</span>
                 <span>{{ order.customerName }}</span>
               </p>
             </li>
             <li>
               <p>
-                <span>历史订单总数:</span>
-                <span>{{ order.total }}个</span>
+                <span>{{$t('common.historyordernum')}}:</span>
+                <span>{{ order.total }}</span>
               </p>
             </li>
             <li>
               <p>
-                <span>下单备注:</span>
+                <span>{{$t('common.orderremark')}}:</span>
                 <span>{{ order.remark }}</span>
               </p>
             </li>
           </ul>
         </div>
         <div class="baseinfo_col">
-          <div class="item_title">收货信息</div>
+          <div class="item_title">{{$t('common.receivinginfo')}}</div>
           <ul>
             <li>
               <p>
-                <span>姓名:</span>
+                <span>{{$t('common.name')}}:</span>
                 <span>{{ order.receiveName }}</span>
               </p>
             </li>
             <li>
               <p>
-                <span>手机号:</span>
+                <span>{{$t('common.mobilephone')}}:</span>
                 <span>{{ order.receivePhone }}</span>
               </p>
             </li>
             <li>
               <p>
-                <span>地址:</span>
+                <span>{{$t('common.address')}}:</span>
                 <span>{{ order.receiveAdress }} {{ order.address }}</span>
               </p>
             </li>
@@ -111,9 +111,9 @@
 
       <div class="baseinfo_row">
         <div class="baseinfo_col">
-          <div class="item_title">商品信息</div>
+          <div class="item_title">{{$t('common.productinfo')}}</div>
           <el-table :data='order.products' style="width: 100%" class="product_table">
-            <el-table-column label="商品" width="400">
+            <el-table-column :label="$t('common.product')" width="400">
               <template slot-scope="scope">
                 <div class="product_info">
                   <img :src="scope.row.image" class="product_img">
@@ -132,36 +132,36 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="productPrice" label="价格">
+            <el-table-column prop="productPrice" :label="$t('common.price')">
             </el-table-column>
-            <el-table-column prop="number" label="数量">
+            <el-table-column prop="number" :label="$t('common.quantity')">
             </el-table-column>
-            <el-table-column prop="total" label="小计">
+            <el-table-column prop="total" :label="$t('common.total_small')">
             </el-table-column>
           </el-table>
           <div class="product_total">
-            <div class="product_row"><span>商品总价:</span> <span>{{ order.orderPrice }}</span></div>
-            <div class="product_row"><span>运费金额:</span> <span>{{ order.logisticsPrice }}</span></div>
-            <div class="product_price"><span>总金额:</span> <span>{{ order.price }}</span></div>
+            <div class="product_row"><span>{{$t('common.producttotalprice')}}:</span> <span>{{ order.orderPrice }}</span></div>
+            <div class="product_row"><span>{{$t('common.freightamount')}}:</span> <span>{{ order.logisticsPrice }}</span></div>
+            <div class="product_price"><span>{{$t('common.totalamount')}}:</span> <span>{{ order.price }}</span></div>
 
           </div>
         </div>
       </div>
       <div class="baseinfo_row">
         <div class="baseinfo_col">
-          <div class="item_title">物流信息</div>
+          <div class="item_title">{{$t('order.logisticsinfo')}}</div>
           <el-button v-if="!order.logisticsNum && order.state == 2" type="primary" class="send_good"
-            @click="send">去发货</el-button>
+            @click="send">{{$t('common.send')}}</el-button>
           <ul v-else>
             <li v-if="order.express">
               <p>
-                <span>物流公司:</span>
+                <span>{{$t('common.logisticscompany')}}:</span>
                 <span>{{ order.express }}</span>
               </p>
             </li>
             <li v-if="order.deliverFormid">
               <p>
-                <span>运单号:</span>
+                <span>{{$t('common.hwbnumber')}}:</span>
                 <span>{{ order.deliverFormid }}</span>
               </p>
             </li>
@@ -222,13 +222,13 @@ export default {
       isVisible: false,
       rules: {
         logisticsName: [
-          { required: false, message: '请输入快递公司名称', trigger: 'blur' }
+          { required: false, message: this.$t('common.logisticscompany_hint'), trigger: 'blur' }
         ],
         deliverFormid: [
-          { required: true, message: '请输入快递单号', trigger: 'blur' }
+          { required: true, message: this.$t('common.logistics_number_hint'), trigger: 'blur' }
         ],
         express: [
-          { required: true, message: '请选择快递公司', trigger: 'blur' }
+          { required: true, message: this.$t('common.logisticscompany_choose_hint'), trigger: 'blur' }
         ]
       },
       companyList: [],
@@ -273,7 +273,7 @@ export default {
           orderDilevery(this.form).then((res) => {
             if (res.code === '') {
               this.$message({
-                message: '发货成功',
+                message: this.$t('common.sendsuccess'),
                 type: 'success'
               })
               this.isVisible = false

src/views/setup/phone/index.vue

@@ -29,15 +29,15 @@
             v-model="ruleForm.newPhone"
             maxlength="11"
             style="width: 70%"
-            placeholder="请输入新手机号"
+            :placeholder="$t('common.newphonenum_hint')"
           />
         </el-form-item>
-        <el-form-item label="验证码" prop="code">
+        <el-form-item :label="$t('common.verificationcode')" prop="code">
           <el-input
             v-model="ruleForm.code"
             maxlength="6"
             style="width: 40%; margin-right: 38px"
-            placeholder="请输入验证码"
+            :placeholder="$t('common.enterverificationcode')"
           />
           <el-button
             class="codeBtn"
@@ -45,12 +45,12 @@
             :loading="codeloading"
             @click="getCode(oldPhone)"
           >
-            <span v-if="!codeloading">获取验证码</span>
+            <span v-if="!codeloading">{{$t('common.verificationcodetip')}}</span>
             <span v-else>{{ count }} s</span>
           </el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="submint"> 确定 </el-button>
+          <el-button type="primary" @click="submint"> {{$t('common.sure')}} </el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -72,7 +72,7 @@ export default {
       if (!value) {
         return callback(new Error("请输入旧手机号"));
       } else if (/^1[3456789]\d{9}$/.test(value) === false) {
-        return callback(new Error("请输入正确的手机号"));
+        return callback(new Error(this.$t('common.phonenumber_error')));
       } else {
         callback();
       }
@@ -80,9 +80,9 @@ export default {
     // 新手机号
     const newPhone = (rule, value, callback) => {
       if (!value) {
-        return callback(new Error("请输入新手机号"));
+        return callback(new Error(this.$t('common.newphonenum_hint')));
       } else if (/^1[3456789]\d{9}$/.test(value) === false) {
-        return callback(new Error("请输入正确的手机号"));
+        return callback(new Error(this.$t('common.phonenumber_error')));
       } else {
         callback();
       }
@@ -90,7 +90,7 @@ export default {
     // 验证码
     const code = (rule, value, callback) => {
       if (!value) {
-        return callback(new Error("请输入验证码"));
+        return callback(new Error(this.$t('common.enterverificationcode')));
       } else {
         callback();
       }
@@ -128,11 +128,11 @@ export default {
     async getCode(phone) {
       console.log(phone);
       if (phone === "" || phone === undefined) {
-        this.$message.error("请填写新手机号");
+        this.$message.error(this.$t('common.newphonenum_hint'));
         return;
       }
       if (/^1[3456789]\d{9}$/.test(phone) === false) {
-        this.$message.error("请填写正确手机号");
+        this.$message.error(this.$t('common.phonenumber_error'));
         return false;
       }
       if (!this.timer) {
@@ -160,15 +160,15 @@ export default {
     },
     submint() {
       if (this.ruleForm.newPhone === "" || this.ruleForm.newPhone === undefined) {
-        this.$message.error("请填写新手机号");
+        this.$message.error(this.$t('common.newphonenum_hint'));
         return;
       }
       if (/^1[3456789]\d{9}$/.test(this.ruleForm.newPhone) === false) {
-        this.$message.error("请填写正确手机号");
+        this.$message.error(this.$t('common.phonenumber_error'));
         return false;
       }
       if (this.ruleForm.code === "" || this.ruleForm.code === undefined) {
-        this.$message.error("请填写验证码");
+        this.$message.error(this.$t('common.enterverificationcode'));
         return;
       }
       var data = {

src/views/setup/privacy/index.vue

@@ -8,31 +8,31 @@
         label-width="100px"
         class="demo-ruleForm"
       >
-        <el-form-item label="认证时间：" prop="newPhone">
+        <el-form-item :label="$t('common.certificationdate')" prop="newPhone">
           {{ now_time }}
         </el-form-item>
-        <el-form-item label="管理员电话" prop="newPhone">
+        <el-form-item :label="$t('common.administratortelephone')" prop="newPhone">
           <el-input
             v-if="Number(privacyTime)===0"
             disabled
             :value="hidden(ruleForm.newPhone,3,4)"
             style="width: 70%"
-            placeholder="请输入管理员电话"
+            :placeholder="$t('common.administratortelephone_hint')"
           />
           <el-input
             v-else
             disabled
             v-model="ruleForm.newPhone"
             style="width: 70%"
-            placeholder="请输入管理员电话"
+            :placeholder="$t('common.administratortelephone_hint')"
           />
         </el-form-item>
-        <el-form-item label="验证码" prop="code">
+        <el-form-item :label="$t('common.verificationcode')" prop="code">
           <el-input
             v-model="ruleForm.code"
             maxlength="6"
             style="width: 40%; margin-right: 38px"
-            placeholder="请输入验证码"
+            :placeholder="$t('common.enterverificationcode')"
           />
           <el-button
             class="codeBtn"
@@ -40,13 +40,13 @@
             :loading="codeloading"
             @click="getCode(ruleForm.newPhone)"
           >
-            <span v-if="!codeloading">获取验证码</span>
+            <span v-if="!codeloading">{{$t('common.verificationcodetip')}}</span>
             <span v-else>{{ count }} s</span>
           </el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submint(ruleForm.newPhone)">
-            确定
+            {{$t('common.sure')}}
           </el-button>
         </el-form-item>
       </el-form>
@@ -67,9 +67,9 @@ export default {
     // 管理员手机号码
     const newPhone = (rule, value, callback) => {
       if (!value) {
-        return callback(new Error("请输入新手机号"));
+        return callback(new Error(this.$t('common.newphonenum_hint')));
       } else if (/^1[3456789]\d{9}$/.test(value) === false) {
-        return callback(new Error("请输入正确的手机号"));
+        return callback(new Error(this.$t('common.phonenumber_error')));
       } else {
         callback();
       }
@@ -77,7 +77,7 @@ export default {
     // 验证码
     const code = (rule, value, callback) => {
       if (!value) {
-        return callback(new Error("请输入验证码"));
+        return callback(new Error(this.$t('common.enterverificationcode')));
       } else {
         callback();
       }
@@ -104,7 +104,7 @@ export default {
     // 获取认证的时间
     this.privacyTime = localStorage.getItem("privacyTime");
     if (Number(this.privacyTime) === 0) {
-      this.now_time = "未认证";
+      this.now_time = this.$t('common.uncertificated');
     } else {
       var time = new Date(Number(this.privacyTime));
       var year = time.getFullYear();
@@ -129,11 +129,11 @@ export default {
     async getCode(phone) {
       console.log(phone);
       if (phone === "" || phone === undefined) {
-        this.$message.error("请填写手机号");
+        this.$message.error(this.$t('common.phonenumber_empty'));
         return;
       }
       if (/^1[3456789]\d{9}$/.test(phone) === false) {
-        this.$message.error("请填写正确手机号");
+        this.$message.error(this.$t('common.phonenumber_error'));
         return false;
       }
       if (!this.timer) {
@@ -143,7 +143,7 @@ export default {
         const res = await getPrivacyCode({ phone });
         if (res.code === "") {
           this.$message({
-            message: "发送成功，请注意查看手机短信",
+            message: this.$t('common.getcodesuccess_notify'),
             type: "success",
           });
         }
@@ -164,7 +164,7 @@ export default {
       this.timer = null;
       this.codeloading = false;
       if (this.ruleForm.code === "" || this.ruleForm.code === undefined) {
-        this.$message.error("请填写验证码");
+        this.$message.error(this.$t('common.enterverificationcode'));
         return;
       }
       var data = {
@@ -174,7 +174,7 @@ export default {
       const res = await verifyPrivacyCode(data);
       if (res.data === true) {
         this.$message({
-          message: "二次认证成功，该认证24小时内有效，超过时间需要重新认证",
+          message: this.$t('common.privacysuccess_notify'),
           type: "success",
         });
         this.ruleForm.code = "";

src/views/setup/role/index.vue

@@ -260,8 +260,8 @@ export default {
     // 删除角色
     async del(row) {
       this.$confirm('此操作将永久删除该角色, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       })
         .then(() => {

src/views/setup/tabs/Icons.vue

@@ -92,8 +92,8 @@
       </el-tab-pane>
     </el-tabs>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="isVisible = false"> 取消 </el-button>
-      <el-button type="primary" @click="confirm"> 确定 </el-button>
+      <el-button @click="isVisible = false"> {{$t('common.sure')}} </el-button>
+      <el-button type="primary" @click="confirm"> {{$t('common.cancel')}} </el-button>
     </div>
   </el-dialog>
 </template>

src/views/setup/user/index.vue

@@ -8,7 +8,7 @@
           <el-input v-model="formInline.search" maxlength="20" placeholder="请输入用户名" />
         </el-form-item>
         <el-form-item label="是否启用">
-          <el-select v-model="formInline.state" placeholder="请选择">
+          <el-select v-model="formInline.state" :placeholder="$t('common.choose')">
             <el-option label="是" value="1" />
             <el-option label="否" value="0" />
           </el-select>
@@ -110,7 +110,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否启用">
-            <el-select v-model="addForm.state" placeholder="请选择">
+            <el-select v-model="addForm.state" :placeholder="$t('common.choose')">
               <el-option label="是" :value="1" />
               <el-option label="否" :value="0" />
             </el-select>
@@ -119,7 +119,7 @@
             <el-select
               v-model="addForm.roleIds"
               multiple
-              placeholder="请选择"
+              :placeholder="$t('common.choose')"
               @remove-tag="removeTag"
               @change="tagChange"
             >
@@ -186,11 +186,11 @@ export default {
         ],
         name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         phone: [
-          { required: true, message: '请输入手机号', trigger: 'blur' },
+          { required: true, message: this.$t('common.phonenumber_empty'), trigger: 'blur' },
           { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
           {
             pattern: /^1[3456789]\d{9}$/,
-            message: "请输入正确的手机号码"
+            message: this.$t('common.phonenumber_error')
           }
         ],
       },
@@ -316,8 +316,8 @@ export default {
     // 删除用户
     async del(row) {
       this.$confirm('此操作将永久删除该用户, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       })
         .then(() => {

src/views/shop/material/index.vue

@@ -291,7 +291,7 @@ export default {
         labelId: this.tipsList[this.findIndex].labelId
       })
       if (res.code === '') {
-        this.$message.success($t('common.deletesuccess'))
+        this.$message.success(this.$t('common.deletesuccess'))
         this.getAllTips()
         this.tipsShow = false
       }
@@ -342,7 +342,7 @@ export default {
         link: arr.link
       })
       if (res.code === '') {
-        this.$message.success($t('common.deletesuccess'))
+        this.$message.success(this.$t('common.deletesuccess'))
         this.getAllTips()
         this.getTips(this.findIndex, {
           labelName: this.tipsName,

src/views/shop/myshop/index.vue

@@ -32,7 +32,7 @@
           <!-- <el-form-item label="合同状态">
             <el-select
               v-model="formInline.contractState"
-              placeholder="请选择"
+              :placeholder="$t('common.choose')"
             >
               <el-option
                 label="有效"
@@ -339,7 +339,7 @@
                     v-model="ruleForm.effectiveYear"
                     type="text"
                     :disabled="disabled"
-                    placeholder="请输入内容"
+                    :placeholder="$t('common.defaulthint')"
                     maxlength="4"
                     class="elipt"
                     style="width: 50%"
@@ -614,7 +614,7 @@ export default {
           //   this.ruleForm.shopPhone = this.userPhone
           // }
           if (this.ruleForm.shopName === '') {
-            this.$message.error($t('shop.shopNameHint'))
+            this.$message.error(this.$t('shop.shopNameHint'))
             return
           }
           // if (this.ruleForm.effectiveDate === '') {
@@ -723,8 +723,8 @@ export default {
     delshop (row) {
       // todo 判断店铺状态
       this.$confirm('此操作将永久删除该店铺, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(async () => {
         const res = await delshopById({

src/views/stock/stocknote/index.vue

@@ -174,8 +174,8 @@ export default {
     // 删除
     del(row) {
       this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       })
         .then(() => {

src/views/system/logistics/Edit.vue

@@ -58,7 +58,7 @@
                 (logisticsDetail.regions &&
                   logisticsDetail.regions.length &&
                   logisticsDetail.regions.toString()) ||
-                  '请选择'
+                 $t('common.choose')
               }}
             </div>
           </el-form-item>
@@ -71,7 +71,7 @@
                   v-model="logisticsDetail.weight"
                   maxlength="9"
                   :readonly="isDisabled"
-                  placeholder="请输入内容"
+                  :placeholder="$t('common.defaulthint')"
                   oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                 /> -->
                 KG/件
@@ -81,7 +81,7 @@
                   maxlength="9"
                   type="text"
                   :readonly="isDisabled"
-                  placeholder="请输入内容"
+                  :placeholder="$t('common.defaulthint')"
                   oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                 /> -->
                 元
@@ -93,7 +93,7 @@
                   v-model="logisticsDetail.secondWeight"
                   maxlength="9"
                   :readonly="isDisabled"
-                  placeholder="请输入内容"
+                  :placeholder="$t('common.defaulthint')"
                   oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                 /> -->
                 KG/件
@@ -102,7 +102,7 @@
                   v-model="logisticsDetail.secondPrice"
                   maxlength="9"
                   :readonly="isDisabled"
-                  placeholder="请输入内容"
+                  :placeholder="$t('common.defaulthint')"
                   oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                 /> -->
                 元

src/views/system/logistics/index.vue

@@ -174,7 +174,7 @@ export default {
     },
     // 删除
     del(row) {
-      this.$confirm($t('common.deletedialogtitle'), $t('common.notice_dialog_title'), {
+      this.$confirm(this.$t('common.deletedialogtitle'), $t('common.notice_dialog_title'), {
         confirmButtonText: $t('common.sure'),
         cancelButtonText: $t('common.cancel'),
         type: 'warning'

src/views/system/storehouse/index.vue

@@ -179,8 +179,8 @@ export default {
     // 删除
     del(row) {
       this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: this.$t('common.sure'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       })
         .then(() => {