diff --git a/locale/en.json b/locale/en.json
index d0c4810..1455988 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -4,6 +4,9 @@
 	"uni.dataSelect.emptyTips": "No options available",
 	"utils.read-more": "Read more",
 	"utils.no-more": "No more",
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data",
 	"button.confirm": "Submit",
 	"button.cancel": "Cancel",
 	"button.clear": "Clear",
@@ -60,6 +63,7 @@
 	"button.save": "Save",
 	"button.outstore-confirm": "Outbound Confirmation",
 	"button.verify": "Verify",
+	"button.return": "Return",
 	"login.username": "Username",
 	"login.password": "Password",
 	"login.remember": "Remember username",
@@ -163,6 +167,8 @@
 	"filter.product-thickness": "Product thickness",
 	"filter.material-type": "Material type",
 	"filter.outer-label-code": "Outer Carton Label Code",
+	"filter.case-has-scanned": "Wooden case number has been scanned",
+	"filter.destination": "Destination",
 	"grid.number": "Serial number",
 	"grid.select": "Select",
 	"grid.work-order-number": "Work order number",
@@ -247,6 +253,16 @@
 	"grid.personnel": "Personnel",
 	"grid.replace-outsourcing": "Replace outsourcing",
 	"grid.replace-insourcing": "Replace the inner packaging",
+	"grid.unbind-ship-area": "Unbind from Shipping Area",
+	"grid.point-name": "Point Name",
+	"grid.product-name": "Product Name",
+	"grid.width": "Width",
+	"grid.thickness": "Thickness",
+	"grid.length": "Length",
+	"grid.width-required-customer": "Width Required by Customer",
+	"grid.standard-hickness-mater": "Standard Thickness of Material",
+	"grid.shelf-life": "Shelf Life",
+	"grid.manu-completion-date": "Manufacturing Completion Date",
 	"toast.point-not-empty": "Point position cannot be empty",
 	"toast.select-cache-point": "Please select a cache point position",
 	"toast.select-device": "Please select a device",
@@ -257,6 +273,24 @@
 	"toast.scan-wooden-box-code": "Please scan the wooden box code",
 	"toast.prompt": "Prompt",
 	"toast.sure-perform-operation": "Are you sure you want to perform this operation?",
+	"toast.enter-keywords-search": "Enter keywords to search",
+	"toast.check-subroll-box-spec-match": "Please carefully check whether the sub - roll specifications match the wooden box specifications",
+	"toast.box-specifications": "The wooden box specifications are",
+	"toast.subroll-specifications": "The sub - roll specifications are",
+	"toast.generate-outbound-task": "After clicking'OK', the empty wooden box outbound task will be generated immediately and cannot be changed.",
+	"toast.check-subroll-count-match": "Please carefully check whether the number of currently scanned sub - rolls is consistent with the number of rolls that the wooden box can hold",
+	"toast.current-subroll-scan-count": "Number of currently scanned sub - rolls",
+	"toast.roll-unit": " rolls",
+	"toast.box-roll-capacity": "The number of rolls that this wooden box can hold is",
+	"toast.no-subroll-spec-info": "No information about the sub - roll specifications was found. Please check the slitting plan information of the sub - roll!",
+	"toast.scanned-specifications": "The scanned specifications are",
+	"toast.spec-mismatch-check": "They do not match the sub - roll specifications in the list. Please check",
+	"toast.current-scanned-order-number": "The currently scanned order number is",
+	"toast.order-number-mismatch-check": "It does not match the order number in the list. Please check",
+	"toast.subroll-assigned-spec": "The status of this sub - roll is that the wooden box specification has been assigned. Please check",
+	"toast.subroll-exists-check": "This sub - roll already exists. Please check",
+	"toast.operation-success": "Operation successful!",
+	"toast.subroll-count-exceed": "The number of sub - rolls exceeds the maximum number of rolls that the wooden box can hold.",
 	"select.coaster": "Small pallet",
 	"select.large-tray": "Large pallet",
 	"select.lualified-products": "Qualified products",
@@ -267,6 +301,8 @@
 	"select.tube-label": "Tube label",
 	"select.decide-oven": "Decide to put into the oven",
 	"select.decide-cooling": "Decide to put into cooling",
