Browse Source

解决冲突

mabaoyi 10 months ago
parent
commit
dc7a96e167
53 changed files with 1773 additions and 945 deletions
  1. 766 139
      commont/messages.js
  2. 6 1
      components/kj-flow/kj-flow.vue
  3. 45 28
      pageA/counter.vue
  4. 33 28
      pageA/productdetails.vue
  5. 23 16
      pageA/shoplist.vue
  6. 118 108
      pageA/shoptype.vue
  7. 29 17
      pageB/Senderinfor.vue
  8. 22 10
      pageB/goods.vue
  9. 32 16
      pageB/myPackage.vue
  10. 21 8
      pageB/parcel.vue
  11. 33 22
      pageB/recipientinfo.vue
  12. 1 1
      pages/cart/cart.vue
  13. 75 60
      pages/express/express.vue
  14. 57 38
      pages/index/index.vue
  15. 3 2
      pages/shopping/shopping.vue
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map
  38. 397 363
      unpackage/dist/dev/mp-weixin/common/vendor.js
  39. 2 2
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js
  40. 14 1
      unpackage/dist/dev/mp-weixin/pages/express/express.js
  41. 0 0
      unpackage/dist/dev/mp-weixin/pages/express/express.wxml
  42. 18 1
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  43. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  44. 1 8
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  45. 1 0
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js
  46. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
  47. 1 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js
  48. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
  49. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js
  50. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
  51. 2 2
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js
  52. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
  53. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js

+ 766 - 139
commont/messages.js

