diff --git a/package1/.DS_Store b/package1/.DS_Store
index a878e0c..d7b21e9 100644
Binary files a/package1/.DS_Store and b/package1/.DS_Store differ
diff --git a/package1/AI/AIHangOrderList.vue b/package1/AI/AIHangOrderList.vue
index a33a166..a091401 100644
--- a/package1/AI/AIHangOrderList.vue
+++ b/package1/AI/AIHangOrderList.vue
@@ -11,7 +11,7 @@
style="font-size: 40rpx;font-weight: 800;line-height: 56rpx;color: rgba(86, 132, 255, 1);">Hi
- 你好，田一的店
+ 你好，{{shopName}}
@@ -23,18 +23,18 @@
-
-
- 
+
+
+ 
AI
语音或输入文字开单
-
-
+
+
@@ -50,36 +50,241 @@
- AI
+ AI
+ 扫
- {{item.createTime}}
+ {{item.userName}}
- 识别成功：120
+ {{item.createTime}}
-
+
识别中...
- 去开单
+
+
+
+
+
+ 语音备注
+ 扫码选货
+ 去开单
+
+ 删除
+
+
+
+
+
+ 备注：
+ {{item.remark==null?'暂无':item.remark}}
+
+
+
+ {{items.productName}}（{{items.productSn}}）单价：{{items.discountAmount}}
+ 
+
+
+
+
+
+ {{itemss.attributeList | sliceMsg}} * {{itemss.productCount}}
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+ 
+ 语音识别中...
+
+
+
+
+
+
+
+
+
+
-
@@ -208,7 +990,7 @@
.content-list {
width: 95%;
- height: 170rpx;
+ height: auto;
background: #fff;
border-radius: 10px;
margin: 0 auto 20rpx;
@@ -238,7 +1020,7 @@
.content-text {
width: 400rpx;
- height: 200rpx;
+ height: 170rpx;
float: left;
line-height: 50rpx;
padding-left: 30rpx;
@@ -256,17 +1038,17 @@
float: left;
}
- .btn {
- position: absolute;
- width: 120rpx;
- height: 60rpx;
- background: linear-gradient(90deg, #6691fb 0%, #6ad3fe 100%);
- color: #fff;
- border-radius: 6px;
- text-align: center;
- line-height: 60rpx;
- bottom: 20rpx;
- right: 20rpx;
+ .btn {
+ width: 100rpx;
+ height: 50rpx;
+ background: linear-gradient(90deg, #6691fb 0%, #6ad3fe 100%);
+ color: #fff;
+ border-radius: 6px;
+ text-align: center;
+ line-height: 50rpx;
+ font-size: 22rpx;
+ float: right;
+ margin: 20rpx 20rpx 0 0;
}
@keyframes blinking {
@@ -290,7 +1072,7 @@
animation: blinking 1s infinite;
}
- .bottom {
+ .bottom-box {
background: rgba(255, 255, 255, 0.3);
width: 100rpx;
height: 100rpx;
@@ -321,7 +1103,7 @@
}
50% {
- margin-top: -25rpx;
+ margin-top: -15rpx;
}
100% {
@@ -352,5 +1134,301 @@
}
.content{
margin-top: 20rpx;
+ }
+ .order-collapse-item {
+ background: #fff;
+ height: auto;
+ margin: 250rpx auto 0;
+ padding: 20rpx;
+ }
+ .order-notes {
+ height: 80rpx;
+ line-height: 80rpx;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: pre-wrap;
+ text-overflow: -o-ellipsis-lastline;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ line-clamp: 2;
+ -webkit-box-orient: vertical;
+ border-top: 1px solid #eee;
+ }
+ .shop-list {
+ margin: 10rpx 0;
+ border-top: 1px solid #eee;
+ border-bottom: 1px solid #eee;
+ position: relative;
+ }
+
+ .shop-list:last-child {
+ border-bottom: none;
+ }
+ .order-name {
+ height: 80rpx;
+ font-size: 32rpx;
+ font-weight: bold;
+ line-height: 80rpx;
+
+ img {
+ height: 32rpx;
+ width: 32rpx;
+ float: left;
+ margin: 24rpx;
+ }
+ }
+ .specs-name {
+ display: flex;
+ padding-bottom: 20rpx;
+ height: 60rpx;
+ line-height: 60rpx;
+ }
+ .del-icon {
+ position: absolute;
+ top: 10rpx;
+ right: 10rpx;
+ }
+ .img-popup-content {
+ width: 500rpx;
+ height: 500rpx;
+ }
+ .popup-content {
+ align-items: center;
+ justify-content: center;
+ padding: 15px;
+ width: 500rpx;
+ height: 600rpx;
+ background-color: #fff;
+ }
+
+ .popup-title {
+ font-size: 36rpx;
+ font-weight: bold;
+ text-align: center;
+ position: relative;
+ }
+
+ .popup-container {
+ margin-top: 20rpx;
+ }
+
+ .popup-bottom {
+ display: flex;
+ height: 80rpx;
+ color: #fff;
+ line-height: 80rpx;
+ margin-top: 50rpx;
+ }
+
+ .popup-btn {
+ flex: 1;
+ text-align: center;
+ background: linear-gradient(90deg, #FF9797, #FFC1E0);
+ }
+
+ .popup-btn:last-child {
+ background: linear-gradient(90deg, #60F3FF, #088FEB);
+ }
+
+ .voice-model {
+ width: 300rpx;
+ height: 300rpx;
+ display: flex;
+ justify-content: center;
+ flex-flow: column;
+ position: fixed;
+ left: 50%;
+ top:50%;
+ background: rgba(0, 0, 0, 0.5);
+ border-radius: 20rpx;
+ color: #fff;
+ text-align: center;
+ margin-left: -150rpx;
+ z-index: 999;
+ }
+
+ .voice-model img {
+ width: 200rpx;
+ height: 200rpx;
+ margin: 0 auto;
+ }
+ .voice-btn{
+ position: absolute;
+ bottom: -300rpx;
+ left: 30%;
+ width: 200rpx;
+ height: 200rpx;
+ background: #eee;
+ border-radius: 50%;
+ }
+ .shop-popup-content {
+ align-items: center;
+ justify-content: center;
+ padding: 15px;
+ height: 1200rpx;
+ background-color: #fff;
+ margin-bottom: 30rpx;
+ overflow: scroll;
+ }
+
+ .shop-popup-title {
+ display: flex;
+ height: 180rpx;
+ border-bottom: 1px solid #eee;
+ margin-top: 20rpx;
+ }
+
+ .shop-popup-title-left {
+ width: 150rpx;
+ height: 150rpx;
+ }
+
+ .shop-popup-title-right {
+ width: 400rpx;
+ margin-left: 30rpx;
+ }
+
+ .shop-popup-title-right-box {
+ height: 50rpx;
+ line-height: 50rpx;
+ }
+
+ .shop-checkList {
+ display: flex;
+ height: 50rpx;
+ font-size: 28rpx;
+ line-height: 50rpx;
+ margin: 20rpx 0;
+ }
+
+ .shop-checkList-box {
+ height: 50rpx;
+ width: 60%;
+ }
+
+ .shop-popup-bottom {
+ width: 95%;
+ height: 100rpx;
+ position: fixed;
+ bottom: 0;
+ left: 2.5%;
+ display: flex;
+ z-index: 99;
+ background: #fff;
+ }
+
+ .shop-popup-bottom-left {
+ width: 50%;
+ line-height: 80rpx;
+ }
+
+ .shop-popup-bottom-right {
+ width: 50%;
+ line-height: 100rpx;
+
+ .bottom-btn {
+ width: 70%;
+ line-height: 35px;
+ height: 70rpx;
+ text-align: center;
+ color: #fff;
+ font-size: 28rpx;
+ margin: 0 auto;
+ background: linear-gradient(90deg, #60F3FF, #088FEB);
+ border-radius: 70rpx;
+ }
+ }
+
+ .shop-popup-container {
+ width: 100%;
+ background: #fff;
+ height: 50rpx;
+ }
+
+ .shop-purchase-price {
+ display: flex;
+ line-height: 40px;
+ height: 80rpx;
+ width: 95%;
+ margin: 20rpx auto;
+ }
+
+ .shop-title-fur {
+ width: 95%;
+ height: 70rpx;
+ margin: 0 auto;
+ }
+
+ .shop-name {
+ font-size: 30rpx;
+ width: 50%;
+ float: left;
+ height: 70rpx;
+ line-height: 70rpx;
+ }
+
+ .shop-attrs {
+ text {
+ display: inline-block;
+ border: 1px solid #5fd9ee;
+ margin: 20rpx;
+ background-color: #fff;
+ color: #5fd9ee;
+ width: 100rpx;
+ line-height: 70rpx;
+ height: 70rpx;
+ text-align: center;
+ border-radius: 20rpx;
+ }
+
+ .checkedText {
+ background-color: $u-primary;
+ color: #fff;
+ border-radius: 20rpx;
+ }
+ }
+
+ .shop-popup-title-left img {
+ width: 150rpx;
+ height: 150rpx;
+
+ }
+
+ .popup-pay-content {
+ align-items: center;
+ justify-content: center;
+ padding: 15px;
+ width: 500rpx;
+ height: auto;
+ background-color: #fff;
+ }
+
+ .popup-pay-title {
+ font-size: 36rpx;
+ font-weight: bold;
+ text-align: center;
+ position: relative;
+ }
+
+ .popup-pay-container {
+ margin-top: 20rpx;
+ height: 100rpx;
+ border-radius: 10px;
+ background: #088FEB;
+ line-height: 100rpx;
+ text-align: center;
+ border-bottom: 1px solid #eee;
+ border-top: 1px solid #eee;
+ color: #fff;
+ }
+ .noPic{
+ border-radius: 10px;
+ width: 150rpx;
+ height: 150rpx;
+ // margin: 30rpx 0 0 30rpx;
+ text-align: center;
+ line-height: 140rpx;
+ color: #777;
+ background: #eee;
}
\ No newline at end of file
diff --git a/package1/AI/AIInventoryList.vue b/package1/AI/AIInventoryList.vue
index bc02722..18d96cd 100644
--- a/package1/AI/AIInventoryList.vue
+++ b/package1/AI/AIInventoryList.vue
@@ -11,7 +11,7 @@
style="font-size: 40rpx;font-weight: 800;line-height: 56rpx;color: rgba(86, 132, 255, 1);">Hi
- 你好，田一的店
+ 你好，{{shopName}}
@@ -56,7 +56,8 @@
return {
aiList:[],
carList1:[],
- purchaseDetails:[]
+ purchaseDetails:[],
+ shopName:''
}
},
onPullDownRefresh(){
@@ -67,7 +68,7 @@
this.getList()
},
onLoad() {
-
+ this.shopName = uni.getStorageSync('shopName')
},
methods: {
getList(){
@@ -111,10 +112,11 @@
for(let i=0;i
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击添加子图
+ 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 134b8a5..166a6bf 100644
Binary files a/package1/inventory/.DS_Store and b/package1/inventory/.DS_Store differ
diff --git a/package1/inventory/addGoods.vue b/package1/inventory/addGoods.vue
index 0d9f98d..cdbd375 100644
--- a/package1/inventory/addGoods.vue
+++ b/package1/inventory/addGoods.vue
@@ -259,7 +259,7 @@
//跳转分类页
goGategoryLow() {
uni.navigateTo({
- url: '/pages/inventory/gategory'
+ url: '/package1/inventory/gategory'
})
},
scanCodeAdd() {
diff --git a/package1/inventory/batchPrint.vue b/package1/inventory/batchPrint.vue
index 72690d4..e8a29ce 100644
--- a/package1/inventory/batchPrint.vue
+++ b/package1/inventory/batchPrint.vue
@@ -13,7 +13,7 @@
{{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) => {