+	"select.enter-oven": "Enter Oven",
+	"select.enter-cooling": "Enter Cooling Zone",
 	"select.binding-point": "Binding point ",
 	"select.return-inspection-warehousing": "Return inspection & warehousing",
 	"select.recut-warehousing": "Recut & warehousing",
diff --git a/locale/id.json b/locale/id.json
index 3777d23..5535414 100644
--- a/locale/id.json
+++ b/locale/id.json
@@ -4,6 +4,9 @@
 	"uni.dataSelect.emptyTips": "Tidak ada pilihan tersedia",
 	"utils.read-more": "Lihat lebih",
 	"utils.no-more": "Tidak lagi",
+	"uni-load-more.contentdown": "Geser ke atas untuk menampilkan lebih banyak",
+	"uni-load-more.contentrefresh": "Sedang memuat...",
+	"uni-load-more.contentnomore": "Tidak ada data lebih lanjut",
 	"button.confirm": "Kirimkan",
 	"button.cancel": "Batalkan",
 	"button.clear": "Hapus",
@@ -60,6 +63,7 @@
 	"button.save": "Simpan",
 	"button.outstore-confirm": "Konfirmasi Deposit",
 	"button.verify": "Verifikasi",
+	"button.return": "Kembali",
 	"login.username": "Nama pengguna",
 	"login.password": "Kata sandi",
 	"login.remember": "Ingat nama pengguna",
@@ -163,6 +167,8 @@
 	"filter.product-thickness": "Ketebalan produk",
 	"filter.material-type": "Jenis bahan",
 	"filter.outer-label-code": "Kode Label Karton Luar",
+	"filter.case-has-scanned": "Nomor kotak kayu telah di - scan",
+	"filter.destination": "Tujuan",
 	"grid.number": "Nomor urut",
 	"grid.select": "Pilih",
 	"grid.work-order-number": "Nomor pesanan kerja",
@@ -247,6 +253,16 @@
 	"grid.personnel": "Staf",
 	"grid.replace-outsourcing": "Ganti outsourcing",
 	"grid.replace-insourcing": "Ganti Paket Dalam",
+	"grid.unbind-ship-area": "Membatalkan Pengikatan dari Daerah Pengiriman",
+	"grid.point-name": "Nama Titik",
+	"grid.product-name": "Nama Produk",
+	"grid.width": "Lebar",
+	"grid.thickness": "Ketebalan",
+	"grid.length": "Panjang",
+	"grid.width-required-customer": "Lebar yang Diperlukan Oleh Pelanggan",
+	"grid.standard-hickness-mater": "Ketebalan Standar Bahan",
+	"grid.shelf-life": "Umur Simpan",
+	"grid.manu-completion-date": "Tanggal Selesai Manufaktur",
 	"toast.point-not-empty": "Posisi titik tidak boleh kosong",
 	"toast.select-cache-point": "Silakan pilih posisi titik cache",
 	"toast.select-device": "Silakan pilih peralatan",
@@ -257,6 +273,24 @@
 	"toast.scan-wooden-box-code": "Silakan scan kode kotak kayu",
 	"toast.prompt": "Petunjuk",
 	"toast.sure-perform-operation": "Apakah Anda yakin ingin melakukan operasi ini?",
