Эх сурвалжийг харах

[dev]
1、添加打印机判断
2、添加重量获取

Neo 1 жил өмнө
parent
commit
b429e2ed3c

+ 10 - 4
components/order-card/order-card.vue

@@ -138,11 +138,17 @@ const deployStateName = computed(()=>{
 
 const handleDetail = ()=>{
 	console.log("handleDetail", props.v, props.c)
+	const initPrint = uni.getStorageSync('hasPrinter')
+
 	if(props.c===0){
-		uni.navigateTo({
-			url:`/pages/edit/edit?id=${props.v.id}`
-			// url:`/pages/review/review?id=&preNo=${props.v.preNo}&deployState=${props.v.deployState}`
-		})
+		if(initPrint !== '1'){
+			uni.$showMsg('请先连接打印机!然后进行调配', 2000)
+		} else {
+			uni.navigateTo({
+				url:`/pages/edit/edit?id=${props.v.id}`
+				// url:`/pages/review/review?id=&preNo=${props.v.preNo}&deployState=${props.v.deployState}`
+			})
+		}
 	} else {
 		uni.navigateTo({
 			url:`/pages/detail/detail?id=${props.v.id}`

+ 2 - 2
components/print-config/print-config.vue

@@ -43,8 +43,8 @@ const connectPrint = ()=>{
 				const res = JSON.parse(JSON.stringify(ret))
 				console.log('connectPrint>>res',res.code)
 				if(res.code==3){
-					initPrint.value = true
-					uni.setStorageSync('initPrint', true)
+					// initPrint.value = true
+					uni.setStorageSync('hasPrinter', '1')
 					// _this.tip=JSON.stringify(ret);
 					// console.log(_this.tip);	
 					// 关闭配置页操作

+ 2 - 1
pages/review/review.vue

@@ -269,7 +269,7 @@ const editForm =ref({
 	urls:[],
 	userId:uni.getStorageSync('userId'),
 	comments:'',
-	weight:v.value.weight,
+	weight:'',
 	preNo: v.value.preNo
 })
 onMounted(() => {
@@ -426,6 +426,7 @@ const handleBack =()=>{
 
 const handleSubmit = debounce(async()=>{
 	editForm.value.preNo = v.value.preNo
+	editForm.value.weight = v.value.weight + ''
 	console.log('handleSubmit>>>',editForm.value)
 	
 	const {data:res} = await saveReview({