@@ -6,77 +6,190 @@ export default {
 			address: '地址管理',
 			addAndEdit: "新增/修改地址",
 			account: '账号与安全',
-			password:'修改密码/手机号',
-			switch:'切换语言',
-			user:"用户协议",
-			privacy:"隐私政策",
-			platform:"平台规则",
-			merchant:"商户入驻申请协议",
-			layout:"退出登录",
-			setup:"账号设置",
-			information:"个人信息",
-			headerImg:"头像",
-			nickname:"昵称",
-			prompt:"限4-24个字符(1汉字=2字符,1英文活数字=1字符)",
-			editNextname:'编辑昵称',
-			inland:"中国内地",
-			international:"国际",
-			initial:"默认地址",
-			edit:"编辑",
-			delete:"删除",
-			wx:"微信导入",
-			add:"新增地址",
-			contacts:"联系人信息",
-			wxAddress:"微信地址薄",
-			newAddress:"新建地址",
-			name:"姓名",
-			phone:"手机号",
-			city:"省市区",
-			detailed:"详细地址",
-			goods:"请填写收货人信息",
-			pleasePhoneNumber:"请填写收货人手机号",
-			township:"省市区县、乡镇等",
-			sect:"请输入详细地址精确到门牌号",
-			company:"公司名称(选填)",
-			preserve:"保存",
-			empty:"清空",
-			country:"国家",
-			postalCode:"邮编",
-			email:"电子邮箱",
-			companyName:"公司名称",
-			selection:"请选择",
-			PleacePostalCode:"请输入邮编",
-			addressBook:"保存到地址薄",
-			pleaseEmail:"请输入电子邮箱(选填)",
-			editPassword:"修改登录密码",
-			editPhone:"修改手机号",
-			accountCancellation:"账号注销",
-			setPassword:"设置密码",
-			cancellation:"注销后无法恢复,请谨慎操作",
-			myDeposit:"我的保证金",
-			balance:"余额",
-			mineFollow:"我的关注",
-			myPackage:"我的包裹",
-			mallOrders:"商城订单",
-			whole:"全部",
-			pendingPayment:"待付款",
-			joiningGroups:"拼团中",
-			toBeShipped:"待发货",
-			toBeReceived:"待收货",
-			refund:"退款/售后",
-			leaderunction:"团长功能",
-			platform:"平台商品库",
-			productManagement:"商品管理",
-			orderManagement:"订单管理",
-			afterSales:"售后管理",
-			supplyChain:"供应链商品",
-			PCEnd:"PC端",
-			pontact:"联系客服",
-			accountSettings:"账号设置",
-			accountBalance:"账户余额",
-			myBalance:"我的余额",
-			withdrawal:"提现",
+			password: '修改密码/手机号',
+			switch: '切换语言',
+			user: "用户协议",
+			privacy: "隐私政策",
+			platform: "平台规则",
+			merchant: "商户入驻申请协议",
+			layout: "退出登录",
+			setup: "账号设置",
+			information: "个人信息",
+			headerImg: "头像",
+			nickname: "昵称",
+			prompt: "限4-24个字符(1汉字=2字符,1英文活数字=1字符)",
+			editNextname: '编辑昵称',
+			inland: "中国内地",
+			international: "国际",
+			initial: "默认地址",
+			edit: "编辑",
+			delete: "删除",
+			wx: "微信导入",
+			add: "新增地址",
+			contacts: "联系人信息",
+			wxAddress: "微信地址薄",
+			newAddress: "新建地址",
+			name: "姓名",
+			phone: "手机号",
+			city: "省市区",
+			detailed: "详细地址",
+			goods: "请填写收货人信息",
+			pleasePhoneNumber: "请填写收货人手机号",
+			township: "省市区县、乡镇等",
+			sect: "请输入详细地址精确到门牌号",
+			company: "公司名称(选填)",
+			preserve: "保存",
+			empty: "清空",
+			country: "国家",
+			postalCode: "邮编",
+			email: "电子邮箱",
+			companyName: "公司名称",
+			selection: "请选择",
+			PleacePostalCode: "请输入邮编",
+			addressBook: "保存到地址薄",
+			pleaseEmail: "请输入电子邮箱(选填)",
+			editPassword: "修改登录密码",
+			editPhone: "修改手机号",
+			accountCancellation: "账号注销",
+			setPassword: "设置密码",
+			cancellation: "注销后无法恢复,请谨慎操作",
+			myDeposit: "我的保证金",
+			balance: "余额",
+			mineFollow: "我的关注",
+			myPackage: "我的包裹",
+			mallOrders: "商城订单",
+			whole: "全部",
+			pendingPayment: "待付款",
+			joiningGroups: "拼团中",
+			toBeShipped: "待发货",
+			toBeReceived: "待收货",
+			refund: "退款/售后",
+			leaderunction: "团长功能",
+			platform: "平台商品库",
+			productManagement: "商品管理",
+			orderManagement: "订单管理",
+			afterSales: "售后管理",
+			supplyChain: "供应链商品",
+			PCEnd: "PC端",
+			pontact: "联系客服",
+			accountSettings: "账号设置",
+			shop: '商城',
+			border: '跨境速递',
+			item: '物品信息',
+			required: '必填',
+			flow: '跨境物流',
+			share: '分享给好友',
+			compute: "物流计算器",
+			deliver: "发往中转点",
+			Sign: '中转已签收',
+			overseas: "正发往海外",
+			mail: '去寄件',
+			mine: '我的',
+			addsign: '添加寄往中转点包裹',
+			more: '更多',
+			price: '单价',
+			already: '已拼',
+			parcel: '包裹',
+			residue: '剩余重量',
+			plan: '进度',
+			start: '开始时间',
+			cut: '截止时间',
+			parceling: '拼包发海外',
+			goparceling: '去拼包',
+			sender: '新建寄件人',
+			recipient: '新建收件人',
+			informat: '点击填写寄件地址信息',
+			informate: '点击填写收件地址信息',
+			addressbook: '地址薄',
+			select: '请选择物品信息',
+			//主页
+			search: '搜索',
+			Searchcon: '请输入要搜索的内容',
+			expensive: '买贵必赔',
+			Something: '全球好物',
+			postage: '包邮',
+			Trade: '以旧换新',
+			sort: '分类',
+			fill: '已补',
+			RMB: '元',
+			history: '历史地址',
+			Fill: '请填写',
+			//填写寄件人信息
+			senderinfo: '填写寄件人信息',
+			addressee: '请输入收件人姓名',
+			enter: '确定',
+			shoptype: '商品类型',
+			estimated: '预估重量',
+			piece: '件数',
+			rule: '了解计费规则',
+			Starting: '起始地',
+			destination: '目的地',
+			Commodity: '商品重量',
+			Acquisition: '获取价格',
+			Calculated: '计算重量',
+			Estimated: '预估运费',
+			details: '查看详情',
+			Normal: '普通商品',
+			special: '特殊商品',
+			orderSearch: '请输入订单编号搜索',
+			orderWeight: '当前页面加载的订单总重量',
+			purchase: '平台自购',
+			OrderNumber: '订单编号',
+			Parcelweight: '包裹重量',
+			payment: '立即付款',
+			Frozen: '冻结',
+			recover: '恢复',
+			total: '合计',
+			selfPost: '自寄',
+			receiveGoods: '待平台收货',
+			TrackingNumber: '快递单号',
+			trackingNumber: '输入快递单号,快速添加到我的包裹',
+			Expresscompany: '快递公司',
+			ExpressCompany: '输入快递公司名称',
+			parcelWeight: '请输入包裹重量',
+			Addlist: '添加到包裹列表',
+			Addparcel: '添加包裹',
+			Packlist: '拼包列表',
+			classification: '商品分类',
+			synthesis: '综合',
+			sell: '销售',
+			Pricea: '价格',
+			screen: '筛选',
+			Pricerange: '价格区间',
+			Weightinterval: '重量区间',
+			brand: '品牌',
+			Proprietary: '自营商品',
+			reset: '重置',
+			yes: '是',
+			Bottomprice: '最低价',
+			highestprice: '最高价',
+
+			Discounted: '折扣价',
+			service: '服务',
+			Netcontent: '净含量',
+			sametype: '同款低价',
+			review: '评论',
+			Productdetails: '商品详情',
+			Specification: '规格参数',
+			Recommended: '推荐商品',
+			material: '主要原料',
+			specification: '规格',
+			Shelflife: '保质期',
+			Suitableobject: '适合对象',
+			Customer: '客服',
+			Shopping: '购物车',
+			follow: '关注',
+			notification: '到货通知',
+			Sele: '选择',
+			Salesvolume: '销售量',
+			stroll: '逛逛',
+			article: '条',
 			
+			know:'我知道了',
+			shar:'分享',
+			Copylink:'复制链接',
+			Generatepicture:'生成图片',
+			Cancel:'取消'
 		}
 	},
 	"en-US": {
@@ -86,75 +199,589 @@ export default {
 			address: "Address Management",
 			addAndEdit: "add/modify Address",
 			account: 'Account and Security',
-			password:'Change password/Phone Number',
-			switch:'Switch Language',
-			user:"User Agreement",
-			privacy:"Privacy Policy",
-			platform:"Platform rules",
-			merchant:"Merchant Entry Application Agreement",
-			layout:"Log out and log in",
-			setup:"Account Settings",
-			information:"Personal Information",
-			headerImg:"Avatar",
-			nickname:"Nickname",
-			prompt:"Limited to 4-24 characters (1 Chinese character=2 characters, 1 English live number=1 character)",
-			editNextname:'Edit Nickname',
-			inland:"Mainland China",
-			international:"International",
-			initial:"Default Address",
-			edit:'Edit',
-			delete:"Delete",
-			wx:"WeChat import",
-			add:"Add Address",
-			contacts:"Contact Information ",
-			wxAddress:"WeChat Address Book",
-			newAddress:"New Address",
-			name:"Name",
-			phone:"Mobile phone number",
-			city:"Provinces, cities, and districts",
-			detailed:"Detailed address",
-			goods:"Please fill in the recipient information",
-			pleasePhoneNumber:"Please fill in the recipient's mobile phone number",
-			township:"Provinces, cities, counties, townships, etc",
-			sect:"Please enter a detailed address accurate to the house number",
-			company:"Company name (optional)",
-			preserve:"Preserve",
-			empty:"Empty",
-			country:"Country",
-			postalCode:"Postal code",
-			email:"E-mail",
-			companyName:"Company Name",
-			selection:"Please Select",
-			PleacePostalCode:"Please enter your postal code",
-			addressBook:"Save to Address Book",
-			pleaseEmail:"Please enter your email address (optional)",
-			cancellation:"Unable to recover after logging out, please operate with caution",
-			editPassword:"Change login password",
-			editPhone:"Change phone number",
-			accountCancellation:"Account Cancellation",
-			setPassword:"Set password",
-			myDeposit:"My deposit",
-			balance:"Balance",
-			mineFollow:"My following",
-			myPackage:"My Package",
-			mallOrders:"Mall orders",
-			whole:"Whole",
-			pendingPayment:"Pending payment",
-			joiningGroups:"Joining groups",
-			toBeShipped:"To be shipped",
-			toBeReceived:"To be received",
-			refund:"Refund/After sales",
-			leaderunction:"Leader function",
-			platform:"Platform product library",
-			productManagement:"Product Management",
-			orderManagement:"order management",
-			afterSales:"After sales",
-			supplyChain:"Supply chain goods",
-			PCEnd:"PC end",
-			pontact:"Contact customer service",
-			accountSettings:"Account Settings",
-			accountBalance:"Account Balance",
-			myBalance:"My Balance",
+			password: 'Change password/Phone Number',
+			switch: 'Switch Language',
+			user: "User Agreement",
+			privacy: "Privacy Policy",
+			platform: "Platform rules",
+			merchant: "Merchant Entry Application Agreement",
+			layout: "Log out and log in",
+			setup: "Account Settings",
+			information: "Personal Information",
+			headerImg: "Avatar",
+			nickname: "Nickname",
+			prompt: "Limited to 4-24 characters (1 Chinese character=2 characters, 1 English live number=1 character)",
+			editNextname: 'Edit Nickname',
+			inland: "Mainland China",
+			international: "International",
+			initial: "Default Address",
+			edit: 'Edit',
+			delete: "Delete",
+			wx: "WeChat import",
+			add: "Add Address",
+			contacts: "Contact Information ",
+			wxAddress: "WeChat Address Book",
+			newAddress: "New Address",
+			name: "Name",
+			phone: "Mobile phone number",
+			city: "Provinces, cities, and districts",
+			detailed: "Detailed address",
+			goods: "Please fill in the recipient information",
+			pleasePhoneNumber: "Please fill in the recipient's mobile phone number",
+			township: "Provinces, cities, counties, townships, etc",
+			sect: "Please enter a detailed address accurate to the house number",
+			company: "Company name (optional)",
+			preserve: "Preserve",
+			empty: "Empty",
+			country: "Country",
+			postalCode: "Postal code",
+			email: "E-mail",
+			companyName: "Company Name",
+			selection: "Please Select",
+			PleacePostalCode: "Please enter your postal code",
+			addressBook: "Save to Address Book",
+			pleaseEmail: "Please enter your email address (optional)",
+			cancellation: "Unable to recover after logging out, please operate with caution",
+			editPassword: "Change login password",
+			editPhone: "Change phone number",
+			accountCancellation: "Account Cancellation",
+			setPassword: "Set password",
+			myDeposit: "My deposit",
+			balance: "Balance",
+			mineFollow: "My following",
+			myPackage: "My Package",
+			mallOrders: "Mall orders",
+			whole: "Whole",
+			pendingPayment: "Pending payment",
+			joiningGroups: "Joining groups",
+			toBeShipped: "To be shipped",
+			toBeReceived: "To be received",
+			refund: "Refund/After sales",
+			leaderunction: "Leader function",
+			platform: "Platform product library",
+			productManagement: "Product Management",
+			orderManagement: "order management",
+			afterSales: "After sales",
+			supplyChain: "Supply chain goods",
+			PCEnd: "PC end",
+			pontact: "Contact customer service",
+			accountSettings: "Account Settings",
+			shop: 'store',
+			border: 'border',
+			item: 'Item information',
+			required: 'required',
+			flow: 'Cross border logistics',
+			share: 'Share',
+			compute: "The Reckoner",
+			deliver: "To transfer point",
+			Sign: 'Transfer has been signed for',
+			overseas: "Sending overseas",
+			mail: 'Go and send the package',
+			mine: 'mine',
+			addsign: 'Add package to transit point',
+			more: 'more',
+			price: 'unit price',
+			already: 'Spliced',
+			parcel: 'package',
+			residue: ' weight',
+			plan: 'schedule',
+			start: 'start time',
+			cut: 'Deadline',
+			parceling: 'Package shipping overseas',
+			goparceling: 'Go pack up',
+			sender: 'New sender',
+			recipient: 'New recipient',
+			informat: 'Fill in the mailing address information',
+			informate: 'Fill in the shipping address information',
+			addressbook: 'Address Book',
+			select: 'Please select item information',
+			//主页
+			search: 'search',
+			Searchcon: 'you want to search for',
+			expensive: 'Buy high Must compensate',
+			Something: 'Global goodies',
+			postage: 'Exempt from postage',
+			Trade: 'Trade-in',
+			sort: 'sort',
+			fill: 'subsidy',
+			RMB: 'RMB',
+			history: 'Historical address',
+			Fill: 'Fill out',
+			senderinfo: 'Sender information',
+			addressee: 'Indicare il nome del destinatario',
+
+			enter: 'confirm',
+			shoptype: 'type of merchandise',
+			estimated: 'estimated weight',
+			piece: 'piece',
+			rule: 'Understanding billing rules',
+			Starting: 'Starting place',
+			destination: 'destination',
+			Commodity: 'Commodity weight',
+			Acquisition: 'Acquisition price',
+			Calculated: 'Calculated weight',
+			Estimated: 'Estimated freight',
+			details: 'View details',
+			Normal: 'General goods',
+			special: 'Special goods',
+
+			orderSearch: 'Please enter the order number to search',
+			orderWeight: 'The total weight of the order currently loaded on the page',
+			purchase: 'Platform purchase',
+			OrderNumber: 'Order number',
+			Parcelweight: 'Parcel weight',
+			payment: 'Immediate payment',
+			Frozen: 'Frozen',
+			recover: 'recover',
+			total: 'total',
+			selfPost: 'self-post',
+			receiveGoods: 'Wait for the platform to receive the goods',
+
+			TrackingNumber: 'Tracking number',
+			trackingNumber: 'Enter the tracking number to quickly add to my package',
+			Expresscompany: 'Express company',
+			ExpressCompany: 'Enter the name of the Courier company',
+			parcelWeight: 'Please enter the parcel weight',
+			Addlist: 'Add to package list',
+			Addparcel: 'Add parcel',
+			Packlist: 'Pack list',
+			classification: 'Commodity classification',
+
+			synthesis: 'synthesis',
+			sell: 'sell',
+			Pricea: 'Price',
+			screen: 'screen',
+			Pricerange: 'Price range',
+			Weightinterval: 'Weight section',
+			brand: 'brand',
+			Proprietary: 'Proprietary commodities',
+			reset: 'reset',
+			yes: 'yes',
+			Bottomprice: 'Bottom price',
+			highestprice: 'The highest price',
+
+			Discounted: 'Discounted price',
+			service: 'service',
+			Netcontent: 'Net content',
+			sametype: 'Lower price of the same type',
+			review: 'review',
+			Productdetails: 'Product details',
+			Specification: 'Specification parameter',
+			Recommended: 'Recommended goods',
+			material: 'Main raw material',
+			specification: 'specification',
+			Shelflife: 'Shelf life',
+			Suitableobject: 'Suitable object',
+			Customer: 'Customer service',
+			Shopping: 'Shopping cart',
+			follow: 'follow',
+			notification: 'Notice of arrival',
+			Sele: 'Select',
+			Salesvolume: 'Sales volume',
+			stroll: 'stroll',
+			article: 'article',
+			
+			know:'I know',
+			shar:'Share',
+			Copylink:'Copy link',
+			Generatepicture:'Generate picture',
+			Cancel:'Cancel'
+		}
+	},
+	// 西班牙
+	"es-ES": {
+		index: {
+			homepage: 'La página',
+			switchLanguage: 'Cambiar el idioma',
+			address: 'Gestión de direcciones',
+			addAndEdit: "Añadir/cambiar dirección",
+			account: 'Cuenta y seguridad',
+			password: 'Cambiar contraseña/número de teléfono móvil',
+			switch: 'Cambiar el idioma',
+			user: "Acuerdo de usuario",
+			privacy: "Política de privacidad",
+			platform: "Reglas de plataforma",
+			merchant: "Acuerdo de solicitud de entrada comercial",
+			layout: "Salir del login",
+			setup: "Configuración de cuenta",
+			information: "Información personal",
+			headerImg: "avatares",
+			nickname: "apodo",
+			prompt: "Limitado a 4-24 caracteres (1 kanji =2 caracteres, 1 número vivo en inglés =1 carácter)",
+			editNextname: 'Editar el apodo',
+			inland: "China continental",
+			international: "internacional",
+			initial: "Dirección por defecto",
+			edit: "editor",
+			delete: "borrar",
+			wx: "Importación de wechat",
+			add: "Nueva dirección añadida",
+			contacts: "Información de contacto",
+			wxAddress: "Dirección wechat delgada",
+			newAddress: "Nueva dirección",
+			name: "Los nombres",
+			phone: "Teléfono móvil no",
+			city: "Provincia y ciudad",
+			detailed: "Dirección completa",
+			goods: "Por favor complete la información del destinatario",
+			pleasePhoneNumber: "Por favor, introduzca el número de teléfono móvil del destinatario",
+			township: "Provincia ciudad distrito condado pueblo etc",
+			sect: "Por favor, introduzca la dirección exacta al número de la casa",
+			company: "Nombre de la empresa (opcional)",
+			preserve: "guardar",
+			empty: "vacíe",
+			country: "países",
+			postalCode: "Código postal",
+			email: "Correo electrónico",
+			companyName: "Nombre de empresa",
+			selection: "favor seleccione",
+			PleacePostalCode: "Por favor ingrese su código postal",
+			addressBook: "Guardar a la dirección delgada",
+			pleaseEmail: "Por favor, introduzca su correo electrónico (opcional)",
+			editPassword: "Cambiar contraseña de acceso",
+			editPhone: "Cambiar el número de teléfono",
+			accountCancellation: "Cierre de cuenta",
+			setPassword: "Establecer una contraseña",
+			cancellation: "No se puede restaurar después de la cancelación, por favor, tenga cuidado",
+			myDeposit: "Mi depósito de seguridad",
+			balance: "El saldo",
+			mineFollow: "Mi preocupación por",
+			myPackage: "Mi paquete de",
+			mallOrders: "Orden del centro",
+			whole: "total",
+			pendingPayment: "Pendiente de pago",
+			joiningGroups: "En grupo",
+			toBeShipped: "Listo para enviar",
+			toBeReceived: "Para recibir",
+			refund: "Reembolso/post-venta",
+			leaderunction: "Función jefe",
+			platform: "Plataforma mercancía biblioteca",
+			productManagement: "Gestión de mercancías",
+			orderManagement: "Gestión de pedidos",
+			afterSales: "Gestión post-venta",
+			supplyChain: "Cadena de suministro commodities",
+			PCEnd: "PC cliente",
+			pontact: "Contactar servicio al cliente",
+			accountSettings: "Configuración de cuenta",
+			shop: 'Comercial',
+			border: 'transfronterizo',
+			item: 'Artículos',
+			required: 'Obligatorio',
+			flow: 'Logística transfronteriza',
+			share: 'Compartir',
+			compute: "Calculadora",
+			deliver: "Enviado al punto de tránsito",
+			Sign: 'El tránsito ha sido firmado',
+			overseas: "Se está enviando al extranjero",
+			mail: 'Ir a enviar',
+			mine: 'El mío',
+			addsign: 'Añadir paquetes de puntos de tránsito',
+			more: 'Más',
+			price: 'Precio unitario',
+			already: 'Se ha luchado',
+			parcel: 'Paquete',
+			residue: 'residual',
+			plan: 'Progreso',
+			start: 'Hora de inicio',
+			cut: 'Plazo',
+			parceling: 'Envío de paquetes en el extranjero',
+			goparceling: 'Ir a empacar',
+			sender: 'Nuevo remitente',
+			recipient: 'Nuevo destinatario',
+			informat: 'Rellene la información de la dirección de envío',
+			informate: 'Rellene la información de la dirección de recepción',
+			addressbook: 'Libreta de direcciones',
+			select: 'Por favor, seleccione la información del artículo',
+			//主页
+			search: 'Buscar',
+			Searchcon: 'Contenido de la búsqueda',
+			expensive: 'Comprar caro Debe pagar',
+			Something: 'Cosas buenas del mundo',
+			postage: 'Envío gratis',
+			Trade: 'Cambiar lo viejo por lo nuevo',
+			sort: 'Clasificación',
+			fill: 'Subvenciones',
+			RMB: 'RMB',
+			history: 'Dirección histórica',
+			Fill: 'Por favor, rellene',
+			senderinfo: 'Rellene la información del remitente',
+			addressee: 'Por favor ingrese el nombre del destinatario',
+
+			enter: 'determinar',
+			shoptype: 'Tipo de mercancía',
+			estimated: 'Peso estimado estimado',
+			piece: 'algo',
+			rule: 'Entender las reglas de facturación',
+
+			Starting: 'incipiente',
+			destination: 'destino',
+			Commodity: 'Peso de mercancía',
+			Acquisition: 'Obtener el precio',
+			Calculated: 'Calcula el peso',
+			Estimated: 'Gastos de envío estimados',
+			details: 'Ver los detalles',
+			Normal: 'Bienes comunes',
+			special: 'Mercancía especial',
+
+			orderSearch: 'Por favor, introduzca el número de pedido buscar',
+			orderWeight: 'Peso total del pedido cargado por la página actual',
+			purchase: 'Plataforma de compra propia',
+			OrderNumber: 'Número de pedido',
+			Parcelweight: 'Peso del paquete',
+			payment: 'Pague ahora mismo',
+			Frozen: ' congelación',
+			recover: ' recuperación',
+			total: 'total',
+			selfPost: 'Postal desde',
+			receiveGoods: 'A recibir en la plataforma',
+
+			TrackingNumber: 'Número de seguimiento',
+			trackingNumber: 'Ingrese el número de seguimiento para agregar rápidamente a mi paquete',
+			Expresscompany: 'Empresa de mensajería',
+			ExpressCompany: 'Introduzca el nombre de la empresa de mensajería',
+			parcelWeight: 'Por favor ingrese el peso del paquete',
+			Addlist: 'Añadir a la lista de paquetes',
+			Addparcel: 'Añadir un paquete',
+			Packlist: 'Lista de paquetes',
+			classification: 'Clasificación de mercancías',
+
+			synthesis: 'integrado',
+			sell: 'venta',
+			Pricea: 'precio',
+			screen: 'selección',
+			Pricerange: 'Rango de precios',
+			Weightinterval: 'Intervalo de peso',
+			brand: 'La marca',
+			Proprietary: 'Mercancía por cuenta propia',
+			reset: 'restaurar',
+			yes: 'es',
+			Bottomprice: 'Precio más bajo',
+			highestprice: 'Precio máximo',
+
+			Discounted: 'Precio con descuento',
+			service: 'servicios',
+			Netcontent: 'Contenido neto',
+			sametype: 'Mismo modelo bajo precio',
+			review: 'comentarios',
+			Productdetails: 'Detalles de mercancía',
+			Specification: 'Especificaciones y parámetros',
+			Recommended: 'Artículos recomendados para',
+			material: 'Materia prima principal',
+			specification: 'Las especificaciones',
+			Shelflife: 'caducidad',
+			Suitableobject: 'Apto para objetos',
+			Customer: 'call',
+			Shopping: 'carrito',
+			follow: 'atención',
+			notification: 'Notificación de llegada',
+			Sele: 'seleccione',
+			Salesvolume: 'Volumen de ventas',
+			stroll: 'Los alrededores',
+			article: 'Art',
+			
+			know:'Lo sé',
+			shar:'compartir',
+			Copylink:'Copiar el enlace',
+			Generatepicture:'Generar una imagen',
+			Cancel:'cancelación'
+		}
+	},
+	//意大利
+	"it-IT": {
+		index: {
+			homepage: 'Home page',
+			switchLanguage: 'Cambio di lingua',
+			address: 'Gestione degli indirizzi',
+			addAndEdit: "Nuovi indirizzi/modifiche",
+			account: 'Numero di conto e sicurezza',
+			password: 'Modificare la parola d’ordine/numero di cellulare',
+			switch: 'Cambio di lingua',
+			user: "Accordi per gli utenti",
+			privacy: "Politica in materia di tutela della vita privata",
+			platform: "Regole per le piattaforme",
+			merchant: "Accordo di adesione di un commerciante",
+			layout: "Uscita logon",
+			setup: "Fissazione del numero di conto",
+			information: "Dati personali",
+			headerImg: "avatar",
+			nickname: "soprannome",
+			prompt: "Limite da 4 a 24 caratteri (1 cinese =2 caratteri, 1 inglese vivo =1 carattere)",
+			editNextname: 'Soprannomi di redazione',
+			inland: "Cina continentale",
+			international: "internazionale",
+			initial: "Indirizzo predefinito",
+			edit: "editoriale",
+			delete: "cancellare",
+			wx: "Importazioni di wechat",
+			add: "Nuovo indirizzo",
+			contacts: "Información de contacto",
+			wxAddress: "Dirección wechat delgada",
+			newAddress: "Nuovi indirizzi",
+			name: "nomi",
+			phone: "Numero di telefono",
+			city: "Aree metropolitane",
+			detailed: "Indirizzo completo",
+			goods: "Per piacere, completare l’informazione del destinatario",
+			pleasePhoneNumber: "Per piacere, completare il numero di telefono del destinatario",
+			township: "I comuni e le province le regioni, le città, ecc",
+			sect: "Si prega di indicare l’indirizzo completo con il numero della targa",
+			company: "Nome della società (indicare il nome della società)",
+			preserve: "conservazione",
+			empty: "svuotati",
+			country: "paesi",
+			postalCode: "P.",
+			email: "Posta elettronica",
+			companyName: "Nome della società",
+			selection: "selezione",
+			PleacePostalCode: "Per favore digitate il codice postale",
+			addressBook: "Conservare all’indirizzo sottile",
+			pleaseEmail: "Per abbonarsi, digitare la casella di posta elettronica (indirizzatela)",
+			editPassword: "Modificare la password logon",
+			editPhone: "Modifica del numero di telefono",
+			accountCancellation: "Annullamento dei conti",
+			setPassword: "Stabilire la password",
+			cancellation: "Se il recupero non è possibile dopo l’annullamento, occorre procedere con cautela",
+			myDeposit: "I margine",
+			balance: "saldo",
+			mineFollow: "La mia preoccupazione",
+			myPackage: "Il mio pacco",
+			mallOrders: "Orden del centro",
+			whole: "totale",
+			pendingPayment: "Pagamenti da effettuare",
+			joiningGroups: "Nella composizione",
+			toBeShipped: "Prodotti in attesa di spedizione",
+			toBeReceived: "Para recibir",
+			refund: "Rimborso/assistenza post-vendita",
+			leaderunction: "Funzioni del capo servizio",
+			platform: "Banca di prodotti di base",
+			productManagement: "Gestione dei prodotti di base",
+			orderManagement: "Gestione delle ordinazioni",
+			afterSales: "Gestione post-vendita",
+			supplyChain: "Prodotti della catena d’approvvigionamento",
+			PCEnd: "PC, copiglie, pernotti",
+			pontact: "Contatti con il servizio clienti",
+			accountSettings: "Fissazione del numero di conto",
+			shop: 'posta',
+			border: 'transfrontaliero',
+			item: 'Informazioni sugli articoli',
+			required: 'Sarà compilata',
+			flow: 'La logistica transfrontaliera',
+			share: 'condividere',
+			compute: "calcolatrici",
+			deliver: "Punti di transito",
+			Sign: 'I trasferimenti sono stati firmati',
+			overseas: "Sta andando all’estero",
+			mail: 'Per inviare gli articoli',
+			mine: 'La mia',
+			addsign: 'Aggiungere i pacchi ai punti di transito',
+			more: 'più',
+			price: 'Prezzo unitario',
+			already: 'Ha scritto',
+			parcel: 'pacchi',
+			residue: 'residuo',
+			plan: 'processo ',
+			start: 'Ora di inizio',
+			cut: 'Tempo di chiusura',
+			parceling: 'Speaker all’estero',
+			goparceling: 'dischetti',
+			sender: 'Nuovi mittenti',
+			recipient: 'Nuovi destinatari',
+			informat: 'Compilare il tagliando di spedizione',
+			informate: 'Indicare l’indirizzo per il ricevimento',
+			addressbook: 'Indirizzo sottile',
+			select: 'Si prega di selezionare informazioni sugli articoli',
+			//主页
+			search: 'ricerca',
+			Searchcon: 'Contenuto della ricerca',
+			expensive: 'Comprare costoso Mosto del',
+			Something: 'Il bene globale',
+			postage: 'Circostanze eccezionali',
+			Trade: 'Cambiare vecchio per nuovo',
+			sort: 'classificazione',
+			fill: 'sovvenzioni',
+			RMB: 'RMB',
+			history: 'Indirizzo storico',
+			Fill: 'Per piacere',
+			senderinfo: 'Compilare le informazioni inviate ai mittenti',
+			addressee: 'Indicare il nome del destinatario',
+
+			enter: 'definire',
+			shoptype: 'Tipo di merce',
+			estimated: 'Peso stimato',
+			piece: 'cosa',
+			rule: 'Conoscenza delle norme di fatturazione',
+
+			Starting: 'Verso l’alto',
+			destination: 'destinazione',
+			Commodity: 'Peso delle merci',
+			Acquisition: 'Accesso ai prezzi',
+			Calculated: 'Calcolo del peso',
+			Estimated: 'Nolo stimato',
+			details: 'Esaminare i dettagli',
+			Normal: 'Merci comuni',
+			special: 'Prodotti speciali',
+
+			orderSearch: 'Digitare il numero d’ordine per effettuare la ricerca',
+			orderWeight: 'Peso totale delle ordinazioni attualmente caricate',
+			purchase: 'Acquisto di piattaforme',
+			OrderNumber: 'Numero d’ordine',
+			Parcelweight: 'Peso del pacco',
+			payment: 'Pagamenti immediati',
+			Frozen: 'congelamento',
+			recover: 'ripristino',
+			total: 'totale',
+			selfPost: 'Inviata dal',
+			receiveGoods: 'Lascia alla piattaforma il carico',
+
+			TrackingNumber: 'Numero del corriere espresso',
+			trackingNumber: 'Inserire il numero d’ordine del corriere rapido e completare rapidamente il pacco',
+			Expresscompany: 'Società di corriere rapido',
+			ExpressCompany: 'Indicare il nome del servizio di corriere espresso',
+			parcelWeight: 'Per piacere indicare il peso del pacco',
+			Addlist: 'Aggiunta all’elenco dei colli',
+			Addparcel: 'Aggiunta di pacchi',
+			Packlist: 'Elenco degli statuti',
+			classification: 'Classificazione delle merci',
+
+			synthesis: 'integrato',
+			sell: 'vendita',
+			Pricea: 'prezzi',
+			screen: 'screening',
+			Pricerange: 'Fascia di prezzo',
+			Weightinterval: 'Intervallo di peso',
+			brand: 'marca',
+			Proprietary: 'Prodotti per uso proprio',
+			reset: 'sostituzione',
+			yes: 'è',
+			Bottomprice: 'Prezzo più basso',
+			highestprice: 'Prezzo massimo',
+
+			Discounted: 'Prezzo ridotto',
+			service: 'servizi',
+			Netcontent: 'Tenore netto',
+			sametype: 'Prezzo ridotto dello stesso articolo',
+			review: 'commenti',
+			Productdetails: 'Dettaglio delle merci',
+			Specification: 'Parametri delle specifiche',
+			Recommended: 'Prodotti raccomandati',
+			material: 'Principali materie prime',
+			specification: 'Le specifiche',
+			Shelflife: 'Periodo di validità',
+			Suitableobject: 'Adatto agli oggetti',
+			Customer: 'servizio',
+			Shopping: 'Carrelli per acquisti',
+			follow: 'attenzione',
+			notification: 'Notifica di ricevimento',
+			Sele: 'scelta',
+			Salesvolume: 'Volume delle vendite',
+			stroll: 'gira',
+			article: 'articolo',
+			
+			know:'Io so che',
+			shar:'condividere',
+			Copylink:'Riproduzione di un link',
+			Generatepicture:'Creazione di immagini',
+			Cancel:'soppressione'
 		}
 	}
 }