+	"toast.enter-keywords-search": "Masukkan kata kunci untuk mencari",
+	"toast.check-subroll-box-spec-match": "Mohon periksa dengan teliti apakah spesifikasi sub - gulungan cocok dengan spesifikasi kotak kayu",
+	"toast.box-specifications": "Spesifikasi kotak kayu adalah",
+	"toast.subroll-specifications": "Spesifikasi sub - gulungan adalah",
+	"toast.generate-outbound-task": "Setelah mengklik'OK', tugas pengiriman kotak kayu kosong akan segera dibuat dan tidak dapat diubah.",
+	"toast.check-subroll-count-match": "Mohon periksa dengan teliti apakah jumlah sub - gulungan yang sedang di - scan sesuai dengan jumlah gulungan yang dapat dimuat oleh kotak kayu",
+	"toast.current-subroll-scan-count": "Jumlah sub - gulungan yang sedang di - scan",
+	"toast.roll-unit": " gulungan",
+	"toast.box-roll-capacity": "Jumlah gulungan yang dapat dimuat oleh kotak kayu ini adalah",
+	"toast.no-subroll-spec-info": "Tidak ditemukan informasi spesifikasi sub - gulungan. Mohon periksa informasi rencana pemotongan sub - gulungan!",
+	"toast.scanned-specifications": "Spesifikasi yang di - scan adalah",
+	"toast.spec-mismatch-check": "Tidak sesuai dengan spesifikasi sub - gulungan dalam daftar. Mohon periksa",
+	"toast.current-scanned-order-number": "Nomor pesanan yang sedang di - scan adalah",
+	"toast.order-number-mismatch-check": "Tidak sesuai dengan nomor pesanan dalam daftar. Mohon periksa",
+	"toast.subroll-assigned-spec": "Status sub - gulungan ini adalah spesifikasi kotak kayu telah ditugaskan. Mohon periksa",
+	"toast.subroll-exists-check": "Sub - gulungan ini sudah ada. Mohon periksa",
+	"toast.operation-success": "Operasi berhasil!",
+	"toast.subroll-count-exceed": "Jumlah sub - gulungan melebihi jumlah maksimum gulungan yang dapat dimuat oleh kotak kayu.",
 	"select.coaster": "Palet kecil",
 	"select.large-tray": "Palet besar",
 	"select.lualified-products": "Produk layak",
@@ -267,6 +301,8 @@
 	"select.tube-label": "Label tabung",
 	"select.decide-oven": "Putuskan dimasukkan ke dalam oven",
 	"select.decide-cooling": "Putuskan dimasukkan ke pendinginan",
+	"select.enter-oven": "Masuk ke Oven",
+	"select.enter-cooling": "Masuk ke ZonaPendinginan",
 	"select.binding-point": "Titik pengikat ",
 	"select.return-inspection-warehousing": "Kembali inspeksi & simpan",
 	"select.recut-warehousing": "Potong ulang & simpan",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 23d769e..ea1f59a 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -4,6 +4,9 @@
 	"uni.dataSelect.emptyTips": "无选项",
 	"utils.read-more": "查看更多",
 	"utils.no-more": "没有更多",
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了",
 	"button.confirm": "确定",
 	"button.cancel": "取消",
 	"button.clear": "清空",
@@ -60,6 +63,7 @@
 	"button.save": "保存",
 	"button.outstore-confirm": "出库确认",
 	"button.verify": "校验",
+	"button.return": "返回",
 	"login.username": "用户名",
 	"login.password": "密码",
 	"login.remember": "记住用户名",
@@ -163,6 +167,8 @@
 	"filter.product-thickness": "产品厚度",
 	"filter.material-type": "物料类型",
 	"filter.outer-label-code": "外箱标签码",
+	"filter.case-has-scanned": "已扫木箱号",
+	"filter.destination": "去向",
 	"grid.number": "序号",
 	"grid.select": "选择",
 	"grid.work-order-number": "工单号",
@@ -247,6 +253,16 @@
 	"grid.personnel": "人员",
 	"grid.replace-outsourcing": "更换外包",
 	"grid.replace-insourcing": "更换内包",
+	"grid.unbind-ship-area": "发货区解绑",
+	"grid.point-name": "点位名称",
+	"grid.product-name": "产品名称",
+	"grid.width": "幅宽",
+	"grid.thickness": "厚度",
+	"grid.length": "长度",
+	"grid.width-required-customer": "客户要求幅宽",
+	"grid.standard-hickness-mater": "物料标准厚度",
+	"grid.shelf-life": "保质期",
+	"grid.manu-completion-date": "制造完成日期",
 	"toast.point-not-empty": "点位不能为空",
 	"toast.select-cache-point": "请选择缓存点位",
 	"toast.select-device": "请选择设备",
@@ -257,6 +273,24 @@
 	"toast.scan-wooden-box-code": "请扫木箱码",
 	"toast.prompt": "提示",
 	"toast.sure-perform-operation": "确定要执行此操作吗？",
