解决合并冲突

.env.dev

@@ -2,7 +2,7 @@
 NODE_ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
-VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+#VUE_APP_BASE_API = 'https://apitest.groupage.cn'
+VUE_APP_BASE_API = 'http://apitest.groupage.cn'
 
-VUE_APP_HOME_API = 'https://www.groupage.cn'
\ No newline at end of file
+VUE_APP_HOME_API = 'https://apitest.groupage.cn'

.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 NODE_ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
-VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+#VUE_APP_BASE_API = 'https://apitest.groupage.cn'
+VUE_APP_BASE_API = 'http://apitest.groupage.cn'
 
-VUE_APP_HOME_API = 'https://www.groupage.cn'
+VUE_APP_HOME_API = 'https://apitest.groupage.cn'

src/api/data.js

@@ -135,3 +135,11 @@ export function checkKycStatus(query) {
     params: query
   })
 }
+// 获取城市
+export function getCityData(query) {
+  return request({
+    url: '/app-api/ecw/region/get',
+    method: 'get',
+    params: query
+  })
+}

src/lang/en.js

@@ -570,58 +570,80 @@ export default {
     view: "view",
   },
   orderdetail: {
-    orderNo: "orderNo",
-    deliveryDate: "deliveryDate",
-    transport: "transportation",
-    channel: "Delivery channels",
-    startTitle: "Original warehouse",
-    destTitle: "Destination warehouse",
-    startAddress: "startAddress",
-    consignorName: "consignorName",
-    consignorCompany: "consignorCompany",
-    consignorNameEn: "English consignorName",
-    consignorCompanyEn: "English consignorCompany",
-    consignorPhone: "consignorPhone",
-    consignorEmail: "consignorEmail",
-    consigneeName: "consigneeName",
-    consigneeCompany: "consigneeCompany",
-    consigneeNameEn: "English consigneeName",
-    consigneeCompanyEn: " English consigneeCompany",
-    consigneeEmail: "consigneeEmail",
-    consigneePhone: "consigneePhone",
-    marks: "marks",
-    isCargoControl: "Is cargo on hold",
-    baseInfo: "baseInfo",
-    transportInfo: "transportInfo",
-    costVO: "orderInfo",
-    box: "CTNS",
-    is: "yes",
-    no: "no",
-    warehouseNum: "warehouseNum",
-    entry: "receipt data ",
-    warehouseType: "warehouseType",
-    customsType: "Customs declaration",
-    isCollection: "collection",
-    activeFirst: "Details of the goods",
-    activeSecond: "Order status",
-    activeThree: "Packing list",
-    prodTitleZh: "Chinese item name",
-    prodTitleEn: "English item name",
-    brand: "brand",
-    num: "num",
-    sumNum: "sumNum",
-    unit: "unit",
-    worth: "worth",
-    material: "material",
-    volume: "volume(m3)",
-    weight: "weight(kg)",
-    noData: "noData",
-    notOrderData: "notOrderData",
-    showWarehouseReceipt: "showWarehouseReceipt",
-    showLadingBill: "showLadingBill",
-    hiddenText: "Show",
-    showText: "Hide",
-    transInfo: "Transportation information",
+    orderNo: 'orderNo',
+    deliveryDate: 'deliveryDate',
+    transport: 'transportation',
+    channel: 'Delivery channels',
+    startTitle: 'Original warehouse',
+    destTitle: 'Destination warehouse',
+    startAddress: 'startAddress',
+    consignorName: 'consignorName',
+    consignorCompany: 'consignorCompany',
+    consignorNameEn: 'English consignorName',
+    consignorCompanyEn: 'English consignorCompany',
+    consignorPhone: 'consignorPhone',
+    consignorEmail: 'consignorEmail',
+    consigneeName: 'consigneeName',
+    consigneeCompany: 'consigneeCompany',
+    consigneeNameEn: 'English consigneeName',
+    consigneeCompanyEn: ' English consigneeCompany',
+    consigneeEmail: 'consigneeEmail',
+    consigneePhone: 'consigneePhone',
+    marks: 'marks',
+    isCargoControl: 'Is cargo on hold',
+    baseInfo: 'baseInfo',
+    transportInfo: 'transportInfo',
+    costVO: 'orderInfo',
+    box: 'CTNS',
+    is: 'yes',
+    no: 'no',
+    warehouseNum: 'warehouseNum',
+    entry: 'receipt data ',
+    warehouseType: 'warehouseType',
+    customsType: 'Customs declaration',
+    isCollection: 'collection',
+    activeFirst: 'Details of the goods',
+    activeSecond: 'Order status',
+    activeThree: 'Packing list',
+    prodTitleZh: 'Chinese item name',
+    prodTitleEn: 'English item name',
+    brand: 'brand',
+    num: 'num',
+    sumNum: 'sumNum',
+    unit: 'unit',
+    worth: 'worth',
+    material: 'material',
+    volume: 'volume(m3)',
+    weight: 'weight(kg)',
+    noData: 'noData',
+    notOrderData: 'notOrderData',
+    showWarehouseReceipt: 'showWarehouseReceipt',
+    showLadingBill: 'showLadingBill',
+    hiddenText: 'Show',
+    showText: 'Hide',
+    transInfo: 'Transportation information',
+    own: "selp pickup",
+    toRoom: "to door",
+    typeName:"value-added services",
+    service: "Gether transpotation",
+    oversears: "overseas cargo",
+    consignor: "consignor",
+    consignee: "consignee",
+    objectport:'Destination port customs clearance',
+    ourUndertakes:'Our company undertakes',
+    customerUndertakes:'Customer Undertaking',
+    tiedanPrice:"Does the bill of lading display the price",
+    warehouseName:"Warehouse",
+    externalWarehouse:'External warehouse',
+    estLoading:"Loading time",
+    loadingAddress:"Loading address",
+    creator:'creator',
+    customerManage:"Customer Manager",
+    prodTitle:"item name",
+    inWarehouseInfo:"Warehouse entry information",
+    packing:"packing",
+    tiandanExpressNO:"prefill express tracking number",
+    feeData:'Fee data'
   },
   customer: {
     none: "none",

src/lang/zh.js

@@ -554,58 +554,80 @@ export default {
     view: "查看",
   },
   orderdetail: {
-    orderNo: "订单编号",
-    deliveryDate: "送货时间",
-    transport: "运输方式",
-    channel: "出货渠道",
-    startTitle: "始发仓",
-    destTitle: "目的仓",
-    startAddress: "地址",
-    consignorName: "发货人",
-    consignorCompany: "发货人公司名称",
-    consignorNameEn: "发货人英文名称",
-    consignorCompanyEn: "发货人公司英文名称",
-    consignorPhone: "发货人电话",
-    consignorEmail: "发货人邮箱",
-    consigneeName: "收货人",
-    consigneeCompany: "收货人公司名称",
-    consigneeNameEn: "收货人英文名称",
-    consigneeCompanyEn: "收货人公司英文名称",
-    consigneeEmail: "收货人邮箱",
-    consigneePhone: "收货人电话",
-    marks: "唛头",
-    isCargoControl: "是否控货",
-    baseInfo: "基础信息",
-    transportInfo: "物流信息",
-    costVO: "填单信息",
-    box: "箱",
-    is: "是",
-    no: "否",
-    warehouseNum: "仓库实测",
-    entry: "收款数据",
-    warehouseType: "入仓类型",
-    customsType: "单证报关",
-    isCollection: "代收货款",
-    activeFirst: "货物详情",
-    activeSecond: "订单动态",
-    activeThree: "运单资料/提货单",
-    prodTitleZh: "中文品名",
-    prodTitleEn: "英文品名",
-    brand: "品牌",
-    num: "填单件数",
-    sumNum: "入仓件数",
-    unit: "单位",
-    worth: "货值",
-    material: "材质",
-    volume: "体积(m3)",
-    weight: "重量(kg)",
-    noData: "暂无数据",
-    notOrderData: "暂无订单动态数据",
-    showWarehouseReceipt: "查看入仓单",
-    showLadingBill: "查看提货单",
-    hiddenText: "隐藏",
-    showText: "展示",
-    transInfo: "运输信息",
+    orderNo: '订单编号',
+    deliveryDate: '送货时间',
+    transport: '运输方式',
+    channel: '出货渠道',
+    startTitle: '始发仓',
+    destTitle: '目的仓',
+    startAddress: '地址',
+    consignorName: '发货人',
+    consignorCompany: '发货人公司名称',
+    consignorNameEn: '发货人英文名称',
+    consignorCompanyEn: '发货人公司英文名称',
+    consignorPhone: '发货人电话',
+    consignorEmail: '发货人邮箱',
+    consigneeName: '收货人',
+    consigneeCompany: '收货人公司名称',
+    consigneeNameEn: '收货人英文名称',
+    consigneeCompanyEn: '收货人公司英文名称',
+    consigneeEmail: '收货人邮箱',
+    consigneePhone: '收货人电话',
+    marks: '唛头',
+    isCargoControl: '是否控货',
+    baseInfo: '基础信息',
+    transportInfo: '物流信息',
+    costVO: '填单信息',
+    box: '箱',
+    is: '是',
+    no: '否',
+    warehouseNum: '仓库实测',
+    entry: '收款数据',
+    warehouseType: '入仓类型',
+    customsType: '单证报关',
+    isCollection: '代收货款',
+    activeFirst: '货物详情',
+    activeSecond: '订单动态',
+    activeThree: '运单资料/提货单',
+    prodTitleZh: '中文品名',
+    prodTitleEn: '英文品名',
+    brand: '品牌',
+    num: '填单件数',
+    sumNum: '入仓件数',
+    unit: '单位',
+    worth: '货值',
+    material: '材质',
+    volume: '体积(m3)',
+    weight: '重量(kg)',
+    noData: '暂无数据',
+    notOrderData: '暂无订单动态数据',
+    showWarehouseReceipt: '查看入仓单',
+    showLadingBill: '查看提货单',
+    hiddenText: '隐藏',
+    showText: '展示',
+    transInfo: '运输信息',
+    own: "自提",
+    toRoom: "送货上门",
+    typeName:"增值服务",
+    service: "集运",
+    oversears: "海外仓",
+    consignor: "发货人",
+    consignee: "收货人",
+    objectport:'目的港清关',
+    ourUndertakes:'我司承接',
+    customerUndertakes:'客户承接',
+    tiedanPrice:"提单是否显示价格",
+    warehouseName:"仓库",
+    externalWarehouse:'外部仓',
+    estLoading:"装柜时间",
+    loadingAddress:"装柜地址",
+    creator:'创建人',
+    customerManage:"客户经理",
+    prodTitle:"品名",
+    inWarehouseInfo:"入仓信息",
+    packing:"包装",
+    tiandanExpressNO:"填单快递单号",
+    feeData:'收费数据'
   },
   customer: {
     none: "无",