From 9fb09704e412b7c67a17a5f9dc04f34c33cb05e7 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Mon, 8 Apr 2024 22:45:34 +0800 Subject: [PATCH] 11 --- package1/.DS_Store | Bin 10244 -> 10244 bytes package1/AI/AIHangOrderList.vue | 1154 ++++++++++++++++++++- package1/AI/AIInventoryList.vue | 12 +- package1/AI/AIPicture.vue | 179 ++-- package1/AI/AiChangeGoods.vue | 3 +- package1/AI/AiChat.vue | 27 +- package1/cropper/cropper.vue | 26 +- package1/inventory/.DS_Store | Bin 6148 -> 6148 bytes package1/inventory/addGoods.vue | 2 +- package1/inventory/batchPrint.vue | 10 +- package1/inventory/getProductIdToList.vue | 9 +- package1/other/logistics.vue | 4 +- 12 files changed, 1273 insertions(+), 153 deletions(-) diff --git a/package1/.DS_Store b/package1/.DS_Store index a878e0c970d754b9b6083b31fd29fdf2c1058043..d7b21e9450a7c27ca17bde0922958964700d1625 100644 GIT binary patch delta 213 zcmZn(XbIRLBq(!a8Uq6Z6N4jzXKucWOHxjL5|Gc)_fz_xz`eFc_gc=4J}QLbQBCN4JRKEkY?^BWO$Mn=)i dB4P&2OotLTyGb5k+sv-;i)E9jFhu-4BLGw!LJt4{ delta 212 zcmZn(XbIRLBq&p1!N9=4#Nf!_nVaw8l9ZF51mtssKTcTk|Mp}(K{0s<^Qa?CSwV(j zaB_Zb0gw*_8#X5kS~4;j_fDQCbbqq5K&gnKxtW2EfiHVMaxtYo2GXlnw zw}=Q&_7&k}2I`u;QAA7#*}kP#vyQvooxEN|V)9%O9yT~v6{dRgTM>0eM%B%tVg}4i Z2URz_OCDg`%%Hi - 你好，田一的店 + 你好，{{shopName}} @@ -23,18 +23,18 @@ - - + + + + + + + + + + + + + 点击添加子图 + src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/27e2655fe19f454d93970f968d91fbef.png" alt="" /> Ai识别 @@ -68,25 +79,54 @@ 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/44e7ccc2fae74db593bd1a10f538e2de.jpg', 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/2a55142e562b4ea480ce553c8b84d092.jpg' ], - purchaseOcrPictureList: [] + purchaseOcrPictureList: [], + parentPicturePath:'', + parentId:'', + newSubmit:[] } }, onShow() { - if (this.uploadUrl && this.uploadNum == 1) { - let data = { - ocrPicture: this.uploadUrl, - count: '' + if (this.uploadUrl && this.uploadNum == 1) { + if(this.parentId !=''){ + for(let i=0;i { - if (res.code == 200) { - this.tui.toast("识别中，请等待...") - setTimeout(res => { - uni.navigateBack({ - delta: 1 - }) - }, 2000) - - } else { - this.tui.toast(res.message) + let data = { + ocrPicture: this.purchaseOcrPictureList[i].ocrPicture, + count: this.purchaseOcrPictureList[i].count, + parentPicturePath:'' + } + this.newSubmit.push(data) + if(this.purchaseOcrPictureList[i].children.length > 0){ + for(let m=0;m {}) + } } - } - } - + } + console.log(this.newSubmit) + this.tui.request("/purchaseOcrPicture/batchSave", "POST", { + orderId: "", + purchaseOcrPictureList: this.newSubmit + + }, false, false).then((res) => { + if (res.code == 200) { + this.tui.toast("识别中，请等待...") + setTimeout(res => { + uni.navigateBack({ + delta: 1 + }) + }, 2000) + + } else { + this.tui.toast(res.message) + } + }).catch((res) => {}) }, backPage() { uni.navigateBack({ @@ -221,15 +279,6 @@ background: linear-gradient(180deg, #6585fa 0%, #6ad5fe 100%); } - .content-list { - width: 95%; - height: auto; - border-radius: 10px; - margin: 0 auto 20rpx; - overflow: hidden; - display: block; - } - .image-box { width: 120rpx; height: 170rpx; @@ -400,48 +449,40 @@ .content-list-img { position: relative; - width: 48%; + width: 360rpx; margin-left: 1.5%; height: 400rpx; border: 1px solid #eee; - float: left; background: #fff; border-top-left-radius: 10px; border-top-right-radius: 10px; margin-bottom: 40rpx; image { - width: 100%; + width: 360rpx; height: 80%; padding: 10px; } - - .uni-easyinput { - width: 100%; - height: 20%; - font-size: 36rpx; - line-height: 40rpx; - background: #F8FAFF; - text-align: center; - display: block; - border-bottom-left-radius: 10px; - border-bottom-right-radius: 10px; - } - - .is-input-border { - border: none; - background: #F8FAFF !important; - } - - .del-icon { - width: 50rpx; - height: 50rpx; - position: absolute; - top: 0; - right: 0; - } + } + .uni-easyinput { + width: 100%; + height: 20%; + font-size: 36rpx; + line-height: 40rpx; + background: #F8FAFF; + text-align: center; + display: block; + border:none; + border-bottom-left-radius: 10px; + border-bottom-right-radius: 10px; + } + .del-icon { + width: 50rpx; + height: 50rpx; + position: absolute; + top: 0; + right: 0; } - .icon-upload { position: absolute; top: 0; diff --git a/package1/AI/AiChangeGoods.vue b/package1/AI/AiChangeGoods.vue index b6e499f..90c985b 100644 --- a/package1/AI/AiChangeGoods.vue +++ b/package1/AI/AiChangeGoods.vue @@ -96,7 +96,8 @@ }).catch((res) => {}) }, //点击商品，返回上一页 - backPrevPage(item) { + backPrevPage(item) { + item.productId = item.id let pages = getCurrentPages(); let prevPage = pages[pages.length - 2]; prevPage.$vm.carList1 = item diff --git a/package1/AI/AiChat.vue b/package1/AI/AiChat.vue index a2943ea..92af97d 100644 --- a/package1/AI/AiChat.vue +++ b/package1/AI/AiChat.vue @@ -32,14 +32,14 @@ 点击可编辑语音输入的内容~ - - + + {{item.text}} - 确认挂单 + 开始识别 @@ -147,13 +147,6 @@ this.recordState = false manager.stop() }, - //语音内容为空 - showRecordEmptyTip() { - uni.showToast({ - title: "请重新说一遍", - icon: 'error' - }) - }, //语音识别功能初始化 initRecord() { let that = this; @@ -161,13 +154,19 @@ // 识别结束事件 manager.onStop = (res) => { if (res.result == '') { - that.showRecordEmptyTip() + uni.showToast({ + title: "请重新说一遍", + icon: 'error' + }) return } + console.log('语音',res) let data = { text:res.result } that.msgList.push(data) + that.$forceUpdate() + console.log('语音',that.msgList) } // 识别错误事件 @@ -185,7 +184,11 @@ userId:this.khName.id, userName:this.khName.name, aiFlag:1, - status: 7 + status: 7, + area:this.khName.area, + city:this.khName.city, + province:this.khName.province, + receiveAddress:this.khName.address }, false, false).then((res) => { if (res.code == 200) { this.goHangOrder(res.result.id) diff --git a/package1/cropper/cropper.vue b/package1/cropper/cropper.vue index 3448dc2..8f5ef3d 100644 --- a/package1/cropper/cropper.vue +++ b/package1/cropper/cropper.vue @@ -7,7 +7,7 @@ 点击中间裁剪框可查看裁剪后的图片 - + @@ -20,10 +20,10 @@ src: '', width: 250, //宽度 height: 250, //高度 - max_width: 1920, - max_height: 1080, + max_width: 1080, + max_height: 1920, disable_rotate: true, //是否禁用旋转 - disable_ratio: true, //锁定比例 + disable_ratio: false, //锁定比例 limit_move: true, //是否限制移动 } }, @@ -31,20 +31,6 @@ let that = this; this.cropper = this.selectComponent("#image-cropper"); this.src= options.imgSrc - // uni.getImageInfo({ - // src: options.imgSrc, - // success(res) { - // that.height = res.height - // that.width = res.width - // that.max_width = res.width - // that.max_height = res.height - // }, - // fail(err) { - // console.error('获取图片信息失败:', err); - // } - // }); - // console.log('宽',this.width) - // console.log('高',this.height) if(!options.imgSrc){ this.cropper.upload(); //上传图片 } @@ -56,7 +42,9 @@ loadimage(e) { wx.hideLoading(); console.log('图片'); - this.cropper.imgReset(); + // this.cropper.imgReset(); + this.cropper.setCutSize() + this.cropper.setCutCenter() }, clickcut(e) { console.log(e.detail); diff --git a/package1/inventory/.DS_Store b/package1/inventory/.DS_Store index 134b8a59d35561d5c6a7e723366ce7b210317a40..166a6bf9c92d50beaefeac5af7851d9e38af732d 100644 GIT binary patch delta 145 zcmZoMXfc@J&&a+pU^gQp`(z%bazP%3bcRHR5{6VDozGCjP&rwFNo*1`iwYy(e=uMG z0e*B<3_d{B {{item.productName}} {{item.productSn}} - + {{item.wholesalePrice}} 批发价 @@ -24,7 +24,7 @@ - + @@ -49,7 +49,7 @@ {{item.productName}} {{item.productSn}} - + {{item.wholesalePrice}} 批发价 @@ -60,7 +60,7 @@ - + @@ -243,7 +243,7 @@ this.carList.push(item) }else{ for(let i=0;i { this.status = 'nomore'; if (res.code == 200) { @@ -107,6 +107,13 @@ this.list = [...this.list, ...res.result.records] } + for(let i=0;i 下单时间： {{item.createTime}} - + 订单编号： {{item.orderId}} @@ -140,7 +140,7 @@ dataType: 'json', success: (res) => { if (res.data.code == 200){ - this.waitUpDoorNum = res.result.orders.length + this.waitUpDoorNum = res.data.result.total } }, fail: (res) => {