+	"toast.enter-keywords-search": "输入关键字搜索",
+	"toast.check-subroll-box-spec-match": "请仔细核对子卷与木箱规格是否匹配",
+	"toast.box-specifications": "木箱规格为",
+	"toast.subroll-specifications": "子卷规格为",
+	"toast.generate-outbound-task": "点击确定后将立即生成空木箱出库任务，无法更改",
+	"toast.check-subroll-count-match": "请仔细核对当前扫描子卷数与木箱装卷数是否一致",
+	"toast.current-subroll-scan-count": "当前扫描子卷数",
+	"toast.roll-unit": "卷",
+	"toast.box-roll-capacity": "该木箱装卷数为",
+	"toast.no-subroll-spec-info": "未查询到该子卷规格信息，请检查子卷的分切计划信息！",
+	"toast.scanned-specifications": "扫描的规格为",
+	"toast.spec-mismatch-check": "与列表中的子卷规格不一致，请检查",
+	"toast.current-scanned-order-number": "当前扫描的订单号为",
+	"toast.order-number-mismatch-check": "与列表中的订单号不一致，请检查",
+	"toast.subroll-assigned-spec": "该子卷状态为已分配木箱规格，请检查",
+	"toast.subroll-exists-check": "该子卷已存在，请检查",
+	"toast.operation-success": "操作成功！",
+	"toast.subroll-count-exceed": "子卷数量超过木箱的最大装卷数！",
 	"select.coaster": "小托盘",
 	"select.large-tray": "大托盘",
 	"select.lualified-products": "合格品",
@@ -267,6 +301,8 @@
 	"select.tube-label": "管标",
 	"select.decide-oven": "决策入烘箱",
 	"select.decide-cooling": "决策入冷却",
+	"select.enter-oven": "入烘箱",
+	"select.enter-cooling": "入冷却",
 	"select.binding-point": "捆扎点",
 	"select.return-inspection-warehousing": "返检入库",
 	"select.recut-warehousing": "改切入库",
diff --git a/pages/SecondPhase/DeliveryUnbindConfirm.vue b/pages/SecondPhase/DeliveryUnbindConfirm.vue
index 79c960d..e0b496a 100644
--- a/pages/SecondPhase/DeliveryUnbindConfirm.vue
+++ b/pages/SecondPhase/DeliveryUnbindConfirm.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="发货区解绑" :inner="true" :show="false"></nav-bar>
+		<nav-bar :title="$t('grid.unbind-ship-area')" :inner="true" :show="false"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
@@ -12,7 +12,7 @@
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">单据号</view>
+					<view class="filter_label">{{$t('grid.bill-code')}}</view>
 					<view class="filter_input_wraper">
 						<input type="text" class="filter_input filter_input_disabled" v-model="val2" disabled>
 					</view>
@@ -25,10 +25,10 @@
 							<tr>
 								<th class="fontcol2">{{$t('filter.box-no')}}</th>
 								<th>{{$t('grid.point-code')}}</th>
-								<th>点位名称</th>
+								<th>{{$t('grid.point-name')}}</th>
 								<th>{{$t('grid.weight')}}</th>
 								<th>{{$t('grid.product-code')}}</th>
-								<th>产品名称</th>
+								<th>{{$t('grid.product-name')}}</th>
 								<th>{{$t('grid.order-number')}}</th>
 							</tr>
 						</thead>
@@ -62,20 +62,20 @@
 								<tr>
 									<th>{{$t('filter.box-no')}}</th>
 									<th>{{$t('grid.sub-roll-number')}}</th>
-									<th>sap批次</th>
-									<th>净重</th>
-									<th>状态</th>
+									<th>{{$t('grid.sap-batch')}}</th>
+									<th>{{$t('grid.net-weight')}}</th>
+									<th>{{$t('grid.status')}}</th>
 									<th>{{$t('grid.order-number')}}</th>
-									<th>客户编码</th>
+									<th>{{$t('grid.customer-code')}}</th>
 									<th>{{$t('grid.customer-name')}}</th>
-									<th>幅宽</th>
-									<th>厚度</th>
-									<th>长度</th>
-									<th>客户要求幅宽</th>
-									<th>物料标准厚度</th>
-									<th>保质期</th>
-									<th>制造完成日期</th>
-									<th>入库日期</th>
+									<th>{{$t('grid.width')}}</th>
+									<th>{{$t('grid.thickness')}}</th>
+									<th>{{$t('grid.length')}}</th>
+									<th>{{$t('grid.width-required-customer')}}</th>
+									<th>{{$t('grid.standard-hickness-mater')}}</th>
+									<th>{{$t('grid.shelf-life')}}</th>
+									<th>{{$t('grid.manu-completion-date')}}</th>
+									<th>{{$t('grid.warehousing-date')}}</th>
 								</tr>
 							</thead>
 							<tbody>
@@ -103,7 +103,7 @@
 				</view>
 			</view>
 			<view class="zd-row submitbar">
-				<button class="zd-col-22 btn-submit btn-success letter-30" @tap.stop="show = false">返回</button>
+				<button class="zd-col-22 btn-submit btn-success letter-30" @tap.stop="show = false">{{$t('button.return')}}</button>
 			</view>
 		</view>
 		<view v-if="show" class="msg_mask"></view>
diff --git a/pages/SecondPhase/EmptyBoxOutStore.vue b/pages/SecondPhase/EmptyBoxOutStore.vue
index fd10d39..fab5c0c 100644
--- a/pages/SecondPhase/EmptyBoxOutStore.vue
+++ b/pages/SecondPhase/EmptyBoxOutStore.vue
@@ -12,7 +12,7 @@
 						<search-box v-model="val1" @handleChange="handleChange1" />
 					</view>
 				</view>
-				<view v-if="editValue.length" class="msg_item" style="margin-bottom:16rpx;">已扫木箱号：{{editValue.toString()}}</view>
+				<view v-if="editValue.length" class="msg_item" style="margin-bottom:16rpx;">{{$t('filter.case-has-scanned')}}：{{editValue.toString()}}</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.select-box-num')}}</span>
diff --git a/pages/SecondPhase/finished/abnorToStore.vue b/pages/SecondPhase/finished/abnorToStore.vue
index 1e2ec4a..c3fcf80 100644
--- a/pages/SecondPhase/finished/abnorToStore.vue
+++ b/pages/SecondPhase/finished/abnorToStore.vue
@@ -56,7 +56,7 @@
 		data() {
 			return {
 				title: '',
-				options: [{value: '1', text: this.$t('select.return-inspection-warehousing')}, {value: '2', text: this.$t('select.recut-warehousing')}, {value: '0001', text: this.$t('select.production-warehousing')}, {value: '0009', text: '手工入库'}],
+				options: [{value: '1', text: this.$t('select.return-inspection-warehousing')}, {value: '2', text: this.$t('select.recut-warehousing')}, {value: '0001', text: this.$t('select.production-warehousing')}, {value: '0009', text: this.$t('select.manual-warehousing')}],
 				index: '',
 				val1: '',
 				val2: '',
diff --git a/pages/SecondPhase/production/BakeDetail.vue b/pages/SecondPhase/production/BakeDetail.vue
index 61da3db..c72f294 100644
--- a/pages/SecondPhase/production/BakeDetail.vue
+++ b/pages/SecondPhase/production/BakeDetail.vue
@@ -82,7 +82,7 @@
 						</view>
 					</view>
 					<view class="filter_item">
-						<view class="filter_label">去向</view>
+						<view class="filter_label">{{$t('filter.destination')}}</view>
 						<view class="filter_input_wraper">
 							<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options1" placement="top"></uni-data-select>
 						</view>
@@ -126,9 +126,9 @@
 				reload: false,
 				status: 'more',
 				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
+					contentdown: this.$t('uni-load-more.contentdown'),
+					contentrefresh: this.$t('uni-load-more.contentrefresh'),
+					contentnomore: this.$t('uni-load-more.contentnomore')
 				},
 				totalCount: 0,
 				pageNum: 1,
@@ -139,7 +139,7 @@
 				val3: '',
 				val4: '',
 				index1: '',
-				options1: [{value: '1', text: '入冷却'}, {value: '2', text: '入烘箱'}]
+				options1: [{value: '1', text: this.$t('select.enter-cooling')}, {value: '2', text: this.$t('select.enter-oven')}]
 			};
 		},
 		onPageScroll(e) {
diff --git a/pages/SecondPhase/production/SboCool.vue b/pages/SecondPhase/production/SboCool.vue
index 7bbcfc3..6aca999 100644
--- a/pages/SecondPhase/production/SboCool.vue
+++ b/pages/SecondPhase/production/SboCool.vue
@@ -90,9 +90,9 @@
 				reload: false,
 				status: 'more',
 				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
+					contentdown: this.$t('uni-load-more.contentdown'),
+					contentrefresh: this.$t('uni-load-more.contentrefresh'),
+					contentnomore: this.$t('uni-load-more.contentnomore')
 				},
 				totalCount: 0,
 				pageNum: 1,
diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue
index de1ece1..885f2ce 100644
--- a/pages/SecondPhase/production/SboProcess.vue
+++ b/pages/SecondPhase/production/SboProcess.vue
@@ -113,9 +113,9 @@
 				reload: false,
 				status: 'more',
 				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
+					contentdown: this.$t('uni-load-more.contentdown'),
+					contentrefresh: this.$t('uni-load-more.contentrefresh'),
+					contentnomore: this.$t('uni-load-more.contentnomore')
 				},
 				totalCount: 0,
 				pageNum: 1,
diff --git a/pages/SecondPhase/production/SboProdProgress.vue b/pages/SecondPhase/production/SboProdProgress.vue
index 7aaf444..554e7fe 100644
--- a/pages/SecondPhase/production/SboProdProgress.vue
+++ b/pages/SecondPhase/production/SboProdProgress.vue
@@ -91,9 +91,9 @@
 				reload: false,
 				status: 'more',
 				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
+					contentdown: this.$t('uni-load-more.contentdown'),
+					contentrefresh: this.$t('uni-load-more.contentrefresh'),
+					contentnomore: this.$t('uni-load-more.contentnomore')
 				},
 				totalCount: 0,
 				pageNum: 1,
diff --git a/pages/SecondPhase/production/ZjContainer.vue b/pages/SecondPhase/production/ZjContainer.vue
index 32f8a22..19bc351 100644
--- a/pages/SecondPhase/production/ZjContainer.vue
+++ b/pages/SecondPhase/production/ZjContainer.vue
@@ -53,7 +53,7 @@
 			<view class="zd_wrapper-2">
 				<view class="zd-row filter_item">
 					<view :class="!disabled ? 'zd-col-18' : 'zd-col-24'">
-						<input type="text" placeholder="输入关键字搜索" class="filter_input" :class="{'filter_input_disabled': disabled}" :disabled="disabled" v-model="val2">
+						<input type="text" :placeholder="$t('toast.enter-keywords-search')" class="filter_input" :class="{'filter_input_disabled': disabled}" :disabled="disabled" v-model="val2">
 					</view>
 					<view v-show="!disabled" class="zd-col-5"><button class="btn-submit btn-success" @tap="_queryBoxSpec">{{$t('button.search')}}</button></view>
 				</view>
@@ -89,35 +89,35 @@
 				</view>
 			</view>
 			<view class="zd-row submitbar">
-				<button class="zd-col-6 btn-submit btn-success letter-30" @tap="show = false, pkId = '', pkObj = {}">取消</button>
+				<button class="zd-col-6 btn-submit btn-success letter-30" @tap="show = false, pkId = '', pkObj = {}">{{$t('button.cancel')}}</button>
 				<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !pkId}" :disabled="disabled1" @tap="popSure">{{$t('button.confirm')}}</button>
 			</view>
 		</view>
 		<view v-if="show" class="msg_mask"></view>
 		<view class="msg_modal" :class="modalShow ? 'popshow1' : 'pophide1'">
-			<view class="msg_tip">提示</view>
+			<view class="msg_tip">{{$t('toast.prompt')}}</view>
 			<view class="zd_content pdt26">
-				<view class="msg_p1">请仔细核对子卷与木箱规格是否匹配，</view>
-				<view class="msg_p2">木箱规格为：{{this.pkObj.material_name}},</view>
-				<view class="msg_p2">子卷规格为：{{this.current.paper_tube_description}},</view>
-				<view class="msg_p1">击确定后将立即生成空木箱出库任务，无法更改！</view>
+				<view class="msg_p1">{{$t('toast.check-subroll-box-spec-match')}}，</view>
+				<view class="msg_p2">{{$t('toast.box-specifications')}}：{{this.pkObj.material_name}},</view>
+				<view class="msg_p2">{{$t('toast.subroll-specifications')}}：{{this.current.paper_tube_description}},</view>
+				<view class="msg_p1">{{$t('toast.generate-outbound-task')}}！</view>
 			</view>
 			<view class="zd-row submitbar">
-				<button class="zd-col-6 btn-submit btn-success letter-30" @tap.stop="modalShow = false">取消</button>
-				<button class="zd-col-15 btn-submit btn-success letter-30" @tap="modalSure">确定</button>
+				<button class="zd-col-6 btn-submit btn-success letter-30" @tap.stop="modalShow = false">{{$t('button.cancel')}}</button>
+				<button class="zd-col-15 btn-submit btn-success letter-30" @tap="modalSure">{{$t('button.confirm')}}</button>
 			</view>
 		</view>
 		<view v-if="modalShow" class="msg_mask msg_mask_1"></view>
 		<view class="msg_modal" :class="modalShow1 ? 'popshow1' : 'pophide1'">
-			<view class="msg_tip">提示</view>
+			<view class="msg_tip">{{$t('toast.prompt')}}</view>
 			<view class="zd_content pdt26">
-				<view class="msg_p1">请仔细核对当前扫描子卷数与木箱装卷数是否一致，</view>
-				<view class="msg_p2">当前扫描子卷数： {{dataList.length}}卷，该木箱装卷数为：{{pkObj.num}}卷，</view>
-				<view class="msg_p1">点击确定后将立即生成空木箱出库任务，无法更改!</view>
+				<view class="msg_p1">{{$t('toast.check-subroll-count-match')}}，</view>
+				<view class="msg_p2">{{$t('toast.current-subroll-scan-count')}}： {{dataList.length}}{{$t('toast.roll-unit')}}，{{$t('toast.box-roll-capacity')}}：{{pkObj.num}}{{$t('toast.roll-unit')}}，</view>
+				<view class="msg_p1">{{$t('toast.generate-outbound-task')}}!</view>
 			</view>
 			<view class="zd-row submitbar">
-				<button class="zd-col-6 btn-submit btn-success letter-30" @tap.stop="modalShow1 = false">取消</button>
-				<button class="zd-col-15 btn-submit btn-success letter-30" @tap="modalSure1">确定</button>
+				<button class="zd-col-6 btn-submit btn-success letter-30" @tap.stop="modalShow1 = false">{{$t('button.cancel')}}</button>
+				<button class="zd-col-15 btn-submit btn-success letter-30" @tap="modalSure1">{{$t('button.confirm')}}</button>
 			</view>
 		</view>
 		<view v-if="modalShow1" class="msg_mask msg_mask_1"></view>
@@ -178,7 +178,7 @@
 				if (res.content.length) {
 					if (res.content[0].paper_tube_description === null || res.content[0].paper_tube_description === '') {
 						uni.showToast({
-							title: '未查询到该子卷规格信息，请检查子卷的分切计划信息！',
+							title: this.$t('toast.no-subroll-spec-info'),
 							icon: 'none',
 							duration: 5000
 						})
@@ -186,7 +186,7 @@
 					}
 					if (this.dataList.length >= 1 && res.content[0].paper_tube_description !== this.current.paper_tube_description) {
 						uni.showToast({
-							title: `扫描的规格为：${res.content[0].paper_tube_description}，与列表中的子卷规格不一致，请检查！`,
+							title: `${this.$t('toast.scanned-specifications')}：${res.content[0].paper_tube_description}，${this.$t('toast.spec-mismatch-check')}！`,
 							icon: 'none',
 							duration: 5000
 						})
@@ -194,7 +194,7 @@
 					}
 					if (this.dataList.length >= 1 && res.content[0].sale_order_name !== this.current.sale_order_name) {
 						uni.showToast({
-							title: `当前扫描的订单号为：${res.content[0].sale_order_name}，与列表中的订单号不一致，请检查！`,
+							title: `${this.$t('toast.current-scanned-order-number')}：${res.content[0].sale_order_name}，${this.$t('toast.order-number-mismatch-check')}！`,
 							icon: 'none',
 							duration: 5000
 						})
@@ -202,7 +202,7 @@
 					}
 					if (res.content[0].status !== '99') {
 						uni.showToast({
-							title: `该子卷状态为已分配木箱规格，请检查！`,
+							title: `${this.$t('toast.subroll-assigned-spec')}！`,
 							icon: 'none'
 						})
 						return
@@ -215,7 +215,7 @@
 					})
 					if (flag) {
 						uni.showToast({
-							title: `该子卷已存在，请检查！`,
+							title: `${this.$t('toast.subroll-exists-check')}！`,
 							icon: 'none'
 						})
 						return
@@ -267,7 +267,7 @@
 				try {
 					let res = await updateEntityList(this.pkId, this.dataList)
 					uni.showToast({
-						title: '操作成功！',
+						title: this.$t('toast.operation-success'),
 						icon: 'none'
 					})
 					this.clearUp()
@@ -278,7 +278,7 @@
 			popSure () {
 				if (this.dataList.length > Number(this.pkObj.num)) {
 					uni.showToast({
-						title: '子卷数量超过木箱的最大装卷数！',
+						title: this.$t('toast.subroll-count-exceed'),
 						icon: 'none',
 						duration: 5000
 					})
diff --git a/pages/SecondPhase/slitting/SlittingFeeding.vue b/pages/SecondPhase/slitting/SlittingFeeding.vue
index a5095e5..1c05103 100644
--- a/pages/SecondPhase/slitting/SlittingFeeding.vue
+++ b/pages/SecondPhase/slitting/SlittingFeeding.vue
@@ -157,9 +157,9 @@
 				reload: false,
 				status: 'more',
 				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
+					contentdown: this.$t('uni-load-more.contentdown'),
+					contentrefresh: this.$t('uni-load-more.contentrefresh'),
+					contentnomore: this.$t('uni-load-more.contentnomore')
 				},
 				totalCount: 0,
 				pageNum: 1,
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4d90592..c46e767 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -84,23 +84,11 @@
 				})
 			},
 			async toLogin() {
-				uni.redirectTo({
-					url: '/pages/home/home'
-				})
+				// uni.redirectTo({
+				// 	url: '/pages/home/home'
+				// })
 				this.disabled = true
-				if (this.user === '') {
-					// uni.showToast({
-					// 	title: '用户名不能为空',
-					// 	icon: 'none'
-					// })
-					this.disabled = false
-					return
-				}
-				if (this.password === '') {
-					// uni.showToast({
-					// 	title: '密码不能为空',
-					// 	icon: 'none'
-					// })
+				if (this.user === '' || this.password === '') {
 					this.disabled = false
 					return
 				}
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index 2a7f65b..80510fa 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="设置" :inner2="true" @goIn="goIn" :show="false"></nav-bar>
+		<nav-bar :title="$t('login.settings')" :inner2="true" @goIn="goIn" :show="false"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row">
@@ -105,18 +105,7 @@
 				// }
 			},
 			_submit () {
-				if (this.addrip === '') {
-					uni.showToast({
-						title: '服务器地址',
-						icon: 'none'
-					})
-					return
-				}
-				if (this.setTime === '') {
-					uni.showToast({
-						title: '请填写刷新时间',
-						icon: 'none'
-					})
+				if (this.addrip === '' || this.setTime === '') {
 					return
 				}
 				// 存值
diff --git a/pages/login/upgrade.vue b/pages/login/upgrade.vue
index 133cac6..2142b13 100644
--- a/pages/login/upgrade.vue
+++ b/pages/login/upgrade.vue
@@ -2,14 +2,14 @@
 	<view class="mask flex-center">
 		<view class="content botton-radius">
 			<view class="content-top">
-				<text class="content-top-text">发现新版本</text>
+				<text class="content-top-text">{{$t('upgrade.new-version')}}</text>
 				<image class="content-top" style="top: 0;" width="100%" height="100%" src="../../static/image/bg_top.png">
 				</image>
 			</view>
 			<view class="content-header"></view>
 			<view class="content-body">
 				<view class="title">
-					<text>海亮铜箔又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！</text>
+					<text>{{$t('upgrade.text1')}}</text>
 				</view>
 				<view class="footer flex-center">
 					<template>
@@ -17,11 +17,11 @@
 							<view class="progress-box flex-column" v-if="downloading">
 								<progress class="progress" border-radius="35" :percent="downLoadPercent" activeColor="#3DA7FF" show-info stroke-width="10" />
 								<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
-									<text>安装包下载中，请稍后</text>
+									<text>{{$t('upgrade.text2')}}</text>
 									<text>({{downloadedSize}}/{{packageFileSize}}M)</text>
 								</view>
 							</view>
-							<button v-else class="content-button" style="border: none;color: #fff;" plain @click="updateApp">立即升级</button>
+							<button v-else class="content-button" style="border: none;color: #fff;" plain @click="updateApp">{{$t('upgrade.upgrade-now')}}</button>
 						</template>
 					</template>
 				</view>