+ 6 - 1
components/kj-flow/kj-flow.vue

@@ -35,7 +35,7 @@
 			</scroll-view>
 		</view>
 		<view class="bottom">
-			<view class="btn" @click="enter">确定</view>
+			<view class="btn" @click="enter">{{i18n.enter}}</view>
 		</view>
 		<view class=""></view>
 	</view>
@@ -49,6 +49,11 @@
 
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods:{
 			close(){
 				this.$emit('close')

+ 45 - 28
pageA/counter.vue

@@ -3,32 +3,33 @@
 	<view class="back">
 		<!-- 城市 -->
 		<view class="add u-flex u-row-around">
-			<text class='address' @click="change(0)">{{original||'起始地'}}</text>
+			<text class='address' @click="change(0)">{{original||i18n.Starting}}</text>
 			<image src="static/images/arrows.png" mode="" style="width: 130rpx;height: 10rpx;"></image>
-			<text class='address' @click="change(1)">{{bourn||'目的地'}}</text>
+			<text class='address' @click="change(1)">{{bourn||i18n.destination}}</text>
 		</view>
 		<!-- 商品类型 -->
 		<view class="type">
 			<view class="title u-flex">
-				<text>商品类型</text>
+				<text>{{i18n.shoptype}}</text>
 				<image src="" mode="" style="width: 12rpx;height: 12rpx;"></image>
 			</view>
 			<view class="u-flex" style="margin-top: 24rpx;">
-				<view :class="index==idx?'left':'right'" @click="good(idx)" style="margin-right: 20rpx;" v-for="(item,idx) in goods" :key="idx">{{item.name}}</view>
+				<view :class="index==idx?'left':'right'" @click="good(idx)" style="margin-right: 20rpx;"
+					v-for="(item,idx) in goods" :key="idx">{{item.name}}</view>
 				<!-- <view class="right" style="margin-left: 20rpx;">特殊商品</view> -->
 			</view>
 		</view>
 		<!-- 跨境物流 -->
 		<view class="logistics u-flex u-row-between">
-			<text style="font-weight: 600;">跨境物流</text>
+			<text style="font-weight: 600;">{{i18n.flow}}</text>
 			<view class="u-flex" @click="logshow=true">
-				<text class="change">请选择</text>
+				<text class="change">{{i18n.selection}}</text>
 				<u-icon name="arrow-right" size='16'></u-icon>
 			</view>
 		</view>
 		<!-- 商品重量 -->
 		<view class="weight u-flex u-row-between">
-			<text style="font-weight: 600;">商品重量</text>
+			<text style="font-weight: 600;">{{i18n.Commodity}}</text>
 			<u-number-box v-model="value">
 				<view slot="minus" class="minus">
 					<u-icon name="minus" size="12"></u-icon>
@@ -41,22 +42,22 @@
 		</view>
 		<!-- 获取价格 -->
 		<view @click="gain" :class="gat==1?'yuan':'price'">
-			获取价格
+			{{i18n.Acquisition}}
 		</view>
 		<view class="gain" v-if="gatShow">
 			<view class="">
-				<text class='weigh'>计算重量:</text>
+				<text class='weigh'>{{i18n.Calculated}}:</text>
 				<text class='weigh' style="color: rgba(34, 34, 34, 1);">30.00kg</text>
 			</view>
 			<view class="u-flex u-row-between"
 				style="border-top: 2rpx solid #979797;margin-top: 32rpx;padding-top: 20rpx;">
 				<view class="">
-					<text class='weigh'>预估运费</text>
+					<text class='weigh'>{{i18n.Estimated}}</text>
 					<text style="margin-left: 6rpx;" class='red'>¥</text>
 					<text class='red' style="font-size: 32rpx;">3619</text>
 					<text class='red'>起</text>
 				</view>
-				<view class="info" @click="logistics">查看详情</view>
+				<view class="info" @click="logistics">{{i18n.details}}</view>
 			</view>
 		</view>
 		<!-- 地址选择 -->
@@ -90,32 +91,44 @@
 					['深圳', '厦门', '上海', '拉萨'],
 					['得州', '华盛顿', '纽约', '阿拉斯加']
 				],
-				goods:[
-					{
-						name:'普通商品'
-					},
-					{
-						name:'特殊商品'
-					}
-				],
-				index:0
+				goods: [],
+				index: 0
 			};
 		},
