Commit 4b0157d3 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318

parents 578bd32e afc6c7bb
......@@ -31,6 +31,7 @@
"build:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.0.10:9400 yarn build",
"build:study": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.207:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.1.207:9400 yarn build",
"build:v2": "cross-env PRO_ENV=v2 yarn build",
"build:v2-0318": "cross-env PRO_ENV=v2-0318 yarn build",
"build:v2Preview": "cross-env PRO_ENV=v2Preview yarn build",
"build:v2scm": "cross-env PRO_ENV=v2scm yarn build",
"build:v2-demo": "cross-env PRO_ENV=v2-demo yarn build",
......@@ -47,6 +48,7 @@
"start:study": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.207:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.1.207:9400 yarn start",
"start:25": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.25:8100 USE_ROUTE_CONFIG=true SOCKET_URL=ws://10.0.0.25:9400 yarn start",
"start:v2": "cross-env PRO_ENV=v2 yarn start",
"start:v2-0318": "cross-env PRO_ENV=v2-0318 yarn start",
"start-noApi:v2": "cross-env PRO_ENV=v2 yarn start-noApi",
"start:v2Preview": "cross-env PRO_ENV=v2Preview yarn start",
"start:v2scm": "cross-env PRO_ENV=v2scm yarn start",
......
......@@ -12,6 +12,7 @@ import editor from './en-US/editor'
import authConfig from './en-US/system/authConfig'
import systemSetting from './en-US/system/systemSetting'
import accountSetting from './en-US/system/accountSetting'
import portalSystem from './en-US/system/portalSystem'
import activityPage from './en-US/marketingAbility/activityPage'
import merchantCoupon from './en-US/marketingAbility/merchantCoupon'
import paltformSign from './en-US/marketingAbility/paltformSign'
......@@ -56,6 +57,7 @@ export default {
...authConfig,
...systemSetting,
...accountSetting,
...portalSystem,
...activityPage,
...merchantCoupon,
...paltformSign,
......
export default {
'portalSystem.mendiandaima': 'Store code',
'portalSystem.mendianmingcheng': 'Store name',
'portalSystem.mendiandizhi': 'Store address',
'portalSystem.youbian': 'Postal code',
'portalSystem.suoshujigou': 'Organization',
'portalSystem.lianxiren': 'Contact person',
'portalSystem.lianxidianhua': 'Contact number',
'portalSystem.zhuangtai': 'Status',
'portalSystem.caozuo': 'Operation',
'portalSystem.bianji': 'Editing',
'portalSystem.shanchu': 'Delete',
'portalSystem.quedingyaoshanchuma': 'Are you sure you want to delete?',
'portalSystem.shi': 'Yes',
'portalSystem.fou': 'No',
'portalSystem.chaxun': 'Query',
'portalSystem.menhuguanlixiangqing': 'Portal Administration details',
'portalSystem.jibenxinxi': 'Basic information',
'portalSystem.mendianLOGO': 'Store LOGO',
'portalSystem.lianxixinxi': 'Contact information',
'portalSystem.xiangxidizhi': 'Full address',
'portalSystem.lianxirenxingming': 'Contact name',
'portalSystem.youxiang': 'Mailbox',
'portalSystem.zhiwei': 'Position',
'portalSystem.suoshuzuzhijigou': 'Affiliated organization',
'portalSystem.shouhuodizhi': 'Receiving address',
'portalSystem.fahuozitidizhi': 'Shipping (pick-up) address',
'portalSystem.morendizhi': 'Default address',
'portalSystem.bianjimendian': 'Edit store',
'portalSystem.xinzengmendian': 'Add stores',
'portalSystem.baocun': 'Save',
'portalSystem.menhudaima': 'Portal code',
'portalSystem.qingshuru': 'Please enter',
'portalSystem.qingshurumenhudaima': 'Please enter the portal code',
'portalSystem.qingshumendianmingcheng': 'Please enter the name of the store',
'portalSystem.qingxuanzeshengshiqu': 'Please select a province / city / district',
'portalSystem.qingtianxiexiangxidizhi': 'Please fill in the detailed address, road name, house number, etc.',
'portalSystem.qingshurulianxirenxingming': 'Please enter the contact name',
'portalSystem.qingxuanzequhao': 'Please select the area code',
'portalSystem.qingshurushoujihaoma': 'Please enter your mobile phone number',
'portalSystem.shoujihaomageshibuzheng': 'Incorrect format of mobile phone number',
'portalSystem.youxianggeshibuzhengque': 'Incorrect mailbox format',
'portalSystem.qingshuruzhiwei': 'Please enter a position',
'portalSystem.qingxuanzesuoshuzuzhiji': 'Please select your organization',
'portalSystem.qingshuruyouxiang': 'Please enter your mailbox',
'portalSystem.qingshuruyoubian': 'Please enter the zip code',
'portalSystem.xuanze': 'Choice',
'portalSystem.xinzengdizhi': 'added address',
'portalSystem.dianhuahaomageshibuzheng': 'Incorrect phone number format',
'portalSystem.added': 'Added',
'portalSystem.qiyong': 'Enable',
'portalSystem.tingyong': 'Deactivate',
}
export default {
// Secret key management
'systemSetting.key.decryptionKey':'Decryption Key',
'systemSetting.key.copyKey':'Copy key',
'systemSetting.key.resettingKey':'The system will automatically reset the decryption key after expiration',
'systemSetting.key.keyUsefulTime':'Current decryption key valid time',
// Collection management
'systemSetting.collection.itemTakenOffShelf':'The item has been off the shelf',
'systemSetting.collection.buyAgain':'Buy again',
'systemSetting.collection.redeemNow':'Redeem Now',
'systemSetting.collection.InquiryNow':'Inquiry Now',
'systemSetting.collection.integral':'Integral',
'systemSetting.collection.onlineInquiry':'Online inquiry',
'systemSetting.collection.cancelCollection':'Do you want to cancel the collection?',
'systemSetting.collection.collection':'Collection',
'systemSetting.collection.commodityCollection':'Commodity Collection',
'systemSetting.collection.shopCollection':'Shop Collection',
'systemSetting.collection.newsCollection':'Information Collection',
'systemSetting.collection.doorCollection':'Portal Collection',
'systemSetting.collection.logisticsCollection':'Logistics provider collection',
'systemSetting.collection.processorCollection':'Processor Collection',
'systemSetting.collection.articleTakenOffShelf':'The article has been taken off the shelf',
'systemSetting.collection.logisticsProvidersFrozen':'Logistics provider has been frozen',
'systemSetting.collection.processorFrozen':'Processor has been frozen',
'systemSetting.collection.doorFrozen':'The portal has been frozen',
'systemSetting.collection.shopFrozen':'The shop has been frozen',
'systemSetting.collection.satisfaction':'Satisfaction',
// Message Center
'systemSetting.message.systemMessage':'System Message',
'systemSetting.message.plaformMessage':'Platform Message',
'systemSetting.message.total':'Total',
'systemSetting.message.numble':'Bar',
'systemSetting.message.messageList':'Message List',
'systemSetting.message.allRead':'All read',
// Parameter configuration
'systemSetting.parameterSetting.DoNotConfigureRepeatPeriods':'Do not configure the repeat period',
'systemSetting.parameterSetting.type':'Type',
'systemSetting.parameterSetting.all':'All',
'systemSetting.parameterSetting.commodityRelated':'Commodity Related',
'systemSetting.parameterSetting.orderRelated':'Order related',
'systemSetting.parameterSetting.setApplicableMall':'Set applicable mall',
'systemSetting.parameterSetting.ApplicableMall':'Applicable Mall',
'systemSetting.parameterSetting.DaysOfReceipt':'Receipt days',
'systemSetting.parameterSetting.orderTime':'Reservation time (days)',
'systemSetting.parameterSetting.add':'Add',
// Secret key management
'systemSetting.key.decryptionKey': 'Decryption Key',
'systemSetting.key.copyKey': 'Copy key',
'systemSetting.key.resettingKey': 'The system will automatically reset the decryption key after expiration',
'systemSetting.key.keyUsefulTime': 'Current decryption key valid time',
// Collection management
'systemSetting.collection.itemTakenOffShelf': 'The item has been off the shelf',
'systemSetting.collection.buyAgain': 'Buy again',
'systemSetting.collection.redeemNow': 'Redeem Now',
'systemSetting.collection.InquiryNow': 'Inquiry Now',
'systemSetting.collection.integral': 'Integral',
'systemSetting.collection.onlineInquiry': 'Online inquiry',
'systemSetting.collection.cancelCollection': 'Do you want to cancel the collection?',
'systemSetting.collection.collection': 'Collection',
'systemSetting.collection.commodityCollection': 'Commodity Collection',
'systemSetting.collection.shopCollection': 'Shop Collection',
'systemSetting.collection.newsCollection': 'Information Collection',
'systemSetting.collection.doorCollection': 'Portal Collection',
'systemSetting.collection.logisticsCollection': 'Logistics provider collection',
'systemSetting.collection.processorCollection': 'Processor Collection',
'systemSetting.collection.articleTakenOffShelf': 'The article has been taken off the shelf',
'systemSetting.collection.logisticsProvidersFrozen': 'Logistics provider has been frozen',
'systemSetting.collection.processorFrozen': 'Processor has been frozen',
'systemSetting.collection.doorFrozen': 'The portal has been frozen',
'systemSetting.collection.shopFrozen': 'The shop has been frozen',
'systemSetting.collection.satisfaction': 'Satisfaction',
// Message Center
'systemSetting.message.systemMessage': 'System Message',
'systemSetting.message.plaformMessage': 'Platform Message',
'systemSetting.message.total': 'Total',
'systemSetting.message.numble': 'Bar',
'systemSetting.message.messageList': 'Message List',
'systemSetting.message.allRead': 'All read',
// Parameter configuration
'systemSetting.parameterSetting.DoNotConfigureRepeatPeriods': 'Do not configure the repeat period',
'systemSetting.parameterSetting.type': 'Type',
'systemSetting.parameterSetting.all': 'All',
'systemSetting.parameterSetting.commodityRelated': 'Commodity Related',
'systemSetting.parameterSetting.orderRelated': 'Order related',
'systemSetting.parameterSetting.setApplicableMall': 'Set applicable mall',
'systemSetting.parameterSetting.ApplicableMall': 'Applicable Mall',
'systemSetting.parameterSetting.DaysOfReceipt': 'Receipt days',
'systemSetting.parameterSetting.orderTime': 'Reservation time (days)',
'systemSetting.parameterSetting.add': 'Add',
// leak
"systemSetting.year": "Year",
"systemSetting.priceQuxian": "Commodity price curve",
"systemSetting.zidongshouhuo": "Automatically confirm receipt",
"systemSetting.DeliveryAppointmentDuration": "Delivery Appointment Duration",
"systemSetting.DeliveryTimePeriod": "Delivery Time Period",
"systemSetting.pleaseChoosePeriod": "Please select a time period",
"systemSetting.priceLineCommodity": "Enable the display of commodity price curves. When the mouse is moved to the price column, the historical price changes of commodities of the current specification will be displayed.",
"systemSetting.autoReceiveOrder": "Enable automatic confirmation of receipt. When the receipt is not confirmed after the delivery exceeds the number of days after receipt, the system defaults to receipt.",
"systemSetting.forcastTimeOrder": "Enable delivery appointment time. You can make an appointment to place an order and deliver goods within the appointment time (days).",
"systemSetting.expressTimeOrder": "Enable delivery time period. You can choose the time within the delivery time period."
}
\ No newline at end of file
// leak
"systemSetting.year": "Year",
"systemSetting.priceQuxian": "Commodity price curve",
"systemSetting.zidongshouhuo": "Automatically confirm receipt",
"systemSetting.DeliveryAppointmentDuration": "Delivery Appointment Duration",
"systemSetting.DeliveryTimePeriod": "Delivery Time Period",
"systemSetting.pleaseChoosePeriod": "Please select a time period",
"systemSetting.priceLineCommodity": "Enable the display of commodity price curves. When the mouse is moved to the price column, the historical price changes of commodities of the current specification will be displayed.",
"systemSetting.autoReceiveOrder": "Enable automatic confirmation of receipt. When the receipt is not confirmed after the delivery exceeds the number of days after receipt, the system defaults to receipt.",
"systemSetting.forcastTimeOrder": "Enable delivery appointment time. You can make an appointment to place an order and deliver goods within the appointment time (days).",
"systemSetting.expressTimeOrder": "Enable delivery time period. You can choose the time within the delivery time period.",
'systemSetting.jifenxiangguan': 'Integral correlation',
'systemSetting.yunfeixiangguan': 'Freight related',
'systemSetting.shezhicanshu': 'Setting parameter',
'systemSetting.jifendikoudingdanjine': 'Integral deduction order amount',
'systemSetting.qiyongjifendikoudingdan': 'Enable integral deduction order amount. You can use the set integral to offset the order amount when you order.',
'systemSetting.qingxuanzeshijianduan': 'Please select the time period',
'systemSetting.shezhixiadanshijifenke': 'Set the deductible order amount when placing the order',
'systemSetting.dangedingdanyunxushiyong': 'The upper limit of integral is allowed for a single order',
'systemSetting.qingshurudangedingdanyun': 'Please enter the upper limit of integral allowed for a single order',
'systemSetting.jifenshangxianzhengshuxingbi': 'Integral upper limit integer must be greater than 0',
'systemSetting.qingshurujifendikoujin': 'Please enter the proportion of integral deduction amount',
'systemSetting.jifendikoujinebili': 'Proportional integral of integral deduction amount must be greater than 0',
'systemSetting.jifendikoujinebili1': 'Proportion of integral deduction amount',
'systemSetting.jifendikou': 'Deductible integral : $ 1.00',
'systemSetting.manebaoyou': 'Full package mail',
'systemSetting.shezhidingdanmanduoshaojin': 'Set order full amount free of freight',
'systemSetting.qiyongmanebaoyouke': 'Enable full package mail. Free shipping after reaching the set order amount at the time of order',
'systemSetting.dingdanjineman': 'Order amount is full',
'systemSetting.yuanmianyunfei': 'Free freight',
'systemSetting.qingshurudingdanjineman': 'Please enter the full amount of the order',
'systemSetting.dingdanjinemanbixuda': 'Orders must be greater than 0, up to 2 decimal places',
}
......@@ -12,6 +12,7 @@ import editor from './ko-KR/editor'
import authConfig from './ko-KR/system/authConfig'
import systemSetting from './ko-KR/system/systemSetting'
import accountSetting from './ko-KR/system/accountSetting'
import portalSystem from './ko-KR/system/portalSystem'
import activityPage from './ko-KR/marketingAbility/activityPage'
import merchantCoupon from './ko-KR/marketingAbility/merchantCoupon'
import paltformSign from './ko-KR/marketingAbility/paltformSign'
......@@ -56,6 +57,7 @@ export default {
...authConfig,
...systemSetting,
...accountSetting,
...portalSystem,
...activityPage,
...merchantCoupon,
...paltformSign,
......
export default {
'portalSystem.mendiandaima': '매장 코드',
'portalSystem.mendianmingcheng': '매장명',
'portalSystem.mendiandizhi': '매장 주소',
'portalSystem.youbian': '우편번호',
'portalSystem.suoshujigou': '소속 기관',
'portalSystem.lianxiren': '연락처',
'portalSystem.lianxidianhua': '연락처 번호',
'portalSystem.zhuangtai': '상태',
'portalSystem.caozuo': '조작',
'portalSystem.bianji': '편집',
'portalSystem.shanchu': '삭제',
'portalSystem.quedingyaoshanchuma': '삭제하시겠습니까?',
'portalSystem.shi': '예',
'portalSystem.fou': '아니오',
'portalSystem.chaxun': '조회',
'portalSystem.menhuguanlixiangqing': '포털 관리 상세 정보',
'portalSystem.jibenxinxi': '기본 정보',
'portalSystem.mendianLOGO': '매장LOGO',
'portalSystem.lianxixinxi': '연락처 정보',
'portalSystem.xiangxidizhi': '상세 주소',
'portalSystem.lianxirenxingming': '담당자 이름',
'portalSystem.youxiang': '우편함',
'portalSystem.zhiwei': '직위',
'portalSystem.suoshuzuzhijigou': '소속 기관',
'portalSystem.shouhuodizhi': '납품처 주소',
'portalSystem.fahuozitidizhi': '배송 주소',
'portalSystem.morendizhi': '기본 주소',
'portalSystem.bianjimendian': '매장 편집',
'portalSystem.xinzengmendian': '신규 매장',
'portalSystem.baocun': '저장',
'portalSystem.menhudaima': '포털 코드',
'portalSystem.qingshuru': '입력하십시오.',
'portalSystem.qingshurumenhudaima': '포털 코드를 입력하십시오.',
'portalSystem.qingshumendianmingcheng': '매장명을 입력해 주세요.',
'portalSystem.qingxuanzeshengshiqu': '시/도를 선택하십시오.',
'portalSystem.qingtianxiexiangxidizhi': '자세한 주소, 도로명, 문패 등을 기입해 주세요',
'portalSystem.qingshurulianxirenxingming': '연락처 이름을 입력하십시오.',
'portalSystem.qingxuanzequhao': '지역 번호를 선택하십시오.',
'portalSystem.qingshurushoujihaoma': '휴대폰 번호를 입력하십시오.',
'portalSystem.shoujihaomageshibuzheng': '휴대폰 번호 형식이 잘못되었습니다.',
'portalSystem.youxianggeshibuzhengque': '사서함 형식이 잘못되었습니다.',
'portalSystem.qingshuruzhiwei': '직책을 입력하십시오.',
'portalSystem.qingxuanzesuoshuzuzhiji': '소속 기관을 선택하십시오.',
'portalSystem.qingshuruyouxiang': '사서함을 입력하십시오.',
'portalSystem.qingshuruyoubian': '우편 번호를 입력하십시오.',
'portalSystem.xuanze': '선택',
'portalSystem.xinzengdizhi': '새 주소',
'portalSystem.dianhuahaomageshibuzheng': '잘못된 전화 번호 형식',
'portalSystem.added': '신규',
'portalSystem.qiyong': '활성화',
'portalSystem.tingyong': '비활성화',
}
export default {
// 秘钥管理
'systemSetting.key.decryptionKey': '암호 해독 키',
'systemSetting.key.copyKey': '키 복사',
'systemSetting.key.resettingKey': '만료 후 시스템은 자동으로 복호화 키를 재설정합니다',
'systemSetting.key.keyUsefulTime': '현재 암호화 키 유효 시간',
// 收藏管理
'systemSetting.collection.itemTakenOffShelf': '이 상품은 이미 진열대에서 내렸다',
'systemSetting.collection.buyAgain': '재구매',
'systemSetting.collection.redeemNow': '즉시 교환',
'systemSetting.collection.InquiryNow': '즉시 가격 문의',
'systemSetting.collection.integral': '적분',
'systemSetting.collection.onlineInquiry': '온라인 문의',
'systemSetting.collection.cancelCollection': '모음을 취소하시겠습니까?',
'systemSetting.collection.collection': '수장하다',
'systemSetting.collection.commodityCollection': '상품 수집',
'systemSetting.collection.shopCollection': '가게',
'systemSetting.collection.newsCollection': '정보 수집',
'systemSetting.collection.doorCollection': '포털 컬렉션',
'systemSetting.collection.logisticsCollection': '물류상 수집',
'systemSetting.collection.processorCollection': '가공상 소장품',
'systemSetting.collection.articleTakenOffShelf': '이 문장은 이미 결말이 났다',
'systemSetting.collection.logisticsProvidersFrozen': '물류상은 이미 동결되었다',
'systemSetting.collection.processorFrozen': '가공업자는 이미 동결되었다',
'systemSetting.collection.doorFrozen': '이 문호는 이미 동결되었다',
'systemSetting.collection.shopFrozen': '이 점포는 이미 동결되었다',
'systemSetting.collection.satisfaction': '만족도',
// 消息中心
'systemSetting.message.systemMessage': '시스템 메시지',
'systemSetting.message.plaformMessage': '플랫폼 메시지',
'systemSetting.message.total': '모두',
'systemSetting.message.numble': '가늘고 긴 것',
'systemSetting.message.messageList': '메시지 목록',
'systemSetting.message.allRead': '모두 읽음',
// 参数配置
'systemSetting.parameterSetting.DoNotConfigureRepeatPeriods': '반복 기간을 구성하지 마십시오.',
'systemSetting.parameterSetting.type': '타입',
'systemSetting.parameterSetting.all': '모조리',
'systemSetting.parameterSetting.commodityRelated': '상품 관련',
'systemSetting.parameterSetting.orderRelated': '주문 관련',
'systemSetting.parameterSetting.setApplicableMall': '적용 상점 설정',
'systemSetting.parameterSetting.ApplicableMall': '적용 상점',
'systemSetting.parameterSetting.DaysOfReceipt': '납품 일수',
'systemSetting.parameterSetting.orderTime': '예약 기간(일)',
'systemSetting.parameterSetting.add': '덧붙이다',
// 秘钥管理
'systemSetting.key.decryptionKey': '암호 해독 키',
'systemSetting.key.copyKey': '키 복사',
'systemSetting.key.resettingKey': '만료 후 시스템은 자동으로 복호화 키를 재설정합니다',
'systemSetting.key.keyUsefulTime': '현재 암호화 키 유효 시간',
// 收藏管理
'systemSetting.collection.itemTakenOffShelf': '이 상품은 이미 진열대에서 내렸다',
'systemSetting.collection.buyAgain': '재구매',
'systemSetting.collection.redeemNow': '즉시 교환',
'systemSetting.collection.InquiryNow': '즉시 가격 문의',
'systemSetting.collection.integral': '적분',
'systemSetting.collection.onlineInquiry': '온라인 문의',
'systemSetting.collection.cancelCollection': '모음을 취소하시겠습니까?',
'systemSetting.collection.collection': '수장하다',
'systemSetting.collection.commodityCollection': '상품 수집',
'systemSetting.collection.shopCollection': '가게',
'systemSetting.collection.newsCollection': '정보 수집',
'systemSetting.collection.doorCollection': '포털 컬렉션',
'systemSetting.collection.logisticsCollection': '물류상 수집',
'systemSetting.collection.processorCollection': '가공상 소장품',
'systemSetting.collection.articleTakenOffShelf': '이 문장은 이미 결말이 났다',
'systemSetting.collection.logisticsProvidersFrozen': '물류상은 이미 동결되었다',
'systemSetting.collection.processorFrozen': '가공업자는 이미 동결되었다',
'systemSetting.collection.doorFrozen': '이 문호는 이미 동결되었다',
'systemSetting.collection.shopFrozen': '이 점포는 이미 동결되었다',
'systemSetting.collection.satisfaction': '만족도',
// 消息中心
'systemSetting.message.systemMessage': '시스템 메시지',
'systemSetting.message.plaformMessage': '플랫폼 메시지',
'systemSetting.message.total': '모두',
'systemSetting.message.numble': '가늘고 긴 것',
'systemSetting.message.messageList': '메시지 목록',
'systemSetting.message.allRead': '모두 읽음',
// 参数配置
'systemSetting.parameterSetting.DoNotConfigureRepeatPeriods': '반복 기간을 구성하지 마십시오.',
'systemSetting.parameterSetting.type': '타입',
'systemSetting.parameterSetting.all': '모조리',
'systemSetting.parameterSetting.commodityRelated': '상품 관련',
'systemSetting.parameterSetting.orderRelated': '주문 관련',
'systemSetting.parameterSetting.setApplicableMall': '적용 상점 설정',
'systemSetting.parameterSetting.ApplicableMall': '적용 상점',
'systemSetting.parameterSetting.DaysOfReceipt': '납품 일수',
'systemSetting.parameterSetting.orderTime': '예약 기간(일)',
'systemSetting.parameterSetting.add': '덧붙이다',
// 漏
"systemSetting.year": '년',
"systemSetting.priceQuxian": '상품 가격 곡선',
"systemSetting.zidongshouhuo": '자동 수령 확인',
"systemSetting.DeliveryAppointmentDuration": '배송 예약 시간',
"systemSetting.DeliveryTimePeriod": '배송 기간',
"systemSetting.pleaseChoosePeriod": '기간을 선택하십시오.',
"systemSetting.priceLineCommodity": '상품의 가격 곡선을 표시할 수 있습니다.마우스를 가격 표시줄로 이동할 때 현재 규격 상품의 역사적 가격 변화를 표시합니다.',
"systemSetting.autoReceiveOrder": '자동 수령 확인을 활성화합니다.배송 후 수령 일수를 초과한 후 수령을 확인하지 않으면 시스템은 기본적으로 수령합니다.',
"systemSetting.forcastTimeOrder": '배송 예약 기간이 활성화됩니다.주문 가능 시간 후 예약 시간(일수) 내 배송.',
"systemSetting.expressTimeOrder": '배송 기간을 활성화합니다.배송 기간을 선택할 수 있습니다.'
}
\ No newline at end of file
// 漏
"systemSetting.year": '년',
"systemSetting.priceQuxian": '상품 가격 곡선',
"systemSetting.zidongshouhuo": '자동 수령 확인',
"systemSetting.DeliveryAppointmentDuration": '배송 예약 시간',
"systemSetting.DeliveryTimePeriod": '배송 기간',
"systemSetting.pleaseChoosePeriod": '기간을 선택하십시오.',
"systemSetting.priceLineCommodity": '상품의 가격 곡선을 표시할 수 있습니다.마우스를 가격 표시줄로 이동할 때 현재 규격 상품의 역사적 가격 변화를 표시합니다.',
"systemSetting.autoReceiveOrder": '자동 수령 확인을 활성화합니다.배송 후 수령 일수를 초과한 후 수령을 확인하지 않으면 시스템은 기본적으로 수령합니다.',
"systemSetting.forcastTimeOrder": '배송 예약 기간이 활성화됩니다.주문 가능 시간 후 예약 시간(일수) 내 배송.',
"systemSetting.expressTimeOrder": '배송 기간을 활성화합니다.배송 기간을 선택할 수 있습니다.',
'systemSetting.jifenxiangguan': '포인트 관련',
'systemSetting.yunfeixiangguan': '운송비 관련',
'systemSetting.shezhicanshu': '매개변수 설정',
'systemSetting.jifendikoudingdanjine': '포인트 공제 주문 금액',
'systemSetting.qiyongjifendikoudingdan': `포인트 공제 주문 금액을 사용할 수 있습니다. 주문 시 설정된 포인트 차감 주문 금액을 사용할 수 있습니다.`,
'systemSetting.qingxuanzeshijianduan': '기간을 선택하십시오.',
'systemSetting.shezhixiadanshijifenke': '기간을 선택하십시오.',
'systemSetting.dangedingdanyunxushiyong': '단일 주문에 사용할 수 있는 포인트 상한',
'systemSetting.qingshurudangedingdanyun': '단일 주문에 사용할 수 있는 포인트 한도를 입력하십시오.',
'systemSetting.jifenshangxianzhengshuxingbi': '단일 주문에 사용할 수 있는 포인트 한도를 입력하십시오.',
'systemSetting.qingshurujifendikoujin': '단일 주문에 사용할 수 있는 포인트 한도를 입력하십시오.',
'systemSetting.jifendikoujinebili': '적분 공제 금액 비율 정수형은 0보다 커야 합니다.',
'systemSetting.jifendikoujinebili1': '적분 공제 금액 비율',
'systemSetting.jifendikou': '적분 공제 가능: ₩ 1.00 원',
'systemSetting.manebaoyou': '만액 패키지',
'systemSetting.shezhidingdanmanduoshaojin': '운송비 없이 주문한 금액의 금액 설정',
'systemSetting.qiyongmanebaoyouke': `전체 팩을 사용할 수 있습니다. 주문 시 설정된 주문 금액에 도달하면 배송료가 무료입니다.`,
'systemSetting.dingdanjineman': '주문 금액이 가득 차다.',
'systemSetting.yuanmianyunfei': '원 무료 운송비.',
'systemSetting.qingshurudingdanjineman': '주문 금액이 꽉 차게 입력하십시오.',
'systemSetting.dingdanjinemanbixuda': '주문 금액 가득 참은 0보다 커야 하며 소수점 이하 2자리까지 유지해야 합니다.',
}
......@@ -12,6 +12,7 @@ import editor from './zh-CN/editor'
import authConfig from './zh-CN/system/authConfig'
import systemSetting from './zh-CN/system/systemSetting'
import accountSetting from './zh-CN/system/accountSetting'
import portalSystem from './zh-CN/system/portalSystem'
import activityPage from './zh-CN/marketingAbility/activityPage'
import merchantCoupon from './zh-CN/marketingAbility/merchantCoupon'
import paltformSign from './zh-CN/marketingAbility/paltformSign'
......@@ -56,6 +57,7 @@ export default {
...authConfig,
...systemSetting,
...accountSetting,
...portalSystem,
...activityPage,
...merchantCoupon,
...paltformSign,
......
export default {
'portalSystem.mendiandaima': '门店代码',
'portalSystem.mendianmingcheng': '门店名称',
'portalSystem.mendiandizhi': '门店地址',
'portalSystem.youbian': '邮编',
'portalSystem.suoshujigou': '所属机构',
'portalSystem.lianxiren': '联系人',
'portalSystem.lianxidianhua': '联系电话',
'portalSystem.zhuangtai': '状态',
'portalSystem.caozuo': '操作',
'portalSystem.bianji': '编辑',
'portalSystem.shanchu': '删除',
'portalSystem.quedingyaoshanchuma': '确定要删除吗?',
'portalSystem.shi': '是',
'portalSystem.fou': '否',
'portalSystem.chaxun': '查询',
'portalSystem.menhuguanlixiangqing': '门户管理详情',
'portalSystem.jibenxinxi': '基本信息',
'portalSystem.mendianLOGO': '门店LOGO',
'portalSystem.lianxixinxi': '联系信息',
'portalSystem.xiangxidizhi': '详细地址',
'portalSystem.lianxirenxingming': '联系人姓名',
'portalSystem.youxiang': '邮箱',
'portalSystem.zhiwei': '职位',
'portalSystem.suoshuzuzhijigou': '所属组织机构',
'portalSystem.shouhuodizhi': '收货地址',
'portalSystem.fahuozitidizhi': '发货(自提)地址',
'portalSystem.morendizhi': '默认地址',
'portalSystem.bianjimendian': '编辑门店',
'portalSystem.xinzengmendian': '新增门店',
'portalSystem.baocun': '保存',
'portalSystem.menhudaima': '门户代码',
'portalSystem.qingshuru': '请输入',
'portalSystem.qingshurumenhudaima': '请输入门户代码',
'portalSystem.qingshumendianmingcheng': '请输门店名称',
'portalSystem.qingxuanzeshengshiqu': '请选择省/市/区',
'portalSystem.qingtianxiexiangxidizhi': '请填写详细地址,路名、门牌号等',
'portalSystem.qingshurulianxirenxingming': '请输入联系人姓名',
'portalSystem.qingxuanzequhao': '请选择区号',
'portalSystem.qingshurushoujihaoma': '请输入手机号码',
'portalSystem.shoujihaomageshibuzheng': '手机号码格式不正确',
'portalSystem.youxianggeshibuzhengque': '邮箱格式不正确',
'portalSystem.qingshuruzhiwei': '请输入职位',
'portalSystem.qingxuanzesuoshuzuzhiji': '请选择所属组织机构',
'portalSystem.qingshuruyouxiang': '请输入邮箱',
'portalSystem.qingshuruyoubian': '请输入邮编',
'portalSystem.xuanze': '选择',
'portalSystem.xinzengdizhi': '新增地址',
'portalSystem.dianhuahaomageshibuzheng': '电话号码格式不正确',
'portalSystem.added': '新增',
'portalSystem.qiyong': '启用',
'portalSystem.tingyong': '停用',
}
export default {
// 秘钥管理
'systemSetting.key.decryptionKey': '解密密钥',
'systemSetting.key.copyKey': '复制密钥',
'systemSetting.key.resettingKey': '到期后系统将自动重置解密密钥',
'systemSetting.key.keyUsefulTime': '当前解密密钥有效时间',
// 收藏管理
'systemSetting.collection.itemTakenOffShelf': '该商品已下架',
'systemSetting.collection.buyAgain': '再次购买',
'systemSetting.collection.redeemNow': '立即兑换',
'systemSetting.collection.InquiryNow': '立即询价',
'systemSetting.collection.integral': '积分',
'systemSetting.collection.onlineInquiry': '在线询价',
'systemSetting.collection.cancelCollection': '是否要取消收藏?',
'systemSetting.collection.collection': '收藏',
'systemSetting.collection.commodityCollection': '商品收藏',
'systemSetting.collection.shopCollection': '店铺收藏',
'systemSetting.collection.newsCollection': '资讯收藏',
'systemSetting.collection.doorCollection': '门户收藏',
'systemSetting.collection.logisticsCollection': '物流商收藏',
'systemSetting.collection.processorCollection': '加工商收藏',
'systemSetting.collection.articleTakenOffShelf': '该文章已下架',
'systemSetting.collection.logisticsProvidersFrozen': '物流商已被冻结',
'systemSetting.collection.processorFrozen': '加工商已被冻结',
'systemSetting.collection.doorFrozen': '该门户已被冻结',
'systemSetting.collection.shopFrozen': '该店铺已冻结',
'systemSetting.collection.satisfaction': '满意度',
// 消息中心
'systemSetting.message.systemMessage': '系统消息',
'systemSetting.message.plaformMessage': '平台消息',
'systemSetting.message.total': '共',
'systemSetting.message.numble': '条',
'systemSetting.message.messageList': '消息列表',
'systemSetting.message.allRead': '全部已读',
// 参数配置
'systemSetting.parameterSetting.DoNotConfigureRepeatPeriods': '请勿配置重复时间段',
'systemSetting.parameterSetting.type': '类型',
'systemSetting.parameterSetting.all': '全部',
'systemSetting.parameterSetting.commodityRelated': '商品相关',
'systemSetting.parameterSetting.orderRelated': '订单相关',
'systemSetting.parameterSetting.setApplicableMall': '设置适用商城',
'systemSetting.parameterSetting.ApplicableMall': '适用商城',
'systemSetting.parameterSetting.DaysOfReceipt': '收货天数',
'systemSetting.parameterSetting.orderTime': '预约时长(天)',
'systemSetting.parameterSetting.add': '添加',
// 秘钥管理
'systemSetting.key.decryptionKey': '解密密钥',
'systemSetting.key.copyKey': '复制密钥',
'systemSetting.key.resettingKey': '到期后系统将自动重置解密密钥',
'systemSetting.key.keyUsefulTime': '当前解密密钥有效时间',
// 收藏管理
'systemSetting.collection.itemTakenOffShelf': '该商品已下架',
'systemSetting.collection.buyAgain': '再次购买',
'systemSetting.collection.redeemNow': '立即兑换',
'systemSetting.collection.InquiryNow': '立即询价',
'systemSetting.collection.integral': '积分',
'systemSetting.collection.onlineInquiry': '在线询价',
'systemSetting.collection.cancelCollection': '是否要取消收藏?',
'systemSetting.collection.collection': '收藏',
'systemSetting.collection.commodityCollection': '商品收藏',
'systemSetting.collection.shopCollection': '店铺收藏',
'systemSetting.collection.newsCollection': '资讯收藏',
'systemSetting.collection.doorCollection': '门户收藏',
'systemSetting.collection.logisticsCollection': '物流商收藏',
'systemSetting.collection.processorCollection': '加工商收藏',
'systemSetting.collection.articleTakenOffShelf': '该文章已下架',
'systemSetting.collection.logisticsProvidersFrozen': '物流商已被冻结',
'systemSetting.collection.processorFrozen': '加工商已被冻结',
'systemSetting.collection.doorFrozen': '该门户已被冻结',
'systemSetting.collection.shopFrozen': '该店铺已冻结',
'systemSetting.collection.satisfaction': '满意度',
// 消息中心
'systemSetting.message.systemMessage': '系统消息',
'systemSetting.message.plaformMessage': '平台消息',
'systemSetting.message.total': '共',
'systemSetting.message.numble': '条',
'systemSetting.message.messageList': '消息列表',
'systemSetting.message.allRead': '全部已读',
// 参数配置
'systemSetting.parameterSetting.DoNotConfigureRepeatPeriods': '请勿配置重复时间段',
'systemSetting.parameterSetting.type': '类型',
'systemSetting.parameterSetting.all': '全部',
'systemSetting.parameterSetting.commodityRelated': '商品相关',
'systemSetting.parameterSetting.orderRelated': '订单相关',
'systemSetting.parameterSetting.setApplicableMall': '设置适用商城',
'systemSetting.parameterSetting.ApplicableMall': '适用商城',
'systemSetting.parameterSetting.DaysOfReceipt': '收货天数',
'systemSetting.parameterSetting.orderTime': '预约时长(天)',
'systemSetting.parameterSetting.add': '添加',
// 漏
"systemSetting.year": "年",
"systemSetting.priceQuxian": "商品价格曲线",
"systemSetting.zidongshouhuo": "自动确认收货",
"systemSetting.DeliveryAppointmentDuration": "送货预约时长",
"systemSetting.DeliveryTimePeriod": "配送时间段",
"systemSetting.pleaseChoosePeriod": "请选择时间段",
"systemSetting.priceLineCommodity": "启用显示商品价格曲线。鼠标移到价格一栏时,显示当前规格商品的历史价格变化。",
"systemSetting.autoReceiveOrder": "启用自动确认收货。当发货后超过收货天数后未确认收货,系统默认收货。",
"systemSetting.forcastTimeOrder": "启用送货预约时长。可预约下单时间后可预约时长(天数)内送货。",
"systemSetting.expressTimeOrder": "启用配送时间段。可选择配送时间段内的时间。"
}
\ No newline at end of file
// 漏
'systemSetting.year': '年',
'systemSetting.priceQuxian': '商品价格曲线',
'systemSetting.zidongshouhuo': '自动确认收货',
'systemSetting.DeliveryAppointmentDuration': '送货预约时长',
'systemSetting.DeliveryTimePeriod': '配送时间段',
'systemSetting.pleaseChoosePeriod': '请选择时间段',
'systemSetting.priceLineCommodity': '启用显示商品价格曲线。鼠标移到价格一栏时,显示当前规格商品的历史价格变化。',
'systemSetting.autoReceiveOrder': '启用自动确认收货。当发货后超过收货天数后未确认收货,系统默认收货。',
'systemSetting.forcastTimeOrder': '启用送货预约时长。可预约下单时间后可预约时长(天数)内送货。',
'systemSetting.expressTimeOrder': '启用配送时间段。可选择配送时间段内的时间。',
'systemSetting.jifenxiangguan': '积分相关',
'systemSetting.yunfeixiangguan': '运费相关',
'systemSetting.shezhicanshu': '设置参数',
'systemSetting.jifendikoudingdanjine': '积分抵扣订单金额',
'systemSetting.qiyongjifendikoudingdan': '启用积分抵扣订单金额。可在下单时使用设置的积分抵扣订单金额。',
'systemSetting.qingxuanzeshijianduan': '请选择时间段',
'systemSetting.shezhixiadanshijifenke': '设置下单时积分可抵扣的订单金额',
'systemSetting.dangedingdanyunxushiyong': '单个订单允许使用积分上限',
'systemSetting.qingshurudangedingdanyun': '请输入单个订单允许使用积分上限',
'systemSetting.jifenshangxianzhengshuxingbi': '积分上限整数型必须大于0',
'systemSetting.qingshurujifendikoujin': '请输入积分抵扣金额比例',
'systemSetting.jifendikoujinebili': '积分抵扣金额比例整数型必须大于0',
'systemSetting.jifendikoujinebili1': '积分抵扣金额比例',
'systemSetting.jifendikou': '积分可抵扣: ¥1.00元',
'systemSetting.manebaoyou': '满额包邮',
'systemSetting.shezhidingdanmanduoshaojin': '设置订单满多少金额免运费',
'systemSetting.qiyongmanebaoyouke': '启用满额包邮。可在下单时达到设置的订单金额后免运费',
'systemSetting.dingdanjineman': '订单金额满',
'systemSetting.yuanmianyunfei': '元免运费',
'systemSetting.qingshurudingdanjineman': '请输入订单金额满',
'systemSetting.dingdanjinemanbixuda': '订单金额满必须大于0,最多保留2位小数',
}
import React, { Fragment, useEffect, useState } from 'react';
import { Button, Form, message } from 'antd';
import { history, Prompt } from 'umi';
import { history, Prompt, getIntl } from 'umi';
import PeripheralLayout from '@/pages/transaction/components/detailLayout';
import BasicLayout from './components/basicLayout';
import ContactLayout from './components/contactLayout';
......@@ -8,6 +8,8 @@ import AddressLayout, { ADDED_DELIVERY, ADDED_DISPATCH, addressList } from './co
import { getMemberStoreDetail, postMemberStoreAdd, postMemberStoreUpdate } from '@/services/MemberV2Api';
import { isEmpty } from 'lodash';
const intl = getIntl()
export const layout: any = {
colon: false,
labelCol: { style: { width: "144px" } },
......@@ -80,10 +82,10 @@ export type sunmitVal = {
}
export const Tablink = [
{ id: 'basicLayout', title: '基本信息' },
{ id: 'contactLayout', title: '联系信息' },
{ id: 'address1', title: '收货地址' },
{ id: 'address2', title: '发货(自提)地址' },
{ id: 'basicLayout', title: intl.formatMessage({ id: 'portalSystem.jibenxinxi', defaultMessage: '基本信息' }) },
{ id: 'contactLayout', title: intl.formatMessage({ id: 'portalSystem.lianxixinxi', defaultMessage: '联系信息' }) },
{ id: 'address1', title: intl.formatMessage({ id: 'portalSystem.shouhuodizhi', defaultMessage: '收货地址' }) },
{ id: 'address2', title: intl.formatMessage({ id: 'portalSystem.fahuozitidizhi', defaultMessage: '发货(自提)地址' }) },
]
export const Context = React.createContext<sunmitVal & addressInfo>(null);
......@@ -167,10 +169,10 @@ const PortalSystemAdded = (props) => {
return (
<Context.Provider value={dataSource}>
<PeripheralLayout
detail='新增门户'
detail={path === 'edit' ? intl.formatMessage({ id: 'portalSystem.bianjimendian', defaultMessage: '编辑门店' }) : intl.formatMessage({ id: 'portalSystem.xinzengmendian', defaultMessage: '新增门店' })}
tabLink={Tablink}
hideBreak
effect={<Button type='primary' loading={loading} onClick={() => handleSubmit()}>保存</Button>}
effect={<Button type='primary' loading={loading} onClick={() => handleSubmit()}>{intl.formatMessage({ id: 'portalSystem.baocun', defaultMessage: '保存' })}</Button>}
components={
<Form
{...layout}
......@@ -183,8 +185,8 @@ const PortalSystemAdded = (props) => {
>
<BasicLayout form={form} />
<ContactLayout form={form} />
<AddressLayout id='address1' title='收货地址' type={ADDED_DELIVERY} onChange={handleGetAddress} />
<AddressLayout id='address2' title='发货(自提)地址' type={ADDED_DISPATCH} onChange={handleGetAddress} />
<AddressLayout id='address1' title={intl.formatMessage({ id: 'portalSystem.shouhuodizhi', defaultMessage: '收货地址' })} type={ADDED_DELIVERY} onChange={handleGetAddress} />
<AddressLayout id='address2' title={intl.formatMessage({ id: 'portalSystem.fahuozitidizhi', defaultMessage: '发货(自提)地址' })} type={ADDED_DISPATCH} onChange={handleGetAddress} />
</Form>
}
/>
......
import React, { Fragment, useContext, useEffect, useMemo, useState } from 'react';
import CardLayout from '@/pages/transaction/components/card'
import { Button, Col, Radio, Row, Drawer, Empty, Form } from 'antd';
import { Button, Col, Radio, Row, Drawer, Empty } from 'antd';
import style from './index.less';
import { DeleteOutlined, EditOutlined } from '@ant-design/icons';
import { DELIVERY_SCHEMA } from './schema/delivery';
......@@ -12,7 +12,7 @@ import { getManageAreaByPcode, GetManageAreaByPcodeRequest, getManageCountryArea
import { useFetchAreaEnumLinkageEffect } from '@/components/AddressSelect';
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import { isEmpty } from 'lodash';
import { Prompt, getIntl } from 'umi';
import { getIntl } from 'umi';
import { addressInfo, Context } from '../add';
const intl = getIntl();
......@@ -204,12 +204,16 @@ const AddressLayout: React.FC<addressProps> = (props: addressProps) => {
}), [])
);
useEffect(() => {
}, [unsaved])
return (
<Fragment>
<CardLayout
id={id}
title={title}
extra={isEmpty(addressList) ? <Button type='link' onClick={() => handleAdded()}>新增地址</Button> : null}
extra={isEmpty(addressList) ? <Button type='link' onClick={() => handleAdded()}>{intl.formatMessage({ id: 'portalSystem.xinzengdizhi', defaultMessage: '新增地址' })}</Button> : null}
>
<div className={style.addressList}>
{!isEmpty(addressList) ? (
......@@ -222,7 +226,7 @@ const AddressLayout: React.FC<addressProps> = (props: addressProps) => {
<div className={style.addressInfo}>
<div className={style.info}>
<div className={style.name}>{type === ADDED_DELIVERY ? addressList.receiverName : addressList.deliverName}&nbsp;{addressList.phone}</div>
{addressList.isDefault ? <div className={style.default}>默认地址</div> : null}
{addressList.isDefault ? <div className={style.default}>{intl.formatMessage({ id: 'portalSystem.morendizhi', defaultMessage: '默认地址' })}</div> : null}
</div>
<div className={style.address}>{handleMosaic(addressList.provinceName, addressList.cityName, addressList.districtName, addressList.address, addressList.streetName)}</div>
</div>
......@@ -277,7 +281,6 @@ const AddressLayout: React.FC<addressProps> = (props: addressProps) => {
schema={type === ADDED_DELIVERY ? DELIVERY_SCHEMA : DISPATCH_SCHEMA}
/>
</Drawer>
<Prompt when={unsaved} message={intl.formatMessage({ id: 'logistics.ninhaiyouweibao' })} />
</Fragment>
)
}
......
import React, { useContext, useEffect, useState } from 'react';
import { getIntl } from 'umi';
import { Form, Row, Col, Input, FormInstance } from 'antd';
import CardLayout from '@/pages/transaction/components/card'
import UploadImage from '@/components/UploadImage';
......@@ -9,6 +10,8 @@ interface BasicProps {
form?: FormInstance
}
const intl = getIntl();
const BasicLayout: React.FC<BasicProps> = (props: BasicProps) => {
const { form } = props;
const [logo, setLogo] = useState<string>('');
......@@ -23,19 +26,19 @@ const BasicLayout: React.FC<BasicProps> = (props: BasicProps) => {
return (
<CardLayout
id='basicLayout'
title='基本信息'
title={intl.formatMessage({ id: 'portalSystem.jibenxinxi', defaultMessage: '基本信息' })}
>
<Row gutter={[48, 24]}>
<Col span={12}>
<Form.Item label='门户代码' name='code' rules={[{ required: true, message: '请输入门户代码' }]}>
<Input placeholder='请输入' maxLength={12} />
<Form.Item label={intl.formatMessage({ id: 'portalSystem.menhudaima', defaultMessage: '门户代码' })} name='code' rules={[{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingshurumenhudaima', defaultMessage: '请输入门户代码' }) }]}>
<Input placeholder={intl.formatMessage({ id: 'portalSystem.qingshuru', defaultMessage: '请输入' })} maxLength={12} />
</Form.Item>
<Form.Item label='门店名称' name='name' rules={[{ required: true, message: '请输门店名称' }]}>
<Input placeholder='请输入' maxLength={20} />
<Form.Item label={intl.formatMessage({ id: 'portalSystem.mendianmingcheng', defaultMessage: '门店名称' })} name='name' rules={[{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingshumendianmingcheng', defaultMessage: '请输门店名称' }) }]}>
<Input placeholder={intl.formatMessage({ id: 'portalSystem.qingshuru', defaultMessage: '请输入' })} maxLength={20} />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item label='门店LOGO' name='logo' >
<Form.Item label={intl.formatMessage({ id: 'portalSystem.mendianLOGO', defaultMessage: '门店LOGO' })} name='logo' >
<UploadImage
imgUrl={logo}
fileMaxSize={50}
......
......@@ -87,23 +87,23 @@ const ContactLayout: React.FC<ContactProps> = (props) => {
>
<Row gutter={[48, 24]}>
<Col span={12}>
<Form.Item label='门店地址' name='areaSelect' rules={[{ required: true, message: '请选择省/市/区' }]}>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.mendiandizhi', defaultMessage: '门店地址' })} name='areaSelect' rules={[{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingxuanzeshengshiqu', defaultMessage: '请选择省/市/区' }) }]}>
<AreaSelect onChange={(e) => console.log(e)} />
</Form.Item>
<Form.Item label='详细地址' name='address' rules={[{ required: true, message: '请填写详细地址,路名、门牌号等' }]}>
<Input.TextArea autoSize maxLength={30} placeholder='请填写详细地址,路名、门牌号等' />
<Form.Item label={intl.formatMessage({ id: 'portalSystem.xiangxidizhi', defaultMessage: '详细地址' })} name='address' rules={[{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingtianxiexiangxidizhi', defaultMessage: '请填写详细地址,路名、门牌号等' }) }]}>
<Input.TextArea autoSize maxLength={30} placeholder={intl.formatMessage({ id: 'portalSystem.qingtianxiexiangxidizhi', defaultMessage: '请填写详细地址,路名、门牌号等' })} />
</Form.Item>
<Form.Item label='联系人姓名' name='contactName' rules={[{ required: true, message: '请输入联系人姓名' }]}>
<Input placeholder='请输入联系人姓名' maxLength={8} />
<Form.Item label={intl.formatMessage({ id: 'portalSystem.lianxirenxingming', defaultMessage: '联系人姓名' })} name='contactName' rules={[{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingshurulianxirenxingming', defaultMessage: '请输入联系人姓名' }) }]}>
<Input placeholder={intl.formatMessage({ id: 'portalSystem.qingshurulianxirenxingming', defaultMessage: '请输入联系人姓名' })} maxLength={8} />
</Form.Item>
<Form.Item label='联系电话' required>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.lianxidianhua', defaultMessage: '联系电话' })} required>
<Row gutter={16}>
<Col span={8}>
<Form.Item
name='countryCode'
rules={[{ required: true, message: '请选择区号' }]}
rules={[{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingxuanzequhao', defaultMessage: '请选择区号' }) }]}
>
<Select placeholder='请选择区号'>
<Select placeholder={intl.formatMessage({ id: 'portalSystem.qingxuanzequhao', defaultMessage: '请选择区号' })}>
{telCode.map(item => (
<Select.Option key={item} value={item}>{item}</Select.Option>
))}
......@@ -113,26 +113,26 @@ const ContactLayout: React.FC<ContactProps> = (props) => {
<Col span={16}>
<Form.Item
name='phone'
rules={[{ required: true, message: '请输入手机号码' }, { pattern: PATTERN_MAPS.phone, message: '手机号码格式不正确' }]}
rules={[{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingshurushoujihaoma', defaultMessage: '请输入手机号码' }) }, { pattern: PATTERN_MAPS.phone, message: intl.formatMessage({ id: 'portalSystem.shoujihaomageshibuzheng', defaultMessage: '手机号码格式不正确' }) }]}
>
<Input placeholder='请输入手机号码' type='number' maxLength={11} />
<Input placeholder={intl.formatMessage({ id: 'portalSystem.qingshurushoujihaoma', defaultMessage: '请输入手机号码' })} type='number' maxLength={11} />
</Form.Item>
</Col>
</Row>
</Form.Item>
</Col>
<Col span={12}>
<Form.Item label='邮箱' name='email' rules={[{ pattern: PATTERN_MAPS.email, message: '邮箱格式不正确' }]}>
<Input placeholder='请输入邮箱' />
<Form.Item label={intl.formatMessage({ id: 'portalSystem.youxiang', defaultMessage: '邮箱' })} name='email' rules={[{ pattern: PATTERN_MAPS.email, message: intl.formatMessage({ id: 'portalSystem.youxianggeshibuzhengque', defaultMessage: '邮箱格式不正确' }) }]}>
<Input placeholder={intl.formatMessage({ id: 'portalSystem.qingshuruyouxiang', defaultMessage: '请输入邮箱' })} />
</Form.Item>
<Form.Item label='邮编' name='postalCode'>
<Input placeholder='请输入邮编' maxLength={6} />
<Form.Item label={intl.formatMessage({ id: 'portalSystem.youbian', defaultMessage: '邮编' })} name='postalCode'>
<Input placeholder={intl.formatMessage({ id: 'portalSystem.qingshuruyoubian', defaultMessage: '请输入邮编' })} maxLength={6} />
</Form.Item>
<Form.Item label='职位' name='position' rules={[{ required: true, message: '请输入职位' }]}>
<Input placeholder='请输入职位' maxLength={10} />
<Form.Item label={intl.formatMessage({ id: 'portalSystem.zhiwei', defaultMessage: '职位' })} name='position' rules={[{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingshuruzhiwei', defaultMessage: '请输入职位' }) }]}>
<Input placeholder={intl.formatMessage({ id: 'portalSystem.qingshuruzhiwei', defaultMessage: '请输入职位' })} maxLength={10} />
</Form.Item>
<Form.Item label='所属组织机构' name='orgName' rules={[{ required: true, message: '请选择所属组织机构' }]}>
<Input.Search placeholder='请选择所属组织机构' readOnly enterButton={<Button style={{ backgroundColor: '#00a98f' }} type='primary' onClick={() => openOriginTree()} icon={<LinkOutlined style={{ marginRight: 4 }} />}>选择</Button>} />
<Form.Item label={intl.formatMessage({ id: 'portalSystem.suoshuzuzhijigou', defaultMessage: '所属组织机构' })} name='orgName' rules={[{ required: true, message: intl.formatMessage({ id: 'portalSystem.qingxuanzesuoshuzuzhiji', defaultMessage: '请选择所属组织机构' }) }]}>
<Input.Search placeholder={intl.formatMessage({ id: 'portalSystem.qingxuanzesuoshuzuzhiji', defaultMessage: '请选择所属组织机构' })} readOnly enterButton={<Button style={{ backgroundColor: '#00a98f' }} type='primary' onClick={() => openOriginTree()} icon={<LinkOutlined style={{ marginRight: 4 }} />}>{intl.formatMessage({ id: 'portalSystem.xuanze', defaultMessage: '选择' })}</Button>} />
</Form.Item>
<Form.Item hidden label='所属组织机构' name='orgId' rules={[{ required: true, message: '请选择所属组织机构' }]}>
<Input />
......
......@@ -35,7 +35,7 @@ export const DELIVERY_SCHEMA: ISchema = {
"x-rules": [
{
required: true,
message: '请选择省/市/区',
message: intl.formatMessage({ id: 'portalSystem.qingxuanzeshengshiqu', defaultMessage: '请选择省/市/区' }),
},
],
"x-component": "AddressSelect"
......@@ -126,7 +126,7 @@ export const DELIVERY_SCHEMA: ISchema = {
'x-rules': [
{
pattern: PATTERN_MAPS.tel,
message: '电话号码格式不正确',
message: intl.formatMessage({ id: 'portalSystem.dianhuahaomageshibuzheng', defaultMessage: '电话号码格式不正确' }),
},
],
},
......
......@@ -36,7 +36,7 @@ export const DISPATCH_SCHEMA: ISchema = {
"x-rules": [
{
required: true,
message: '请选择省/市/区',
message: intl.formatMessage({ id: 'portalSystem.qingxuanzeshengshiqu', defaultMessage: '请选择省/市/区' }),
},
],
"x-component": "AddressSelect"
......@@ -126,7 +126,7 @@ export const DISPATCH_SCHEMA: ISchema = {
'x-rules': [
{
pattern: PATTERN_MAPS.tel,
message: '电话号码格式不正确',
message: intl.formatMessage({ id: 'portalSystem.dianhuahaomageshibuzheng', defaultMessage: '电话号码格式不正确' }),
},
],
},
......
import React, { Fragment, useEffect, useState } from 'react';
import { Col, Form, message, Radio, Row, Skeleton } from 'antd';
import { history } from 'umi';
import { history, getIntl } from 'umi';
import PeripheralLayout from '@/pages/transaction/components/detailLayout';
import { getMemberOrgTree, getMemberStoreDetail } from '@/services/MemberV2Api';
import { addressInfo, layout, sunmitVal, Tablink } from './add';
......@@ -10,6 +10,8 @@ import { isEmpty } from 'lodash';
import { getParentTreeTitles } from '@/utils';
import style from './components/index.less';
const intl = getIntl();
const ProtalSystemDetail: React.FC<{}> = (props: any) => {
const {
query: {
......@@ -58,7 +60,7 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
return (
<PeripheralLayout
detail='门户管理详情'
detail={intl.formatMessage({ id: 'portalSystem.menhuguanlixiangqing', defaultMessage: '门户管理详情' })}
tabLink={Tablink}
hideBreak
components={
......@@ -67,19 +69,19 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
<Form {...layout}>
<CardLayout
id='basicLayout'
title='基本信息'
title={intl.formatMessage({ id: 'portalSystem.jibenxinxi', defaultMessage: '基本信息' })}
>
<Row gutter={[48, 24]}>
<Col span={12}>
<Form.Item label='门户代码' name='code'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.mendiandaima', defaultMessage: '门店代码' })} name='code'>
<span>{dataSource?.code}</span>
</Form.Item>
<Form.Item label='门店名称' name='name'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.mendianmingcheng', defaultMessage: '门店名称' })} name='name'>
<span>{dataSource?.name}</span>
</Form.Item>
</Col>
<Col span={12}>
<Form.Item label='门店LOGO' name='logo' >
<Form.Item label={intl.formatMessage({ id: 'portalSystem.mendianLOGO', defaultMessage: '门店LOGO' })} name='logo' >
<UploadImage
disabled
imgUrl={dataSource?.logo}
......@@ -92,34 +94,34 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
</CardLayout>
<CardLayout
id='contactLayout'
title='联系信息'
title={intl.formatMessage({ id: 'portalSystem.lianxixinxi', defaultMessage: '联系信息' })}
>
<Row gutter={[48, 24]}>
<Col span={12}>
<Form.Item label='门店地址' name='areaSelect'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.mendiandizhi', defaultMessage: '门店地址' })} name='areaSelect'>
<span>{dataSource?.provinceName}-{dataSource?.cityName}-{dataSource?.districtName}{`${dataSource?.streetName ? ('-' + dataSource?.streetName) : null}`}</span>
</Form.Item>
<Form.Item label='详细地址' name='address'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.xiangxidizhi', defaultMessage: '详细地址' })} name='address'>
<span>{dataSource?.address}</span>
</Form.Item>
<Form.Item label='联系人姓名' name='contactName'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.lianxirenxingming', defaultMessage: '联系人姓名' })} name='contactName'>
<span>{dataSource?.contactName}</span>
</Form.Item>
<Form.Item label='联系电话'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.lianxidianhua', defaultMessage: '联系电话' })}>
<span>+{dataSource?.countryCode}&nbsp;{dataSource?.phone}</span>
</Form.Item>
</Col>
<Col span={12}>
<Form.Item label='邮箱' name='email'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.youxiang', defaultMessage: '邮箱' })} name='email'>
<span>{dataSource?.email}</span>
</Form.Item>
<Form.Item label='邮编' name='postalCode'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.youbian', defaultMessage: '邮编' })} name='postalCode'>
<span>{dataSource?.postalCode}</span>
</Form.Item>
<Form.Item label='职位' name='position'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.zhiwei', defaultMessage: '职位' })} name='position'>
<span>{dataSource?.position}</span>
</Form.Item>
<Form.Item label='所属组织机构' name='orgName'>
<Form.Item label={intl.formatMessage({ id: 'portalSystem.suoshuzuzhijigou', defaultMessage: '所属组织机构' })} name='orgName'>
<span>{dataSource?.org.title}</span>
</Form.Item>
</Col>
......@@ -128,7 +130,7 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
</CardLayout>
<CardLayout
id='address1'
title='收货地址'
title={intl.formatMessage({ id: 'portalSystem.shouhuodizhi', defaultMessage: '收货地址' })}
>
<div className={style.addressList}>
<Radio.Group style={{ display: 'block' }}>
......@@ -139,7 +141,7 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
<div className={style.addressInfo}>
<div className={style.info}>
<div className={style.name}>{dataSource?.receiveAddress?.receiverName}&nbsp;{dataSource?.receiveAddress?.phone}</div>
{dataSource?.receiveAddress?.isDefault ? <div className={style.default}>默认地址</div> : null}
{dataSource?.receiveAddress?.isDefault ? <div className={style.default}>{intl.formatMessage({ id: 'portalSystem.morendizhi', defaultMessage: '默认地址' })}</div> : null}
</div>
<div className={style.address}>{handleMosaic(dataSource?.receiveAddress?.provinceName, dataSource?.receiveAddress?.cityName, dataSource?.receiveAddress?.districtName, dataSource?.receiveAddress?.address, dataSource?.receiveAddress?.streetName)}</div>
</div>
......@@ -152,7 +154,7 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
</CardLayout>
<CardLayout
id='address2'
title='发货(自提)地址'
title={intl.formatMessage({ id: 'portalSystem.fahuozitidizhi', defaultMessage: '发货(自提)地址' })}
>
<div className={style.addressList}>
<Radio.Group style={{ display: 'block' }}>
......@@ -163,7 +165,7 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
<div className={style.addressInfo}>
<div className={style.info}>
<div className={style.name}>{dataSource?.deliverAddress?.deliverName}&nbsp;{dataSource?.deliverAddress?.phone}</div>
{dataSource?.deliverAddress?.isDefault ? <div className={style.default}>默认地址</div> : null}
{dataSource?.deliverAddress?.isDefault ? <div className={style.default}>{intl.formatMessage({ id: 'portalSystem.morendizhi', defaultMessage: '默认地址' })}</div> : null}
</div>
<div className={style.address}>{handleMosaic(dataSource?.deliverAddress?.provinceName, dataSource?.deliverAddress?.cityName, dataSource?.deliverAddress?.districtName, dataSource?.deliverAddress?.address, dataSource?.deliverAddress?.streetName)}</div>
</div>
......
import React, { Fragment, useRef, useState } from 'react';
import { history } from 'umi';
import { history, getIntl } from 'umi';
import { Button, Row, Col, Space, Popconfirm, Switch } from 'antd';
import TableLayout from '@/components/TableLayout';
import { FORM_FILTER_PATH } from '@/formSchema/const';
......@@ -9,6 +9,8 @@ import { PlusOutlined } from '@ant-design/icons';
import { getMemberStorePage, postMemberStoreDelete, postMemberStoreEnable } from '@/services/MemberV2Api/id13430';
import StatusSwitch from '@/components/StatusSwitch';
const intl = getIntl()
const PortalSystem = () => {
const tableRef = useRef<any>({});
const [confirmLoading, setConfirmLoading] = useState<boolean>(false)
......@@ -33,59 +35,59 @@ const PortalSystem = () => {
const columns: ColumnType<any>[] = [
{
title: '门店代码',
title: intl.formatMessage({ id: 'portalSystem.mendiandaima', defaultMessage: '门店代码' }),
key: 'code',
dataIndex: 'code',
},
{
title: '门店名称',
title: intl.formatMessage({ id: 'portalSystem.mendianmingcheng', defaultMessage: '门店名称' }),
key: 'name',
dataIndex: 'name',
render: (text, record) => <EyePreview url={`/memberCenter/systemSetting/authConfig/portalSystem/detail?id=${record.id}`}>{text}</EyePreview>
},
{
title: '门店地址',
title: intl.formatMessage({ id: 'portalSystem.mendiandizhi', defaultMessage: '门店地址' }),
key: 'fullAddress',
dataIndex: 'fullAddress',
},
{
title: '邮编',
title: intl.formatMessage({ id: 'portalSystem.youbian', defaultMessage: '邮编' }),
key: 'postalCode',
dataIndex: 'postalCode',
},
{
title: '所属机构',
title: intl.formatMessage({ id: 'portalSystem.suoshujigou', defaultMessage: '所属机构' }),
key: 'orgName',
dataIndex: 'orgName',
},
{
title: '联系人',
title: intl.formatMessage({ id: 'portalSystem.lianxiren', defaultMessage: '联系人' }),
key: 'contactName',
dataIndex: 'contactName',
},
{
title: '联系电话',
title: intl.formatMessage({ id: 'portalSystem.lianxidianhua', defaultMessage: '联系电话' }),
key: 'phone',
dataIndex: 'phone',
render: (text, record) => <>+{record.countryCode}&nbsp;{text}</>
},
{
title: '状态',
title: intl.formatMessage({ id: 'portalSystem.zhuangtai', defaultMessage: '状态' }),
key: 'status',
dataIndex: 'status',
render: (_text, record) => <StatusSwitch handleConfirm={() => handleStatus(record)} record={record}/>
},
{
title: '操作',
title: intl.formatMessage({ id: 'portalSystem.caozuo', defaultMessage: '操作' }),
key: 'operate',
dataIndex: 'operate',
render: (_text, record) => (
<Fragment>
{record.showUpdate && <Button type='link' onClick={() => history.push(`/memberCenter/systemSetting/authConfig/portalSystem/edit?id=${record.id}`)}>编辑</Button>}
{record.showUpdate && <Button type='link' onClick={() => history.push(`/memberCenter/systemSetting/authConfig/portalSystem/edit?id=${record.id}`)}>{intl.formatMessage({ id: 'portalSystem.bianji', defaultMessage: '编辑' })}</Button>}
{record.showDelete && (
<Popconfirm title="确定要删除吗?" okText="是" cancelText="否" onConfirm={() => _delete(record)} okButtonProps={{ loading: confirmLoading }}>
<Popconfirm title={intl.formatMessage({ id: 'portalSystem.quedingyaoshanchuma', defaultMessage: '确定要删除吗?' })} okText={intl.formatMessage({ id: 'portalSystem.shi', defaultMessage: '是' })} cancelText={intl.formatMessage({ id: 'portalSystem.fou', defaultMessage: '否' })} onConfirm={() => _delete(record)} okButtonProps={{ loading: confirmLoading }}>
<Button type='link'>
删除
{intl.formatMessage({ id: 'portalSystem.shanchu', defaultMessage: '删除' })}
</Button>
</Popconfirm>
)}
......@@ -118,7 +120,7 @@ const PortalSystem = () => {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '门户名称',
placeholder: intl.formatMessage({ id: 'portalSystem.mendianmingcheng', defaultMessage: '门店名称' }),
},
},
}
......@@ -148,7 +150,7 @@ const PortalSystem = () => {
contactName: {
type: 'string',
'x-component-props': {
placeholder: '联系人',
placeholder: intl.formatMessage({ id: 'portalSystem.lianxiren', defaultMessage: '联系人' }),
style: {
width: 160,
},
......@@ -157,12 +159,15 @@ const PortalSystem = () => {
status: {
type: 'string',
'x-component-props': {
placeholder: '状态',
placeholder: intl.formatMessage({ id: 'portalSystem.zhuangtai', defaultMessage: '状态' }),
style: {
width: 160,
},
},
enum: [],
enum: [
{label: intl.formatMessage({id: 'portalSystem.qiyong', defaultMessage: '启用'}), value: 1},
{label: intl.formatMessage({id: 'portalSystem.tingyong', defaultMessage: '停用'}), value: 0},
],
},
}
},
......@@ -172,7 +177,7 @@ const PortalSystem = () => {
span: 1
},
"x-component-props": {
children: "查询"
children: intl.formatMessage({ id: 'portalSystem.chaxun', defaultMessage: '查询' })
}
}
}
......@@ -188,7 +193,7 @@ const PortalSystem = () => {
icon={<PlusOutlined />}
onClick={() => history.push(`/memberCenter/systemSetting/authConfig/portalSystem/add`)}
>
新增
{intl.formatMessage({id: 'portalSystem.added', defaultMessage: '新增'})}
</Button>
</Space>
</Col>
......
......@@ -53,16 +53,16 @@ export const configSourceData: IConfigSource[] = [
},
{
id: 5,
title: '积分抵扣订单金额',
description: '设置下单时积分可抵扣的订单金额。',
title: intl.formatMessage({ id: 'systemSetting.jifendikoudingdanjine', defaultMessage: '积分抵扣订单金额' }),
description: intl.formatMessage({ id: 'systemSetting.shezhixiadanshijifenke', defaultMessage: '设置下单时积分可抵扣的订单金额。' }),
icon: integral_icon,
type: 'integral',
isSettting: false
},
{
id: 6,
title: '满额包邮',
description: '设置订单满多少金额免运费',
title: intl.formatMessage({ id: 'systemSetting.manebaoyou', defaultMessage: '满额包邮' }),
description: intl.formatMessage({ id: 'systemSetting.shezhidingdanmanduoshaojin', defaultMessage: '设置订单满多少金额免运费' }),
icon: logistics_icon,
type: 'logistics',
isSettting: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment