|
|
@@ -28,7 +28,6 @@
|
|
|
"weChatScanning": "微信主扫",
|
|
|
"antiScanningOfAlipay": "支付宝反扫",
|
|
|
"weChatBackScanning": "微信反扫",
|
|
|
-<<<<<<< HEAD
|
|
|
"unpaid":"未支付",
|
|
|
"paid":"已支付",
|
|
|
"refunding":"退款中",
|
|
|
@@ -38,14 +37,6 @@
|
|
|
"companies": "公司平台",
|
|
|
"sz": "申泽",
|
|
|
"sc": "七云"
|
|
|
-=======
|
|
|
- "unpaid": "未支付",
|
|
|
- "paid": "已支付",
|
|
|
- "refunding": "退款中",
|
|
|
- "refunded": "已退款",
|
|
|
- "orderStatus": "订单状态",
|
|
|
- "allSuboUsers": "所有下级用户"
|
|
|
->>>>>>> sunzee-dev
|
|
|
},
|
|
|
"navBar": {
|
|
|
"homePage": "首页",
|
|
|
@@ -290,10 +281,7 @@
|
|
|
"addAlarmClock": "添加闹钟",
|
|
|
"modify": "修改",
|
|
|
"furnHeadStatus": "炉头状态",
|
|
|
-<<<<<<< HEAD
|
|
|
"deviceStatus": "设备状态",
|
|
|
-=======
|
|
|
->>>>>>> sunzee-dev
|
|
|
"opened": "已开启",
|
|
|
"closed": "已关闭",
|
|
|
"weekday2": "工作日",
|
|
|
@@ -412,12 +400,9 @@
|
|
|
"furnaceHeadTemperature": "炉头温度",
|
|
|
"temperatureInCabinet": "柜内温度",
|
|
|
"humidityInCabinet": "柜内湿度",
|
|
|
-<<<<<<< HEAD
|
|
|
"stirringTemperature": "搅拌温度",
|
|
|
"cornGeneratorTemperature": "玉米发生器温度",
|
|
|
"cupQuantity": "杯子剩余量",
|
|
|
-=======
|
|
|
->>>>>>> sunzee-dev
|
|
|
"showGoods": "屏蔽/显示商品",
|
|
|
"editCheck": "是否确认更改？",
|
|
|
"unknownError": "未知错误！",
|
|
|
@@ -838,17 +823,10 @@
|
|
|
"endTime": "结束时间",
|
|
|
"clickSearch": "点击搜索",
|
|
|
"selectFullTime": "选择完整时间",
|
|
|
-<<<<<<< HEAD
|
|
|
"refundAmount":"退款金额",
|
|
|
- "refundTip": "退款请慎重，否则会影响统计！",
|
|
|
- "refundQuantity":"退款数量",
|
|
|
"refundPlace":"请选择退款商品",
|
|
|
"refundCheck": "是否确认退款？",
|
|
|
- "accountBalance":"账户余额",
|
|
|
- "refundSubmit": "提交申请",
|
|
|
- "requestFailed": "请求失败"
|
|
|
-=======
|
|
|
- "refundAmount": "退款金额",
|
|
|
+ "requestFailed": "请求失败",
|
|
|
"refundTip": "确保金额与数量对应，否则会影响统计！",
|
|
|
"refundQuantity": "退款数量",
|
|
|
"refundAmountPlace": "请输入退款金额",
|
|
|
@@ -856,7 +834,6 @@
|
|
|
"at": "个",
|
|
|
"accountBalance": "账户余额",
|
|
|
"refundSubmit": "提交申请"
|
|
|
->>>>>>> sunzee-dev
|
|
|
},
|
|
|
"orderExport": {
|
|
|
"orderAnalysis": "订单分析",
|
|
|
@@ -867,7 +844,6 @@
|
|
|
"orderDetails": "订单明细",
|
|
|
"clickFilter": "点击筛选",
|
|
|
"exportToExcel": "导出excel",
|
|
|
-<<<<<<< HEAD
|
|
|
"totalSales":"总销售额",
|
|
|
"machines":"台机器",
|
|
|
"superior":"所属上级",
|
|
|
@@ -889,23 +865,6 @@
|
|
|
"whole":"全部",
|
|
|
"sz": "申泽",
|
|
|
"sc": "七云"
|
|
|
-=======
|
|
|
- "totalSales": "总销售额",
|
|
|
- "machines": "台机器",
|
|
|
- "superior": "所属上级",
|
|
|
- "searchPop": {
|
|
|
- "title": "根据以下条件筛选",
|
|
|
- "orderNo": "订单编号",
|
|
|
- "orderNoPlace": "请输入订单编号",
|
|
|
- "busiName": "商户名称",
|
|
|
- "busiNamePlace": "请输入商户名称",
|
|
|
- "clearFilter": "清空条件",
|
|
|
- "filter": "筛选",
|
|
|
- "mainOver": "大陆/海外",
|
|
|
- "mainOverPlace": "请选择大陆/海外",
|
|
|
- "mainland": "大陆",
|
|
|
- "overseas": "海外"
|
|
|
->>>>>>> sunzee-dev
|
|
|
}
|
|
|
},
|
|
|
"role": {
|
|
|
@@ -1099,7 +1058,6 @@
|
|
|
"filterBtn": "点击查询"
|
|
|
}
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
"joinpayMchCheck":{
|
|
|
"convergence":"汇聚",
|
|
|
"huifu":"汇付",
|
|
|
@@ -1135,48 +1093,6 @@
|
|
|
"cardName": "卡户名",
|
|
|
"mp": "结算手机号",
|
|
|
"successful": "审核成功"
|
|
|
-=======
|
|
|
- "joinpayMchCheck": {
|
|
|
- "convergence": "汇聚",
|
|
|
- "shande": "杉德",
|
|
|
- "withAccoDetail": "提现账号详情",
|
|
|
- "merchantName": "商户名称",
|
|
|
- "merchantType": "商户类型",
|
|
|
- "contactName": "联系人姓名",
|
|
|
- "indiOrPersName": "法人/个人姓名",
|
|
|
- "indiOrPersPhone": "法人/个人手机号",
|
|
|
- "indiOrPersPhoneIdCard": "法人/个人身份证",
|
|
|
- "idCardValid": "身份证有效期",
|
|
|
- "accountType": "账号类型",
|
|
|
- "bankAccountName": "银行账号名称",
|
|
|
- "bankAccount": "银行账号",
|
|
|
- "interBankNo": "联行号",
|
|
|
- "settlMethod": "结算方式",
|
|
|
- "settlCycle": "结算周期",
|
|
|
- "businessNature": "经营范围",
|
|
|
- "businessAddress": "经营地址",
|
|
|
- "personal": "个人",
|
|
|
- "indivBusines": "个体工商户",
|
|
|
- "enterprise": "企业",
|
|
|
- "debitCard": "借记卡",
|
|
|
- "corporateAccount": "对公账户",
|
|
|
- "autoSettByConvergence": "由汇聚自动结算",
|
|
|
- "manuSettByMercPlatform": "由商户平台手工结算",
|
|
|
- "day": "日",
|
|
|
- "merchantID": "商户id",
|
|
|
- "nameOfDepoBank": "开户行名称",
|
|
|
- "bankNo": "银行号",
|
|
|
- "nameOfPayee": "收款人名称",
|
|
|
- "beneAccoNo": "收款人账号",
|
|
|
- "lastCleaBalance": "上一次清算余额",
|
|
|
- "balaToBeSettled": "待清算余额",
|
|
|
- "lastSettTime": "上一次结算时间",
|
|
|
- "todaCollBalance": "今日收款余额",
|
|
|
- "clearBalance": "已清算余额",
|
|
|
- "ShandebaoType": "杉德宝类型",
|
|
|
- "enterpriseShandebao": "企业杉德宝",
|
|
|
- "personalShandebao": "个人杉德宝"
|
|
|
->>>>>>> sunzee-dev
|
|
|
}
|
|
|
},
|
|
|
"uniPay": {
|
|
|
@@ -1276,7 +1192,7 @@
|
|
|
"phoneRegistration": "手机注册"
|
|
|
},
|
|
|
"robotRanking": {
|
|
|
- "machineSalesRanking": "机器销售排行榜",
|
|
|
+ "machineSalesRanking":"机器销售排行榜",
|
|
|
"dailySalesRanking": "日销售排行",
|
|
|
"today": "今日",
|
|
|
"yesterday": "昨日",
|
|
|
@@ -1290,7 +1206,6 @@
|
|
|
"salesRankingThisYear": "年销售排行",
|
|
|
"thisYear": "今年",
|
|
|
"lastYear": "去年",
|
|
|
-<<<<<<< HEAD
|
|
|
"yearPopTitle":"请选择年份",
|
|
|
"changeType":"统计方式",
|
|
|
"changeTypePlace":"请选择统计方式",
|
|
|
@@ -1303,15 +1218,6 @@
|
|
|
"sc": "七云",
|
|
|
"seleWeekDateRangeNotSeveDays":"选择周的日期范围不能超过7天！！！",
|
|
|
"rankMethod":"排行方式"
|
|
|
-=======
|
|
|
- "yearPopTitle": "请选择年份",
|
|
|
- "changeType": "统计方式",
|
|
|
- "changeTypePlace": "请选择统计方式",
|
|
|
- "patternStatistics": "花型统计",
|
|
|
- "salesStatistics": "销售额统计",
|
|
|
- "seleWeekDateRangeNotSeveDays": "选择周的日期范围不能超过7天！！！",
|
|
|
- "rankMethod": "排行方式"
|
|
|
->>>>>>> sunzee-dev
|
|
|
},
|
|
|
"user": {
|
|
|
"essentialInformation": "基本信息",
|
|
|
@@ -1428,4 +1334,4 @@
|
|
|
"wechat": {
|
|
|
"headerName": "绑定微信"
|
|
|
}
|
|
|
-}
|
|
|
+}
|
wangzeyu@tom.com