+		onLoad() {
+			this.goods = [{
+					name: this.i18n.Normal
+				},
+				{
+					name: this.i18n.special
+				}
+			]
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title:this.i18n.compute
+			})
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
-			success(){
+			success() {
 				this.logshow = false
 			},
 			close() {
 				this.logshow = false
 			},
 			//切换商品类型
-			good(idx){
+			good(idx) {
 				this.index = idx
 			},
 			//物流详情
-			logistics(){
+			logistics() {
 				uni.navigateTo({
-					url:'/pageA/logisticsinfo'
+					url: '/pageA/logisticsinfo'
 				})
 			},
 			//获取价格
@@ -167,10 +180,10 @@
 		line-height: 50rpx;
 		text-align: left;
 		font-style: normal;
-		padding:32rpx 28rpx 0 0 ;
+		padding: 32rpx 28rpx 0 0;
 		box-sizing: border-box;
 	}
-	
+
 	.back {
 		background-color: rgba(244, 244, 244, 1);
 		padding: 20rpx 24rpx;
@@ -337,7 +350,8 @@
 			}
 
 			.left {
-				width: 202rpx;
+				// width: 202rpx;
+				padding: 0 30rpx;
 				height: 60rpx;
 				border-radius: 36rpx;
 				border: 1rpx solid #F83224;
@@ -348,11 +362,13 @@
 				line-height: 60rpx;
 				text-align: center;
 				font-style: normal;
+				box-sizing: border-box;
 			}
 
 			.right {
-				width: 202rpx;
+				// width: 202rpx;
 				height: 60rpx;
+				padding: 0 30rpx;
 				border-radius: 36rpx;
 				border: 1rpx solid #979797;
 				font-family: PingFangSC, PingFang SC;
@@ -360,6 +376,7 @@
 				font-size: 26rpx;
 				color: #979797;
 				line-height: 60rpx;
+				box-sizing: border-box;
 				text-align: center;
 				font-style: normal;
 			}

+ 33 - 28
pageA/productdetails.vue

@@ -21,14 +21,14 @@
 			<!-- 折扣 -->
 			<view class="discount">
 				<view class="top">
-					<text class='count'>折扣价</text>
+					<text class='count'>{{i18n.Discounted}}</text>
 					<text class='money'>¥</text>
 					<text class='money' style="font-size: 48rpx;">258</text>
 					<text class='money'>.00</text>
 					<text class='right'>¥328.5</text>
 				</view>
 				<view class="bottom">
-					<text class="tabs">同款低价</text>
+					<text class="tabs">{{i18n.sametype}}</text>
 					<view class="title">
 						<text class="title" selectable @longpress="onLongPress">
 							布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼
@@ -40,8 +40,8 @@
 			<view class="serve" style="margin-top: 20rpx;">
 				<view class="top u-flex u-row-between">
 					<view class="u-flex">
-						<view class="change">选择</view>
-						<view class="" style="margin-left: 20rpx;">净含量</view>
+						<view class="change">{{i18n.Sele}}</view>
+						<view class="" style="margin-left: 20rpx;">{{i18n.Netcontent}}</view>
 					</view>
 					<view class="">
 						<u-icon name="arrow-right" size='16'></u-icon>
@@ -49,7 +49,7 @@
 				</view>
 				<view class="top u-flex u-row-between" style="margin-top: 36rpx;">
 					<view class="u-flex" @click="serve=true">
-						<view class="change">服务</view>
+						<view class="change">{{i18n.service}}</view>
 						<view class="" style="margin-left: 20rpx;">正品保障 · 极速退款 · 7天无理由退</view>
 					</view>
 					<view class="">
@@ -60,9 +60,9 @@
 			<!-- 评论 -->
 			<view class="comment">
 				<view class="u-flex u-row-between">
-					<text class="ping">评论</text>
+					<text class="ping">{{i18n.review}}</text>
 					<view class="u-flex">
-						<text class="strip">5000+条评论</text>
+						<text class="strip">5000+{{i18n.article + i18n.review}}</text>
 						<u-icon name="arrow-right" size='16'></u-icon>
 					</view>
 				</view>
@@ -85,41 +85,41 @@
 						<view class="title">小萌优选🔥(每天0元秒杀)</view>
 						<view class="" style='margin-top:20rpx'></view>
 						<view class="u-flex" style='margin-top:20rpx'>
-							<text class='num'>销售量 2384w+</text>
+							<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
 							<view class="line"></view>
-							<text class='num'>销售量 2384w+</text>
+							<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
 						</view>
 					</view>
 				</view>
-				<view class="goshop">逛逛</view>
+				<view class="goshop">{{i18n.stroll}}</view>
 			</view>
 			<!-- 推荐 -->
 			<view class="recommend">
 				<view class="title">
-					推荐商品
+					{{i18n.Recommended}}
 				</view>
 				<view class="">
 					<image src="" mode=""></image>
 				</view>
 			</view>
 			<view class="recommend">
-				<view class="title">商品详情</view>
-				<view class="" style="margin-top: 32rpx;margin-bottom:28rpx">规格参数</view>
+				<view class="title">{{i18n.Productdetails}}</view>
+				<view class="" style="margin-top: 32rpx;margin-bottom:28rpx">{{i18n.Specification}}</view>
 				<view class="specification">
 					<view class="item u-flex" style='margin-bottom:28rpx'>
-						<view style='width:150rpx;'>主要原料</view>
+						<view style='width:150rpx;'>{{i18n.material}}</view>
 						<text style='margin-left:58rpx'>保鲜鸡肉,鸡心,鸡肝</text>
 					</view>
 					<view class="item u-flex" style='margin-bottom:28rpx'>
-						<view style='width:150rpx;'>规格</view>
+						<view style='width:150rpx;'>{{i18n.specification}}</view>
 						<text style='margin-left:58rpx'>300g</text>
 					</view>
 					<view class="item u-flex" style='margin-bottom:28rpx'>
-						<view style='width:150rpx;'>保质期</view>
+						<view style='width:150rpx;'>{{i18n.Shelflife}}</view>
 						<text style='margin-left:58rpx'>12个月</text>
 					</view>
 					<view class="item u-flex">
-						<view style='width:150rpx;'>适用对象</view>
+						<view style='width:150rpx;'>{{i18n.Suitableobject}}</view>
 						<text style='margin-left:58rpx'>3个月以上的全猫种</text>
 					</view>
 				</view>
@@ -133,22 +133,22 @@
 					<view class="u-flex" style="justify-content: center;flex-direction: column;">
 						<image src="../static/images/index/service.png" style='width:40rpx;height:40rpx' mode="">
 						</image>
-						<view class="ke">客服</view>
+						<view class="ke">{{i18n.Customer}}</view>
 					</view>
 					<view class="u-flex" style="justify-content: center;flex-direction: column;" @click="join">
 						<image src="../static/cart1.png" style='width:40rpx;height:40rpx' mode=""></image>
-						<view class="ke">购物车</view>
+						<view class="ke">{{i18n.Shopping}}</view>
 					</view>
 					<view class="u-flex" style="justify-content: center;flex-direction: column;">
 						<image src="../static/images/index/attention.png" style='width:40rpx;height:40rpx' mode="">
 						</image>
-						<view class="ke">关注</view>
+						<view class="ke">{{i18n.follow}}</view>
 					</view>
 				</view>
 				<!-- 	<view class="join" @click="join">加入购物车</view>
 				<view class="pin">立即拼团</view> -->
 				<view class="tongzhi" @click="inform">
-					到货通知
+					{{i18n.notification}}
 				</view>
 			</view>
 		</view>
@@ -216,7 +216,7 @@
 					</view>
 				</view>
 				<view class="button" @click="serve = false">
-					我知道了
+					{{i18n.know}}
 				</view>
 			</view>
 		</u-popup>
@@ -224,7 +224,7 @@
 			<view style="padding:48rpx 24rpx;box-sizing: border-box;background-color: rgba(244, 244, 244, 1);">
 				<view class="u-flex" style="flex-direction: column;justify-content: center;">
 					<text class="info" style="font-size: 32rpx;">
-						分享
+						{{i18n.shar}}
 					</text>
 				</view>
 				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
@@ -234,16 +234,16 @@
 					<view class="">
 						<image src="../static/images/index/link.png" style="width: 108rpx;height: 108rpx;" mode="">
 						</image>
-						<view class="link">复制链接</view>
+						<view class="link">{{i18n.Copylink}}</view>
 					</view>
 					<view class="">
 						<image src="../static/images/index/image.png" style="width: 108rpx;height: 108rpx;" mode="">
 						</image>
-						<view class="link">生成图片</view>
+						<view class="link">{{i18n.Generatepicture}}</view>
 					</view>
 				</view>
 				<view class="button" @click="share = false" style="background: #fff;color: #555555;margin-top: 58rpx;">
-					取消
+					{{i18n.Cancel}}
 				</view>
 			</view>
 		</u-popup>
@@ -271,6 +271,11 @@
 				value: 0, //步进器的值
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			valChange(e) {
 				console.log('当前值为: ' + e.value)
@@ -516,7 +521,7 @@
 		// 规格
 		.specification {
 			width: 670rpx;
-			height: 280rpx;
+			// height: 280rpx;
 			background: #F4F4F4;
 			padding: 24rpx 22rpx;
 			box-sizing: border-box;
@@ -535,7 +540,7 @@
 		// 推荐
 		.recommend {
 			width: 710rpx;
-			height: 476rpx;
+			// height: 476rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx;
 			padding: 24rpx 20rpx;

+ 23 - 16
pageA/shoplist.vue

@@ -8,62 +8,64 @@
 		<view class="box" style="position: relative;">
 			<view class="u-flex u-row-between">
 				<view @click="current=0" class="u-flex" :style="{color:current==0?'rgba(255, 21, 21, 1)':''}">
-					<view>综合</view>
+					{{i18n.synthesis}}
+					<view>
+					</view>
 					<u-icon name="arrow-down-fill" color="rgba(255, 21, 21, 1)" size="8"></u-icon>
 				</view>
-				<text @click="current=1" :style="{color:current==1?'rgba(255, 21, 21, 1)':''}">销量</text>
+				<text @click="current=1" :style="{color:current==1?'rgba(255, 21, 21, 1)':''}">{{i18n.sell}}</text>
 				<view @click="current=2" class=" u-flex" :style="{color:current==2?'rgba(255, 21, 21, 1)':''}">
-					<view>价格</view>
+					<view>{{i18n.Pricea}}</view>
 					<image src="static/images/up.png" style="width: 16rpx;height: 16rpx;" mode=""></image>
 				</view>
 				<text @click="current=3" :style="{color:current==3?'rgba(255, 21, 21, 1)':''}">≤1kg</text>
 				<text>|</text>
 				<view class="u-flex" :style="{color:current==4?'rgba(255, 21, 21, 1)':''}" @click="shaixuan">
-					<view>筛选</view>
+					<view style="margin-right: 10rpx;">{{i18n.screen}}</view>
 					<image v-if="current==4" src="static/images/shaixuana.png" style="width: 24rpx;height: 24rpx;"
 						mode=""></image>
 					<image v-else src="static/images/shaixuan.png" style="width: 24rpx;height: 24rpx;" mode=""></image>
 				</view>
 			</view>
 			<liu-waterfall :dataList="data" :column="columns" @click="click"></liu-waterfall>
-			<view class="pop" style="position: absolute;top:80rpx" v-if="shai">
-				<view class="title">价格区间</view>
+			<view class="pop" style="position: absolute;top:80rpx" v-if="shai&&current==4">
+				<view class=" title">{{i18n.Pricerange}}</view>
 				<view class="u-flex u-row-between">
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" placeholder="最低价" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice" />
 					</view>
 					<text>-</text>
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" placeholder="最高价" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice" />
 					</view>
 				</view>
-				<view class="title" style="margin-top: 36rpx;">重量区间</view>
+				<view class="title" style="margin-top: 36rpx;">{{i18n.Weightinterval}}</view>
 				<view class="u-flex u-row-between">
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" placeholder="最低价" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice" />
 					</view>
 					<text>-</text>
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" placeholder="最高价" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice" />
 					</view>
 				</view>
-				<view style="margin-top: 36rpx;" class="title">品牌</view>
+				<view style="margin-top: 36rpx;" class="title">{{i18n.brand}}</view>
 				<view class="u-flex " style="flex-wrap: wrap;column-gap: 34rpx;">
 					<view @click="changei(idx)" class="item" v-for="(item,idx) in 8" :key="idx"
 						:class="index==idx?'acitem':'item'">
 						PURICH/醇粹
 					</view>
 				</view>
-				<view style="margin-top: 36rpx;" class="title">自营商品</view>
+				<view style="margin-top: 36rpx;" class="title">{{i18n.Proprietary}}</view>
 				<view class="item">
-					
+					{{i18n.yes}}
 				</view>
 				<view class="bottom u-flex" style="margin-top: 58rpx;">
 					<view class="btn1">
-						重置
+						{{i18n.reset}}
 					</view>
 					<view class="btn2">
-						确定
+						{{i18n.enter}}
 					</view>
 				</view>
 			</view>
@@ -182,6 +184,11 @@
 				columns: 2,
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			shaixuan() {
 				this.shai = true,

+ 118 - 108
pageA/shoptype.vue

@@ -1,124 +1,134 @@
 <template>
-    <view class="">
-        <zhSlidingMenu ref='zhSlidingMenu' :tabbar='list' :scrollH="scrollH">
-            <template #default="{scroll_list}">
-                <view class="goods">
-                    <view class="goods_item" v-for="(item, index) in scroll_list" :key="index"
-                        @click="clickGoods(item)">
-                        <image class="goods_item_img" :src="item.icon" mode=""></image>
-                        <view class="goods_item_name">{{item.name}}</view>
-                    </view>
-                </view>
-            </template>
-        </zhSlidingMenu>
-    </view>
+	<view class="">
+		<zhSlidingMenu ref='zhSlidingMenu' :tabbar='list' :scrollH="scrollH">
+			<template #default="{scroll_list}">
+				<view class="goods">
+					<view class="goods_item" v-for="(item, index) in scroll_list" :key="index"
+						@click="clickGoods(item)">
+						<image class="goods_item_img" :src="item.icon" mode=""></image>
+						<view class="goods_item_name">{{item.name}}</view>
+					</view>
+				</view>
+			</template>
+		</zhSlidingMenu>
+	</view>
 </template>
 
 <script>
 	import zhSlidingMenu from '@/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.vue'
-    export default {
-        components: {
-            zhSlidingMenu
-        },
-        data() {
-            return {
-                scrollH: 0, //scroll高度
-                list: [{
-                        name: "女装",
-                        children: [{
-                                name: "A字裙",
-                                icon: "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
-                            },
-                            {
-                                name: "礼服/婚纱",
-                                icon: "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
-                            }
-                        ]
-                    },
-                    {
-                        name: "美食",
-                        children: [{
-                                name: "火锅",
-                                icon: "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
-                            },
-                            {
-                                name: "精品茗茶",
-                                icon: "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
-                            },
-                            {
-                                name: "休闲食品",
-                                icon: "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
-                            },
-                        ]
-                    },
-                    {
-                        name: "美妆",
-                        children: [{
-                                name: "化妆刷",
-                                icon: "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
-                            },
-                            {
-                                name: "防晒品",
-                                icon: "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
-                            },
-                            {
-                                name: "美甲",
-                                icon: "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
-                            }
+	export default {
+		components: {
+			zhSlidingMenu
+		},
+		data() {
+			return {
+				scrollH: 0, //scroll高度
+				list: [{
+						name: "女装",
+						children: [{
+								name: "A字裙",
+								icon: "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
+							},
+							{
+								name: "礼服/婚纱",
+								icon: "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
+							}
+						]
+					},
+					{
+						name: "美食",
+						children: [{
+								name: "火锅",
+								icon: "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
+							},
+							{
+								name: "精品茗茶",
+								icon: "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
+							},
+							{
+								name: "休闲食品",
+								icon: "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
+							},
+						]
+					},
+					{
+						name: "美妆",
+						children: [{
+								name: "化妆刷",
+								icon: "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
+							},
+							{
+								name: "防晒品",
+								icon: "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
+							},
+							{
+								name: "美甲",
+								icon: "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
+							}
 
-                        ]
-                    }
-                ],
-            }
-        },
-        onLoad() {
-            uni.getSystemInfo({
-                success: (res) => {
-                    this.scrollH = res.windowHeight
-                }
-            });
-        },
-        methods: {
-            clickGoods(item) { //点击商品
-                console.log(item);
+						]
+					}
+				],
+			}
+		},
+		onLoad() {
+			uni.getSystemInfo({
+				success: (res) => {
+					this.scrollH = res.windowHeight
+				}
+			});
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.classification
+			})
+		},
+		methods: {
+			clickGoods(item) { //点击商品
+				console.log(item);
 				uni.navigateTo({
-					url:'/pageA/shoplist'
+					url: '/pageA/shoplist'
 				})
-            },
-        },
-    }
+			},
+		},
+	}
 </script>
 
 <style lang="scss" scoped>
-    .goods {
-        display: flex;
-        flex-wrap: wrap;
+	.goods {
+		display: flex;
+		flex-wrap: wrap;
 
-        .goods_item {
-            width: 33.3%;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            flex-direction: column;
-            margin-top: 20rpx;
+		.goods_item {
+			width: 33.3%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			margin-top: 20rpx;
 
-            .goods_item_img {
-                width: 120rpx;
-                height: 120rpx;
-            }
+			.goods_item_img {
+				width: 120rpx;
+				height: 120rpx;
+			}
 
-            .goods_item_name {
-                color: #333;
-                font-size: 28rpx;
-                font-weight: 500rpx;
-                display: -webkit-box;
-                -webkit-box-orient: vertical;
-                -webkit-line-clamp: 1;
-                overflow: hidden;
-                word-break: break-all;
-                text-align: center;
-            }
-        }
+			.goods_item_name {
+				color: #333;
+				font-size: 28rpx;
+				font-weight: 500rpx;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+				overflow: hidden;
+				word-break: break-all;
+				text-align: center;
+			}
+		}
 
-    }
+	}
 </style>

+ 29 - 17
pageB/Senderinfor.vue

@@ -3,38 +3,38 @@
 	<view class="back">
 		<view class="info">
 			<view class="item u-flex u-row-between">
-				<text class="title">填写寄件人信息</text>
+				<text class="title">{{i18n.goods}}</text>
 				<view class="u-flex">
 					<u-icon name="order" color="rgba(0, 0, 0, 0.6)" size="23"></u-icon>
-					<text class="wx">微信地址薄</text>
+					<text class="wx">{{i18n.wxAddress}}</text>
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">姓名</text>
+				<text class="left">{{i18n.name}}</text>
 				<view class="right">
-					<input type="text" placeholder="请填写" />
+					<input type="text" :placeholder="i18n.Fill" />
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">手机号</text>
+				<text class="left">{{i18n.phone}}</text>
 				<view class="right">
-					<input type="text" placeholder="请填写" />
+					<input type="text" :placeholder="i18n.Fill" />
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">省市区</text>
+				<text class="left">{{i18n.city}}</text>
 				<view class="right">
-					<input type="text" placeholder="请选择" disabled="" />
+					<input type="text" :placeholder="i18n.selection" disabled="" />
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">详细地址</text>
+				<text class="left">{{i18n.detailed}}</text>
 				<view class="right">
-					<input type="area" placeholder="请填写" disabled="" />
+					<input type="area" :placeholder="i18n.Fill" disabled="" />
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<input type="area" placeholder="公司名称(选填)" />
+				<input type="area" :placeholder="i18n.company" />
 			</view>
 			<!-- 默认地址 -->
 			<view class="u-flex u-row-between" style="margin-top: 22rpx;">
@@ -45,14 +45,14 @@
 							</u-checkbox>
 						</u-checkbox-group>
 					</view>
-					<text class="clear">默认寄件地址</text>
+					<text class="clear">{{i18n.initial}}</text>
 				</view>
 				<text class="clear">
-					清空
+					{{i18n.empty}}
 				</text>
 			</view>
 		</view>
-		<view class="history">历史地址</view>
+		<view class="history">{{i18n.history}}</view>
 		<view class="add">
 			<view class="">
 				<text class="name">陈盼盼</text>
@@ -76,6 +76,16 @@
 				name: 1
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.goods
+			})
+		},
 		methods: {
 			checkboxChange(n) {
 				console.log('change', n);
@@ -185,8 +195,10 @@
 
 			.item {
 				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-				height: 100rpx;
-				line-height: 100rpx;
+				// height: 100rpx;
+				min-height: 100rpx;
+				padding: 20rpx 0;
+				box-sizing: border-box;
 
 				.title {
 					font-family: PingFangSC, PingFang SC;
@@ -216,7 +228,7 @@
 					line-height: 40rpx;
 					text-align: left;
 					font-style: normal;
-					width: 115rpx;
+					width: 160rpx;
 				}
 
 				.right {

+ 22 - 10
pageB/goods.vue

@@ -3,8 +3,8 @@
 	<view class="back">
 		<view class="top">
 			<view class="u-flex">
-				<text class="title">物品信息</text>
-				<view class="mast">必填</view>
+				<text class="title">{{i18n.item}}</text>
+				<view class="mast">{{i18n.required}}</view>
 			</view>
 			<view class="" style="margin-top: 30rpx;">
 				<view class="about u-flex"
@@ -25,16 +25,16 @@
 		</view>
 		<view class="type  u-flex u-row-between">
 			<view class="">
-				<text class="title">商品类型</text>
+				<text class="title">{{i18n.shoptype}}</text>
 			</view>
 			<view class="">
-				<text class="change">请选择</text>
+				<text class="change">{{i18n.selection}}</text>
 				<image src="../static/express/next1.png" style="width: 26rpx;height: 26rpx;" mode=""></image>
 			</view>
 		</view>
 		<view class="abouta">
 			<view class="u-flex u-row-between">
-				<view class="title">预估重量</view>
+				<view class="title">{{i18n.estimated}}</view>
 				<view class="">
 					<u-number-box v-model="value">
 						<view slot="minus" class="minus">
@@ -49,7 +49,7 @@
 			</view>
 			<view class="u-flex u-row-between"
 				style="border-top: 2rpx solid rgba(151, 151, 151, 0.1);padding-top: 30rpx;margin-top: 32rpx;">
-				<view class="title">件数</view>
+				<view class="title">{{i18n.piece}}</view>
 				<view class="">
 					<u-number-box v-model="value">
 						<view slot="minus" class="minus">
@@ -65,12 +65,12 @@
 			<view class="u-flex" style="margin-top: 28rpx;">
 				<view class="zhu">
 					注:实际重量体积以收派员确定为准,物品在
-					<text class="rule"> 了解计费规则</text>
+					<text class="rule"> {{i18n.rule}}</text>
 				</view>
 			</view>
 		</view>
 		<view class="btn">
-			<view class="button">确定</view>
+			<view class="button">{{i18n.enter}}</view>
 		</view>
 	</view>
 </template>
@@ -81,7 +81,17 @@
 			return {
 				value: 1
 			};
-		}
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.item
+			})
+		},
 	}
 </script>
 
@@ -221,7 +231,7 @@
 
 
 			.mast {
-				width: 62rpx;
+				// width: 62rpx;
 				height: 30rpx;
 				border-radius: 16rpx;
 				border: 1rpx solid #F83224;
@@ -233,6 +243,8 @@
 				text-align: center;
 				font-style: normal;
 				margin-left: 8rpx;
+				padding: 0 6rpx;
+				box-sizing:border-box;
 			}
 
 			.about {

+ 32 - 16
pageB/myPackage.vue

@@ -4,7 +4,7 @@
 		<view class="top">
 			<view class="inputbg u-flex">
 				<u-icon name="search" color="#777777" size="32"></u-icon>
-				<input type="text" placeholder="请输入订单编号搜索" style="flex: 1;margin-left: 12rpx;" />
+				<input type="text" :placeholder="i18n.orderSearch" style="flex: 1;margin-left: 12rpx;" />
 			</view>
 			<!-- rgba(252, 97, 74, 1) -->
 			<view class="">
@@ -14,16 +14,16 @@
 		<view class="content">
 			<view class="kg u-flex">
 				<image src="static/images/kg.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
-				<text style="margin-left: 20rpx;">当前页面加载的订单总重量300kg</text>
+				<text style="margin-left: 20rpx;">{{i18n.orderWeight}}300kg</text>
 			</view>
 			<view class="info" v-if="current==0">
 				<view class="u-flex u-row-between">
 					<view class="u-flex ">
-						<!-- <view class="tab">平台自购</view> -->
-						<view class="tab" style="background: rgba(255, 103, 0, 1);">自寄</view>
-						<text class="order">订单编号:487322109310589</text>
+						<!-- <view class="tab">{{i18n.purchase}}</view> -->
+						<view class="tab" style="background: rgba(255, 103, 0, 1);">{{i18n.selfPost}}</view>
+						<text class="order">{{i18n.OrderNumber}}:487322109310589</text>
 					</view>
-					<text class="order" style="color:rgba(248, 50, 36, 1) ;">待平台收货</text>
+					<text class="order" style="color:rgba(248, 50, 36, 1) ;">{{i18n.receiveGoods}}</text>
 				</view>
 				<view class="u-flex u-row-around" style="margin-top: 40rpx;">
 					<view class="flexc">
@@ -37,23 +37,25 @@
 					</view>
 				</view>
 				<view class="" style="margin-top: 36rpx;text-align: right;">
-					<text class="sum">合计</text>
+					<text class="sum">{{i18n.total}}</text>
 					<text class="money" style="">¥</text>
 					<text class="money" style="font-size: 36rpx;">1280</text>
 					<text class="money">.00</text>
 				</view>
 				<view class="content-bottom u-flex u-row-between">
-					<text class="weight">包裹重量:45kg</text>
+					<text class="weight">{{i18n.Parcelweight}}:45kg</text>
 					<view class="u-flex">
-						<!-- 	<view class="btn">冻结</view>
-						<view class="btn">查看详情</view> -->
-						<!-- <view class="btn">恢复</view> -->
-						<view class="btn"
+						<view class="btn">{{i18n.Frozen}}</view>
+						<view class="btn">{{i18n.details}}</view>
+						<!-- <view class="btn">{{i18n.recover}}</view> -->
+<!-- 						<view class="btn"
 							style="background-color:rgba(248, 50, 36, 1) ;color: #fff;border: 2rpx solid rgba(248, 50, 36, 0);">
-							立即付款</view>
+							{{i18n.payment}}
+						</view>
 						<view class="btn"
 							style="background-color:rgba(248, 50, 36, 1) ;color: #fff;border: 2rpx solid rgba(248, 50, 36, 0);">
-							去寄件</view>
+							{{i18n.mail}}
+						</view> -->
 					</view>
 				</view>
 			</view>
@@ -76,11 +78,25 @@
 			};
 		},
 		onLoad(options) {
+			this.list1 = [{
+				name: this.i18n.deliver,
+			}, {
+				name: this.i18n.Sign,
+			}, {
+				name: this.i18n.overseas
+			}]
 			console.log(options);
 			this.current = options.index
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		onShow() {
-
+			uni.setNavigationBarTitle({
+				title: this.i18n.mine + this.i18n.parcel
+			})
 		},
 		methods: {
 			click(item) {
@@ -127,7 +143,7 @@
 				border-radius: 34rpx;
 				border: 1rpx solid rgba(151, 151, 151, 0.7);
 				display: inline;
-				padding: 0 38rpx;
+				padding: 0 20rpx;
 				box-sizing: border-box;
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;

+ 21 - 8
pageB/parcel.vue

@@ -3,25 +3,25 @@
 	<view class="back">
 		<view class="box">
 			<view class="boxitem u-flex">
-				<text class="name">快递单号</text>
-				<input style="flex: 1;" type="text" placeholder="输入快递单号,快速添加到我的包裹" />
+				<text class="name">{{i18n.TrackingNumber}}</text>
+				<input style="flex: 1;" type="text" :placeholder="i18n.trackingNumber" />
 			</view>
 		</view>
 		<view class="box">
 			<view class="boxitem u-flex">
-				<text class="name">快递公司</text>
-				<input style="flex: 1;" type="text" placeholder="输入快递公司名称" />
+				<text class="name">{{i18n.Expresscompany}}</text>
+				<input style="flex: 1;" type="text" :placeholder="i18n.ExpressCompany" />
 			</view>
 		</view>
 		<view class="box">
 			<view class="boxitem u-flex">
-				<text class="name">包裹重量</text>
-				<input style="flex: 1;" type="text" placeholder="请输入包裹重量" />
+				<text class="name">{{i18n.Parcelweight}}</text>
+				<input style="flex: 1;" type="text" :placeholder="i18n.parcelWeight" />
 				<text>kg</text>
 			</view>
 		</view>
 		<view class="btn">
-			添加到包裹列表
+			{{i18n.Addlist}}
 		</view>
 	</view>
 </template>
@@ -32,7 +32,17 @@
 			return {
 
 			};
-		}
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.Addparcel
+			})
+		},
 	}
 </script>
 
@@ -65,6 +75,7 @@
 		// height: 324rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
+		box-sizing: border-box;
 
 		.boxitem {
 			height: 100rpx;
@@ -74,6 +85,8 @@
 		}
 
 		.name {
+			width: 150rpx;
+			display: block;
 			font-family: PingFangSC, PingFang SC;
 			font-weight: 400;
 			font-size: 30rpx;

+ 33 - 22
pageB/recipientinfo.vue

@@ -3,56 +3,56 @@
 	<view class="back">
 		<view class="info">
 			<view class="item u-flex u-row-between">
-				<text class="title">填写收件人信息</text>
+				<text class="title">{{i18n.goods}}</text>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">国家</text>
+				<text class="left">{{i18n.country}}</text>
 				<view class="right u-flex u-row-between" style="flex: 1;">
-					<input type="text" placeholder="请选择" />
+					<input type="text" :placeholder="i18n.selection" />
 					<image src="../static/express/next1.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">姓名</text>
+				<text class="left">{{i18n.name}}</text>
 				<view class="right">
 					<input type="text" placeholder="请输入收件人姓名" />
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">手机号</text>
+				<text class="left">{{i18n.phone}}</text>
 				<view class="right">
-					<input type="text" placeholder="请输入手机号" />
+					<input type="text" :placeholder="i18n.pleasePhoneNumber" />
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">邮编</text>
+				<text class="left">{{i18n.postalCode}}</text>
 				<view class="right">
-					<input type="text" placeholder="请输入邮编" />
+					<input type="text" :placeholder="i18n.PleacePostalCode" />
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">省市区</text>
+				<text class="left">{{i18n.city}}</text>
 				<view class="right u-flex u-row-between " style="flex: 1;">
-					<input type="text" placeholder="请选择" disabled="" />
+					<input type="text" :placeholder="i18n.selection" disabled="" />
 					<image src="../static/express/next1.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">详细地址</text>
+				<text class="left">{{i18n.detailed}}</text>
 				<view class="right">
-					<input type="area" placeholder="详细地址精确到门牌号" />
+					<input type="area" :placeholder="i18n.sect" />
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">公司名称</text>
+				<text class="left">{{i18n.companyName}}</text>
 				<view class="right">
-					<input type="area" placeholder="请输入公司名称(选填)" />
+					<input type="area" :placeholder="i18n.company" />
 				</view>
 			</view>
 			<view class="item u-flex ">
-				<text class="left">电子邮箱</text>
+				<text class="left">{{i18n.email}}</text>
 				<view class="right">
-					<input type="area" placeholder="请输入电子邮箱(选填)" />
+					<input type="area" :placeholder="i18n.pleaseEmail" />
 				</view>
 			</view>
 			<!-- 默认地址 -->
@@ -64,10 +64,10 @@
 							</u-checkbox>
 						</u-checkbox-group>
 					</view>
-					<text class="clear">保存到地址薄</text>
+					<text class="clear">{{i18n.addressBook}}</text>
 				</view>
 				<text class="clear">
-					清空
+					{{i18n.empty}}
 				</text>
 			</view>
 		</view>
@@ -92,7 +92,17 @@
 			checkboxChange(n) {
 				console.log('change', n);
 			}
-		}
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.goods
+			})
+		},
 	}
 </script>
 
@@ -178,7 +188,7 @@
 		}
 
 		.info {
-			padding:  0 24rpx 28rpx;
+			padding: 0 24rpx 28rpx;
 			box-sizing: border-box;
 			width: 702rpx;
 			// height: 742rpx;
@@ -197,8 +207,9 @@
 
 			.item {
 				border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-				height: 100rpx;
-				line-height: 100rpx;
+				min-height: 100rpx;
+				padding: 20rpx 0;
+				box-sizing: border-box;
 
 				.title {
 					font-family: PingFangSC, PingFang SC;

+ 1 - 1
pages/cart/cart.vue

@@ -88,7 +88,7 @@
 				<view class="settle">去结算</view>
 			</view>
 		</view>
-		<kj-tabbar :value1=3></kj-tabbar>
+		<kj-tabbar  :value1=3></kj-tabbar>
 	</view>
 </template>
 

+ 75 - 60
pages/express/express.vue

@@ -6,8 +6,8 @@
 			<image src="../../static/images/index/back.png"
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;left:-24rpx;" mode="">
 			</image>
-			<u-navbar bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true' :safeAreaInsetTop="true"
-				style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
+			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :safeAreaInsetTop="true"
+				style="position: absolute;z-index: 110;">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<image src="../../static/images/index/xiaoxi.png" mode="" style="width: 40rpx;height: 40rpx;">
 					</image>
@@ -32,12 +32,12 @@
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
 						<view class="u-row-between " style="" @click="send">
-							<view class="pople">新建寄件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.sender}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
@@ -50,23 +50,23 @@
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
 						<view class="u-row-between " style="" @click="recipirnt">
-							<view class="pople">新建收件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.recipient}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
 				<!-- 物品信息 -->
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
-						<text class="wupin">物品信息</text>
-						<view class="mast">必填</view>
+						<text class="wupin">{{i18n.item}}</text>
+						<view class="mast">{{i18n.required}}</view>
 					</view>
-					<view class="u-flex" @click='goods'>
-						<text class="change">请选择物品信息</text>
+					<view class="u-flex" @click='goods'>  
+						<view class="change">{{i18n.selection}}</view>
 						<image src="../../static/express/next1.png"
 							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
 					</view>
@@ -74,10 +74,10 @@
 				<!-- 跨境物流 -->
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
-						<text class="wupin">跨境物流</text>
+						<text class="wupin">{{i18n.flow}}</text>
 					</view>
 					<view class="u-flex" @click="logshow=true">
-						<text class="change" style="color: rgba(248, 50, 36, 1);">请选择</text>
+						<text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text>
 						<image src="../../static/express/next1.png"
 							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
 					</view>
@@ -85,19 +85,19 @@
 				<!-- 去寄件 -->
 				<view class="" style="margin-top: 34rpx;">
 					<view class="mail" @click="count">
-						去寄件
+						{{i18n.mail}}
 					</view>
 				</view>
 				<view class="bottom u-flex u-row-between">
 					<view class="u-flex">
 						<image src="../../static/express/share.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
-						<text class="friend">分享给好友</text>
+						<text class="friend">{{i18n.share}}</text>
 					</view>
-					<view class="friend">|</view>
+					<view class="friend">|</view>  
 					<view class="u-flex" @click="counter">
 						<image src="/static/images/index/compile.png" style="width: 36rpx;height: 36rpx;" mode="">
 						</image>
-						<text class="friend">物流计算器</text>
+						<text class="friend">{{i18n.compute}}</text>
 					</view>
 				</view>
 			</view>
@@ -105,12 +105,12 @@
 			<view class="parcel">
 				<view class="u-flex u-row-between">
 					<view class="myparcel">
-						<text>我的</text>
-						<text style="color: rgba(248, 50, 36, 1);">包裹</text>
+						<text>{{i18n.mine}}</text>
+						<text style="color: rgba(248, 50, 36, 1);">{{i18n.parcel}}</text>
 					</view>
 					<view class="add u-flex">
 						<image src="../../static/express/add.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
-						<text class="addtext" @click="toparcel">添加寄往中转点包裹</text>
+						<text class="addtext" @click="toparcel">{{i18n.addsign}}</text>
 					</view>
 				</view>
 				<view class="u-flex u-row-around" style="margin-top: 44rpx;">
@@ -119,28 +119,28 @@
 						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="value"></u-badge>
 						<!-- </view> -->
 						<image src="/static/express/address.png" style='width:68rpx;height:68rpx' mode=""></image>
-						<text style='margin-top:16rpx' >发往中转点</text>
+						<text style='margin-top:16rpx'>{{i18n.deliver}}</text>
 					</view>
 					<view class="flexc" style="position: relative;" @click="pack(1)">
 						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="value"></u-badge>
 						<image src="/static/express/sign.png" style='width:68rpx;height:68rpx' mode=""></image>
-						<text style='margin-top:16rpx' >中转已签收</text>
+						<text style='margin-top:16rpx'>{{i18n.Sign}}</text>
 					</view>
 					<view class="flexc" style="position: relative;" @click="pack(2)">
 						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="value"></u-badge>
 						<image src="../../static/express/send.png" style='width:68rpx;height:68rpx' mode=""></image>
-						<text style='margin-top:16rpx' >正发往海外</text>
+						<text style='margin-top:16rpx'>{{i18n.overseas}}</text>
 					</view>
 				</view>
 			</view>
 			<!-- 拼包 -->
 			<view class="u-flex u-row-between" style="margin-top: 32rpx;">
 				<view class="u-flex">
-					<text class="hai">拼包发海外</text>
+					<text class="hai">{{i18n.parceling}}</text>
 					<image style="width: 180rpx;height: 32rpx;" src="/static/express/label.png" mode=""></image>
 				</view>
 				<view class="u-flex">
-					<text class="more" @click="more">更多</text>
+					<text class="more" @click="more">{{i18n.more}}</text>
 					<image src="../../static/express/next2.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
 				</view>
 			</view>
@@ -159,7 +159,7 @@
 								<text class='bigtitle'>海运散货</text>
 							</view>
 							<view class="mon">
-								<text class="timeb">单价</text>
+								<text class="timeb">{{i18n.price}}</text>
 								<text>¥</text>
 								<text style="font-size: 32rpx;">28</text>
 								<text>.00</text>
@@ -172,24 +172,24 @@
 						<view class="u-flex u-row-between" style="margin-top: 20rpx;">
 							<view class="u-flex">
 								<view class="">
-									<text class='timeb'>已拼 </text>
+									<text class='timeb'>{{i18n.already}} </text>
 									<text class='timeb' style='color:rgba(255, 21, 21, 1)'>200kg</text>
 								</view>
 								<text style="margin: 0 8rpx;">|</text>
 								<view class="">
-									<text class='timeb'>剩余重量 </text>
+									<text class='timeb'>{{i18n.residue}} </text>
 									<text class='timeb' style='color:rgba(255, 21, 21, 1)'>400kg</text>
 								</view>
 							</view>
 							<view class="">
-								<text class="timeb">进度50%</text>
+								<text class="timeb">{{i18n.plan}}50%</text>
 							</view>
 						</view>
 					</view>
 				</view>
 				<view class="u-flex u-row-between" style="margin-top: 32rpx;">
-					<text class="timea">开始时间:2023-12-31/截止时间:2023-12-31</text>
-					<view class="pinb" @click="toaccount">去拼包</view>
+					<text class="timea">{{i18n.start}}:2023-12-31/{{i18n.cut}}:2023-12-31</text>
+					<view class="pinb" @click="toaccount">{{i18n.goparceling}}</view>
 				</view>
 			</view>
 		</view>
@@ -208,7 +208,7 @@
 		data() {
 			return {
 				//顶部分段器
-				list: ['跨境速递', '商城'],
+				list: [],
 				current: 0,
 				type: "error",
 				value: 1, //徽标数量
@@ -217,56 +217,69 @@
 			}
 		},
 		onLoad(options) {
+			this.list = [this.i18n.border,this.i18n.shop]
 			if (options.current) {
 				this.current = options.current
 			}
 		},
+		onShow() {
+			this.list[0] = this.i18n.border
+			this.list[1] = this.i18n.shop
+			uni.setNavigationBarTitle({
+				title: this.i18n.setup
+			})
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
-			count(){
+			count() {
 				uni.navigateTo({
-					url:'/pageB/account'
+					url: '/pageB/account'
 				})
 			},
-			pack(index){
+			pack(index) {
 				uni.navigateTo({
-					url:'/pageB/myPackage?index='+index
+					url: '/pageB/myPackage?index=' + index
 				})
 			},
-			more(){
+			more() {
 				uni.navigateTo({
-					url:'/pageB/list/list'    
+					url: '/pageB/list/list'
 				})
 			},
 			//拼包快递
-			toaccount(){
+			toaccount() {
 				uni.navigateTo({
-					url:'/pageB/ParcelExpress'
+					url: '/pageB/ParcelExpress'
 				})
 			},
 			//物流计算器
-			counter(){
+			counter() {
 				uni.navigateTo({
-					url:'/pageA/counter'
+					url: '/pageA/counter'
 				})
 			},
 			//物品信息
-			goods(){
+			goods() {
 				uni.navigateTo({
-					url:'/pageB/goods'
+					url: '/pageB/goods'
 				})
 			},
 			//寄件人信息
-			send(){
+			send() {
 				uni.navigateTo({
-					url:'/pageB/Senderinfor'
+					url: '/pageB/Senderinfor'
 				})
 			},
-			recipirnt(){
+			recipirnt() {
 				uni.navigateTo({
-					url:'/pageB/recipientinfo'
+					url: '/pageB/recipientinfo'
 				})
 			},
-			success(){
+			success() {
 				this.logshow = false
 			},
 			close() {
@@ -301,7 +314,7 @@
 		line-height: 50rpx;
 		text-align: left;
 		font-style: normal;
-		padding:32rpx 28rpx 0 0 ;
+		padding: 32rpx 28rpx 0 0;
 		box-sizing: border-box;
 	}
 
@@ -425,7 +438,7 @@
 
 	.parcel {
 		width: 702rpx;
-		height: 260rpx;
+		// height: 260rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		margin-top: 20rpx;
@@ -462,7 +475,7 @@
 
 	.address {
 		width: 702rpx;
-		height: 776rpx;
+		// height: 776rpx;
 		background: #FFFFFF;
 		border-radius: 20rpx;
 		padding: 48rpx 24rpx 36rpx;
@@ -528,7 +541,7 @@
 			}
 
 			.mast {
-				width: 62rpx;
+				// width: 62rpx;
 				height: 30rpx;
 				border-radius: 16rpx;
 				border: 1rpx solid #F83224;
@@ -540,6 +553,8 @@
 				text-align: center;
 				font-style: normal;
 				margin-left: 12rpx;
+				padding:  0 4rpx;
+				box-sizing: border-box;
 			}
 		}
 
@@ -579,13 +594,13 @@
 		}
 	}
 
-	::v-deep .u-navbar__content.data-v-1194bf80 {
-		background-color: rgba(0, 0, 0, 0) !important;
-	}
+	// ::v-deep .u-navbar__content.data-v-1194bf80 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
 
-	::v-deep .u-status-bar.data-v-13f16680 {
-		background-color: rgba(0, 0, 0, 0) !important;
-	}
+	// ::v-deep .u-status-bar.data-v-13f16680 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
 
 	::v-deep .u-subsection--button.data-v-b14d3440 {
 		/* padding: 6rpx 34rpx !important; */

+ 57 - 38
pages/index/index.vue

@@ -6,7 +6,7 @@
 			<!-- 自定义导航栏 -->
 			<image src="../../static/images/index/back.png"
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;" mode=""></image>
-			<u-navbar bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true'  :fixed='true'
+			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :fixed='true'
 				style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<image src="../../static/images/index/xiaoxi.png" mode="" style="width: 40rpx;height: 40rpx;">
@@ -26,27 +26,27 @@
 				<view class="search">
 					<view class="u-flex">
 						<u-icon name="search" size='32'></u-icon>
-						<input type="text" placeholder="请输入要搜索的内容" />
+						<input type="text" :placeholder="i18n.Searchcon" />
 					</view>
 					<view class="right">
-						搜索
-					</view>     
+						{{i18n.search}}
+					</view>
 				</view>
 				<!-- tabs -->
 				<view class=""
 					style="display: flex;margin-top: 20rpx;align-items: center;justify-content: space-between;">
-					<u-tabs :list="list1" @click="click"></u-tabs>
+					<u-tabs :list="list1"></u-tabs>
 					<view class="border">
 					</view>
 					<view class="u-flex" style="margin-left: 24rpx;width: 100rpx;" @click="shoptype">
 						<image src="../../static/images/index/fenlei.png" style="width: 24rpx;height: 24rpx;;" mode="">
 						</image>
-						<text class="fenlei">分类</text>
+						<text class="fenlei">{{i18n.sort}}</text>
 					</view>
 				</view>
 				<!-- 轮播图 -->
 				<view class="" style="margin-top: 20rpx;">
-					<u-swiper radius='10' :indicator='true' :list="banner" @click="click"></u-swiper>
+					<u-swiper radius='10' :indicator='true' :list="banner"></u-swiper>
 				</view>
 			</view>
 			<view class="shopback">
@@ -55,7 +55,7 @@
 						<view class="u-flex">
 							<image src="../../static/images/index/butie.png" style="width: 104rpx;height: 26rpx;"
 								mode=""></image>
-							<view class="biaoqian" style="background: #F35D22;">买贵必赔</view>
+							<view class="biaoqian" style="background: #F35D22;">{{i18n.expensive}}</view>
 						</view>
 						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
 							<view v-for="(item,idx) in 4" class="ssbox  " style="margin-top: 16rpx;">
@@ -63,13 +63,16 @@
 									<image src=""
 										style="background-color: rgba(119, 119, 119, 1);width: 144rpx;height: 144rpx;"
 										mode=""></image>
-									<view class="" style="position: absolute;bottom: 10rpx;margin-left: 8rpx">
+									<view class="u-flex u-row-center"
+										style="position: absolute;bottom: 10rpx;width: 144rpx;">
 										<view class="u-flex">
-											<image src="../../static/images/index/down.png"
-												style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
-												mode="">
-											</image>
-											<view class="tag" style="background: rgba(243, 93, 34, 1);">已补15元</view>
+											<view class="tag u-flex" style="background: rgba(243, 93, 34, 1);">
+												<image src="../../static/images/index/down.png"
+													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
+													mode="">
+												</image>
+												<text>{{15 + i18n.RMB}}</text>
+											</view>
 										</view>
 									</view>
 								</view>
@@ -84,7 +87,8 @@
 							<view class="u-flex">
 								<image src="../../static/images/index/pinbao.png" style="width: 164rpx;height: 26rpx;"
 									mode=""></image>
-								<view class="biaoqian" style="background: rgba(255, 148, 21, 1);">买贵必赔</view>
+								<view class="biaoqian" style="background: rgba(255, 148, 21, 1);">{{i18n.expensive}}
+								</view>
 							</view>
 							<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
 								<view v-for="(item,idx) in 2" class="ssbox  " style="margin-top: 16rpx;">
@@ -92,13 +96,19 @@
 										<image src=""
 											style="background-color: rgba(119, 119, 119, 1);width: 144rpx;height: 144rpx;"
 											mode=""></image>
-										<view class="" style="position: absolute;bottom: 10rpx;margin-left: 8rpx">
+										<view class="u-flex u-row-center"
+											style="position: absolute;bottom: 10rpx;width: 144rpx;">
 											<view class="u-flex">
-												<image src="../../static/images/index/label.png"
+												<!-- 												<image src="../../static/images/index/label.png"
 													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
 													mode="">
-												</image>
-												<view class="tag" style="background-color: rgba(251, 73, 70, 1);">已补15元
+												</image> -->
+												<view class="tag u-flex" style="background-color: rgba(251, 73, 70, 1);">
+													<image src="../../static/images/index/down.png"
+														style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
+														mode="">
+													</image>
+													<text>{{15 + i18n.RMB}}</text>
 												</view>
 											</view>
 										</view>
@@ -110,7 +120,7 @@
 							<view class="u-flex">
 								<image src="../../static/images/index/postage.png" style="width: 116rpx;height: 26rpx;"
 									mode=""></image>
-								<view class="biaoqian" style="background:rgba(248, 50, 36, 1)">全球好物</view>
+								<view class="biaoqian" style="background:rgba(248, 50, 36, 1)">{{i18n.Something}}</view>
 							</view>
 							<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
 								<view v-for="(item,idx) in 2" class="ssbox  " style="margin-top: 8rpx;">
@@ -128,8 +138,7 @@
 					</view>
 				</view>
 				<view class="u-flex u-row-between" style="flex-wrap: wrap;">
-					<view class="bigbox" v-for="(item,index) in 6" style="position: relative;height: 556rpx;"
-						@click="todetail">
+					<view class="bigbox" v-for="(item,index) in 6" style="position: relative;" @click="todetail">
 						<image src="../../static/images/index/discount.png"
 							style="width: 60rpx;height: 36rpx;position: absolute;left: 12rpx;top: 12rpx;" mode="">
 						</image>
@@ -149,9 +158,11 @@
 						</view>
 						<view class="u-flex"
 							style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 12px;overflow: hidden;">
-							<view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">包邮</view>
+							<view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">{{i18n.postage}}
+							</view>
 							<view class="taber"
-								style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">以旧换新</view>
+								style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">{{i18n.Trade}}
+							</view>
 							<!-- <view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">以旧换新</view> -->
 						</view>
 					</view>
@@ -177,7 +188,7 @@
 		data() {
 			return {
 				//顶部分段器
-				list: ['跨境速递', '商城'],
+				list: [],
 				current: 1,
 				//tabs
 				list1: [{
@@ -202,16 +213,22 @@
 				show: true
 			}
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		onLoad(options) {
-			if(options.current){
+			this.list = [this.i18n.border, this.i18n.shop]
+			if (options.current) {
 				this.current = options.current
 			}
 		},
 		methods: {
 			//商品分类
-			shoptype(){
+			shoptype() {
 				uni.navigateTo({
-					url:'/pageA/shoptype'
+					url: '/pageA/shoptype'
 				})
 			},
 			//分段器切换
@@ -236,12 +253,14 @@
 </script>
 
 <style lang="scss" scoped>
-	::v-deep .u-tabs{
+	::v-deep .u-tabs {
 		width: 560rpx;
 	}
+
 	.taber {
 		border-radius: 4rpx;
 		padding: 4rpx 8rpx;
+		margin-bottom: 10rpx;
 	}
 
 	.title {
@@ -303,7 +322,7 @@
 		// height: 28rpx;
 		border-radius: 14rpx 14rpx 14rpx 0rpx;
 		border: 1rpx solid #FFFFFF;
-		padding: 6rpx ;
+		padding: 6rpx;
 		text-align: center;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
@@ -313,12 +332,12 @@
 		text-align: center;
 		font-style: normal;
 		box-sizing: border-box;
-		margin-left: -15rpx;
+		// margin-left: -15rpx;
 	}
 
 	.bigbox {
 		width: 340rpx;
-		height: 468rpx;
+		// height: 468rpx;
 		background: #FFFFFF;
 		border-radius: 12rpx;
 		border: 2rpx solid #FFFFFF;
@@ -393,13 +412,13 @@
 		background-color: #979797;
 	}
 
-	::v-deep .u-navbar__content.data-v-1194bf80 {
-		background-color: rgba(0, 0, 0, 0) !important;
-	}
+	// ::v-deep .u-navbar__content.data-v-1194bf80 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
 
-	::v-deep .u-status-bar.data-v-13f16680 {
-		background-color: rgba(0, 0, 0, 0) !important;
-	}
+	// ::v-deep .u-status-bar.data-v-13f16680 {
+	// 	background-color: rgba(0, 0, 0, 0) !important;
+	// }
 
 	::v-deep .u-subsection--button.data-v-b14d3440 {
 		/* padding: 6rpx 34rpx !important; */

+ 3 - 2
pages/shopping/shopping.vue

@@ -23,7 +23,7 @@
             transform: 'scale(1.05)'
         }" :list="list1" @click="click"></u-tabs>
 			</view>
-			<view class="u-flex u-row-between" style="margin-top: 24rpx;flex-wrap: wrap;" >
+			<view class="u-flex u-row-between" style="margin-top: 24rpx;flex-wrap: wrap;">
 				<view class="item" v-for="(item,idx) in 6" :key="idx" style="margin-bottom: 20rpx;">
 					<image src="/static/images/logo.png" style="width: 340rpx;height: 340rpx;" mode=""></image>
 					<view class="" style="padding: 20rpx;box-sizing: border-box;">
@@ -37,7 +37,8 @@
 							已售5000+件
 						</view>
 						<view class="" style="margin-top: 16rpx;position: relative;">
-							<image src="/static/shopping/btn.png" style="width: 300rpx;height: 68rpx;position: absolute;top:0;left:0;" mode=""></image>
+							<image src="/static/shopping/btn.png"
+								style="width: 300rpx;height: 68rpx;position: absolute;top:0;left:0;" mode=""></image>
 							<view class="u-flex u-row-between"
 								style="padding:10rpx 20rpx 0 26rpx;width: 85%;position: relative;z-index: 1;">
 								<view class="" style="margin-top: 10rpx;">

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map


File diff suppressed because it is too large
+ 397 - 363
unpackage/dist/dev/mp-weixin/common/vendor.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js

@@ -78,10 +78,10 @@ var components
 try {
   components = {
     uTabbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabbar/u-tabbar.vue */ 1054))
+      return Promise.all(/*! import() | uview-ui/components/u-tabbar/u-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabbar/u-tabbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabbar/u-tabbar.vue */ 1061))
     },
     uTabbarItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 1062))
+      return Promise.all(/*! import() | uview-ui/components/u-tabbar-item/u-tabbar-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabbar-item/u-tabbar-item.vue */ 1069))
     },
   }
 } catch (e) {

+ 14 - 1
unpackage/dist/dev/mp-weixin/pages/express/express.js

@@ -399,7 +399,7 @@ var _default = {
   data: function data() {
     return {
       //顶部分段器
-      list: ['跨境速递', '商城'],
+      list: [],
       current: 0,
       type: "error",
       value: 1,
@@ -410,10 +410,23 @@ var _default = {
     };
   },
   onLoad: function onLoad(options) {
+    this.list = [this.i18n.border, this.i18n.shop];
     if (options.current) {
       this.current = options.current;
     }
   },
+  onShow: function onShow() {
+    this.list[0] = this.i18n.border;
+    this.list[1] = this.i18n.shop;
+    uni.setNavigationBarTitle({
+      title: this.i18n.setup
+    });
+  },
+  computed: {
+    i18n: function i18n() {
+      return this.$t('index');
+    }
+  },
   methods: {
     count: function count() {
       uni.navigateTo({

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/express/express.wxml


+ 18 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -361,11 +361,22 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
       //顶部分段器
-      list: ['跨境速递', '商城'],
+      list: [],
       current: 1,
       //tabs
       list1: [{
@@ -386,7 +397,13 @@ var _default = {
       show: true
     };
   },
+  computed: {
+    i18n: function i18n() {
+      return this.$t('index');
+    }
+  },
   onLoad: function onLoad(options) {
+    this.list = [this.i18n.border, this.i18n.shop];
     if (options.current) {
       this.current = options.current;
     }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 1 - 8
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -30,6 +30,7 @@
 .taber.data-v-57280228 {
   border-radius: 4rpx;
   padding: 4rpx 8rpx;
+  margin-bottom: 10rpx;
 }
 .title.data-v-57280228 {
   font-family: SFPro, SFPro;
@@ -94,11 +95,9 @@
   text-align: center;
   font-style: normal;
   box-sizing: border-box;
-  margin-left: -15rpx;
 }
 .bigbox.data-v-57280228 {
   width: 340rpx;
-  height: 468rpx;
   background: #FFFFFF;
   border-radius: 12rpx;
   border: 2rpx solid #FFFFFF;
@@ -164,12 +163,6 @@
   opacity: 0.2;
   background-color: #979797;
 }
-.data-v-57280228 .u-navbar__content.data-v-1194bf80 {
-  background-color: rgba(0, 0, 0, 0) !important;
-}
-.data-v-57280228 .u-status-bar.data-v-13f16680 {
-  background-color: rgba(0, 0, 0, 0) !important;
-}
 .data-v-57280228 .u-subsection--button.data-v-b14d3440 {
   /* padding: 6rpx 34rpx !important; */
   border-radius: 64rpx !important;

+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js

@@ -229,6 +229,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {

File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uStatusBar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-status-bar/u-status-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-status-bar/u-status-bar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-status-bar/u-status-bar.vue */ 1014))
+      return Promise.all(/*! import() | uview-ui/components/u-status-bar/u-status-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-status-bar/u-status-bar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-status-bar/u-status-bar.vue */ 1021))
     },
     uIcon: function () {
       return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 667))

File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js

@@ -80,10 +80,10 @@ var components
 try {
   components = {
     uLoadingIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 1022))
+      return Promise.all(/*! import() | uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 1029))
     },
     uSwiperIndicator: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swiper-indicator/u-swiper-indicator */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper-indicator/u-swiper-indicator")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper-indicator/u-swiper-indicator.vue */ 1030))
+      return Promise.all(/*! import() | uview-ui/components/u-swiper-indicator/u-swiper-indicator */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper-indicator/u-swiper-indicator")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper-indicator/u-swiper-indicator.vue */ 1037))
     },
   }
 } catch (e) {

File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js


Some files were not shown because too many files changed in this diff